From 42a370ffc86c60316deb225fb1d91f9cf3ee7a35 Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 27 Feb 2023 10:42:20 +0100 Subject: [PATCH 001/102] set showDonations flag to false as default to avoid blinking --- webapp/pages/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index d5f1ac3d0..0468dc3a7 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -149,7 +149,7 @@ export default { hideByScroll: false, revScrollpos: 0, showFilter: false, - showDonations: true, + showDonations: false, goal: 15000, progress: 7000, posts: [], From cecd506581ea769bab36e5166eb32e566aa6df0e Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 27 Feb 2023 10:45:46 +0100 Subject: [PATCH 002/102] removed gap above news feed in desktop view --- webapp/pages/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index d5f1ac3d0..88bb20ebb 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -75,15 +75,16 @@ + + + - - diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue index a2b959b6d..06e95abb4 100644 --- a/webapp/pages/profile/_id/_slug.vue +++ b/webapp/pages/profile/_id/_slug.vue @@ -384,9 +384,9 @@ export default { this.user.followedByCurrentUser = followedByCurrentUser this.user.followedBy = followedBy }, - fetchAllConnections(type) { - if (type === 'following') this.followingCount = Infinity - if (type === 'followedBy') this.followedByCount = Infinity + fetchAllConnections(type, count) { + if (type === 'following') this.followingCount = count + if (type === 'followedBy') this.followedByCount = count }, }, apollo: { From cec9276a0f550fa51ea7b7f82e81f4b0a8633fc1 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Tue, 7 Mar 2023 13:34:36 +0100 Subject: [PATCH 008/102] 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 009/102] 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 010/102] 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 011/102] 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 012/102] 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 013/102] 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 014/102] 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 015/102] 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 016/102] 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 017/102] 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 018/102] 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 019/102] 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 020/102] 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 021/102] 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 022/102] 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 cf6116b5d9ef07b0002d7c6eff048fc3075cbf8e Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 9 Mar 2023 13:02:28 +0100 Subject: [PATCH 023/102] change locales for invitation link short description --- webapp/locales/de.json | 2 +- webapp/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index c0cae5b08..fbb9a1ce5 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -518,7 +518,7 @@ "copy-code": "Code:", "copy-success": "Einladungscode erfolgreich in die Zwischenablage kopiert", "not-available": "Du hast keinen Einladungscode zur Verfügung!", - "your-code": "Kopiere deinen Einladungscode in die Ablage:" + "your-code": "Sende diesen Link per E-Mail oder in sozialen Medien, um deine Freunde einzuladen:" }, "login": { "email": "Deine E-Mail", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 3a741a02b..d31f3f90c 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -518,7 +518,7 @@ "copy-code": "Code:", "copy-success": "Invite code copied to clipboard", "not-available": "You have no valid invite code available!", - "your-code": "Copy your invite code to the clipboard:" + "your-code": "Send this link per e-mail or in social media to invite your friends:" }, "login": { "email": "Your E-mail", From 9a59799b2bd62102e876797a7628b791e44b79a9 Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 9 Mar 2023 13:10:57 +0100 Subject: [PATCH 024/102] change copy text in invite button menu --- webapp/components/InviteButton/InviteButton.vue | 5 +---- webapp/locales/de.json | 2 +- webapp/locales/en.json | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/webapp/components/InviteButton/InviteButton.vue b/webapp/components/InviteButton/InviteButton.vue index 9eec37bc2..d3d926533 100644 --- a/webapp/components/InviteButton/InviteButton.vue +++ b/webapp/components/InviteButton/InviteButton.vue @@ -15,10 +15,7 @@ ghost @click="copyInviteLink" > - - {{ $t('invite-codes.copy-code') }} - {{ inviteCode.code }} - + {{ $t('invite-codes.copy-code') }} diff --git a/webapp/locales/de.json b/webapp/locales/de.json index fbb9a1ce5..d21e63547 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -515,7 +515,7 @@ "no-results": "Keine Beiträge gefunden." }, "invite-codes": { - "copy-code": "Code:", + "copy-code": "Einladungslink kopieren", "copy-success": "Einladungscode erfolgreich in die Zwischenablage kopiert", "not-available": "Du hast keinen Einladungscode zur Verfügung!", "your-code": "Sende diesen Link per E-Mail oder in sozialen Medien, um deine Freunde einzuladen:" diff --git a/webapp/locales/en.json b/webapp/locales/en.json index d31f3f90c..c3022b7ad 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -515,7 +515,7 @@ "no-results": "No contributions found." }, "invite-codes": { - "copy-code": "Code:", + "copy-code": "Copy Invite Link", "copy-success": "Invite code copied to clipboard", "not-available": "You have no valid invite code available!", "your-code": "Send this link per e-mail or in social media to invite your friends:" 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 025/102] 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 89fd312220134ba5fc532e26c553bc49378e5182 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 9 Mar 2023 14:35:15 +0100 Subject: [PATCH 026/102] feat(webapp): filter button style change --- webapp/pages/index.vue | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index d5f1ac3d0..673425d12 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -40,7 +40,7 @@ - + {{ $t('contribution.filterMasonryGrid.myTopics') }} - + {{ $t('contribution.filterMasonryGrid.myFriends') }} @@ -307,6 +309,17 @@ export default { float: right; } +.my-filter-button-selected { + padding-right: 30px; + margin-left: 8px; +} + +.base-button.filter-remove { + position: relative; + margin-left: -31px; + top: -5px; +} + .base-button.--circle.post-add-button-bottom { height: 54px; width: 54px; @@ -335,6 +348,7 @@ export default { align-items: center; } .filterButtonMenu { + width: 70%; position: fixed; z-index: 6; margin-top: -35px; From cfb07809c7af6bf1a6c6770dbf239e6af8d9a352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 9 Mar 2023 15:23:10 +0100 Subject: [PATCH 027/102] Rename 'HcCategory' to 'Category' on main index page --- webapp/components/PostTeaser/PostTeaser.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/webapp/components/PostTeaser/PostTeaser.vue b/webapp/components/PostTeaser/PostTeaser.vue index 6dc770d99..9c53d46aa 100644 --- a/webapp/components/PostTeaser/PostTeaser.vue +++ b/webapp/components/PostTeaser/PostTeaser.vue @@ -26,7 +26,7 @@ v-observe-visibility="(isVisible, entry) => visibilityChanged(isVisible, entry, post.id)" >
- From 19ac18af2af3ad1cf77107be620f7deed4e156f7 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 15 Mar 2023 11:08:47 +0100 Subject: [PATCH 082/102] Base is now width 98% after md we switch to 48% --- webapp/components/Group/GroupList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue index 93ad6e2b0..debe0e7a5 100644 --- a/webapp/components/Group/GroupList.vue +++ b/webapp/components/Group/GroupList.vue @@ -3,7 +3,7 @@ + :width="{ base: '98%', sm: '98%', md: '48%' }"> @@ -24,6 +24,6 @@ export default { From fe422f5c777ad9f1c78cf1d5bdc2f5b650ee26f2 Mon Sep 17 00:00:00 2001 From: mahula Date: Wed, 15 Mar 2023 11:39:03 +0100 Subject: [PATCH 083/102] add leave and tooltip key tolocales --- webapp/locales/de.json | 4 +++- webapp/locales/en.json | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index f341f405c..b2d802bc1 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -448,7 +448,9 @@ "joinLeaveButton": { "iAmMember": "Bin Mitglied", "join": "Beitreten", - "pendingMember": "Ausstehendes Mitglied" + "leave": "Verlassen", + "pendingMember": "Ausstehendes Mitglied", + "tooltip": "Der Inhaber muss dich noch bestätigen." }, "labelSlug": "Eindeutiger Gruppenname", "leaveModal": { diff --git a/webapp/locales/en.json b/webapp/locales/en.json index e8c50fc23..a718abdd7 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -448,7 +448,9 @@ "joinLeaveButton": { "iAmMember": "I'm a member", "join": "Join", - "pendingMember": "Pending member" + "leave": "Leave", + "pendingMember": "Pending member", + "tooltip": "The owner has yet to confirm you." }, "labelSlug": "Unique group name", "leaveModal": { From 5d5100f08cb816efaf72a0225ca28fba62f1d0e3 Mon Sep 17 00:00:00 2001 From: mahula Date: Wed, 15 Mar 2023 11:43:14 +0100 Subject: [PATCH 084/102] change join leave button behavior for pending user --- webapp/components/Button/JoinLeaveButton.vue | 28 ++++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/webapp/components/Button/JoinLeaveButton.vue b/webapp/components/Button/JoinLeaveButton.vue index 57337b4ac..cd91a029e 100644 --- a/webapp/components/Button/JoinLeaveButton.vue +++ b/webapp/components/Button/JoinLeaveButton.vue @@ -6,6 +6,7 @@ :icon="icon" :filled="isMember && !hovered" :danger="isMember && hovered" + v-tooltip="tooltip" @mouseenter.native="onHover" @mouseleave.native="hovered = false" @click.prevent="toggle" @@ -37,27 +38,32 @@ export default { computed: { icon() { if (this.isMember) { - if (this.hovered) { - return 'close' - } else if (this.isNonePendingMember) { - return 'check' + if (this.isNonePendingMember) { + return this.hovered ? 'close' : 'check' } else { - return 'question-circle' + return this.hovered ? 'close' : 'question-circle' } - } else { - return 'plus' } + return 'plus' }, label() { if (this.isMember) { if (this.isNonePendingMember) { - return this.$t('group.joinLeaveButton.iAmMember') + return this.hovered ? this.$t('group.joinLeaveButton.leave') : this.$t('group.joinLeaveButton.iAmMember') + } else { + return this.$t('group.joinLeaveButton.pendingMember') } - return this.$t('group.joinLeaveButton.pendingMember') - } else { - return this.$t('group.joinLeaveButton.join') } + return this.$t('group.joinLeaveButton.join') }, + tooltip() { + return { + content: this.$t('group.joinLeaveButton.tooltip'), + placement: 'right', + show: this.isMember && !this.isNonePendingMember && this.hovered, + trigger: this.isMember && !this.isNonePendingMember ? 'hover' : 'manual' + } + } }, watch: { isMember() { From be130f849a5ebf6a865c17a0affcae0d82c1dee9 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 15 Mar 2023 11:44:13 +0100 Subject: [PATCH 085/102] Fix linting. --- webapp/components/Group/GroupList.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue index debe0e7a5..692e518d8 100644 --- a/webapp/components/Group/GroupList.vue +++ b/webapp/components/Group/GroupList.vue @@ -1,9 +1,10 @@