diff --git a/Dockerfile b/Dockerfile index 27591352..bfd46086 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,6 +57,7 @@ ENV VIKUNJA_SENTRY_ENABLED false ENV VIKUNJA_SENTRY_DSN https://85694a2d757547cbbc90cd4b55c5a18d@o1047380.ingest.sentry.io/6024480 ENV VIKUNJA_PROJECT_INFINITE_NESTING_ENABLED false ENV VIKUNJA_ALLOW_ICON_CHANGES true +ENV VIKUNJA_CUSTOM_LOGO_URL "" COPY docker/injector.sh /docker-entrypoint.d/50-injector.sh COPY docker/ipv6-disable.sh /docker-entrypoint.d/60-ipv6-disable.sh diff --git a/docker/injector.sh b/docker/injector.sh index 9aa1efad..244e211d 100755 --- a/docker/injector.sh +++ b/docker/injector.sh @@ -13,5 +13,6 @@ sed -ri "s:^(\s*window.SENTRY_ENABLED\s*=)\s*.+:\1 ${VIKUNJA_SENTRY_ENABLED}:g" 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.PROJECT_INFINITE_NESTING_ENABLED\s*=)\s*.+:\1 '${VIKUNJA_PROJECT_INFINITE_NESTING_ENABLED}':g" /usr/share/nginx/html/index.html sed -ri "s:^(\s*window.ALLOW_ICON_CHANGES\s*=)\s*.+:\1 ${VIKUNJA_ALLOW_ICON_CHANGES}:g" /usr/share/nginx/html/index.html +sed -ri "s:^(\s*window.CUSTOM_LOGO_URL\s*=)\s*.+:\1 ${VIKUNJA_CUSTOM_LOGO_URL}:g" /usr/share/nginx/html/index.html date -uIseconds | xargs echo 'info: started at' diff --git a/index.html b/index.html index c89f02cf..700a8bc3 100644 --- a/index.html +++ b/index.html @@ -32,6 +32,8 @@ window.PROJECT_INFINITE_NESTING_ENABLED = false // Allow changing the logo and other icons based on various occasions throughout the year. window.ALLOW_ICON_CHANGES = true + // Allow using a custom logo via external URL. + window.CUSTOM_LOGO_URL = '' diff --git a/src/components/home/Logo.vue b/src/components/home/Logo.vue index 2eca1069..10a1753a 100644 --- a/src/components/home/Logo.vue +++ b/src/components/home/Logo.vue @@ -9,15 +9,21 @@ import {MILLISECONDS_A_HOUR} from '@/constants/date' const now = useNow({ interval: MILLISECONDS_A_HOUR, }) -const Logo = computed(() => window.ALLOW_ICON_CHANGES && now.value.getMonth() === 5 ? LogoFullPride : LogoFull) +const Logo = computed(() => window.ALLOW_ICON_CHANGES && now.value.getMonth() === 6 ? LogoFullPride : LogoFull) +const CustomLogo = computed(() => window.CUSTOM_LOGO_URL) \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index 7be38554..5999d8d8 100644 --- a/src/main.ts +++ b/src/main.ts @@ -23,6 +23,7 @@ declare global { SENTRY_DSN: string; PROJECT_INFINITE_NESTING_ENABLED: boolean; ALLOW_ICON_CHANGES: boolean; + CUSTOM_LOGO_URL?: string; } }