From 92ff05f5059a6c58f55ee92e636d2204469b38ab Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 26 Apr 2019 15:22:16 +0200 Subject: [PATCH] Test implementation of my account page --- .graphqlconfig.yaml | 4 +- js/src/App.vue | 1 + js/src/components/Account/CreateIdentity.vue | 44 ++ js/src/components/Account/Identities.vue | 82 ++ js/src/components/Event/EventCard.vue | 2 +- js/src/components/Group/GroupCard.vue | 2 +- js/src/components/NavBar.vue | 17 +- js/src/router/actor.ts | 17 +- js/src/types/actor.model.ts | 75 -- js/src/types/actor/actor.model.ts | 39 + js/src/types/actor/group.model.ts | 22 + js/src/types/actor/index.ts | 3 + js/src/types/actor/person.model.ts | 25 + js/src/types/event.model.ts | 3 +- js/src/types/search.model.ts | 2 +- js/src/utils/html.ts | 3 + js/src/views/Account/Identities.vue | 92 --- js/src/views/Account/MyAccount.vue | 68 ++ js/src/views/Account/Profile.vue | 199 +++-- js/src/views/Account/Register.vue | 2 +- js/src/views/Event/Create.vue | 2 +- js/src/views/Event/Event.vue | 2 +- js/src/views/Group/Group.vue | 2 +- js/src/views/Home.vue | 2 +- js/src/views/Search.vue | 2 +- js/tslint.json | 3 +- schema.graphql | 781 +++++++++++++++++++ 27 files changed, 1200 insertions(+), 296 deletions(-) create mode 100644 js/src/components/Account/CreateIdentity.vue create mode 100644 js/src/components/Account/Identities.vue delete mode 100644 js/src/types/actor.model.ts create mode 100644 js/src/types/actor/actor.model.ts create mode 100644 js/src/types/actor/group.model.ts create mode 100644 js/src/types/actor/index.ts create mode 100644 js/src/types/actor/person.model.ts create mode 100644 js/src/utils/html.ts delete mode 100644 js/src/views/Account/Identities.vue create mode 100644 js/src/views/Account/MyAccount.vue create mode 100644 schema.graphql diff --git a/.graphqlconfig.yaml b/.graphqlconfig.yaml index 97d01151f..6058dcaba 100644 --- a/.graphqlconfig.yaml +++ b/.graphqlconfig.yaml @@ -3,4 +3,6 @@ projects: schemaPath: schema.graphql extensions: endpoints: - dev: 'http://localhost:4000/api' + dev: + url: 'http://localhost:4001/api' + introspect: true diff --git a/js/src/App.vue b/js/src/App.vue index 5df5c8f2b..2d05f65b5 100644 --- a/js/src/App.vue +++ b/js/src/App.vue @@ -79,6 +79,7 @@ export default class App extends Vue { @import "~bulma/sass/elements/tag.sass"; @import "~bulma/sass/components/navbar.sass"; @import "~bulma/sass/components/modal.sass"; + @import "~bulma/sass/components/media.sass"; @import "~bulma/sass/grid/_all.sass"; @import "~bulma/sass/layout/section.sass"; @import "~bulma/sass/layout/footer.sass"; diff --git a/js/src/components/Account/CreateIdentity.vue b/js/src/components/Account/CreateIdentity.vue new file mode 100644 index 000000000..ec5bdd7fe --- /dev/null +++ b/js/src/components/Account/CreateIdentity.vue @@ -0,0 +1,44 @@ + + + diff --git a/js/src/components/Account/Identities.vue b/js/src/components/Account/Identities.vue new file mode 100644 index 000000000..d1337db96 --- /dev/null +++ b/js/src/components/Account/Identities.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/js/src/components/Event/EventCard.vue b/js/src/components/Event/EventCard.vue index 1fcd23f72..e551cbcca 100644 --- a/js/src/components/Event/EventCard.vue +++ b/js/src/components/Event/EventCard.vue @@ -47,7 +47,7 @@ import { IEvent, ParticipantRole } from '@/types/event.model'; import { Component, Prop, Vue } from 'vue-property-decorator'; import DateCalendarIcon from '@/components/Event/DateCalendarIcon.vue'; -import { IActor, IPerson, Person } from '@/types/actor.model'; +import { IActor, IPerson, Person } from '@/types/actor'; const lineClamp = require('line-clamp'); export interface IEventCardOptions { diff --git a/js/src/components/Group/GroupCard.vue b/js/src/components/Group/GroupCard.vue index f5d2336d4..cb8137624 100644 --- a/js/src/components/Group/GroupCard.vue +++ b/js/src/components/Group/GroupCard.vue @@ -20,7 +20,7 @@ diff --git a/js/src/views/Account/MyAccount.vue b/js/src/views/Account/MyAccount.vue new file mode 100644 index 000000000..f4d39d400 --- /dev/null +++ b/js/src/views/Account/MyAccount.vue @@ -0,0 +1,68 @@ + + + + + + diff --git a/js/src/views/Account/Profile.vue b/js/src/views/Account/Profile.vue index 9ecacfacb..f5c7a5b1a 100644 --- a/js/src/views/Account/Profile.vue +++ b/js/src/views/Account/Profile.vue @@ -1,103 +1,102 @@ diff --git a/js/src/views/Account/Register.vue b/js/src/views/Account/Register.vue index 3c125d9b6..6c461d0b1 100644 --- a/js/src/views/Account/Register.vue +++ b/js/src/views/Account/Register.vue @@ -71,7 +71,7 @@