From 952106f4370cc3cff34adca5946d564ee060f157 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 11 Apr 2025 21:04:38 +0200
Subject: [PATCH] add admin responsive view

---
 src/components/AppMenu.vue                    | 422 ------------------
 src/components/settings/MenuDisplay.vue       |  31 --
 .../settings/form/FormDisplayPicker.vue       |  26 +-
 src/pages/AdminSettings.vue                   |  16 +-
 src/scss/admin.scss                           |  13 +
 5 files changed, 36 insertions(+), 472 deletions(-)
 delete mode 100644 src/components/AppMenu.vue
 delete mode 100644 src/components/settings/MenuDisplay.vue

diff --git a/src/components/AppMenu.vue b/src/components/AppMenu.vue
deleted file mode 100644
index 33646b1..0000000
--- a/src/components/AppMenu.vue
+++ /dev/null
@@ -1,422 +0,0 @@
-<!--
-  - @copyright Copyright (c) 2022 Julius Härtl <jus@bitgrid.net>
-  -
-  - @author Julius Härtl <jus@bitgrid.net>
-  -
-  - @license GNU AGPL version 3 or any later version
-  -
-  - This program is free software: you can redistribute it and/or modify
-  - it under the terms of the GNU Affero General Public License as
-  - published by the Free Software Foundation, either version 3 of the
-  - License, or (at your option) any later version.
-  -
-  - This program is distributed in the hope that it will be useful,
-  - but WITHOUT ANY WARRANTY; without even the implied warranty of
-  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  - GNU Affero General Public License for more details.
-  -
-  - You should have received a copy of the GNU Affero General Public License
-  - along with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<template>
-  <nav
-    class="app-menu show"
-    :aria-label="t('core', 'Applications menu')"
-  >
-    <ul
-      v-if="appList.length"
-      class="app-menu-main"
-      :class="{ 'app-menu-main__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
-    >
-      <li
-        v-for="app in mainAppList(state)"
-        :key="app.id"
-        :data-app-id="app.id"
-        class="app-menu-entry"
-        :class="{ 'app-menu-entry__active': app.active, 'app-menu-entry__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
-        :style="makeStyle(app)"
-      >
-        <a
-          :href="app.href"
-          :class="{ 'has-unread': app.unread > 0 }"
-          :aria-label="appLabel(app)"
-          :target="targetBlankApps.indexOf(app.id) !== -1 ? '_blank' : undefined"
-          :aria-current="app.active ? 'page' : false"
-        >
-          <img
-            :src="app.icon"
-            alt=""
-          />
-          <div class="app-menu-entry--label">
-            {{ app.name }}
-            <span
-              v-if="app.unread > 0"
-              class="hidden-visually unread-counter"
-              >{{ app.unread }}</span
-            >
-          </div>
-        </a>
-      </li>
-    </ul>
-    <NcActions
-      class="app-menu-more"
-      :aria-label="t('core', 'More apps')"
-    >
-      <NcActionLink
-        v-for="app in popoverAppList(state)"
-        :key="app.id"
-        :aria-label="appLabel(app)"
-        :aria-current="app.active ? 'page' : false"
-        :href="app.href"
-        :style="makeStyle(app)"
-        class="app-menu-popover-entry"
-      >
-        <template #icon>
-          <div
-            class="app-icon"
-            :class="{ 'has-unread': app.unread > 0 }"
-          >
-            <img
-              :src="app.icon"
-              alt=""
-            />
-          </div>
-        </template>
-        {{ app.name }}
-        <span
-          v-if="app.unread > 0"
-          class="hidden-visually unread-counter"
-          >{{ app.unread }}</span
-        >
-      </NcActionLink>
-    </NcActions>
-  </nav>
-</template>
-
-<script>
-import { subscribe, unsubscribe } from '@nextcloud/event-bus'
-import { loadState } from '@nextcloud/initial-state'
-import { n, t } from '@nextcloud/l10n'
-import { useElementSize } from '@vueuse/core'
-import { defineComponent, ref } from 'vue'
-import axios from '@nextcloud/axios'
-import { generateOcsUrl } from '@nextcloud/router'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
-
-export default defineComponent({
-  name: 'AppMenu',
-
-  components: {
-    NcActions,
-    NcActionLink,
-  },
-
-  setup() {
-    return {
-      t,
-      n,
-    }
-  },
-
-  data() {
-    return {
-      apps: null,
-      appList: [],
-      observer: null,
-      targetBlankApps: [],
-      hiddenLabels: true,
-      state: 1,
-    }
-  },
-
-  mounted() {
-    axios
-      .get(generateOcsUrl('core/navigation', 2) + '/apps?format=json')
-      .then((response) => response.data)
-      .then((data) => {
-        if (data.ocs.meta.statuscode !== 200) {
-          return
-        }
-
-        this.setApps(data.ocs.data)
-      })
-
-    this.targetBlankApps = window.targetBlankApps
-    this.hiddenLabels = window.topMenuAppsMouseOverHiddenLabel
-    let timeout = null
-
-    window.addEventListener('resize', () => {
-      timeout = window.setTimeout(() => {
-        this.update()
-      }, 300)
-    })
-  },
-
-  methods: {
-    update() {
-      ++this.state
-    },
-
-    mainAppList() {
-      return this.appList.slice(0, this.appLimit())
-    },
-
-    popoverAppList() {
-      return this.appList.slice(this.appLimit())
-    },
-
-    appLimit() {
-      const maxApps = Math.floor(this.$root.$el.offsetWidth / 60)
-
-      if (maxApps < this.appList.length) {
-        // Ensure there is space for the overflow menu
-        return Math.max(maxApps - 1, 0)
-      }
-
-      return maxApps
-    },
-
-    setNavigationCounter(id, counter) {
-      const app = this.appList.find(({ app }) => app === id)
-      if (app) {
-        this.$set(app, 'unread', counter)
-      } else {
-        logger.warn(`Could not find app "${id}" for setting navigation count`)
-      }
-    },
-
-    setApps(apps) {
-      this.appList = []
-      let orders = {}
-
-      window.menuAppsOrder.forEach((app, order) => {
-        orders[app] = order + 1
-      })
-
-      apps.forEach((app) => {
-        Array.from(window.topMenuApps).forEach((id) => {
-          if (app.id === id) {
-            app.order = orders[id] || null
-            this.appList.push(app)
-          }
-        })
-      })
-    },
-
-    appLabel(app) {
-      return (
-        app.name +
-        (app.active ? ' (' + t('core', 'Currently open') + ')' : '') +
-        (app.unread > 0 ? ' (' + n('core', '{count} notification', '{count} notifications', app.unread, { count: app.unread }) + ')' : '')
-      )
-    },
-
-    makeStyle(app) {
-      if (app.order !== null) {
-        return `order: ${app.order}`
-      }
-    },
-  },
-})
-</script>
-
-<style lang="scss" scoped>
-$header-icon-size: 20px;
-
-.app-menu {
-  width: 100%;
-  display: flex;
-  flex-shrink: 1;
-  flex-wrap: wrap;
-}
-
-.app-menu-main {
-  display: flex;
-  flex-wrap: nowrap;
-
-  .app-menu-entry {
-    width: 50px;
-    height: 50px;
-    position: relative;
-    display: flex;
-
-    &.app-menu-entry__active {
-      opacity: 1;
-
-      &::before {
-        content: ' ';
-        position: absolute;
-        pointer-events: none;
-        border-bottom-color: var(--color-main-background);
-        transform: translateX(-50%);
-        width: 12px;
-        height: 5px;
-        border-radius: 3px;
-        background-color: var(--color-primary-text);
-        left: 50%;
-        bottom: 6px;
-        display: block;
-        transition: all 0.1s ease-in-out;
-        opacity: 1;
-      }
-
-      .app-menu-entry--label {
-        font-weight: bold;
-      }
-    }
-
-    a {
-      width: calc(100% - 4px);
-      height: calc(100% - 4px);
-      margin: 2px;
-      color: var(--color-primary-text);
-      position: relative;
-    }
-
-    img {
-      transition: margin 0.1s ease-in-out;
-      width: $header-icon-size;
-      height: $header-icon-size;
-      padding: calc((100% - $header-icon-size) / 2);
-      box-sizing: content-box;
-      filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright));
-    }
-
-    .app-menu-entry--label {
-      opacity: 0;
-      position: absolute;
-      font-size: 12px;
-      color: var(--color-primary-text);
-      text-align: center;
-      left: 50%;
-      top: 45%;
-      display: block;
-      min-width: 100%;
-      transform: translateX(-50%);
-      transition: all 0.1s ease-in-out;
-      width: 100%;
-      text-overflow: ellipsis;
-      overflow: hidden;
-      letter-spacing: -0.5px;
-    }
-
-    &:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):hover,
-    &:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):focus-within {
-      opacity: 1;
-      .app-menu-entry--label {
-        opacity: 1;
-        font-weight: bolder;
-        bottom: 0;
-        width: 100%;
-        text-overflow: ellipsis;
-        overflow: hidden;
-      }
-    }
-  }
-
-  // Show labels
-  &:hover,
-  &:focus-within,
-  .app-menu-entry:hover,
-  .app-menu-entry:focus {
-    opacity: 1;
-  }
-
-  &:not(.app-menu-main__hidden-label):not(.app-menu-main__show-hovered):hover,
-  &:not(.app-menu-main__hidden-label):not(.app-menu-main__show-hovered):focus-within,
-  .app-menu-entry:not(.app-menu-entry__hidden-label):hover,
-  .app-menu-entry:not(.app-menu-entry__hidden-label):focus {
-    opacity: 1;
-
-    img {
-      margin-top: -8px;
-    }
-
-    .app-menu-entry--label {
-      opacity: 1;
-      bottom: 0;
-    }
-
-    &::before,
-    .app-menu-entry::before {
-      opacity: 0;
-    }
-  }
-
-  &.app-menu-main__show-hovered .app-menu-entry:hover,
-  &.app-menu-main__show-hovered .app-menu-entry:focus {
-    img {
-      margin-top: -8px;
-    }
-
-    .app-menu-entry--label {
-      opacity: 1;
-      bottom: 0;
-    }
-
-    &::before,
-    .app-menu-entry::before {
-      opacity: 0;
-    }
-  }
-}
-
-::v-deep .app-menu-more .button-vue--vue-tertiary {
-  opacity: 0.7;
-  margin: 3px;
-  filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright));
-
-  &:not([aria-expanded='true']) {
-    color: var(--color-main-text);
-
-    &:hover {
-      opacity: 1;
-      background-color: transparent !important;
-    }
-  }
-
-  &:focus-visible {
-    opacity: 1;
-    outline: none !important;
-  }
-}
-
-.app-menu-popover-entry {
-  .app-icon {
-    position: relative;
-    height: 44px;
-    width: 48px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    filter: var(--background-invert-if-bright, var(--primary-invert-if-bright));
-
-    &.has-unread::after {
-      background-color: var(--color-main-text);
-    }
-
-    img {
-      width: $header-icon-size;
-      height: $header-icon-size;
-    }
-  }
-}
-
-.has-unread::after {
-  content: '';
-  width: 8px;
-  height: 8px;
-  background-color: var(--color-primary-element-text);
-  border-radius: 50%;
-  position: absolute;
-  display: block;
-  top: 10px;
-  right: 10px;
-}
-
-.unread-counter {
-  display: none;
-}
-</style>
diff --git a/src/components/settings/MenuDisplay.vue b/src/components/settings/MenuDisplay.vue
deleted file mode 100644
index fd65a0f..0000000
--- a/src/components/settings/MenuDisplay.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template></template>
-
-<script setup>
-// import AlwaysDisplayImg from '../../img/admin/layout-always-displayed.svg'
-// import WideMenuImg from '../../img/admin/layout-big-menu.svg'
-// import DefaultImg from '../../img/admin/layout-default.svg'
-// import WithCategoriesImg from '../../img/admin/layout-width-categories.svg'
-
-const choices = [
-  // {id: 1, url: AlwaysDisplayImg},
-  // {id: 2, url: WideMenuImg},
-  // {id: 3, url: DefaultImg},
-  // {id: 4, url: WithCategoriesImg},
-]
-
-const carouselConfig = {
-  itemsToShow: 1.3,
-  wrapAround: true,
-}
-
-const { mode, alwaysDisplayed } = defineProps({
-  mode: {
-    type: String,
-    required: true,
-  },
-  alwaysDisplayed: {
-    type: Boolean,
-    required: true,
-  },
-})
-</script>
diff --git a/src/components/settings/form/FormDisplayPicker.vue b/src/components/settings/form/FormDisplayPicker.vue
index 2783007..07d38d0 100644
--- a/src/components/settings/form/FormDisplayPicker.vue
+++ b/src/components/settings/form/FormDisplayPicker.vue
@@ -1,14 +1,14 @@
 <template>
-  <NcButton @click="update(false, false, false)" :variant="is(false, false, false) ? 'primary' : 'seconday'">
+  <NcButton :variant="is(false, false, false) ? 'primary' : 'seconday'" @click="update(false, false, false)">
     {{ t('side_menu', 'Default') }}
   </NcButton>
-  <NcButton @click="update(true, false, false)" :variant="is(true, false, false) ? 'primary' : 'seconday'">
+  <NcButton :variant="is(true, false, false) ? 'primary' : 'seconday'" @click="update(true, false, false)">
     {{ t('side_menu', 'Always displayed') }}
   </NcButton>
-  <NcButton @click="update(false, true, false)" :variant="is(false, true, false) ? 'primary' : 'seconday'">
+  <NcButton :variant="is(false, true, false) ? 'primary' : 'seconday'" @click="update(false, true, false)">
     {{ t('side_menu', 'Big menu') }}
   </NcButton>
-  <NcButton @click="update(false, false, true)" :variant="is(false, false, true) ? 'primary' : 'seconday'">
+  <NcButton :variant="is(false, false, true) ? 'primary' : 'seconday'" @click="update(false, false, true)">
     {{ t('side_menu', 'With categories') }}
   </NcButton>
 
@@ -19,13 +19,6 @@
     <img v-if="is(false, false, true)" class="side-menu-display" :src="SideMenuWithCategoriesImg" />
   </p>
 </template>
-<style scoped>
-button {
-  display: inline-block !important;
-  margin: 2px;
-}
-</style>
-
 <script setup>
 import { NcButton } from '@nextcloud/vue'
 
@@ -68,3 +61,14 @@ const is = (isAlwayDisplayed, isTopWideMenu, isSideMenuWithCategories) => {
 }
 
 </script>
+
+<style scoped>
+button {
+  display: inline-block !important;
+  margin: 2px;
+}
+
+img {
+  max-width: 100%;
+}
+</style>
diff --git a/src/pages/AdminSettings.vue b/src/pages/AdminSettings.vue
index 4c3d2f9..e186fd5 100644
--- a/src/pages/AdminSettings.vue
+++ b/src/pages/AdminSettings.vue
@@ -35,13 +35,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
           <TableLabel label="Display" />
           <TableValue>
             <FormDisplayPicker
-              :alwaysDisplayed="config['always-displayed']"
-              :topWideMenu="config['big-menu']"
-              :sideMenuWithCategories="config['side-with-categories']"
+              :always-displayed="config['always-displayed']"
+              :top-wide-menu="config['big-menu']"
+              :side-menu-with-categories="config['side-with-categories']"
 
-              @update:alwaysDisplayed="(value) => config['always-displayed'] = value"
-              @update:topWideMenu="(value) => config['big-menu'] = value"
-              @update:sideMenuWithCategories="(value) => config['side-with-categories'] = value"
+              @update:always-displayed="(value) => config['always-displayed'] = value"
+              @update:top-wide-menu="(value) => config['big-menu'] = value"
+              @update:side-menu-with-categories="(value) => config['side-with-categories'] = value"
             />
           </TableValue>
         </TableRow>
@@ -468,7 +468,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
                 <textarea
                   class="config"
                   readonly
-                  >{{ filterConfig(config) }}</textarea
+                  v-text="filterConfig(config)"
+                  ></textarea
                 >
 
                 <div class="modal__footer">
@@ -500,7 +501,6 @@ import { NcContent, NcAppContent, NcButton, NcModal } from '@nextcloud/vue'
 import { ref, onMounted } from 'vue'
 import { useConfigStore } from '../store/config.js'
 
-import MenuDisplay from '../components/settings/MenuDisplay'
 import TableContainer from '../components/settings/TableContainer'
 import TableRow from '../components/settings/TableRow'
 import TableLabel from '../components/settings/TableLabel'
diff --git a/src/scss/admin.scss b/src/scss/admin.scss
index 1537c98..99ae589 100644
--- a/src/scss/admin.scss
+++ b/src/scss/admin.scss
@@ -135,6 +135,7 @@
 .side-menu-setting-label {
   display: table-cell;
   width: 430px;
+  max-width: 30vw;
   padding-right: 20px;
 }
 
@@ -149,6 +150,7 @@
 .side-menu-setting-form {
   display: table-cell;
   min-width: 300px;
+  max-width: 30vw;
 }
 
 .side-menu-setting-label-short {
@@ -159,6 +161,17 @@
   width: 400px;
 }
 
+@media screen and (max-width: 1024px) {
+  .side-menu-setting-table, .side-menu-setting-row, .side-menu-setting-label, .side-menu-setting-form {
+    display: block;
+    max-width: 100%;
+  }
+
+  .side-menu-setting-label {
+    margin-bottom: 10px;
+  }
+}
+
 #side-menu-save-progress {
   display: inline-block;
   width: 0;