From 637260a03770d2fe29d3a5f148a5623592197990 Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Mon, 8 Jan 2024 11:22:26 -0500 Subject: [PATCH] Work on initial cms setup --- package.json | 20 +++++++++--------- pnpm-lock.yaml | 39 +++++++++++++++++------------------ project.inlang/settings.json | 2 +- src/lib/i18n/link.ts | 3 +++ src/params/lang.ts | 5 +++++ src/routes/admin/+page.svelte | 12 ----------- static/admin/config.yml | 4 ++++ static/admin/index.html | 13 ++++++++++++ svelte.config.js | 2 +- 9 files changed, 56 insertions(+), 44 deletions(-) create mode 100644 src/lib/i18n/link.ts create mode 100644 src/params/lang.ts delete mode 100644 src/routes/admin/+page.svelte create mode 100644 static/admin/config.yml create mode 100644 static/admin/index.html diff --git a/package.json b/package.json index 14e888f..407243a 100644 --- a/package.json +++ b/package.json @@ -15,22 +15,22 @@ "devDependencies": { "@inlang/paraglide-js": "1.1.0", "@inlang/paraglide-js-adapter-vite": "^1.2.0", - "@sveltejs/adapter-auto": "^3.0.0", - "@sveltejs/kit": "^2.0.0", - "@sveltejs/vite-plugin-svelte": "^3.0.0", + "@sveltejs/adapter-static": "^3.0.1", + "@sveltejs/kit": "^2.0.6", + "@sveltejs/vite-plugin-svelte": "^3.0.1", "@types/eslint": "8.56.0", - "@typescript-eslint/eslint-plugin": "^6.0.0", - "@typescript-eslint/parser": "^6.0.0", + "@typescript-eslint/eslint-plugin": "^6.18.0", + "@typescript-eslint/parser": "^6.18.0", "eslint": "^8.56.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-svelte": "^2.35.1", "prettier": "^3.1.1", "prettier-plugin-svelte": "^3.1.2", - "svelte": "^5.0.0-next.1", - "svelte-check": "^3.6.0", - "tslib": "^2.4.1", - "typescript": "^5.0.0", - "vite": "^5.0.3" + "svelte": "5.0.0-next.29", + "svelte-check": "^3.6.2", + "tslib": "^2.6.2", + "typescript": "^5.3.3", + "vite": "^5.0.11" }, "type": "module" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 29dbb37..9aa9c87 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,23 +11,23 @@ devDependencies: '@inlang/paraglide-js-adapter-vite': specifier: ^1.2.0 version: 1.2.0(@sinclair/typebox@0.31.28) - '@sveltejs/adapter-auto': - specifier: ^3.0.0 - version: 3.1.0(@sveltejs/kit@2.0.6) + '@sveltejs/adapter-static': + specifier: ^3.0.1 + version: 3.0.1(@sveltejs/kit@2.0.6) '@sveltejs/kit': - specifier: ^2.0.0 + specifier: ^2.0.6 version: 2.0.6(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@5.0.0-next.29)(vite@5.0.11) '@sveltejs/vite-plugin-svelte': - specifier: ^3.0.0 + specifier: ^3.0.1 version: 3.0.1(svelte@5.0.0-next.29)(vite@5.0.11) '@types/eslint': specifier: 8.56.0 version: 8.56.0 '@typescript-eslint/eslint-plugin': - specifier: ^6.0.0 + specifier: ^6.18.0 version: 6.18.0(@typescript-eslint/parser@6.18.0)(eslint@8.56.0)(typescript@5.3.3) '@typescript-eslint/parser': - specifier: ^6.0.0 + specifier: ^6.18.0 version: 6.18.0(eslint@8.56.0)(typescript@5.3.3) eslint: specifier: ^8.56.0 @@ -45,19 +45,19 @@ devDependencies: specifier: ^3.1.2 version: 3.1.2(prettier@3.1.1)(svelte@5.0.0-next.29) svelte: - specifier: ^5.0.0-next.1 + specifier: 5.0.0-next.29 version: 5.0.0-next.29 svelte-check: - specifier: ^3.6.0 + specifier: ^3.6.2 version: 3.6.2(postcss@8.4.33)(svelte@5.0.0-next.29) tslib: - specifier: ^2.4.1 + specifier: ^2.6.2 version: 2.6.2 typescript: - specifier: ^5.0.0 + specifier: ^5.3.3 version: 5.3.3 vite: - specifier: ^5.0.3 + specifier: ^5.0.11 version: 5.0.11 packages: @@ -907,13 +907,12 @@ packages: resolution: {integrity: sha512-/s55Jujywdw/Jpan+vsy6JZs1z2ZTGxTmbZTPiuSL2wz9mfzA2gN1zzaqmvfi4pq+uOt7Du85fkiwv5ymW84aQ==} dev: true - /@sveltejs/adapter-auto@3.1.0(@sveltejs/kit@2.0.6): - resolution: {integrity: sha512-igS5hqCwdiXWb8NoWzThKCVQQj9tKgUkbTtzfxBPgSLOyFjkiGNDX0SgCoY2QIUWBqOkfGTOqGlrW5Ynw9oUvw==} + /@sveltejs/adapter-static@3.0.1(@sveltejs/kit@2.0.6): + resolution: {integrity: sha512-6lMvf7xYEJ+oGeR5L8DFJJrowkefTK6ZgA4JiMqoClMkKq0s6yvsd3FZfCFvX1fQ0tpCD7fkuRVHsnUVgsHyNg==} peerDependencies: '@sveltejs/kit': ^2.0.0 dependencies: '@sveltejs/kit': 2.0.6(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@5.0.0-next.29)(vite@5.0.11) - import-meta-resolve: 4.0.0 dev: true /@sveltejs/kit@2.0.6(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@5.0.0-next.29)(vite@5.0.11): @@ -1865,10 +1864,6 @@ packages: resolve-from: 4.0.0 dev: true - /import-meta-resolve@4.0.0: - resolution: {integrity: sha512-okYUR7ZQPH+efeuMJGlq4f8ubUgO50kByRPyt/Cy1Io4PSRsPjxME+YlVaCOx+NIToW7hCsZNFJyTPFFKepRSA==} - dev: true - /imurmurhash@0.1.4: resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} engines: {node: '>=0.8.19'} @@ -1984,7 +1979,7 @@ packages: lodash.isplainobject: 4.0.6 lodash.isstring: 4.0.1 lodash.once: 4.1.1 - ms: 2.1.2 + ms: 2.1.3 semver: 7.5.4 dev: true @@ -2172,6 +2167,10 @@ packages: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} dev: true + /ms@2.1.3: + resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} + dev: true + /nanoid@3.3.7: resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} diff --git a/project.inlang/settings.json b/project.inlang/settings.json index eb760cb..20a384b 100644 --- a/project.inlang/settings.json +++ b/project.inlang/settings.json @@ -12,6 +12,6 @@ "https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@latest/dist/index.js" ], "plugin.inlang.messageFormat": { - "pathPattern": "./translations/{languageTag}.json" + "pathPattern": "./messages/{languageTag}.json" } } diff --git a/src/lib/i18n/link.ts b/src/lib/i18n/link.ts new file mode 100644 index 0000000..d6eff3e --- /dev/null +++ b/src/lib/i18n/link.ts @@ -0,0 +1,3 @@ +import type { AvailableLanguageTag } from '$messages/runtime'; + +export function link

(path: P, lang: AvailableLanguageTag = 'fr') {} diff --git a/src/params/lang.ts b/src/params/lang.ts new file mode 100644 index 0000000..e839ab3 --- /dev/null +++ b/src/params/lang.ts @@ -0,0 +1,5 @@ +import { availableLanguageTags, type AvailableLanguageTag } from '$translations/runtime'; + +export function match(param): param is AvailableLanguageTag { + return availableLanguageTags.includes(param as AvailableLanguageTag); +} diff --git a/src/routes/admin/+page.svelte b/src/routes/admin/+page.svelte deleted file mode 100644 index 7574add..0000000 --- a/src/routes/admin/+page.svelte +++ /dev/null @@ -1,12 +0,0 @@ - - - - Dashboard - - - diff --git a/static/admin/config.yml b/static/admin/config.yml new file mode 100644 index 0000000..79b3e38 --- /dev/null +++ b/static/admin/config.yml @@ -0,0 +1,4 @@ +backend: + name: github + repo: CUPUM/site + branch: main diff --git a/static/admin/index.html b/static/admin/index.html new file mode 100644 index 0000000..16141e5 --- /dev/null +++ b/static/admin/index.html @@ -0,0 +1,13 @@ + + + + + + + UNESCO Chair - Site dashboard + + + + + + diff --git a/svelte.config.js b/svelte.config.js index d993ac3..b14758f 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -12,7 +12,7 @@ const config = { base: process.argv.includes('dev') ? '' : process.env.BASE_PATH }, alias: { - $messages: './src/lib/i18n/generated' + $translations: './src/lib/i18n/generated' } } };