From d04b18c19c4d8856431290c85b8c8afae2f71f27 Mon Sep 17 00:00:00 2001
From: ilmedova <milmedova96@gmail.com>
Date: Wed, 3 May 2023 11:18:52 +0500
Subject: [PATCH] fixed bugs

---
 .../Admin/AttenderCrudController.php          |   4 +++
 app/Http/Controllers/HomeController.php       |   2 +-
 app/Models/Attender.php                       |   3 +-
 ..._03_061520_add_city_to_attenders_table.php |  28 ++++++++++++++++++
 public/qr/6451fc89de083.png                   | Bin 0 -> 2353 bytes
 resources/views/emails/qr.blade.php           |   2 +-
 resources/views/signup.blade.php              |  18 +++++------
 7 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 database/migrations/2023_05_03_061520_add_city_to_attenders_table.php
 create mode 100644 public/qr/6451fc89de083.png

diff --git a/app/Http/Controllers/Admin/AttenderCrudController.php b/app/Http/Controllers/Admin/AttenderCrudController.php
index 99a3989..fa19552 100644
--- a/app/Http/Controllers/Admin/AttenderCrudController.php
+++ b/app/Http/Controllers/Admin/AttenderCrudController.php
@@ -45,6 +45,10 @@ protected function setupListOperation()
                 'name' => 'name',
                 'type' => 'text'
             ],
+            [
+                'name' => 'city',
+                'type' => 'text'
+            ],
             [
                 'name' => 'email',
                 'type' => 'email'
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 8007b63..b85f7b2 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -28,7 +28,7 @@ public function apply($id){
     }
 
     public function submit(Request $request){
-        $data = $request->only(['name', 'surname', 'email', 'file', 'organization', 'is_attending', 'consent_form', 'consent_form_second', 'consent_form_third']);
+        $data = $request->only(['name', 'city', 'email', 'file', 'organization', 'is_attending', 'consent_form', 'consent_form_second', 'consent_form_third']);
         $data['attended'] = 0;
         $data['is_attending'] = (bool)$data['is_attending'];
         $data['consent_form'] = $data['consent_form'] ?? false;
diff --git a/app/Models/Attender.php b/app/Models/Attender.php
index bdb26bb..2415f86 100644
--- a/app/Models/Attender.php
+++ b/app/Models/Attender.php
@@ -29,7 +29,8 @@ class Attender extends Model
         'attended',
         'consent_form',
         'consent_form_second',
-        'consent_form_third'
+        'consent_form_third',
+        'city'
     ];
     // protected $hidden = [];
     // protected $dates = [];
diff --git a/database/migrations/2023_05_03_061520_add_city_to_attenders_table.php b/database/migrations/2023_05_03_061520_add_city_to_attenders_table.php
new file mode 100644
index 0000000..8674f71
--- /dev/null
+++ b/database/migrations/2023_05_03_061520_add_city_to_attenders_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('attenders', function (Blueprint $table) {
+            $table->string('city')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('attenders', function (Blueprint $table) {
+            //
+        });
+    }
+};
diff --git a/public/qr/6451fc89de083.png b/public/qr/6451fc89de083.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1cc3713d897a8f001af81393787233f0ae2970b
GIT binary patch
literal 2353
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
BY&!q|

literal 0
HcmV?d00001

diff --git a/resources/views/emails/qr.blade.php b/resources/views/emails/qr.blade.php
index a4209c4..9ef16b3 100644
--- a/resources/views/emails/qr.blade.php
+++ b/resources/views/emails/qr.blade.php
@@ -49,7 +49,7 @@
                     <tr>
                         <td style="padding: 30px 0 0 20px;">
                             <p class="content_txt" style="font-size: 14px; font-weight: 400; line-height: 1.4; margin-bottom: 15px;">
-                                <b>Dear {{ $attender->name }} {{ $attender->surname }}! </b><br/>
+                                <b>Dear {{ $attender->name }}! </b><br/>
                                 Here is your QR code for your registered event!
                             </p>
                         </td>
diff --git a/resources/views/signup.blade.php b/resources/views/signup.blade.php
index 9161005..31d296e 100644
--- a/resources/views/signup.blade.php
+++ b/resources/views/signup.blade.php
@@ -31,13 +31,13 @@
                     </div>
 
                     <div>
-                        <label for="name"><b>Organization</b></label>
-                        <input type="text" id="name" name="ogranization">
+                        <label for="ogranization"><b>Organization</b></label>
+                        <input type="text" id="ogranization" name="ogranization">
                     </div>
 
                     <div>
-                        <label for="name"><b>City and country</b></label>
-                        <input type="text" id="name" name="name" required>
+                        <label for="city"><b>City and country</b></label>
+                        <input type="text" id="city" name="city" required>
                     </div>
 
                     <div>
@@ -87,17 +87,17 @@
                         <div style="width: 3%">
                             <input type="checkbox" name="consent_form" id="consent_form" style="display:block">
                         </div>
-                        <div style="width: 97%">
+                        <div style="width: 97%; padding: 15px">
                             <label for="consent_form">
                                 I consent that video(s) and/or photo(s) taken of me during the event/meeting, including web streaming and the recording of the event/meeting are used in EU communication activities including social media platforms.
                             </label>
                         </div>
                     </div>
                     <div class="pb-3" style="display: flex; width: 100%; align-items: center">
-                        <div style="width: 3%">
+                        <div style="width: 3%;">
                             <input type="checkbox" name="consent_form_second" id="consent_form_second" style="display:block">
                         </div>
-                        <div style="width: 97%">
+                        <div style="width: 97%; padding: 15px">
                             <label for="consent_form_second">
                                 I consent that my name and contact details are included in an established contact list shared internally among EEAS services for the purpose of promoting EU public diplomacy activities/events and disseminating information, including newsletters.
                             </label>
@@ -107,7 +107,7 @@
                         <div style="width: 3%">
                             <input type="checkbox" name="consent_form_third" id="consent_form_third" style="display:block">
                         </div>
-                        <div style="width: 95%">
+                        <div style="width: 97%; padding: 15px">
                             <label for="consent_form_third">
                                 I consent that my name and contact details are published in the list of participants of the event.
                             </label>
@@ -141,7 +141,7 @@
                         <!--Footer-->
                         <div class="flex justify-end pt-6">
                             <button type="submit" class="px-4 bg-transparent p-3 rounded-lg text-blue-500 hover:bg-gray-100 hover:text-blue-400 mr-2">Yes</button>
-                            <button class="modal-close px-4 bg-blue-500 p-3 rounded-lg text-white hover:bg-blue-400">No</button>
+                            <button type="button" class="modal-close px-4 bg-blue-500 p-3 rounded-lg text-white hover:bg-blue-400">No</button>
                         </div>
 
                     </div>