From 539c474a06d2ef0b14515ab227a67b5dccdf9a20 Mon Sep 17 00:00:00 2001
From: Arthur Danjou <arthurdanjou@outlook.fr>
Date: Sat, 17 Apr 2021 13:24:37 +0200
Subject: [PATCH] Fix form fill

---
 src/assets/css/style.scss      |  1 -
 src/components/ContactForm.vue | 64 ++++++++++++++++++++++++++++++++--
 src/pages/contact.vue          | 41 ----------------------
 src/pages/projects.vue         |  2 +-
 4 files changed, 62 insertions(+), 46 deletions(-)

diff --git a/src/assets/css/style.scss b/src/assets/css/style.scss
index 69163c6..b3c1df6 100644
--- a/src/assets/css/style.scss
+++ b/src/assets/css/style.scss
@@ -14,7 +14,6 @@ body {
 }
 
 * {
-  @apply select-none outline-none;
   font-family: 'Raleway', sans-serif;
 }
 
diff --git a/src/components/ContactForm.vue b/src/components/ContactForm.vue
index 0d69d3d..6f3498f 100644
--- a/src/components/ContactForm.vue
+++ b/src/components/ContactForm.vue
@@ -8,6 +8,7 @@
         <div class="form-div lg:w-1/2 mb-8 lg:mb-0">
           <input
             id="name"
+            v-model="form.name"
             required
             type="text"
             placeholder=" "
@@ -18,6 +19,7 @@
         <div class="form-div lg:w-1/2">
           <input
             id="email"
+            v-model="form.email"
             required
             type="email"
             placeholder=" "
@@ -29,6 +31,7 @@
       <div class="form-div w-full mb-8 lg:mb-12">
         <input
           id="subject"
+          v-model="form.subject"
           required
           type="text"
           placeholder=" "
@@ -39,6 +42,7 @@
       <div class="form-div w-full">
           <textarea
             id="content"
+            v-model="form.content"
             required
             placeholder=" "
             class="form-input w-full"
@@ -48,17 +52,71 @@
         <label for="content" class="form-label">{{ $t('contact.form.content') }}</label>
       </div>
     </form>
+    <div v-if="error" class="mt-4 px-3 py-1 rounded-full bg-red-300 font-bold text-black">
+      {{ $t('contact.form.error') }}
+    </div>
+    <div v-if="success" class="mt-4 px-3 py-1 rounded-full bg-green-300 font-bold text-black">
+      {{ $t('contact.form.success') }}
+    </div>
     <div class="my-12">
-      <div class="font-bold px-6 py-3 border-2 rounded-full border-indigo-600 text-indigo-600 hover:(bg-indigo-600 text-white) hover:dark:text-black duration-300 cursor-pointer">
+      <button :disabled="!isSendable" @click.prevent="handleForm" class="font-bold px-6 py-3 border-2 rounded-full border-indigo-600 text-indigo-600 hover:(bg-indigo-600 text-white) hover:dark:text-black duration-300 cursor-pointer">
         {{ $t('contact.form.submit') }}
-      </div>
+      </button>
     </div>
   </section>
 </template>
 
 <script lang="ts">
+import {computed, ref, useContext} from "@nuxtjs/composition-api";
+import {Form} from "../../@types/types";
+
 export default {
-  name: "ContactForm"
+  name: "ContactForm",
+  setup() {
+    const error = ref(false)
+    const success = ref(false)
+
+    const {$axios} = useContext()
+    const form = ref<Form>({} as Form)
+    const handleForm = async () => {
+      await $axios.post('form',
+        {
+          email: form.value.email,
+          name: form.value.name,
+          content: form.value.content,
+          subject: form.value.subject
+        })
+        .then(() => {
+          success.value = true
+          setTimeout(() => {
+            success.value = false
+            form.value = {} as Form
+          }, 5000)
+        }).catch(() => {
+          error.value = true
+          setTimeout(() => {
+            error.value = false
+          }, 5000)
+        })
+    }
+
+    const isSendable = computed(() => {
+      const {email, name, content, subject} = form.value
+      return isNotEmpty(email) && isNotEmpty(name) && isNotEmpty(content) && isNotEmpty(subject)
+    })
+
+    const isNotEmpty = (object: string | undefined) => {
+      return object !== undefined && object.length > 0 && object !== "" && object !== ''
+    }
+
+    return {
+      error,
+      success,
+      isSendable,
+      form,
+      handleForm
+    }
+  }
 }
 </script>
 
diff --git a/src/pages/contact.vue b/src/pages/contact.vue
index dce8dd0..01e73f7 100644
--- a/src/pages/contact.vue
+++ b/src/pages/contact.vue
@@ -59,50 +59,9 @@ export default {
       }
     })
 
-    const error = ref(false)
-    const success = ref(false)
-
-    const {$axios} = useContext()
-    const form = ref<Form>({} as Form)
-    const handleForm = async () => {
-      await $axios.post('subscribers',
-        {
-          email: form.value.email,
-          name: form.value.name,
-          content: form.value.content,
-          subject: form.value.subject
-        })
-        .then(() => {
-          success.value = true
-          setTimeout(() => {
-            success.value = false
-            form.value = {} as Form
-          }, 5000)
-        }).catch(() => {
-          error.value = true
-          setTimeout(() => {
-            error.value = false
-          }, 5000)
-        })
-    }
-
-    const isSendable = computed(() => {
-      const {email, name, content, subject} = form.value
-      return isNotEmpty(email) && isNotEmpty(name)
-    })
-
-    const isNotEmpty = (object: string | undefined) => {
-      return object !== undefined && object.length > 0 && object !== "" && object !== ''
-    }
-
     return {
       info,
       getColor,
-      handleForm,
-      success,
-      error,
-      form,
-      isSendable
     }
   }
 }
diff --git a/src/pages/projects.vue b/src/pages/projects.vue
index dbfdc5c..1f71a83 100644
--- a/src/pages/projects.vue
+++ b/src/pages/projects.vue
@@ -12,7 +12,7 @@
       <h1 class="text-gray-700 dark:text-gray-400 text-xl mt-4">{{ $t('projects.description') }}</h1>
       <div class="flex flex-col items-center md:items-start md:flex-row flex-wrap w-full space-y-3 md:space-y-0">
         <div class="flex py-8 w-full flex-wrap" >
-          <div class="md:mx-3 my-2 w-full" v-for="project in projects">
+          <div class="md:mx-3 my-2 w-full xl:w-auto" v-for="project in projects">
             <Project
               :title="project.title"
               :cover="project.cover"