diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index 49e10e7bb..2f7d68c4c 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -54,7 +54,7 @@ - +
@@ -237,7 +237,7 @@ export default { email: this.item.email, creationDate: this.radioSelected.long, amount: this.value, - note: this.text, + memo: this.text, moderator: this.$store.state.moderator.id, }, ] @@ -255,7 +255,7 @@ export default { email: this.item.email, creationDate: this.radioSelected.long, amount: Number(this.value), - note: this.text, + memo: this.text, moderator: Number(this.$store.state.moderator.id), } diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index ba6bb60ca..208a6fa70 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -2,7 +2,7 @@
- ... + ... @@ -32,28 +32,8 @@ import CONFIG from '../config' export default { name: 'navbar', - data() { - return { - logo: 'img/brand/green.png', - } - }, methods: { logout() { - // TODO - // this.$emit('logout') - /* this.$apollo - .query({ - query: logout, - }) - .then(() => { - this.$store.dispatch('logout') - this.$router.push('/logout') - }) - .catch(() => { - this.$store.dispatch('logout') - if (this.$router.currentRoute.path !== '/logout') this.$router.push('/logout') - }) - */ this.$store.dispatch('logout') this.$router.push('/logout') }, diff --git a/admin/src/graphql/getUsersQuery.ts b/admin/src/graphql/getUsersQuery.ts deleted file mode 100644 index e69de29bb..000000000 diff --git a/backend/src/graphql/arg/CreatePendingCreationArgs.ts b/backend/src/graphql/arg/CreatePendingCreationArgs.ts index ed24ed963..d2c17abf1 100644 --- a/backend/src/graphql/arg/CreatePendingCreationArgs.ts +++ b/backend/src/graphql/arg/CreatePendingCreationArgs.ts @@ -9,7 +9,7 @@ export default class CreatePendingCreationArgs { amount: number @Field(() => String) - note: string + memo: string @Field(() => String) creationDate: string diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index a93696814..5868d0733 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -31,7 +31,7 @@ export class AdminResolver { @Query(() => [Number]) async createPendingCreation( - @Args() { email, amount, note, creationDate, moderator }: CreatePendingCreationArgs, + @Args() { email, amount, memo, creationDate, moderator }: CreatePendingCreationArgs, ): Promise { const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) @@ -45,7 +45,7 @@ export class AdminResolver { loginPendingTaskAdmin.amount = BigInt(amount * 10000) loginPendingTaskAdmin.created = new Date() loginPendingTaskAdmin.date = creationDateObj - loginPendingTaskAdmin.note = note + loginPendingTaskAdmin.memo = memo loginPendingTaskAdmin.moderator = moderator pendingCreationRepository.save(loginPendingTaskAdmin) diff --git a/database/migrations/0005-admin_tables.ts b/database/migrations/0005-admin_tables.ts index 8e1219715..6398b22fc 100644 --- a/database/migrations/0005-admin_tables.ts +++ b/database/migrations/0005-admin_tables.ts @@ -16,7 +16,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis \`userId\` int UNSIGNED DEFAULT 0, \`created\` datetime NOT NULL, \`date\` datetime NOT NULL, - \`note\` text DEFAULT NULL, + \`memo\` text DEFAULT NULL, \`amount\` bigint(20) NOT NULL, \`moderator\` int UNSIGNED DEFAULT 0, PRIMARY KEY (\`id\`)