vikunja/frontend
Archived
6
39
Fork 48
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

feature/projects-all-the-way-down #3323

Merged
konrad merged 123 commits from feature/projects-all-the-way-down into main 2023-05-30 10:09:40 +00:00
Conversation 16 Commits 123 Files Changed 85 +5 -5
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6e095436e9 - Show all commits

2
Dockerfile
View File

@ -54,7 +54,7 @@ ENV VIKUNJA_LOG_FORMAT main
ENV VIKUNJA_API_URL /api/v1
ENV VIKUNJA_SENTRY_ENABLED false
ENV VIKUNJA_SENTRY_DSN https://85694a2d757547cbbc90cd4b55c5a18d@o1047380.ingest.sentry.io/6024480
ENV VIKUNJA_INFINITE_PROJECT_NESTING_ENABLED false
ENV VIKUNJA_PROJECT_INFINITE_NESTING_ENABLED false
dpschen commented 2023-04-11 15:02:57 +00:00
Outdated
Review
Copy Link

Add types to env.d.ts

Add types to `env.d.ts`
konrad commented 2023-04-12 08:40:33 +00:00
Outdated
Review
Copy Link

Even though this env variable only works in Docker and is translated to a window. variable at runtime? We don't do this for the other variables either...

Even though this env variable only works in Docker and is translated to a window. variable at runtime? We don't do this for the other variables either...
COPY docker/injector.sh /docker-entrypoint.d/50-injector.sh
COPY docker/ipv6-disable.sh /docker-entrypoint.d/60-ipv6-disable.sh

2
docker/injector.sh
View File

@ -11,6 +11,6 @@ VIKUNJA_SENTRY_DSN="$(echo "$VIKUNJA_SENTRY_DSN" | sed -r 's/([:;])/\\\1/g')"
sed -ri "s:^(\s*window.API_URL\s*=)\s*.+:\1 '${VIKUNJA_API_URL}':g" /usr/share/nginx/html/index.html
sed -ri "s:^(\s*window.SENTRY_ENABLED\s*=)\s*.+:\1 ${VIKUNJA_SENTRY_ENABLED}:g" /usr/share/nginx/html/index.html
sed -ri "s:^(\s*window.SENTRY_DSN\s*=)\s*.+:\1 '${VIKUNJA_SENTRY_DSN}':g" /usr/share/nginx/html/index.html
sed -ri "s:^(\s*window.INFINITE_PROJECT_NESTING_ENABLED\s*=)\s*.+:\1 '${VIKUNJA_INFINITE_PROJECT_NESTING_ENABLED}':g" /usr/share/nginx/html/index.html
sed -ri "s:^(\s*window.PROJECT_INFINITE_NESTING_ENABLED\s*=)\s*.+:\1 '${VIKUNJA_PROJECT_INFINITE_NESTING_ENABLED}':g" /usr/share/nginx/html/index.html
date -uIseconds | xargs echo 'info: started at'

2
index.html
View File

@ -29,7 +29,7 @@
window.SENTRY_DSN = 'https://85694a2d757547cbbc90cd4b55c5a18d@o1047380.ingest.sentry.io/6024480'
// If enabled, allows the user to nest projects infinitely, instead of the default 2 levels.
// This setting might change in the future or be removed completely.
window.INFINITE_PROJECT_NESTING_ENABLED = false
window.PROJECT_INFINITE_NESTING_ENABLED = false
</script>
</body>
</html>

2
src/components/home/ProjectsNavigationItem.vue
View File

@ -94,7 +94,7 @@ const canNestDeeper = computed(() => {
return true
dpschen commented 2023-04-12 14:56:16 +00:00
Outdated
Review
Copy Link

Simplify:

const canNestDeeper = computed(() => props.level >= 2 && window.PROJECT_INFINITE_NESTING_ENABLED)
Simplify: ```ts const canNestDeeper = computed(() => props.level >= 2 && window.PROJECT_INFINITE_NESTING_ENABLED) ```
konrad commented 2023-04-14 15:19:47 +00:00
Outdated
Review
Copy Link

But that would return false for the first two levels?

But that would return `false` for the first two levels?
}
return props.level >= 2 && window.INFINITE_PROJECT_NESTING_ENABLED
return props.level >= 2 && window.PROJECT_INFINITE_NESTING_ENABLED
})
</script>

2
src/main.ts
View File

@ -23,7 +23,7 @@ declare global {
API_URL: string;
SENTRY_ENABLED: boolean;
SENTRY_DSN: string;
INFINITE_PROJECT_NESTING_ENABLED: boolean;
PROJECT_INFINITE_NESTING_ENABLED: boolean;
konrad marked this conversation as resolved Outdated
dpschen commented 2023-04-11 16:38:53 +00:00
Outdated
Review
Copy Link

PROJECT_INFINITE_NESTING_ENABLED

`PROJECT_INFINITE_NESTING_ENABLED`
✅ 1
konrad commented 2023-04-12 08:39:15 +00:00
Outdated
Review
Copy Link

Done.

Done.
}
}