Merge pull request #69 from Sanium/L-69

L-69 Szybkie aplikowanie
Sanium · May 18, 2020 · 1402ce4 · 1402ce4
2 parents aa79ff6 + 0fde78a
commit 1402ce4
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -10,6 +10,7 @@
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Illuminate\Routing\Redirector;
 
 class HomeController extends Controller
@@ -28,14 +29,24 @@ public function __construct()
     /**
      * Show the home page.
      *
-     * @return Renderable
+     * @return Renderable|RedirectResponse|Redirector|Response
      */
-    public function welcome(): Renderable
+    public function welcome()
     {
-        return view('welcome');
+        /** @var User $user */
+        $user = auth()->user();
+        if (null === $user) {
+            return view('welcome', [
+                'showForm' => true,
+            ]);
+        }
+
+        return view('welcome', [
+            'showForm' => !$user->isClient(),
+        ]);
     }
 
-    /**
+        /**
      * Show the application dashboard.
      *
      * @return Renderable|RedirectResponse|Redirector

diff --git a/app/Http/Controllers/JobOfferResponseController.php b/app/Http/Controllers/JobOfferResponseController.php
@@ -44,8 +44,10 @@ public function store(Request $request, Offer $offer)
                 $query->where('user_id', $user_id)->where('offer_id', $offer_id);
             })->limit(1)->get();
             if ($jor->isNotEmpty()) {
-                $request->session()->flash('status', __('You already respond to this offer..'));
-                return back();
+                $request->session()->flash('status', __('You already respond to this offer.'));
+                return $request->wantsJson()
+                    ? new Response(['error' => __('You already respond to this offer.')], 200)
+                    : back();
             }
             $jor = $offer->jobOfferResponses()->create([
                 'user_id' => $user->id,
@@ -62,7 +64,9 @@ public function store(Request $request, Offer $offer)
         }
         Mail::to($jor->offer->user)->queue(new JobOfferResponseMail($jor->name, $jor->email, $jor->links, $jor->getFile()));
         $request->session()->flash('status', __('Mail has been send.'));
-        return back();
+        return $request->wantsJson()
+            ? new Response(['ok' => __('Mail has been send.')], 200)
+            : back();
     }
 
     /**

diff --git a/resources/lang/pl.json b/resources/lang/pl.json
@@ -109,12 +109,14 @@
     "Offer :name will expire on :date.": "Oferta :name wygaśnie :date.",
     "You have been successfully verified.": "Zostałeś pomyślnie zweryfikowany.",
     "Hello :name, you has been successfully registered.": "Witaj :name, zostałeś pomyślnie zarejestrowany.",
+    "You already respond to this offer.": "Juz odpowiedziałeś na tę ofertę.",
     "Applications": "Zgłoszenia",
     "Date": "Data",
     "Download": "Pobierz",
     "User verified": "Użytkownik zweryfikowany",
     "Number of application": "Liczba zgłoszeń",
     "Your applications": "Twoje zgłoszenia",
     "You have canceled your application for position :name.": "Anulowałeś swoją aplikację na stanowisko :name.",
-    "Registration failed. Contact the administrator.": "Rejestracja nie udała się. Skontaktuj się z administratorem."
+    "Registration failed. Contact the administrator.": "Rejestracja nie udała się. Skontaktuj się z administratorem.",
+    "The given data was invalid.": "Podane dane były nieprawidłowe."
 }
diff --git a/resources/lang/pl/validation.php b/resources/lang/pl/validation.php
@@ -134,6 +134,7 @@
             'rule-name' => 'custom-message',
         ],
     ],
+    'The given data was invalid.' => 'Podane dane były nieprawidłowe.',
 
     /*
     |--------------------------------------------------------------------------

diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
@@ -18,6 +18,9 @@
 
     <!-- Scripts -->
     @yield('javascript')
+    <script>
+        window.showForm = {{ $showForm ? 'true' : 'false' }};
+    </script>
 
 </head>
 <body>