return register and header to original

src/components/authentication/TheRegister.vue

@@ -22,6 +22,14 @@
             <img class="logo-img" src="img/e-rahn-lelong.png" alt="arrahn-logo" />
             <div class="text-200 text-3xl font-semibold mb-3 mt-3">Daftar Akaun</div>
           </div>
+          <!-- <span class="text-600 font-medium line-height-3"
+            >Sudah punyai akaun?</span
+          >
+          <router-link
+            v-bind:to="{ name: 'login' }"
+            class="font-medium no-underline ml-2 text-blue-500 cursor-pointer"
+            >Log masuk sekarang!</router-link
+          > -->
         </div>
         <!-- <h5>Daftar Akaun</h5> -->
         <div class="grid">
@@ -260,12 +268,12 @@
             />
           </div>
           <div class="col-12 text-center">
-            <span class="text-600 font-medium line-height-3"
+            <span class="text-200 font-medium line-height-3"
             >Sudah punyai akaun?
             </span>
             <router-link
             v-bind:to="{ name: 'login' }"
-            class="font-medium no-underline ml-2 text-blue-500 cursor-pointer"
+            class="font-medium no-underline ml-2 text-teal-600 cursor-pointer"
             >Log masuk sekarang!</router-link>
           </div>      
         </div>
@@ -297,8 +305,6 @@
           ></Button>
         </template>
       </Dialog>
-        </template>
-      </Dialog>
     </div>
   </div>
 </template>
@@ -308,22 +314,19 @@ import axios from "axios";
 import useVuelidate from "@vuelidate/core";
 import { required, email, minLength, maxLength } from "@vuelidate/validators";
 import TermsAndConditionsDetails from "./TermsAndConditionsDetails.vue";
+import { useAuthenticationUserStore } from "@/store/modules/authentication"
 
 export default {
   name: "Register",
   components: {
     "terms-and-conditions-details": TermsAndConditionsDetails,
   },
-  components: {
-    "terms-and-conditions-details": TermsAndConditionsDetails,
-  },
   data() {
     return {
       v$: useVuelidate(),
       alertMessages: Array,
       isLoading: false,
       isDisplayTNC: false,
-      isDisplayTNC: false,
       form: {
         name: "",
         username: "",
@@ -333,7 +336,6 @@ export default {
         notelbimbit: "",
         register_agree: null,
         alamat: "",
-        alamat: "",
         // password_confirmation: "",
         images: {
           file1: {
@@ -364,7 +366,6 @@ export default {
         axios
           .post("/register", this.form)
           .then((response) => {
-            // console.log("doRegister", response);
             // console.log("doRegister", response);
             if (response.data.success == true) {
               localStorage.setItem("token", response.data.token);
@@ -391,7 +392,6 @@ export default {
             } else if (response.data.success == false) {
               this.isLoading = false;
               this.isDisplayTNC = false;
-              this.isDisplayTNC = false;
               this.alertMessages = response.data.message;
               Object.values(this.alertMessages).forEach((val) =>
                 this.$toast.add({
@@ -408,14 +408,6 @@ export default {
                 summary: "Failed to register!",
                 detail: response.data.message,
               });
-            } else if (response.data.success == "Staff") {
-              this.isLoading = false;
-              this.isDisplayTNC = false;
-              this.$toast.add({
-                severity: "warn",
-                summary: "Failed to register!",
-                detail: response.data.message,
-              });
             } else {
               this.isLoading = false;
               alert(response);
@@ -455,10 +447,8 @@ export default {
         password: { required, minLengthValue: minLength(8) },
         email: { required, email },
         notelbimbit: { required, minLengthValue: minLength(8) },
-        notelbimbit: { required, minLengthValue: minLength(8) },
         register_agree: { required },
         alamat: { required },
-        alamat: { required },
         // images: {
         //   file1: {
         //     filename: { required },

src/components/layouts/TheHeader.vue

@@ -11,8 +11,7 @@
         </div>
       </div>
       <div class="flex align-items-center justify-content-center">
-        <img class="logo-img" src="img/e-rahn-lelong.png" alt="arrahn-logo" />
+        <nav class="main-nav">
-        <!-- <nav class="main-nav">
           <router-link class="nav-button" v-bind:to="{ name: 'home' }"
             >Utama</router-link
           >
@@ -201,330 +200,6 @@
         >
       </div>
     </div>
-  </Sidebar> -->
-
-  
-<Sidebar :visible.sync="visibleLeft" autoZIndex dismissable:false>
-    <!-- <h3>Left Sidebar</h3> -->
-    <div class="grid">
-      <!-- <div class="col-12">
-        <div class="text-center">
-          <i class="bi bi-person-circle me-1"></i> {{ username }}
-        </div>
-      </div> -->
-       <div class="col-12">
-        <div class="text-center">
-          <img class="logo-img" src="img/e-rahn-lelong.png" alt="arrahn-logo" />
-        </div>
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'home' }"
-          >Utama</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'list' }"
-          >Senarai</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'cart' }"
-          >Troli</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'bid-record' }"
-          >Rekod</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'result' }"
-          >Keputusan</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'policy' }"
-          >Polisi</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'profile' }"
-          >Profil</router-link
-        >
-      </div>
-      <div class="col-12">
-        <!-- <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'login' }"
-          >Login</router-link
-        > -->
-      </div>
-      <div class="col-12">
-        <a
-          class="main-nav-link main-nav-link-sidebar"
-          v-on:click="doLogout()"
-          href="#"
-          ><i class="bi bi-box-arrow-right me-1"></i> Log Keluar</a
-        >
-      </div>
-    </div>
-  </Sidebar> -->
-
-  
-<Sidebar :visible.sync="visibleLeft" autoZIndex dismissable:false>
-    <!-- <h3>Left Sidebar</h3> -->
-    <div class="grid">
-      <!-- <div class="col-12">
-        <div class="text-center">
-          <i class="bi bi-person-circle me-1"></i> {{ username }}
-        </div>
-      </div> -->
-       <div class="col-12">
-        <div class="text-center">
-          <img class="logo-img" src="img/e-rahn-lelong.png" alt="arrahn-logo" />
-        </div>
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'home' }"
-          >Utama</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'list' }"
-          >Senarai</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'cart' }"
-          >Troli</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'bid-record' }"
-          >Rekod</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'result' }"
-          >Keputusan</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'policy' }"
-          >Polisi</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'profile' }"
-          >Profil</router-link
-        >
-      </div>
-      <div class="col-12">
-        <!-- <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'login' }"
-          >Login</router-link
-        > -->
-      </div>
-      <div class="col-12">
-        <a
-          class="main-nav-link main-nav-link-sidebar"
-          v-on:click="doLogout()"
-          href="#"
-          ><i class="bi bi-box-arrow-right me-1"></i> Log Keluar</a
-        >
-      </div>
-    </div>
-  </Sidebar> -->
-
-  
-<Sidebar :visible.sync="visibleLeft" autoZIndex dismissable:false>
-    <!-- <h3>Left Sidebar</h3> -->
-    <div class="grid">
-      <!-- <div class="col-12">
-        <div class="text-center">
-          <i class="bi bi-person-circle me-1"></i> {{ username }}
-        </div>
-      </div> -->
-       <div class="col-12">
-        <div class="text-center">
-          <img class="logo-img" src="img/e-rahn-lelong.png" alt="arrahn-logo" />
-        </div>
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'home' }"
-          >Utama</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'list' }"
-          >Senarai</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'cart' }"
-          >Troli</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'bid-record' }"
-          >Rekod</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'result' }"
-          >Keputusan</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'policy' }"
-          >Polisi</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'profile' }"
-          >Profil</router-link
-        >
-      </div>
-      <div class="col-12">
-        <!-- <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'login' }"
-          >Login</router-link
-        > -->
-      </div>
-      <div class="col-12">
-        <a
-          class="main-nav-link main-nav-link-sidebar"
-          v-on:click="doLogout()"
-          href="#"
-          ><i class="bi bi-box-arrow-right me-1"></i> Log Keluar</a
-        >
-      </div>
-    </div>
-  </Sidebar> -->
-
-  
-<Sidebar :visible.sync="visibleLeft" autoZIndex dismissable:false>
-    <!-- <h3>Left Sidebar</h3> -->
-    <div class="grid">
-      <!-- <div class="col-12">
-        <div class="text-center">
-          <i class="bi bi-person-circle me-1"></i> {{ username }}
-        </div>
-      </div> -->
-       <div class="col-12">
-        <div class="text-center">
-          <img class="logo-img" src="img/e-rahn-lelong.png" alt="arrahn-logo" />
-        </div>
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'home' }"
-          >Utama</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'list' }"
-          >Senarai</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'cart' }"
-          >Troli</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'bid-record' }"
-          >Rekod</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'result' }"
-          >Keputusan</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'policy' }"
-          >Polisi</router-link
-        >
-      </div>
-      <div class="col-12">
-        <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'profile' }"
-          >Profil</router-link
-        >
-      </div>
-      <div class="col-12">
-        <!-- <router-link
-          class="main-nav-link main-nav-link-sidebar"
-          v-bind:to="{ name: 'login' }"
-          >Login</router-link
-        > -->
-      </div>
-      <div class="col-12">
-        <a
-          class="main-nav-link main-nav-link-sidebar"
-          v-on:click="doLogout()"
-          href="#"
-          ><i class="bi bi-box-arrow-right me-1"></i> Log Keluar</a
-        >
-      </div>
-    </div>
   </Sidebar>
 </template>
 
@@ -676,7 +351,7 @@ router-link:hover {
   padding: 25px 10px;
 }
 .main-color {
-  background-color: #008F96;
+  background-color: #0D908B;
 }
 
 .border-none {
@@ -751,14 +426,14 @@ router-link:hover {
 }
 
 a.router-link-exact-active {
-  background: #d5d54f;
+  background: #FAE79A;
   color: #000000;
-  border-radius: 10px;
+  border-radius: 5px;
   padding: 7px 20px;
 }
 
 a.router-link-exact-active:hover {
-  color: #000000;
+  color: #132a4f;
 }
 
 .profile-title {