Compare commits

..

9 Commits

Author SHA1 Message Date
Simon Vieille 37b9beb8f7 update app version 2024-10-30 19:07:47 +01:00
Simon Vieille 0402e00eac update changelog 2024-10-30 19:07:31 +01:00
Simon Vieille 8c9dc83a59 Merge pull request 'fix #369: The menu is displayed even if there are no apps' (#370) from bugfix/issue369 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/370
2024-10-30 19:00:43 +01:00
Simon Vieille 66716ec53b Merge pull request 'fix top menu labels (fix #368)' (#371) from bugfix/issue368-top-menu-labels into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/371
2024-10-30 19:00:28 +01:00
Simon Vieille 879f9f092b fix op menu labels (fix #368) 2024-10-30 18:33:16 +01:00
Simon Vieille 66a2843a14 remove logs 2024-10-30 18:19:13 +01:00
Simon Vieille c517adcb81 remove logs 2024-10-30 18:19:01 +01:00
Simon Vieille 84efcbd36c fix the menu is displayed even if there are no apps (fix #369) 2024-10-30 18:18:01 +01:00
Simon Vieille 6be15c269b remove useless command in ci 2024-10-27 18:56:34 +01:00
5 changed files with 15 additions and 17 deletions
-8
View File
@@ -7,17 +7,9 @@ when:
branch: [master, develop, feature/*, fix/*, bugfix/*, translations] branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
steps: steps:
# "Install dependencies":
# image: node:20
# pull: true
# commands:
# - npm i
"Build JS": "Build JS":
image: node:20 image: node:20
commands: commands:
- make dep
- ls -l node_modules/@nextcloud/vue/dist/Components
- make build - make build
"Build translations": "Build translations":
+5
View File
@@ -1,5 +1,10 @@
## [Unreleased] ## [Unreleased]
## 4.0.1
### Fixed
* fix top menu labels (fix #368)
* fix #369: The menu is displayed even if there are no apps
## 4.0.0 ## 4.0.0
### Added ### Added
* add compatibility with NC30 * add compatibility with NC30
+1 -1
View File
@@ -32,7 +32,7 @@ Notice
Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**. Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/). In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
]]></description> ]]></description>
<version>4.0.0</version> <version>4.0.1</version>
<licence>agpl</licence> <licence>agpl</licence>
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author> <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
<namespace>SideMenu</namespace> <namespace>SideMenu</namespace>
+4 -2
View File
@@ -110,14 +110,16 @@ export default defineComponent({
mounted() { mounted() {
axios.get(generateOcsUrl('core/navigation', 2) + '/apps?format=json') axios.get(generateOcsUrl('core/navigation', 2) + '/apps?format=json')
.then((response) => response.data) .then((response) => response.data)
.then((data) => { .then((data) => {
if (data.ocs.meta.statuscode !== 200) { if (data.ocs.meta.statuscode !== 200) {
return return
} }
this.setApps(data.ocs.data) this.setApps(data.ocs.data)
}) })
this.targetBlankApps = window.targetBlankApps
this.hiddenLabels = window.topMenuAppsMouseOverHiddenLabel
let timeout = null let timeout = null
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
+5 -6
View File
@@ -39,7 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<ul class="side-menu-apps-list" :class="{'side-menu-apps-list--with-settings': !!settings}"> <ul class="side-menu-apps-list" :class="{'side-menu-apps-list--with-settings': !!settings}">
<SideMenuApp <SideMenuApp
v-for="(app, key) in apps" v-for="(app, key) in apps"
v-if="!hiddenApps.includes(app.id) && searchMatch(app.name)" v-if="searchMatch(app.name)"
v-bind:classes="{'side-menu-app': true, 'active': app.active}" v-bind:classes="{'side-menu-app': true, 'active': app.active}"
v-bind:key="key" v-bind:key="key"
v-bind:icon="app.icon" v-bind:icon="app.icon"
@@ -94,17 +94,16 @@ export default {
orders[app] = order + 1 orders[app] = order + 1
}) })
for (let id in ncApps) { for (let app of ncApps) {
if (window.topMenuApps.includes(id) && !window.topSideMenuApps.includes(id)) { if (window.topMenuApps.includes(app.id) && !window.topSideMenuApps.includes(app.id)) {
continue continue
} }
if (this.hiddenApps.includes(id)) { if (this.hiddenApps.includes(app.id)) {
continue continue
} }
let app = ncApps[id] app.order = orders[app.id] || null
app.order = orders[id] || null
finalApps.push(app) finalApps.push(app)
} }