From 5183277554809d7c2ddcacc84cd1115eccfc36bd Mon Sep 17 00:00:00 2001
From: Ron Rise <ron@siteworxpro.com>
Date: Mon, 7 Aug 2023 20:55:32 -0400
Subject: [PATCH] REALLY FUCKING FIXED

---
 src/components/GunForm.vue | 32 +++++++++++++++++++++++++++-----
 src/pages/Add.vue          | 11 ++++++++---
 src/pages/Edit.vue         | 10 ++++++++--
 src/styles.css             |  6 +++++-
 4 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/src/components/GunForm.vue b/src/components/GunForm.vue
index c83cbf9..19c4b6a 100644
--- a/src/components/GunForm.vue
+++ b/src/components/GunForm.vue
@@ -62,22 +62,24 @@
             <Textarea v-model="gun.notes"/>
           </div>
         </div>
-        <div class="w-full mt-5">
+        <div class="w-full mt-5" v-if="gun.id">
           <div class="flex gap-2" style="flex-direction: column">
             <label for="value_amount">Photos</label>
             <FileUpload
-                :showUploadButton="gun.id === false"
                 :showCancelButton="false"
                 accept="image/*"
-                :multiple="gun.id === null"
+                multiple
+                :url="`${url}/gun/photo/${gun.id}`"
+                @upload="$emit('upload')"
             />
           </div>
         </div>
         <div class="w-full mt-5">
-          <Button @click="$emit('save')" class="p-button-success" icon="fa-sharp fa-light fa-floppy-disk" label="Save"/>
+          <Button :loading="loading" @click="$emit('save')" class="p-button-success" icon="fa-sharp fa-light fa-floppy-disk" label="Save"/>
           <router-link to="/guns">
             <Button class="p-button-warning ml-3" icon="fa-sharp fa-light fa-times" label="Cancel"/>
           </router-link>
+          <Button @click="deleteGun" v-if="gun.id" class="p-button-danger ml-3" icon="fa-sharp fa-light fa-trash" label="Delete"/>
         </div>
       </div>
     </template>
@@ -85,13 +87,33 @@
 
 </template>
 <script lang="ts">
-import {defineComponent} from "vue";
+import {defineComponent} from "vue"
+import axios from "axios"
 
 export default defineComponent({
   props: {
+    loading: {
+      type: Boolean,
+      default: () => {
+        return false
+      }
+    },
     gun: {
       type: Object,
       required: true
+    },
+  },
+  computed: {
+    url() {
+      return import.meta.env.VITE_API
+    }
+  },
+  methods: {
+    deleteGun() {
+      axios.delete(`${import.meta.env.VITE_API}/gun/${this.gun.id}`)
+          .then(() => {
+            this.$router.push('/guns')
+          })
     }
   }
 })
diff --git a/src/pages/Add.vue b/src/pages/Add.vue
index 66e65a4..4cb2fbf 100644
--- a/src/pages/Add.vue
+++ b/src/pages/Add.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="md:w-2/3">
-    <GunForm @save="save" :gun="gun" />
+    <GunForm :loading="loading" @save="save" :gun="gun" :photos="photos" />
   </div>
 </template>
 <script lang="ts">
@@ -11,6 +11,8 @@ import {Response} from "../types/Response";
 import GunForm from "../components/GunForm.vue";
 
 interface Data {
+  loading: boolean
+  photos: Array<File>
   gun: {
     make: string
     model: string
@@ -25,6 +27,7 @@ interface Data {
 export default defineComponent({
   components: {GunForm},
   data: (): Data => ({
+    loading: false,
     gun: {
       make: "",
       model: "",
@@ -33,12 +36,14 @@ export default defineComponent({
       value_amount: 0,
       date_purchased: "",
       notes: ""
-    }
+    },
+    photos: []
   }),
   methods: {
     save() {
+      this.loading = true
       axios.post(import.meta.env.VITE_API + '/gun', this.gun).then((r: Response<{ id: number }>) => {
-        this.$router.push('/gun/' + r.data.payload.id)
+        this.$router.push(`/edit/${r.data.payload.id}`)
       })
     }
   }
diff --git a/src/pages/Edit.vue b/src/pages/Edit.vue
index ae26c6d..79e8352 100644
--- a/src/pages/Edit.vue
+++ b/src/pages/Edit.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="w-full flex flex-row flex-wrap justify-around">
     <div class="w-full lg:w-1/2 m-5">
-      <GunForm @save="save" :gun="gun"/>
+      <GunForm @upload="getGun" v-if="gun" @save="save" :gun="gun"/>
     </div>
     <div class="mt-10 w-full lg:w-1/2 m-5">
       <Card>
@@ -16,7 +16,7 @@
                 {{ photo.file_name }}
               </a>
             </div>
-            <div>
+            <div @click="deletePhoto(photo.id)">
               <i style="color: red;" class="fa-regular fa-2x fa-trash"></i>
             </div>
           </div>
@@ -51,6 +51,12 @@ export default defineComponent({
     }
   },
   methods: {
+    deletePhoto(id: number) {
+      axios.delete(import.meta.env.VITE_API + `/gun/photo/${id}`)
+          .then(() => {
+            this.getGun()
+          })
+    },
     getGun() {
       axios.get(import.meta.env.VITE_API + `/gun/${this.$route.params.id}`)
           .then((r: Response<Guns>) => {
diff --git a/src/styles.css b/src/styles.css
index bd6213e..9411f32 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -1,3 +1,7 @@
 @tailwind base;
 @tailwind components;
-@tailwind utilities;
\ No newline at end of file
+@tailwind utilities;
+
+.p-button {
+    color: inherit;
+}
\ No newline at end of file