Merged in stage (pull request #28)

release 0.6.0

Author: yvess

django/Makefile

@@ -32,6 +32,9 @@ migrate:
 	$(DOCKER_EXEC) python3 manage.py migrate
 	make collectstatic
 
+createcachetable:
+	$(DOCKER_EXEC) python3 manage.py createcachetable
+
 tests:
 	$(DOCKER_EXEC) pytest --create-db
 
@@ -50,5 +53,6 @@ import-gemeinden-json:
 init:
 	make symlinks
 	make migrate
+	make createcachetable
 	make adminuser
 	make import-gemeinden-json

django/gsmap/models.py

@@ -15,6 +15,7 @@
 from django.core.files.base import ContentFile
 from django.core.files.storage import FileSystemStorage
 from django.utils.html import escape
+from django.db import transaction, DatabaseError
 from sortedm2m.fields import SortedManyToManyField
 from sorl.thumbnail import ImageField, get_thumbnail
 from gsuser.models import User
@@ -241,12 +242,18 @@ def test_exists(pk):
             else:
                 storage.delete(f'snapshot-meta/{self.id}.html')
 
-        super().save(*args, **kwargs)
+        try:
+            super().save(*args, **kwargs)
+        except DatabaseError:
+            transaction.rollback()
 
         if hasattr(settings, 'SAVE_SCREENSHOT_ENABLED') and settings.SAVE_SCREENSHOT_ENABLED is True:
             self.create_screenshot()
 
-        super().save(*args, **kwargs)
+        try:
+            super().save(*args, **kwargs)
+        except DatabaseError:
+            transaction.rollback()
 
     def create_screenshot(self):
         # only create snapshot if data changed

vue/src/assets/styles/main.css

@@ -87,4 +87,14 @@ a {
   padding-bottom: 6em;
 }
 
+.v-btn.nobg::before{
+  content: none;
+}
+.v-btn.nobg .v-icon{
+  transition: color 0.3s;
+}
+.v-btn.nobg:hover .v-icon{
+  color: #543076 !important;
+}
+
 /* SNAPSHOTS END */

vue/src/components/SnapshotList.vue

@@ -12,46 +12,61 @@
 <template>
   <v-list class="snapshotlist"
     three-line>
+      <div v-for="(snapshot, index) in groupedsnapshots" :key="snapshot.id">
+       <v-subheader
+        v-if="showTopic(index) && withTopic"
+        class="px-0">{{ snapshot.topic }}</v-subheader>
+      <v-list-item class="px-0 mb-4" dense
 
-      <v-list-item class="px-2 mb-4" dense
-        v-for="snapshot in snapshots" :key="snapshot.id"
         :to="createRouteLink(snapshot.pk)">
-          <v-list-item-avatar tile size="64" class="my-2">
+          <v-list-item-avatar tile size="64" class="my-0">
             <v-img
               v-if="snapshot.thumbnail"
               :src="djangobaseurl + '/media/' + snapshot.thumbnail">
             </v-img>
           </v-list-item-avatar>
           <v-list-item-content>
             <v-list-item-title style="font-weight:700">{{ snapshot.title }}</v-list-item-title>
-            <v-list-item-subtitle>{{ snapshot.topic }}</v-list-item-subtitle>
           </v-list-item-content>
-          <v-list-item-action style="margin:0 0 4px 0; align-self: flex-end;">
+          <v-list-item-action style="margin:0 0 4px 0; align-self: center;">
             <v-btn icon
+              class="nobg"
               v-if="snapshot.screenshot"
               v-on:click.stop="function(){}"
               :href="djangobaseurl + '/downloads/' + snapshot.screenshot">
                 <v-icon color="grey lighten-1" >mdi-download</v-icon>
             </v-btn>
           </v-list-item-action>
       </v-list-item>
+      </div>
   </v-list>
 </template>
 
 <style>
 .snapshotlist .v-list-item {
   background-color: #f8f8f8;
   border-radius: 4px;
+  overflow: hidden;
 }
 .snapshotlist .v-list-item,
 .snapshotlist .v-list-item__content {
-  min-height: 80px;
+  min-height: 64px;
 }
+
 .snapshotlist .v-list-item--active::before {
-  background-color: transparent;
+  background-color: #543076;
   border: 1px solid #000;
   border-radius: 4px;
 }
+
+.v-list-item__title {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  overflow: hidden;
+  white-space: initial;
+  text-overflow: ellipsis;
+}
 </style>
 
 
@@ -60,7 +75,8 @@ export default {
   name: 'SnapshotList',
   data() {
     return {
-      djangobaseurl: process.env.VUE_APP_DJANGOBASEURL
+      djangobaseurl: process.env.VUE_APP_DJANGOBASEURL,
+      groupedsnapshots: []
     };
   },
 
@@ -69,7 +85,11 @@ export default {
       type: String,
       default: ''
     },
-    snapshots: Array
+    snapshots: Array,
+    withTopic: {
+      type: Boolean,
+      default: true
+    }
   },
 
   methods: {
@@ -78,6 +98,32 @@ export default {
         return `/${this.$i18n.locale}/${this.workspaceHash}/${hash}/`;
       }
       return `/${this.$i18n.locale}/${hash}/`;
+    },
+    showTopic(curindex) {
+      if (curindex > 0) {
+        if (this.groupedsnapshots[curindex - 1].topic !== this.groupedsnapshots[curindex].topic) {
+          return true;
+        }
+        return false;
+      }
+      return true;
+    }
+  },
+  watch: {
+    snapshots(newsnaps) {
+      const topicgroups = {};
+      newsnaps.forEach((snapshot) => {
+        if (typeof (topicgroups[snapshot.topic]) === 'undefined') {
+          topicgroups[snapshot.topic] = [];
+        }
+        topicgroups[snapshot.topic].push(snapshot);
+      });
+
+      Object.keys(topicgroups).forEach((group) => {
+        topicgroups[group].forEach((snapshot) => {
+          this.groupedsnapshots.push(snapshot);
+        });
+      });
     }
   }
 };

vue/src/components/SnapshotMap.vue

@@ -62,6 +62,7 @@ body,
   position: relative;
   width: 100%;
   overflow: hidden;
+  background: #dedede;
 }
 
 #map .mapbox-improve-map {

vue/src/views/Snapshot.vue

@@ -66,7 +66,7 @@
 
         <snapshot-list
           v-if="snapshotsExamples"
-          :snapshots="snapshotsExamples"
+          :snapshots="snapshotsExamples" :withTopic="false"
         />
 
         <div class="useractions">