From 002e2a99fe70b58fd376de637b710c51608ca84c Mon Sep 17 00:00:00 2001 From: Amir Date: Thu, 22 Dec 2022 10:05:09 +0800 Subject: [PATCH 01/23] Update fix ui --- public/themes/lara-light-blue/theme.css | 30 ++++++++++++++++ src/components/authentication/TheLogin.vue | 11 ++++-- src/components/authentication/TheRegister.vue | 19 ++++++++-- src/components/bid-record/BidRecordList.vue | 23 ++++-------- src/components/bid-record/TheBidRecord.vue | 17 --------- src/components/cart/CartListNew.vue | 36 ++++++++++++++----- src/components/home/LelongNextDetail.vue | 4 +-- src/components/home/LelongToday.vue | 2 +- src/components/home/LelongTodayDetail.vue | 6 ++-- src/components/list/ListItem.vue | 2 +- src/components/list/TheList.vue | 7 ++++ src/components/result/ResultMain.vue | 2 +- 12 files changed, 104 insertions(+), 55 deletions(-) diff --git a/public/themes/lara-light-blue/theme.css b/public/themes/lara-light-blue/theme.css index 4b7ef90..6af8753 100644 --- a/public/themes/lara-light-blue/theme.css +++ b/public/themes/lara-light-blue/theme.css @@ -5719,3 +5719,33 @@ .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td { box-shadow: inset 0 -2px 0 0 #3B82F6; } + +.bounce-up-down { + animation: bounce 0.5s; + animation-direction: alternate; + animation-timing-function: cubic-bezier(0.5, 0.05, 1, 0.5); + animation-iteration-count: infinite; +} + +@keyframes bounce { + from { + transform: translate3d(0, 0, 0); + } + to { + transform: translate3d(0, 25px, 0px); + } +} + +.style-info { + background: #e4f8f0; + border: solid #1ea97c; + border-width: 0.1px; + color: #1ea97c; + font-size: 1rem; + align-items: center; + display: flex; + padding: 0.4rem 0.9rem; + margin: 0; + border-radius: 6px; + font-weight: 700; +} diff --git a/src/components/authentication/TheLogin.vue b/src/components/authentication/TheLogin.vue index 61a9620..8175b3f 100644 --- a/src/components/authentication/TheLogin.vue +++ b/src/components/authentication/TheLogin.vue @@ -94,8 +94,15 @@ iconPos="right" > -
- +
+
+ +
+ Pautan Sistem Lelong
diff --git a/src/components/authentication/TheRegister.vue b/src/components/authentication/TheRegister.vue index fe441d7..4c951bc 100644 --- a/src/components/authentication/TheRegister.vue +++ b/src/components/authentication/TheRegister.vue @@ -253,7 +253,14 @@
@@ -938,17 +949,24 @@ export default { min-height: 70vh; } -.style-info { - background: #e4f8f0; - border: solid #1ea97c; +.info-teruskan { + background: #ffe7e6; + border: solid #ff5757; border-width: 0px; - color: #1ea97c; - font-size: 1rem; - align-items: center; - display: flex; + color: #ff5757; padding: 0.4rem 0.9rem; - margin: 0; border-radius: 6px; - font-weight: 400; + text-align: center; +} + +.info-teruskan-icon { + display: flex; + justify-content: center; + padding: 0.4rem 0.9rem 0 0.9rem; + margin-bottom: 15px; +} + +.icon-color { + color: #ff5757; } \ No newline at end of file diff --git a/src/components/home/LelongNextDetail.vue b/src/components/home/LelongNextDetail.vue index 751130e..071bcd9 100644 --- a/src/components/home/LelongNextDetail.vue +++ b/src/components/home/LelongNextDetail.vue @@ -15,7 +15,7 @@ Bil - Cawangan + Cawangan Ar-Rahn Tarikh @@ -29,7 +29,7 @@ Bil - Cawangan + Cawangan Ar-Rahn Tarikh diff --git a/src/components/home/LelongToday.vue b/src/components/home/LelongToday.vue index 4ac9c74..24d21d6 100644 --- a/src/components/home/LelongToday.vue +++ b/src/components/home/LelongToday.vue @@ -2,7 +2,7 @@ diff --git a/src/components/layouts/TheHeader.vue b/src/components/layouts/TheHeader.vue index 58863fd..90fc243 100644 --- a/src/components/layouts/TheHeader.vue +++ b/src/components/layouts/TheHeader.vue @@ -134,7 +134,7 @@ notification-mobile " > - Lelongan akan tamat pada + Lelongan akan tamat pada {{ lelongOnline }} diff --git a/src/components/list/ItemMasterImage.vue b/src/components/list/ItemMasterImage.vue index 2166678..94c4065 100644 --- a/src/components/list/ItemMasterImage.vue +++ b/src/components/list/ItemMasterImage.vue @@ -1,7 +1,5 @@ - - + @@ -36,5 +66,10 @@ export default { components: { "terms-and-conditions-details": TermsAndConditionsDetails, }, + data() { + return { + theUrl: "https://www.youtube.com/watch?v=lucYE9bM_PY&t=53s", + }; + }, }; \ No newline at end of file diff --git a/src/main.js b/src/main.js index 54637df..8c3db0f 100644 --- a/src/main.js +++ b/src/main.js @@ -51,6 +51,11 @@ import ScrollTop from 'primevue/scrolltop'; import 'maz-ui/css/main.css' import MazPhoneNumberInput from 'maz-ui/components/MazPhoneNumberInput' +import YouTube from "vue3-youtube"; + +import 'viewerjs/dist/viewer.css'; +import VueViewer from 'v-viewer'; + import TheTemplate from './components/layouts/TheTemplate.vue' import BaseCard from './components/base/BaseCard.vue' import TermsAndConditions from './components/authentication/TermsAndConditions.vue' @@ -93,9 +98,10 @@ app.component('Textarea', Textarea); app.directive('tooltip', Tooltip); app.component('ScrollTop', ScrollTop); - app.component('MazPhoneNumberInput', MazPhoneNumberInput) +app.component('YouTube', YouTube) + app.use(router).use(store).use(PrimeVue).use(VueSweetalert2).use(ToastService).mount('#app'); // app.use(router).use(store).use(PrimeVue).use(ToastService).mount('#app'); From 376eb0184c9c11eac68fae592741976a81a3cdf4 Mon Sep 17 00:00:00 2001 From: Amir Date: Mon, 26 Dec 2022 09:41:27 +0800 Subject: [PATCH 03/23] Force redirect to login page even request failed --- src/components/layouts/TheHeader.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/layouts/TheHeader.vue b/src/components/layouts/TheHeader.vue index 90fc243..e89bbdd 100644 --- a/src/components/layouts/TheHeader.vue +++ b/src/components/layouts/TheHeader.vue @@ -249,6 +249,8 @@ export default { .catch((error) => { console.log(error); }); + localStorage.clear(); + this.$router.push({ name: "login" }); }, toHome() { this.$router.push({ name: "home" }); From 41415408c3f53f57a4b09e5c267a3b1da1eb8e8c Mon Sep 17 00:00:00 2001 From: Amir Date: Tue, 27 Dec 2022 05:47:16 +0800 Subject: [PATCH 04/23] Reload page when visited cart --- public/themes/lara-light-blue/theme.css | 5 +++++ src/components/cart/TheCart.vue | 8 ++++++++ src/components/pay/SelectOutlet.vue | 20 +++++++++++++------- src/components/pay/ThePay.vue | 2 +- src/components/result/ResultMain.vue | 8 +++++++- 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/public/themes/lara-light-blue/theme.css b/public/themes/lara-light-blue/theme.css index 3ce2634..0676132 100644 --- a/public/themes/lara-light-blue/theme.css +++ b/public/themes/lara-light-blue/theme.css @@ -5759,3 +5759,8 @@ opacity: 0; } } + +.button-custom { + height: 20px; + width: 10px !important; +} diff --git a/src/components/cart/TheCart.vue b/src/components/cart/TheCart.vue index 1ed267e..bd5e75a 100644 --- a/src/components/cart/TheCart.vue +++ b/src/components/cart/TheCart.vue @@ -25,6 +25,14 @@ export default { componentKey: 0, }; }, + mounted: function () { + if (localStorage.getItem("reloaded")) { + localStorage.removeItem("reloaded"); + } else { + localStorage.setItem("reloaded", "1"); + location.reload(); + } + }, methods: { toggleReloadComponent() { this.componentKey += 1; diff --git a/src/components/pay/SelectOutlet.vue b/src/components/pay/SelectOutlet.vue index d4dbba7..f707b76 100644 --- a/src/components/pay/SelectOutlet.vue +++ b/src/components/pay/SelectOutlet.vue @@ -47,7 +47,7 @@
@@ -55,7 +55,7 @@
@@ -136,14 +136,19 @@ -
- +
+ +

+
+ Pembida berjaya hendaklah menyelesaikan keseluruhan amaun bidaan dan + mengambil marhun pada/sebelum jam 4.00 petang. +
@@ -938,17 +949,24 @@ export default { min-height: 70vh; } -.style-info { - background: #e4f8f0; - border: solid #1ea97c; +.info-teruskan { + background: #ffe7e6; + border: solid #ff5757; border-width: 0px; - color: #1ea97c; - font-size: 1rem; - align-items: center; - display: flex; + color: #ff5757; padding: 0.4rem 0.9rem; - margin: 0; border-radius: 6px; - font-weight: 400; + text-align: center; +} + +.info-teruskan-icon { + display: flex; + justify-content: center; + padding: 0.4rem 0.9rem 0 0.9rem; + margin-bottom: 15px; +} + +.icon-color { + color: #ff5757; } \ No newline at end of file diff --git a/src/components/home/LelongNextDetail.vue b/src/components/home/LelongNextDetail.vue index 751130e..071bcd9 100644 --- a/src/components/home/LelongNextDetail.vue +++ b/src/components/home/LelongNextDetail.vue @@ -15,7 +15,7 @@ Bil - Cawangan + Cawangan Ar-Rahn Tarikh @@ -29,7 +29,7 @@ Bil - Cawangan + Cawangan Ar-Rahn Tarikh diff --git a/src/components/home/LelongToday.vue b/src/components/home/LelongToday.vue index 4ac9c74..24d21d6 100644 --- a/src/components/home/LelongToday.vue +++ b/src/components/home/LelongToday.vue @@ -2,7 +2,7 @@ diff --git a/src/components/layouts/TheHeader.vue b/src/components/layouts/TheHeader.vue index 58863fd..90fc243 100644 --- a/src/components/layouts/TheHeader.vue +++ b/src/components/layouts/TheHeader.vue @@ -134,7 +134,7 @@ notification-mobile " > - Lelongan akan tamat pada + Lelongan akan tamat pada {{ lelongOnline }} diff --git a/src/components/list/ItemMasterImage.vue b/src/components/list/ItemMasterImage.vue index 2166678..94c4065 100644 --- a/src/components/list/ItemMasterImage.vue +++ b/src/components/list/ItemMasterImage.vue @@ -1,7 +1,5 @@ - - + @@ -36,5 +66,10 @@ export default { components: { "terms-and-conditions-details": TermsAndConditionsDetails, }, + data() { + return { + theUrl: "https://www.youtube.com/watch?v=lucYE9bM_PY&t=53s", + }; + }, }; \ No newline at end of file diff --git a/src/main.js b/src/main.js index 54637df..8c3db0f 100644 --- a/src/main.js +++ b/src/main.js @@ -51,6 +51,11 @@ import ScrollTop from 'primevue/scrolltop'; import 'maz-ui/css/main.css' import MazPhoneNumberInput from 'maz-ui/components/MazPhoneNumberInput' +import YouTube from "vue3-youtube"; + +import 'viewerjs/dist/viewer.css'; +import VueViewer from 'v-viewer'; + import TheTemplate from './components/layouts/TheTemplate.vue' import BaseCard from './components/base/BaseCard.vue' import TermsAndConditions from './components/authentication/TermsAndConditions.vue' @@ -93,9 +98,10 @@ app.component('Textarea', Textarea); app.directive('tooltip', Tooltip); app.component('ScrollTop', ScrollTop); - app.component('MazPhoneNumberInput', MazPhoneNumberInput) +app.component('YouTube', YouTube) + app.use(router).use(store).use(PrimeVue).use(VueSweetalert2).use(ToastService).mount('#app'); // app.use(router).use(store).use(PrimeVue).use(ToastService).mount('#app'); From fb26f8caee657205065a213676dcd85564aa374c Mon Sep 17 00:00:00 2001 From: Amir Date: Mon, 26 Dec 2022 09:41:27 +0800 Subject: [PATCH 09/23] Force redirect to login page even request failed --- src/components/layouts/TheHeader.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/layouts/TheHeader.vue b/src/components/layouts/TheHeader.vue index 90fc243..e89bbdd 100644 --- a/src/components/layouts/TheHeader.vue +++ b/src/components/layouts/TheHeader.vue @@ -249,6 +249,8 @@ export default { .catch((error) => { console.log(error); }); + localStorage.clear(); + this.$router.push({ name: "login" }); }, toHome() { this.$router.push({ name: "home" }); From ddd682055697df66cd3d0a778878204ac064c5ff Mon Sep 17 00:00:00 2001 From: Amir Date: Tue, 27 Dec 2022 05:47:16 +0800 Subject: [PATCH 10/23] Reload page when visited cart --- public/themes/lara-light-blue/theme.css | 5 +++++ src/components/cart/TheCart.vue | 8 ++++++++ src/components/pay/SelectOutlet.vue | 20 +++++++++++++------- src/components/pay/ThePay.vue | 2 +- src/components/result/ResultMain.vue | 8 +++++++- 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/public/themes/lara-light-blue/theme.css b/public/themes/lara-light-blue/theme.css index 3ce2634..0676132 100644 --- a/public/themes/lara-light-blue/theme.css +++ b/public/themes/lara-light-blue/theme.css @@ -5759,3 +5759,8 @@ opacity: 0; } } + +.button-custom { + height: 20px; + width: 10px !important; +} diff --git a/src/components/cart/TheCart.vue b/src/components/cart/TheCart.vue index 1ed267e..bd5e75a 100644 --- a/src/components/cart/TheCart.vue +++ b/src/components/cart/TheCart.vue @@ -25,6 +25,14 @@ export default { componentKey: 0, }; }, + mounted: function () { + if (localStorage.getItem("reloaded")) { + localStorage.removeItem("reloaded"); + } else { + localStorage.setItem("reloaded", "1"); + location.reload(); + } + }, methods: { toggleReloadComponent() { this.componentKey += 1; diff --git a/src/components/pay/SelectOutlet.vue b/src/components/pay/SelectOutlet.vue index d4dbba7..f707b76 100644 --- a/src/components/pay/SelectOutlet.vue +++ b/src/components/pay/SelectOutlet.vue @@ -47,7 +47,7 @@
@@ -55,7 +55,7 @@
@@ -136,14 +136,19 @@ -
- +
+ +

+
+ Pembida berjaya hendaklah menyelesaikan keseluruhan amaun bidaan dan + mengambil marhun pada/sebelum jam 4.00 petang. +