Compare commits
3 Commits
50f3f3ad3a
...
70b8eb2d92
Author | SHA1 | Date |
---|---|---|
Lucas Verney | 70b8eb2d92 | |
Lucas Verney | 64fe52a0bf | |
Lucas Verney | 2a4b185007 |
|
@ -20,7 +20,6 @@
|
||||||
"file-saver": "^2.0.0",
|
"file-saver": "^2.0.0",
|
||||||
"gps-to-gpx": "git://github.com/phyks/gps-to-gpx.git#1cb5adf4dd382266d076d7df3cb5aa3a4d7dd27b",
|
"gps-to-gpx": "git://github.com/phyks/gps-to-gpx.git#1cb5adf4dd382266d076d7df3cb5aa3a4d7dd27b",
|
||||||
"localforage": "^1.7.3",
|
"localforage": "^1.7.3",
|
||||||
"nosleep.js": "^0.9.0",
|
|
||||||
"ol": "^5.3.0",
|
"ol": "^5.3.0",
|
||||||
"roboto-fontface": "^0.10.0",
|
"roboto-fontface": "^0.10.0",
|
||||||
"serviceworker-webpack-plugin": "^1.0.1",
|
"serviceworker-webpack-plugin": "^1.0.1",
|
||||||
|
|
|
@ -60,14 +60,14 @@ def preprocess_hauts_de_seine(data):
|
||||||
new_fields['date_debut'] = arrow.get(
|
new_fields['date_debut'] = arrow.get(
|
||||||
datetime.datetime(
|
datetime.datetime(
|
||||||
now.year,
|
now.year,
|
||||||
(now.month // 3) * 3,
|
max(1, min((now.month // 3) * 3, 12)),
|
||||||
1
|
1
|
||||||
)
|
)
|
||||||
).isoformat()
|
).isoformat()
|
||||||
new_fields['date_fin'] = arrow.get(
|
new_fields['date_fin'] = arrow.get(
|
||||||
datetime.datetime(
|
datetime.datetime(
|
||||||
now.year,
|
now.year,
|
||||||
(now.month // 3 + 1) * 3,
|
max(1, min((now.month // 3 + 1) * 3, 12)),
|
||||||
1
|
1
|
||||||
)
|
)
|
||||||
).isoformat()
|
).isoformat()
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -52,9 +52,7 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
// Import directly from dist to avoid ES6 issues
|
import NoSleep from '@/tools/nosleep';
|
||||||
// See https://github.com/richtr/NoSleep.js/issues/46.
|
|
||||||
import NoSleep from 'nosleep.js';
|
|
||||||
|
|
||||||
import Alert from '@/components/Alert.vue';
|
import Alert from '@/components/Alert.vue';
|
||||||
import Map from '@/components/Map.vue';
|
import Map from '@/components/Map.vue';
|
||||||
|
|
|
@ -1,98 +1,134 @@
|
||||||
<template>
|
<template>
|
||||||
<v-container fluid class="no-padding">
|
<v-container fluid class="no-padding">
|
||||||
<v-layout row wrap>
|
<v-layout row wrap>
|
||||||
|
<v-dialog v-model="isDialog" max-width="250px">
|
||||||
|
<v-card>
|
||||||
|
<template v-if="whichDialog === LOCALE">
|
||||||
|
<v-card-title>
|
||||||
|
{{ $t('settings.locale') }}
|
||||||
|
</v-card-title>
|
||||||
|
<v-card-text>
|
||||||
|
<v-select
|
||||||
|
:items="i18nItems"
|
||||||
|
v-model="locale"
|
||||||
|
item-text="name"
|
||||||
|
item-value="iso"
|
||||||
|
required
|
||||||
|
></v-select>
|
||||||
|
</v-card-text>
|
||||||
|
</template>
|
||||||
|
<template v-else-if="whichDialog === TILE_SERVER">
|
||||||
|
<v-card-title>
|
||||||
|
{{ $t('settings.tileServer') }}
|
||||||
|
</v-card-title>
|
||||||
|
<v-card-text>
|
||||||
|
<v-select
|
||||||
|
:items="tileServers"
|
||||||
|
v-model="tileServer"
|
||||||
|
:label="$t('settings.tileServer')"
|
||||||
|
required
|
||||||
|
></v-select>
|
||||||
|
|
||||||
|
<v-text-field
|
||||||
|
:hint="$t('settings.customTileServerURLHint')"
|
||||||
|
:label="$t('settings.customTileServerURL')"
|
||||||
|
v-model="customTileServerURL"
|
||||||
|
v-if="showCustomTileServerURLField"
|
||||||
|
required
|
||||||
|
>
|
||||||
|
</v-text-field>
|
||||||
|
</v-card-text>
|
||||||
|
</template>
|
||||||
|
<template v-else-if="whichDialog === DEFAULT_ORIENTATION">
|
||||||
|
<v-card-title>
|
||||||
|
{{ $t('settings.defaultOrientationMode') }}
|
||||||
|
</v-card-title>
|
||||||
|
<v-card-text>
|
||||||
|
<v-select
|
||||||
|
:items="orientationModes"
|
||||||
|
v-model="defaultOrientationMode"
|
||||||
|
required
|
||||||
|
></v-select>
|
||||||
|
</v-card-text>
|
||||||
|
</template>
|
||||||
|
<template v-else-if="whichDialog === TILE_CACHING">
|
||||||
|
<v-card-title>
|
||||||
|
{{ $t('settings.tileCachingDuration') }}
|
||||||
|
</v-card-title>
|
||||||
|
<v-card-text>
|
||||||
|
<v-select
|
||||||
|
:items="tileCachingDurationOptions"
|
||||||
|
v-model="tileCachingDuration"
|
||||||
|
item-text="name"
|
||||||
|
item-value="duration"
|
||||||
|
required
|
||||||
|
v-if="tileCachingEnabled"
|
||||||
|
></v-select>
|
||||||
|
</v-card-text>
|
||||||
|
</template>
|
||||||
|
<v-card-actions>
|
||||||
|
<v-btn color="primary" flat @click="isDialog = false">Close</v-btn>
|
||||||
|
</v-card-actions>
|
||||||
|
</v-card>
|
||||||
|
</v-dialog>
|
||||||
|
|
||||||
<v-flex xs12 sm4 offset-sm4 class="text-xs-center">
|
<v-flex xs12 sm4 offset-sm4 class="text-xs-center">
|
||||||
<form>
|
<v-list subheader two-line>
|
||||||
<v-select
|
<v-subheader>{{ $t('settings.general') }}</v-subheader>
|
||||||
:items="i18nItems"
|
|
||||||
v-model="locale"
|
|
||||||
item-text="name"
|
|
||||||
item-value="iso"
|
|
||||||
:label="$t('settings.locale')"
|
|
||||||
required
|
|
||||||
></v-select>
|
|
||||||
|
|
||||||
<v-select
|
<v-list-tile @click="showDialog(LOCALE)">
|
||||||
:items="tileServers"
|
|
||||||
v-model="tileServer"
|
|
||||||
:label="$t('settings.tileServer')"
|
|
||||||
required
|
|
||||||
></v-select>
|
|
||||||
|
|
||||||
<v-select
|
|
||||||
:items="orientationModes"
|
|
||||||
v-model="defaultOrientationMode"
|
|
||||||
:label="$t('settings.defaultOrientationMode')"
|
|
||||||
required
|
|
||||||
></v-select>
|
|
||||||
|
|
||||||
<v-select
|
|
||||||
:items="tileCachingDurationOptions"
|
|
||||||
v-model="tileCachingDuration"
|
|
||||||
item-text="name"
|
|
||||||
item-value="duration"
|
|
||||||
:label="$t('settings.tileCachingDuration')"
|
|
||||||
required
|
|
||||||
v-if="tileCachingEnabled"
|
|
||||||
></v-select>
|
|
||||||
|
|
||||||
<v-text-field
|
|
||||||
:hint="$t('settings.customTileServerURLHint')"
|
|
||||||
:label="$t('settings.customTileServerURL')"
|
|
||||||
v-model="customTileServerURL"
|
|
||||||
v-if="showCustomTileServerURLField"
|
|
||||||
required
|
|
||||||
>
|
|
||||||
</v-text-field>
|
|
||||||
|
|
||||||
<v-checkbox
|
|
||||||
:label="$t('settings.skipOnboarding')"
|
|
||||||
v-model="skipOnboarding"
|
|
||||||
></v-checkbox>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<v-list subheader>
|
|
||||||
<v-subheader>Général</v-subheader>
|
|
||||||
|
|
||||||
<v-list-tile>
|
|
||||||
<v-list-tile-content>
|
<v-list-tile-content>
|
||||||
<v-list-tile-title>
|
<v-list-tile-title>
|
||||||
{{ $t('settings.locale') }}
|
{{ $t('settings.locale') }}
|
||||||
</v-list-tile-title>
|
</v-list-tile-title>
|
||||||
|
<v-list-tile-sub-title>
|
||||||
|
{{ localeName }}
|
||||||
|
</v-list-tile-sub-title>
|
||||||
</v-list-tile-content>
|
</v-list-tile-content>
|
||||||
</v-list-tile>
|
</v-list-tile>
|
||||||
|
|
||||||
<v-list-tile>
|
<v-list-tile @click="showDialog(TILE_SERVER)">
|
||||||
<v-list-tile-content>
|
<v-list-tile-content>
|
||||||
<v-list-tile-title>
|
<v-list-tile-title>
|
||||||
{{ $t('settings.tileServer') }}
|
{{ $t('settings.tileServer') }}
|
||||||
</v-list-tile-title>
|
</v-list-tile-title>
|
||||||
|
<v-list-tile-sub-title>
|
||||||
|
{{ tileServer }}
|
||||||
|
</v-list-tile-sub-title>
|
||||||
</v-list-tile-content>
|
</v-list-tile-content>
|
||||||
</v-list-tile>
|
</v-list-tile>
|
||||||
|
|
||||||
<v-list-tile>
|
<v-list-tile @click="showDialog(DEFAULT_ORIENTATION)">
|
||||||
<v-list-tile-content>
|
<v-list-tile-content>
|
||||||
<v-list-tile-title>
|
<v-list-tile-title>
|
||||||
{{ $t('settings.defaultOrientationMode') }}
|
{{ $t('settings.defaultOrientationMode') }}
|
||||||
</v-list-tile-title>
|
</v-list-tile-title>
|
||||||
|
<v-list-tile-sub-title>
|
||||||
|
{{ defaultOrientationModeName }}
|
||||||
|
</v-list-tile-sub-title>
|
||||||
</v-list-tile-content>
|
</v-list-tile-content>
|
||||||
</v-list-tile>
|
</v-list-tile>
|
||||||
|
|
||||||
<v-list-tile>
|
<v-list-tile v-if="tileCachingEnabled" @click="showDialog(TILE_CACHING)">
|
||||||
<v-list-tile-content>
|
<v-list-tile-content>
|
||||||
<v-list-tile-title>
|
<v-list-tile-title>
|
||||||
{{ $t('settings.tileCachingDuration') }}
|
{{ $t('settings.tileCachingDuration') }}
|
||||||
</v-list-tile-title>
|
</v-list-tile-title>
|
||||||
|
<v-list-tile-sub-title>
|
||||||
|
{{ tileCachingDurationName }}
|
||||||
|
</v-list-tile-sub-title>
|
||||||
</v-list-tile-content>
|
</v-list-tile-content>
|
||||||
</v-list-tile>
|
</v-list-tile>
|
||||||
</v-list>
|
</v-list>
|
||||||
|
<v-divider></v-divider>
|
||||||
<PermissionsSwitches></PermissionsSwitches>
|
<PermissionsSwitches></PermissionsSwitches>
|
||||||
|
<v-divider></v-divider>
|
||||||
<v-list subheader>
|
<v-list subheader>
|
||||||
<v-subheader>Divers</v-subheader>
|
<v-subheader>{{ $t('settings.misc') }}</v-subheader>
|
||||||
<v-list-tile>
|
<v-list-tile @click="dialog">
|
||||||
<v-list-tile-content>
|
<v-list-tile-content>
|
||||||
<v-list-tile-title>
|
<v-list-tile-title>
|
||||||
{{ $t('settings.skipOnboarding') }}
|
{{ $t('settings.showOnboarding') }}
|
||||||
</v-list-tile-title>
|
</v-list-tile-title>
|
||||||
</v-list-tile-content>
|
</v-list-tile-content>
|
||||||
</v-list-tile>
|
</v-list-tile>
|
||||||
|
@ -139,6 +175,11 @@ export default {
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
defaultOrientationModeName() {
|
||||||
|
return this.orientationModes.find(
|
||||||
|
item => item.value === this.defaultOrientationMode,
|
||||||
|
).text;
|
||||||
|
},
|
||||||
locale: {
|
locale: {
|
||||||
get() {
|
get() {
|
||||||
return this.$store.state.settings.locale;
|
return this.$store.state.settings.locale;
|
||||||
|
@ -147,6 +188,21 @@ export default {
|
||||||
this.$store.dispatch('setLocale', { locale });
|
this.$store.dispatch('setLocale', { locale });
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
localeName() {
|
||||||
|
return this.i18nItems.find(item => item.iso === this.locale).name;
|
||||||
|
},
|
||||||
|
orientationModes() {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
text: this.$t('settings.fixedNorth'),
|
||||||
|
value: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: this.$t('settings.autorotate'),
|
||||||
|
value: true,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
},
|
||||||
showCustomTileServerURLField() {
|
showCustomTileServerURLField() {
|
||||||
return !(this.$store.state.settings.tileServer in TILE_SERVERS);
|
return !(this.$store.state.settings.tileServer in TILE_SERVERS);
|
||||||
},
|
},
|
||||||
|
@ -187,6 +243,11 @@ export default {
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
},
|
},
|
||||||
|
tileCachingDurationName() {
|
||||||
|
return this.tileCachingDurationOptions.find(
|
||||||
|
item => item.duration === this.tileCachingDuration,
|
||||||
|
).name;
|
||||||
|
},
|
||||||
tileServer: {
|
tileServer: {
|
||||||
get() {
|
get() {
|
||||||
const tileServerStore = this.$store.state.settings.tileServer;
|
const tileServerStore = this.$store.state.settings.tileServer;
|
||||||
|
@ -208,7 +269,6 @@ export default {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
const $t = this.$t.bind(this);
|
|
||||||
const i18nItems = [];
|
const i18nItems = [];
|
||||||
Object.keys(AVAILABLE_LOCALES).forEach(iso => i18nItems.push({
|
Object.keys(AVAILABLE_LOCALES).forEach(iso => i18nItems.push({
|
||||||
iso,
|
iso,
|
||||||
|
@ -222,19 +282,21 @@ export default {
|
||||||
);
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
DEFAULT_ORIENTATION: 'DEFAULT_ORIENTATION',
|
||||||
|
LOCALE: 'LOCALE',
|
||||||
|
TILE_CACHING: 'TILE_CACHING',
|
||||||
|
TILE_SERVER: 'TILE_SERVER',
|
||||||
|
isDialog: false,
|
||||||
|
whichDialog: null,
|
||||||
i18nItems,
|
i18nItems,
|
||||||
orientationModes: [
|
|
||||||
{
|
|
||||||
text: $t('settings.fixedNorth'),
|
|
||||||
value: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
text: $t('settings.autorotate'),
|
|
||||||
value: true,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
tileCachingEnabled,
|
tileCachingEnabled,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
methods: {
|
||||||
|
showDialog(which) {
|
||||||
|
this.isDialog = true;
|
||||||
|
this.whichDialog = which;
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -5722,11 +5722,6 @@ normalize-url@^3.0.0:
|
||||||
version "3.2.0"
|
version "3.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.2.0.tgz#98d0948afc82829f374320f405fe9ca55a5f8567"
|
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.2.0.tgz#98d0948afc82829f374320f405fe9ca55a5f8567"
|
||||||
|
|
||||||
nosleep.js@^0.9.0:
|
|
||||||
version "0.9.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/nosleep.js/-/nosleep.js-0.9.0.tgz#0f1371b81dc182e3b6bbdb837e880f16db9d7163"
|
|
||||||
integrity sha512-qLOl2MmuGOPZY7Exi0kYJSCr2e9IcAtOykOo7hXUGAoaMC1Iqj0m+Aj2REuay68mDkhbc5CoA4ccUvcZI175Kw==
|
|
||||||
|
|
||||||
npm-bundled@^1.0.1:
|
npm-bundled@^1.0.1:
|
||||||
version "1.0.3"
|
version "1.0.3"
|
||||||
resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
|
resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
|
||||||
|
|
Loading…
Reference in New Issue