mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
Merge branch 'master' into dependabot/npm_and_yarn/babel/core-7.23.2
This commit is contained in:
mahula
GitHub
commit
472b6fae11
164
README.md
164
README.md
@ -6,7 +6,7 @@
|
|||||||
[](https://discord.gg/AJSX9DCSUA)
|
[](https://discord.gg/AJSX9DCSUA)
|
||||||
[](https://www.codetriage.com/ocelot-social-community/ocelot-social)
|
[](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 -->
|
<!-- markdownlint-disable MD033 -->
|
||||||
<p align="center">
|
<p align="center">
|
||||||
@ -18,36 +18,45 @@ Our goal is to enable people to participate fairly and equally in online social
|
|||||||
|
|
||||||
We therefore consider it desirable that operators offer such networks so that people can choose where they want to be on the move.
|
We therefore consider it desirable that operators offer such networks so that people can choose where they want to be on the move.
|
||||||
|
|
||||||
At the same time, it should be possible in the future to link these networks with each other (ActivityPub, Fediverse), so that users can also connect with people from other networks - for example by making friends or following posts or other contributions.
|
Our vision for the future is that at some point it should be possible to link these networks together (ActivityPub, Fediverse) so that users can also connect with people from other networks - for example, by friending them or following posts or other contributions.
|
||||||
|
|
||||||
|
If you would like to help set up this capability with us, please contact us.
|
||||||
|
|
||||||
In other words, we are interested in a network of networks and in keeping the data as close as possible to the user and the operator they trusts.
|
In other words, we are interested in a network of networks and in keeping the data as close as possible to the user and the operator they trusts.
|
||||||
|
|
||||||
## Screenshots
|
## Screenshots
|
||||||
|
|
||||||
|
<!-- markdownlint-disable MD033 -->
|
||||||
<img src="https://user-images.githubusercontent.com/17728384/218597429-554e4082-3906-4721-8f68-0c13146fc218.png" alt="Post feed" title="Post feed" />
|
<img src="https://user-images.githubusercontent.com/17728384/218597429-554e4082-3906-4721-8f68-0c13146fc218.png" alt="Post feed" title="Post feed" />
|
||||||
|
<!-- markdownlint-enable MD033 -->
|
||||||
|
|
||||||
Check out more screenshots [here](/wiki/en:Screenshots).
|
Check out more screenshots [here](https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki/en:Screenshots).
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
Ocelot.social networks feature:
|
Ocelot.social networks features:
|
||||||
* <strong>user accounts</strong>
|
|
||||||
* <strong>user roles</strong>
|
|
||||||
* <strong>posts</strong> and <strong>comments</strong>
|
|
||||||
* <strong>groups</strong>
|
|
||||||
* <strong>maps</strong>
|
|
||||||
* <strong>search</strong>
|
|
||||||
* <strong>filters</strong>
|
|
||||||
* and more …
|
|
||||||
|
|
||||||
Check out the [full feature list](/wiki/en:FAQ#what-are-the-features).
|
- **news feed**
|
||||||
|
- **posts**
|
||||||
|
- as **articles** and **events**
|
||||||
|
- **comments**
|
||||||
|
- **filter**
|
||||||
|
- **search**
|
||||||
|
- **groups**
|
||||||
|
- **map**
|
||||||
|
- **user accounts**
|
||||||
|
- **user roles**
|
||||||
|
- make your own **branded network**
|
||||||
|
- and more …
|
||||||
|
|
||||||
|
Check out the [full feature list](https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki/en:FAQ#what-are-the-features).
|
||||||
|
|
||||||
## User Guide and Frequently Asked Questions
|
## User Guide and Frequently Asked Questions
|
||||||
|
|
||||||
In the [wiki](/wiki) you can find more information.
|
In the [wiki](https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki) you can find more information.
|
||||||
|
|
||||||
* [User Guide](/wiki/en:User-Guide)
|
- [User Guide](https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki/en:User-Guide)
|
||||||
* [Frequently Asked Questions](/wiki/en:FAQ)
|
- [Frequently Asked Questions](https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki/en:FAQ)
|
||||||
|
|
||||||
## Demo
|
## Demo
|
||||||
|
|
||||||
@ -57,27 +66,28 @@ 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.:
|
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:
|
- 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/.
|
- 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/.
|
- Star our project on GitHub at <https://github.com/Ocelot-Social-Community/Ocelot-Social/>.
|
||||||
* Promote it on your social networks.
|
- Promote it on your social networks.
|
||||||
* Tell your friends about it by word-of-mouth.
|
- Tell your friends about it by word-of-mouth.
|
||||||
* Write a press article on ocelot.social or contact the editorial office of your local newspage or radio station.
|
- Write a press article on ocelot.social or contact the editorial office of your local news page or radio station.
|
||||||
* Take a [good first issue](https://github.com/Ocelot-Social-Community/Ocelot-Social/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) or issues that need help. Make sure to read [CONTRIBUTING.md](/CONTRIBUTING.md) first though.
|
- Take a [good first issue](https://github.com/Ocelot-Social-Community/Ocelot-Social/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) or issues that need help. Make sure to read [CONTRIBUTING.md](/CONTRIBUTING.md) first though.
|
||||||
* Testing and [reporting](/issues/new/choose) bugs.
|
- Testing and [reporting](https://github.com/Ocelot-Social-Community/Ocelot-Social/issues/new/choose) bugs.
|
||||||
* Translating: Please [contact us](#contact).
|
- Translating: Please [contact us](#contact).
|
||||||
* Reviewing and testing pull requests.
|
- Reviewing and testing pull requests.
|
||||||
|
|
||||||
## Donate
|
## Donate
|
||||||
|
|
||||||
Your donation is very welcome and helps to enhance and improve the network. This software is mostly developped and maintained by the association [busFaktor() e.V.](https://www.busfaktor.org/en). Please support us with a [donation](https://www.busfaktor.org/en/donations) to busFaktor() e.V.. Thanks a lot! ❤️
|
Your donation is very welcome and helps to enhance and improve the network. This software is mostly developed and maintained by the association [busFaktor() e.V.](https://www.busfaktor.org/en) . Please support us with a [donation](https://www.busfaktor.org/en/donations) to busFaktor() e.V. . Thanks a lot! ❤️
|
||||||
|
|
||||||
## Contact
|
## Contact
|
||||||
|
|
||||||
Are you interested in operating your own ocelot.social network or becoming a user? Please contact us here:
|
Are you interested in operating your own ocelot.social network or becoming a user? Please contact us here:
|
||||||
* [hello@ocelot.social](mailto:hello@ocelot.social)
|
|
||||||
* [Discord](https://discord.com/invite/DFSjPaX)
|
- [hello@ocelot.social](mailto:hello@ocelot.social)
|
||||||
|
- our developer chat on [Discord](https://discord.gg/AJSX9DCSUA)
|
||||||
|
|
||||||
## For Developers and Contributors
|
## For Developers and Contributors
|
||||||
|
|
||||||
@ -90,17 +100,17 @@ Have a look into our short video:
|
|||||||
|
|
||||||
There are three important directories:
|
There are three important directories:
|
||||||
|
|
||||||
* [Backend](./backend) runs on the server and is a middleware between database and frontend
|
- [Backend](./backend) runs on the server and is a middleware between database and frontend
|
||||||
* [Frontend](./webapp) is a server-side-rendered and client-side-rendered web frontend
|
- [Frontend](./webapp) is a server-side-rendered and client-side-rendered web frontend
|
||||||
* [Cypress](./cypress) contains end-to-end tests and executable feature specifications
|
- [Cypress](./cypress) contains end-to-end tests and executable feature specifications
|
||||||
|
|
||||||
In order to setup the application and start to develop features you have to
|
In order to setup the application and start to develop features you have to
|
||||||
setup **frontend** and **backend**.
|
setup **webapp** and **backend**.
|
||||||
|
|
||||||
There are two approaches:
|
There are two approaches:
|
||||||
|
|
||||||
1. [Local](#local-installation) installation, which means you have to take care of dependencies yourself.
|
1. [Local](#local-installation) installation, which means you have to take care of dependencies yourself.
|
||||||
2. **Or** Install everything through [Docker](#docker-installation) which takes care of dependencies for you.
|
2. **Or** install everything through [Docker](#docker-installation) which takes care of dependencies for you.
|
||||||
|
|
||||||
### Installation
|
### Installation
|
||||||
|
|
||||||
@ -126,13 +136,13 @@ Change into the new folder.
|
|||||||
$ cd Ocelot-Social
|
$ cd Ocelot-Social
|
||||||
```
|
```
|
||||||
|
|
||||||
### Live Demo And Developer Logins
|
### 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:
|
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). -->
|
<!-- - rebranded staging network: [rebrand.ocelot.social](https://stage.ocelot.social). -->
|
||||||
|
|
||||||
#### Login
|
#### Login
|
||||||
@ -151,19 +161,14 @@ Docker is a software development container tool that combines software and its d
|
|||||||
|
|
||||||
##### General Installation of Docker
|
##### General Installation of Docker
|
||||||
|
|
||||||
There are [several ways to install Docker CE](https://docs.docker.com/install/) on your computer or server.
|
There are [several ways to install Docker](https://docs.docker.com/get-docker/) on your computer or server.
|
||||||
|
|
||||||
* [install Docker Desktop on macOS](https://docs.docker.com/docker-for-mac/install/)
|
|
||||||
* [install Docker Desktop on Windows](https://docs.docker.com/docker-for-windows/install/)
|
|
||||||
* [install Docker CE on Linux](https://docs.docker.com/install/)
|
|
||||||
|
|
||||||
Check the correct Docker installation by checking the version before proceeding. E.g. we have the following versions:
|
Check the correct Docker installation by checking the version before proceeding. E.g. we have the following versions:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
# use Docker version 24.0.6 or newer
|
||||||
|
# includes Docker Compose
|
||||||
$ docker --version
|
$ docker --version
|
||||||
Docker version 18.09.2
|
|
||||||
$ docker-compose --version
|
|
||||||
docker-compose version 1.23.2
|
|
||||||
```
|
```
|
||||||
|
|
||||||
##### Start Ocelot-Social via Docker-Compose
|
##### Start Ocelot-Social via Docker-Compose
|
||||||
@ -182,14 +187,14 @@ For Development:
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# in main folder
|
# in main folder
|
||||||
$ docker-compose up
|
$ docker compose up
|
||||||
```
|
```
|
||||||
|
|
||||||
For Production:
|
For Production:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# in main folder
|
# in main folder
|
||||||
$ docker-compose -f docker-compose.yml up
|
$ docker compose -f docker-compose.yml up
|
||||||
```
|
```
|
||||||
|
|
||||||
This will start all required Docker containers.
|
This will start all required Docker containers.
|
||||||
@ -198,7 +203,7 @@ Make sure your database is running on `http://localhost:7474/browser/`.
|
|||||||
Prepare database once before you start by running the following command in a second terminal:
|
Prepare database once before you start by running the following command in a second terminal:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# in main folder while docker-compose is up
|
# in main folder while docker compose is up
|
||||||
$ docker compose exec backend yarn run db:migrate init
|
$ docker compose exec backend yarn run db:migrate init
|
||||||
$ docker compose exec backend yarn run db:migrate up
|
$ docker compose exec backend yarn run db:migrate up
|
||||||
```
|
```
|
||||||
@ -206,17 +211,17 @@ $ docker compose exec backend yarn run db:migrate up
|
|||||||
Then clear and seed database by running the following command as well in the second terminal:
|
Then clear and seed database by running the following command as well in the second terminal:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# in main folder while docker-compose is up
|
# in main folder while docker compose is up
|
||||||
$ docker-compose exec backend yarn run db:reset
|
$ docker compose exec backend yarn run db:reset
|
||||||
$ docker-compose exec backend yarn run db:seed
|
$ docker compose exec backend yarn run db:seed
|
||||||
```
|
```
|
||||||
|
|
||||||
For a closer description see [backend README.md](./backend/README.md).
|
For a closer description see [backend](./backend/README.md).
|
||||||
For a full documentation see [SUMMARY](./SUMMARY.md).
|
For a full documentation of the Docker installation see [summary](./SUMMARY.md).
|
||||||
|
|
||||||
#### Local Installation
|
#### Local Installation
|
||||||
|
|
||||||
For a full documentation see [SUMMARY](./SUMMARY.md).
|
For a full documentation of the local installation see [summary](./SUMMARY.md).
|
||||||
|
|
||||||
### Contributing
|
### Contributing
|
||||||
|
|
||||||
@ -225,7 +230,9 @@ To have the necessary permission to push directly to this repository, please acc
|
|||||||
|
|
||||||
We are happy if you fork our repository, but we don't recommend it for development. You do not need a fork.
|
We are happy if you fork our repository, but we don't recommend it for development. You do not need a fork.
|
||||||
|
|
||||||
Clone this repository locally as [described above](#clone-the-repository), create your branch named `<issue-number>-<description>`, add your code and push your branch to this repository. Then create a PR by comparing it to our `master`.
|
Clone this repository locally as [described above](#clone-the-repository), create your branch named `<issue-number>-<description>`, add your code and push your branch direct to this repository. Then create a PR by comparing it to our `master`.
|
||||||
|
|
||||||
|
**_!!! Be aware:_** Please don't compare from a fork, because the tests are breaking caused by credential problems.
|
||||||
|
|
||||||
Please run the following commands before you push:
|
Please run the following commands before you push:
|
||||||
|
|
||||||
@ -246,33 +253,48 @@ Check out our [contribution guideline](./CONTRIBUTING.md), too!
|
|||||||
|
|
||||||
#### Developer Chat
|
#### Developer Chat
|
||||||
|
|
||||||
Join our friendly open-source community on [Discord](https://discord.gg/AJSX9DCSUA) :heart_eyes_cat:
|
Join our friendly open-source community on [Discord](https://discord.gg/AJSX9DCSUA) 😻
|
||||||
Just introduce yourself at `#introduce-yourself` and mention a mentor or `@@Mentors` to get you onboard :neckbeard:
|
Just introduce yourself at `#introduce-yourself` and mention a mentor or `@@Mentors` to get you onboard 🤓
|
||||||
|
|
||||||
We give write permissions to every developer who asks for it. Just text us on
|
We give write permissions to every developer who asks for it. Just text us on
|
||||||
[Discord](https://discord.gg/AJSX9DCSUA).
|
[Discord](https://discord.gg/AJSX9DCSUA).
|
||||||
|
|
||||||
### Deployment
|
### Deployment
|
||||||
|
|
||||||
Deployment methods can be found in the [Ocelot-Social-Deploy-Rebranding](https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding) repository.
|
Deployment methods can be found in our `deployment` folder described in the [README](./deployment/README.md).
|
||||||
|
Our branding template is our [stage.ocelot.social](https://github.com/Ocelot-Social-Community/stage.ocelot.social) repository.
|
||||||
|
Place your branding repository inside `deployment/configurations`.
|
||||||
|
|
||||||
The only deployment method in this repository for development purposes as described above is `docker-compose`.
|
The only deployment method in this repository for production purposes is [Kubernetes](https://kubernetes.io) for now.
|
||||||
|
But we just started to develop a deployment for [Docker Compose](https://docs.docker.com/compose/) as well.
|
||||||
|
|
||||||
|
The only deployment method with branding in this repository for development purposes as described above is [Docker Compose](https://docs.docker.com/compose/):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# in folder deployment/
|
||||||
|
# set your branding folder name in .env
|
||||||
|
# then run
|
||||||
|
$ docker compose up
|
||||||
|
```
|
||||||
|
|
||||||
|
The code is branded automatically.
|
||||||
|
To setup the Neo4j database see above.
|
||||||
|
|
||||||
### Technology Stack
|
### Technology Stack
|
||||||
|
|
||||||
* [VueJS](https://vuejs.org/)
|
- [VueJS](https://vuejs.org/)
|
||||||
* [NuxtJS](https://nuxtjs.org/)
|
- [NuxtJS](https://nuxtjs.org/)
|
||||||
* [GraphQL](https://graphql.org/)
|
- [GraphQL](https://graphql.org/)
|
||||||
* [NodeJS](https://nodejs.org/en/)
|
- [NodeJS](https://nodejs.org/en/)
|
||||||
* [Neo4J](https://neo4j.com/)
|
- [Neo4J](https://neo4j.com/)
|
||||||
|
|
||||||
#### For Testing
|
#### For Testing
|
||||||
|
|
||||||
* [Cypress](https://docs.cypress.io/)
|
- [Cypress](https://docs.cypress.io/)
|
||||||
* [Storybook](https://storybook.js.org/)
|
- [Storybook](https://storybook.js.org/)
|
||||||
* [Jest](https://jestjs.io/)
|
- [Jest](https://jestjs.io/)
|
||||||
* [Vue Test Utils](https://vue-test-utils.vuejs.org/)
|
- [Vue Test Utils](https://vue-test-utils.vuejs.org/)
|
||||||
* [ESLint](https://eslint.org/)
|
- [ESLint](https://eslint.org/)
|
||||||
|
|
||||||
### Attributions
|
### Attributions
|
||||||
|
|
||||||
@ -280,7 +302,9 @@ Locale Icons made by [Freepik](http://www.freepik.com/) from [www.flaticon.com](
|
|||||||
|
|
||||||
Browser compatibility testing with [BrowserStack](https://www.browserstack.com/).
|
Browser compatibility testing with [BrowserStack](https://www.browserstack.com/).
|
||||||
|
|
||||||
|
<!-- markdownlint-disable MD033 -->
|
||||||
<img alt="BrowserStack Logo" src=".gitbook/assets/browserstack-logo.svg" width="256">
|
<img alt="BrowserStack Logo" src=".gitbook/assets/browserstack-logo.svg" width="256">
|
||||||
|
<!-- markdownlint-enable MD033 -->
|
||||||
|
|
||||||
### License
|
### License
|
||||||
|
|
||||||
|
|||||||
12
SUMMARY.md
12
SUMMARY.md
@ -6,19 +6,17 @@
|
|||||||
* [Backend](backend/README.md)
|
* [Backend](backend/README.md)
|
||||||
* [GraphQL](backend/graphql.md)
|
* [GraphQL](backend/graphql.md)
|
||||||
* [neo4j-graphql-js](backend/neo4j-graphql-js.md)
|
* [neo4j-graphql-js](backend/neo4j-graphql-js.md)
|
||||||
* [Webapp](webapp/README.md)
|
* [Webapp (Frontend)](webapp/README.md)
|
||||||
* [Components](webapp/components.md)
|
* [Components](webapp/components.md)
|
||||||
* [HTML](webapp/html.md)
|
* [HTML](webapp/html.md)
|
||||||
* [SCSS](webapp/scss.md)
|
* [SCSS](webapp/scss.md)
|
||||||
* [Vue](webapp/vue.md)
|
* [Vue](webapp/vue.md)
|
||||||
* [Testing Guide](testing.md)
|
* [Testing Guide](testing.md)
|
||||||
* [End-to-end tests](cypress/README.md)
|
* [End-to-end Tests](cypress/README.md)
|
||||||
* [Frontend tests](webapp/testing.md)
|
* [Webapp (Frontend) Tests](webapp/testing.md)
|
||||||
* [Backend tests](backend/testing.md)
|
* [Backend Tests](backend/testing.md)
|
||||||
* [Docker More Closely](DOCKER_MORE_CLOSELY.md)
|
|
||||||
* [Deployment](deployment/README.md)
|
* [Deployment](deployment/README.md)
|
||||||
* [Contributing](CONTRIBUTING.md)
|
* [Contributing](CONTRIBUTING.md)
|
||||||
* [Feature Specification](cypress/features.md)
|
* [Feature Specification](cypress/features.md)
|
||||||
* [Code of conduct](CODE_OF_CONDUCT.md)
|
* [Code of Conduct](CODE_OF_CONDUCT.md)
|
||||||
* [License](LICENSE.md)
|
* [License](LICENSE.md)
|
||||||
|
|
||||||
|
|||||||
@ -2,12 +2,13 @@
|
|||||||
|
|
||||||
GraphQL is a data query language which provides an alternative to REST and ad-hoc web service architectures. It allows clients to define the structure of the data required, and exactly the same structure of the data is returned from the server.
|
GraphQL is a data query language which provides an alternative to REST and ad-hoc web service architectures. It allows clients to define the structure of the data required, and exactly the same structure of the data is returned from the server.
|
||||||
|
|
||||||
|
We have a closer description for the [GraphQL Playground](./src/graphql/GraphQL-Playground.md).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Middleware keeps resolvers clean
|
## Middleware keeps resolvers clean
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
A well-organized codebase is key for the ability to maintain and easily introduce changes into an app. Figuring out the right structure for your code remains a continuous challenge - especially as an application grows and more developers are joining a project.
|
A well-organized codebase is key for the ability to maintain and easily introduce changes into an app. Figuring out the right structure for your code remains a continuous challenge - especially as an application grows and more developers are joining a project.
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
# GraphQL Playground
|
# GraphQL Playground
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
***Attention:** For using the GraphQL Playground set `DEBUG=true` in your backend `.env`, see `.env.template`!*
|
***Attention:** For using the GraphQL Playground set `DEBUG=true` in your backend `.env`, see `.env.template`!*
|
||||||
|
|
||||||
To use GraphQL Playground, we need to know some basics:
|
To use GraphQL Playground, we need to know some basics:
|
||||||
|
|||||||
@ -1,2 +1,3 @@
|
|||||||
# Unit Testing
|
# Unit Testing
|
||||||
|
|
||||||
|
***TODO:** To be filled in*
|
||||||
|
|||||||
@ -31,7 +31,8 @@ const { parsed } = dotenv.config({ path: '../backend/.env' })
|
|||||||
module.exports = defineConfig({
|
module.exports = defineConfig({
|
||||||
e2e: {
|
e2e: {
|
||||||
projectId: "qa7fe2",
|
projectId: "qa7fe2",
|
||||||
defaultCommandTimeout: 10000,
|
defaultCommandTimeout: 60000,
|
||||||
|
pageLoadTimeout:180000,
|
||||||
chromeWebSecurity: false,
|
chromeWebSecurity: false,
|
||||||
baseUrl: "http://localhost:3000",
|
baseUrl: "http://localhost:3000",
|
||||||
specPattern: "cypress/e2e/**/*.feature",
|
specPattern: "cypress/e2e/**/*.feature",
|
||||||
|
|||||||
@ -4,7 +4,7 @@ When you introduce a new version and branding and deploy it on your network, you
|
|||||||
|
|
||||||
## Version >= 3.3.0 with 'ocelotDockerVersionTag' 3.3.0-XXX
|
## Version >= 3.3.0 with 'ocelotDockerVersionTag' 3.3.0-XXX
|
||||||
|
|
||||||
- We have the new option to configure DKIM for sent e-mails in environment variables (`.env` or `values.yaml`), see [here](deployment.md):
|
- We have the new option to configure DKIM for sent e-mails in environment variables (`.env` or `values.yaml`), see [deployment-values.md](deployment-values.md):
|
||||||
- `SMTP_DKIM_DOMAINNAME=`
|
- `SMTP_DKIM_DOMAINNAME=`
|
||||||
- `SMTP_DKIM_KEYSELECTOR=`
|
- `SMTP_DKIM_KEYSELECTOR=`
|
||||||
- `SMTP_DKIM_PRIVATKEY=`
|
- `SMTP_DKIM_PRIVATKEY=`
|
||||||
|
|||||||
@ -142,19 +142,35 @@ services:
|
|||||||
- 3001:80
|
- 3001:80
|
||||||
|
|
||||||
neo4j:
|
neo4j:
|
||||||
|
# Neo4j v3.5.14-community
|
||||||
|
# image: wollehuss/neo4j-community-branded:latest
|
||||||
|
# Neo4j 4.4-community
|
||||||
image: ocelotsocialnetwork/neo4j-community:latest
|
image: ocelotsocialnetwork/neo4j-community:latest
|
||||||
container_name: neo4j-branded
|
container_name: neo4j-branded
|
||||||
networks:
|
networks:
|
||||||
- test-network
|
- test-network
|
||||||
|
ports:
|
||||||
|
- 7687:7687
|
||||||
|
# only for development
|
||||||
|
# - 7474:7474
|
||||||
|
- 7474:7474
|
||||||
volumes:
|
volumes:
|
||||||
- neo4j_data:/data
|
- neo4j_data:/data
|
||||||
environment:
|
environment:
|
||||||
|
# settings reference: https://neo4j.com/docs/operations-manual/4.4/docker/ref-settings/
|
||||||
|
# TODO: This sounds scary for a production environment
|
||||||
- NEO4J_AUTH=none
|
- NEO4J_AUTH=none
|
||||||
- NEO4J_dbms_security_procedures_unrestricted=algo.*,apoc.*
|
- NEO4J_dbms_security_procedures_unrestricted=algo.*,apoc.*
|
||||||
- NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
|
- NEO4J_dbms_allow__format__migration=true
|
||||||
ports:
|
- NEO4J_dbms_allow__upgrade=true
|
||||||
- 7687:7687
|
# TODO: clarify if that is the only thing needed to unlock the Enterprise version
|
||||||
- 7474:7474
|
# - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
|
||||||
|
# Uncomment following line for Neo4j Enterprise version instead of Community version
|
||||||
|
# TODO: clarify if that is the only thing needed to unlock the Enterprise version
|
||||||
|
# - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
|
||||||
|
# TODO: Remove the playground from production
|
||||||
|
# bring the database in offline mode to export or load dumps
|
||||||
|
# command: ["tail", "-f", "/dev/null"]
|
||||||
|
|
||||||
mailserver:
|
mailserver:
|
||||||
image: djfarrelly/maildev
|
image: djfarrelly/maildev
|
||||||
|
|||||||
@ -18,16 +18,8 @@ BACKUP_FOLDER=${BACKUP_FOLDER:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/
|
|||||||
# create backup fodler
|
# create backup fodler
|
||||||
mkdir -p ${BACKUP_FOLDER}
|
mkdir -p ${BACKUP_FOLDER}
|
||||||
|
|
||||||
# maintenance mode on
|
# cluster maintenance mode on && Neo4j maintenance mode on
|
||||||
${SCRIPT_DIR}/cluster.maintenance.sh on
|
${SCRIPT_DIR}/cluster.neo4j.sh maintenance on
|
||||||
|
|
||||||
# shutdown database
|
|
||||||
kubectl --kubeconfig=${KUBECONFIG} get deployment ocelot-neo4j -o json \
|
|
||||||
| jq '.spec.template.spec.containers[] += {"command": ["tail", "-f", "/dev/null"]}' \
|
|
||||||
| kubectl --kubeconfig=${KUBECONFIG} apply -f -
|
|
||||||
|
|
||||||
# wait for the container to restart
|
|
||||||
sleep 60
|
|
||||||
|
|
||||||
# database backup
|
# database backup
|
||||||
kubectl --kubeconfig=${KUBECONFIG} -n default exec -it \
|
kubectl --kubeconfig=${KUBECONFIG} -n default exec -it \
|
||||||
@ -40,13 +32,5 @@ kubectl --kubeconfig=${KUBECONFIG} cp \
|
|||||||
kubectl --kubeconfig=${KUBECONFIG} cp \
|
kubectl --kubeconfig=${KUBECONFIG} cp \
|
||||||
default/$(kubectl --kubeconfig=${KUBECONFIG} -n default get pods | grep ocelot-backend |awk '{ print $1 }'):/app/public/uploads $BACKUP_FOLDER/public-uploads
|
default/$(kubectl --kubeconfig=${KUBECONFIG} -n default get pods | grep ocelot-backend |awk '{ print $1 }'):/app/public/uploads $BACKUP_FOLDER/public-uploads
|
||||||
|
|
||||||
# restart database
|
# Neo4j maintenance mode off && cluster maintenance mode off
|
||||||
kubectl --kubeconfig=${KUBECONFIG} get deployment ocelot-neo4j -o json \
|
${SCRIPT_DIR}/cluster.neo4j.sh maintenance off
|
||||||
| jq 'del(.spec.template.spec.containers[].command)' \
|
|
||||||
| kubectl --kubeconfig=${KUBECONFIG} apply -f -
|
|
||||||
|
|
||||||
# wait for the container to restart
|
|
||||||
sleep 60
|
|
||||||
|
|
||||||
# maintenance mode off
|
|
||||||
${SCRIPT_DIR}/cluster.maintenance.sh off
|
|
||||||
58
deployment/scripts/cluster.install.sh
Executable file
58
deployment/scripts/cluster.install.sh
Executable file
@ -0,0 +1,58 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# !!! never tested !!!
|
||||||
|
|
||||||
|
# base setup
|
||||||
|
SCRIPT_PATH=$(realpath $0)
|
||||||
|
SCRIPT_DIR=$(dirname $SCRIPT_PATH)
|
||||||
|
|
||||||
|
# check CONFIGURATION
|
||||||
|
if [ -z ${CONFIGURATION} ]; then
|
||||||
|
echo "You must provide a `CONFIGURATION` via environment variable"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "Using CONFIGURATION=${CONFIGURATION}"
|
||||||
|
|
||||||
|
# configuration
|
||||||
|
KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
|
||||||
|
VALUES=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubernetes/values.yaml
|
||||||
|
DOCKERHUB_OCELOT_TAG=${DOCKERHUB_OCELOT_TAG:-"latest"}
|
||||||
|
|
||||||
|
|
||||||
|
## install Ingress-Nginx
|
||||||
|
helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
|
||||||
|
helm repo update
|
||||||
|
helm install \
|
||||||
|
ingress-nginx ingress-nginx/ingress-nginx \
|
||||||
|
--kubeconfig=${KUBECONFIG} \
|
||||||
|
-f ${SCRIPT_DIR}/../src/kubernetes/nginx.values.yaml
|
||||||
|
|
||||||
|
## install Cert-Manager
|
||||||
|
helm repo add jetstack https://charts.jetstack.io
|
||||||
|
helm repo update
|
||||||
|
helm install \
|
||||||
|
cert-manager jetstack/cert-manager \
|
||||||
|
--kubeconfig=${KUBECONFIG} \
|
||||||
|
--namespace cert-manager \
|
||||||
|
--create-namespace \
|
||||||
|
--version v1.13.1 \
|
||||||
|
--set installCRDs=true
|
||||||
|
|
||||||
|
## install Ocelot with helm
|
||||||
|
helm install \
|
||||||
|
ocelot \
|
||||||
|
--kubeconfig=${KUBECONFIG} \
|
||||||
|
--values ${VALUES} \
|
||||||
|
--set appVersion="${DOCKERHUB_OCELOT_TAG}" \
|
||||||
|
${SCRIPT_DIR}/../src/kubernetes/ \
|
||||||
|
--timeout 10m
|
||||||
|
|
||||||
|
## set Neo4j database indexes, constrains, and initial admin account plus run migrate up
|
||||||
|
kubectl --kubeconfig=${KUBECONFIG} \
|
||||||
|
-n default \
|
||||||
|
exec -it \
|
||||||
|
$(kubectl --kubeconfig=${KUBECONFIG} -n default get pods | grep ocelot-backend | awk '{ print $1 }') -- \
|
||||||
|
/bin/sh -c "yarn prod:migrate init && yarn prod:migrate up"
|
||||||
|
# /bin/sh -c "node --experimental-repl-await build/src/db/clean.js && node --experimental-repl-await build/src/db/seed.js"
|
||||||
|
|
||||||
|
echo "!!! You must install a firewall or similar !!! (for DigitalOcean see: deployment/src/kubernetes/README.md)"
|
||||||
53
deployment/scripts/cluster.neo4j.sh
Executable file
53
deployment/scripts/cluster.neo4j.sh
Executable file
@ -0,0 +1,53 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# base setup
|
||||||
|
SCRIPT_PATH=$(realpath $0)
|
||||||
|
SCRIPT_DIR=$(dirname $SCRIPT_PATH)
|
||||||
|
|
||||||
|
# check CONFIGURATION
|
||||||
|
if [ -z ${CONFIGURATION} ]; then
|
||||||
|
echo "You must provide a `CONFIGURATION` via environment variable"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# configuration
|
||||||
|
KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
|
||||||
|
|
||||||
|
case $1 in
|
||||||
|
maintenance)
|
||||||
|
case $2 in
|
||||||
|
on)
|
||||||
|
# maintenance mode on
|
||||||
|
${SCRIPT_DIR}/cluster.maintenance.sh on
|
||||||
|
|
||||||
|
# set Neo4j in offline mode (maintenance)
|
||||||
|
kubectl --kubeconfig=${KUBECONFIG} get deployment ocelot-neo4j -o json \
|
||||||
|
| jq '.spec.template.spec.containers[] += {"command": ["tail", "-f", "/dev/null"]}' \
|
||||||
|
| kubectl --kubeconfig=${KUBECONFIG} apply -f -
|
||||||
|
|
||||||
|
# wait for the container to restart
|
||||||
|
sleep 60
|
||||||
|
;;
|
||||||
|
off)
|
||||||
|
# set Neo4j in online mode
|
||||||
|
kubectl --kubeconfig=${KUBECONFIG} get deployment ocelot-neo4j -o json \
|
||||||
|
| jq 'del(.spec.template.spec.containers[].command)' \
|
||||||
|
| kubectl --kubeconfig=${KUBECONFIG} apply -f -
|
||||||
|
|
||||||
|
# wait for the container to restart
|
||||||
|
sleep 60
|
||||||
|
|
||||||
|
# maintenance mode off
|
||||||
|
${SCRIPT_DIR}/cluster.maintenance.sh off
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo -e "Run this script with first argument either 'off' or 'on'"
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo -e "Run this script with first argument 'maintenance'"
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
esac
|
||||||
@ -137,7 +137,7 @@ $ kubectl -n default exec -it $(kubectl -n default get pods | grep ocelot-neo4j
|
|||||||
# bash: enter bash of Neo4j
|
# bash: enter bash of Neo4j
|
||||||
$ kubectl -n default exec -it $(kubectl -n default get pods | grep ocelot-neo4j | awk '{ print $1 }') -- bash
|
$ kubectl -n default exec -it $(kubectl -n default get pods | grep ocelot-neo4j | awk '{ print $1 }') -- bash
|
||||||
# generate Dump
|
# generate Dump
|
||||||
neo4j% neo4j-admin dump --to=/var/lib/neo4j/$(date +%F)-neo4j-dump
|
neo4j% neo4j-admin dump --database=graph.db --to=/var/lib/neo4j/$(date +%F)-neo4j-dump
|
||||||
# exit bash
|
# exit bash
|
||||||
neo4j% exit
|
neo4j% exit
|
||||||
|
|
||||||
|
|||||||
@ -75,7 +75,7 @@ The IPs of the DigitalOcean machines are not necessarily stable, so the cluster'
|
|||||||
|
|
||||||
## Deploy
|
## Deploy
|
||||||
|
|
||||||
Yeah, you're done here. Back to [Deployment with Helm for Kubernetes](/deployment/kubernetes/README.md).
|
Yeah, you're done here. Back to [Deployment with Helm for Kubernetes](/deployment/src/kubernetes/README.md).
|
||||||
|
|
||||||
## Backups On DigitalOcean
|
## Backups On DigitalOcean
|
||||||
|
|
||||||
|
|||||||
@ -9,7 +9,7 @@ Please contact us if you are interested in options not listed below.
|
|||||||
|
|
||||||
Managed Kubernetes:
|
Managed Kubernetes:
|
||||||
|
|
||||||
- [DigitalOcean](/deployment/kubernetes/DigitalOcean.md)
|
- [DigitalOcean](/deployment/src/kubernetes/DigitalOcean.md)
|
||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
@ -46,29 +46,20 @@ Please have a look here:
|
|||||||
|
|
||||||
- [Installing with Helm](https://cert-manager.io/docs/installation/helm/#installing-with-helm)
|
- [Installing with Helm](https://cert-manager.io/docs/installation/helm/#installing-with-helm)
|
||||||
|
|
||||||
Our Helm installation is optimized for cert-manager version `v1.9.1` and `kubectl` version `"v1.24.2`.
|
Our Helm installation is optimized for cert-manager version `v1.13.1` and `kubectl` version `"v1.28.2`.
|
||||||
|
|
||||||
Please search here for cert-manager versions that are compatible with your `kubectl` version on the cluster and on the client: [cert-manager Supported Releases](https://cert-manager.io/docs/installation/supported-releases/#supported-releases).
|
Please search here for cert-manager versions that are compatible with your `kubectl` version on the cluster and on the client: [cert-manager Supported Releases](https://cert-manager.io/docs/installation/supported-releases/#supported-releases).
|
||||||
|
|
||||||
***ATTENTION:*** *When uninstalling cert-manager, be sure to use the same method as for installation! Otherwise, we could end up in a broken state, see [Uninstall](https://cert-manager.io/docs/installation/kubectl/#uninstalling).*
|
***ATTENTION:*** *When uninstalling cert-manager, be sure to use the same method as for installation! Otherwise, we could end up in a broken state, see [Uninstall](https://cert-manager.io/docs/installation/kubectl/#uninstalling).*
|
||||||
|
|
||||||
<!-- #### 1. Create Namespace
|
<!-- #### 1. Add Helm repository and update
|
||||||
|
|
||||||
```bash
|
|
||||||
# kubeconfig.yaml set globaly
|
|
||||||
$ kubectl create namespace cert-manager
|
|
||||||
# or kubeconfig.yaml in your repo, then adjust
|
|
||||||
$ kubectl --kubeconfig=/../kubeconfig.yaml create namespace cert-manager
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 2. Add Helm repository and update
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
$ helm repo add jetstack https://charts.jetstack.io
|
$ helm repo add jetstack https://charts.jetstack.io
|
||||||
$ helm repo update
|
$ helm repo update
|
||||||
```
|
```
|
||||||
|
|
||||||
#### 3. Install Cert-Manager Helm chart
|
#### 2. Install Cert-Manager Helm chart
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# option 1
|
# option 1
|
||||||
@ -76,16 +67,24 @@ $ helm repo update
|
|||||||
# $ kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.3.1/cert-manager.crds.yaml
|
# $ kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.3.1/cert-manager.crds.yaml
|
||||||
|
|
||||||
# option 2
|
# option 2
|
||||||
|
# !!! untested for now for new deployment structure !!!
|
||||||
|
|
||||||
|
# in configuration/<deployment-name>
|
||||||
|
|
||||||
# kubeconfig.yaml set globaly
|
# kubeconfig.yaml set globaly
|
||||||
$ helm install cert-manager jetstack/cert-manager \
|
$ helm install \
|
||||||
|
cert-manager jetstack/cert-manager \
|
||||||
--namespace cert-manager \
|
--namespace cert-manager \
|
||||||
--version v1.9.1 \
|
--create-namespace \
|
||||||
|
--version v1.13.1 \
|
||||||
--set installCRDs=true
|
--set installCRDs=true
|
||||||
# or kubeconfig.yaml in your repo, then adjust
|
# or kubeconfig.yaml in your repo, then adjust
|
||||||
$ helm --kubeconfig=/../kubeconfig.yaml \
|
$ helm install \
|
||||||
install cert-manager jetstack/cert-manager \
|
cert-manager jetstack/cert-manager \
|
||||||
|
--kubeconfig ./kubeconfig.yaml \
|
||||||
--namespace cert-manager \
|
--namespace cert-manager \
|
||||||
--version v1.9.1 \
|
--create-namespace \
|
||||||
|
--version v1.13.1 \
|
||||||
--set installCRDs=true
|
--set installCRDs=true
|
||||||
``` -->
|
``` -->
|
||||||
|
|
||||||
@ -101,10 +100,15 @@ $ helm repo update
|
|||||||
#### 2. Install ingress-nginx
|
#### 2. Install ingress-nginx
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
# in configuration/<deployment-name>
|
||||||
|
|
||||||
# kubeconfig.yaml set globaly
|
# kubeconfig.yaml set globaly
|
||||||
$ helm install ingress-nginx ingress-nginx/ingress-nginx -f nginx.values.yaml
|
helm install ingress-nginx ingress-nginx/ingress-nginx -f ../../src/kubernetes/nginx.values.yaml
|
||||||
|
|
||||||
# or kubeconfig.yaml in your repo, then adjust
|
# or kubeconfig.yaml in your repo, then adjust
|
||||||
$ helm --kubeconfig=/../kubeconfig.yaml install ingress-nginx ingress-nginx/ingress-nginx -f nginx.values.yaml
|
helm install \
|
||||||
|
ingress-nginx ingress-nginx/ingress-nginx -f ../../src/kubernetes/nginx.values.yaml \
|
||||||
|
--kubeconfig ./kubeconfig.yaml
|
||||||
```
|
```
|
||||||
|
|
||||||
### DigitalOcean Firewall
|
### DigitalOcean Firewall
|
||||||
@ -159,6 +163,8 @@ $ doctl compute firewall get <ID> --context <context-name>
|
|||||||
|
|
||||||
### DNS
|
### DNS
|
||||||
|
|
||||||
|
***ATTENTION:** This seems not to work at all so we leave it away at the moment*
|
||||||
|
|
||||||
***TODO:** I thought this is necessary if we use the DigitalOcean DNS management service? See [Manage DNS With DigitalOcean](/deployment/kubernetes/DigitalOcean.md#manage-dns-with-digitalocean)*
|
***TODO:** I thought this is necessary if we use the DigitalOcean DNS management service? See [Manage DNS With DigitalOcean](/deployment/kubernetes/DigitalOcean.md#manage-dns-with-digitalocean)*
|
||||||
|
|
||||||
This chart is only necessary (recommended is more precise) if you run DigitalOcean without load balancer.
|
This chart is only necessary (recommended is more precise) if you run DigitalOcean without load balancer.
|
||||||
@ -174,6 +180,8 @@ $ helm repo update
|
|||||||
#### 2. Install DNS
|
#### 2. Install DNS
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
# !!! untested for now for new deployment structure !!!
|
||||||
|
|
||||||
# kubeconfig.yaml set globaly
|
# kubeconfig.yaml set globaly
|
||||||
$ helm install dns bitnami/external-dns -f dns.values.yaml
|
$ helm install dns bitnami/external-dns -f dns.values.yaml
|
||||||
# or kubeconfig.yaml in your repo, then adjust
|
# or kubeconfig.yaml in your repo, then adjust
|
||||||
@ -191,10 +199,22 @@ All commands for ocelot need to be executed in the kubernetes folder. Therefore
|
|||||||
Only run once for the first time of installation:
|
Only run once for the first time of installation:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
# in configuration/<deployment-name>
|
||||||
|
|
||||||
# kubeconfig.yaml set globaly
|
# kubeconfig.yaml set globaly
|
||||||
$ helm install ocelot ./
|
helm install ocelot \
|
||||||
|
--values ./kubernetes/values.yaml \
|
||||||
|
--set appVersion="latest" \
|
||||||
|
../../src/kubernetes/ \
|
||||||
|
--timeout 10m
|
||||||
|
|
||||||
# or kubeconfig.yaml in your repo, then adjust
|
# or kubeconfig.yaml in your repo, then adjust
|
||||||
$ helm --kubeconfig=/../kubeconfig.yaml install ocelot ./
|
helm install ocelot \
|
||||||
|
--kubeconfig ./kubeconfig.yaml \
|
||||||
|
--values ./kubernetes/values.yaml \
|
||||||
|
--set appVersion="latest" \
|
||||||
|
../../src/kubernetes/ \
|
||||||
|
--timeout 10m
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Upgrade & Update
|
#### Upgrade & Update
|
||||||
@ -202,10 +222,24 @@ $ helm --kubeconfig=/../kubeconfig.yaml install ocelot ./
|
|||||||
Run for all upgrades and updates:
|
Run for all upgrades and updates:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
# !!! untested for now for new deployment structure !!!
|
||||||
|
|
||||||
|
# in configuration/<deployment-name>
|
||||||
|
|
||||||
# kubeconfig.yaml set globaly
|
# kubeconfig.yaml set globaly
|
||||||
$ helm upgrade ocelot ./
|
helm upgrade ocelot \
|
||||||
|
--values ./kubernetes/values.yaml \
|
||||||
|
--set appVersion="latest" \
|
||||||
|
../../src/kubernetes/ \
|
||||||
|
--timeout 10m
|
||||||
|
|
||||||
# or kubeconfig.yaml in your repo, then adjust
|
# or kubeconfig.yaml in your repo, then adjust
|
||||||
$ helm --kubeconfig=/../kubeconfig.yaml upgrade ocelot ./
|
helm upgrade ocelot \
|
||||||
|
--kubeconfig ./kubeconfig.yaml \
|
||||||
|
--values ./kubernetes/values.yaml \
|
||||||
|
--set appVersion="latest" \
|
||||||
|
../../src/kubernetes/ \
|
||||||
|
--timeout 10m
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Rollback
|
#### Rollback
|
||||||
@ -213,10 +247,17 @@ $ helm --kubeconfig=/../kubeconfig.yaml upgrade ocelot ./
|
|||||||
Run for a rollback, in case something went wrong:
|
Run for a rollback, in case something went wrong:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
# !!! untested for now for new deployment structure !!!
|
||||||
|
|
||||||
|
# in configuration/<deployment-name>
|
||||||
|
|
||||||
# kubeconfig.yaml set globaly
|
# kubeconfig.yaml set globaly
|
||||||
$ helm rollback ocelot
|
helm rollback ocelot --timeout 10m
|
||||||
|
|
||||||
# or kubeconfig.yaml in your repo, then adjust
|
# or kubeconfig.yaml in your repo, then adjust
|
||||||
$ helm --kubeconfig=/../kubeconfig.yaml rollback ocelot
|
helm rollback ocelot \
|
||||||
|
--kubeconfig ./kubeconfig.yaml \
|
||||||
|
--timeout 10m
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Uninstall
|
#### Uninstall
|
||||||
@ -224,10 +265,17 @@ $ helm --kubeconfig=/../kubeconfig.yaml rollback ocelot
|
|||||||
Be aware that if you uninstall ocelot the formerly bound volumes become unbound. Those volumes contain all data from uploads and database. You have to manually free their reference in order to bind them again when reinstalling. Once unbound from their former container references they should automatically be rebound (considering the sizes did not change)
|
Be aware that if you uninstall ocelot the formerly bound volumes become unbound. Those volumes contain all data from uploads and database. You have to manually free their reference in order to bind them again when reinstalling. Once unbound from their former container references they should automatically be rebound (considering the sizes did not change)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
# !!! untested for now for new deployment structure !!!
|
||||||
|
|
||||||
|
# in configuration/<deployment-name>
|
||||||
|
|
||||||
# kubeconfig.yaml set globaly
|
# kubeconfig.yaml set globaly
|
||||||
$ helm uninstall ocelot
|
helm uninstall ocelot --timeout 10m
|
||||||
|
|
||||||
# or kubeconfig.yaml in your repo, then adjust
|
# or kubeconfig.yaml in your repo, then adjust
|
||||||
$ helm --kubeconfig=/../kubeconfig.yaml uninstall ocelot
|
helm uninstall ocelot \
|
||||||
|
--kubeconfig ./kubeconfig.yaml \
|
||||||
|
--timeout 10m
|
||||||
```
|
```
|
||||||
|
|
||||||
## Backups
|
## Backups
|
||||||
@ -292,8 +340,11 @@ $ kubectl -n default rollout status deployment/ocelot-neo4j --timeout=240s
|
|||||||
# !!! be aware of the correct kube context !!!
|
# !!! be aware of the correct kube context !!!
|
||||||
$ kubectl config get-contexts
|
$ kubectl config get-contexts
|
||||||
|
|
||||||
# reset and seed Neo4j database via backend for staging
|
# for staging: reset and seed Neo4j database via backend
|
||||||
$ kubectl -n default exec -it $(kubectl -n default get pods | grep ocelot-backend | awk '{ print $1 }') -- /bin/sh -c "node --experimental-repl-await build/src/db/clean.js && node --experimental-repl-await build/src/db/seed.js"
|
$ kubectl -n default exec -it $(kubectl -n default get pods | grep ocelot-backend | awk '{ print $1 }') -- /bin/sh -c "node --experimental-repl-await build/src/db/clean.js && node --experimental-repl-await build/src/db/seed.js"
|
||||||
|
|
||||||
|
# or alternatively
|
||||||
|
|
||||||
|
# for production: set Neo4j database indexes, constrains, and initial admin account plus run migrate up via backend
|
||||||
|
$ kubectl -n default exec -it $(kubectl -n default get pods | grep ocelot-backend | awk '{ print $1 }') -- /bin/sh -c "yarn prod:migrate init && yarn prod:migrate up"
|
||||||
```
|
```
|
||||||
|
|||||||
@ -108,6 +108,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- neo4j_data:/data
|
- neo4j_data:/data
|
||||||
environment:
|
environment:
|
||||||
|
# settings reference: https://neo4j.com/docs/operations-manual/4.4/docker/ref-settings/
|
||||||
# TODO: This sounds scary for a production environment
|
# TODO: This sounds scary for a production environment
|
||||||
- NEO4J_AUTH=none
|
- NEO4J_AUTH=none
|
||||||
- NEO4J_dbms_security_procedures_unrestricted=algo.*,apoc.*
|
- NEO4J_dbms_security_procedures_unrestricted=algo.*,apoc.*
|
||||||
|
|||||||
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
Find the [**table of contents** for this documentation on GitHub](https://github.com/Ocelot-Social-Community/Ocelot-Social/blob/master/SUMMARY.md) and navigate to the file you need to update.
|
Find the [**table of contents** for this documentation on GitHub](https://github.com/Ocelot-Social-Community/Ocelot-Social/blob/master/SUMMARY.md) and navigate to the file you need to update.
|
||||||
|
|
||||||
Click on the **edit pencil** on the right side directly above the text to edit this file on your fork of Human Connection \(HC\).
|
Click on the **edit pencil** on the right side directly above the text to edit this file in our repository.
|
||||||
|
|
||||||
You can see a preview of your changes by clicking the **Preview changes** tab aside the **Edit file** tab.
|
You can see a preview of your changes by clicking the **Preview changes** tab aside the **Edit file** tab.
|
||||||
|
|
||||||
If you are ready, fill in the **Propose file change** at the end of the webpage.
|
If you are ready, fill in the **Propose file change** at the end of the webpage.
|
||||||
|
|
||||||
After that you have to send your change to the HC basis with a pull request. Here make a comment which issue you have fixed. (If you are working on one of our [open issues](https://github.com/Ocelot-Social-Community/Ocelot-Social/issues) please include the number.)
|
After that you have to compare your change branch to our `master` branch with a pull request. Here make a comment which issue you have fixed. (If you are working on one of our [open issues](https://github.com/Ocelot-Social-Community/Ocelot-Social/issues) please include the number.)
|
||||||
|
|
||||||
## Markdown your documentation
|
## Markdown your documentation
|
||||||
|
|
||||||
@ -21,9 +21,9 @@ To design your documentation see the syntax description at GitBook:
|
|||||||
#### Headlines
|
#### Headlines
|
||||||
|
|
||||||
```markdown
|
```markdown
|
||||||
# Main headline
|
# Main Headline
|
||||||
## Smaller headlines
|
## Smaller Headlines
|
||||||
### Small headlines
|
### Small Headlines
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Tabs
|
#### Tabs
|
||||||
@ -60,15 +60,15 @@ XXX
|
|||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Hints For ToDos
|
#### Hints for ToDos
|
||||||
|
|
||||||
```markdown
|
```markdown
|
||||||
{% hint style="info" %} TODO: XXX {% endhint %}
|
{% hint style="info" %} TODO: XXX {% endhint %}
|
||||||
```
|
```
|
||||||
|
|
||||||
## Host The Screenshots
|
## Host the Screenshots
|
||||||
|
|
||||||
### Host On Ocelot-Social \(GitHub\) repository
|
### Host on Ocelot-Social \(GitHub\) Repository
|
||||||
|
|
||||||
{% hint style="info" %}
|
{% hint style="info" %}
|
||||||
TODO: How to host on Ocelot-Social \(GitHub\) repository ...
|
TODO: How to host on Ocelot-Social \(GitHub\) repository ...
|
||||||
@ -88,12 +88,13 @@ Right click on it and choose kind of **Open link in new tab**.
|
|||||||
|
|
||||||
Copy the URL and paste it were you need it.
|
Copy the URL and paste it were you need it.
|
||||||
|
|
||||||
## Screenshot modification
|
## Screenshot Modification
|
||||||
|
|
||||||
### Add an arrow or some other marking stuff
|
### Add an Arrow or some other Marking Stuff
|
||||||
|
|
||||||
{% tabs %}
|
{% tabs %}
|
||||||
{% tab title="macOS" %}
|
{% tab title="macOS" %}
|
||||||
|
|
||||||
#### In the Preview App
|
#### In the Preview App
|
||||||
|
|
||||||
Got to: **Menu** + **Tools** \(GER: Werkzeuge\) + **Annotate** \(GER: Anmerkungen\) + etc.
|
Got to: **Menu** + **Tools** \(GER: Werkzeuge\) + **Annotate** \(GER: Anmerkungen\) + etc.
|
||||||
|
|||||||
@ -53,15 +53,45 @@ Start Neo4J and confirm the database is running at [http://localhost:7474](http:
|
|||||||
|
|
||||||
## Operations on Neo4j
|
## Operations on Neo4j
|
||||||
|
|
||||||
### Import Neo4j Dump Locally in Docker
|
### Docker or Docker Compose
|
||||||
|
|
||||||
|
- we need to set `command: ["tail", "-f", "/dev/null"]` in the Neo4j block of `docker-compose.yml` on top level so the Neo4j database is in maintenance mode
|
||||||
|
|
||||||
|
### Create Neo4j Dump
|
||||||
|
|
||||||
|
To create a dump in Neo4j running in a Docker container:
|
||||||
|
|
||||||
|
- set the database to maintenance mode, see above
|
||||||
|
- entering the following commands:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# connect to the Docker containers Neo4j terminal
|
||||||
|
$ docker exec -it neo4j bash
|
||||||
|
# generate Dump
|
||||||
|
neo4j% neo4j-admin dump --database=graph.db --to=/var/lib/neo4j/$(date +%F)-neo4j-dump
|
||||||
|
# exit bash
|
||||||
|
neo4j% exit
|
||||||
|
# copy the dump out of the running Docker container
|
||||||
|
$ docker cp <docker-image-name('neo4j')>:/var/lib/neo4j/neo4j-dump <local-folder-path>/$(date +%F)-neo4j-dump
|
||||||
|
```
|
||||||
|
|
||||||
|
### Import Neo4j Dump
|
||||||
|
|
||||||
To import a dump into Neo4j running in a Docker container:
|
To import a dump into Neo4j running in a Docker container:
|
||||||
|
|
||||||
- we need to set `command: ["tail", "-f", "/dev/null"]` in the Neo4j block of `docker-compose.yml` on top level so the Neo4j database is in maintenance mode
|
- set the database to maintenance mode, see above
|
||||||
- copy the dump into the running Docker container: `docker cp /path/to/dump <docker-image>:/existing-directory-in-docker/`
|
- entering the following commands:
|
||||||
- connect to the Docker containers Neo4j terminal: `docker exec -it neo4j bash`
|
|
||||||
- to load the dump into the database we need the following command in this terminal: `neo4j-admin load --expand-commands --database=graph.db --from /backups/neo4j-dump --force`
|
```bash
|
||||||
- leave the terminal by entering: `exit`
|
# copy the dump into the running Docker container
|
||||||
|
$ docker cp <local-folder-path>/neo4j-dump <docker-image-name('neo4j')>:/var/lib/neo4j/$(date +%F)-neo4j-dump
|
||||||
|
# connect to the Docker containers Neo4j terminal
|
||||||
|
$ docker exec -it neo4j bash
|
||||||
|
# to load the dump into the database we need the following command in this terminal
|
||||||
|
neo4j% neo4j-admin load --expand-commands --database=graph.db --from /var/lib/neo4j/$(date +%F)-neo4j-dump --force
|
||||||
|
# leave the terminal by entering
|
||||||
|
neo4j% exit
|
||||||
|
```
|
||||||
|
|
||||||
## Commands
|
## Commands
|
||||||
|
|
||||||
|
|||||||
@ -39,12 +39,12 @@
|
|||||||
"@babel/register": "^7.22.15",
|
"@babel/register": "^7.22.15",
|
||||||
"@badeball/cypress-cucumber-preprocessor": "^18.0.6",
|
"@badeball/cypress-cucumber-preprocessor": "^18.0.6",
|
||||||
"@cypress/browserify-preprocessor": "^3.0.2",
|
"@cypress/browserify-preprocessor": "^3.0.2",
|
||||||
"@faker-js/faker": "8.1.0",
|
"@faker-js/faker": "8.2.0",
|
||||||
"auto-changelog": "^2.3.0",
|
"auto-changelog": "^2.3.0",
|
||||||
"bcryptjs": "^2.4.3",
|
"bcryptjs": "^2.4.3",
|
||||||
"cross-env": "^7.0.3",
|
"cross-env": "^7.0.3",
|
||||||
"cucumber": "^6.0.5",
|
"cucumber": "^6.0.5",
|
||||||
"cypress": "^13.2.0",
|
"cypress": "^13.3.1",
|
||||||
"cypress-network-idle": "^1.14.2",
|
"cypress-network-idle": "^1.14.2",
|
||||||
"date-fns": "^2.25.0",
|
"date-fns": "^2.25.0",
|
||||||
"dotenv": "^16.3.1",
|
"dotenv": "^16.3.1",
|
||||||
|
|||||||
@ -46,7 +46,7 @@ describe('DonationInfo.vue', () => {
|
|||||||
|
|
||||||
// it looks to me that toLocaleString for some reason is not working as expected
|
// it looks to me that toLocaleString for some reason is not working as expected
|
||||||
it.skip('creates a label from the given amounts and a translation string', () => {
|
it.skip('creates a label from the given amounts and a translation string', () => {
|
||||||
expect(mocks.$t).nthCalledWith(1, 'donations.amount-of-total', {
|
expect(mocks.$t).toHaveBeenNthCalledWith(1, 'donations.amount-of-total', {
|
||||||
amount: '10.000',
|
amount: '10.000',
|
||||||
total: '50.000',
|
total: '50.000',
|
||||||
})
|
})
|
||||||
@ -55,7 +55,7 @@ describe('DonationInfo.vue', () => {
|
|||||||
|
|
||||||
describe('given english locale', () => {
|
describe('given english locale', () => {
|
||||||
it('creates a label from the given amounts and a translation string', () => {
|
it('creates a label from the given amounts and a translation string', () => {
|
||||||
expect(mocks.$t).toBeCalledWith(
|
expect(mocks.$t).toHaveBeenCalledWith(
|
||||||
'donations.amount-of-total',
|
'donations.amount-of-total',
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
amount: '10,000',
|
amount: '10,000',
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
<div class="filter-menu-options">
|
<div class="filter-menu-options">
|
||||||
<div class="filter-header">
|
<div class="filter-header">
|
||||||
<h2 class="title">{{ $t('filter-menu.filter-by') }}</h2>
|
<h2 class="title">{{ $t('filter-menu.filter-by') }}</h2>
|
||||||
<div class="item-save-topics">
|
<div v-if="categoriesActive" class="item-save-topics">
|
||||||
<labeled-button
|
<labeled-button
|
||||||
filled
|
filled
|
||||||
:label="$t('actions.saveCategories')"
|
:label="$t('actions.saveCategories')"
|
||||||
@ -62,18 +62,20 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
saveCategories() {
|
saveCategories() {
|
||||||
this.$apollo
|
if (this.categoriesActive) {
|
||||||
.mutate({
|
this.$apollo
|
||||||
mutation: SaveCategories(),
|
.mutate({
|
||||||
variables: { activeCategories: this.filteredCategoryIds },
|
mutation: SaveCategories(),
|
||||||
})
|
variables: { activeCategories: this.filteredCategoryIds },
|
||||||
.then(() => {
|
})
|
||||||
this.$emit('showFilterMenu')
|
.then(() => {
|
||||||
this.$toast.success(this.$t('filter-menu.save.success'))
|
this.$emit('showFilterMenu')
|
||||||
})
|
this.$toast.success(this.$t('filter-menu.save.success'))
|
||||||
.catch(() => {
|
})
|
||||||
this.$toast.error(this.$t('filter-menu.save.error'))
|
.catch(() => {
|
||||||
})
|
this.$toast.error(this.$t('filter-menu.save.error'))
|
||||||
|
})
|
||||||
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@ -94,20 +94,20 @@ describe('GroupMember', () => {
|
|||||||
|
|
||||||
describe('with server error', () => {
|
describe('with server error', () => {
|
||||||
it('toasts an error message', () => {
|
it('toasts an error message', () => {
|
||||||
expect(toastErrorMock).toBeCalledWith('Oh no!')
|
expect(toastErrorMock).toHaveBeenCalledWith('Oh no!')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
describe('with server success', () => {
|
describe('with server success', () => {
|
||||||
it('calls the API', () => {
|
it('calls the API', () => {
|
||||||
expect(apolloMock).toBeCalledWith({
|
expect(apolloMock).toHaveBeenCalledWith({
|
||||||
mutation: changeGroupMemberRoleMutation(),
|
mutation: changeGroupMemberRoleMutation(),
|
||||||
variables: { groupId: 'group-id', userId: 'user', roleInGroup: 'admin' },
|
variables: { groupId: 'group-id', userId: 'user', roleInGroup: 'admin' },
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
it('toasts a success message', () => {
|
it('toasts a success message', () => {
|
||||||
expect(toastSuccessMock).toBeCalledWith('group.changeMemberRole')
|
expect(toastSuccessMock).toHaveBeenCalledWith('group.changeMemberRole')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@ -150,7 +150,7 @@ describe('GroupMember', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('toasts an error message', () => {
|
it('toasts an error message', () => {
|
||||||
expect(toastErrorMock).toBeCalledWith('Oh no!!')
|
expect(toastErrorMock).toHaveBeenCalledWith('Oh no!!')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('closes the modal', () => {
|
it('closes the modal', () => {
|
||||||
@ -165,7 +165,7 @@ describe('GroupMember', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('calls the API', () => {
|
it('calls the API', () => {
|
||||||
expect(apolloMock).toBeCalledWith({
|
expect(apolloMock).toHaveBeenCalledWith({
|
||||||
mutation: removeUserFromGroupMutation(),
|
mutation: removeUserFromGroupMutation(),
|
||||||
variables: { groupId: 'group-id', userId: 'user' },
|
variables: { groupId: 'group-id', userId: 'user' },
|
||||||
})
|
})
|
||||||
@ -176,7 +176,7 @@ describe('GroupMember', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('toasts a success message', () => {
|
it('toasts a success message', () => {
|
||||||
expect(toastSuccessMock).toBeCalledWith('group.memberRemoved')
|
expect(toastSuccessMock).toHaveBeenCalledWith('group.memberRemoved')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('closes the modal', () => {
|
it('closes the modal', () => {
|
||||||
|
|||||||
@ -75,8 +75,8 @@ describe('LoginForm', () => {
|
|||||||
describe('no categories saved', () => {
|
describe('no categories saved', () => {
|
||||||
it('resets the categories', async () => {
|
it('resets the categories', async () => {
|
||||||
await fillIn(Wrapper())
|
await fillIn(Wrapper())
|
||||||
expect(storeMocks.mutations['posts/RESET_CATEGORIES']).toBeCalled()
|
expect(storeMocks.mutations['posts/RESET_CATEGORIES']).toHaveBeenCalled()
|
||||||
expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).not.toBeCalled()
|
expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).not.toHaveBeenCalled()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -84,11 +84,11 @@ describe('LoginForm', () => {
|
|||||||
it('sets the categories', async () => {
|
it('sets the categories', async () => {
|
||||||
authUserMock.mockReturnValue({ activeCategories: ['cat1', 'cat9', 'cat12'] })
|
authUserMock.mockReturnValue({ activeCategories: ['cat1', 'cat9', 'cat12'] })
|
||||||
await fillIn(Wrapper())
|
await fillIn(Wrapper())
|
||||||
expect(storeMocks.mutations['posts/RESET_CATEGORIES']).toBeCalled()
|
expect(storeMocks.mutations['posts/RESET_CATEGORIES']).toHaveBeenCalled()
|
||||||
expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).toBeCalledTimes(3)
|
expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).toHaveBeenCalledTimes(3)
|
||||||
expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).toBeCalledWith({}, 'cat1')
|
expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).toHaveBeenCalledWith({}, 'cat1')
|
||||||
expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).toBeCalledWith({}, 'cat9')
|
expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).toHaveBeenCalledWith({}, 'cat9')
|
||||||
expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).toBeCalledWith({}, 'cat12')
|
expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).toHaveBeenCalledWith({}, 'cat12')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@ -73,7 +73,7 @@ describe('PostTeaser', () => {
|
|||||||
it('has no validation errors', () => {
|
it('has no validation errors', () => {
|
||||||
const spy = jest.spyOn(global.console, 'error')
|
const spy = jest.spyOn(global.console, 'error')
|
||||||
Wrapper()
|
Wrapper()
|
||||||
expect(spy).not.toBeCalled()
|
expect(spy).not.toHaveBeenCalled()
|
||||||
spy.mockReset()
|
spy.mockReset()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@ -114,11 +114,11 @@ describe('PostIndex', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('resets the category filter', () => {
|
it('resets the category filter', () => {
|
||||||
expect(mutations['posts/RESET_CATEGORIES']).toBeCalled()
|
expect(mutations['posts/RESET_CATEGORIES']).toHaveBeenCalled()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('sets the category', () => {
|
it('sets the category', () => {
|
||||||
expect(mutations['posts/TOGGLE_CATEGORY']).toBeCalledWith({}, 'cat3')
|
expect(mutations['posts/TOGGLE_CATEGORY']).toHaveBeenCalledWith({}, 'cat3')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
</client-only>
|
</client-only>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<div v-if="categoriesActive && SHOW_CONTENT_FILTER_MASONRY_GRID" class="top-filter-menu">
|
<div v-if="SHOW_CONTENT_FILTER_MASONRY_GRID" class="top-filter-menu">
|
||||||
<div class="filterButtonBox">
|
<div class="filterButtonBox">
|
||||||
<div class="filterButtonMenu" :class="{ 'hide-filter': hideByScroll }">
|
<div class="filterButtonMenu" :class="{ 'hide-filter': hideByScroll }">
|
||||||
<base-button
|
<base-button
|
||||||
|
|||||||
@ -71,7 +71,7 @@ describe('Login.vue', () => {
|
|||||||
asyncData = true
|
asyncData = true
|
||||||
tosVersion = '0.0.4'
|
tosVersion = '0.0.4'
|
||||||
wrapper = await Wrapper()
|
wrapper = await Wrapper()
|
||||||
expect(redirect).toBeCalledWith('/')
|
expect(redirect).toHaveBeenCalledWith('/')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@ -36,8 +36,8 @@ describe('logout.vue', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('logs out and redirects to login', () => {
|
it('logs out and redirects to login', () => {
|
||||||
expect(mocks.$store.dispatch).toBeCalledWith('auth/logout')
|
expect(mocks.$store.dispatch).toHaveBeenCalledWith('auth/logout')
|
||||||
expect(mocks.$router.replace).toBeCalledWith('/login')
|
expect(mocks.$router.replace).toHaveBeenCalledWith('/login')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@ -114,19 +114,19 @@ describe('map', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('initializes on style load', () => {
|
it('initializes on style load', () => {
|
||||||
expect(mapOnMock).toBeCalledWith('style.load', expect.any(Function))
|
expect(mapOnMock).toHaveBeenCalledWith('style.load', expect.any(Function))
|
||||||
})
|
})
|
||||||
|
|
||||||
it('initializes on mouseenter', () => {
|
it('initializes on mouseenter', () => {
|
||||||
expect(mapOnMock).toBeCalledWith('mouseenter', 'markers', expect.any(Function))
|
expect(mapOnMock).toHaveBeenCalledWith('mouseenter', 'markers', expect.any(Function))
|
||||||
})
|
})
|
||||||
|
|
||||||
it('initializes on mouseleave', () => {
|
it('initializes on mouseleave', () => {
|
||||||
expect(mapOnMock).toBeCalledWith('mouseleave', 'markers', expect.any(Function))
|
expect(mapOnMock).toHaveBeenCalledWith('mouseleave', 'markers', expect.any(Function))
|
||||||
})
|
})
|
||||||
|
|
||||||
it('calls add map control', () => {
|
it('calls add map control', () => {
|
||||||
expect(mapAddControlMock).toBeCalled()
|
expect(mapAddControlMock).toHaveBeenCalled()
|
||||||
})
|
})
|
||||||
|
|
||||||
describe('trigger style load event', () => {
|
describe('trigger style load event', () => {
|
||||||
@ -137,7 +137,7 @@ describe('map', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('calls loadMarkersIconsAndAddMarkers', () => {
|
it('calls loadMarkersIconsAndAddMarkers', () => {
|
||||||
expect(spy).toBeCalled()
|
expect(spy).toHaveBeenCalled()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@ -68,7 +68,7 @@ describe('password-reset.vue', () => {
|
|||||||
asyncData = true
|
asyncData = true
|
||||||
isLoggedIn = true
|
isLoggedIn = true
|
||||||
wrapper = await Wrapper()
|
wrapper = await Wrapper()
|
||||||
expect(redirect).toBeCalledWith('/')
|
expect(redirect).toHaveBeenCalledWith('/')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@ -76,7 +76,10 @@ describe('post/_id.vue', () => {
|
|||||||
authorId = 'some-author'
|
authorId = 'some-author'
|
||||||
userId = 'some-user'
|
userId = 'some-user'
|
||||||
wrapper = await Wrapper()
|
wrapper = await Wrapper()
|
||||||
expect(error).toBeCalledWith({ message: 'error-pages.cannot-edit-post', statusCode: 403 })
|
expect(error).toHaveBeenCalledWith({
|
||||||
|
message: 'error-pages.cannot-edit-post',
|
||||||
|
statusCode: 403,
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
it('renders with asyncData of same user', async () => {
|
it('renders with asyncData of same user', async () => {
|
||||||
|
|||||||
@ -327,7 +327,7 @@ describe('Registration', () => {
|
|||||||
asyncData = true
|
asyncData = true
|
||||||
isLoggedIn = true
|
isLoggedIn = true
|
||||||
wrapper = await Wrapper()
|
wrapper = await Wrapper()
|
||||||
expect(redirect).toBeCalledWith('/')
|
expect(redirect).toHaveBeenCalledWith('/')
|
||||||
})
|
})
|
||||||
|
|
||||||
// copied from webapp/components/Registration/Signup.spec.js as testing template
|
// copied from webapp/components/Registration/Signup.spec.js as testing template
|
||||||
|
|||||||
@ -71,7 +71,7 @@ describe('terms-and-conditions-confirm.vue', () => {
|
|||||||
asyncData = true
|
asyncData = true
|
||||||
tosAgree = true
|
tosAgree = true
|
||||||
wrapper = await Wrapper()
|
wrapper = await Wrapper()
|
||||||
expect(redirect).toBeCalledWith('/')
|
expect(redirect).toHaveBeenCalledWith('/')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
16
yarn.lock
16
yarn.lock
@ -1395,10 +1395,10 @@
|
|||||||
resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.3.tgz#e5036be529f757e58d9a7771f2f1b14782986a74"
|
resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.3.tgz#e5036be529f757e58d9a7771f2f1b14782986a74"
|
||||||
integrity sha512-FbUN+0ZRXsypPyWE2IwIkVjDkDnJoMJARWOcFZn4KPPli+QnKqF0z1anvfaYe3ev5HFCpRDLLBDHyOALLppWHw==
|
integrity sha512-FbUN+0ZRXsypPyWE2IwIkVjDkDnJoMJARWOcFZn4KPPli+QnKqF0z1anvfaYe3ev5HFCpRDLLBDHyOALLppWHw==
|
||||||
|
|
||||||
"@faker-js/faker@8.1.0":
|
"@faker-js/faker@8.2.0":
|
||||||
version "8.1.0"
|
version "8.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-8.1.0.tgz#e14896f1c57af2495e341dc4c7bf04125c8aeafd"
|
resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-8.2.0.tgz#d4656d2cb485fe6ec4e7b340da9f16fac2c36c4a"
|
||||||
integrity sha512-38DT60rumHfBYynif3lmtxMqMqmsOQIxQgEuPZxCk2yUYN0eqWpTACgxi0VpidvsJB8CRxCpvP7B3anK85FjtQ==
|
integrity sha512-VacmzZqVxdWdf9y64lDOMZNDMM/FQdtM9IsaOPKOm2suYwEatb8VkdHqOzXcDnZbk7YDE2BmsJmy/2Hmkn563g==
|
||||||
|
|
||||||
"@hapi/address@2.x.x":
|
"@hapi/address@2.x.x":
|
||||||
version "2.1.4"
|
version "2.1.4"
|
||||||
@ -2668,10 +2668,10 @@ cypress-network-idle@^1.14.2:
|
|||||||
resolved "https://registry.yarnpkg.com/cypress-network-idle/-/cypress-network-idle-1.14.2.tgz#0837100861feeb5a18f4c2d9815be079f8590f4d"
|
resolved "https://registry.yarnpkg.com/cypress-network-idle/-/cypress-network-idle-1.14.2.tgz#0837100861feeb5a18f4c2d9815be079f8590f4d"
|
||||||
integrity sha512-xAdR8dH58KFPv8eCDWjviScITrJOcUpuMXYfYTc175nk2/NvnJ+I6ylSn1CM7yZmoV/gLbFa36QLiH5NfNEaLQ==
|
integrity sha512-xAdR8dH58KFPv8eCDWjviScITrJOcUpuMXYfYTc175nk2/NvnJ+I6ylSn1CM7yZmoV/gLbFa36QLiH5NfNEaLQ==
|
||||||
|
|
||||||
cypress@^13.2.0:
|
cypress@^13.3.1:
|
||||||
version "13.2.0"
|
version "13.3.1"
|
||||||
resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.2.0.tgz#10f73d06a0764764ffbb903a31e96e2118dcfc1d"
|
resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.3.1.tgz#d72f922e167891574c7773d07ac64d7114e11d49"
|
||||||
integrity sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==
|
integrity sha512-g4mJLZxYN+UAF2LMy3Znd4LBnUmS59Vynd81VES59RdW48Yt+QtR2cush3melOoVNz0PPbADpWr8DcUx6mif8Q==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@cypress/request" "^3.0.0"
|
"@cypress/request" "^3.0.0"
|
||||||
"@cypress/xvfb" "^1.2.4"
|
"@cypress/xvfb" "^1.2.4"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user