diff --git a/.gitignore b/.gitignore
index a0a08dcaa..f03652c14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,8 +15,13 @@ cypress/videos
cypress/screenshots/
cypress.env.json
+.vuepress/.cache/
+.vuepress/.temp/
+.vuepress/dist/
+
+
!.gitkeep
**/coverage
release/
-*~
\ No newline at end of file
+*~
diff --git a/.vuepress/config.js b/.vuepress/config.js
index b856507bf..87862a41d 100644
--- a/.vuepress/config.js
+++ b/.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,
})
diff --git a/.vuepress/config/plugins.js b/.vuepress/config/plugins.js
deleted file mode 100644
index aa21218d6..000000000
--- a/.vuepress/config/plugins.js
+++ /dev/null
@@ -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",
- },
- ],
- })
-]
\ No newline at end of file
diff --git a/.vuepress/config/theme.js b/.vuepress/config/theme.js
index 214cfb862..1a59841d6 100644
--- a/.vuepress/config/theme.js
+++ b/.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",
+ },
+ ],
}
}
})
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5af1c4e36..31cddd1ba 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
# CONTRIBUTING
-Thank you so much for thinking of contributing to the 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
diff --git a/README.md b/README.md
index 714737638..1cffbf027 100644
--- a/README.md
+++ b/README.md
@@ -6,13 +6,12 @@
[](https://discord.gg/AJSX9DCSUA)
[](https://www.codetriage.com/ocelot-social-community/ocelot-social)
-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.
-
-
-
-
+
+
+
@@ -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 to your website.
+ - Add the link [ocelot.social](https://ocelot.social) to your website.
- Give ocelot.social a Like at .
- Star our project on GitHub at .
- Promote it on your social networks.
@@ -140,11 +139,11 @@ $ cd Ocelot-Social
### Live Demo and Developer Logins
-**Try out our deployed development environment.**
+**Try out our deployed [development environment](https://stage.ocelot.social).**
Visit our staging networks:
-- central staging network: stage.ocelot.social
+- central staging network: [stage.ocelot.social](https://stage.ocelot.social)
#### Login
diff --git a/cypress/cypress.config.js b/cypress/cypress.config.js
index db8308557..2a41e11a8 100644
--- a/cypress/cypress.config.js
+++ b/cypress/cypress.config.js
@@ -39,6 +39,8 @@ module.exports = defineConfig({
supportFile: "cypress/support/e2e.js",
retries: 0,
video: false,
+ viewportHeight: 720,
+ viewportWidth: 1290,
setupNodeEvents,
},
env: parsed
diff --git a/cypress/support/step_definitions/common/I_click_the_checkbox_show_donations_progress_bar_and_save.js b/cypress/support/step_definitions/common/I_click_the_checkbox_show_donations_progress_bar_and_save.js
index 1806af807..257b2b556 100644
--- a/cypress/support/step_definitions/common/I_click_the_checkbox_show_donations_progress_bar_and_save.js
+++ b/cypress/support/step_definitions/common/I_click_the_checkbox_show_donations_progress_bar_and_save.js
@@ -1,6 +1,8 @@
import { Then } from "@badeball/cypress-cucumber-preprocessor";
+import 'cypress-network-idle';
Then("I click the checkbox show donations progress bar and save", () => {
cy.get("#showDonations").click()
cy.get(".donations-info-button").click()
+ cy.waitForNetworkIdle(2000)
})
diff --git a/deployment/README.md b/deployment/README.md
index 1af6e0f03..2732919c9 100644
--- a/deployment/README.md
+++ b/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).
-
-
+
+
-
+