Merge branch 'main' into feat/rrule-upstream-pr

Author: IAMSamuelRodda

.github/workflows/build.yml

@@ -0,0 +1,71 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    outputs:
+      version: ${{ steps.ghd.outputs.describe }}
+      image_tag: ${{ steps.meta.outputs.tags }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Git describe
+        id: ghd
+        uses: proudust/gh-describe@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=latest
+            type=sha,prefix=
+            type=raw,value=${{ steps.ghd.outputs.describe }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            RELEASE_VERSION=${{ steps.ghd.outputs.describe }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Output image info
+        run: |
+          echo "Built version: ${{ steps.ghd.outputs.describe }}"
+          echo "Image tags: ${{ steps.meta.outputs.tags }}"
+

.gitignore

@@ -47,3 +47,4 @@ devenv.local.nix
 PLAN.md
 /.crush/
 /.playwright-mcp
+.claude/

Dockerfile

@@ -1,35 +1,35 @@
-# syntax=docker/dockerfile:1@sha256:b6afd42430b15f2d2a4c5a02b919e98a525b785b1aaff16747d2f623364e39b6
-FROM --platform=$BUILDPLATFORM node:24.12.0-alpine@sha256:c921b97d4b74f51744057454b306b418cf693865e73b8100559189605f6955b8 AS frontendbuilder
+# syntax=docker/dockerfile:1
+FROM node:22-alpine AS frontendbuilder
 
 WORKDIR /build
 
 ENV PNPM_CACHE_FOLDER=.cache/pnpm/
 ENV PUPPETEER_SKIP_DOWNLOAD=true
 ENV CYPRESS_INSTALL_BINARY=0
 
-COPY frontend/pnpm-lock.yaml frontend/package.json frontend/.npmrc ./ 
+COPY frontend/pnpm-lock.yaml frontend/package.json frontend/.npmrc ./
 COPY frontend/patches ./patches
 RUN npm install -g corepack && corepack enable && \
     pnpm install --frozen-lockfile
 COPY frontend/ ./
 ARG RELEASE_VERSION=dev
 RUN echo "{\"VERSION\": \"${RELEASE_VERSION/-g/-}\"}" > src/version.json && pnpm run build
 
-FROM --platform=$BUILDPLATFORM ghcr.io/techknowlogick/xgo:go-1.25.x@sha256:3c0082275ecc275b34a03a269ecc768e0f4d0f332e0d1584732a4a53242340fe AS apibuilder
+FROM golang:1.24-alpine AS apibuilder
 
-RUN go install github.com/magefile/mage@latest && \
-    mv /go/bin/mage /usr/local/go/bin
+RUN apk add --no-cache git make
 
-WORKDIR /go/src/code.vikunja.io/api
+RUN go install github.com/magefile/mage@latest
+
+WORKDIR /build
 COPY . ./
 COPY --from=frontendbuilder /build/dist ./frontend/dist
 
-ARG TARGETOS TARGETARCH TARGETVARIANT RELEASE_VERSION
+ARG RELEASE_VERSION=dev
 ENV RELEASE_VERSION=$RELEASE_VERSION
+ENV CGO_ENABLED=0
 
-RUN export PATH=$PATH:$GOPATH/bin && \
-	mage build:clean && \
-    mage release:xgo "${TARGETOS}/${TARGETARCH}/${TARGETVARIANT}"
+RUN mage build
 
 #  ┬─┐┬ ┐┌┐┐┌┐┐┬─┐┬─┐
 #  │┬┘│ │││││││├─ │┬┘
@@ -53,5 +53,5 @@ USER 1000
 ENV VIKUNJA_SERVICE_ROOTPATH=/app/vikunja/
 ENV VIKUNJA_DATABASE_PATH=/db/vikunja.db
 
-COPY --from=apibuilder /build/vikunja-* vikunja
+COPY --from=apibuilder /build/vikunja vikunja
 COPY --from=apibuilder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/

frontend/src/components/home/Navigation.vue

@@ -83,29 +83,71 @@
 				v-if="favoriteProjects.length"
 				class="menu"
 			>
+				<BaseButton
+					v-if="enhancedMode"
+					class="menu-section-header"
+					@click="sectionOpenState.favorites = !sectionOpenState.favorites"
+				>
+					<Icon
+						icon="chevron-down"
+						:class="{ 'section-is-collapsed': !sectionOpenState.favorites }"
+					/>
+					{{ $t('navigation.favorites') }}
+				</BaseButton>
 				<ProjectsNavigation
-					:model-value="favoriteProjects" 
+					v-if="!enhancedMode || sectionOpenState.favorites"
+					:model-value="favoriteProjects"
 					:can-edit-order="false"
 					:can-collapse="false"
+					:hide-star-icons="enhancedMode"
+					:show-task-counts="showTaskCounts"
 				/>
 			</nav>
-			
+
 			<nav
 				v-if="savedFilterProjects.length"
 				class="menu"
 			>
+				<BaseButton
+					v-if="enhancedMode"
+					class="menu-section-header"
+					@click="sectionOpenState.filters = !sectionOpenState.filters"
+				>
+					<Icon
+						icon="chevron-down"
+						:class="{ 'section-is-collapsed': !sectionOpenState.filters }"
+					/>
+					{{ $t('navigation.filters') }}
+				</BaseButton>
 				<ProjectsNavigation
+					v-if="!enhancedMode || sectionOpenState.filters"
 					:model-value="savedFilterProjects"
 					:can-edit-order="false"
 					:can-collapse="false"
+					:hide-star-icons="enhancedMode"
+					:show-task-counts="showTaskCounts"
 				/>
 			</nav>
 
 			<nav class="menu">
+				<BaseButton
+					v-if="enhancedMode"
+					class="menu-section-header"
+					@click="sectionOpenState.projects = !sectionOpenState.projects"
+				>
+					<Icon
+						icon="chevron-down"
+						:class="{ 'section-is-collapsed': !sectionOpenState.projects }"
+					/>
+					{{ $t('navigation.myProjects') }}
+				</BaseButton>
 				<ProjectsNavigation
+					v-if="!enhancedMode || sectionOpenState.projects"
 					:model-value="projects"
 					:can-edit-order="true"
 					:can-collapse="true"
+					:hide-star-icons="enhancedMode"
+					:show-task-counts="showTaskCounts"
 				/>
 			</nav>
 		</template>
@@ -125,27 +167,62 @@
 </template>
 
 <script setup lang="ts">
-import {computed} from 'vue'
+import {computed, watch} from 'vue'
+import {useStorage} from '@vueuse/core'
 
 import PoweredByLink from '@/components/home/PoweredByLink.vue'
 import Logo from '@/components/home/Logo.vue'
 import Loading from '@/components/misc/Loading.vue'
+import BaseButton from '@/components/base/BaseButton.vue'
 
 import {useBaseStore} from '@/stores/base'
 import {useProjectStore} from '@/stores/projects'
+import {useAuthStore} from '@/stores/auth'
 import ProjectsNavigation from '@/components/home/ProjectsNavigation.vue'
 import type {IProject} from '@/modelTypes/IProject'
 import {useSidebarResize} from '@/composables/useSidebarResize'
+import {useProjectTaskCounts} from '@/composables/useProjectTaskCounts'
 
 const baseStore = useBaseStore()
 const projectStore = useProjectStore()
+const authStore = useAuthStore()
 
 const {sidebarWidth, isResizing, startResize, isMobile} = useSidebarResize()
+const {fetchTaskCountsForProjects} = useProjectTaskCounts()
+
+// Section collapse state (persisted)
+type SectionState = { favorites: boolean; filters: boolean; projects: boolean }
+const sectionOpenState = useStorage<SectionState>('navigation-sections-open', {
+	favorites: true,
+	filters: true,
+	projects: true,
+})
+
+// Enhanced sidebar mode setting
+const enhancedMode = computed(() => authStore.settings?.frontendSettings?.sidebarEnhancedMode ?? false)
+const showTaskCounts = computed(() => authStore.settings?.frontendSettings?.sidebarShowTaskCounts ?? false)
 
 // Cast readonly arrays to mutable type - the arrays are not actually mutated by the component
 const projects = computed(() => projectStore.notArchivedRootProjects as IProject[])
 const favoriteProjects = computed(() => projectStore.favoriteProjects as IProject[])
 const savedFilterProjects = computed(() => projectStore.savedFilterProjects as IProject[])
+
+// All non-archived projects (including children) for task count fetching
+const allNonArchivedProjects = computed(() =>
+	(projectStore.projectsArray as IProject[]).filter(p => !p.isArchived),
+)
+
+// Fetch task counts when the setting is enabled and projects are loaded
+watch(
+	[showTaskCounts, () => projectStore.isLoading],
+	([showCounts, isLoading]) => {
+		if (showCounts && !isLoading) {
+			// Fetch counts for ALL non-archived projects (including nested children)
+			fetchTaskCountsForProjects(allNonArchivedProjects.value)
+		}
+	},
+	{immediate: true},
+)
 </script>
 
 <style lang="scss" scoped>
@@ -235,4 +312,36 @@ const savedFilterProjects = computed(() => projectStore.savedFilterProjects as I
 .menu + .menu {
 	padding-block-start: math.div($navbar-padding, 2);
 }
+
+.menu-section-header {
+	display: flex;
+	align-items: center;
+	gap: 0.5rem;
+	inline-size: 100%;
+	font-size: 0.75rem;
+	font-weight: 600;
+	text-transform: uppercase;
+	letter-spacing: 0.05em;
+	color: var(--grey-500);
+	padding-inline-start: 1.5rem;
+	padding-block: 0.5rem 0.25rem;
+	margin: 0;
+	cursor: pointer;
+	background: transparent;
+	border: none;
+	text-align: start;
+
+	&:hover {
+		color: var(--grey-400);
+	}
+
+	.icon {
+		font-size: 0.6rem;
+		transition: transform $transition;
+	}
+
+	.section-is-collapsed {
+		transform: rotate(-90deg);
+	}
+}
 </style>

frontend/src/components/home/ProjectsNavigation.vue

@@ -27,6 +27,8 @@
 				:is-loading="projectUpdating[project.id]"
 				:can-collapse="canCollapse"
 				:can-edit-order="canEditOrder"
+				:hide-star-icons="hideStarIcons"
+				:show-task-counts="showTaskCounts"
 				:data-project-id="project.id"
 			/>
 		</template>
@@ -49,6 +51,8 @@ const props = defineProps<{
 	modelValue?: IProject[],
 	canEditOrder: boolean,
 	canCollapse?: boolean,
+	hideStarIcons?: boolean,
+	showTaskCounts?: boolean,
 }>()
 const emit = defineEmits<{
 	(e: 'update:modelValue', projects: IProject[]): void