Skip to content

fix: align webpack config and sidebar with shared patterns #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rubenvdlinde wants to merge 5 commits into
base: development
Choose a base branch
from
Open

fix: align webpack config and sidebar with shared patterns #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d2c01b
fix: align webpack config and sidebar with shared patterns
rubenvdlinde Apr 15, 2026
66f1e1b
fix: frontend build and rendering — match procest/pipelinq patterns
rubenvdlinde Apr 15, 2026
9a31c7a
feat: convert dashboard to CnDashboardPage with grid layout
rubenvdlinde Apr 15, 2026
71dcc86
fix: settings page — use AdminRoot component, wrap in NcAppNavigation…
rubenvdlinde Apr 16, 2026
8b8adf9
fix: settings uses NcAppSettingsDialog modal, not a route
rubenvdlinde Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6,760 changes: 277 additions & 6,483 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 12 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,26 @@
"extends @nextcloud/browserslist-config"
],
"dependencies": {
"@conduction/nextcloud-vue": "^0.1.0-beta.3",
"@codemirror/commands": "^6.10.3",
"@conduction/nextcloud-vue": "^0.1.0-beta.7",
"@nextcloud/auth": "^2.5.0",
"@nextcloud/axios": "^2.5.0",
"@nextcloud/dialogs": "^3.2.0",
"@nextcloud/initial-state": "^2.2.0",
"@nextcloud/l10n": "^2.0.1",
"@nextcloud/l10n": "^3.4.1",
"@nextcloud/router": "^2.0.1",
"@nextcloud/vue": "^8.16.0",
"apexcharts": "^3.54.1",
"codemirror": "^6.0.2",
"pinia": "^2.1.7",
"vue": "^2.7.14",
"vue-apexcharts": "^1.7.0",
"vue-material-design-icons": "^5.3.0",
"vue-router": "^3.6.5"
},
"overrides": {
"libxmljs2": "^0.37.0",
"apexcharts": "4.7.0"
"apexcharts": "^3.45.0"
},
"devDependencies": {
"@cyclonedx/cyclonedx-npm": "^4.2.1",
Expand All @@ -48,12 +52,15 @@
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"css-loader": "~7.1.1",
"eslint-plugin-vue": "^9.21.1",
"vue-eslint-parser": "^9.4.3",
"eslint": "^8.56.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-vue": "^9.21.1",
"node-polyfill-webpack-plugin": "^4.0.0",
"sass": "^1.99.0",
"sass-loader": "^16.0.7",
"style-loader": "~4.0.0",
"stylelint": "^15.11.0",
"vue-eslint-parser": "^9.4.3",
"vue-loader": "^15.11.1 <16.0.0",
"vue-template-compiler": "^2.7.16",
"webpack": "^5.94.0",
Expand Down
36 changes: 35 additions & 1 deletion src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,21 @@
</NcAppContent>
</template>
<template v-else-if="storesReady && hasOpenRegisters">
<MainMenu />
<MainMenu @open-settings="settingsOpen = true" />
<NcAppContent>
<router-view />
</NcAppContent>
<UserSettings :open="settingsOpen" @update:open="settingsOpen = $event" />
<CnObjectSidebar
v-if="objectSidebarState.active"
:object-type="objectSidebarState.objectType"
:object-id="objectSidebarState.objectId"
:title="objectSidebarState.title"
:subtitle="objectSidebarState.subtitle"
:register="objectSidebarState.register"
:schema="objectSidebarState.schema"
:hidden-tabs="objectSidebarState.hiddenTabs"
:open.sync="objectSidebarState.open" />
</template>
<NcAppContent v-else>
<div style="display: flex; justify-content: center; align-items: center; height: 100%;">
Expand All @@ -38,11 +49,14 @@
</template>

<script>
import Vue from 'vue'
import { NcButton, NcContent, NcAppContent, NcEmptyContent, NcLoadingIcon } from '@nextcloud/vue'
import { CnObjectSidebar } from '@conduction/nextcloud-vue'
import { generateUrl, imagePath } from '@nextcloud/router'
import { initializeStores } from './store/store.js'
import { useSettingsStore } from './store/modules/settings.js'
import MainMenu from './navigation/MainMenu.vue'
import UserSettings from './views/settings/UserSettings.vue'

export default {
name: 'App',
Expand All @@ -52,12 +66,32 @@ export default {
NcAppContent,
NcEmptyContent,
NcLoadingIcon,
CnObjectSidebar,
MainMenu,
UserSettings,
},

provide() {
return {
objectSidebarState: this.objectSidebarState,
}
},

data() {
return {
storesReady: false,
settingsOpen: false,
objectSidebarState: Vue.observable({
active: false,
open: true,
objectType: '',
objectId: '',
title: '',
subtitle: '',
register: '',
schema: '',
hiddenTabs: [],
}),
}
},

Expand Down
18 changes: 7 additions & 11 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import Vue from 'vue'
import { PiniaVuePlugin } from 'pinia'
import { translate as t, translatePlural as n, loadTranslations } from '@nextcloud/l10n'
import { translate as t, translatePlural as n } from '@nextcloud/l10n'
import pinia from './pinia.js'
import router from './router/index.js'
import App from './App.vue'
Expand All @@ -20,14 +20,10 @@ import './assets/app.css'
Vue.mixin({ methods: { t, n } })
Vue.use(PiniaVuePlugin)

loadTranslations('decidesk', () => {
// Create Vue instance to activate Pinia context, then initialize stores.
const app = new Vue({
pinia,
router,
render: h => h(App),
})

// Mount immediately so the App renders (NC32 needs #content to be taken over).
app.$mount('#content')
const app = new Vue({
pinia,
router,
render: h => h(App),
})

app.$mount('#content')
19 changes: 11 additions & 8 deletions src/navigation/MainMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,21 @@ Copyright (C) 2026 Conduction B.V.
</NcAppNavigationItem>
</template>
<template #footer>
<NcAppNavigationItem
:name="t('decidesk', 'Settings')"
:to="{ name: 'Settings' }">
<template #icon>
<CogIcon :size="20" />
</template>
</NcAppNavigationItem>
<NcAppNavigationSettings>
<NcAppNavigationItem
:name="t('decidesk', 'Settings')"
@click="$emit('open-settings')">
<template #icon>
<CogIcon :size="20" />
</template>
</NcAppNavigationItem>
</NcAppNavigationSettings>
</template>
</NcAppNavigation>
</template>

<script>
import { NcAppNavigation, NcAppNavigationItem } from '@nextcloud/vue'
import { NcAppNavigation, NcAppNavigationItem, NcAppNavigationSettings } from '@nextcloud/vue'
import BookOpenVariantOutline from 'vue-material-design-icons/BookOpenVariantOutline.vue'
import CheckboxMarkedOutline from 'vue-material-design-icons/CheckboxMarkedOutline.vue'
import CheckDecagramIcon from 'vue-material-design-icons/CheckDecagram.vue'
Expand All @@ -88,6 +90,7 @@ export default {
components: {
NcAppNavigation,
NcAppNavigationItem,
NcAppNavigationSettings,
BookOpenVariantOutline,
CheckboxMarkedOutline,
CheckDecagramIcon,
Expand Down
41 changes: 21 additions & 20 deletions src/router/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,26 @@ import { generateUrl } from '@nextcloud/router'

Vue.use(Router)

const Dashboard = () => import('../views/Dashboard.vue')
const GovernanceBodies = () => import('../views/GovernanceBodies.vue')
const GovernanceBodyDetail = () => import('../views/GovernanceBodyDetail.vue')
const Meetings = () => import('../views/Meetings.vue')
const MeetingDetail = () => import('../views/MeetingDetail.vue')
const Participants = () => import('../views/Participants.vue')
const ParticipantDetail = () => import('../views/ParticipantDetail.vue')
const AgendaItems = () => import('../views/AgendaItems.vue')
const AgendaItemDetail = () => import('../views/AgendaItemDetail.vue')
const Motions = () => import('../views/Motions.vue')
const MotionDetail = () => import('../views/MotionDetail.vue')
const AmendmentDetail = () => import('../views/AmendmentDetail.vue')
const SettingsView = () => import('../views/SettingsView.vue')
const Minutes = () => import('../views/Minutes.vue')
const MinutesDetail = () => import('../views/MinutesDetail.vue')
const Decisions = () => import('../views/Decisions.vue')
const DecisionDetail = () => import('../views/DecisionDetail.vue')
const ActionItems = () => import('../views/ActionItems.vue')
const ActionItemDetail = () => import('../views/ActionItemDetail.vue')
import Dashboard from '../views/Dashboard.vue'
import GovernanceBodies from '../views/GovernanceBodies.vue'
import GovernanceBodyDetail from '../views/GovernanceBodyDetail.vue'
import Meetings from '../views/Meetings.vue'
import MeetingDetail from '../views/MeetingDetail.vue'
import Participants from '../views/Participants.vue'
import ParticipantDetail from '../views/ParticipantDetail.vue'
import AgendaItems from '../views/AgendaItems.vue'
import AgendaItemDetail from '../views/AgendaItemDetail.vue'
import Motions from '../views/Motions.vue'
import MotionDetail from '../views/MotionDetail.vue'
import AmendmentDetail from '../views/AmendmentDetail.vue'
// Admin settings live at /settings/admin/decidesk (NC admin panel via AdminSettings.php)
// In-app settings use NcAppSettingsDialog modal — no route needed
import Minutes from '../views/Minutes.vue'
import MinutesDetail from '../views/MinutesDetail.vue'
import Decisions from '../views/Decisions.vue'
import DecisionDetail from '../views/DecisionDetail.vue'
import ActionItems from '../views/ActionItems.vue'
import ActionItemDetail from '../views/ActionItemDetail.vue'

export default new Router({
mode: 'history',
Expand All @@ -46,7 +47,7 @@ export default new Router({
{ path: '/motions', name: 'Motions', component: Motions },
{ path: '/motions/:id', name: 'MotionDetail', component: MotionDetail, props: true },
{ path: '/amendments/:id', name: 'AmendmentDetail', component: AmendmentDetail, props: true },
{ path: '/settings', name: 'Settings', component: SettingsView },
// No /settings route — settings opens as NcAppSettingsDialog modal from gear menu
// Minutes routes — @spec openspec/changes/p2-minutes-and-decisions/tasks.md#task-4
{ path: '/minutes', name: 'Minutes', component: Minutes },
{ path: '/minutes/:id', name: 'MinutesDetail', component: MinutesDetail, props: true },
Expand Down
Loading