diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico deleted file mode 100644 index df36fcf..0000000 Binary files a/frontend/public/favicon.ico and /dev/null differ diff --git a/frontend/public/icon.png b/frontend/public/icon.png new file mode 100644 index 0000000..73dda6d Binary files /dev/null and b/frontend/public/icon.png differ diff --git a/frontend/public/index.html b/frontend/public/index.html index 20522df..0880299 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -1,18 +1,19 @@ - + - + - <%= htmlWebpackPlugin.options.title %> + Wulkanowy +
diff --git a/frontend/src/assets/icon copy.png b/frontend/src/assets/icon copy.png new file mode 100644 index 0000000..73dda6d Binary files /dev/null and b/frontend/src/assets/icon copy.png differ diff --git a/frontend/src/assets/icon.png b/frontend/src/assets/icon.png new file mode 100644 index 0000000..73dda6d Binary files /dev/null and b/frontend/src/assets/icon.png differ diff --git a/frontend/src/assets/wulkanowy.svg b/frontend/src/assets/wulkanowy.svg index 49d2fc1..198488a 100644 --- a/frontend/src/assets/wulkanowy.svg +++ b/frontend/src/assets/wulkanowy.svg @@ -1,4 +1,4 @@ - +5 +
+ + + + +
+ +
+
Wulkanowy
+
Nieoficjalna aplikacja przeglądarkowa ucznia i + rodzica dla dziennika Vulcan UONET+ +
+


+ Polityka prywatności +
+
v 0.1.0
+ + + + +
+ + diff --git a/frontend/src/components/Login/Loading.vue b/frontend/src/components/Login/Loading.vue new file mode 100644 index 0000000..8a8d8d1 --- /dev/null +++ b/frontend/src/components/Login/Loading.vue @@ -0,0 +1,19 @@ + + + diff --git a/frontend/src/components/Login/SelectStudent.vue b/frontend/src/components/Login/SelectStudent.vue index 198f452..5ce170b 100644 --- a/frontend/src/components/Login/SelectStudent.vue +++ b/frontend/src/components/Login/SelectStudent.vue @@ -1,10 +1,9 @@ - diff --git a/frontend/src/components/Login/UserLogin.vue b/frontend/src/components/Login/UserLogin.vue index 05e07c0..ca0c54b 100644 --- a/frontend/src/components/Login/UserLogin.vue +++ b/frontend/src/components/Login/UserLogin.vue @@ -1,46 +1,24 @@ - + diff --git a/frontend/src/components/Login/iconTwo.svg b/frontend/src/components/Login/iconTwo.svg new file mode 100644 index 0000000..49d2fc1 --- /dev/null +++ b/frontend/src/components/Login/iconTwo.svg @@ -0,0 +1,68 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/frontend/src/components/Panel/Appbar.vue b/frontend/src/components/Panel/Appbar.vue index 98cec39..3ab6a41 100644 --- a/frontend/src/components/Panel/Appbar.vue +++ b/frontend/src/components/Panel/Appbar.vue @@ -71,5 +71,4 @@ export default { diff --git a/frontend/src/components/Panel/Drawer.vue b/frontend/src/components/Panel/Drawer.vue index a17ddba..82f4245 100644 --- a/frontend/src/components/Panel/Drawer.vue +++ b/frontend/src/components/Panel/Drawer.vue @@ -12,18 +12,19 @@ - {{ nameSurname }} + Jan Kowalski - {{ className }} + 4A - mdi-chevron-right + mdi-chevron-left + @@ -31,7 +32,7 @@ v-model="this.$store.state.group"> - mdi-home + mdi-view-dashboard Dashboard @@ -50,6 +51,13 @@ Attendance + + + mdi-calendar-outline + + Exams + + mdi-table-clock @@ -71,6 +79,13 @@ Homework + + + mdi-trophy-outline + + Notes and achievements + + mdi-devices @@ -84,7 +99,23 @@ School - + + + + + + mdi-cog + + Settings + + + + + mdi-information-outline + + About + + @@ -119,5 +150,4 @@ export default { diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index 17e4edc..01e064c 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -23,6 +23,11 @@ const routes: Array = [ name: 'User', component: () => import('../views/Panel.vue'), }, + { + path: '*', + name: 'Login', + component: () => import('../views/Login.vue'), + }, ]; const router = new VueRouter({ diff --git a/frontend/src/store/index.ts b/frontend/src/store/index.ts index cbc4ff1..85dee8a 100644 --- a/frontend/src/store/index.ts +++ b/frontend/src/store/index.ts @@ -9,7 +9,9 @@ export default new Vuex.Store({ group: null, mini: true, appbarTitle: 'Dashboard', - selectedStudent: 0, + selcetDialog: false, + page: 'about', + showStudentsList: false, }, mutations: { }, diff --git a/frontend/src/store/login.ts b/frontend/src/store/login.ts index 8569cb2..9902f3b 100644 --- a/frontend/src/store/login.ts +++ b/frontend/src/store/login.ts @@ -7,7 +7,7 @@ export default new Vuex.Store({ state: { isLoading: false, loginData: null, - showStudentsList: false, + showStudentsList: true, }, mutations: { }, diff --git a/frontend/src/views/PP.vue b/frontend/src/views/PP.vue new file mode 100644 index 0000000..5de2f70 --- /dev/null +++ b/frontend/src/views/PP.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/frontend/src/views/Panel.vue b/frontend/src/views/Panel.vue index 48bf953..af86453 100644 --- a/frontend/src/views/Panel.vue +++ b/frontend/src/views/Panel.vue @@ -1,10 +1,10 @@