diff --git a/backend/src/schema/resolvers/userData.js b/backend/src/schema/resolvers/userData.js index 98e0e700e..e8dc75588 100644 --- a/backend/src/schema/resolvers/userData.js +++ b/backend/src/schema/resolvers/userData.js @@ -1,5 +1,3 @@ -import log from './helpers/databaseLogger' - export default { Query: { userData: async (object, args, context, resolveInfo) => { @@ -23,7 +21,6 @@ export default { try { const result = await resultPromise - log(result.records[0].get('result')) return result.records[0].get('result') } finally { session.close() diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js index 3b015dacc..60026f0b7 100644 --- a/webapp/graphql/User.js +++ b/webapp/graphql/User.js @@ -292,3 +292,24 @@ export const currentUserCountQuery = () => gql` } } ` + +export const userDataQuery = (i18n) => { + return gql` + ${userFragment} + ${postFragment} + ${commentFragment} + query($id: ID!) { + userData(id: $id) { + user { + ...user + } + posts { + ...post + comments { + ...comment + } + } + } + } + ` +} diff --git a/webapp/pages/settings.vue b/webapp/pages/settings.vue index 950652028..6bd78b701 100644 --- a/webapp/pages/settings.vue +++ b/webapp/pages/settings.vue @@ -51,32 +51,30 @@ export default { name: this.$t('settings.embeds.name'), path: `/settings/embeds`, }, + { + name: this.$t('settings.download.name'), + path: `/settings/data-download`, + }, { name: this.$t('settings.deleteUserAccount.name'), path: `/settings/delete-account`, }, // TODO implement /* { - name: this.$t('settings.invites.name'), - path: `/settings/invites` - }, */ + name: this.$t('settings.invites.name'), + path: `/settings/invites` + }, */ // TODO implement /* { - name: this.$t('settings.download.name'), - path: `/settings/data-download` - }, */ - // TODO implement + name: this.$t('settings.organizations.name'), + path: `/settings/my-organizations` + }, */ // TODO implement /* { - name: this.$t('settings.organizations.name'), - path: `/settings/my-organizations` - }, */ - // TODO implement - /* { - name: this.$t('settings.languages.name'), - path: `/settings/languages` - }, - } */ + name: this.$t('settings.languages.name'), + path: `/settings/languages` + }, + } */ ] }, }, diff --git a/webapp/pages/settings/data-download.vue b/webapp/pages/settings/data-download.vue index b7951182d..ff812e155 100644 --- a/webapp/pages/settings/data-download.vue +++ b/webapp/pages/settings/data-download.vue @@ -1,16 +1,50 @@