Skip to content

Commit c0d2fec

Browse files
committed
Improved early warning and probability maps
1 parent 340f782 commit c0d2fec

21 files changed

+1304
-2014
lines changed

quasar.conf.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,16 @@ module.exports = configure(function (ctx) {
7979
devServer: {
8080
https: false,
8181
// port: 8080,
82-
open: true // opens browser window automatically
83-
// proxy: {
84-
// // proxy all requests starting with /api to jsonplaceholder
85-
// '/django': {
86-
// target: 'http://192.168.1.47:8000/',
87-
// changeOrigin: true,
88-
// pathRewrite: {
89-
// '^/django': ''
90-
// }
91-
// }
92-
// }
82+
open: true, // opens browser window automatically
83+
proxy: {
84+
'/api_v1_prod': {
85+
target: 'https://api.mosquitoalert.com/',
86+
changeOrigin: true,
87+
pathRewrite: {
88+
'^/api_v1_prod': 'v1/map/'
89+
},
90+
}
91+
},
9392
},
9493

9594
// https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework

src/components/CustControl.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<div :class="className">
77
<button
88
:title="trans(titleText)"
9+
:disabled="isDisabled"
910
@click.stop="buttonClicked"
1011
>
1112
<i :class="faIcon"></i>
@@ -18,10 +19,14 @@ import { computed } from 'vue'
1819
import { useStore } from 'vuex'
1920
2021
export default {
21-
props: ['class', 'icon', 'title'],
22+
props: ['class', 'icon', 'title', 'disabled'],
2223
emits: ['clicked'],
2324
setup (props, context) {
2425
const $store = useStore()
26+
const isDisabled = computed(() => {
27+
return props.disabled
28+
})
29+
2530
const className = computed(() => {
2631
return props.class
2732
})
@@ -45,6 +50,7 @@ export default {
4550
return {
4651
trans,
4752
className,
53+
isDisabled,
4854
faIcon,
4955
titleText,
5056
buttonClicked

src/components/FaThinButtonRouter.vue

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<template>
77
<div class="tab-link-container" :class="isButtonDisabled?'disabled':''">
8-
<router-link v-if="!isButtonDisabled" class="main-menu-item" :id="Id" :to="toLink">
8+
<router-link v-if="!isButtonDisabled" class="main-menu-item" :id="Id" :to="{'name': routeName, params: {'lang': language}}">
99
<button class="fa-thin-button" :class="classProp" :title="label">
1010
<i :class="iconCode"></i>
1111
</button>
@@ -20,18 +20,17 @@
2020

2121
<script>
2222
import { computed } from 'vue'
23+
import { useStore } from 'vuex'
2324
2425
export default {
25-
props: ['name', 'label', 'link', 'class', 'item', 'id'],
26+
props: ['name', 'label', 'routeName', 'class', 'item', 'id'],
2627
setup (props) {
28+
const $store = useStore()
29+
2730
const Id = computed(() => {
2831
return props.id
2932
})
3033
31-
const toLink = computed(() => {
32-
return props.link
33-
})
34-
3534
const iconCode = computed(() => {
3635
return props.name
3736
})
@@ -44,12 +43,16 @@ export default {
4443
return props.class.toLowerCase().indexOf('disabled') > -1
4544
})
4645
46+
const language = computed(() => {
47+
return $store.getters['app/getLang']
48+
})
49+
4750
return {
4851
Id,
49-
toLink,
5052
iconCode,
5153
classProp,
52-
isButtonDisabled
54+
isButtonDisabled,
55+
language
5356
}
5457
}
5558
}

src/components/LeftDrawer.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,10 +394,13 @@ export default {
394394
395395
.toc-title-reports{
396396
font-family: 'Roboto';
397-
text-transform: Capitalize;
398397
font-weight: 700;
399398
color: #666666;
400399
}
400+
.toc-title-reports::first-letter{
401+
text-transform: uppercase;
402+
}
403+
401404
.toc-title{
402405
font-family: 'Roboto';
403406
text-transform: uppercase;

0 commit comments

Comments
 (0)