vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

This commit is contained in:
frederikpyt 2020-08-07 10:59:02 +02:00
parent b0eda7f8e7 e0b998dec0
commit c268440021
12 changed files with 75 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
skolehjem/app/Http/Controllers/EventController.php
View File

@ -71,9 +71,9 @@ class EventController extends Controller
$allEvents = Event::query()->where('name', '=', $request->name)->get();
if(count($allEvents) > 0)
if(count($allEvents) > 0) {
return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '<p><b>Der findes allerede et event med det navn!</b></p>');
else {
} else {
$event->save();
$events = Event::query()->paginate($request->input("limit", 20));

26
skolehjem/app/Http/Controllers/UserController.php
View File

@ -152,7 +152,7 @@ class UserController extends Controller
/** @var User $user */
$user->update($data);
} else // Else go back with an error message
return redirect()->route("users.edit", ['user' => $id])->with('error#notsamepass', '<p><b>Der stod ikke det samme i `Password` & `Confirm Password`!</b></p>');
return redirect()->route("users.edit", ['user' => $id])->with('error#notsamepass', '<p><b>Der stod ikke det samme i `Password` & `Bekræft Adgangskode`!</b></p>');
}
else { // If you haven't touched the password, then update everything else but password
$data = $request->only(['name_first', 'name_last', 'email', 'phone', 'roles']);
@ -211,13 +211,19 @@ class UserController extends Controller
return redirect()->route("root.index");
}
return redirect()->back(303)->with('error#wrongcredentials', '<p><b>Email eller Password matchede ikke!</b></p>');
if (request()->cookie('languagesSetting') == "dk")
return redirect()->back(303)->with('error#wrongcredentials', '<p class="text-center text-white"><b>Email eller Password matchede ikke!</b></p>');
if (request()->cookie('languagesSetting') == "en")
return redirect()->back(303)->with('error#wrongcredentials', '<p class="text-center text-white"><b>Wrong Email or Password!</b></p>');
}
public function logout(Request $request) {
Auth::logout();
return redirect()->route("users.login")->with('success#loggedout', '<p><b>Du er hermed logget ud!</b></p>');
if (request()->cookie('languagesSetting') == "dk")
return redirect()->route("users.login")->with('success#loggedout', '<p class="text-center text-white"><b>Du er hermed logget ud!</b></p>');
if (request()->cookie('languagesSetting') == "en")
return redirect()->route("users.login")->with('success#loggedout', '<p class="text-center text-white"><b>You are logged out!</b></p>');
}
/*******************************************/
@ -232,7 +238,7 @@ class UserController extends Controller
$user = User::query()->where('email', '=', $request->email)->first();
if($user == null){
return redirect()->back()->with('errornosuchuser', '<p>Denne email findes ikke i systemet!</p>');
return redirect()->back()->with('errornosuchuser', '<p class="text-center text-white"><b>Denne email findes ikke i systemet!</b></p>');
}
//Send email
@ -290,21 +296,33 @@ class UserController extends Controller
if ($request->input('password') != null) { // If you're editing the password
$data = $request->only(['name_first', 'name_last', 'email', 'phone', 'password']);
if ($request->input('password') != $request->input('confirmpassword')) { // If new password and new password confirm is not the same, go back with fail message.
if (request()->cookie('languagesSetting') == "dk")
return redirect()->route("users.accounteditpass")->with('error#notsamepass', '<p class="text-center"><b>Der stod ikke det samme i `Nyt Password` & `Confirm Password`!</b></p>');
elseif (request()->cookie('languagesSetting') == "en")
return redirect()->route("users.accounteditpass")->with('error#notsamepass', '<p class="text-center"><b>`New Password` & `Confirm Password` was not the same!</b></p>');
} elseif (!Hash::check($request->input('oldpassword'), $user->password)) { // If the written current password and current password in DB is not the same, go back with fail message.
if (request()->cookie('languagesSetting') == "dk")
return redirect()->route("users.accounteditpass")->with('error#oldpass', '<p class="text-center"><b>Det indtastede password i `Nuværende Password` er ikke dit nuværende password!</b></p>');
elseif (request()->cookie('languagesSetting') == "en")
return redirect()->route("users.accounteditpass")->with('error#oldpass', '<p class="text-center"><b>The entered `Current Password` was not the same as your current password!</b></p>');
} else { // If new password and current password is the same AND current written and current DB password is the same. Then update and logout.
/** @var User $user */
$user->update($data);
Auth::logout();
if (request()->cookie('languagesSetting') == "dk")
return redirect()->route("users.login")->with('success#passwordchange', '<p class="text-center text-white"><b>Dit password er hermed ændret!</b></p>');
elseif (request()->cookie('languagesSetting') == "en")
return redirect()->route("users.login")->with('success#passwordchange', '<p class="text-center text-white"><b>Your password was changed successfully!</b></p>');
}
} else { // Else if you're not editing the password but anything else (Email, Phone Number). Then update user.
$data = $request->only(['email', 'phone']);
$user->update($data);
if (request()->cookie('languagesSetting') == "dk")
return redirect()->route("users.account")->with('success#credentialschanged', '<p class="text-center"><b>Dine oplysninger er hermed ændret!</b></p>');
elseif (request()->cookie('languagesSetting') == "en")
return redirect()->route("users.account")->with('success#credentialschanged', '<p class="text-center"><b>Your information has changed!</b></p>');
}
$users = User::query()->paginate(20);

14
skolehjem/app/Http/Controllers/UserEventController.php
View File

@ -48,15 +48,22 @@ class UserEventController extends Controller
->where('event_id', $request->event_id)->get();
// If the row has both, then go back and show an error - Cause you're not allowed to be on the same event twice.
if (count($getTableInfo) > 0)
if (count($getTableInfo) > 0) {
if (request()->cookie('languagesSetting') == "dk")
return redirect()->route("events.index")->with('error#' . $request->event_id, '<p class="text-center"><b>Du har allerede tilmeldt dig denne Aktivitet!</b></p>');
if (request()->cookie('languagesSetting') == "en")
return redirect()->route("events.index")->with('error#' . $request->event_id, '<p class="text-center"><b>You are already participating in this event!</b></p>');
}
// If not, then it keeps going and saves and shows a success message
$UserEvent = new UserEvent($data);
$UserEvent->user_id = auth()->user()->id;
$UserEvent->save();
return redirect()->back();
if (request()->cookie('languagesSetting') == "dk")
return redirect()->route("events.index")->with('signup#' . $request->event_id, '<p class="text-center"><b>Du er hermed tilmeldt denne aktivitet!</b></p>');
if (request()->cookie('languagesSetting') == "en")
return redirect()->route("events.index")->with('signup#' . $request->event_id, '<p class="text-center"><b>You are now participating in this event!</b></p>');
}
/**
@ -76,7 +83,10 @@ class UserEventController extends Controller
$JoinedEvents = UserEvent::query()->join('events', 'events.id', '=', 'user_events.event_id')->where('user_id', "=", auth()->user()->id)->get();
if (request()->cookie('languagesSetting') == "dk")
return redirect()->route("userevents.index", [ "userevents" => $JoinedEvents ])->with('eventunsubscribed', '<p class="text-center"><b>Du er hermed afmeldt aktiviteten!</b></p>');
if (request()->cookie('languagesSetting') == "en")
return redirect()->route("userevents.index", [ "userevents" => $JoinedEvents ])->with('eventunsubscribed', '<p class="text-center"><b>You are no longer participating in this event!</b></p>');
}
public function show()

22
skolehjem/resources/lang/dk/msg.php
View File

@ -12,33 +12,37 @@ return[
"logud" => "Log ud",
"dereringenmenuplanerdenneuge" => "Der er ingen menuplaner denne uge",
"dereringenaktiviteter" => "Der er ingen aktiviteter",
"setilmeldteaktiviteter" => "Se tilmeldte aktiviteter",
"setilmeldteaktiviteter" => "Se Tilmeldte Aktiviteter",
"dinereservationer" => "Dine reservationer",
"duharingenreservationer" => "Du har ingen reservationer",
"reservervaskemaskine" => "Reserver vaskemaskine",
"kontakt" => "Kontakt",
"dereringenvaskemaskiner" => "Der er ikke nogen vaskemaskiner",
"lokation" => "Lokation",
"kontakter" => "Kontakt",
"navn" => "Navn",
"email"=> "E-mail",
"ring" => "Ring",
"givfeedback" => "Giv feedback",
"sendfeedback" => "Send feedback omkring hvem el. hvad som helst",
"accepterer" => "Accepterer",
"accepter" => "Accepter",
"dereringenvejledninger" => "Der er ingen vejledninger",
"telefon" => "Telefon",
"redigeroplysninger" => "Rediger Oplysninger",
"ændrepassword" => "Ænder Password",
"ændrepassword" => "Ændre Password",
"tilmeldteaktiviteter" => "Tilmeldte aktiviteter",
"tilmeld" => "Tilmeld",
"duharikketilmeldtdignogenaktiviteter" => "Du har ikke tilmeldt dig nogen aktiviteter",
"afmeld" => "Afmeld",
"tilbage" => "Tilbage",
"bookingliste" => "Bokking Liste",
"bookingliste" => "Booking Liste",
"ugestor" => "Uge",
"maskiner" => "Maskiner",
"maskiner" => "Vaskemaskiner",
"tilgængeligetider" => "Tilgængelige tider",
"reserver" => "Reserver",
"rediger" => "Rediger",
"nuværendepassword" => "Nuværende Password",
"nytpassword" => "Nyt password",
"confirmpassword" => "Gentag adgangskode",
"nuværendepassword" => "Nuværende Adgangskode",
"nytpassword" => "Ny Adgangskode",
"confirmpassword" => "Gentag Adgangskode",

18
skolehjem/resources/lang/en/msg.php
View File

@ -4,7 +4,7 @@ return[
"menuplan" => "Menu",
"aktiviteter" => "Activities",
"reservationer" => "Reservations",
"kontoret" => "The office",
"kontoret" => "The Bureau",
"vagttelefon" => "Emergency phone",
"vejledning" => "Guide",
"home" => "Home",
@ -19,11 +19,11 @@ return[
"ugestor" => "Week",
"dereringenaktiviteter" => "There is no activity this week",
"setilmeldteaktiviteter" => "See Registered Activities",
"tilmeld" => "Register Activities ",
"tilmeldteaktiviteter" => "Your Registered Activities",
"duharikketilmeldtdignogenaktiviteter" => "You have not signed up for any activities",
"afmeld" => "Cancel",
"tilbage" => "Go Back",
"dinereservationer" => "Your reservations",
"dinereservationer" => "Your Reservations",
"fjern" => "Remove",
"tid" => "Time",
"reservervaskemaskine" => "Reserve washing machine",
@ -31,9 +31,10 @@ return[
"bookingliste" => "Booking List",
"dereringenvaskemaskiner" => "There are no washing machines",
"tilgængeligetider" => "Available times",
"maskiner" => "Washing machine",
"reserver" => "Reserves",
"kontakt" => "Contacts",
"maskiner" => "Washing machines",
"reserver" => "Reserve",
"lokation" => "Location",
"kontakter" => "Contacts",
"navn" => "Name",
"email" => "E-mail",
"telefontid" => "Telephone hours",
@ -41,9 +42,9 @@ return[
"givfeedback" => "Feedback",
"sendfeedback" => "Send us feedback about what you like and what you don't like",
"dereringenkontakter" => "There are no contacts",
"accepterer" => "Accept",
"accepter" => "Accept",
"dereringenvejledninger" => "There are no guides",
"tilmelde" => "Participating",
"tilmeld" => "Participating",
"telefon" => "Phone",
"redigeroplysninger" => "Edit information",
"ændrepassword" => "Change Password",
@ -51,5 +52,4 @@ return[
"nuværendepassword" => "Current password",
"nytpassword" => "New password",
"confirmpassword" => "Confirm password",
];

4
skolehjem/resources/views/admin/users/create.blade.php
View File

@ -22,12 +22,12 @@
<input type="text" name="name_last" id="name_last" placeholder="Efternavn" required>
<label for="email">Email:</label>
<input type="email" name="email" id="email" placeholder="x@y.z" required>
<label for="password1">Password:</label>
<label for="password1">Adgangskode:</label>
<div class="input-group text-left">
<input type="password" class="form-control" name="password" id="password1" placeholder="******" required>
<span class="fa fa-fw fa-eye field-icon toggle-password" id="fa-new" onclick="show('password1', 'fa-new')"></span>
</div>
<label for="password2">Confirm Password:</label>
<label for="password2">Bekræft Adgangskode:</label>
<div class="input-group text-left">
<input type="password" class="form-control" name="password2" id="password2" placeholder="******" required>
<span class="fa fa-fw fa-eye field-icon toggle-password" id="fa-confirm" onclick="show('password2', 'fa-confirm')"></span>

2
skolehjem/resources/views/app/contacts/index.blade.php
View File

@ -5,7 +5,7 @@
@section("content")
<main>
<h1 class="text-center sde-blue mt-0 mb-0">{{__('msg.kontakt')}}</h1>
<h1 class="text-center sde-blue mt-0 mb-0">{{__('msg.kontakter')}}</h1>
@if(!$contacts->isEmpty())
@foreach($contacts as $contact)
<h4 class="mt-2">{{__('msg.navn')}}: {{ $contact->contactname }}</h4>

2
skolehjem/resources/views/app/events/index.blade.php
View File

@ -16,7 +16,7 @@
<input type="hidden" name="event_id" value="{{ $event->id }}">
{!! session()->get('error#' . $event->id) !!}
{!! session()->get('signup#' . $event->id) !!}
<button type="submit" class="btn text-center btn-sde-blue" id="tilmeld">{{__('msg.tilmelde')}}</button>
<button type="submit" class="btn text-center btn-sde-blue" id="tilmeld">{{__('msg.tilmeld')}}</button>
</form>
@endforeach
@else

2
skolehjem/resources/views/app/events/yourevents.blade.php
View File

@ -15,7 +15,7 @@
<h3 class="sde-blue bold text-center mb-0">{{$userevent->name}}</h3>
<p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p>
<p class="text-center">{!! $userevent->description !!}</p>
<button type="submit" class="btn text-center btn-sde-blue" onclick="return confirm('Are you sure you want to remove this event?');">Afmeld</button>
<button type="submit" class="btn text-center btn-sde-blue" onclick="return confirm('Are you sure you want to remove this event?');">{{__('msg.afmeld')}}</button>
</form>
@endforeach
@else

5
skolehjem/resources/views/app/users/forgot.blade.php
View File

@ -9,11 +9,12 @@
<div class="brand">
<img src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" alt="Syddansk Erhvervsskole">
</div>
<form action="" method="post">
<form action="{{ route('users.forgot') }}" method="post">
@csrf
<input class="appinput" type="email" name="email" placeholder="Email" required>
{!! session()->get('errornosuchuser') !!}
<input class="btn btn-dark" type="submit" value="Send reset mail">
<button class="btn btn-dark" onclick="window.location.href = '{{ route("users.login") }}';">Tilbage</button>
<a class="btn btn-dark text-center" href="{{ route("users.login") }}">Tilbage</a>
</form>
</main>
@endsection

2
skolehjem/resources/views/app/vagttelefons/index.blade.php
View File

@ -11,7 +11,7 @@
<label class="toggle">
<input class="toggle__input" type="checkbox" name="accept" id="input" onclick="check()">
<span class="toggle__label sde-blue">
<span class="toggle__text sde-blue semi-bold">{{__('msg.accepterer')}}</span>
<span class="toggle__text sde-blue semi-bold">{{__('msg.accepter')}}</span>
</span>
</label>
<span class="text-center sde-black-20 mt-2">+45 24 62 94 50</span>

2
skolehjem/resources/views/app/washing-reservations/create.blade.php
View File

@ -139,7 +139,7 @@
else {
let span = document.createElement("span");
span.classList.add("events__title");
span.innerText = "Lokation";
span.innerText = "{{__('msg.lokation')}}";
let select = document.createElement("select");
select.classList.add("events__title");