pull from remote-aros

src/components/authentication/TheLogin.vue

@@ -10,44 +10,26 @@
         <div class="row">
           <div
             class="col-md-2 d-flex flex-column justify-content-center align-items-left"
-            style="margin-right: -65px"
+            style="margin-right: -85px"
           >
-            <img
-              class="logo-img1"
-              src="img/e-Rahn_Logo_FA-01.png"
-              alt="erahn-logo"
-            />
+            <img class="logo-img1" src="img/e-Rahn_Logo_FA-01.png" alt="erahn-logo" />
           </div>
           <div
             class="col-md-2 d-flex flex-column justify-content-center align-items-left"
           >
-            <img
-              class="logo-img2"
-              src="img/Logo KoPKB_Final.png"
-              alt="erahn-logo"
-            />
-          </div>
-          <div
-            class="col-md-2 d-flex flex-column justify-content-center align-items-left"
-            style="margin-left: -65px"
-          >
-            <img
-              class="logo-img3"
-              src="img/e-rahn-lelong.png"
-              alt="erahn-logo"
-            />
+            <img class="logo-img2" src="img/Logo KoPKB_Final.png" alt="erahn-logo" />
           </div>
         </div>
       </div>
       <div class="text-center mb-5">
-        <img class="logo-img" src="img/bidder.png" alt="erahn-logo" />
-        <div class="text-200 text-3xl font-semibold mb-3">Log Masuk</div>
+        <img class="logo-img" src="img/e-rahn-lelong.png" alt="erahn-logo" />
+        <div class="text-200 text-3xl font-semibold mb-3 mt-2">Log Masuk</div>
         <span class="text-200 font-medium line-height-3"
           >Belum punyai akaun?</span
         >
         <router-link
           v-bind:to="{ name: 'register' }"
-          class="font-medium ml-2 text-blue cursor-pointer"
+          class="font-medium no-underline ml-2 text-white cursor-pointer"
           >Daftar sekarang!
         </router-link>
       </div>
@@ -66,11 +48,21 @@
                   placeholder="Username"
                   required
                 ></InputText>
+                <InputText
+                  class="mb-2"
+                  v-model="form.username"
+                  type="text"
+                  placeholder="Username"
+                  required
+                ></InputText>
               </span>
             </div>
             <InlineMessage class="flex-auto" v-if="v$.form.username.$error"
               >Username diperlukan</InlineMessage
             >
+            <InlineMessage class="flex-auto" v-if="v$.form.username.$error"
+              >Username diperlukan</InlineMessage
+            >
           </div>
           <div class="field grid">
             <!-- <label for="firstname3"
@@ -86,11 +78,21 @@
                   toggleMask
                   :feedback="false"
                 />
+                <Password
+                  class="mb-2"
+                  v-model="form.password"
+                  placeholder="Password"
+                  toggleMask
+                  :feedback="false"
+                />
               </span>
             </div>
             <InlineMessage class="flex-auto" v-if="v$.form.password.$error"
               >Kata laluan diperlukan</InlineMessage
             >
+            <InlineMessage class="flex-auto" v-if="v$.form.password.$error"
+              >Kata laluan diperlukan</InlineMessage
+            >
           </div>
           <div class="">
             <Button
@@ -255,6 +257,10 @@ export default {
   background: #fff9f9eb !important;
 }
 
+.content-bg {
+  background: #fff9f9eb !important;
+}
+
 .logo-img {
   color: white;
   width: 180px;
@@ -271,9 +277,14 @@ export default {
   height: 60px;
 }
 
-.logo-img3 {
-  width: 150px;
-  height: 30px;
+.logo-img1 {
+  width: 50px;
+  height: 50px;
+}
+
+.logo-img2 {
+  width: 50px;
+  height: 60px;
 }
 
 /* .border-round{

src/components/bid-record/BidRecordList.vue

@@ -302,4 +302,18 @@ export default {
 .container-height {
   min-height: 70vh;
 }
+
+.style-info {
+  background: #e4f8f0;
+  border: solid #1ea97c;
+  border-width: 0px;
+  color: #1ea97c;
+  font-size: 1rem;
+  align-items: center;
+  display: flex;
+  padding: 0.4rem 0.9rem;
+  margin: 0;
+  border-radius: 6px;
+  font-weight: 400;
+}
 </style>

src/components/layouts/TheHeader.vue

@@ -525,4 +525,4 @@ a.router-link-exact-active:hover {
 .arrow-logo {
   font-size: 0.5rem;
 }
-</style>
+</style>

src/components/policy/ThePolicy.vue

@@ -97,3 +97,10 @@ export default {
   border-radius: 6px;
 }
 </style>
+
+export default {
+  components: {
+    "terms-and-conditions-details": TermsAndConditionsDetails,
+  },
+};
+</script>