From 7904af0fb658c9ddc7b9fb17d4d608c4012f4aec Mon Sep 17 00:00:00 2001 From: Will Freeman Date: Fri, 27 Dec 2024 12:06:39 -0700 Subject: [PATCH] major cleanup --- .../main/scala/services/GithubClient.scala | 1 + webapp/public/404media.svg | 7 + webapp/public/deflock-logo-grey.svg | 27 +++ webapp/public/icon-discord-white.svg | 1 + webapp/public/icon-discord.svg | 1 + webapp/public/white-logos/404media.svg | 7 + webapp/public/white-logos/forbes.svg | 4 + webapp/public/white-logos/latimes.svg | 93 +++++++++ webapp/src/App.vue | 20 +- webapp/src/assets/main.css | 7 +- webapp/src/assets/typography.css | 26 +++ webapp/src/components/Dangers.vue | 14 +- webapp/src/components/LeafletMap.vue | 4 +- webapp/src/components/layout/Footer.vue | 95 +++++++++ webapp/src/main.ts | 7 + webapp/src/router/index.ts | 16 +- webapp/src/views/AboutView.vue | 17 +- webapp/src/views/ContactView.vue | 67 ++++++- webapp/src/views/Dangers.vue | 11 +- webapp/src/views/Donate.vue | 33 +++- webapp/src/views/Landing.vue | 186 ++++++++++-------- webapp/src/views/LegalView.vue | 84 -------- webapp/src/views/OperatorsView.vue | 7 +- webapp/src/views/PrivacyPolicy.vue | 48 +++++ webapp/src/views/ReportView.vue | 40 ++-- webapp/src/views/TermsOfService.vue | 101 ++++++++++ webapp/src/views/WhatIsAnALPRView.vue | 7 +- 27 files changed, 681 insertions(+), 250 deletions(-) create mode 100644 webapp/public/404media.svg create mode 100644 webapp/public/deflock-logo-grey.svg create mode 100644 webapp/public/icon-discord-white.svg create mode 100644 webapp/public/icon-discord.svg create mode 100644 webapp/public/white-logos/404media.svg create mode 100644 webapp/public/white-logos/forbes.svg create mode 100644 webapp/public/white-logos/latimes.svg create mode 100644 webapp/src/assets/typography.css create mode 100644 webapp/src/components/layout/Footer.vue delete mode 100644 webapp/src/views/LegalView.vue create mode 100644 webapp/src/views/PrivacyPolicy.vue create mode 100644 webapp/src/views/TermsOfService.vue diff --git a/shotgun/src/main/scala/services/GithubClient.scala b/shotgun/src/main/scala/services/GithubClient.scala index c867d1d..fbd7cb9 100644 --- a/shotgun/src/main/scala/services/GithubClient.scala +++ b/shotgun/src/main/scala/services/GithubClient.scala @@ -29,6 +29,7 @@ class GithubClient(implicit val system: ActorSystem, implicit val executionConte | login | name | avatarUrl + | url | } | } | } diff --git a/webapp/public/404media.svg b/webapp/public/404media.svg new file mode 100644 index 0000000..8748ee2 --- /dev/null +++ b/webapp/public/404media.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/webapp/public/deflock-logo-grey.svg b/webapp/public/deflock-logo-grey.svg new file mode 100644 index 0000000..a448b6e --- /dev/null +++ b/webapp/public/deflock-logo-grey.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/public/icon-discord-white.svg b/webapp/public/icon-discord-white.svg new file mode 100644 index 0000000..1a47495 --- /dev/null +++ b/webapp/public/icon-discord-white.svg @@ -0,0 +1 @@ + diff --git a/webapp/public/icon-discord.svg b/webapp/public/icon-discord.svg new file mode 100644 index 0000000..d57ac7e --- /dev/null +++ b/webapp/public/icon-discord.svg @@ -0,0 +1 @@ + diff --git a/webapp/public/white-logos/404media.svg b/webapp/public/white-logos/404media.svg new file mode 100644 index 0000000..5b6f564 --- /dev/null +++ b/webapp/public/white-logos/404media.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/webapp/public/white-logos/forbes.svg b/webapp/public/white-logos/forbes.svg new file mode 100644 index 0000000..a1a62de --- /dev/null +++ b/webapp/public/white-logos/forbes.svg @@ -0,0 +1,4 @@ + + + + diff --git a/webapp/public/white-logos/latimes.svg b/webapp/public/white-logos/latimes.svg new file mode 100644 index 0000000..5de0dca --- /dev/null +++ b/webapp/public/white-logos/latimes.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/src/App.vue b/webapp/src/App.vue index 581de5c..c3fa834 100644 --- a/webapp/src/App.vue +++ b/webapp/src/App.vue @@ -1,10 +1,11 @@ diff --git a/webapp/src/main.ts b/webapp/src/main.ts index 6f0f9c6..41f293f 100644 --- a/webapp/src/main.ts +++ b/webapp/src/main.ts @@ -17,6 +17,13 @@ const vuetify = createVuetify({ directives, theme: { defaultTheme: 'light', + themes: { + light: { + colors: { + background: '#f5f5f5', + } + } + } } }) diff --git a/webapp/src/router/index.ts b/webapp/src/router/index.ts index 7c835f2..1a13e2f 100644 --- a/webapp/src/router/index.ts +++ b/webapp/src/router/index.ts @@ -83,11 +83,19 @@ const router = createRouter({ } }, { - path: '/legal', - name: 'legal', - component: () => import('../views/LegalView.vue'), + path: '/terms', + name: 'terms', + component: () => import('../views/TermsOfService.vue'), meta: { - title: 'Legal | DeFlock' + title: 'Terms of Service | DeFlock' + } + }, + { + path: '/privacy', + name: 'privacy', + component: () => import('../views/PrivacyPolicy.vue'), + meta: { + title: 'Privacy Policy | DeFlock' } }, { diff --git a/webapp/src/views/AboutView.vue b/webapp/src/views/AboutView.vue index 3f94594..b4dfa10 100644 --- a/webapp/src/views/AboutView.vue +++ b/webapp/src/views/AboutView.vue @@ -1,5 +1,5 @@ + diff --git a/webapp/src/views/Dangers.vue b/webapp/src/views/Dangers.vue index 774e34b..a54f0b3 100644 --- a/webapp/src/views/Dangers.vue +++ b/webapp/src/views/Dangers.vue @@ -1,5 +1,5 @@ diff --git a/webapp/src/views/Donate.vue b/webapp/src/views/Donate.vue index ba6321a..d730860 100644 --- a/webapp/src/views/Donate.vue +++ b/webapp/src/views/Donate.vue @@ -1,5 +1,5 @@ - - diff --git a/webapp/src/views/OperatorsView.vue b/webapp/src/views/OperatorsView.vue index a75a770..16b808a 100644 --- a/webapp/src/views/OperatorsView.vue +++ b/webapp/src/views/OperatorsView.vue @@ -51,12 +51,15 @@ We are getting a lot of new datasets and trying to decide how to import them at a large scale, since they need to be verified and deduplicated. If you have any ideas or want to help, please reach out to us here or join our Discord.

+ +