From 8f336a0d13315d2761714a19fd88e232700b1e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 2 Aug 2022 08:30:14 +0200 Subject: [PATCH 001/225] Add todo comment to Cypress test --- .../UserProfile.SocialMedia/I_delete_a_social_media_link.js | 1 + 1 file changed, 1 insertion(+) diff --git a/cypress/integration/UserProfile.SocialMedia/I_delete_a_social_media_link.js b/cypress/integration/UserProfile.SocialMedia/I_delete_a_social_media_link.js index 10daffca1..73fd0a16e 100644 --- a/cypress/integration/UserProfile.SocialMedia/I_delete_a_social_media_link.js +++ b/cypress/integration/UserProfile.SocialMedia/I_delete_a_social_media_link.js @@ -3,4 +3,5 @@ import { When } from "cypress-cucumber-preprocessor/steps"; When('I delete a social media link', () => { cy.get(".base-button[title='Delete']") .click() + // TODO: add delition confirmation modal click, see issue }) \ No newline at end of file From 33026ba3e0201703bf0eedc9d3f0297828acc985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 2 Aug 2022 08:30:54 +0200 Subject: [PATCH 002/225] Add explaining comments to confirmation modal --- webapp/components/Modal.vue | 2 ++ webapp/components/Modal/ConfirmModal.vue | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/webapp/components/Modal.vue b/webapp/components/Modal.vue index a76adac3f..9195ad179 100644 --- a/webapp/components/Modal.vue +++ b/webapp/components/Modal.vue @@ -22,6 +22,7 @@ :name="name" @close="close" /> + Date: Tue, 2 Aug 2022 08:52:13 +0200 Subject: [PATCH 003/225] Refactor MySomethingList and social media list and adding deletion modal dialog --- .../MySomethingList/MySomethingList.spec.js | 58 ++++++++- .../MySomethingList/MySomethingList.vue | 122 +++++++++--------- webapp/locales/de.json | 11 +- webapp/locales/en.json | 9 +- webapp/pages/settings/my-social-media.spec.js | 10 +- webapp/pages/settings/my-social-media.vue | 94 +++++++------- 6 files changed, 189 insertions(+), 115 deletions(-) diff --git a/webapp/components/_new/features/MySomethingList/MySomethingList.spec.js b/webapp/components/_new/features/MySomethingList/MySomethingList.spec.js index 513207110..7a588f255 100644 --- a/webapp/components/_new/features/MySomethingList/MySomethingList.spec.js +++ b/webapp/components/_new/features/MySomethingList/MySomethingList.spec.js @@ -1,6 +1,7 @@ +import Vue from 'vue' +import Vuex from 'vuex' import { mount } from '@vue/test-utils' import MySomethingList from './MySomethingList.vue' -import Vue from 'vue' const localVue = global.localVue @@ -9,12 +10,23 @@ describe('MySomethingList.vue', () => { let propsData let data let mocks + let mutations beforeEach(() => { propsData = { useFormData: { dummy: '' }, useItems: [{ id: 'id', dummy: 'dummy' }], namePropertyKey: 'dummy', + texts: { + addButton: 'add-button', + addNew: 'add-new-something', + deleteModal: { + titleIdent: 'delete-modal.title', + messageIdent: 'delete-modal.message', + confirm: { icon: 'trash', buttonTextIdent: 'delete-modal.confirm-button' }, + }, + edit: 'edit-something', + }, callbacks: { edit: jest.fn(), submit: jest.fn(), delete: jest.fn() }, } data = () => { @@ -30,6 +42,9 @@ describe('MySomethingList.vue', () => { success: jest.fn(), }, } + mutations = { + 'modal/SET_OPEN': jest.fn().mockResolvedValueOnce(), + } }) describe('mount', () => { @@ -39,12 +54,16 @@ describe('MySomethingList.vue', () => { 'list-item': '
', 'edit-item': '
', } + const store = new Vuex.Store({ + mutations, + }) return mount(MySomethingList, { propsData, data, mocks, localVue, slots, + store, }) } @@ -114,13 +133,42 @@ describe('MySomethingList.vue', () => { ) }) - it('calls delete', async () => { + it('calls delete by committing "modal/SET_OPEN"', async () => { const deleteButton = wrapper.find('.base-button[data-test="delete-button"]') deleteButton.trigger('click') await Vue.nextTick() - const expectedItem = expect.objectContaining({ id: 'id', dummy: 'dummy' }) - expect(propsData.callbacks.delete).toHaveBeenCalledTimes(1) - expect(propsData.callbacks.delete).toHaveBeenCalledWith(expect.any(Object), expectedItem) + const expectedModalData = expect.objectContaining({ + name: 'confirm', + data: { + type: '', + resource: { id: '' }, + modalData: { + titleIdent: 'delete-modal.title', + messageIdent: 'delete-modal.message', + messageParams: { + name: 'dummy', + }, + buttons: { + confirm: { + danger: true, + icon: 'trash', + textIdent: 'delete-modal.confirm-button', + callback: expect.any(Function), + }, + cancel: { + icon: 'close', + textIdent: 'actions.cancel', + callback: expect.any(Function), + }, + }, + }, + }, + }) + expect(mutations['modal/SET_OPEN']).toHaveBeenCalledTimes(1) + expect(mutations['modal/SET_OPEN']).toHaveBeenCalledWith( + expect.any(Object), + expectedModalData, + ) }) }) }) diff --git a/webapp/components/_new/features/MySomethingList/MySomethingList.vue b/webapp/components/_new/features/MySomethingList/MySomethingList.vue index fbfcca932..3ae41d934 100644 --- a/webapp/components/_new/features/MySomethingList/MySomethingList.vue +++ b/webapp/components/_new/features/MySomethingList/MySomethingList.vue @@ -1,19 +1,10 @@ + From fc930174986e54af275a656c6bb93fceb88a6f50 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 10 Nov 2022 10:28:31 +0100 Subject: [PATCH 020/225] fix lint --- webapp/components/Group/GroupMember.vue | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/webapp/components/Group/GroupMember.vue b/webapp/components/Group/GroupMember.vue index 5a81cf607..71bf523df 100644 --- a/webapp/components/Group/GroupMember.vue +++ b/webapp/components/Group/GroupMember.vue @@ -1,11 +1,10 @@ - -

{{ $t('group.membersListTitle') }}

@@ -257,8 +254,6 @@ export default { } diff --git a/webapp/components/Group/GroupMember.vue b/webapp/components/Group/GroupMember.vue index 71bf523df..b8ed09f5a 100644 --- a/webapp/components/Group/GroupMember.vue +++ b/webapp/components/Group/GroupMember.vue @@ -1,39 +1,6 @@ + From f18b1202c18896ae6aa4b9deb496c172c8e1034e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 10 Jan 2023 10:35:12 +0100 Subject: [PATCH 065/225] Cleanup --- webapp/pages/map.vue | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index ef5d6f786..0f41523c4 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -17,21 +17,18 @@ @load="onMapLoad" > - -
- - {{ style.title }} - - -
+ + {{ style.title }} + + @@ -100,8 +97,6 @@ export default { From 67fe5864c9c580a26d4057a329b085b004173f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 10 Jan 2023 10:46:54 +0100 Subject: [PATCH 066/225] Add map page title, even in head --- webapp/locales/de.json | 1 + webapp/locales/en.json | 1 + webapp/pages/map.vue | 75 ++++++++++++++++++++++++------------------ 3 files changed, 45 insertions(+), 32 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 077850296..e37280a42 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -523,6 +523,7 @@ "title": "{APPLICATION_NAME} befindet sich in der Wartung" }, "map": { + "pageTitle": "Karte", "styles": { "dark": "Dunkel", "outdoors": "Landschaft", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index f7f520c93..5635b4e4b 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -523,6 +523,7 @@ "title": "{APPLICATION_NAME} is under maintenance" }, "map": { + "pageTitle": "Map", "styles": { "dark": "Dark", "outdoors": "Outdoors", diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index 0f41523c4..f8d6c8e71 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -1,36 +1,42 @@ From 13f2451e021c0503259035e54031da929c0bef19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 12 Jan 2023 10:12:22 +0100 Subject: [PATCH 074/225] Change default GQL 'UserQuery' to named 'profileUserQuery' --- webapp/graphql/User.js | 2 +- webapp/pages/map.vue | 4 ++-- webapp/pages/profile/_id/_slug.vue | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js index 235e0e997..1ed20f3e6 100644 --- a/webapp/graphql/User.js +++ b/webapp/graphql/User.js @@ -7,7 +7,7 @@ import { commentFragment, } from './Fragments' -export default (i18n) => { +export const profileUserQuery = (i18n) => { const lang = i18n.locale().toUpperCase() return gql` ${userFragment} diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index 680323cc0..465cb9807 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -54,7 +54,7 @@ import mapboxgl from 'mapbox-gl' // import MapboxLanguage from '@mapbox/mapbox-gl-language' import { objectValuesToArray } from '../utils/utils' import { mapGetters } from 'vuex' -import UserQuery from '~/graphql/User' +import { profileUserQuery } from '~/graphql/User' export default { name: 'Map', @@ -164,7 +164,7 @@ export default { const { data: { User: users }, } = await this.$apollo.query({ - query: UserQuery(this.$i18n), + query: profileUserQuery(this.$i18n), variables: { id, followedByCount: 0, diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue index e97b4cc9e..1939dcd9f 100644 --- a/webapp/pages/profile/_id/_slug.vue +++ b/webapp/pages/profile/_id/_slug.vue @@ -184,8 +184,7 @@ import MasonryGrid from '~/components/MasonryGrid/MasonryGrid.vue' import MasonryGridItem from '~/components/MasonryGrid/MasonryGridItem.vue' import TabNavigation from '~/components/_new/generic/TabNavigation/TabNavigation' import { profilePagePosts } from '~/graphql/PostQuery' -import UserQuery from '~/graphql/User' -import { updateUserMutation } from '~/graphql/User.js' +import { profileUserQuery, updateUserMutation } from '~/graphql/User' import { muteUser, unmuteUser } from '~/graphql/settings/MutedUsers' import { blockUser, unblockUser } from '~/graphql/settings/BlockedUsers' import UpdateQuery from '~/components/utils/UpdateQuery' @@ -408,7 +407,7 @@ export default { }, User: { query() { - return UserQuery(this.$i18n) + return profileUserQuery(this.$i18n) }, variables() { return { From 04810ca500bac4f94c237e8503f59cd7e03ce2f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 12 Jan 2023 10:29:34 +0100 Subject: [PATCH 075/225] Move the admins user query GQL to the appropriate file --- webapp/graphql/User.js | 24 ++++++++++++++++++++++++ webapp/pages/admin/users.vue | 24 ++---------------------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js index 1ed20f3e6..8c1b94591 100644 --- a/webapp/graphql/User.js +++ b/webapp/graphql/User.js @@ -62,6 +62,30 @@ export const minimisedUserQuery = () => { ` } +export const adminUserQuery = () => { + return gql` + query ($filter: _UserFilter, $first: Int, $offset: Int, $email: String) { + User( + email: $email + filter: $filter + first: $first + offset: $offset + orderBy: createdAt_desc + ) { + id + name + slug + email + role + createdAt + contributionsCount + commentedCount + shoutedCount + } + } + ` +} + export const notificationQuery = (i18n) => { return gql` ${userFragment} diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue index cbd7433ad..44f162c77 100644 --- a/webapp/pages/admin/users.vue +++ b/webapp/pages/admin/users.vue @@ -74,10 +74,10 @@ From a0f7947c3a5fac2f12720e9068db729552b0fc50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 12 Jan 2023 11:28:02 +0100 Subject: [PATCH 078/225] Use 'getCoordinates' --- webapp/pages/map.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index 776287dee..b632eec96 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -78,7 +78,7 @@ export default { async mounted() { this.currentUserLocation = await this.getUserLocation(this.currentUser.id) this.currentUserCoordinates = this.currentUserLocation - ? [this.currentUserLocation.lng, this.currentUserLocation.lat] // Wolle: getCoordinates + ? this.getCoordinates(this.currentUserLocation) : null this.mapFlyToCenter() }, From 844bfb4cfbcd1b5dc3d6e254a1eab2678c469448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 12 Jan 2023 13:20:09 +0100 Subject: [PATCH 079/225] Show all groups with locations on map --- webapp/graphql/groups.js | 2 ++ webapp/pages/map.vue | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/webapp/graphql/groups.js b/webapp/graphql/groups.js index 72e49ebe3..56d3debeb 100644 --- a/webapp/graphql/groups.js +++ b/webapp/graphql/groups.js @@ -173,6 +173,8 @@ export const groupQuery = (i18n) => { locationName location { name: name${lang} + lng + lat } myRole } diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index b632eec96..4362e8ca7 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -39,13 +39,26 @@ -
+
+
+ +
+ +
@@ -57,6 +70,7 @@ import mapboxgl from 'mapbox-gl' import { objectValuesToArray } from '../utils/utils' import { mapGetters } from 'vuex' import { profileUserQuery, mapUserQuery } from '~/graphql/User' +import { groupQuery } from '~/graphql/groups' export default { name: 'Map', @@ -73,6 +87,7 @@ export default { currentUserLocation: null, currentUserCoordinates: null, users: [], + groups: [], } }, async mounted() { @@ -197,6 +212,18 @@ export default { }, fetchPolicy: 'cache-and-network', }, + Group: { + query() { + return groupQuery(this.$i18n) + }, + variables() { + return {} + }, + update({ Group }) { + this.groups = Group + }, + fetchPolicy: 'cache-and-network', + }, }, } From fbf1f74098f4fee4b767cd55fb069440118d46c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 12 Jan 2023 13:59:25 +0100 Subject: [PATCH 080/225] Move comment --- webapp/pages/map.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index 4362e8ca7..2d986e8cd 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -162,7 +162,6 @@ export default { // // console.log('this.language: ', this.language) // // is unclear, how to // // this.language.setLanguage('de') // makes error - // documentation: https://docs.mapbox.com/mapbox-gl-js/example/center-on-feature/ this.mapFlyToCenter() }, setStyle(url) { @@ -171,6 +170,7 @@ export default { }, mapFlyToCenter() { if (this.map) { + // example: https://docs.mapbox.com/mapbox-gl-js/example/center-on-feature/ this.map.flyTo({ center: this.mapCenter, zoom: this.mapZoom, From 04f43cde71d74e997c4b1161c19c29d5d27f85d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 12 Jan 2023 15:44:06 +0100 Subject: [PATCH 081/225] Comment use of GQL 'location' fragment in webapp 'groups' file --- webapp/graphql/groups.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/webapp/graphql/groups.js b/webapp/graphql/groups.js index 56d3debeb..97652fbb0 100644 --- a/webapp/graphql/groups.js +++ b/webapp/graphql/groups.js @@ -1,4 +1,5 @@ import gql from 'graphql-tag' +// Wolle: import { locationFragment } from './Fragments' // ------ mutations @@ -146,7 +147,9 @@ export const changeGroupMemberRoleMutation = () => { export const groupQuery = (i18n) => { const lang = i18n ? i18n.locale().toUpperCase() : 'EN' + // ${locationFragment(lang)} return gql` + query ($isMember: Boolean, $id: ID, $slug: String, $first: Int, $offset: Int) { Group(isMember: $isMember, id: $id, slug: $slug, first: $first, offset: $offset) { id @@ -171,6 +174,7 @@ export const groupQuery = (i18n) => { url } locationName + # ...location location { name: name${lang} lng From e81336b50fdff962d27c9747e9144f4de7203af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 12 Jan 2023 16:41:40 +0100 Subject: [PATCH 082/225] Set markers direct by map and not via HTML 'MglMarker' --- webapp/pages/map.vue | 69 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 64 insertions(+), 5 deletions(-) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index 2d986e8cd..4085ed545 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -39,10 +39,11 @@ -
+ + < !-- have this as last to have the users marker in front of all others -- > + /> -->
@@ -86,8 +88,14 @@ export default { defaultCenter: [10.452764, 51.165707], // center of Germany: https://www.gpskoordinaten.de/karte/land/DE currentUserLocation: null, currentUserCoordinates: null, - users: [], - groups: [], + users: null, + groups: null, + markers: { + array: [], + isCurrentUserAdded: false, + isUsersAdded: false, + isGroupsAdded: false, + }, } }, async mounted() { @@ -96,6 +104,7 @@ export default { ? this.getCoordinates(this.currentUserLocation) : null this.mapFlyToCenter() + this.addMissingMarkers() }, computed: { ...mapGetters({ @@ -163,11 +172,59 @@ export default { // // is unclear, how to // // this.language.setLanguage('de') // makes error this.mapFlyToCenter() + this.addMissingMarkers() }, setStyle(url) { this.map.setStyle(url) this.activeStyle = url }, + addMissingMarkers() { + if (this.map) { + if (!this.markers.isCurrentUserAdded && this.currentUserCoordinates) { + this.markers.array.push(new mapboxgl.Marker()) + this.markers.array[this.markers.array.length - 1] + .setLngLat(this.currentUserCoordinates) + .addTo(this.map) + this.markers.isCurrentUserAdded = true + } + if (!this.markers.isUsersAdded && this.currentUser && this.users) { + console.log('markers.isUsersAdded !!! this.users: ', this.users) + this.users.forEach((user, index) => { + console.log('markers.isUsersAdded !!! user index: ', index) + if (user.id !== this.currentUser.id && user.location) { + console.log('markers.isUsersAdded !!! user index if: ', index) + this.markers.array.push(new mapboxgl.Marker({ + coordinates: this.getCoordinates(user.location), + scale: 0.75, + color: 'blue', + })) + this.markers.array[this.markers.array.length - 1] + .setLngLat(this.currentUserCoordinates) + .addTo(this.map) + } + }) + this.markers.isUsersAdded = true + } + if (!this.markers.isGroupsAdded && this.groups) { + console.log('markers.isGroupsAdded !!! this.groups: ', this.groups) + this.groups.forEach((group, index) => { + console.log('markers.isGroupsAdded !!! group index: ', index) + if (group.location) { + console.log('markers.isGroupsAdded !!! group index if: ', index) + this.markers.array.push(new mapboxgl.Marker({ + coordinates: this.getCoordinates(group.location), + scale: 0.75, + color: 'green', + })) + this.markers.array[this.markers.array.length - 1] + .setLngLat(this.currentUserCoordinates) + .addTo(this.map) + } + }) + this.markers.isGroupsAdded = true + } + } + }, mapFlyToCenter() { if (this.map) { // example: https://docs.mapbox.com/mapbox-gl-js/example/center-on-feature/ @@ -209,6 +266,7 @@ export default { }, update({ User }) { this.users = User + this.addMissingMarkers() }, fetchPolicy: 'cache-and-network', }, @@ -221,6 +279,7 @@ export default { }, update({ Group }) { this.groups = Group + this.addMissingMarkers() }, fetchPolicy: 'cache-and-network', }, From 739eb20f65c3d0e529c0e4bf32a055d961163a3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 12 Jan 2023 16:54:06 +0100 Subject: [PATCH 083/225] Fix map coordinates of users and groups --- webapp/pages/map.vue | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index 4085ed545..e617ab64f 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -193,13 +193,15 @@ export default { console.log('markers.isUsersAdded !!! user index: ', index) if (user.id !== this.currentUser.id && user.location) { console.log('markers.isUsersAdded !!! user index if: ', index) - this.markers.array.push(new mapboxgl.Marker({ - coordinates: this.getCoordinates(user.location), - scale: 0.75, - color: 'blue', - })) + this.markers.array.push( + new mapboxgl.Marker({ + // Wolle: coordinates: this.getCoordinates(user.location), + scale: 0.75, + color: 'blue', + }), + ) this.markers.array[this.markers.array.length - 1] - .setLngLat(this.currentUserCoordinates) + .setLngLat(this.getCoordinates(user.location)) .addTo(this.map) } }) @@ -210,14 +212,21 @@ export default { this.groups.forEach((group, index) => { console.log('markers.isGroupsAdded !!! group index: ', index) if (group.location) { - console.log('markers.isGroupsAdded !!! group index if: ', index) - this.markers.array.push(new mapboxgl.Marker({ - coordinates: this.getCoordinates(group.location), - scale: 0.75, - color: 'green', - })) + console.log( + 'markers.isGroupsAdded !!! group index if: ', + index, + ' location: ', + this.getCoordinates(group.location), + ) + this.markers.array.push( + new mapboxgl.Marker({ + // Wolle: coordinates: this.getCoordinates(group.location), + scale: 0.75, + color: 'green', + }), + ) this.markers.array[this.markers.array.length - 1] - .setLngLat(this.currentUserCoordinates) + .setLngLat(this.getCoordinates(group.location)) .addTo(this.map) } }) From 1b75a533d9c0df9e7bdf4373f31f810deb1aec4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 12 Jan 2023 16:56:24 +0100 Subject: [PATCH 084/225] Cleanup --- webapp/pages/map.vue | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index e617ab64f..12689cc9b 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -188,11 +188,8 @@ export default { this.markers.isCurrentUserAdded = true } if (!this.markers.isUsersAdded && this.currentUser && this.users) { - console.log('markers.isUsersAdded !!! this.users: ', this.users) this.users.forEach((user, index) => { - console.log('markers.isUsersAdded !!! user index: ', index) if (user.id !== this.currentUser.id && user.location) { - console.log('markers.isUsersAdded !!! user index if: ', index) this.markers.array.push( new mapboxgl.Marker({ // Wolle: coordinates: this.getCoordinates(user.location), @@ -208,16 +205,8 @@ export default { this.markers.isUsersAdded = true } if (!this.markers.isGroupsAdded && this.groups) { - console.log('markers.isGroupsAdded !!! this.groups: ', this.groups) this.groups.forEach((group, index) => { - console.log('markers.isGroupsAdded !!! group index: ', index) if (group.location) { - console.log( - 'markers.isGroupsAdded !!! group index if: ', - index, - ' location: ', - this.getCoordinates(group.location), - ) this.markers.array.push( new mapboxgl.Marker({ // Wolle: coordinates: this.getCoordinates(group.location), From 3040f216d314677040a4338476f54018403658d3 Mon Sep 17 00:00:00 2001 From: ogerly Date: Sun, 22 Jan 2023 11:19:22 +0100 Subject: [PATCH 085/225] hide navbar by scroll down, show navbar by scroll up --- webapp/components/HeaderMenu/HeaderMenu.vue | 22 ++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue index 7f24eeb81..2cd037eaa 100644 --- a/webapp/components/HeaderMenu/HeaderMenu.vue +++ b/webapp/components/HeaderMenu/HeaderMenu.vue @@ -1,5 +1,5 @@