Merge branch 'master' into 13-add-donation-link-to-main-page

.github/workflows/vuepress-deploy.yml

@@ -17,12 +17,13 @@ jobs:
       with:
         node-version: 20
 
-    - name: vuepress-deploy
+    - name: Build Vuepress Pages
-      uses: jenkey2011/vuepress-deploy@master
+      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 }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_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

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/de/impressum/README.md

@@ -1,16 +0,0 @@
----
-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/
----
-## Coming soon
-
-We are rebuilding our website. Check back soon.

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: <vorstand@busfaktor.org>  
+Telefon: +49 173 622 60 91
+
+## Contentwise Responsible Editor
+
+Wolfgang Huß  
+
+Steinburger Straße 38  
+22527 Hamburg  
+E-Mail: <vorstand@busfaktor.org>  
+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: <vorstand@busfaktor.org>  
+Telefon: +49 173 622 60 91
+
+## Inhaltlich verantwortlicher Redakteur
+
+Wolfgang Huß  
+
+Steinburger Straße 38  
+22527 Hamburg  
+E-Mail: <vorstand@busfaktor.org>  
+Telefon: +49 173 622 60 91

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",

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"
   }