diff --git a/.gitbook/assets/maintenance-page.png b/.gitbook/assets/maintenance-page.png new file mode 100644 index 000000000..be07b0716 Binary files /dev/null and b/.gitbook/assets/maintenance-page.png differ diff --git a/backend/README.md b/backend/README.md index 1dffa43bf..b472ef530 100644 --- a/backend/README.md +++ b/backend/README.md @@ -96,11 +96,13 @@ need to seed your database: {% tab title="Docker" %} In another terminal run: + ```bash $ docker-compose exec backend yarn run db:seed ``` To reset the database run: + ```bash $ docker-compose exec backend yarn run db:reset # you could also wipe out your neo4j database and delete all volumes with: @@ -108,18 +110,22 @@ $ docker-compose down -v # if container is not running, run this command to set up your database indeces and contstraints $ docker-compose exec backend yarn run db:migrate init ``` -{% endtab %} +{% endtab %} {% tab title="Without Docker" %} + Run: + ```bash $ yarn run db:seed ``` To reset the database run: + ```bash $ yarn run db:reset ``` + {% endtab %} {% endtabs %} @@ -130,32 +136,40 @@ you have to migrate your data e.g. because your data modeling has changed. {% tabs %} {% tab title="Docker" %} + Generate a data migration file: + ```bash $ docker-compose exec backend yarn run db:migrate:create your_data_migration # Edit the file in ./src/db/migrations/ ``` To run the migration: + ```bash $ docker-compose exec backend yarn run db:migrate up ``` + {% endtab %} {% tab title="Without Docker" %} + Generate a data migration file: + ```bash $ yarn run db:migrate:create your_data_migration # Edit the file in ./src/db/migrations/ ``` To run the migration: + ```bash $ yarn run db:migrate up ``` + {% endtab %} {% endtabs %} -# Testing +## Testing **Beware**: We have no multiple database setup at the moment. We clean the database after each test, running the tests will wipe out all your data! diff --git a/backend/package.json b/backend/package.json index b32be2c5b..a720dcc3a 100644 --- a/backend/package.json +++ b/backend/package.json @@ -2,6 +2,10 @@ "name": "ocelot-social-backend", "version": "0.6.3", "description": "GraphQL Backend for ocelot.social", + "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", + "author": "ocelot.social Community", + "license": "MIT", + "private": false, "main": "src/index.js", "scripts": { "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations", @@ -18,7 +22,6 @@ "db:migrate": "yarn run __migrate --store ./src/db/migrate/store.js", "db:migrate:create": "yarn run __migrate --template-file ./src/db/migrate/template.js --date-format 'yyyymmddHHmmss' create" }, - "license": "MIT", "jest": { "verbose": true, "collectCoverageFrom": [ diff --git a/cypress/README.md b/cypress/README.md index 662d0b51c..fb94cc522 100644 --- a/cypress/README.md +++ b/cypress/README.md @@ -6,8 +6,9 @@ Are you running everything through docker? You're so lucky you don't have to setup anything! Just: -``` -docker-compose up + +```bash +$ docker-compose up ``` ## Setup without docker @@ -19,7 +20,7 @@ file according to your needs. To start the services that are required for cypress testing, run: ```bash -# in the top level folder Human-Connection/ +# in the top level folder Ocelot-Social/ $ yarn cypress:setup ``` @@ -29,9 +30,9 @@ Even if the required services for testing run via docker, depending on your setup, the cypress tests themselves run on your host machine. So with our without docker, you would have to install cypress and its dependencies first: -``` +```bash # in the root folder / -yarn install +$ yarn install ``` ## Run cypress @@ -44,7 +45,6 @@ $ yarn cypress:run ![Console output after running cypress test](../.gitbook/assets/grafik%20%281%29.png) - ### Open Interactive Test Console If you are like me, you might want to see some visual output. The interactive cypress environment also helps at debugging your tests, you can even time travel between individual steps and see the exact state of the app. @@ -61,4 +61,3 @@ $ yarn cypress:open Check out the Cypress documentation for further information on how to write tests: [https://docs.cypress.io/guides/getting-started/writing-your-first-test.html\#Write-a-simple-test](https://docs.cypress.io/guides/getting-started/writing-your-first-test.html#Write-a-simple-test) - diff --git a/docker-compose.yml b/docker-compose.yml index ddcfd78cd..9b00e3cf4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -57,7 +57,8 @@ services: environment: - NEO4J_AUTH=none - NEO4J_dbms_security_procedures_unrestricted=algo.*,apoc.* - - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes + # decomment following line for Neo4j Enterprice version instead of Community version + # - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes ports: - 7687:7687 - 7474:7474 diff --git a/package.json b/package.json index 6deaafaa0..d78d3f6f1 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,10 @@ { - "name": "human-connection", + "name": "ocelot-social", "version": "0.6.3", - "description": "Fullstack and API tests with cypress and cucumber for Human Connection", - "author": "Human Connection gGmbh", + "description": "Fullstack and API tests with cypress and cucumber for ocelot.social", + "author": "ocelot.social Community", "license": "MIT", + "private": false, "repository": { "type": "git", "url": "https://github.com/Ocelot-Social-Community/Ocelot-Social.git" diff --git a/webapp/README.md b/webapp/README.md index 3af1ea806..955d9ba3d 100644 --- a/webapp/README.md +++ b/webapp/README.md @@ -8,6 +8,8 @@ # install all dependencies $ cd webapp/ $ yarn install +# or just +$ yarn ``` Copy: @@ -96,6 +98,10 @@ You can then visit the Storybook playground on `http://localhost:3002` {% endtab %} {% endtabs %} +## Maintenance Mode + +For installing and running the maintenance mode see [Maintenance Mode](./maintenance/README.md). + ## Styleguide Migration We are currently in the process of migrating our styleguide components and design tokens from the [Nitro Styleguide](https://github.com/Ocelot-Social-Community/HC-Styleguide-20201003) into the main [ocelot.social repository](https://github.com/Ocelot-Social-Community/Ocelot-Social) and refactoring our components in the process. During this migration, our new components will live in a `_new/` folder to separate them from the old, yet untouched components. diff --git a/webapp/components/Logo/Logo.vue b/webapp/components/Logo/Logo.vue index b5a2e38a5..8baa39232 100644 --- a/webapp/components/Logo/Logo.vue +++ b/webapp/components/Logo/Logo.vue @@ -37,7 +37,7 @@ export default { } - diff --git a/webapp/maintenance/README.md b/webapp/maintenance/README.md new file mode 100644 index 000000000..bef8b3fd6 --- /dev/null +++ b/webapp/maintenance/README.md @@ -0,0 +1,47 @@ +# Maintenance Mode + +The maintenance mode shows a translatable page that tells the user that we are right back, because we are working on the server. + +![Maintenance Mode Screen Shot](../../.gitbook/assets/maintenance-page.png) + +## Running The Maintenance Page Or Service + +At the moment the maintenance mode can only be locally tested with Docker-Compose. + +{% tabs %} +{% tab title="Locally Without Docker" %} + +{% hint style="info" %} +TODO: Implement a locally running maintenance mode! Without Docker … +{% endhint %} + +The command … + +```bash +# running the maintenance mode in webapp/ folder +$ yarn generate:maintenance +``` + +… is unfortunatelly **not(!)** working at the moment. +This is because the code is rewritten to be easy usable for Docker-Compose. Therefore we lost this possibility. + +{% endtab %} +{% tab title="Locally With Docker" %} + +To get the maintenance mode running use the command: + +```bash +# start Docker in the main folder +$ docker-compose up +```` + +And the maintenance mode page or service will be started as well in an own container. +In the browser you can reach it under `http://localhost:3503/`. + +{% endtab %} +{% tab title="On The Server" %} + +How to bring a Kubernetes server into maintenance mode is discriped [here](../../deployment/ocelot-social/maintenance/README.md). + +{% endtab %} +{% endtabs %} diff --git a/webapp/maintenance/source/package.json b/webapp/maintenance/source/package.json index c51637fbf..a639ec418 100644 --- a/webapp/maintenance/source/package.json +++ b/webapp/maintenance/source/package.json @@ -1,12 +1,12 @@ { "name": "@ocelot-social/maintenance", - "version": "1.0.0", + "version": "0.6.3", "description": "Maintenance page for ocelot.social", - "main": "index.js", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", - "author": "Robert Schäfer", + "author": "ocelot.social Community", "license": "MIT", "private": false, + "main": "index.js", "scripts": { "dev": "yarn run nuxt -c nuxt.config.maintenance.js", "build": "yarn run nuxt build -c nuxt.config.maintenance.js", diff --git a/webapp/maintenance/source/pages/index.vue b/webapp/maintenance/source/pages/index.vue index 934c786ea..59c7d4027 100644 --- a/webapp/maintenance/source/pages/index.vue +++ b/webapp/maintenance/source/pages/index.vue @@ -8,7 +8,13 @@ - Under maintenance + + Under maintenance + @@ -33,6 +39,7 @@ + + diff --git a/webapp/package.json b/webapp/package.json index 1da097089..5200da307 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -2,12 +2,9 @@ "name": "ocelot-social-webapp", "version": "0.6.3", "description": "ocelot.social Frontend", - "authors": [ - "Grzegorz Leoniec (appinteractive)", - "ulfgebhardt" - ], - "license": "MIT", + "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", "author": "ocelot.social Community", + "license": "MIT", "private": false, "scripts": { "dev": "nuxt", diff --git a/webapp/pages/password-reset.vue b/webapp/pages/password-reset.vue index f320bd376..74b719d5f 100644 --- a/webapp/pages/password-reset.vue +++ b/webapp/pages/password-reset.vue @@ -2,7 +2,9 @@ + + diff --git a/webapp/static/favicon.ico b/webapp/static/favicon.ico index 962e5a14a..430cef437 100644 Binary files a/webapp/static/favicon.ico and b/webapp/static/favicon.ico differ diff --git a/webapp/static/icon.png b/webapp/static/icon.png index bb9532676..1c81fa5fc 100644 Binary files a/webapp/static/icon.png and b/webapp/static/icon.png differ diff --git a/webapp/static/img/custom/Logo-Horizontal.svg b/webapp/static/img/custom/Logo-Horizontal.svg index 6a86cfaff..27b522b75 100644 --- a/webapp/static/img/custom/Logo-Horizontal.svg +++ b/webapp/static/img/custom/Logo-Horizontal.svg @@ -1,8 +1,25 @@ - - - + + + + + + + + + + + + + + + + + + + + @@ -12,25 +29,52 @@ - + - + - + - - o - c - elo - t - . - s - o - c - i - a - l + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/static/img/custom/logout.svg b/webapp/static/img/custom/logout.svg index 0950b7532..b130e7583 100644 --- a/webapp/static/img/custom/logout.svg +++ b/webapp/static/img/custom/logout.svg @@ -1,360 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/static/img/custom/password-reset.svg b/webapp/static/img/custom/password-reset.svg index 48cf12e70..68c94d49d 100644 --- a/webapp/static/img/custom/password-reset.svg +++ b/webapp/static/img/custom/password-reset.svg @@ -1 +1,82 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/static/img/custom/sign-up.svg b/webapp/static/img/custom/sign-up.svg index 930923ca4..b130e7583 100644 --- a/webapp/static/img/custom/sign-up.svg +++ b/webapp/static/img/custom/sign-up.svg @@ -1,163 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/static/img/custom/under-maintenance.svg b/webapp/static/img/custom/under-maintenance.svg index 0950b7532..b130e7583 100644 --- a/webapp/static/img/custom/under-maintenance.svg +++ b/webapp/static/img/custom/under-maintenance.svg @@ -1,360 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/static/img/custom/welcome.svg b/webapp/static/img/custom/welcome.svg index 279c519d0..68c94d49d 100644 --- a/webapp/static/img/custom/welcome.svg +++ b/webapp/static/img/custom/welcome.svg @@ -1,36 +1,82 @@ - - - - - - - + + + + - - - + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + - - o - c - elo - t - . - s - o - c - i - a - l + + + + + + + + + + + + + + + + + + +