Merge branch 'master' into 6759-fix-group-profile-content-menu-position

.gitignore

@@ -15,8 +15,13 @@ cypress/videos
 cypress/screenshots/
 cypress.env.json
 
+.vuepress/.cache/
+.vuepress/.temp/
+.vuepress/dist/
+
+
 !.gitkeep
 **/coverage
 
 release/
-*~
+*~

.vuepress/config.js

@@ -1,11 +1,12 @@
 import { defineUserConfig } from 'vuepress'
+import { viteBundler } from '@vuepress/bundler-vite'
+
 import meta from './config/meta'
 import theme from './config/theme'
-import plugins from './config/plugins'
 
 export default defineUserConfig({
   pagePatterns: ['**/*.md', '!.vuepress', '!node_modules', '!backend/node_modules', '!webapp/node_modules', '!deployment/src/old'],
+  bundler: viteBundler(),
   ...meta,
   theme,
-  plugins,
 })

.vuepress/config/plugins.js

@@ -1,18 +0,0 @@
-import { searchProPlugin } from 'vuepress-plugin-search-pro'
-
-export default [
-  searchProPlugin({
-    indexContent: true,
-    autoSuggestions: true,
-    customFields: [
-      {
-        getter: (page) => page.frontmatter.category,
-        formatter: "Category: $content",
-      },
-      {
-        getter: (page) => page.frontmatter.tag,
-        formatter: "Tag: $content",
-      },
-    ],
-  })
-]

.vuepress/config/theme.js

@@ -27,6 +27,20 @@ export default hopeTheme({
       mdEnhance: {
         tabs: true,
         imgSize: true
+      },
+      searchPro: {
+        indexContent: true,
+        autoSuggestions: true,
+        customFields: [
+          {
+            getter: (page) => page.frontmatter.category,
+            formatter: "Category: $content",
+          },
+          {
+            getter: (page) => page.frontmatter.tag,
+            formatter: "Tag: $content",
+          },
+        ],
       }
     }
 })

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # CONTRIBUTING
 
-Thank you so much for thinking of contributing to the <!-- [ -->ocelot.social<!-- ](https://ocelot.social) --> project! It's awesome you're here, we really appreciate it. :-\)
+Thank you so much for thinking of contributing to the [ocelot.social](https://ocelot.social) project! It's awesome you're here, we really appreciate it. :-\)
 
 ## Getting Set Up
 

README.md

@@ -6,13 +6,12 @@
 [![Discord Channel](https://img.shields.io/discord/489522408076738561.svg)](https://discord.gg/AJSX9DCSUA)
 [![Open Source Helpers](https://www.codetriage.com/ocelot-social-community/ocelot-social/badges/users.svg)](https://www.codetriage.com/ocelot-social-community/ocelot-social)
 
-<!-- [ -->Ocelot.social<!-- ](<https://ocelot.social>) --> is free and open source software program code to run social networks. Its development is supported by a community of programmers and interested network operators.
+[Ocelot.social](https://ocelot.social) is free and open source software program code to run social networks. Its development is supported by a community of programmers and interested network operators.
 
 <!-- markdownlint-disable MD033 -->
-<p align="center">
-  <!-- <a href="https://ocelot.social" target="_blank"> -->
-    <img src="https://raw.githubusercontent.com/Ocelot-Social-Community/Ocelot-Social/master/webapp/static/img/custom/logo-squared.svg" alt="ocelot.social" width="40%" height="40%">
-  <!-- </a> -->
+<!-- <p align="center"> -->
+<p style="text-align: center;">
+  <a href="https://ocelot.social" target="_blank"><img src="https://raw.githubusercontent.com/Ocelot-Social-Community/Ocelot-Social/master/webapp/static/img/custom/logo-squared.svg" alt="ocelot.social" width="40%" height="40%"></a>
 </p>
 <!-- markdownlint-enable MD033 -->
 
@@ -69,7 +68,7 @@ Try out our live demo network, see [here](#live-demo-and-developer-logins).
 If you're wondering how you could help, there are plenty of ways, e.g.:
 
 - Spread the good word about ocelot.social to make it more popular:
-  - Add the link <!-- [ -->ocelot.social<!-- ](https://ocelot.social)--> to your website.
+  - Add the link [ocelot.social](https://ocelot.social) to your website.
   - Give ocelot.social a Like at <https://alternativeto.net/software/ocelot-social/>.
   - Star our project on GitHub at <https://github.com/Ocelot-Social-Community/Ocelot-Social/>.
   - Promote it on your social networks.
@@ -140,11 +139,11 @@ $ cd Ocelot-Social
 
 ### Live Demo and Developer Logins
 
-**Try out our deployed <!-- [ -->development environment<!--](https://stage.ocelot.social)-->.**
+**Try out our deployed [development environment](https://stage.ocelot.social).**
 
 Visit our staging networks:
 
-- central staging network: <!-- [ -->stage.ocelot.social<!-- ](https://stage.ocelot.social)-->
+- central staging network: [stage.ocelot.social](https://stage.ocelot.social)
 <!-- - rebranded staging network: [rebrand.ocelot.social](https://stage.ocelot.social). -->
 
 #### Login

deployment/README.md

@@ -9,20 +9,18 @@ This repository is an in use template to rebrand, configure, and deploy [ocelot.
 The forked original repository is [stage.ocelot.social](https://github.com/Ocelot-Social-Community/stage.ocelot.social).
 
 <!-- markdownlint-disable MD033 -->
-<p align="center">
-  <!-- <a href="https://ocelot.social" target="_blank"> -->
-    <img src="../webapp/static/img/custom/logo-squared.svg" alt="ocelot.social" width="40%" height="40%">
-  <!-- </a> -->
+<p style="text-align: center;">
+  <a href="https://ocelot.social" target="_blank"><img src="https://raw.githubusercontent.com/Ocelot-Social-Community/Ocelot-Social/master/webapp/static/img/custom/logo-squared.svg" alt="ocelot.social" width="40%" height="40%"></a>
 </p>
 <!-- markdownlint-enable MD033 -->
 
 ## Live demo
 
-__Try out our deployed <!-- [ -->development environment<!-- ](https://stage.ocelot.social)-->.__
+__Try out our deployed [development environment](https://stage.ocelot.social).__
 
 Visit our staging networks:
 
-- central staging network: <!-- [ -->stage.ocelot.social<!-- ](https://stage.ocelot.social)-->
+- central staging network: [stage.ocelot.social](https://stage.ocelot.social)
 <!-- - rebranded staging network: [rebrand.ocelot.social](https://stage.ocelot.social). -->
 
 Logins:

package.json

@@ -60,9 +60,10 @@
     "wait-on": "^7.2.0"
   },
   "optionalDependencies": {
-    "vuepress": "^2.0.0-rc.0",
-    "vuepress-plugin-search-pro": "^2.0.0-rc.6",
-    "vuepress-theme-hope": "^2.0.0-rc.11"
+    "@vuepress/bundler-vite": "^2.0.0-rc.2",
+    "vuepress": "^2.0.0-rc.2",
+    "vuepress-plugin-search-pro": "^2.0.0-rc.15",
+    "vuepress-theme-hope": "^2.0.0-rc.15"
   },
   "resolutions": {
     "set-value": "^2.0.1",