From 389cb7078d99d6265da229bf3e67e52fc068f30c Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 21 Nov 2023 00:32:01 +0100 Subject: [PATCH 1/4] lint fixes for .json --- .eslintrc.json | 28 +++++++++++++++++----------- renderer/i18n.ts | 4 ++-- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 9360b68..485bb1d 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -77,7 +77,13 @@ "import/no-webpack-loader-syntax": "error", "import/consistent-type-specifier-style": "error", "import/exports-last": "off", - "import/extensions": "error", + "import/extensions": [ + "error", + "never", + { + "json": "always" + } + ], "import/first": "error", "import/group-exports": "off", "import/newline-after-import": "error", @@ -88,16 +94,16 @@ "import/no-namespace": "error", "import/no-unassigned-import": "error", "import/order": [ - "error", - { - "groups": ["builtin", "external", "internal", "parent", "sibling", "index", "object", "type"], - "newlines-between": "always", - "alphabetize": { - "order": "asc", // sort in ascending order. Options: ["ignore", "asc", "desc"] - "caseInsensitive": true // ignore case. Options: [true, false] - }, - "distinctGroup": true - } + "error", + { + "groups": ["builtin", "external", "internal", "parent", "sibling", "index", "object", "type"], + "newlines-between": "always", + "alphabetize": { + "order": "asc", // sort in ascending order. Options: ["ignore", "asc", "desc"] + "caseInsensitive": true // ignore case. Options: [true, false] + }, + "distinctGroup": true + } ], "import/prefer-default-export": "off", // promise diff --git a/renderer/i18n.ts b/renderer/i18n.ts index 7e25431..bfef1cb 100644 --- a/renderer/i18n.ts +++ b/renderer/i18n.ts @@ -1,10 +1,10 @@ import { createI18n } from 'vue-i18n' // eslint-disable-next-line import/no-relative-parent-imports -import de from '../src/locales/de' +import de from '../src/locales/de.json' // import { de as $vuetify } from 'vuetify/locale' // eslint-disable-next-line import/no-relative-parent-imports -import en from '../src/locales/en' +import en from '../src/locales/en.json' // import { en as $vuetify } from 'vuetify/locale' export default createI18n({ From 518c26c69046c9d1b63897992f17eabc3c9dbf8e Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 21 Nov 2023 00:32:13 +0100 Subject: [PATCH 2/4] add .vuepress file selector properly --- .github/file-filters.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/file-filters.yml b/.github/file-filters.yml index ac18ffe..cbf23a2 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -11,7 +11,7 @@ frontend-test-build-code: &frontend-test-build-code frontend-test-build-docs: &frontend-test-build-docs - '**/*.md' - - '.vuepress/' + - '.vuepress/*' frontend-test-build-storybook: &frontend-test-build-storybook - '**/*' \ No newline at end of file From d11ad8fab70e46a7f21bed015e0e07536091be1d Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 21 Nov 2023 00:41:51 +0100 Subject: [PATCH 3/4] try deploying with subfolder --- .github/workflows/frontend.deploy.docs.yml | 8 ++++---- .vuepress/config.ts | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/frontend.deploy.docs.yml b/.github/workflows/frontend.deploy.docs.yml index a79962e..e3d16b8 100644 --- a/.github/workflows/frontend.deploy.docs.yml +++ b/.github/workflows/frontend.deploy.docs.yml @@ -1,8 +1,8 @@ name: "frontend:deploy:docs to github" -on: - push: - branches: - - master +on: [push] +# push: +# branches: +# - master jobs: build-and-deploy: runs-on: ubuntu-latest diff --git a/.vuepress/config.ts b/.vuepress/config.ts index 0cdf891..8dcb70b 100644 --- a/.vuepress/config.ts +++ b/.vuepress/config.ts @@ -4,4 +4,5 @@ export default defineUserConfig({ title: 'IT4C Frontend Boilerplate Documentation', description: 'IT4C Frontend Boilerplate Documentation', dest: 'build/docs', + base: '/boilerplate-frontend/', }) From 210667e7d1775dc6965e17b97f00f0ee3d3e6fa7 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 21 Nov 2023 00:46:47 +0100 Subject: [PATCH 4/4] only push on master again --- .github/workflows/frontend.deploy.docs.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/frontend.deploy.docs.yml b/.github/workflows/frontend.deploy.docs.yml index e3d16b8..a79962e 100644 --- a/.github/workflows/frontend.deploy.docs.yml +++ b/.github/workflows/frontend.deploy.docs.yml @@ -1,8 +1,8 @@ name: "frontend:deploy:docs to github" -on: [push] -# push: -# branches: -# - master +on: + push: + branches: + - master jobs: build-and-deploy: runs-on: ubuntu-latest