From e62cbc96b25edcad71816e6a1aff0feae890f117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 29 Nov 2023 10:49:26 +0100 Subject: [PATCH 01/10] Add correct impressum --- docs/de/impressum/README.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/docs/de/impressum/README.md b/docs/de/impressum/README.md index 9c62ec4..6684240 100644 --- a/docs/de/impressum/README.md +++ b/docs/de/impressum/README.md @@ -11,6 +11,21 @@ tagLine: # - text: Demo # link: https://stage.ocelot.social/ --- -## Coming soon +## Verantwortlich für den Betrieb dieser Website -We are rebuilding our website. Check back soon. \ No newline at end of file +busFaktor() e.V. +Wolfgang Huß, 2. Vorsitzender + +Haferstr. 5c +86179 Augsburg +E-Mail: +Telefon: +49 176 5552 3557 + +## Inhaltlich verantwortlicher Redakteur + +Wolfgang Huß + +Steinburger Straße 38 +22527 Hamburg +E-Mail: +Telefon: +49 173 622 60 91 From 14178580f93cd1fb171124a472cd4778ba651aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 29 Nov 2023 11:05:03 +0100 Subject: [PATCH 02/10] Fix german imprint --- docs/de/impressum/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/de/impressum/README.md b/docs/de/impressum/README.md index 6684240..3e6671e 100644 --- a/docs/de/impressum/README.md +++ b/docs/de/impressum/README.md @@ -19,7 +19,7 @@ Wolfgang Huß, 2. Vorsitzender Haferstr. 5c 86179 Augsburg E-Mail: -Telefon: +49 176 5552 3557 +Telefon: +49 173 622 60 91 ## Inhaltlich verantwortlicher Redakteur From 92d6a2ecdff6a8505f98376c7d2343f2256543ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 29 Nov 2023 11:05:23 +0100 Subject: [PATCH 03/10] Translate imprint to english --- docs/en/impressum/README.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/docs/en/impressum/README.md b/docs/en/impressum/README.md index 9c62ec4..ec17b26 100644 --- a/docs/en/impressum/README.md +++ b/docs/en/impressum/README.md @@ -11,6 +11,21 @@ tagLine: # - text: Demo # link: https://stage.ocelot.social/ --- -## Coming soon +## Responsible for the Operation of this Website -We are rebuilding our website. Check back soon. \ No newline at end of file +busFaktor() e.V. +Wolfgang Huß, 2nd Chairman + +Haferstr. 5c +86179 Augsburg +E-Mail: +Telefon: +49 173 622 60 91 + +## Contentwise Responsible Editor + +Wolfgang Huß + +Steinburger Straße 38 +22527 Hamburg +E-Mail: +Telefon: +49 173 622 60 91 From 539fc4407eb44e087df178e2b4f19f7c70905ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 29 Nov 2023 11:09:47 +0100 Subject: [PATCH 04/10] Fix title of English imprint --- docs/de/impressum/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/de/impressum/README.md b/docs/de/impressum/README.md index 3e6671e..5c9b452 100644 --- a/docs/de/impressum/README.md +++ b/docs/de/impressum/README.md @@ -2,7 +2,7 @@ home: false # layout: BlogHome icon: home -title: Impressum | Ocelot.Social +title: Imprint | Ocelot.Social heroFullScreen: false heroImage: /logo.svg heroText: Free and open-source social network for active citizenship. From eedddece1966f3c53250ab285e7734e6cb6a9814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 29 Nov 2023 11:11:42 +0100 Subject: [PATCH 05/10] Change twisted titles of German and English --- docs/de/impressum/README.md | 2 +- docs/en/impressum/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/de/impressum/README.md b/docs/de/impressum/README.md index 5c9b452..3e6671e 100644 --- a/docs/de/impressum/README.md +++ b/docs/de/impressum/README.md @@ -2,7 +2,7 @@ home: false # layout: BlogHome icon: home -title: Imprint | Ocelot.Social +title: Impressum | Ocelot.Social heroFullScreen: false heroImage: /logo.svg heroText: Free and open-source social network for active citizenship. diff --git a/docs/en/impressum/README.md b/docs/en/impressum/README.md index ec17b26..8d07deb 100644 --- a/docs/en/impressum/README.md +++ b/docs/en/impressum/README.md @@ -2,7 +2,7 @@ home: false # layout: BlogHome icon: home -title: Impressum | Ocelot.Social +title: Imprint | Ocelot.Social heroFullScreen: false heroImage: /logo.svg heroText: Free and open-source social network for active citizenship. From 6b09b500f22ed80078c1c0bfe92e1ca1303d43d7 Mon Sep 17 00:00:00 2001 From: mahula Date: Wed, 29 Nov 2023 11:27:29 +0100 Subject: [PATCH 06/10] replace vuepress deploy action --- .github/workflows/vuepress-deploy.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/vuepress-deploy.yml diff --git a/.github/workflows/vuepress-deploy.yml b/.github/workflows/vuepress-deploy.yml new file mode 100644 index 0000000..3c49a16 --- /dev/null +++ b/.github/workflows/vuepress-deploy.yml @@ -0,0 +1,22 @@ +name: Build and Deploy + +on: + push: + branches: + - master + +jobs: + build-and-deploy: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@master + + - name: vuepress-gh-pages-deploy + uses: crazy-max/ghaction-github-pages@master + with: + target_branch: gh-pages + build_dir: docs/.vuepress/dist + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + From 03dc3ae439d55341c3286b817f675795064e0151 Mon Sep 17 00:00:00 2001 From: mahula Date: Wed, 29 Nov 2023 12:30:12 +0100 Subject: [PATCH 07/10] set github deployment action version --- .github/workflows/vuepress-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/vuepress-deploy.yml b/.github/workflows/vuepress-deploy.yml index f3b7caa..147e86e 100644 --- a/.github/workflows/vuepress-deploy.yml +++ b/.github/workflows/vuepress-deploy.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@master - name: vuepress-gh-pages-deploy - uses: crazy-max/ghaction-github-pages@master + uses: crazy-max/ghaction-github-pages@v4 with: target_branch: gh-pages build_dir: docs/.vuepress/dist From f51d11ef6594264e9fe9a13f1bc77304ec3e7f21 Mon Sep 17 00:00:00 2001 From: mahula Date: Wed, 29 Nov 2023 13:06:50 +0100 Subject: [PATCH 08/10] addvuepress build step to deployment workflow --- .github/workflows/vuepress-deploy.yml | 10 +++++++++- package.json | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vuepress-deploy.yml b/.github/workflows/vuepress-deploy.yml index 147e86e..65d9aa2 100644 --- a/.github/workflows/vuepress-deploy.yml +++ b/.github/workflows/vuepress-deploy.yml @@ -12,7 +12,15 @@ jobs: - name: Checkout uses: actions/checkout@master - - name: vuepress-gh-pages-deploy + - name: Setup Node 20 + uses: actions/setup-node@v4 + with: + node-version: 20 + + - name: Build Vuepress Pages + run: npm install && npm run build + + - name: Deploy Vuepress to Github Pages uses: crazy-max/ghaction-github-pages@v4 with: target_branch: gh-pages diff --git a/package.json b/package.json index 337ec5e..e833564 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "private": false, "scripts": { "build": "vuepress build docs", - "build-node16": "vuepress build docs", "dev": "vuepress dev docs", "test": "textlint \"*.md\" \"docs/**/*.md\"" }, From e62d37fa02d73ff365f91017f31909dc1522c88a Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 29 Nov 2023 14:20:00 +0100 Subject: [PATCH 09/10] Remove redirect plugin and set german as root. --- docs/.vuepress/config.js | 2 +- docs/.vuepress/config/plugins.js | 4 - docs/{de => }/README.md | 0 docs/{de => }/impressum/README.md | 0 package-lock.json | 164 ------------------------------ package.json | 1 - 6 files changed, 1 insertion(+), 170 deletions(-) rename docs/{de => }/README.md (100%) rename docs/{de => }/impressum/README.md (100%) diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 0c689e6..0c10799 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -15,7 +15,7 @@ export default defineUserConfig({ title: 'Ocelot.Social', // description: '' }, - '/de/': { + '/': { lang: 'de-DE', title: 'Ocelot.Social', // description: '' diff --git a/docs/.vuepress/config/plugins.js b/docs/.vuepress/config/plugins.js index fa303d1..c4d4eae 100644 --- a/docs/.vuepress/config/plugins.js +++ b/docs/.vuepress/config/plugins.js @@ -1,5 +1,4 @@ import { searchProPlugin } from 'vuepress-plugin-search-pro' -import { redirectPlugin } from 'vuepress-plugin-redirect' export default [ searchProPlugin({ @@ -16,7 +15,4 @@ export default [ }, ], }), - redirectPlugin({ - autoLocale: true, - }) ] \ No newline at end of file diff --git a/docs/de/README.md b/docs/README.md similarity index 100% rename from docs/de/README.md rename to docs/README.md diff --git a/docs/de/impressum/README.md b/docs/impressum/README.md similarity index 100% rename from docs/de/impressum/README.md rename to docs/impressum/README.md diff --git a/package-lock.json b/package-lock.json index 8757068..9d0793a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,6 @@ "textlint-rule-period-in-list-item": "^1.0.1", "textlint-rule-write-good": "^2.0.0", "vuepress": "^2.0.0-rc.0", - "vuepress-plugin-redirect": "^2.0.0-rc.1", "vuepress-plugin-search-pro": "^2.0.0-rc.0", "vuepress-theme-hope": "^2.0.0-rc.0" } @@ -10700,169 +10699,6 @@ } } }, - "node_modules/vuepress-plugin-redirect": { - "version": "2.0.0-rc.1", - "resolved": "https://registry.npmjs.org/vuepress-plugin-redirect/-/vuepress-plugin-redirect-2.0.0-rc.1.tgz", - "integrity": "sha512-bmRKSEDPKjx1mkaJ6AOGUOtKvmS9yVbnwdGPe7FqjeD/bbTMPDSPrER1V+ztPqK8yzZDYf/oroGiWFwdBhr/Tg==", - "dev": true, - "dependencies": { - "@vuepress/cli": "2.0.0-rc.0", - "@vuepress/client": "2.0.0-rc.0", - "@vuepress/core": "2.0.0-rc.0", - "@vuepress/shared": "2.0.0-rc.0", - "@vuepress/utils": "2.0.0-rc.0", - "@vueuse/core": "^10.6.1", - "cac": "^6.7.14", - "vue": "^3.3.9", - "vue-router": "^4.2.5", - "vuepress-plugin-sass-palette": "2.0.0-rc.1", - "vuepress-shared": "2.0.0-rc.1" - }, - "bin": { - "vp-redirect": "lib/cli/index.js" - }, - "engines": { - "node": ">=18.16.0", - "npm": ">=8", - "pnpm": ">=7", - "yarn": ">=2" - }, - "peerDependencies": { - "sass-loader": "^13.3.2", - "vuepress": "2.0.0-rc.0", - "vuepress-vite": "2.0.0-rc.0", - "vuepress-webpack": "2.0.0-rc.0" - }, - "peerDependenciesMeta": { - "sass-loader": { - "optional": true - }, - "vuepress": { - "optional": true - }, - "vuepress-vite": { - "optional": true - }, - "vuepress-webpack": { - "optional": true - } - } - }, - "node_modules/vuepress-plugin-redirect/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/vuepress-plugin-redirect/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/vuepress-plugin-redirect/node_modules/vuepress-plugin-sass-palette": { - "version": "2.0.0-rc.1", - "resolved": "https://registry.npmjs.org/vuepress-plugin-sass-palette/-/vuepress-plugin-sass-palette-2.0.0-rc.1.tgz", - "integrity": "sha512-3QI7mYFaCI6ynbW0EJ8Qf/3hJiryPOI0B+AJ8iJj06VCZTutQBpQvnsu4LfF02h3j2YNuWWs0UqIqc5fCi+Czg==", - "dev": true, - "dependencies": { - "@vuepress/shared": "2.0.0-rc.0", - "@vuepress/utils": "2.0.0-rc.0", - "chokidar": "^3.5.3", - "sass": "^1.69.5", - "vuepress-shared": "2.0.0-rc.1" - }, - "engines": { - "node": ">=18.16.0", - "npm": ">=8", - "pnpm": ">=7", - "yarn": ">=2" - }, - "peerDependencies": { - "sass-loader": "^13.3.2", - "vuepress": "2.0.0-rc.0", - "vuepress-vite": "2.0.0-rc.0", - "vuepress-webpack": "2.0.0-rc.0" - }, - "peerDependenciesMeta": { - "sass-loader": { - "optional": true - }, - "vuepress": { - "optional": true - }, - "vuepress-vite": { - "optional": true - }, - "vuepress-webpack": { - "optional": true - } - } - }, - "node_modules/vuepress-plugin-redirect/node_modules/vuepress-shared": { - "version": "2.0.0-rc.1", - "resolved": "https://registry.npmjs.org/vuepress-shared/-/vuepress-shared-2.0.0-rc.1.tgz", - "integrity": "sha512-WhtuaP3LCW42Xtu1pK6+NY3oe8BVpPzMgaVn5OnDBqupula0IViY6YgTI86YhCSarhl56sMmvnq1KeuLXPt7uA==", - "dev": true, - "dependencies": { - "@vuepress/client": "2.0.0-rc.0", - "@vuepress/shared": "2.0.0-rc.0", - "@vuepress/utils": "2.0.0-rc.0", - "@vueuse/core": "^10.6.1", - "cheerio": "1.0.0-rc.12", - "dayjs": "^1.11.10", - "execa": "^8.0.1", - "fflate": "^0.8.1", - "gray-matter": "^4.0.3", - "semver": "^7.5.4", - "striptags": "^3.2.0", - "vue": "^3.3.9", - "vue-router": "^4.2.5" - }, - "engines": { - "node": ">=18.16.0", - "npm": ">=8", - "pnpm": ">=7", - "yarn": ">=2" - }, - "peerDependencies": { - "vuepress": "2.0.0-rc.0", - "vuepress-vite": "2.0.0-rc.0", - "vuepress-webpack": "2.0.0-rc.0" - }, - "peerDependenciesMeta": { - "vuepress": { - "optional": true - }, - "vuepress-vite": { - "optional": true - }, - "vuepress-webpack": { - "optional": true - } - } - }, - "node_modules/vuepress-plugin-redirect/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/vuepress-plugin-rtl": { "version": "2.0.0-rc.0", "resolved": "https://registry.npmjs.org/vuepress-plugin-rtl/-/vuepress-plugin-rtl-2.0.0-rc.0.tgz", diff --git a/package.json b/package.json index e833564..092ab52 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "textlint-rule-period-in-list-item": "^1.0.1", "textlint-rule-write-good": "^2.0.0", "vuepress": "^2.0.0-rc.0", - "vuepress-plugin-redirect": "^2.0.0-rc.1", "vuepress-plugin-search-pro": "^2.0.0-rc.0", "vuepress-theme-hope": "^2.0.0-rc.0" } From f688d3cafceff00ee0a230226249cad36d6af137 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 29 Nov 2023 20:04:34 +0100 Subject: [PATCH 10/10] feat(content): add base to vuepress config.js --- docs/.vuepress/config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 0c10799..247a98f 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -7,6 +7,7 @@ export default defineUserConfig({ ...meta, theme, plugins, + base: '/ocelot.social/', locales:{ // The key is the path for the locale to be nested under. // As a special case, the default locale can use '/' as its path.