merge

package-lock.json

@@ -1,6 +1,7 @@
 {
   "name": "lelong-web-pembida",
   "version": "0.1.0",
+<<<<<<< HEAD
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
@@ -11434,6 +11435,10 @@
       }
     }
   },
+=======
+  "lockfileVersion": 1,
+  "requires": true,
+>>>>>>> 7d4eb5a (init)
   "dependencies": {
     "@achrinza/node-ipc": {
       "version": "9.2.2",
@@ -13327,6 +13332,32 @@
         "webpack-merge": "^5.7.3",
         "webpack-virtual-modules": "^0.4.2",
         "whatwg-fetch": "^3.6.2"
+<<<<<<< HEAD
+=======
+      },
+      "dependencies": {
+        "@vue/vue-loader-v15": {
+          "version": "npm:vue-loader@15.10.1",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz",
+          "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
+          "dev": true,
+          "requires": {
+            "@vue/component-compiler-utils": "^3.1.0",
+            "hash-sum": "^1.0.2",
+            "loader-utils": "^1.1.0",
+            "vue-hot-reload-api": "^2.3.0",
+            "vue-style-loader": "^4.1.0"
+          },
+          "dependencies": {
+            "hash-sum": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+              "dev": true
+            }
+          }
+        }
+>>>>>>> 7d4eb5a (init)
       }
     },
     "@vue/cli-shared-utils": {
@@ -13590,6 +13621,7 @@
       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz",
       "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg=="
     },
+<<<<<<< HEAD
     "@vue/vue-loader-v15": {
       "version": "npm:vue-loader@15.9.8",
       "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.8.tgz",
@@ -13611,6 +13643,8 @@
         }
       }
     },
+=======
+>>>>>>> 7d4eb5a (init)
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
@@ -16545,9 +16579,15 @@
       "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
     },
     "json5": {
+<<<<<<< HEAD
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
       "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+=======
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+>>>>>>> 7d4eb5a (init)
       "dev": true
     },
     "jsonfile": {
@@ -18774,6 +18814,20 @@
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
       "dev": true
     },
+<<<<<<< HEAD
+=======
+    "string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+>>>>>>> 7d4eb5a (init)
     "string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -18791,6 +18845,7 @@
         }
       }
     },
+<<<<<<< HEAD
     "string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -18802,6 +18857,8 @@
         "strip-ansi": "^6.0.1"
       }
     },
+=======
+>>>>>>> 7d4eb5a (init)
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",

src/components/authentication/TheLogin.vue

@@ -10,7 +10,11 @@
         <div class="row">
           <div
             class="col-md-2 d-flex flex-column justify-content-center align-items-left"
+<<<<<<< HEAD
             style="margin-right: -65px"
+=======
+            style="margin-right: -120px"
+>>>>>>> 7d4eb5a (init)
           >
             <img
               class="logo-img1"
@@ -29,7 +33,11 @@
           </div>
           <div
             class="col-md-2 d-flex flex-column justify-content-center align-items-left"
+<<<<<<< HEAD
             style="margin-left: -65px"
+=======
+            style="margin-left: -120px"
+>>>>>>> 7d4eb5a (init)
           >
             <img
               class="logo-img3"
@@ -103,6 +111,7 @@
               iconPos="right"
             ></Button>
           </div>
+<<<<<<< HEAD
           <div class="flex alin justify-content-center mt-4 text-hover">
             <div class="btn btn-warning btn-sm">
               <terms-and-conditions></terms-and-conditions>
@@ -110,6 +119,12 @@
             <!-- <a class="btn btn-info btn-sm" href="https://lelong.arrahn.com.my"
               >Pautan Sistem Lelong</a
             > -->
+=======
+          <div class="flex alin justify-content-center mt-4">
+            <div class="btn btn-warning btn-sm mr-4">
+              <terms-and-conditions></terms-and-conditions>
+            </div>
+>>>>>>> 7d4eb5a (init)
           </div>
         </div>
       </form>