-
- Downloads
Merge branch 'master' into 'createtrivio'
# Conflicts: # src/router/index.ts
Showing
- package-lock.json 3 additions, 11 deletionspackage-lock.json
- package.json 1 addition, 0 deletionspackage.json
- src/components/QuestionBox.vue 42 additions, 0 deletionssrc/components/QuestionBox.vue
- src/components/SideMenu.vue 2 additions, 2 deletionssrc/components/SideMenu.vue
- src/components/TrivioCard.vue 112 additions, 0 deletionssrc/components/TrivioCard.vue
- src/components/UserSchema.vue 19 additions, 11 deletionssrc/components/UserSchema.vue
- src/components/icons/cat.png 0 additions, 0 deletionssrc/components/icons/cat.png
- src/router/index.ts 11 additions, 1 deletionsrc/router/index.ts
- src/views/MainPageView.vue 1 addition, 2 deletionssrc/views/MainPageView.vue
- src/views/frontpage/LoginView.vue 40 additions, 7 deletionssrc/views/frontpage/LoginView.vue
- src/views/frontpage/SignUpView.vue 44 additions, 7 deletionssrc/views/frontpage/SignUpView.vue
- src/views/mainpage/ContactView.vue 154 additions, 1 deletionsrc/views/mainpage/ContactView.vue
- src/views/mainpage/DiscoveryView.vue 204 additions, 0 deletionssrc/views/mainpage/DiscoveryView.vue
- src/views/mainpage/HomeView.vue 0 additions, 11 deletionssrc/views/mainpage/HomeView.vue
- src/views/mainpage/MyTriviosView.vue 51 additions, 2 deletionssrc/views/mainpage/MyTriviosView.vue
- src/views/mainpage/PlayView.vue 310 additions, 0 deletionssrc/views/mainpage/PlayView.vue
- src/views/mainpage/ProfileView.vue 209 additions, 2 deletionssrc/views/mainpage/ProfileView.vue
- src/views/mainpage/StartView.vue 203 additions, 0 deletionssrc/views/mainpage/StartView.vue
Loading
Please register or sign in to comment