diff --git a/database/migrations/2020_04_19_144900_create_to_do_lists_table.php b/database/migrations/2020_04_19_144900_create_to_do_lists_table.php index dc8bd15..a76f084 100644 --- a/database/migrations/2020_04_19_144900_create_to_do_lists_table.php +++ b/database/migrations/2020_04_19_144900_create_to_do_lists_table.php @@ -17,6 +17,7 @@ class CreateToDoListsTable extends Migration $table->id(); $table->unsignedBigInteger('user_id'); $table->string('name'); + $table->integer('order')->default(1); $table->timestamps(); }); } diff --git a/resources/js/components/Nav.vue b/resources/js/components/Nav.vue index b795fa0..e046cd6 100644 --- a/resources/js/components/Nav.vue +++ b/resources/js/components/Nav.vue @@ -8,6 +8,10 @@ Memos + + + To Do Lists + Jeux diff --git a/resources/js/components/TopBar.vue b/resources/js/components/TopBar.vue index 807e8b6..5904918 100644 --- a/resources/js/components/TopBar.vue +++ b/resources/js/components/TopBar.vue @@ -37,18 +37,6 @@ ...mapGetters({ authUser: 'authUser', }) - }, - methods: { - logout: function () { - axios.post('logout') - .then(res => { - if(res.status ===302 || 401) { - window.location.href = '/login' - } - }).catch(error => { - - }) - } } } diff --git a/resources/js/router.js b/resources/js/router.js index 957a37f..eb76bf7 100644 --- a/resources/js/router.js +++ b/resources/js/router.js @@ -9,6 +9,8 @@ import MemoIndex from "./views/Memo/MemoIndex"; import MemoCreate from "./views/Memo/MemoCreate"; import MemoShow from "./views/Memo/MemoShow"; import MemoEdit from "./views/Memo/MemoEdit"; +import ToDoListIndex from "./views/ToDoLists/ToDoListIndex"; +import ToDoListShow from "./views/ToDoLists/ToDoListShow"; import GameIndex from "./views/Games/GameIndex"; import Hangman from "./views/Games/HangMan/Hangman"; @@ -54,6 +56,14 @@ export default new VueRouter({ meta: {title: 'Edit Memo'} }, + { + path: '/to-do-lists', component: ToDoListIndex, + meta: {title: 'To Do Lists'} + }, { + path: '/to-do-lists/:id', component: ToDoListShow, + meta: {title: 'Details of List'} + }, + { path: '/jeux', component: GameIndex, meta: {title: 'Liste des jeux'} diff --git a/resources/js/views/DashBoard.vue b/resources/js/views/DashBoard.vue index 092e88c..80f4283 100644 --- a/resources/js/views/DashBoard.vue +++ b/resources/js/views/DashBoard.vue @@ -17,6 +17,18 @@ name: "DashBoard", components: { UserAdmin + }, + methods: { + logout: function () { + axios.post('logout') + .then(res => { + if(res.status ===302 || 401) { + window.location.href = '/login' + } + }).catch(error => { + + }) + } } } diff --git a/resources/js/views/Memo/MemoShow.vue b/resources/js/views/Memo/MemoShow.vue index 36cde34..3882c58 100755 --- a/resources/js/views/Memo/MemoShow.vue +++ b/resources/js/views/Memo/MemoShow.vue @@ -2,6 +2,14 @@
+ +
< Back - +
Edit Delete diff --git a/resources/js/views/ToDoLists/ToDoListIndex.vue b/resources/js/views/ToDoLists/ToDoListIndex.vue new file mode 100644 index 0000000..379ce19 --- /dev/null +++ b/resources/js/views/ToDoLists/ToDoListIndex.vue @@ -0,0 +1,67 @@ + + + diff --git a/resources/js/views/ToDoLists/ToDoListShow.vue b/resources/js/views/ToDoLists/ToDoListShow.vue new file mode 100644 index 0000000..56b087a --- /dev/null +++ b/resources/js/views/ToDoLists/ToDoListShow.vue @@ -0,0 +1,9 @@ + + + diff --git a/resources/sass/components/modal.scss b/resources/sass/components/modal.scss index b32ff51..25c7afa 100644 --- a/resources/sass/components/modal.scss +++ b/resources/sass/components/modal.scss @@ -3,24 +3,28 @@ $modal-duration: 1s; .modal-container { background-color: rgba(0,0,0,0.6); //display: none; - position: fixed; + z-index: 10; + position: absolute; top: 0; bottom: 0; left: 0; right: 0; - .modal { - background-color: #fff; - border-radius: 5px; - box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); - position: absolute; - overflow: hidden; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - max-width: 100%; - width: 400px; - animation-name: modalopen; - animation-duration: $modal-duration; - } + +} + +.modal { + background-color: #fff; + border-radius: 5px; + box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); + position: absolute; + z-index: 20; + //overflow: hidden; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + max-width: 100%; + width: 400px; + animation-name: modalopen; + animation-duration: $modal-duration; }