From 7f88f5371da763e14d6199323a06b0b35d93b016 Mon Sep 17 00:00:00 2001 From: Hubert Van De Walle Date: Thu, 23 Apr 2020 15:59:03 +0200 Subject: [PATCH 1/3] Add webpack config for IntelliJ --- frontend/webpack.config.js | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 frontend/webpack.config.js diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js new file mode 100644 index 0000000..6b209a4 --- /dev/null +++ b/frontend/webpack.config.js @@ -0,0 +1,9 @@ +module.exports = { + resolve: { + // for IntelliJ + alias: { + '@': path.resolve(__dirname), + '~': path.resolve(__dirname) + } + } +}; From 20daa71d51520f626df439c96062bfa77add1bc5 Mon Sep 17 00:00:00 2001 From: Hubert Van De Walle Date: Thu, 23 Apr 2020 16:00:17 +0200 Subject: [PATCH 2/3] Update notes components and page, notes are coming from /notes --- frontend/components/Note.vue | 64 ++++++++++++++------------ frontend/layouts/default.vue | 2 +- frontend/pages/notes.vue | 89 +++++++----------------------------- 3 files changed, 52 insertions(+), 103 deletions(-) diff --git a/frontend/components/Note.vue b/frontend/components/Note.vue index 74c063d..7467700 100644 --- a/frontend/components/Note.vue +++ b/frontend/components/Note.vue @@ -1,47 +1,47 @@ diff --git a/frontend/layouts/default.vue b/frontend/layouts/default.vue index 20684f6..29b6c67 100644 --- a/frontend/layouts/default.vue +++ b/frontend/layouts/default.vue @@ -8,7 +8,7 @@ > Simple Notes - My notes + My notes Welcome {{this.$store.state.auth.user.username}} Account diff --git a/frontend/pages/notes.vue b/frontend/pages/notes.vue index ca19d3c..5fc2fe2 100644 --- a/frontend/pages/notes.vue +++ b/frontend/pages/notes.vue @@ -7,15 +7,18 @@ - - {{ note.content }} - + + + {{ note.content }} + + @@ -38,69 +41,11 @@ Note, }, data: () => ({ - selector: ".viewer", - options: { - columnWidth: "200", - percentPosition: true, - gutter: 0, - itemSelector: ".item" - }, - notes: [ - { - title: "Elec analogique", - tags: ["Ephec"], - content: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab est in rerum." - }, - { - title: "Portfolio", - tags: ["Ephec", "Dev"], - content: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Deserunt doloremque harum iste itaque laboriosam modi placeat quia sequi. Accusamus consectetur dolor doloribus eaque et incidunt ipsa iste, iure magnam maxime minus, modi nam odit possimus quam recusandae reprehenderit sit totam?" - }, - { - title: "Melvin fait du ski", - content: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab est in rerum." - }, - { - title: "Daniel étudie elec", - tags: ["Ephec", "Ephec", "Ephec", "Ephec", "Ephec", "Ephec"], - content: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab est in rerum." - }, - { - title: "Portfolio", - tags: ["Ephec", "Dev"], - content: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Deserunt doloremque harum iste itaque laboriosam modi placeat quia sequi. Accusamus consectetur dolor doloribus eaque et incidunt ipsa iste, iure magnam maxime minus, modi nam odit possimus quam recusandae reprehenderit sit totam?" - }, - { - title: "Portfolio", - tags: ["Ephec", "Dev"], - content: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Deserunt doloremque harum iste itaque laboriosam modi placeat quia sequi. Accusamus consectetur dolor doloribus eaque et incidunt ipsa iste, iure magnam maxime minus, modi nam odit possimus quam recusandae reprehenderit sit totam?" - }, - { - title: "Portfolio", - tags: ["Ephec", "Dev"], - content: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Deserunt doloremque harum iste itaque laboriosam modi placeat quia sequi. Accusamus consectetur dolor doloribus eaque et incidunt ipsa iste, iure magnam maxime minus, modi nam odit possimus quam recusandae reprehenderit sit totam?" - }, - { - title: "Daniel étudie elec", - tags: ["Ephec", "Ephec", "Ephec", "Ephec", "Ephec", "Ephec"], - content: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab est in rerum." - }, - { - title: "Portfolio", - tags: ["Ephec", "Dev"], - content: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Deserunt doloremque harum iste itaque laboriosam modi placeat quia sequi. Accusamus consectetur dolor doloribus eaque et incidunt ipsa iste, iure magnam maxime minus, modi nam odit possimus quam recusandae reprehenderit sit totam?" - }, - { - title: "Portfolio", - tags: ["Ephec", "Dev"], - content: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Deserunt doloremque harum iste itaque laboriosam modi placeat quia sequi. Accusamus consectetur dolor doloribus eaque et incidunt ipsa iste, iure magnam maxime minus, modi nam odit possimus quam recusandae reprehenderit sit totam?" - }, - { - title: "Portfolio", - tags: ["Ephec", "Dev"], - content: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Deserunt doloremque harum iste itaque laboriosam modi placeat quia sequi. Accusamus consectetur dolor doloribus eaque et incidunt ipsa iste, iure magnam maxime minus, modi nam odit possimus quam recusandae reprehenderit sit totam?" - }, - ] - }) + notes: [] + }), + mounted() { + this.$axios.get('/notes') + .then(e => this.notes = e.data) + } } From 06699d262458d34cabf072a227b2e8a58005a428 Mon Sep 17 00:00:00 2001 From: Hubert Van De Walle Date: Thu, 23 Apr 2020 16:11:42 +0200 Subject: [PATCH 3/3] Add & use timeago lib --- frontend/components/Note.vue | 6 ++--- frontend/pages/notes.vue | 47 +++++++++++++++++------------------- package.json | 5 ++++ yarn.lock | 8 ++++++ 4 files changed, 38 insertions(+), 28 deletions(-) create mode 100644 package.json create mode 100644 yarn.lock diff --git a/frontend/components/Note.vue b/frontend/components/Note.vue index 7467700..eca1f48 100644 --- a/frontend/components/Note.vue +++ b/frontend/components/Note.vue @@ -14,9 +14,9 @@ -
+
- {{ updatedAt }} + Last updated {{ updatedAt }}
@@ -41,7 +41,7 @@ default: null, }, }, - }; + }