From ce4d4bc0703c2874b0837c0c1d6d37085317c915 Mon Sep 17 00:00:00 2001 From: Bubka <858858+Bubka@users.noreply.github.com> Date: Mon, 24 Jun 2019 00:29:14 +0200 Subject: [PATCH] Very first 2FAccounts index with OTP modal --- resources/js/app.js | 14 +++- resources/js/components/Modal.vue | 29 ++++++++ resources/js/components/Nav.vue | 24 ++++++ resources/js/views/Accounts.vue | 117 ++++++++++++++++++++++++++++++ resources/js/views/App.vue | 50 +++++++------ resources/js/views/Welcome.vue | 56 -------------- resources/views/landing.blade.php | 4 +- 7 files changed, 212 insertions(+), 82 deletions(-) create mode 100644 resources/js/components/Modal.vue create mode 100644 resources/js/components/Nav.vue create mode 100644 resources/js/views/Accounts.vue delete mode 100644 resources/js/views/Welcome.vue diff --git a/resources/js/app.js b/resources/js/app.js index a211c380..4748b0f2 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -6,15 +6,23 @@ Vue.use(VueRouter) import App from './views/App' import Login from './views/Login' import Register from './views/Register' -import Home from './views/Welcome' +import Accounts from './views/Accounts' + +import { library } from '@fortawesome/fontawesome-svg-core' +import { faPlusCircle } from '@fortawesome/free-solid-svg-icons' +import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome' + +library.add(faPlusCircle); + +Vue.component('font-awesome-icon', FontAwesomeIcon) const router = new VueRouter({ mode: 'history', routes: [ { path: '/', - name: 'home', - component: Home + name: 'accounts', + component: Accounts }, { path: '/login', diff --git a/resources/js/components/Modal.vue b/resources/js/components/Modal.vue new file mode 100644 index 00000000..97ff56d8 --- /dev/null +++ b/resources/js/components/Modal.vue @@ -0,0 +1,29 @@ + + + + + + + + + + + diff --git a/resources/js/components/Nav.vue b/resources/js/components/Nav.vue new file mode 100644 index 00000000..1fa9630c --- /dev/null +++ b/resources/js/components/Nav.vue @@ -0,0 +1,24 @@ + + + + 2FAccount + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/js/views/Accounts.vue b/resources/js/views/Accounts.vue new file mode 100644 index 00000000..867e4ad3 --- /dev/null +++ b/resources/js/views/Accounts.vue @@ -0,0 +1,117 @@ + + + + + + + {{ account.name }} + {{ account.email }} + + + + + + + + + + + + + + diff --git a/resources/js/views/App.vue b/resources/js/views/App.vue index 1b1de9e2..ce75c16d 100644 --- a/resources/js/views/App.vue +++ b/resources/js/views/App.vue @@ -1,26 +1,33 @@ - - - Treclon - - - - - - - - - - - Login - Register - Hi, {{name}} - Home - - + + + 2FAccount + + + + + + + + + + + + login + + + + + Register + + + + Hi, {{username}} + + @@ -29,15 +36,16 @@ \ No newline at end of file diff --git a/resources/js/views/Welcome.vue b/resources/js/views/Welcome.vue deleted file mode 100644 index 5205dd29..00000000 --- a/resources/js/views/Welcome.vue +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - Treclon - - - Your efficent task planner - - - - - - - - - \ No newline at end of file diff --git a/resources/views/landing.blade.php b/resources/views/landing.blade.php index 3142008a..75f087c8 100644 --- a/resources/views/landing.blade.php +++ b/resources/views/landing.blade.php @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@ {{ env("APP_NAME") }} - +
2FAccount
+ + + + + +
+ + login + +
+ + Register + +
+ Hi, {{username}} +