Merge branch 'master' into develop/sprint3

yvess · yvess · commit eb008a0732bd · 2020-03-11T17:25:33.000+01:00
diff --git a/django/Makefile b/django/Makefile
@@ -33,6 +33,7 @@ delete-gemeinden-django:
 	$(DOCKER_EXEC) python3 manage.py shell --command="from gsmap.models import Municipality;Municipality.objects.all().delete()"
 
 import-gemeinden-json:
+	$(DOCKER_EXEC) mkdir -p $(dir ./tmp/)
 	$(DOCKER_EXEC) curl -o ./tmp/gemeinden.geojson -Ls https://datahub.io/n0rdlicht/ch-municipalities/r/2.geojson
 	$(DOCKER_EXEC) python3 manage.py import-municipality ./tmp/gemeinden.geojson
 	$(DOCKER_EXEC) rm ./tmp/gemeinden.geojson
diff --git a/django/main/urls.py b/django/main/urls.py
@@ -5,7 +5,7 @@
 from django.views.decorators.csrf import csrf_exempt
 
 urlpatterns = [
-    path('admin/', admin.site.urls),
+    path('gmanage/', admin.site.urls),
     path('graphql/', csrf_exempt(GraphQLView.as_view(graphiql=True))),
 ]
 
diff --git a/vue/public/index.html b/vue/public/index.html
@@ -4,8 +4,9 @@
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width,initial-scale=1.0">
-
+  <meta name="viewport" content="width=device-width,initial-scale=1.0, 
+minimum-scale=1.0,maximum-scale=1.0,shrink-to-fit=no,user-scalable=no">
+  <meta name="HandheldFriendly" content="true">
   <link rel="apple-touch-icon" sizes="180x180" href="<%= BASE_URL %>apple-touch-icon.png">
   <link rel="icon" type="image/png" sizes="32x32" href="<%= BASE_URL %>favicon-32x32.png">
   <link rel="icon" type="image/png" sizes="16x16" href="<%= BASE_URL %>favicon-16x16.png">
diff --git a/vue/src/assets/styles/main.css b/vue/src/assets/styles/main.css
@@ -6,6 +6,11 @@
   -webkit-tap-highlight-color: rgba(0,0,0,0);
 }
 
+html {
+    -webkit-text-size-adjust: none;
+    touch-action: manipulation;
+}
+
 body {
   /* font-family: "Circular Pro", sans-serif; */
   font-family: "Open Sans", sans-serif;
diff --git a/vue/src/components/SnapshotList.vue b/vue/src/components/SnapshotList.vue
@@ -20,7 +20,7 @@
         class="px-0">{{ $t('listtitle') }}
       </v-subheader>
 
-      <v-list-item v-for="snapshot in snapshotsFiltered" :key="snapshot.node.id"
+      <v-list-item v-for="snapshot in snapshots" :key="snapshot.node.id"
         :to="'/' + $i18n.locale + '/' + snapshot.node.pk + '/'"
         class="px-2 mb-4" dense>
         <v-list-item-avatar tile size="64" class="my-2">
@@ -61,14 +61,7 @@ export default {
   },
 
   props: {
-    snapshots: Array,
-    exclude: String
-  },
-
-  computed: {
-    snapshotsFiltered() {
-      return this.snapshots.filter(snapshot => snapshot.pk !== this.exclude);
-    }
+    snapshots: Array
   }
 };
 </script>
diff --git a/vue/src/components/SnapshotMeta.vue b/vue/src/components/SnapshotMeta.vue
@@ -20,7 +20,8 @@
         <v-list-item-icon class="my-0 mr-2">
           <v-icon v-if="item.shape === 'circle'"
             :color="item.color"
-            :style="{ fontSize: 1.6 * item.size + 'em', opacity: item.opacity}">mdi-circle</v-icon>
+            :style="{ fontSize: 1.6 * item.size + 'em', opacity: item.opacity}">
+              mdi-circle-outline</v-icon>
           <v-icon v-else-if="item.shape === 'square'"
             :color="item.color"
             :style="{ fontSize: 1.6 * item.size + 'em', opacity: item.opacity}">mdi-square</v-icon>
diff --git a/vue/src/views/Snapshot.vue b/vue/src/views/Snapshot.vue
@@ -2,19 +2,19 @@
 <i18n>
 {
   "de": {
-    "calltoactionText": "Angebot für {municipalityText} einholen",
+    "calltoactionText": "Angebot für Ihre Gemeinde einholen",
     "hasSnapshot.title": "Datenverfügbarkeit",
     "hasSnapshot.p1": "Für {municipalityText} stehen erste Daten zur Verfügung.",
-    "hasSnapshot.p2": "Erkunden Sie unsere weiteren Fallbeispiele um ein besseres Bild der Anwendungs-möglichkeiten für Ihre Gemeinde zu erhalten.",
+    "hasSnapshot.p2": "Erkunden Sie unsere weiteren Fallbeispiele um ein besseres Bild der Möglichkeiten für Ihre Gemeinde zu erhalten.",
     "noSnapshot.title": "Datenverfügbarkeit",
     "noSnapshot.municipalityText": "diese Gemeinde",
     "noSnapshot.p1": "Für {municipalityText} stehen zur Zeit noch keine Daten zur Verfügung.",
     "noSnapshot.p2": "Erkunden Sie unsere Fallbeispiele um ein besseres Bild der Möglichkeiten für Ihre Gemeinde zu erhalten."
   },
   "fr": {
-    "calltoactionText": "Veuillez recueillir l’offre pour votre commune",
+    "calltoactionText": "Offre pour votre commune",
     "hasSnapshot.title": "Disponibilité des données",
-    "hasSnapshot.p1": "Les premières données concernants {municipalityText} sont disponibles.",
+    "hasSnapshot.p1": "Les premières données concernant {municipalityText} sont disponibles.",
     "hasSnapshot.p2": "Prenez compte de nos études pour une meilleure vue d’ensemble des possibilitiées qui s’offrent à votre commune.",
     "noSnapshot.title": "Disponibilité des données",
     "noSnapshot.municipalityText": "cette communauté",
@@ -64,7 +64,7 @@
           </div>
         </div>
 
-        <snapshot-list :snapshots="snapshotsExamples" :exclude="hash" />
+        <snapshot-list :snapshots="snapshotsExamples" />
       </div>
 
       <v-toolbar
@@ -82,7 +82,7 @@
     <v-content>
       <v-slide-x-reverse-transition>
         <v-btn fab absolute small
-          style="top:1.2em; right:2em;"
+          style="top:1.2em; right:1.3em;"
           color="primary"
           v-if="!snapshotnav"
           @click="snapshotnav=!snapshotnav">
@@ -162,6 +162,10 @@ body,
   opacity: 1;
   font-weight: 900;
 }
+
+h4 {
+  margin-bottom: 0.8em;
+}
 </style>
 
 <script>
@@ -194,7 +198,7 @@ export default {
       legend: [],
       municipalityName: '',
       snapshotsExamples: [],
-      snapshotnav: true,
+      snapshotnav: this.getInitialSnapshotnav(),
       mapinfoopen: true
     };
   },
@@ -220,6 +224,16 @@ export default {
   },
 
   methods: {
+    getInitialSnapshotnav() {
+      if (this.$route.params.hash) {
+        console.log(this.$vuetify.breakpoint.name);
+        if (this.$vuetify.breakpoint.name === 'lg') {
+          return true;
+        }
+        return false;
+      }
+      return true;
+    },
     async getSnapshot(hash) {
       const result = await this.$apollo.query({
         query: gql`query getsnapshot($hash: ID!) {
@@ -293,8 +307,8 @@ export default {
       this.geojson = result.data.municipality.perimeter;
       this.geobounds = result.data.municipality.perimeterBounds;
       this.snapshotsExamples = result.data.snapshots.edges;
-      this.$store.commit('setBfsnumber', result.data.snapshot.bfsNumber);
-      this.$store.commit('setBfsname', result.data.snapshot.fullname);
+      this.$store.commit('setBfsnumber', result.data.municipality.bfsNumber);
+      this.$store.commit('setBfsname', result.data.municipality.fullname);
     },
 
     createFeatureLayer(geojson) {
@@ -353,9 +367,9 @@ export default {
         });
       } else if (this.bfsNumber) { // empty municipality
         this.geojson.coordinates.forEach((polygon) => {
-          this.map.addLayer(L.polygon(polygon));
+          this.map.addLayer(L.polygon(polygon, { color: '#543076' }));
         });
-        this.map.addLayer(L.mapbox.styleLayer('mapbox://styles/gemeindescan/ck6qnoijj28od1is9u1wbb3vr'));
+        this.map.addLayer(L.mapbox.styleLayer('mapbox://styles/gemeindescan/ck6rp249516tg1iqkmt48o4pz'));
       }
       L.control.scale({
         metric: true,

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`from django.views.decorators.csrf import csrf_exempt`
`6`	`6`
`7`	`7`	`urlpatterns = [`
`8`		`- path('admin/', admin.site.urls),`
	`8`	`+ path('gmanage/', admin.site.urls),`
`9`	`9`	`path('graphql/', csrf_exempt(GraphQLView.as_view(graphiql=True))),`
`10`	`10`	`]`
`11`	`11`