diff --git a/backend/src/db/migrate/store.js b/backend/src/db/migrate/store.js index 57a317b47..ac762647b 100644 --- a/backend/src/db/migrate/store.js +++ b/backend/src/db/migrate/store.js @@ -85,7 +85,7 @@ class Store { await createDefaultAdminUser(session) if (CONFIG.CATEGORIES_ACTIVE) await createCategories(session) const writeTxResultPromise = session.writeTransaction(async (txc) => { - await txc.run('CALL apoc.schema.assert({},{},true)') // drop all indices and contraints + await txc.run('CALL apoc.schema.assert({},{},true)') // drop all indices and constraints return Promise.all( [ 'CALL db.index.fulltext.createNodeIndex("user_fulltext_search",["User"],["name", "slug"])', diff --git a/docker-compose.maintenance.yml b/docker-compose.maintenance.yml index 831bb3f4a..b006713ec 100644 --- a/docker-compose.maintenance.yml +++ b/docker-compose.maintenance.yml @@ -20,7 +20,6 @@ services: - GRAPHQL_URI=http://localhost:4000 - CLIENT_URI=http://localhost:3000 - JWT_SECRET=b/&&7b78BF&fv/Vd - - MAPBOX_TOKEN=pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g - PRIVATE_KEY_PASSPHRASE=a7dsf78sadg87ad87sfagsadg78 - NEO4J_apoc_import_file_enabled=true - "SSH_USERNAME=${SSH_USERNAME}" diff --git a/neo4j/README.md b/neo4j/README.md index f2b26d551..885f7f445 100644 --- a/neo4j/README.md +++ b/neo4j/README.md @@ -98,22 +98,22 @@ 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 contraints*** +***Cypher commands to show indexes and constraints*** ```bash # in browser command line or cypher shell -# show all indexes and contraints +# show all indexes and constraints $ :schema # show all indexes $ CALL db.indexes(); -# show all contraints +# show all constraints $ CALL db.constraints(); ``` -***Cypher commands to create and drop indexes and contraints*** +***Cypher commands to create and drop indexes and constraints*** ```bash # in browser command line or cypher shell @@ -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 contraints +# drop all indexes and constraints $ CALL apoc.schema.assert({},{},true) YIELD label, key RETURN * ; ``` diff --git a/webapp/.env.template b/webapp/.env.template index 9776fcea2..76bc502f9 100644 --- a/webapp/.env.template +++ b/webapp/.env.template @@ -1,7 +1,8 @@ SENTRY_DSN_WEBAPP= COMMIT= -PUBLIC_REGISTRATION=false -INVITE_REGISTRATION=true WEBSOCKETS_URI=ws://localhost:3000/api/graphql GRAPHQL_URI=http://localhost:4000/ +MAPBOX_TOKEN="pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g" +PUBLIC_REGISTRATION=false +INVITE_REGISTRATION=true CATEGORIES_ACTIVE=false diff --git a/webapp/assets/_new/icons/svgs/globe-detailed.svg b/webapp/assets/_new/icons/svgs/globe-detailed.svg new file mode 100644 index 000000000..64b5b1573 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/globe-detailed.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss index 180f9c820..770a1a9c9 100644 --- a/webapp/assets/_new/styles/tokens.scss +++ b/webapp/assets/_new/styles/tokens.scss @@ -3,28 +3,28 @@ * @presenter Color */ - $color-primary: rgb(23, 181, 63); - $color-primary-light: rgb(96, 214, 98); - $color-primary-dark: rgb(25, 122, 49); - $color-primary-active: rgb(25, 194, 67); - $color-primary-inverse: rgb(241, 253, 244); - $color-secondary: rgb(0, 142, 230); - $color-secondary-active: rgb(10, 161, 255); - $color-secondary-inverse: rgb(240, 249, 255); - $color-success: rgb(23, 181, 63); - $color-success-active: rgb(26, 203, 71); - $color-success-inverse: rgb(241, 253, 244); - $color-danger: rgb(219, 57, 36); - $color-danger-light: rgb(242, 97, 65); - $color-danger-dark: rgb(158, 43, 28); - $color-danger-active: rgb(224, 81, 62); - $color-danger-inverse: rgb(253, 243, 242); - $color-warning: rgb(230, 121, 25); - $color-warning-active: rgb(233, 137, 53); - $color-warning-inverse: rgb(253, 247, 241); - $color-yellow: rgb(245, 196, 0); - $color-yellow-active: rgb(255, 206, 10); - $color-yellow-inverse: rgb(255, 252, 240); +$color-primary: rgb(23, 181, 63); +$color-primary-light: rgb(96, 214, 98); +$color-primary-dark: rgb(25, 122, 49); +$color-primary-active: rgb(25, 194, 67); +$color-primary-inverse: rgb(241, 253, 244); +$color-secondary: rgb(0, 142, 230); +$color-secondary-active: rgb(10, 161, 255); +$color-secondary-inverse: rgb(240, 249, 255); +$color-success: rgb(23, 181, 63); +$color-success-active: rgb(26, 203, 71); +$color-success-inverse: rgb(241, 253, 244); +$color-danger: rgb(219, 57, 36); +$color-danger-light: rgb(242, 97, 65); +$color-danger-dark: rgb(158, 43, 28); +$color-danger-active: rgb(224, 81, 62); +$color-danger-inverse: rgb(253, 243, 242); +$color-warning: rgb(230, 121, 25); +$color-warning-active: rgb(233, 137, 53); +$color-warning-inverse: rgb(253, 247, 241); +$color-yellow: rgb(245, 196, 0); +$color-yellow-active: rgb(255, 206, 10); +$color-yellow-inverse: rgb(255, 252, 240); /** * @tokens Color Neutral diff --git a/webapp/components/Group/GroupButton.vue b/webapp/components/Group/GroupButton.vue index db72467ef..10275dcca 100644 --- a/webapp/components/Group/GroupButton.vue +++ b/webapp/components/Group/GroupButton.vue @@ -1,5 +1,19 @@ + + diff --git a/webapp/components/Group/GroupForm.vue b/webapp/components/Group/GroupForm.vue index 94ff000dc..cb407a3d9 100644 --- a/webapp/components/Group/GroupForm.vue +++ b/webapp/components/Group/GroupForm.vue @@ -142,6 +142,9 @@ style="position: relative; display: inline-block; right: -96%; top: -33px; width: 26px" @click="formData.locationName = ''" > + + {{ $t('settings.data.labelCityHint') }} + @@ -436,5 +439,9 @@ export default { align-self: flex-end; margin-top: $space-base; } + + > .location-hint { + margin-top: -$space-base + $space-xxx-small; + } } diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue index 7f24eeb81..fcec15850 100644 --- a/webapp/components/HeaderMenu/HeaderMenu.vue +++ b/webapp/components/HeaderMenu/HeaderMenu.vue @@ -20,7 +20,7 @@ - + - - + - + + - +
+ + + + diff --git a/webapp/components/Map/MapStylesButtons.vue b/webapp/components/Map/MapStylesButtons.vue new file mode 100644 index 000000000..be77a5344 --- /dev/null +++ b/webapp/components/Map/MapStylesButtons.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/webapp/components/_new/generic/BaseButton/BaseButton.vue b/webapp/components/_new/generic/BaseButton/BaseButton.vue index 6b8ad4f23..a51c3101c 100644 --- a/webapp/components/_new/generic/BaseButton/BaseButton.vue +++ b/webapp/components/_new/generic/BaseButton/BaseButton.vue @@ -96,6 +96,7 @@ export default { border-radius: $border-radius-x-large; overflow: hidden; font-weight: $font-weight-bold; + letter-spacing: $letter-spacing-large; cursor: pointer; &.--danger { diff --git a/webapp/components/_new/generic/BaseIcon/BaseIcon.vue b/webapp/components/_new/generic/BaseIcon/BaseIcon.vue index a1c34555e..ef09e2e03 100644 --- a/webapp/components/_new/generic/BaseIcon/BaseIcon.vue +++ b/webapp/components/_new/generic/BaseIcon/BaseIcon.vue @@ -1,6 +1,6 @@ @@ -16,6 +16,13 @@ export default { return iconNames.includes(value) }, }, + size: { + type: String, + default: 'regular', + validator(value) { + return value.match(/^(small|regular|large)$/) + }, + }, }, computed: { svgIcon() { @@ -42,6 +49,19 @@ export default { > .svg { height: 1.2em; fill: currentColor; + + &.--small { + height: 0.8em; + } + + &.--regular { + height: 1.2em; + } + + &.--large { + margin-left: 4px; + height: 2.2em; + } } } diff --git a/webapp/config/index.js b/webapp/config/index.js index db030e929..5da17010b 100644 --- a/webapp/config/index.js +++ b/webapp/config/index.js @@ -28,6 +28,7 @@ const sentry = { const options = { VERSION: process.env.VERSION || pkg.version, DESCRIPTION: process.env.DESCRIPTION || pkg.description, + MAPBOX_TOKEN: process.env.MAPBOX_TOKEN, PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION === 'true' || false, INVITE_REGISTRATION: process.env.INVITE_REGISTRATION !== 'false', // default = true // Cookies diff --git a/webapp/graphql/Fragments.js b/webapp/graphql/Fragments.js index 23d2c11d3..4931750b6 100644 --- a/webapp/graphql/Fragments.js +++ b/webapp/graphql/Fragments.js @@ -13,11 +13,19 @@ export const userFragment = gql` } ` -export const locationAndBadgesFragment = (lang) => gql` - fragment locationAndBadges on User { +export const locationFragment = (lang) => gql` + fragment location on User { + locationName location { name: name${lang} + lng + lat } + } +` + +export const badgesFragment = gql` + fragment badges on User { badges { id icon diff --git a/webapp/graphql/PostQuery.js b/webapp/graphql/PostQuery.js index 1b5c41984..1c6c76276 100644 --- a/webapp/graphql/PostQuery.js +++ b/webapp/graphql/PostQuery.js @@ -5,7 +5,8 @@ import { commentFragment, postCountsFragment, userCountsFragment, - locationAndBadgesFragment, + locationFragment, + badgesFragment, tagsCategoriesAndPinnedFragment, } from './Fragments' @@ -14,7 +15,8 @@ export default (i18n) => { return gql` ${userFragment} ${userCountsFragment} - ${locationAndBadgesFragment(lang)} + ${locationFragment(lang)} + ${badgesFragment} ${postFragment} ${postCountsFragment} ${tagsCategoriesAndPinnedFragment} @@ -28,7 +30,8 @@ export default (i18n) => { author { ...user ...userCounts - ...locationAndBadges + ...location + ...badges blocked } comments(orderBy: createdAt_asc) { @@ -36,7 +39,8 @@ export default (i18n) => { author { ...user ...userCounts - ...locationAndBadges + ...location + ...badges } } group { @@ -54,7 +58,8 @@ export const filterPosts = (i18n) => { return gql` ${userFragment} ${userCountsFragment} - ${locationAndBadgesFragment(lang)} + ${locationFragment(lang)} + ${badgesFragment} ${postFragment} ${postCountsFragment} ${tagsCategoriesAndPinnedFragment} @@ -67,7 +72,8 @@ export const filterPosts = (i18n) => { author { ...user ...userCounts - ...locationAndBadges + ...location + ...badges } group { id @@ -84,7 +90,8 @@ export const profilePagePosts = (i18n) => { return gql` ${userFragment} ${userCountsFragment} - ${locationAndBadgesFragment(lang)} + ${locationFragment(lang)} + ${badgesFragment} ${postFragment} ${postCountsFragment} ${tagsCategoriesAndPinnedFragment} @@ -102,7 +109,8 @@ export const profilePagePosts = (i18n) => { author { ...user ...userCounts - ...locationAndBadges + ...location + ...badges } group { id @@ -127,7 +135,8 @@ export const relatedContributions = (i18n) => { return gql` ${userFragment} ${userCountsFragment} - ${locationAndBadgesFragment(lang)} + ${locationFragment(lang)} + ${badgesFragment} ${postFragment} ${postCountsFragment} ${tagsCategoriesAndPinnedFragment} @@ -140,7 +149,8 @@ export const relatedContributions = (i18n) => { author { ...user ...userCounts - ...locationAndBadges + ...location + ...badges } relatedContributions(first: 2) { ...post @@ -149,7 +159,8 @@ export const relatedContributions = (i18n) => { author { ...user ...userCounts - ...locationAndBadges + ...location + ...badges } } } diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js index 0d3a24d8b..d5a18bbd7 100644 --- a/webapp/graphql/User.js +++ b/webapp/graphql/User.js @@ -1,26 +1,28 @@ import gql from 'graphql-tag' import { userCountsFragment, - locationAndBadgesFragment, + locationFragment, + badgesFragment, userFragment, postFragment, commentFragment, } from './Fragments' -export default (i18n) => { +export const profileUserQuery = (i18n) => { const lang = i18n.locale().toUpperCase() return gql` ${userFragment} ${userCountsFragment} - ${locationAndBadgesFragment(lang)} + ${locationFragment(lang)} + ${badgesFragment} - query User($id: ID!, $followedByCount: Int, $followingCount: Int) { + query User($id: ID!, $followedByCount: Int!, $followingCount: Int!) { User(id: $id) { ...user ...userCounts - ...locationAndBadges + ...location + ...badges about - locationName createdAt followedByCurrentUser isMuted @@ -29,12 +31,14 @@ export default (i18n) => { following(first: $followingCount) { ...user ...userCounts - ...locationAndBadges + ...location + ...badges } followedBy(first: $followedByCount) { ...user ...userCounts - ...locationAndBadges + ...location + ...badges } socialMedia { id @@ -62,6 +66,48 @@ 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 mapUserQuery = (i18n) => { + const lang = i18n.locale().toUpperCase() + return gql` + ${userFragment} + ${locationFragment(lang)} + ${badgesFragment} + + query { + User { + ...user + about + ...location + ...badges + } + } + ` +} + export const notificationQuery = (i18n) => { return gql` ${userFragment} diff --git a/webapp/graphql/groups.js b/webapp/graphql/groups.js index 72e49ebe3..cf64c21b3 100644 --- a/webapp/graphql/groups.js +++ b/webapp/graphql/groups.js @@ -1,4 +1,5 @@ import gql from 'graphql-tag' +// 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,8 +174,11 @@ export const groupQuery = (i18n) => { url } locationName + # ...location location { name: name${lang} + lng + lat } myRole } diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index 06c3315cd..524a530d1 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -1,14 +1,14 @@ + 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 { diff --git a/webapp/pages/settings/index.vue b/webapp/pages/settings/index.vue index b060e1327..6cae7e44c 100644 --- a/webapp/pages/settings/index.vue +++ b/webapp/pages/settings/index.vue @@ -1,5 +1,5 @@