added previous_tags setting

app/Http/Controllers/UsersController.php

@@ -344,6 +344,19 @@ public function togglePrivacy (Request $request)
         $user->save();
     }
 
+    /**
+     * Toggle a Users tagging settings
+     */
+    public function toggleTagging (Request $request)
+    {
+        $user = Auth::user();
+
+        /* Whether to save the tags from a previous image */
+        $user->previous_tags = $request->previous_tags;
+
+        $user->save();
+    }
+
     /**
      * Log the user out
      */

resources/js/components/Litter/AddTags.vue

@@ -63,7 +63,6 @@
                     v-click-outside="clickOutsideTag"
                 />
             </div>
-
             <!-- Quantity -->
             <div class="select" id="int">
                 <select v-model="quantity">
@@ -72,11 +71,26 @@
             </div>
 
             <br><br>
+
+           <div v-if="show_previous_tags && Object.keys(previousTags).length > 0 && show_previous_tags">
+            <h1>{{ $t('tags.previous-tags') }}:</h1>
+                <div v-for="category in Object.keys(previousTags)">
+                    <p>{{ getCategoryName(category) }}</p>
 
-            <div v-if="Object.keys(recentTags).length > 0 && this.annotations !== true && this.id !== 0" class="mb-5">
+                    <transition-group name="list" class="recent-tags" tag="div" :key="category">
+                        <div
+                            v-for="tag in Object.keys(previousTags[category])"
+                            class="litter-tag"
+                            :key="tag"
+                            @click="addRecentTag(category, tag)"
+                        ><p>{{ getTagName(category, tag) }}</p></div>
+                    </transition-group>
+                </div>
+                <hr v-if="Object.keys(previousTags).length > 0">
+            </div>
 
+            <div v-if="Object.keys(recentTags).length > 0 && this.annotations !== true && this.id !== 0" class="mb-5">
                 <p class="mb-05">{{ $t('tags.recently-tags') }}</p>
-
                 <div v-for="category in Object.keys(recentTags)">
                     <p>{{ getCategoryName(category) }}</p>
 
@@ -90,7 +104,6 @@
                     </transition-group>
                 </div>
             </div>
-
             <div>
                 <button
                     :disabled="checkDecr"
@@ -109,7 +122,6 @@
                     @click="incr"
                 >+</button>
             </div>
-
             <br>
 
             <button
@@ -197,6 +209,11 @@ export default {
         };
     },
     computed: {
+
+        //whether the user wants to show previous tags. return type: boolean
+        show_previous_tags(){
+            return this.user.previous_tags == 1;
+        },
         /**
          * Litter tags for all categories, used by the Search field
          */
@@ -323,6 +340,14 @@ export default {
             return this.$store.state.litter.recentTags;
         },
 
+        /**
+         * The previous tags the user applied
+         */
+        previousTags ()
+        {
+            return this.$store.state.litter.previousTags;
+        },
+
         /**
          * Get / Set the current tag (category -> tag)
          */
@@ -352,6 +377,14 @@ export default {
                 };
             });
         },
+
+        /**
+         * Currently authenticated user
+         */
+        user ()
+        {
+            return this.$store.state.user.user;
+        },
     },
     methods: {
 
@@ -543,6 +576,7 @@ export default {
          */
         async submit ()
         {
+            // this.previousTags = (this.$store.state.litter.tags[this.id] || {});
             this.processing = true;
 
             let action = '';
@@ -561,7 +595,7 @@ export default {
             await this.$store.dispatch(action);
 
             this.processing = false;
-        }
+        },
     }
 };
 </script>

resources/js/langs/de/settings/common.json

@@ -8,6 +8,7 @@
     "littercoin": "Littercoin (LTRX)",
     "presence": "Presence",
     "emails": "Emails",
+    "tagging": "Tagging",
     "show-flag": "Show Flag",
     "teams": "Teams"
 }

resources/js/langs/de/settings/index.js

@@ -8,6 +8,7 @@ import password from './password.json'
 import payments from './payments.json'
 import presence from './presence.json'
 import privacy from './privacy.json'
+import tagging from './tagging.json'
 
 export const settings = {
     account,
@@ -19,5 +20,6 @@ export const settings = {
     password,
     payments,
     presence,
-    privacy
+    privacy,
+    tagging
 }

resources/js/langs/de/tags.json

@@ -1,6 +1,7 @@
 {
     "address": "Address",
     "add-tag": "Add Tag",
+    "previous-tags": "Previous Tags",
     "coordinates": "Coordinates",
     "device": "Device",
     "next": "Next Image",

resources/js/langs/en/notifications.json

@@ -2,6 +2,7 @@
     "success": "Success",
     "error": "Error!",
     "tags-added": "Success! Your tags have been added",
+    "tagging-updated": "Success! Tag settings have been changed",
     "subscription-cancelled": "Your subscription has been cancelled",
     "privacy-updated": "Your Privacy Settings have been saved",
     "litter-toggled": "Picked up value updated",

resources/js/langs/en/settings/common.json

@@ -9,5 +9,6 @@
     "presence": "Presence",
     "emails": "Emails",
     "show-flag": "Show Flag",
+    "tagging": "Tagging",
     "teams": "Teams"
 }

resources/js/langs/en/settings/index.js

@@ -8,6 +8,7 @@ import password from './password.json'
 import payments from './payments.json'
 import presence from './presence.json'
 import privacy from './privacy.json'
+import tagging from './tagging.json'
 
 export const settings = {
     account,
@@ -19,5 +20,6 @@ export const settings = {
     password,
     payments,
     presence,
-    privacy
+    privacy,
+    tagging
 }

resources/js/langs/en/settings/tagging.json

@@ -0,0 +1,4 @@
+{
+    "tagging": "Tagging",
+    "show-previous-tags": "Show previously used tags"
+}

resources/js/langs/en/tags.json

@@ -1,6 +1,7 @@
 {
     "address": "Address",
     "add-tag": "Add Tag",
+    "previous-tags": "Previous Tags",
     "coordinates": "Coordinates",
     "device": "Device",
     "next": "Next Image",

resources/js/langs/es/settings/common.json

@@ -9,5 +9,6 @@
     "presence": "Presencia",
     "emails": "Corres electrónicos",
     "show-flag": "Mostrar bandera",
+    "tagging": "Etiquetado",
     "teams": "Equipos"
 }

resources/js/langs/es/settings/index.js

@@ -8,6 +8,7 @@ import password from './password.json'
 import payments from './payments.json'
 import presence from './presence.json'
 import privacy from './privacy.json'
+import tagging from './tagging.json'
 
 export const settings = {
     account,
@@ -19,5 +20,6 @@ export const settings = {
     password,
     payments,
     presence,
-    privacy
+    privacy,
+    tagging
 }

resources/js/langs/es/settings/tagging.json

@@ -0,0 +1,4 @@
+{
+    "tagging": "etiquetado",
+    "show-previous-tags": "Mostrar etiquetas utilizadas anteriormente"
+}

resources/js/langs/es/tags.json

@@ -1,6 +1,7 @@
 {
     "address": "Dirección",
     "add-tag": "Añadir etiqueta",
+    "previous-tags": "etiquetas anteriores",
     "coordinates": "Coordenadas",
     "device": "Dispositivo",
     "next": "Imagen siguiente",

resources/js/langs/nl/settings/common.json

@@ -9,5 +9,6 @@
     "presence": "Aanwezigheid",
     "emails": "Emails",
     "show-flag": "Toon vlag",
-    "teams": "Teams"
+    "teams": "Teams",
+    "tagging": "Taggen"
 } 

resources/js/langs/nl/settings/index.js

@@ -8,6 +8,7 @@ import password from './password.json'
 import payments from './payments.json'
 import presence from './presence.json'
 import privacy from './privacy.json'
+import tagging from './tagging.json'
 
 export const settings = {
     account,
@@ -19,5 +20,6 @@ export const settings = {
     password,
     payments,
     presence,
-    privacy
+    privacy,
+    tagging
 }

resources/js/langs/nl/settings/tagging.json

@@ -0,0 +1,4 @@
+{
+    "tagging": "Taggen",
+    "show-previous-tags": "Eerder gebruikte tags weergeven"
+}

resources/js/langs/nl/tags.json

@@ -1,6 +1,7 @@
 {
     "address": "Locatie",
     "add-tag": "Label toevoegen",
+    "previous-tags": "vorige tags",
     "coordinates": "Coördinaten",
     "device": "Toestel",
     "next": "Volgende foto",

resources/js/langs/pl/settings/common.json

@@ -9,5 +9,6 @@
     "presence": "Obecność",
     "emails": "E-maile",
     "show-flag": "Pokaż flage",
-    "teams": "Drużyny"
+    "tagging": "Tagowanie",
+    "teams": "Tagowanie"
 }

resources/js/langs/pl/settings/index.js

@@ -8,6 +8,7 @@ import password from './password.json'
 import payments from './payments.json'
 import presence from './presence.json'
 import privacy from './privacy.json'
+import tagging from './tagging.json'
 
 export const settings = {
     account,
@@ -19,5 +20,6 @@ export const settings = {
     password,
     payments,
     presence,
-    privacy
+    privacy,
+    tagging
 }

resources/js/langs/pl/settings/tagging.json

@@ -0,0 +1,4 @@
+{
+    "tagging": "Tagowanie",
+    "show-previous-tags": "Pokaż poprzednio używane tags"
+}

resources/js/langs/pl/tags.json

@@ -1,6 +1,7 @@
 {
     "address": "Adres",
     "add-tag": "Dodaj tag",
+    "previous-tags": "poprzednie tag",
     "coordinates": "Współrzędne",
     "device": "Urządzenie",
     "next": "Następne zdjęcie",

resources/js/routes.js

@@ -171,6 +171,10 @@ const router = new VueRouter({
                     path: 'show-flag',
                     component: require('./views/settings/GlobalFlag').default,
                 },
+                {
+                    path: 'tagging',
+                    component: require('./views/settings/Tagging').default,
+                },
                 // {
                 // 	path: 'phone',
                 // 	component: require('./views/Phone').default

resources/js/store/modules/litter/init.js

@@ -7,5 +7,6 @@ export const init = {
     photos: {}, // paginated photos object
     tags: {}, // added tags go here -> { photoId: { smoking: { butts: 1, lighters: 2 }, alcohol: { beer_cans: 3 } }, ... };
     submitting: false,
-    recentTags: {}
+    recentTags: {},
+    previousTags: {}
 };

resources/js/store/modules/litter/mutations.js

@@ -61,6 +61,7 @@ export const mutations = {
      */
     clearTags (state, photoId)
     {
+        state.previousTags = state.tags[photoId] || {}
         if (photoId !== null) {
             delete state.tags[photoId];
         } else {