Merge branch 'master' into feat-i18n-french-and-english-textes

.github/workflows/vuepress-deploy.yml

@@ -17,12 +17,13 @@ jobs:
       with:
         node-version: 20
 
-    - name: vuepress-deploy
-      uses: jenkey2011/vuepress-deploy@master
+    - 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
+        build_dir: docs/.vuepress/dist
       env:
-        ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
-        TARGET_REPO: Ocelot-Social-Community/ocelot.social
-        TARGET_BRANCH: gh-pages
-        BUILD_SCRIPT: npm install && npm run build-legacy
-        BUILD_DIR: docs/.vuepress/dist
-        CNAME: https://www.ocelot.social
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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.
@@ -15,7 +16,7 @@ export default defineUserConfig({
       title: 'Ocelot.Social',
       // description: ''
     },
-    '/de/': {
+    '/': {
       lang: 'de-DE',
       title: 'Ocelot.Social',
       // description: ''

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,
-  })
 ]

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.
@@ -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.
+busFaktor() e.V.  
+Wolfgang Huß, 2nd Chairman
+
+Haferstr. 5c  
+86179 Augsburg  
+E-Mail: <[email protected]>  
+Telefon: +49 173 622 60 91
+
+## Contentwise Responsible Editor
+
+Wolfgang Huß  
+
+Steinburger Straße 38  
+22527 Hamburg  
+E-Mail: <[email protected]>  
+Telefon: +49 173 622 60 91

docs/impressum/README.md

@@ -0,0 +1,31 @@
+---
+home: false
+# layout: BlogHome
+icon: home
+title: Impressum | Ocelot.Social
+heroFullScreen: false
+heroImage: /logo.svg
+heroText: Free and open-source social network for active citizenship.
+tagLine: 
+# actions:
+#   - text: Demo
+#     link: https://stage.ocelot.social/
+---
+## Verantwortlich für den Betrieb dieser Website
+
+busFaktor() e.V.  
+Wolfgang Huß, 2. Vorsitzender
+
+Haferstr. 5c  
+86179 Augsburg  
+E-Mail: <[email protected]>  
+Telefon: +49 173 622 60 91
+
+## Inhaltlich verantwortlicher Redakteur
+
+Wolfgang Huß  
+
+Steinburger Straße 38  
+22527 Hamburg  
+E-Mail: <[email protected]>  
+Telefon: +49 173 622 60 91

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\""
   },
@@ -36,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"
   }