From 41fba30e4a3f43abbdb6dd80e94de17c7118f7c5 Mon Sep 17 00:00:00 2001
From: NGPixel <github@ngpixel.com>
Date: Sun, 22 Oct 2023 21:43:45 +0000
Subject: [PATCH] fix: use pnpm for build + add not implemented to buttons

---
 .github/workflows/build.yml          |  17 ++--
 ux/src/components/PageActionsCol.vue |   8 ++
 ux/src/components/PageHeader.vue     |   9 +++
 ux/src/components/WelcomeOverlay.vue |   2 +-
 ux/src/layouts/MainLayout.vue        |  13 +++
 ux/src/pages/AdminDashboard.vue      | 117 +++------------------------
 6 files changed, 52 insertions(+), 114 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a3ddbb0f..fbc78895 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,6 +20,11 @@ jobs:
       with:
         node-version: 20.x
 
+    - name: Enable pnpm
+      run: |
+        corepack enable
+        corepack prepare pnpm@latest --activate
+
     - name: Set Build Variables
       run: |
           echo "REL_VERSION=3.0.0-alpha.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV
@@ -41,14 +46,14 @@ jobs:
     - name: Build Assets
       working-directory: ux
       run: |
-        npm ci --audit=false --fund=false
-        npm run build
+        pnpm install --frozen-lockfile
+        pnpm build
 
     - name: Build Blocks
       working-directory: blocks
       run: |
-        npm ci --audit=false --fund=false
-        npm run build
+        pnpm install --frozen-lockfile
+        pnpm build
 
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v2
@@ -85,7 +90,7 @@ jobs:
         cp LICENSE _dist/LICENSE
         cp config.sample.yml _dist/config.sample.yml
         cd _dist/server
-        npm ci --omit=dev --audit=false --fund=false
+        pnpm install --prod --frozen-lockfile
         cd -
         find ./_dist/ -printf "%P\n" | tar -czf wiki-js.tar.gz --no-recursion -C ./_dist/ -T -
 
@@ -118,7 +123,7 @@ jobs:
         tar -xzf $env:GITHUB_WORKSPACE\build\wiki-js.tar.gz -C $env:GITHUB_WORKSPACE\win --exclude=server/node_modules
 
     - name: Install Dependencies
-      run: npm ci --omit=dev --audit=false --fund=false
+      run: pnpm install --prod --frozen-lockfile
       working-directory: win\server
 
     - name: Create Bundle
diff --git a/ux/src/components/PageActionsCol.vue b/ux/src/components/PageActionsCol.vue
index a99c4510..032434d4 100644
--- a/ux/src/components/PageActionsCol.vue
+++ b/ux/src/components/PageActionsCol.vue
@@ -69,6 +69,7 @@
     icon='las la-history'
     :color='editorStore.isActive ? `white` : `grey`'
     aria-label='Page History'
+    @click='notImplemented'
     )
     q-tooltip(anchor='center left' self='center right') Page History
   q-btn.q-py-md(
@@ -264,6 +265,13 @@ function removePendingAsset (item) {
     menuPendingAssets.value.hide()
   }
 }
+
+function notImplemented () {
+  $q.notify({
+    type: 'negative',
+    message: 'Not implemented'
+  })
+}
 </script>
 
 <style lang="scss">
diff --git a/ux/src/components/PageHeader.vue b/ux/src/components/PageHeader.vue
index aaf866d8..20919d81 100644
--- a/ux/src/components/PageHeader.vue
+++ b/ux/src/components/PageHeader.vue
@@ -81,6 +81,7 @@
         icon='las la-bell'
         color='grey'
         aria-label='Watch Page'
+        @click='notImplemented'
         )
         q-tooltip Watch Page
       q-btn.q-ml-md(
@@ -90,6 +91,7 @@
         icon='las la-bookmark'
         color='grey'
         aria-label='Bookmark Page'
+        @click='notImplemented'
         )
         q-tooltip Bookmark Page
       q-btn.q-ml-md(
@@ -397,4 +399,11 @@ async function editPage () {
 function printPage () {
   window.print()
 }
+
+function notImplemented () {
+  $q.notify({
+    type: 'negative',
+    message: 'Not implemented'
+  })
+}
 </script>
diff --git a/ux/src/components/WelcomeOverlay.vue b/ux/src/components/WelcomeOverlay.vue
index 57903f4e..52b947de 100644
--- a/ux/src/components/WelcomeOverlay.vue
+++ b/ux/src/components/WelcomeOverlay.vue
@@ -114,7 +114,7 @@ function loadAdmin () {
     background: #FFF radial-gradient(ellipse, #FFF, #DDD);
     color: $grey-9;
     height: 100vh;
-    border: 10px solid #EEE;
+    border: 1px solid #EEE;
     border-radius: 25px !important;
 
     &-bg {
diff --git a/ux/src/layouts/MainLayout.vue b/ux/src/layouts/MainLayout.vue
index 14d2b573..bb6f1910 100644
--- a/ux/src/layouts/MainLayout.vue
+++ b/ux/src/layouts/MainLayout.vue
@@ -22,6 +22,7 @@ q-layout(view='hHh Lpr lff')
         icon='las la-sitemap'
         color='white'
         aria-label='Browse'
+        @click='notImplemented'
         )
         q-tooltip(anchor='center right' self='center left') Browse
       q-separator.q-my-sm(inset, dark)
@@ -30,6 +31,7 @@ q-layout(view='hHh Lpr lff')
         icon='las la-bookmark'
         color='white'
         aria-label='Bookmarks'
+        @click='notImplemented'
         )
         q-tooltip(anchor='center right' self='center left') Bookmarks
       q-space
@@ -73,6 +75,7 @@ q-layout(view='hHh Lpr lff')
           label='Browse'
           aria-label='Browse'
           size='sm'
+          @click='notImplemented'
           )
       nav-sidebar
       q-bar.sidebar-footerbtns.text-white(
@@ -99,6 +102,7 @@ q-layout(view='hHh Lpr lff')
           icon='las la-bookmark'
           label='Bookmarks'
           flat
+          @click='notImplemented'
         )
   q-page-container
     router-view
@@ -182,6 +186,15 @@ const isSidebarMini = computed(() => {
   return ['hide', 'hideExact'].includes(pageStore.navigationMode) || !pageStore.navigationId
 })
 
+// METHODS
+
+function notImplemented () {
+  $q.notify({
+    type: 'negative',
+    message: 'Not implemented'
+  })
+}
+
 </script>
 
 <style lang="scss">
diff --git a/ux/src/pages/AdminDashboard.vue b/ux/src/pages/AdminDashboard.vue
index c6704430..5d0b9245 100644
--- a/ux/src/pages/AdminDashboard.vue
+++ b/ux/src/pages/AdminDashboard.vue
@@ -6,7 +6,7 @@ q-page.admin-dashboard
     .col.q-pl-md
       .text-h5.text-primary.animated.fadeInLeft {{ t('admin.dashboard.title') }}
       .text-subtitle1.text-grey.animated.fadeInLeft.wait-p2s {{ t('admin.dashboard.subtitle') }}
-  .row.q-px-md.q-col-gutter-md
+  .row.q-px-md.q-col-gutter-sm
     .col-12.col-sm-6.col-lg-3
       q-card
         q-card-section.admin-dashboard-card
@@ -108,7 +108,7 @@ q-page.admin-dashboard
           img(src='/_assets/icons/fluent-female-working-with-a-laptop.svg')
           div
             strong Logins
-            small {{adminStore.info.loginsPastDay}} #[i / last 24h]
+            small {{adminStore.info.loginsPastDay}} #[i / past 24h]
         q-separator
         q-card-actions(align='right')
           q-btn(
@@ -144,111 +144,6 @@ q-page.admin-dashboard
             :label='t(`admin.system.title`)'
             to='/_admin/system'
             )
-
-//- v-container(fluid, grid-list-lg)
-//-   v-layout(row, wrap)
-//-     v-flex(xs12)
-//-       .admin-header
-//-         img.animated.fadeInUp(src='/_assets/svg/icon-browse-page.svg', alt='Dashboard', style='width: 80px;')
-//-         .admin-header-title
-//-           .headline.primary--text.animated.fadeInLeft {{ $t('admin.dashboard.title') }}
-//-           .subtitle-1.grey--text.animated.fadeInLeft.wait-p2s {{ $t('admin.dashboard.subtitle') }}
-//-     v-flex(xs12 md6 lg4 xl3 d-flex)
-//-       v-card.primary.dashboard-card.animated.fadeInUp(dark)
-//-         v-card-text
-//-           v-icon.dashboard-icon mdi-file-document-outline
-//-           .overline {{$t('admin.dashboard.pages')}}
-//-           animated-number.display-1(
-//-             :value='info.pagesTotal'
-//-             :duration='2000'
-//-             :formatValue='round'
-//-             easing='easeOutQuint'
-//-             )
-//-     v-flex(xs12 md6 lg4 xl3 d-flex)
-//-       v-card.blue.darken-3.dashboard-card.animated.fadeInUp.wait-p2s(dark)
-//-         v-card-text
-//-           v-icon.dashboard-icon mdi-account
-//-           .overline {{$t('admin.dashboard.users')}}
-//-           animated-number.display-1(
-//-             :value='info.usersTotal'
-//-             :duration='2000'
-//-             :formatValue='round'
-//-             easing='easeOutQuint'
-//-             )
-//-     v-flex(xs12 md6 lg4 xl3 d-flex)
-//-       v-card.blue.darken-4.dashboard-card.animated.fadeInUp.wait-p4s(dark)
-//-         v-card-text
-//-           v-icon.dashboard-icon mdi-account-group
-//-           .overline {{$t('admin.dashboard.groups')}}
-//-           animated-number.display-1(
-//-             :value='info.groupsTotal'
-//-             :duration='2000'
-//-             :formatValue='round'
-//-             easing='easeOutQuint'
-//-             )
-//-     v-flex(xs12 md6 lg12 xl3 d-flex)
-//-       v-card.dashboard-card.animated.fadeInUp.wait-p6s(
-//-         :class='isLatestVersion ? "green" : "red lighten-2"'
-//-         dark
-//-         )
-//-         v-btn.btn-animate-wrench(fab, absolute, :right='!$vuetify.rtl', :left='$vuetify.rtl', top, small, light, to='system', v-if='hasPermission(`manage:system`)')
-//-           v-icon(:color='isLatestVersion ? `green` : `red darken-4`', small) mdi-wrench
-//-         v-card-text
-//-           v-icon.dashboard-icon mdi-blur
-//-           .subtitle-1 Wiki.js {{info.currentVersion}}
-//-           .body-2(v-if='isLatestVersion') {{$t('admin.dashboard.versionLatest')}}
-//-           .body-2(v-else) {{$t('admin.dashboard.versionNew', { version: info.latestVersion })}}
-//-     v-flex(xs12, xl6)
-//-       v-card.radius-7.animated.fadeInUp.wait-p2s
-//-         v-toolbar(:color='$q.dark.isActive ? `grey darken-2` : `grey lighten-5`', dense, flat)
-//-           v-spacer
-//-           .overline {{$t('admin.dashboard.recentPages')}}
-//-           v-spacer
-//-         v-data-table.pb-2(
-//-           :items='recentPages'
-//-           :headers='recentPagesHeaders'
-//-           :loading='recentPagesLoading'
-//-           hide-default-footer
-//-           hide-default-header
-//-           )
-//-           template(slot='item', slot-scope='props')
-//-             tr.is-clickable(:active='props.selected', @click='$router.push(`/pages/` + props.item.id)')
-//-               td
-//-                 .body-2: strong {{ props.item.title }}
-//-               td.admin-pages-path
-//-                 v-chip(label, small, :color='$q.dark.isActive ? `grey darken-4` : `grey lighten-4`') {{ props.item.locale }}
-//-                 span.ml-2.grey--text(:class='$q.dark.isActive ? `text--lighten-1` : `text--darken-2`') / {{ props.item.path }}
-//-               td.text-right.caption(width='250') {{ props.item.updatedAt | moment('calendar') }}
-//-     v-flex(xs12, xl6)
-//-       v-card.radius-7.animated.fadeInUp.wait-p4s
-//-         v-toolbar(:color='$q.dark.isActive ? `grey darken-2` : `grey lighten-5`', dense, flat)
-//-           v-spacer
-//-           .overline {{$t('admin.dashboard.lastLogins')}}
-//-           v-spacer
-//-         v-data-table.pb-2(
-//-           :items='lastLogins'
-//-           :headers='lastLoginsHeaders'
-//-           :loading='lastLoginsLoading'
-//-           hide-default-footer
-//-           hide-default-header
-//-           )
-//-           template(slot='item', slot-scope='props')
-//-             tr.is-clickable(:active='props.selected', @click='$router.push(`/users/` + props.item.id)')
-//-               td
-//-                 .body-2: strong {{ props.item.name }}
-//-               td.text-right.caption(width='250') {{ props.item.lastLoginAt | moment('calendar') }}
-
-//-     v-flex(xs12)
-//-       v-card.dashboard-contribute.animated.fadeInUp.wait-p4s
-//-         v-card-text
-//-           img(src='/_assets/svg/icon-heart-health.svg', alt='Contribute', style='height: 80px;')
-//-           .pl-5
-//-             .subtitle-1 {{$t('admin.contribute.title')}}
-//-             .body-2.mt-3: strong {{$t('admin.dashboard.contributeSubtitle')}}
-//-             .body-2 {{$t('admin.dashboard.contributeHelp')}}
-//-             v-btn.mx-0.mt-4(:color='$q.dark.isActive ? `indigo lighten-3` : `indigo`', outlined, small, to='/contribute')
-//-               .caption: strong {{$t('admin.dashboard.contributeLearnMore')}}
-
 </template>
 
 <script setup>
@@ -361,6 +256,14 @@ function checkForUpdates () {
       }
     }
   }
+
+  .q-card__actions {
+    background: linear-gradient(to bottom, rgba(0,0,0,0), rgba(0,0,0,.03));
+
+    @at-root .body--dark & {
+      background: linear-gradient(to bottom, rgba(0,0,0,0), rgba(0,0,0,.2));
+    }
+  }
 }
 
 </style>