From a8b47abaa5b348d2328c2d32a848f6382d9a0ace Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Sun, 1 Mar 2020 01:44:16 +0100 Subject: [PATCH 01/25] custom colors --- src/plugins/vuetify.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/plugins/vuetify.ts b/src/plugins/vuetify.ts index 219b598..47ea22c 100644 --- a/src/plugins/vuetify.ts +++ b/src/plugins/vuetify.ts @@ -3,4 +3,18 @@ import Vuetify from "vuetify/lib"; Vue.use(Vuetify); -export default new Vuetify({}); +export default new Vuetify({ + theme: { + themes: { + light: { + primary: "#4caf50", + secondary: "#2196f3", + accent: "#ff5722", + error: "#f44336", + warning: "#ff9800", + info: "#3f51b5", + success: "#00bcd4" + } + } + } +}); From aa1a2d7b42873d56caf5bb046665e9b7bc58c5c5 Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Sun, 1 Mar 2020 01:44:30 +0100 Subject: [PATCH 02/25] fixing errors in compile stages --- src/views/About.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/About.vue b/src/views/About.vue index 3fa2807..dd72021 100644 --- a/src/views/About.vue +++ b/src/views/About.vue @@ -3,3 +3,9 @@

This is an about page

+ + From c52ebc30c5cb915eb9df150fe1349ec0b758a9ad Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Sun, 1 Mar 2020 01:58:10 +0100 Subject: [PATCH 03/25] reusable theme definition --- src/plugins/vuetify.ts | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/plugins/vuetify.ts b/src/plugins/vuetify.ts index 47ea22c..82f6332 100644 --- a/src/plugins/vuetify.ts +++ b/src/plugins/vuetify.ts @@ -3,18 +3,21 @@ import Vuetify from "vuetify/lib"; Vue.use(Vuetify); +const theme = { + primary: "#4caf50", + secondary: "#2196f3", + accent: "#ff5722", + error: "#f44336", + warning: "#ff9800", + info: "#3f51b5", + success: "#00bcd4" +}; + export default new Vuetify({ theme: { themes: { - light: { - primary: "#4caf50", - secondary: "#2196f3", - accent: "#ff5722", - error: "#f44336", - warning: "#ff9800", - info: "#3f51b5", - success: "#00bcd4" - } + light: theme, + dark: theme } } }); From 9b0940b9e24f0875312c93b682492eb249f36da3 Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Sun, 1 Mar 2020 12:55:34 +0100 Subject: [PATCH 04/25] Experimenting with layout and table of reports --- src/App.vue | 49 ++++--------- src/components/core/Footer.vue | 22 ++++++ src/components/core/Header.vue | 41 +++++++++++ src/components/report/ReportListData.vue | 93 ++++++++++++++++++++++++ src/router/index.ts | 5 ++ src/views/About.vue | 8 +- src/views/Home.vue | 13 ++-- src/views/ReportList.vue | 23 ++++++ 8 files changed, 210 insertions(+), 44 deletions(-) create mode 100644 src/components/core/Footer.vue create mode 100644 src/components/core/Header.vue create mode 100644 src/components/report/ReportListData.vue create mode 100644 src/views/ReportList.vue diff --git a/src/App.vue b/src/App.vue index 391ae0b..d5ee193 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,53 +1,30 @@ diff --git a/src/components/core/Header.vue b/src/components/core/Header.vue new file mode 100644 index 0000000..1d597d9 --- /dev/null +++ b/src/components/core/Header.vue @@ -0,0 +1,41 @@ + + + diff --git a/src/components/report/ReportListData.vue b/src/components/report/ReportListData.vue new file mode 100644 index 0000000..8fd6a35 --- /dev/null +++ b/src/components/report/ReportListData.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/src/router/index.ts b/src/router/index.ts index daa6cee..98e34ab 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -18,6 +18,11 @@ const routes = [ // which is lazy-loaded when the route is visited. component: () => import(/* webpackChunkName: "about" */ "../views/About.vue") + }, + { + path: "/reports", + name: "Reports", + component: () => import("../views/ReportList.vue") } ]; diff --git a/src/views/About.vue b/src/views/About.vue index dd72021..35443e2 100644 --- a/src/views/About.vue +++ b/src/views/About.vue @@ -6,6 +6,12 @@ diff --git a/src/views/Home.vue b/src/views/Home.vue index 191049e..23bd4a4 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,18 +1,17 @@ diff --git a/src/views/ReportList.vue b/src/views/ReportList.vue new file mode 100644 index 0000000..51f4ab6 --- /dev/null +++ b/src/views/ReportList.vue @@ -0,0 +1,23 @@ + + + + + From 3d65a39bb85c675a7ec865ea34b1eb6241fa7501 Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Sun, 1 Mar 2020 22:43:06 +0100 Subject: [PATCH 05/25] adding material design icons svg --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 8014763..6e3ba0e 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "vuex": "^3.1.2" }, "devDependencies": { + "@mdi/js": "^4.9.95", "@types/jest": "^24.0.19", "@typescript-eslint/eslint-plugin": "^2.18.0", "@typescript-eslint/parser": "^2.18.0", From 436fa066be692b9fdad972a1891a314e811a95ad Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Sun, 1 Mar 2020 22:43:19 +0100 Subject: [PATCH 06/25] mdi js --- yarn.lock | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/yarn.lock b/yarn.lock index 8b50a21..1f08181 100644 --- a/yarn.lock +++ b/yarn.lock @@ -985,6 +985,11 @@ "@types/istanbul-reports" "^1.1.1" "@types/yargs" "^13.0.0" +"@mdi/js@^4.9.95": + version "4.9.95" + resolved "https://registry.yarnpkg.com/@mdi/js/-/js-4.9.95.tgz#8984c2ac04c89913a3ff2bbe4d91f4ab51d8ef4f" + integrity sha512-6zKTCqZUCuDWJThdRcjdFTqp2BXfYwXI1UlYa68A1/kmCcy1ijpbpRbrJcUdZ+9WojencCh1DOGFqhj/x8I/eQ== + "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" From 57a664fe468ae4fc3274d6642dc9b4f82224f017 Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Sun, 1 Mar 2020 22:43:35 +0100 Subject: [PATCH 07/25] enabling icons --- src/plugins/vuetify.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/vuetify.ts b/src/plugins/vuetify.ts index 82f6332..56c5a00 100644 --- a/src/plugins/vuetify.ts +++ b/src/plugins/vuetify.ts @@ -19,5 +19,8 @@ export default new Vuetify({ light: theme, dark: theme } + }, + icons: { + iconfont: "mdiSvg" } }); From 36ce92468fe4c09f7eec8dda58b07b011a34ff64 Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Sun, 1 Mar 2020 22:44:01 +0100 Subject: [PATCH 08/25] reworking header --- src/components/core/Header.vue | 50 +++++++++++++++++++++------------- src/components/core/Logo.vue | 19 +++++++++++++ 2 files changed, 50 insertions(+), 19 deletions(-) create mode 100644 src/components/core/Logo.vue diff --git a/src/components/core/Header.vue b/src/components/core/Header.vue index 1d597d9..ad8fc3d 100644 --- a/src/components/core/Header.vue +++ b/src/components/core/Header.vue @@ -1,25 +1,36 @@ diff --git a/src/components/core/Logo.vue b/src/components/core/Logo.vue new file mode 100644 index 0000000..b901cdc --- /dev/null +++ b/src/components/core/Logo.vue @@ -0,0 +1,19 @@ + + + From 84bcc1608107c5e588ef4226ac6e5d7cba473810 Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Sun, 1 Mar 2020 22:44:29 +0100 Subject: [PATCH 09/25] cleaner design on sub pages --- src/views/About.vue | 12 +++++++++--- src/views/Home.vue | 6 +++--- src/views/ReportList.vue | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/views/About.vue b/src/views/About.vue index 35443e2..b98e449 100644 --- a/src/views/About.vue +++ b/src/views/About.vue @@ -1,7 +1,13 @@ From c9f0956c78244d8290e8b0f63d140e4077759451 Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Mon, 2 Mar 2020 00:02:50 +0100 Subject: [PATCH 11/25] adding axios --- package.json | 1 + yarn.lock | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/package.json b/package.json index 6e3ba0e..7f58732 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "axios": "^0.19.2", "core-js": "^3.6.4", "register-service-worker": "^1.6.2", "vue": "^2.6.11", diff --git a/yarn.lock b/yarn.lock index 1f08181..e487485 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2005,6 +2005,13 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== +axios@^0.19.2: + version "0.19.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27" + integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA== + dependencies: + follow-redirects "1.5.10" + babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" @@ -3504,6 +3511,13 @@ debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: dependencies: ms "^2.1.1" +debug@=3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" @@ -4598,6 +4612,13 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" +follow-redirects@1.5.10: + version "1.5.10" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" + integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== + dependencies: + debug "=3.1.0" + follow-redirects@^1.0.0: version "1.10.0" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.10.0.tgz#01f5263aee921c6a54fb91667f08f4155ce169eb" From da10f72221d81f14a8eb9eaf7edcbf73522a5249 Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Mon, 2 Mar 2020 00:03:35 +0100 Subject: [PATCH 12/25] api calls to the reports api with axios --- src/services/api.ts | 12 ++++++++++++ src/services/reports.ts | 10 ++++++++++ 2 files changed, 22 insertions(+) create mode 100644 src/services/api.ts create mode 100644 src/services/reports.ts diff --git a/src/services/api.ts b/src/services/api.ts new file mode 100644 index 0000000..3495ffd --- /dev/null +++ b/src/services/api.ts @@ -0,0 +1,12 @@ +import axios from "axios"; + +export default () => { + return axios.create({ + baseURL: "http://localhost:8080/api", + withCredentials: false, + headers: { + Accept: "application/json", + "Content-Type": "application/json" + } + }); +}; diff --git a/src/services/reports.ts b/src/services/reports.ts new file mode 100644 index 0000000..e1096f3 --- /dev/null +++ b/src/services/reports.ts @@ -0,0 +1,10 @@ +import api from "@/services/api"; + +export default { + getReports: () => { + return api().get("/report"); + }, + getReport: (id: string) => { + return api().get("/report/" + id); + } +}; From f1f77a30ac80cab33dbb759f7fb07e86d22e0d8f Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Mon, 2 Mar 2020 00:04:09 +0100 Subject: [PATCH 13/25] rudimentary api call and ui viz --- src/components/report/ReportListData.vue | 58 ++++-------------------- src/store/index.ts | 10 +++- src/views/Report.vue | 16 ++++++- 3 files changed, 32 insertions(+), 52 deletions(-) diff --git a/src/components/report/ReportListData.vue b/src/components/report/ReportListData.vue index 8fd6a35..d952e65 100644 --- a/src/components/report/ReportListData.vue +++ b/src/components/report/ReportListData.vue @@ -9,11 +9,17 @@ diff --git a/src/store/index.ts b/src/store/index.ts index fb6015f..e7f9a48 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -4,8 +4,14 @@ import Vuex from "vuex"; Vue.use(Vuex); export default new Vuex.Store({ - state: {}, - mutations: {}, + state: { + reports: [] + }, + mutations: { + setReports: (state, reports) => { + state.reports = reports; + } + }, actions: {}, modules: {} }); diff --git a/src/views/Report.vue b/src/views/Report.vue index 28fa608..a7968e0 100644 --- a/src/views/Report.vue +++ b/src/views/Report.vue @@ -1,18 +1,30 @@ From 6360cd06fa39e5a92ea659a508b7dfeff05d383a Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Mon, 2 Mar 2020 00:05:57 +0100 Subject: [PATCH 14/25] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ef5cefc --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 Patrick Strang + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 9bf68e404a4f3d37c029f823a9b83758d47633c7 Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Mon, 2 Mar 2020 00:08:26 +0100 Subject: [PATCH 15/25] Create CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..f1a0751 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,76 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at strangnet@gmail.com. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see +https://www.contributor-covenant.org/faq From f3063a3efba85d40a4d8d0377f372f21a69a3a9d Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Mon, 2 Mar 2020 00:10:42 +0100 Subject: [PATCH 16/25] Create CONTRIBUTING.md --- CONTRIBUTING.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..084d409 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,5 @@ +# Contribution Guidelines + +1. [Fork](https://help.github.com/articles/fork-a-repo/) this repository to your own GitHub account and then [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device. +2. Start making changes. +3. Submit a [pull request](https://help.github.com/articles/using-pull-requests/) to the original repository. From de253ed5ef4037499e7f0ec6d3c453eda7042641 Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Mon, 2 Mar 2020 00:12:40 +0100 Subject: [PATCH 17/25] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 38 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..dd84ea7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,38 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..bbcbbe7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From b96c642e6888214b4a6feab8959242b7f0f996cf Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Thu, 12 Mar 2020 22:22:26 +0100 Subject: [PATCH 18/25] adding device detector --- package.json | 1 + yarn.lock | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/package.json b/package.json index 7f58732..b8585c4 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "dependencies": { "axios": "^0.19.2", "core-js": "^3.6.4", + "device-detector-js": "^2.2.1", "register-service-worker": "^1.6.2", "vue": "^2.6.11", "vue-class-component": "^7.2.2", diff --git a/yarn.lock b/yarn.lock index e487485..66c3ac7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3659,6 +3659,11 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw== +device-detector-js@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/device-detector-js/-/device-detector-js-2.2.1.tgz#c6409cb56001923fd1b40ca11fcaf932000462e0" + integrity sha512-1Gt0n8+1ppJNfrpUIWvmLnAG+fMMh5EVbMaWAs3a2D81tJBs0NHMRD6iScjL0pPCZSeAyIFNNMe6qvhDa+gEcQ== + diff-sequences@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5" From 8cccd198a7a849d7288a847cecc0c93dfefb75d8 Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Thu, 12 Mar 2020 22:22:48 +0100 Subject: [PATCH 19/25] reports api service --- src/services/reports.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/reports.ts b/src/services/reports.ts index e1096f3..b193cbb 100644 --- a/src/services/reports.ts +++ b/src/services/reports.ts @@ -1,10 +1,10 @@ import api from "@/services/api"; export default { - getReports: () => { + getReports() { return api().get("/report"); }, - getReport: (id: string) => { + getReport(id: string) { return api().get("/report/" + id); } }; From 77faf26c2c0dbea5b9d5283036d81499413f1286 Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Thu, 12 Mar 2020 22:22:59 +0100 Subject: [PATCH 20/25] lint --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index 2f7f08b..741a127 100644 --- a/vue.config.js +++ b/vue.config.js @@ -2,6 +2,6 @@ module.exports = { transpileDependencies: ["vuetify"], pwa: { - name: 'csp-uri-report' + name: "csp-uri-report" } }; From ac5fe8cbe29736ce8c8683ede8fa2bd10a63257a Mon Sep 17 00:00:00 2001 From: Patrick Strang Date: Thu, 12 Mar 2020 22:23:15 +0100 Subject: [PATCH 21/25] parsing the user agent --- src/components/report/ReportListData.vue | 22 +++++++++++------ .../report/UserAgentListDisplay.vue | 24 +++++++++++++++++++ 2 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 src/components/report/UserAgentListDisplay.vue diff --git a/src/components/report/ReportListData.vue b/src/components/report/ReportListData.vue index d952e65..e9e9a13 100644 --- a/src/components/report/ReportListData.vue +++ b/src/components/report/ReportListData.vue @@ -4,16 +4,22 @@ :items="reports" :items-per-page="5" class="elevation-1" - > + > + + diff --git a/src/components/report/UserAgentListDisplay.vue b/src/components/report/UserAgentListDisplay.vue new file mode 100644 index 0000000..1390163 --- /dev/null +++ b/src/components/report/UserAgentListDisplay.vue @@ -0,0 +1,24 @@ + + + From 5fe4dd5f861ceda4d4bcb368e459134800d28eac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 4 Apr 2020 14:09:36 +0000 Subject: [PATCH 22/25] Bump acorn from 5.7.3 to 5.7.4 Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 66c3ac7..56d4478 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1705,9 +1705,9 @@ acorn-walk@^7.0.0: integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ== acorn@^5.5.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" - integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== + version "5.7.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" + integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1: version "6.4.0" From 75f51260b123188e82975958bf256208ae41424f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 7 Jun 2020 22:28:07 +0000 Subject: [PATCH 23/25] Bump websocket-extensions from 0.1.3 to 0.1.4 Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. - [Release notes](https://github.com/faye/websocket-extensions-node/releases) - [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 66c3ac7..2db19b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10611,9 +10611,9 @@ websocket-driver@>=0.5.1: websocket-extensions ">=0.1.1" websocket-extensions@>=0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" - integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg== + version "0.1.4" + resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3, whatwg-encoding@^1.0.5: version "1.0.5" From 5fa7a66abdcda0d500ed19659d53ac13afc2696a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Aug 2020 15:29:43 +0000 Subject: [PATCH 24/25] Bump elliptic from 6.5.2 to 6.5.3 Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/indutny/elliptic/releases) - [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3) Signed-off-by: dependabot[bot] --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index da6245b..f941b66 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2258,9 +2258,9 @@ bluebird@^3.1.1, bluebird@^3.5.5: integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: - version "4.11.8" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" - integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA== + version "4.11.9" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" + integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== body-parser@1.19.0: version "1.19.0" @@ -3858,9 +3858,9 @@ elegant-spinner@^1.0.1: integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= elliptic@^6.0.0: - version "6.5.2" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762" - integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw== + version "6.5.3" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" + integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw== dependencies: bn.js "^4.4.0" brorand "^1.0.1" From 5a176dd4f6c3e1e122b074e64e5efc4e898f6b58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Sep 2020 09:56:50 +0000 Subject: [PATCH 25/25] Bump http-proxy from 1.18.0 to 1.18.1 Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.18.0 to 1.18.1. - [Release notes](https://github.com/http-party/node-http-proxy/releases) - [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/http-party/node-http-proxy/compare/1.18.0...1.18.1) Signed-off-by: dependabot[bot] --- yarn.lock | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index f941b66..653c75a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3504,7 +3504,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8: dependencies: ms "2.0.0" -debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: +debug@3.2.6, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -4156,9 +4156,9 @@ eventemitter2@4.1.2: integrity sha1-DhqEd6+CGm7zmVsxG/dMI6UkfxU= eventemitter3@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb" - integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg== + version "4.0.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== events@^3.0.0: version "3.1.0" @@ -4625,11 +4625,9 @@ follow-redirects@1.5.10: debug "=3.1.0" follow-redirects@^1.0.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.10.0.tgz#01f5263aee921c6a54fb91667f08f4155ce169eb" - integrity sha512-4eyLK6s6lH32nOvLLwlIOnr9zrL8Sm+OvW4pVTJNoXeGzYIkHVf+pADQi+OJ0E67hiuSLezPVPyBcIZO50TmmQ== - dependencies: - debug "^3.0.0" + version "1.13.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" + integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== for-in@^1.0.2: version "1.0.2" @@ -5211,9 +5209,9 @@ http-proxy-middleware@0.19.1: micromatch "^3.1.10" http-proxy@^1.17.0: - version "1.18.0" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a" - integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ== + version "1.18.1" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== dependencies: eventemitter3 "^4.0.0" follow-redirects "^1.0.0"