Revert "merge 1"

This reverts commit 0bc6c20a6d.

app/Http/Controllers/ApplicationController.php

@@ -23,15 +23,11 @@ namespace App\Http\Controllers;
 
 use App\Application;
 use App\Exceptions\ApplicationNotFoundException;
-use App\Exceptions\DiscordAccountRequiredException;
-use App\Exceptions\IncompatibleAgeException;
 use App\Exceptions\IncompleteApplicationException;
-use App\Exceptions\InvalidAgeException;
 use App\Exceptions\UnavailableApplicationException;
 use App\Exceptions\VacancyNotFoundException;
 use App\Facades\IP;
 use App\Services\ApplicationService;
-use App\Vacancy;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
@@ -86,13 +82,6 @@ class ApplicationController extends Controller
     }
 
 
-    public function discordApply(Request $request, $vacancySlug) {
-
-        $request->session()->put('discordApplicationRedirectedSlug', $vacancySlug);
-        return redirect(route('discordRedirect'));
-
-    }
-
     public function renderApplicationForm($vacancySlug)
     {
         try {
@@ -102,47 +91,25 @@ class ApplicationController extends Controller
             return redirect()
                 ->back()
                 ->with('error', $ex->getMessage());
-
-        } catch (DiscordAccountRequiredException $e) {
-            \Log::info('Redirecting user: ' . $e->getMessage(), [
-                'user' => Auth::user()->email
-            ]);
-
-            request()->session()->put('discordApplicationRedirectedSlug', $vacancySlug);
-            return redirect(route('discordRedirect'));
-        } catch (IncompatibleAgeException $e) {
-
-            return redirect()
-                ->to(route('dashboard'))
-                ->with('error', $e->getMessage());
-
-        } catch (InvalidAgeException $e) {
-
-            return view('dashboard.application-rendering.add-age');
         }
     }
 
     public function saveApplicationAnswers(Request $request, $vacancySlug)
     {
-        if (Auth::user()->isEligible()) {
-            try {
-                $this->applicationService->fillForm(Auth::user(), $request->all(), $vacancySlug);
+        try {
 
-            } catch (VacancyNotFoundException | IncompleteApplicationException | UnavailableApplicationException $e) {
+            $this->applicationService->fillForm(Auth::user(), $request->all(), $vacancySlug);
 
-                return redirect()
-                    ->back()
-                    ->with('error', $e->getMessage());
-            }
+        } catch (VacancyNotFoundException | IncompleteApplicationException | UnavailableApplicationException $e) {
 
             return redirect()
-                ->to(route('showUserApps'))
-                ->with('success', __('Thank you! Your application has been processed and our team will get to it shortly.'));
+                ->back()
+                ->with('error', $e->getMessage());
         }
 
         return redirect()
             ->to(route('showUserApps'))
-            ->with('error', __('Your account is not eligible to submit a new application.'));
+            ->with('success', __('Thank you! Your application has been processed and our team will get to it shortly.'));
     }
 
     public function updateApplicationStatus(Request $request, Application $application, $newStatus)