diff --git a/src/App.vue b/src/App.vue index 6e24cd3..1200439 100644 --- a/src/App.vue +++ b/src/App.vue @@ -24,7 +24,6 @@ export default { -moz-osx-font-smoothing: grayscale; text-align: center; color: #2c3e50; - margin-top: 60px; } .list { diff --git a/src/components/Cart.vue b/src/components/Cart.vue index 1b85c76..f9d90b1 100644 --- a/src/components/Cart.vue +++ b/src/components/Cart.vue @@ -259,7 +259,7 @@ diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue index 584b483..5cd84bc 100644 --- a/src/components/Navbar.vue +++ b/src/components/Navbar.vue @@ -1,7 +1,7 @@ + + + + \ No newline at end of file diff --git a/src/components/layouts/TheFooter.vue b/src/components/layouts/TheFooter.vue index 77abfb3..f9babce 100644 --- a/src/components/layouts/TheFooter.vue +++ b/src/components/layouts/TheFooter.vue @@ -16,7 +16,6 @@

  • - Permodalan Kelantan Berhad
    • diff --git a/src/components/layouts/TheHeader.vue b/src/components/layouts/TheHeader.vue index eb0bac8..103ead5 100644 --- a/src/components/layouts/TheHeader.vue +++ b/src/components/layouts/TheHeader.vue @@ -1,7 +1,7 @@ + + \ No newline at end of file diff --git a/src/components/profile/TheProfile.vue b/src/components/profile/TheProfile.vue index 35013fc..b5a2ef5 100644 --- a/src/components/profile/TheProfile.vue +++ b/src/components/profile/TheProfile.vue @@ -1,5 +1,127 @@ \ No newline at end of file + + +
    + +
    + +
    +
    PROFIL
    +
    + +
    +
    +
    + Nama +
    +
    {{ data.name }}
    +
    +
    +
    + Username +
    +
    {{ data.username }}
    +
    +
    +
    + No Kad Pengenalan +
    +
    {{ data.nokp }}
    +
    +
    +
    + No Tel Bimbit +
    +
    {{ data.notelbimbit }}
    +
    +
    +
    + Front IC +
    +
    + {{ data.filename }} +
    +
    +
    +
    + Rear IC +
    +
    + {{ data_2.filename }} +
    +
    +
    +
    Tiada Data
    +
    +
    +     +     + + + + + \ No newline at end of file diff --git a/src/components/result/TheResult.vue b/src/components/result/TheResult.vue index 165ff4f..4977094 100644 --- a/src/components/result/TheResult.vue +++ b/src/components/result/TheResult.vue @@ -1,5 +1,51 @@ \ No newline at end of file + +
    +
    +
    + +
    KEPUTUSAN
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    BilTarikhJumlahStatus
    112/03/2020RM1212.00Belum Selesai
    112/03/2020RM1212.00Selesai
    112/03/2020RM1212.00Selesai
    +     +
    +
    +
    +     + + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 40c0d3d..409561f 100644 --- a/src/main.js +++ b/src/main.js @@ -1,6 +1,6 @@ import { createApp } from 'vue' -// import App from './App.vue' -import Master from './Master.vue' +import App from './App.vue' +// import Master from './Master.vue' import router from './router' import store from './store' // import useVuelidate from '@vuelidate/core' @@ -12,7 +12,8 @@ import 'bootstrap-icons/font/bootstrap-icons.css' import TheTemplate from './components/layouts/TheTemplate.vue' import BaseCard from './components/base/BaseCard.vue' -const app = createApp(Master); +const app = createApp(App); +// const app = createApp(Master); app.component('the-template', TheTemplate); app.component('base-card', BaseCard); diff --git a/src/router/index.js b/src/router/index.js index 4bd6868..d92e30b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -18,7 +18,7 @@ // import TheLogin from '../components/authentication/TheLogin.vue' // import TheRegister from '../components/authentication/TheRegister.vue' -import TheHome from '../components/home/TheHome.vue' +// import TheHome from '../components/home/TheHome.vue' // import TheCart from '../components/cart/TheCart.vue' // import TheResult from '../components/result/TheResult.vue' // import TheProfile from '../components/profile/TheProfile.vue' @@ -120,6 +120,15 @@ import TheHome from '../components/home/TheHome.vue' // export default router; +// import TheLogin from '../components/authentication/TheLogin.vue' +// import TheRegister from '../components/authentication/TheRegister.vue' +import TheHome from '../components/home/TheHome.vue' +import TheCart from '../components/cart/TheCart.vue' +import TheResult from '../components/result/TheResult.vue' +import TheProfile from '../components/profile/TheProfile.vue' +import TheBidRecord from '../components/bid-record/TheBidRecord.vue' +import TheList from '../components/list/TheList.vue' + import { createRouter, createWebHistory, createMemoryHistory } from "vue-router"; import Login from '../components/Login.vue'; import Register from '../components/Register.vue'; @@ -127,7 +136,6 @@ import Dashboard from './../components/Dashboard.vue'; import Cart from './../components/Cart.vue'; import List from './../components/List.vue' import Pay from '../components/Pay.vue' -import Profile from './../components/Profile.vue' import BidHistory from '../components/BidHistory.vue' import Test from "../components/Test.vue" import IndexPaymentHistory from '../components/result/IndexPaymentHistory.vue' @@ -151,7 +159,7 @@ const routes = [ }, { path: '/', - name: 'Dashboard', + name: 'home', component: TheHome, // meta: { requiresAuth: true } }, @@ -159,14 +167,14 @@ const routes = [ { path: '/cart', name: 'cart', - component: Cart, + component: TheCart, // meta: { requiresAuth: true } }, { path: '/list', name: 'list', - component: List, + component: TheList, // meta: { requiresAuth: true } }, @@ -180,21 +188,21 @@ const routes = [ { path: '/profile', name: 'profile', - component: Profile, + component: TheProfile, // meta: { requiresAuth: true } }, { - path: '/bid-history', + path: '/bid-record', name: 'bid-record', - component: BidHistory, + component: TheBidRecord, // meta: { requiresAuth: true } }, { - path: '/payment-history', + path: '/result', name: 'result', - component: IndexPaymentHistory, + component: TheResult, // meta: { requiresAuth: true } },