Merge branch 'master' into dependabot/npm_and_yarn/vuepress-b69fc2c674

This commit is contained in:
Wolfgang Huß 2024-06-10 18:12:31 +02:00 committed by GitHub
commit 826143b324
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 124 additions and 9 deletions

110
README.md Normal file
View File

@ -0,0 +1,110 @@
# ocelot.social Website
This repository contains the Website <https://ocelot.social> utilizing `vuepress` to generate it.
## Software requirements
This package requires:
- [nodejs](https://github.com/nodejs/node)
- [npm](https://github.com/npm/cli)
## Techstack
This package uses:
- [vuepress](https://github.com/vuejs/vuepress)
- [vuepress-theme-hope](https://github.com/vuepress-theme-hope/vuepress-theme-hope)
<!-- - [vuepress-deploy](https://github.com/jenkey2011/vuepress-deploy) -->
## Usage
How to use this package.
### Build
Build the static files of the website which then can be found under `docs/.vuepress/dist/`.
```bash
npm run build
```
### Dev
Bring up a development environment with hot reloading which can be reached under <http://localhost:8080/>:
```bash
npm run dev
```
### Test
Run the tests to ensure everything is working as expected:
```bash
# general tests
$ npm test
# test linting
$ npm test:lint
# fix linting
$ npm test:lint:fix
```
<!-- ## Deploy
You can use the webhook template `webhook.conf.template` and the `deploy.sh` script in `.github/webhooks/` for an automatic deployment from a (github) webhook.
For this to work follow these steps (using alpine):
```bash
apk add webhook
cp .github/webhooks/hooks.json.template .github/webhooks/hooks.json
vi .github/webhooks/hooks.json
# adjust content of .github/webhooks/hooks.json
# replace all variables accordingly
# copy webhook service file
cp .github/webhooks/webhook.template /etc/init.d/webhook
vi /etc/init.d/webhook
# adjust content of /etc/init.d/webhook
chmod +x /etc/init.d/webhook
service webhook start
rc-update add webhook boot
vi /etc/nginx/http.d/default.conf
# adjust the nginx config
# location /hooks/ {
# proxy_http_version 1.1;
# proxy_set_header Upgrade $http_upgrade;
# proxy_set_header Connection 'upgrade';
# proxy_set_header X-Forwarded-For $remote_addr;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header Host $host;
#
# proxy_pass http://127.0.0.1:9000/hooks/;
# proxy_redirect off;
#
# #access_log $LOG_PATH/nginx-access.hooks.log hooks_log;
# #error_log $LOG_PATH/nginx-error.backend.hook.log warn;
# }
```
For the github webhook configure the following:
| Field | Value |
|------------------------------------------------------|-------------------------------|
| Payload URL | <https://it4c.dev/hooks/github> |
| Content type | application/json |
| Secret | A SECRET |
| SSL verification | Enable SSL verification |
| Which events would you like to trigger this webhook? | Send me everything. |
| Active | [x] |
## How it works
This repository utilizes `vuepress-deploy` to automatically deploy the current `master` branch to github pages.
![repo-architecture](./docs/images/docs/architecture.png)
A Pullrequest-Review-Workflow is applied to get changes into the `master`. From there on an automatic github workflow script utilizing `vuepress-deploy` is taking over. The vuepress page is built and force-pushed to the `gh-pages` branch, which in turn is then deployed on the github pages infrastructure and bound to the web address [IT4C.dev](https://www.it4c.dev). -->

View File

@ -95,10 +95,14 @@ h1, h2, h3, h4 {
}
.theme-hope-content Button.donate-button {
background-color: $theme-color !important;
background-color: $theme-color;
opacity: 0.85 !important;
border: 0 !important;
color: white !important;
html[data-theme="dark"] & {
background-color: rgba($theme-color, 0.75) !important;
}
};
.theme-hope-content Button.donate-button:hover {

View File

@ -30,7 +30,7 @@ tagLine:
</div>
</div>
<h2 id="benefits" class="large-header">Warum Ocelot.Social?</h2>
<h2 id="benefits" class="large-header">Warum ocelot.social?</h2>
<div class="benefits-grid center">
<figure>

View File

@ -57,7 +57,7 @@ Für weitere Informationen besuche die Website des Betreibers oder kontaktiere i
### Betreibe ein eigenes Netzwerk
Mit der freien Software *ocelot.social* und dem nötigen Know-How kannst du ein eigenes Netzwerk betreiben (→ [Dokumentation](https://docs.ocelot.social/deployment/), auf Englisch).
Mit der freien Software *ocelot.social* und dem nötigen Know-How kannst du ein [eigenes Netzwerk betreiben](/de/get-started/).
Benötigst du dabei Hilfe, dann [unterstützen](/de/contact/) dich unsere Entwickler gerne.

View File

@ -14,13 +14,12 @@ Click on the area that interests you:
- [Support your network](#support-your-network)
- [Operate your own network](#operate-your-own-network)
- [Make the *ocelot.social* software known](#make-the-ocelot-social-software-known)
- [Promote *ocelot.social*](#promote-ocelot-social)
- [Improve the network](#improve-the-network)
- [Would you like to help test new functions?](#would-you-like-to-help-test-new-functions)
- [Do you like writing?](#do-you-like-writing)
- [Do you speak a foreign language?](#do-you-speak-a-foreign-language)
- [Do you like organizing?](#do-you-like-organizing)
- [Organisierst du gerne?](#organisierst-du-gerne)
- [Help develop the software](#help-develop-the-software)
- [Other ideas for getting involved?](#other-ideas-for-getting-involved)
- [Donate](#donate)
@ -57,11 +56,11 @@ For more information, visit the operators website or contact them.
### Operate your own network
With the free software *ocelot.social* and the necessary know-how, you can run your own network (→ [Documentation](https://docs.ocelot.social/deployment/)).
With the free software *ocelot.social* and the necessary know-how, you can run [your own network](/en/get-started/).
If you need help with this, our developers will be happy to [support](/en/contact/) you.
### Make the *ocelot.social* software known
### Promote *ocelot.social*
<!-- markdownlint-disable-next-line no-emphasis-as-heading -->
*“Spread the word!”*

View File

@ -57,7 +57,7 @@ Pour plus dinformations, visites le site web de lopérateur ou contactes-l
### Gére ton propre réseau
Avec le logiciel gratuit *ocelot.social* et le savoir-faire nécessaire, tu peux gérer ton propre réseau (→ [Documentation](https://docs.ocelot.social/deployment/), en anglais).
Avec le logiciel gratuit *ocelot.social* et le savoir-faire nécessaire, tu peux [gérer ton propre réseau](/fr/get-started/).
Si tu asbesoin daide, nos développeurs se feront un plaisir de [taider](/fr/contact/).

View File

@ -8,7 +8,9 @@
"scripts": {
"build": "vuepress build docs",
"dev": "vuepress dev docs",
"test": "textlint \"*.md\" \"docs/**/*.md\""
"test": "npm run test:lint",
"test:lint": "textlint \"*.md\" \"docs/**/*.md\"",
"test:lint:fix": "textlint \"*.md\" \"docs/**/*.md\" --fix"
},
"repository": {
"type": "git",