diff --git a/webapp/public/alprs/elsag-1.jpg b/webapp/public/alprs/elsag-1.jpg new file mode 100644 index 0000000..8120c3c Binary files /dev/null and b/webapp/public/alprs/elsag-1.jpg differ diff --git a/webapp/public/alprs/elsag-2.jpg b/webapp/public/alprs/elsag-2.jpg new file mode 100644 index 0000000..e27e0c3 Binary files /dev/null and b/webapp/public/alprs/elsag-2.jpg differ diff --git a/webapp/public/alprs/elsag-3.jpg b/webapp/public/alprs/elsag-3.jpg new file mode 100644 index 0000000..47439f3 Binary files /dev/null and b/webapp/public/alprs/elsag-3.jpg differ diff --git a/webapp/public/alprs/elsag-4.jpg b/webapp/public/alprs/elsag-4.jpg new file mode 100644 index 0000000..b245191 Binary files /dev/null and b/webapp/public/alprs/elsag-4.jpg differ diff --git a/webapp/public/alprs/flock-1.jpg b/webapp/public/alprs/flock-1.jpg new file mode 100644 index 0000000..e071986 Binary files /dev/null and b/webapp/public/alprs/flock-1.jpg differ diff --git a/webapp/public/alprs/flock-2.jpg b/webapp/public/alprs/flock-2.jpg new file mode 100644 index 0000000..c11d28b Binary files /dev/null and b/webapp/public/alprs/flock-2.jpg differ diff --git a/webapp/public/alprs/flock-3.jpg b/webapp/public/alprs/flock-3.jpg new file mode 100644 index 0000000..ec36843 Binary files /dev/null and b/webapp/public/alprs/flock-3.jpg differ diff --git a/webapp/public/alprs/flock-4.jpg b/webapp/public/alprs/flock-4.jpg new file mode 100644 index 0000000..3ccb292 Binary files /dev/null and b/webapp/public/alprs/flock-4.jpg differ diff --git a/webapp/public/alprs/motorola-1.jpg b/webapp/public/alprs/motorola-1.jpg new file mode 100644 index 0000000..32e91e1 Binary files /dev/null and b/webapp/public/alprs/motorola-1.jpg differ diff --git a/webapp/public/alprs/motorola-2.jpg b/webapp/public/alprs/motorola-2.jpg new file mode 100644 index 0000000..6d3678d Binary files /dev/null and b/webapp/public/alprs/motorola-2.jpg differ diff --git a/webapp/public/alprs/motorola-3.jpg b/webapp/public/alprs/motorola-3.jpg new file mode 100644 index 0000000..389ad0e Binary files /dev/null and b/webapp/public/alprs/motorola-3.jpg differ diff --git a/webapp/public/alprs/motorola-4.jpg b/webapp/public/alprs/motorola-4.jpg new file mode 100644 index 0000000..dd261f7 Binary files /dev/null and b/webapp/public/alprs/motorola-4.jpg differ diff --git a/webapp/public/alprs/neology-1.jpg b/webapp/public/alprs/neology-1.jpg new file mode 100644 index 0000000..bd9db2b Binary files /dev/null and b/webapp/public/alprs/neology-1.jpg differ diff --git a/webapp/public/alprs/neology-2.jpg b/webapp/public/alprs/neology-2.jpg new file mode 100644 index 0000000..7ab74b8 Binary files /dev/null and b/webapp/public/alprs/neology-2.jpg differ diff --git a/webapp/public/chicago-pd.jpg b/webapp/public/chicago-pd.jpg deleted file mode 100644 index 69de0de..0000000 Binary files a/webapp/public/chicago-pd.jpg and /dev/null differ diff --git a/webapp/public/flock-1.jpg b/webapp/public/flock-1.jpg deleted file mode 100644 index f973630..0000000 Binary files a/webapp/public/flock-1.jpg and /dev/null differ diff --git a/webapp/public/flock-2.jpg b/webapp/public/flock-2.jpg deleted file mode 100644 index 5b0bb8b..0000000 Binary files a/webapp/public/flock-2.jpg and /dev/null differ diff --git a/webapp/public/flock-3.jpg b/webapp/public/flock-3.jpg deleted file mode 100644 index cc982be..0000000 Binary files a/webapp/public/flock-3.jpg and /dev/null differ diff --git a/webapp/public/flock-4.jpg b/webapp/public/flock-4.jpg deleted file mode 100644 index a03ae97..0000000 Binary files a/webapp/public/flock-4.jpg and /dev/null differ diff --git a/webapp/public/flock-5.jpg b/webapp/public/flock-5.jpg deleted file mode 100644 index 22f9c1b..0000000 Binary files a/webapp/public/flock-5.jpg and /dev/null differ diff --git a/webapp/public/flock-6.jpg b/webapp/public/flock-6.jpg deleted file mode 100644 index 0e5e4a9..0000000 Binary files a/webapp/public/flock-6.jpg and /dev/null differ diff --git a/webapp/public/flock-logo.svg b/webapp/public/flock-logo.svg new file mode 100644 index 0000000..0a0915d --- /dev/null +++ b/webapp/public/flock-logo.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/webapp/public/neology-1.jpg b/webapp/public/neology-1.jpg deleted file mode 100644 index 5d48547..0000000 Binary files a/webapp/public/neology-1.jpg and /dev/null differ diff --git a/webapp/public/redlight-camera.jpg b/webapp/public/redlight-camera.jpg deleted file mode 100644 index dc00bd8..0000000 Binary files a/webapp/public/redlight-camera.jpg and /dev/null differ diff --git a/webapp/public/security-camera.jpg b/webapp/public/security-camera.jpg deleted file mode 100644 index 43f99b7..0000000 Binary files a/webapp/public/security-camera.jpg and /dev/null differ diff --git a/webapp/public/toll-camera.jpg b/webapp/public/toll-camera.jpg deleted file mode 100644 index 7e81b8b..0000000 Binary files a/webapp/public/toll-camera.jpg and /dev/null differ diff --git a/webapp/public/traffic-camera.jpg b/webapp/public/traffic-camera.jpg deleted file mode 100644 index 57c5c54..0000000 Binary files a/webapp/public/traffic-camera.jpg and /dev/null differ diff --git a/webapp/public/vigilant-1.jpg b/webapp/public/vigilant-1.jpg deleted file mode 100644 index ba85e67..0000000 Binary files a/webapp/public/vigilant-1.jpg and /dev/null differ diff --git a/webapp/public/vigilant-2.jpg b/webapp/public/vigilant-2.jpg deleted file mode 100644 index ddf7bf4..0000000 Binary files a/webapp/public/vigilant-2.jpg and /dev/null differ diff --git a/webapp/public/vigilant-3.jpg b/webapp/public/vigilant-3.jpg deleted file mode 100644 index ee68041..0000000 Binary files a/webapp/public/vigilant-3.jpg and /dev/null differ diff --git a/webapp/src/App.vue b/webapp/src/App.vue index 5ea27b7..bb5bf4a 100644 --- a/webapp/src/App.vue +++ b/webapp/src/App.vue @@ -16,7 +16,6 @@ const items = [ { title: 'Home', icon: 'mdi-home', to: '/' }, { title: 'Map', icon: 'mdi-map', to: '/map' }, { title: 'What is an ALPR?', icon: 'mdi-cctv', to: '/what-is-an-alpr' }, - { title: 'Dangers of ALPRs', icon: 'mdi-shield-alert', to: '/dangers' }, { title: 'Report an ALPR', icon: 'mdi-map-marker-plus', to: '/report' }, { title: 'Known Operators', icon: 'mdi-police-badge', to: '/operators' }, // { title: 'About', icon: 'mdi-information', to: '/about' }, diff --git a/webapp/src/assets/main.css b/webapp/src/assets/main.css index b03096b..325fd3a 100644 --- a/webapp/src/assets/main.css +++ b/webapp/src/assets/main.css @@ -32,6 +32,10 @@ p { font-family: "PT Serif", serif; } +.sans-serif { + font-family: unset !important; +} + /* Prevent Scrolling Horizontally */ html, body { overflow-x: hidden; diff --git a/webapp/src/components/ALPRCounter.vue b/webapp/src/components/ALPRCounter.vue index 1ec1f58..dfd8855 100644 --- a/webapp/src/components/ALPRCounter.vue +++ b/webapp/src/components/ALPRCounter.vue @@ -12,6 +12,13 @@ import { useDisplay } from 'vuetify' import { getALPRCounts } from '@/services/apiService'; import { CountUp } from 'countup.js'; +const props = defineProps({ + delayMs: { + type: Number, + default: 200, + } +}); + const counterEl: Ref = ref(null); const countupOptions = { useEasing: true, @@ -33,13 +40,17 @@ const counts: Ref = ref({ const showFinalAnimation = ref(false); const { xs: isMobile } = useDisplay(); +let timeOfMount: number|undefined = undefined; + onMounted(() => { - getALPRCounts().then((response) => { - counts.value = response; + timeOfMount = new Date().getTime(); + getALPRCounts().then((countResponse) => { + counts.value = countResponse; + countUp(countResponse); }); }); -watch(counts, (newCounts: Counts) => { +function countUp(newCounts: Counts) { if (!newCounts.worldwide) return; if (!counterEl.value) { console.error('Counter element not found'); @@ -48,14 +59,23 @@ watch(counts, (newCounts: Counts) => { if (!counter) { counter = new CountUp(counterEl.value, newCounts.worldwide, countupOptions); - setTimeout(() => { - counter?.start(); - }, 500); + + if (timeOfMount) { + const timeSinceMount = new Date().getTime() - timeOfMount; + if (timeSinceMount < props.delayMs) { + setTimeout(() => { + counter?.start(); + }, props.delayMs - timeSinceMount); + } else { + counter.start(); + } + } + setTimeout(() => { showFinalAnimation.value = true; - }, 3000); + }, 2500); } -}); +} diff --git a/webapp/src/components/OSMTagSelector.vue b/webapp/src/components/OSMTagSelector.vue index a434d07..b49d842 100644 --- a/webapp/src/components/OSMTagSelector.vue +++ b/webapp/src/components/OSMTagSelector.vue @@ -1,6 +1,6 @@