From b1ad3ef17425cbf1d715d200f2006998638364b0 Mon Sep 17 00:00:00 2001 From: Kaveh Hajinajaf Date: Tue, 29 Apr 2025 20:49:16 +0330 Subject: [PATCH] ADD: Search and Index system FIX: Minor Bugs FIX: Bugs in CreateBelonging Page --- .github/workflows/deploy.yaml | 20 ++ src/assets/layout/_main.scss | 1 - src/assets/layout/_menu.scss | 2 +- src/assets/layout/_responsive.scss | 7 +- src/components/LoadingCheck.vue | 93 +++++++ .../dashboard/RecentSalesWidget.vue | 4 +- src/layout/AppLayout.vue | 3 +- src/service/BelongingService.js | 27 ++ src/views/pages/Belonging/CreateBelonging.vue | 17 +- src/views/pages/Belonging/ListBelongings.vue | 259 +++++++++--------- 10 files changed, 285 insertions(+), 148 deletions(-) create mode 100644 .github/workflows/deploy.yaml create mode 100644 src/components/LoadingCheck.vue diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml new file mode 100644 index 0000000..92a7e7f --- /dev/null +++ b/.github/workflows/deploy.yaml @@ -0,0 +1,20 @@ +name: deploy-chabokan +on: + push: + branches: [main] +jobs: + deploy: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: '18' + - name: update-chabokan + env: + CHABOKAN_TOKEN: ${{ secrets.CHABOKAN_TOKEN }} + run: | + npm install -g @chabokan.net/cli + chabok login -t $CHABOKAN_TOKEN + chabok deploy -s bm-vue diff --git a/src/assets/layout/_main.scss b/src/assets/layout/_main.scss index 607a5bf..9a0db3b 100644 --- a/src/assets/layout/_main.scss +++ b/src/assets/layout/_main.scss @@ -3,7 +3,6 @@ flex-direction: column; min-height: 100vh; justify-content: space-between; - padding: 6rem 2rem 0 2rem; transition: margin-right var(--layout-section-transition-duration); } diff --git a/src/assets/layout/_menu.scss b/src/assets/layout/_menu.scss index 1c595a7..a2c82bb 100644 --- a/src/assets/layout/_menu.scss +++ b/src/assets/layout/_menu.scss @@ -5,7 +5,7 @@ position: fixed; width: 20rem; height: calc(100vh - 8rem); - z-index: 999; + z-index: 1001; overflow-y: auto; user-select: none; top: 6rem; diff --git a/src/assets/layout/_responsive.scss b/src/assets/layout/_responsive.scss index 6bdcd9a..7bfd670 100644 --- a/src/assets/layout/_responsive.scss +++ b/src/assets/layout/_responsive.scss @@ -12,7 +12,6 @@ &.layout-overlay { .layout-main-container { margin-left: 0; - padding-left: 2rem; } .layout-sidebar { @@ -52,7 +51,6 @@ .layout-main-container { margin-right: 0; - padding-left: 2rem; } } } @@ -71,11 +69,10 @@ .layout-wrapper { .layout-main-container { margin-left: 0; - padding-left: 2rem; } .layout-sidebar { - transform: translateX(-100%); + transform: translateX(350px); left: 0; top: 0; height: 100vh; @@ -99,7 +96,7 @@ &.layout-mobile-active { .layout-sidebar { - transform: translateX(0); + transform: translateX(30px); } .layout-mask { diff --git a/src/components/LoadingCheck.vue b/src/components/LoadingCheck.vue new file mode 100644 index 0000000..3a99797 --- /dev/null +++ b/src/components/LoadingCheck.vue @@ -0,0 +1,93 @@ + + + + diff --git a/src/components/dashboard/RecentSalesWidget.vue b/src/components/dashboard/RecentSalesWidget.vue index 4d80d82..00ef4bc 100644 --- a/src/components/dashboard/RecentSalesWidget.vue +++ b/src/components/dashboard/RecentSalesWidget.vue @@ -2,6 +2,7 @@ import { ProductService } from '@/service/ProductService'; import { onMounted, ref } from 'vue'; import { BelongingService } from '@/service/BelongingService'; +import { useRouter } from 'vue-router'; const products = ref(null); @@ -13,6 +14,7 @@ onMounted(() => { BelongingService.getAllBelongings().then((data) => (products.value = data)); }); +const router = useRouter(); function editBelonging(belongingId) { router.push('/belonging/edit-belonging/' + belongingId); } @@ -34,7 +36,7 @@ function editBelonging(belongingId) { -