diff --git a/.gitignore b/.gitignore index 4f83c39b4..817ec200c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ /keys /locale/*.schema.json +/locale/fonts.ts /cache /calendar diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01a617e3c..56b2e25a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ check: needs: [] rules: - if: $CI_COMMIT_BRANCH - image: node:20.12.2 + image: node:22.14.0 before_script: - set -o pipefail - export NODE_ENV=development @@ -100,7 +100,7 @@ build: tags: ['build'] rules: - if: $CI_COMMIT_REF_PROTECTED == 'true' - image: node:20.12.2 + image: node:22.14.0 script: # see https://docs.gitlab.com/ee/ci/jobs/ssh_keys.html#ssh-keys-when-using-the-docker-executor - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )' @@ -145,7 +145,7 @@ build: - job: 'build' artifacts: false - image: node:20.12.2 + image: node:22.14.0 before_script: # see https://docs.gitlab.com/ee/ci/jobs/ssh_keys.html#ssh-keys-when-using-the-docker-executor - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )' diff --git a/.nvmrc b/.nvmrc index a81debaee..7d41c735d 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v20.12.2 +22.14.0 diff --git a/Makefile b/Makefile index 053161a6b..52c50b72c 100644 --- a/Makefile +++ b/Makefile @@ -24,12 +24,6 @@ test: run: pnpm dev -start: - node_modules/.bin/avris-daemonise start webserver pnpm dev - -stop: - node_modules/.bin/avris-daemonise stop webserver - build: install pnpm build pnpm run-file server/sentry.ts release @@ -37,6 +31,7 @@ build: install deploy: pnpm install -P pnpm run-file server/migrate.ts + -redis-cli KEYS \"${NUXT_PUBLIC_ENV}:cache:*\" | xargs -n 100 redis-cli DEL -pnpm run-file server/sentry.ts deploy migrate: diff --git a/README.md b/README.md index 728a7fbaf..06f9af3f4 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ To work effectively with this project, it is recommended to configure these poin - Integrating Vitest to easily view test results - Use `yaml` syntax highlighting for `.suml` files - Link `locale/config.schema.json` to `locale/*/config.suml` for schema validation and type hints - (the schema file is automatically generated by `locale/generateSchemas.ts` in `make install`) + (the schema file is automatically generated by `locale/generate.ts` in `make install`) ### Git diff --git a/app.vue b/app.vue index 2c14e8d61..c4659aa86 100644 --- a/app.vue +++ b/app.vue @@ -5,6 +5,7 @@ import { useHead, useSeoMeta } from '#imports'; import useConfig from '~/composables/useConfig.ts'; import { getDefaultSeo } from '~/composables/useSimpleHead.ts'; import { getUrlForLocale } from '~/src/domain.ts'; +import { formatFonts } from '~/src/fonts.ts'; const { $translator: translator } = useNuxtApp(); const config = useConfig(); @@ -20,8 +21,8 @@ useHead({ style: [{ innerHTML: `:root { - --font-headings: ${config.style.fontHeadings.map((font) => `'${font}'`).join(',')}; - --font-text: ${config.style.fontText.map((font) => `'${font}'`).join(',')}; + --font-headings: ${formatFonts(config.style.fontHeadings)}; + --font-text: ${formatFonts(config.style.fontText)}; }`, }], link: [ diff --git a/assets/dark.scss b/assets/dark.scss index 55eab1ed8..e71bc1560 100644 --- a/assets/dark.scss +++ b/assets/dark.scss @@ -180,7 +180,7 @@ body[data-theme="dark"] { .bg-light, .text-bg-light { background-color: #111 !important; } .bg-dark, .text-bg-dark { background-color: #f8f9fa !important; } .text-bg-light { color: #fff !important; } - .text-bg-dark { color: #000 !important; } + .text-bg-dark { color: #000 !important; } .bg-white { background-color: #000 !important; } .bg-white.text-white, .bg-dark.text-white, diff --git a/assets/style.scss b/assets/style.scss index b78438206..fe2a602b0 100644 --- a/assets/style.scss +++ b/assets/style.scss @@ -313,9 +313,9 @@ form[inert] { } } .list-group-item-active { - color: $primary; - border-inline-start: 3px solid $primary; - padding-inline-start: calc(#{$list-group-item-padding-x} - 2px); + background-color: $list-group-hover-bg !important; + border-inline-start: 3px solid $primary !important; + padding-inline-start: calc(#{$list-group-item-padding-x} - 2px) !important; } .list-group-item-bg { @@ -409,4 +409,4 @@ textarea.form-control, textarea.form-control-sm { field-sizing: content; min-height: 5rem; -} \ No newline at end of file +} diff --git a/components/AbuseReports.vue b/components/AbuseReports.vue index b636cba0d..6da4ff456 100644 --- a/components/AbuseReports.vue +++ b/components/AbuseReports.vue @@ -21,7 +21,7 @@ - + diff --git a/components/LocaleList.vue b/components/LocaleList.vue index b0f93c51c..1a7637e74 100644 --- a/components/LocaleList.vue +++ b/components/LocaleList.vue @@ -1,6 +1,8 @@ +