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

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

 Conflicts:
	skolehjem/resources/lang/dk/msg.php
	skolehjem/resources/lang/en/msg.php
This commit is contained in:
frederikpyt 2020-08-12 13:10:37 +02:00
parent 4a8b22d6dd 6671cd6aa8
commit e06504b5fb
6 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
skolehjem/app/Http/Controllers/AboutController.php Normal file
View File

@ -0,0 +1,14 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
class AboutController extends Controller
{
public function index(Request $request)
{
return Response::detect("about.index");
}
}

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

@ -51,7 +51,8 @@ return[
"indstillinger" => "Indstillinger",
"ændrebillede" => "Skift billede",
"ændrer" => "Skift",
"profilbillede" => "Upload profil billede"
"profilbillede" => "Upload profil billede",
"omkring" => "Omkring",

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

@ -60,5 +60,6 @@ return[
"indstillinger" => "Settings",
"ændrebillede" => "Change picture",
"ændrer" => "Change",
"profilbillede" => "Upload profile picture"
"profilbillede" => "Upload profile picture",
"Omkring" => "About",
];

10
skolehjem/resources/views/app/about/index.blade.php Normal file
View File

@ -0,0 +1,10 @@
@extends("app.layout.base")
@section("title")
Aktiviteter
@endsection
@section("content")
<main>
<h1 class="text-center sde-blue mb-0" style="margin-bottom: 2rem">{{ __('msg.omkring') }}</h1>
</main>
@endsection

4
skolehjem/resources/views/app/layout/base.blade.php
View File

@ -71,6 +71,10 @@
<img src="{{URL::asset('/images/icons/settings-hvid.svg')}}" alt="Indstillinger">
{{ __('msg.indstillinger') }}
</a>
<a href="{{ route('about.index') }}">
<img src="{{URL::asset('/images/icons/Logout.svg')}}" alt="Omkring">
{{ __('msg.omkring') }}
</a>
<a href="{{ route('users.logout') }}">
<img src="{{URL::asset('/images/icons/Logout.svg')}}" alt="Logud">
{{ __('msg.logud') }}

1
skolehjem/routes/web.php
View File

@ -33,6 +33,7 @@ Route::get("/washing-reservationsapi", "WashingReservationController@api")->name
Route::get("/app/washing-reservations", "WashingReservationController@appindex")->name("washing-reservations.appindex");
Route::get("/settings", "SettingsController@index")->name("settings.index");
Route::post("/events/signup", "UserEventController@createajax")->name("userevents.createajax");
Route::get("/about", "AboutController@index")->name("about.index");
//Search/Filter