From a3ac360889d3fd1b9b2917990db073994140f4df Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 28 Feb 2023 13:02:29 +0100 Subject: [PATCH 01/23] docs(other): change contraint* to constraint*, correct indexes to indices, add yarn run db:migrations up to the readmes. --- backend/README.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/backend/README.md b/backend/README.md index 4ce74dc40..130b9b05b 100644 --- a/backend/README.md +++ b/backend/README.md @@ -81,8 +81,7 @@ More details about our GraphQL playground and how to use it with ocelot.social c ### Database Indices and Constraints -Database indices and constraints need to be created when the database and the -backend is running: +Database indices and constraints need to be created and upgraded when the database and the backend are running: {% tabs %} {% tab title="Docker" %} @@ -92,6 +91,11 @@ backend is running: $ docker exec backend yarn run db:migrate init ``` +```bash +# in main folder with docker compose running +$ docker exec backend yarn run db:migrate up +``` + {% endtab %} {% tab title="Without Docker" %} @@ -101,6 +105,11 @@ $ docker exec backend yarn run db:migrate init yarn run db:migrate init ``` +```bash +# in backend/ with database running (In docker or local) +yarn run db:migrate up +``` + {% endtab %} {% endtabs %} @@ -126,8 +135,10 @@ To reset the database run: $ docker exec backend yarn run db:reset # you could also wipe out your neo4j database and delete all volumes with: $ docker-compose down -v -# if container is not running, run this command to set up your database indeces and contstraints +# if container is not running, run this command to set up your database indices and constraints $ docker exec backend yarn run db:migrate init +# And then upgrade the indices and const +$ docker exec backend yarn run db:migrate up ``` {% endtab %} From fb353b8a689c2d0368eb6bd6d057dd42a336f6fb Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 28 Feb 2023 13:05:13 +0100 Subject: [PATCH 02/23] Change README.md --- CONTRIBUTING.md | 4 ++-- README.md | 1 + deployment/DOCKER_MORE_CLOSELY.md | 2 +- neo4j/README.md | 22 +++++++++++----------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 83a63b36a..918eff871 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -190,7 +190,7 @@ For Docker compose `up` or `build` commands, you can use our Apple M1 override f # for development $ docker compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.apple-m1.override.yml up -# only once: init admin user and create indexes and contraints in Neo4j database +# only once: init admin user and create indices and constraints in Neo4j database $ docker compose exec backend yarn prod:migrate init # clean db $ docker compose exec backend yarn db:reset @@ -199,7 +199,7 @@ $ docker compose exec backend yarn db:seed # for production $ docker compose -f docker-compose.yml -f docker-compose.apple-m1.override.yml up -# only once: init admin user and create indexes and contraints in Neo4j database +# only once: init admin user and create indices and constraints in Neo4j database $ docker compose exec backend /bin/sh -c "yarn prod:migrate init" ``` diff --git a/README.md b/README.md index f0688f820..5b36dbc87 100644 --- a/README.md +++ b/README.md @@ -139,6 +139,7 @@ Prepare database once before you start by running the following command in a sec ```bash # 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 up ``` Then clear and seed database by running the following command as well in the second terminal: diff --git a/deployment/DOCKER_MORE_CLOSELY.md b/deployment/DOCKER_MORE_CLOSELY.md index 113e3a4da..1768d74fa 100644 --- a/deployment/DOCKER_MORE_CLOSELY.md +++ b/deployment/DOCKER_MORE_CLOSELY.md @@ -24,7 +24,7 @@ $ docker compose -f docker-compose.yml -f docker-compose.apple-m1.override.yml u # for production testing Docker images from DockerHub $ docker compose -f docker-compose.ocelotsocial-branded.yml -f docker-compose.apple-m1.override.yml up -# only once: init admin user and create indexes and contraints in Neo4j database +# only once: init admin user and create indices and constraints in Neo4j database $ docker compose exec backend /bin/sh -c "yarn prod:migrate init" ``` diff --git a/neo4j/README.md b/neo4j/README.md index 885f7f445..a9834ae20 100644 --- a/neo4j/README.md +++ b/neo4j/README.md @@ -44,7 +44,7 @@ for development, spin up a [hosted Neo4j Sandbox instance](https://neo4j.com/download/), run Neo4j in one of the [many cloud options](https://neo4j.com/developer/guide-cloud-deployment/), [spin up Neo4j in a Docker container](https://neo4j.com/developer/docker/), -on Archlinux you can install [neo4j-community from AUR](https://aur.archlinux.org/packages/neo4j-community/) +on Arch linux you can install [neo4j-community from AUR](https://aur.archlinux.org/packages/neo4j-community/) or on Debian-based systems install [Neo4j from the Debian Repository](http://debian.neo4j.org/). Just be sure to update the Neo4j connection string and credentials accordingly in `backend/.env`. @@ -55,15 +55,15 @@ Start Neo4J and confirm the database is running at [http://localhost:7474](http: Here we describe some rarely used Cypher commands for Neo4j that are needed from time to time: -### Index And Contraint Commands +### Index And Constraint Commands -If indexes or constraints are missing or not set correctly, the browser search will not work or the database seed for development will not work. +If indices or constraints are missing or not set correctly, the browser search will not work or the database seed for development will not work. -The indexes and constraints of our database are set in `backend/src/db/migrate/store.js`. +The indices and constraints of our database are set in `backend/src/db/migrate/store.js`. This is where the magic happens. It's called by our `prod:migrate init` command. -This command initializes the Admin user and creates all necessary indexes and constraints in the Neo4j database. +This command initializes the Admin user and creates all necessary indices and constraints in the Neo4j database. ***Calls in development*** @@ -98,27 +98,27 @@ On a server with Kubernetes cluster: $ kubectl -n default exec -it $(kubectl -n default get pods | grep ocelot-backend | awk '{ print $1 }') -- /bin/sh -c "yarn prod:migrate init" ``` -***Cypher commands to show indexes and constraints*** +***Cypher commands to show indices and constraints*** ```bash # in browser command line or cypher shell -# show all indexes and constraints +# show all indices and constraints $ :schema -# show all indexes +# show all indices $ CALL db.indexes(); # show all constraints $ CALL db.constraints(); ``` -***Cypher commands to create and drop indexes and constraints*** +***Cypher commands to create and drop indices and constraints*** ```bash # in browser command line or cypher shell -# create indexes +# create indices $ CALL db.index.fulltext.createNodeIndex("post_fulltext_search",["Post"],["title", "content"]); $ CALL db.index.fulltext.createNodeIndex("user_fulltext_search",["User"],["name", "slug"]); $ CALL db.index.fulltext.createNodeIndex("tag_fulltext_search",["Tag"],["id"]); @@ -126,6 +126,6 @@ $ CALL db.index.fulltext.createNodeIndex("tag_fulltext_search",["Tag"],["id"]); # drop an index $ DROP CONSTRAINT ON ( image:Image ) ASSERT image.url IS UNIQUE -# drop all indexes and constraints +# drop all indices and constraints $ CALL apoc.schema.assert({},{},true) YIELD label, key RETURN * ; ``` From cec9276a0f550fa51ea7b7f82e81f4b0a8633fc1 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Tue, 7 Mar 2023 13:34:36 +0100 Subject: [PATCH 03/23] Update CONTRIBUTING.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 918eff871..785f51642 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -190,7 +190,7 @@ For Docker compose `up` or `build` commands, you can use our Apple M1 override f # for development $ docker compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.apple-m1.override.yml up -# only once: init admin user and create indices and constraints in Neo4j database +# only once: init admin user and create indexes and constraints in Neo4j database $ docker compose exec backend yarn prod:migrate init # clean db $ docker compose exec backend yarn db:reset From cde40b82748fe7f6cfc18bea6fe0494b32c97705 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Tue, 7 Mar 2023 13:34:47 +0100 Subject: [PATCH 04/23] Update CONTRIBUTING.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 785f51642..e5839a576 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -199,7 +199,7 @@ $ docker compose exec backend yarn db:seed # for production $ docker compose -f docker-compose.yml -f docker-compose.apple-m1.override.yml up -# only once: init admin user and create indices and constraints in Neo4j database +# only once: init admin user and create indexes and constraints in Neo4j database $ docker compose exec backend /bin/sh -c "yarn prod:migrate init" ``` From 3b724b802267bbbd36a5df9021adba03faaace6e Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 8 Mar 2023 09:32:03 +0100 Subject: [PATCH 05/23] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5b36dbc87..6712922ce 100644 --- a/README.md +++ b/README.md @@ -138,8 +138,8 @@ Prepare database once before you start by running the following command in a sec ```bash # 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 up +$ docker compose exec backend yarn run db:migrate init +$ 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: From 7d761363d5daeaf3cd6c37cb381fa531c7d2bf7b Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 8 Mar 2023 09:32:10 +0100 Subject: [PATCH 06/23] Update backend/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- backend/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/README.md b/backend/README.md index 130b9b05b..5173286d1 100644 --- a/backend/README.md +++ b/backend/README.md @@ -135,7 +135,7 @@ To reset the database run: $ docker exec backend yarn run db:reset # you could also wipe out your neo4j database and delete all volumes with: $ docker-compose down -v -# if container is not running, run this command to set up your database indices and constraints +# if container is not running, run this command to set up your database indexes and constraints $ docker exec backend yarn run db:migrate init # And then upgrade the indices and const $ docker exec backend yarn run db:migrate up From 3c7d4df8ba2fe8a22ffedcd4348e4f5520bef9b3 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 8 Mar 2023 09:32:20 +0100 Subject: [PATCH 07/23] Update neo4j/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- neo4j/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neo4j/README.md b/neo4j/README.md index a9834ae20..788b4e87e 100644 --- a/neo4j/README.md +++ b/neo4j/README.md @@ -103,7 +103,7 @@ $ kubectl -n default exec -it $(kubectl -n default get pods | grep ocelot-backen ```bash # in browser command line or cypher shell -# show all indices and constraints +# show all indexes and constraints $ :schema # show all indices From 0c6fd23f8ad01d57d130fdb7aba148316d1bc959 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 8 Mar 2023 09:32:31 +0100 Subject: [PATCH 08/23] Update neo4j/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- neo4j/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neo4j/README.md b/neo4j/README.md index 788b4e87e..31f4d5739 100644 --- a/neo4j/README.md +++ b/neo4j/README.md @@ -113,7 +113,7 @@ $ CALL db.indexes(); $ CALL db.constraints(); ``` -***Cypher commands to create and drop indices and constraints*** +***Cypher commands to create and drop indexes and constraints*** ```bash # in browser command line or cypher shell From a24bca7d70a33214dfd0e25a1e1dab7515a0bbfd Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 8 Mar 2023 09:32:39 +0100 Subject: [PATCH 09/23] Update neo4j/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- neo4j/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neo4j/README.md b/neo4j/README.md index 31f4d5739..da6b8fad1 100644 --- a/neo4j/README.md +++ b/neo4j/README.md @@ -118,7 +118,7 @@ $ CALL db.constraints(); ```bash # in browser command line or cypher shell -# create indices +# create indexes $ CALL db.index.fulltext.createNodeIndex("post_fulltext_search",["Post"],["title", "content"]); $ CALL db.index.fulltext.createNodeIndex("user_fulltext_search",["User"],["name", "slug"]); $ CALL db.index.fulltext.createNodeIndex("tag_fulltext_search",["Tag"],["id"]); From b9a5de277eaeaa48ce113359d940d42e02ecb394 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 8 Mar 2023 09:32:48 +0100 Subject: [PATCH 10/23] Update neo4j/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- neo4j/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neo4j/README.md b/neo4j/README.md index da6b8fad1..281c2904b 100644 --- a/neo4j/README.md +++ b/neo4j/README.md @@ -126,6 +126,6 @@ $ CALL db.index.fulltext.createNodeIndex("tag_fulltext_search",["Tag"],["id"]); # drop an index $ DROP CONSTRAINT ON ( image:Image ) ASSERT image.url IS UNIQUE -# drop all indices and constraints +# drop all indexes and constraints $ CALL apoc.schema.assert({},{},true) YIELD label, key RETURN * ; ``` From 0ae1e47076c725eddcdb0af8a17e31bdec4a1098 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 8 Mar 2023 09:33:24 +0100 Subject: [PATCH 11/23] Update neo4j/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- neo4j/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neo4j/README.md b/neo4j/README.md index 281c2904b..12ec90240 100644 --- a/neo4j/README.md +++ b/neo4j/README.md @@ -106,7 +106,7 @@ $ kubectl -n default exec -it $(kubectl -n default get pods | grep ocelot-backen # show all indexes and constraints $ :schema -# show all indices +# show all indexes $ CALL db.indexes(); # show all constraints From 6a54e8cb1bfceca463abdd2f60a8cce9d1d3a3bf Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 8 Mar 2023 09:33:34 +0100 Subject: [PATCH 12/23] Update backend/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- backend/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/README.md b/backend/README.md index 5173286d1..3dd8ced83 100644 --- a/backend/README.md +++ b/backend/README.md @@ -137,7 +137,7 @@ $ docker exec backend yarn run db:reset $ docker-compose down -v # if container is not running, run this command to set up your database indexes and constraints $ docker exec backend yarn run db:migrate init -# And then upgrade the indices and const +# And then upgrade the indexes and const $ docker exec backend yarn run db:migrate up ``` From 92a74bd2a3bf2adb51b93f255ba00e106b3839ce Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 8 Mar 2023 09:33:47 +0100 Subject: [PATCH 13/23] Update deployment/DOCKER_MORE_CLOSELY.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- deployment/DOCKER_MORE_CLOSELY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/DOCKER_MORE_CLOSELY.md b/deployment/DOCKER_MORE_CLOSELY.md index 1768d74fa..67488fe81 100644 --- a/deployment/DOCKER_MORE_CLOSELY.md +++ b/deployment/DOCKER_MORE_CLOSELY.md @@ -24,7 +24,7 @@ $ docker compose -f docker-compose.yml -f docker-compose.apple-m1.override.yml u # for production testing Docker images from DockerHub $ docker compose -f docker-compose.ocelotsocial-branded.yml -f docker-compose.apple-m1.override.yml up -# only once: init admin user and create indices and constraints in Neo4j database +# only once: init admin user and create indexes and constraints in Neo4j database $ docker compose exec backend /bin/sh -c "yarn prod:migrate init" ``` From 5460a8121707891fa396d2fa661a5b7df1ec213a Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 8 Mar 2023 09:34:01 +0100 Subject: [PATCH 14/23] Update neo4j/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- neo4j/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neo4j/README.md b/neo4j/README.md index 12ec90240..0f2af9365 100644 --- a/neo4j/README.md +++ b/neo4j/README.md @@ -57,7 +57,7 @@ Here we describe some rarely used Cypher commands for Neo4j that are needed from ### Index And Constraint Commands -If indices or constraints are missing or not set correctly, the browser search will not work or the database seed for development will not work. +If indexes or constraints are missing or not set correctly, the browser search will not work or the database seed for development will not work. The indices and constraints of our database are set in `backend/src/db/migrate/store.js`. This is where the magic happens. From 9162ae1192e44ea3d165506f57dd92b1108d5452 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 8 Mar 2023 09:34:14 +0100 Subject: [PATCH 15/23] Update neo4j/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- neo4j/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neo4j/README.md b/neo4j/README.md index 0f2af9365..a715a4630 100644 --- a/neo4j/README.md +++ b/neo4j/README.md @@ -98,7 +98,7 @@ On a server with Kubernetes cluster: $ kubectl -n default exec -it $(kubectl -n default get pods | grep ocelot-backend | awk '{ print $1 }') -- /bin/sh -c "yarn prod:migrate init" ``` -***Cypher commands to show indices and constraints*** +***Cypher commands to show indexes and constraints*** ```bash # in browser command line or cypher shell From 9f2211d7d1391f5af2d76fa082be4c0226511f15 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 8 Mar 2023 09:34:25 +0100 Subject: [PATCH 16/23] Update neo4j/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- neo4j/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neo4j/README.md b/neo4j/README.md index a715a4630..8b61cef53 100644 --- a/neo4j/README.md +++ b/neo4j/README.md @@ -59,7 +59,7 @@ Here we describe some rarely used Cypher commands for Neo4j that are needed from If indexes or constraints are missing or not set correctly, the browser search will not work or the database seed for development will not work. -The indices and constraints of our database are set in `backend/src/db/migrate/store.js`. +The indexes and constraints of our database are set in `backend/src/db/migrate/store.js`. This is where the magic happens. It's called by our `prod:migrate init` command. From 5e5c1fef04ac95d1674f9da770c74aacd341c271 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 8 Mar 2023 09:34:35 +0100 Subject: [PATCH 17/23] Update neo4j/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- neo4j/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neo4j/README.md b/neo4j/README.md index 8b61cef53..1ea625d89 100644 --- a/neo4j/README.md +++ b/neo4j/README.md @@ -63,7 +63,7 @@ The indexes and constraints of our database are set in `backend/src/db/migrate/s This is where the magic happens. It's called by our `prod:migrate init` command. -This command initializes the Admin user and creates all necessary indices and constraints in the Neo4j database. +This command initializes the Admin user and creates all necessary indexes and constraints in the Neo4j database. ***Calls in development*** From b9d5fe449e2e0df98b756c8976891320cb0f4383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 9 Mar 2023 14:35:02 +0100 Subject: [PATCH 18/23] Fix 'viewport' 'width=device-width' by removing it, because it does not work correctly for Safari on iOS --- webapp/nuxt.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js index ef29c938d..750161095 100644 --- a/webapp/nuxt.config.js +++ b/webapp/nuxt.config.js @@ -62,7 +62,8 @@ export default { }, { name: 'viewport', - content: 'width=device-width, initial-scale=1', + // content: 'width=device-width, initial-scale=1', // "width=device-width" does not work correctly for Safari on iOS + content: 'initial-scale=1', }, { hid: 'description', From eb9daebe52c0feee8ddf0b47af0596db947d3369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 9 Mar 2023 20:13:48 +0100 Subject: [PATCH 19/23] Change 'viewport' on maintenance page as well and add comment --- webapp/maintenance/source/nuxt.config.maintenance.js | 3 ++- webapp/nuxt.config.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/webapp/maintenance/source/nuxt.config.maintenance.js b/webapp/maintenance/source/nuxt.config.maintenance.js index 9e11a5eb0..32fa4855c 100644 --- a/webapp/maintenance/source/nuxt.config.maintenance.js +++ b/webapp/maintenance/source/nuxt.config.maintenance.js @@ -15,7 +15,8 @@ export default { }, { name: 'viewport', - content: 'width=device-width, initial-scale=1', + // content: 'width=device-width, initial-scale=1', // "width=device-width" does not work correctly for Safari on iOS, see https://stackoverflow.com/a/37136777 + content: 'initial-scale=1', }, { hid: 'description', diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js index 750161095..c6cded102 100644 --- a/webapp/nuxt.config.js +++ b/webapp/nuxt.config.js @@ -62,7 +62,7 @@ export default { }, { name: 'viewport', - // content: 'width=device-width, initial-scale=1', // "width=device-width" does not work correctly for Safari on iOS + // content: 'width=device-width, initial-scale=1', // "width=device-width" does not work correctly for Safari on iOS, see https://stackoverflow.com/a/37136777 content: 'initial-scale=1', }, { From ecbaffc0def6ab8a5b4b174ac110ba5aaca9fce2 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Mon, 13 Mar 2023 07:04:37 +0100 Subject: [PATCH 20/23] Update backend/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- backend/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/README.md b/backend/README.md index 3dd8ced83..60748ecb0 100644 --- a/backend/README.md +++ b/backend/README.md @@ -81,7 +81,7 @@ More details about our GraphQL playground and how to use it with ocelot.social c ### Database Indices and Constraints -Database indices and constraints need to be created and upgraded when the database and the backend are running: +Database indexes and constraints need to be created and upgraded when the database and the backend are running: {% tabs %} {% tab title="Docker" %} From 0d9dbbe4da9152770b24504cf5bd84916acb353d Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Mon, 13 Mar 2023 07:06:43 +0100 Subject: [PATCH 21/23] Update backend/README.md --- backend/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/README.md b/backend/README.md index 60748ecb0..92a14044c 100644 --- a/backend/README.md +++ b/backend/README.md @@ -79,7 +79,7 @@ More details about our GraphQL playground and how to use it with ocelot.social c ![GraphQL Playground](../.gitbook/assets/graphql-playground.png) -### Database Indices and Constraints +### Database Indexes and Constraints Database indexes and constraints need to be created and upgraded when the database and the backend are running: From 851679fe33d6700593351105116cdad6ddb1cb87 Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 13 Mar 2023 15:01:08 +0100 Subject: [PATCH 22/23] increased the y-Gap in the masonry-grid component for a better overview --- webapp/components/MasonryGrid/MasonryGrid.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/components/MasonryGrid/MasonryGrid.vue b/webapp/components/MasonryGrid/MasonryGrid.vue index 00afa31af..f95c0e16e 100644 --- a/webapp/components/MasonryGrid/MasonryGrid.vue +++ b/webapp/components/MasonryGrid/MasonryGrid.vue @@ -30,7 +30,7 @@ export default { /* dirty fix to override broken styleguide inline-styles */ .ds-grid { grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr)) !important; - gap: 16px !important; + gap: 32px 16px !important; grid-auto-rows: 20px; } From 60e4ff28a70bd59eaf50bbeac872436d4fbe5f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 14 Mar 2023 07:39:25 +0100 Subject: [PATCH 23/23] Remove comment why 'viewport' has to be changed --- webapp/maintenance/source/nuxt.config.maintenance.js | 1 - webapp/nuxt.config.js | 1 - 2 files changed, 2 deletions(-) diff --git a/webapp/maintenance/source/nuxt.config.maintenance.js b/webapp/maintenance/source/nuxt.config.maintenance.js index 32fa4855c..4bbe72fdb 100644 --- a/webapp/maintenance/source/nuxt.config.maintenance.js +++ b/webapp/maintenance/source/nuxt.config.maintenance.js @@ -15,7 +15,6 @@ export default { }, { name: 'viewport', - // content: 'width=device-width, initial-scale=1', // "width=device-width" does not work correctly for Safari on iOS, see https://stackoverflow.com/a/37136777 content: 'initial-scale=1', }, { diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js index c6cded102..2a837ffb4 100644 --- a/webapp/nuxt.config.js +++ b/webapp/nuxt.config.js @@ -62,7 +62,6 @@ export default { }, { name: 'viewport', - // content: 'width=device-width, initial-scale=1', // "width=device-width" does not work correctly for Safari on iOS, see https://stackoverflow.com/a/37136777 content: 'initial-scale=1', }, {