fix #106, fix #107, fix #110, fix #111, fix #112 (#131)

code4romania · Jul 25, 2023 · e69e831 · e69e831
1 parent ccf12d9
commit e69e831
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 28 deletions.
diff --git a/app/Http/Controllers/AdminBBTemporary.php b/app/Http/Controllers/AdminBBTemporary.php
@@ -50,10 +50,7 @@ public function faqs()
         $faqs = [
             'title' => 'Intrebări frecvente',
             'content' => '
-                    <p>Purus morbi dignissim senectus mattis adipiscing. Amet, massa quam varius orci dapibus volutpat cras. In amet eu ridiculus leo sodales cursus tristique. Tincidunt sed tempus ut viverra ridiculus non molestie. Gravida quis fringilla amet eget dui tempor dignissim. Facilisis auctor venenatis varius nunc, congue erat ac. Cras fermentum convallis quam.</p>
-                    <h3>What’s the best thing about Switzerland?</h3>
-                    <p>I dont know, but the flag is a big plus. Lorem ipsum dolor sit amet consectetur adipisicing elit. Quas cupiditate laboriosam fugiat.</p>
-                ',
+                    <p>Purus morbi dignissim senectus mattis adipiscing. Amet, massa quam varius orci dapibus volutpat cras. In amet eu ridiculus leo sodales cursus tristique. Tincidunt sed tempus ut viverra ridiculus non molestie. Gravida quis fringilla amet eget dui tempor dignissim. Facilisis auctor venenatis varius nunc, congue erat ac. Cras fermentum convallis quam.</p>',
             'faqs' => [
                 [
                     'title' => 'How do you make holy water?',

diff --git a/resources/js/Pages/AdminOng/Ong/EditOng.vue b/resources/js/Pages/AdminOng/Ong/EditOng.vue
@@ -436,6 +436,8 @@
     const clonedOrganization = ({...props.organization});
 
     const editField = () => {
+        console.log(form)
+
         form.put(route('admin.ong.update', form.id), {
             preserveScroll: true,
             onSuccess: () => {},
@@ -445,5 +447,7 @@
 
     const handleFileChange = (file) => {
         form.cover_image = file;
+
+        console.log(file)
     }
 </script>
diff --git a/resources/js/Pages/Public/Website/Contact.vue b/resources/js/Pages/Public/Website/Contact.vue
@@ -3,14 +3,14 @@
         <!-- Inertia page head -->
         <Head :title="$t('contact')" />
 
-        <div class="my-14 relative">
-            <div class="flex flex-col sm:flex-row gap-20 mx-auto max-w-5xl">
+        <div class="relative px-6 my-14 lg:px-0">
+            <div class="flex flex-col max-w-5xl gap-20 mx-auto sm:flex-row">
 
-                <div class="w-full sm:w-6/12 space-y-4">
-                    <h1 class="text-cyan-900 text-3xl font-bold">{{ $t('send_message') }}</h1>
-                    <p class="text-gray-500 font-medium text-sm">{{ $t('send_message_info') }}</p>
+                <div class="w-full space-y-4 sm:w-6/12">
+                    <h1 class="text-3xl font-bold text-cyan-900">{{ $t('send_message') }}</h1>
+                    <p class="text-sm font-medium text-gray-500">{{ $t('send_message_info') }}</p>
 
-                    <form @submit.prevent="contact" class="mt-2 space-y-6 pb-20">
+                    <form @submit.prevent="contact" class="pb-20 mt-2 space-y-6">
                         <!-- Name -->
                         <Input
                             class="w-full"
@@ -25,7 +25,7 @@
                         <!-- Email -->
                         <Input
                             class="w-full"
-                            :label="$t('project_name_label')"
+                            :label="$t('email')"
                             color="gray-700"
                             id="email"
                             type="email"
@@ -56,28 +56,28 @@
                     </form>
                 </div>
 
-                <div class="w-full sm:w-6/12 space-y-4">
-                    <h1 class="text-cyan-900 text-3xl font-bold">{{ $t('contact') }}</h1>
-                    <p class="text-gray-500 font-medium text-sm">{{ $t('contact_info') }}</p>
+                <div class="w-full space-y-4 sm:w-6/12">
+                    <h1 class="text-3xl font-bold text-cyan-900">{{ $t('contact') }}</h1>
+                    <p class="text-sm font-medium text-gray-500">{{ $t('contact_info') }}</p>
 
-                    <a href="mail:to" class="flex items-center gap-2 py-6 text-sm text-gray-500">
+                    <a href="mail:to[email protected]" class="flex items-center gap-2 py-6 text-sm text-gray-500">
                         <SvgLoader class="shrink-0" name="email" />
                         [email protected]
                     </a>
 
                     <div class="space-y-2">
-                        <p class="text-base text-primary-500 font-semibold">Los Angeles</p>
-                        <p class="text-gray-500 font-medium text-sm">4556 Brendan Ferry</p>
-                        <p class="text-gray-500 font-medium text-sm">Los Angeles, CA 90210</p>
+                        <p class="text-base font-semibold text-primary-500">Los Angeles</p>
+                        <p class="text-sm font-medium text-gray-500">4556 Brendan Ferry</p>
+                        <p class="text-sm font-medium text-gray-500">Los Angeles, CA 90210</p>
                     </div>
                 </div>
             </div>
 
-            <div class="hidden lg:block absolute bottom-0 left-0">
+            <div class="absolute bottom-0 left-0 hidden lg:block">
                 <SvgLoader class="shrink-0" name="pattern" />
             </div>
 
-            <div class="hidden lg:block absolute top-0 right-0">
+            <div class="absolute top-0 right-0 hidden lg:block">
                 <SvgLoader class="shrink-0" name="pattern" />
             </div>
         </div>
@@ -103,8 +103,6 @@
 
     /** Submit action. */
     const contact = () => {
-        // form.post(route('route'), {
-        //     onFinish: () => form.reset('password'),
-        // });
+        // form.post(route('route'), {});
     };
 </script>
diff --git a/resources/js/Pages/Public/Website/Faqs.vue b/resources/js/Pages/Public/Website/Faqs.vue
@@ -4,20 +4,44 @@
         <Head :title="$t('faqs_title')" />
 
         <div class="mx-auto mt-4 mb-10 space-y-6 p-9 max-w-7xl">
-            <h1 v-if="faqs?.title" class="text-2xl font-bold text-cyan-900">{{ faqs.title }}</h1>
-            <div v-if="faqs?.content" v-html="faqs.content" class="space-y-4 text-sm text-gray-500"></div>
-            <Faqs v-if="faqs?.faqs?.length" :data="faqs.faqs" />
+
+            <h1 v-if="faqs?.title" class="text-3xl font-bold text-cyan-900">{{ faqs.title }}</h1>
+            <div v-if="faqs?.content" v-html="faqs.content" class="space-y-4 text-base text-gray-500"></div>
+
+            <div class="relative bg-white z-101">
+                <Faqs v-if="faqs?.faqs?.length" :data="faqs.faqs" />
+            </div>
+
+            <div class="mt-12">
+                <p class="text-sm text-gray-500">{{ $t('need_help') }}</p>
+
+                <Link
+                    :href="route('contact')"
+                    class="inline-flex items-center justify-center gap-4 mt-4 rounded-md bg-primary-500 px-3.5 text-sm font-semibold text-white shadow-sm hover:bg-primary-400 py-2.5"
+                >
+                    {{ $t('contact_us') }}
+                </Link>
+            </div>
+
+            <div class="absolute left-0 z-0 hidden bottom-60 md:block" style="z-index: -1 !important;">
+                <SvgLoader class="shrink-0 fill-gray-200" name="dotted_square" />
+            </div>
+
+            <div class="absolute right-0 z-0 hidden top-32 md:block" style="z-index: -1 !important;">
+                <SvgLoader class="shrink-0 fill-gray-200" name="dotted_square" />
+            </div>
         </div>
     </PageLayout>
 </template>
 
 <script setup>
     /** Import from inertia. */
-    import { Head } from '@inertiajs/vue3';
+    import { Head, Link } from '@inertiajs/vue3';
 
     /** Import components. */
     import PageLayout from '@/Layouts/PageLayout.vue';
     import Faqs from '@/Components/faqs/Faqs.vue';
+    import SvgLoader from '@/Components/SvgLoader.vue';
 
     const props = defineProps({
         faqs: Object

diff --git a/resources/js/locales/ro.js b/resources/js/locales/ro.js
@@ -388,5 +388,6 @@ export default {
     "donate_for_good": "Donează pentru fapte bune",
     "project_categories": "Proiecte din categoria",
     "donation_period": "Perioada donatii",
-    "ong_description": "Descriere organizație"
+    "ong_description": "Descriere organizație",
+    "need_help": "Ai nevoie de ajutor în plus?"
 }