diff --git a/frontend/app/package-lock.json b/frontend/app/package-lock.json index 6094f5e..535ddd4 100644 --- a/frontend/app/package-lock.json +++ b/frontend/app/package-lock.json @@ -3268,6 +3268,11 @@ "assert-plus": "^1.0.0" } }, + "date-fns": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", + "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==" + }, "date-now": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", diff --git a/frontend/app/package.json b/frontend/app/package.json index d592486..15321ee 100644 --- a/frontend/app/package.json +++ b/frontend/app/package.json @@ -8,6 +8,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "date-fns": "^1.30.1", "vue": "^2.5.21", "vue-router": "^3.0.1", "vuetify": "^1.3.0" diff --git a/frontend/app/public/cylinder-okragly.png b/frontend/app/public/cylinder-okragly.png new file mode 100644 index 0000000..f9c4c2c Binary files /dev/null and b/frontend/app/public/cylinder-okragly.png differ diff --git a/frontend/app/src/App.vue b/frontend/app/src/App.vue index 37a339f..ed968a0 100644 --- a/frontend/app/src/App.vue +++ b/frontend/app/src/App.vue @@ -1,34 +1,18 @@ - - diff --git a/frontend/app/src/components/Navbar.vue b/frontend/app/src/components/Navbar.vue new file mode 100644 index 0000000..87dcfd3 --- /dev/null +++ b/frontend/app/src/components/Navbar.vue @@ -0,0 +1,94 @@ + + + diff --git a/frontend/app/src/components/Popup.vue b/frontend/app/src/components/Popup.vue new file mode 100644 index 0000000..ebda978 --- /dev/null +++ b/frontend/app/src/components/Popup.vue @@ -0,0 +1,59 @@ + + + diff --git a/frontend/app/src/plugins/vuetify.js b/frontend/app/src/plugins/vuetify.js index 975696e..59846e9 100644 --- a/frontend/app/src/plugins/vuetify.js +++ b/frontend/app/src/plugins/vuetify.js @@ -4,4 +4,11 @@ import 'vuetify/src/stylus/app.styl' Vue.use(Vuetify, { iconfont: 'md', + theme: { //nadpisanie słów kluczowych + primary: '#212121', + success: '#EEEEEE', + info: '#ffaa2c', + error: '#f83e70', + myTheme: '#483D8B' + } }) diff --git a/frontend/app/src/router.js b/frontend/app/src/router.js index 39650f9..9ea2de0 100644 --- a/frontend/app/src/router.js +++ b/frontend/app/src/router.js @@ -1,6 +1,13 @@ import Vue from 'vue' import Router from 'vue-router' -import Home from './views/Home.vue' +import Users from '@/views/Users' +import Game from '@/views/Game' +import Cards from '@/views/Cards' +import Login from '@/views/Login' +import Logout from '@/views/Logout' +import Register from '@/views/Register' + + Vue.use(Router) @@ -10,16 +17,33 @@ export default new Router({ routes: [ { path: '/', - name: 'home', - component: Home + name: 'game', + component: Game }, { - path: '/about', - name: 'about', - // route level code-splitting - // this generates a separate chunk (about.[hash].js) for this route - // which is lazy-loaded when the route is visited. - component: () => import(/* webpackChunkName: "about" */ './views/About.vue') + path: '/dzentelmani', + name: 'users', + component: Users + }, + { + path: '/karty', + name: 'cards', + component: Cards + }, + { + path: '/register', + name: 'register', + component: Register + }, + { + path: '/login', + name: 'login', + component: Login + }, + { + path: '/logout', + name: 'logout', + component: Logout } ] }) diff --git a/frontend/app/src/views/About.vue b/frontend/app/src/views/About.vue deleted file mode 100644 index 3fa2807..0000000 --- a/frontend/app/src/views/About.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/frontend/app/src/views/Cards.vue b/frontend/app/src/views/Cards.vue new file mode 100644 index 0000000..e69de29 diff --git a/frontend/app/src/views/Game.vue b/frontend/app/src/views/Game.vue new file mode 100644 index 0000000..e69de29 diff --git a/frontend/app/src/views/Home.vue b/frontend/app/src/views/Home.vue deleted file mode 100644 index cfba1d9..0000000 --- a/frontend/app/src/views/Home.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/frontend/app/src/views/Login.vue b/frontend/app/src/views/Login.vue new file mode 100644 index 0000000..e69de29 diff --git a/frontend/app/src/views/Logout.vue b/frontend/app/src/views/Logout.vue new file mode 100644 index 0000000..e69de29 diff --git a/frontend/app/src/views/Register.vue b/frontend/app/src/views/Register.vue new file mode 100644 index 0000000..e69de29 diff --git a/frontend/app/src/views/Users.vue b/frontend/app/src/views/Users.vue new file mode 100644 index 0000000..e69de29