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

Browse Source
This commit is contained in:
victor
2020-11-27 11:27:47 +01:00
parent 520aa99ff5 3bf8329434
commit a082ac9cea
69 changed files with 810 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/app/about/index.blade.php
+6 -8
View File
@@ -4,17 +4,15 @@
@endsection
@section("content")
<main style="justify-content: unset">
<h1 class="text-center sde-blue mb-0" style="margin-bottom: 2rem">{{ __('msg.omkring') }}</h1>
<main class="justify-unset">
<h1 class="text-center sde-blue mb-2rem">{{ __('msg.omkring') }}</h1>
<h4 class="mb-0 mt-1">Version:</h4>
<p>1.0</p>
<h4 class="mb-0 mt-1">{{__("msg.omappen")}}:</h4>
<p>{{__("msg.infoomappen")}}</p>
<!--<h4 class="mb-1 mt-1">{{__("msg.programmedby")}}:</h4>
<span style="margin-bottom: 0.2rem;"><span style="float: left;">Anders Rasmussen,</span><span style="float: right;">anders164a@gmail.com</span></span>
<span style="margin-bottom: 0.2rem;">Frederik Milling Pytlick,<span style="float: right;">frederikpyt@gmail.com</span></span>
<span style="margin-bottom: 0.2rem;">Vedran Zelen,<span style="float: right;">zelenvedran@gmail.com</span></span>
<span style="margin-bottom: 0.2rem;">Victor Neerholt,<span style="float: right;">victorneerholt@gmail.com</span></span>
<span style="margin-bottom: 0.2rem;">Sebastian Davaris,<span style="float: right;">sebastian@davaris.dk</span></span>-->
<!--{{__("msg.programmedby")}}:</h4>
Anders Rasmussen, Anders164a@gmail.com
Frederik Milling Pytlick, Frederikpyt@gmail.com
Victor Neerholt, Victorneerholt@gmail.com-->
</main>
@endsection
skolehjem/resources/views/app/contacts/index.blade.php
+1 -1
View File
@@ -4,7 +4,7 @@
@endsection
@section("content")
<main style="justify-content: unset">
<main class="justify-unset">
<h1 class="text-center sde-blue mt-0 mb-0">{{__('msg.kontakter')}}</h1>
@if(!$contacts->isEmpty())
@foreach($contacts as $contact)
skolehjem/resources/views/app/events/index.blade.php
+16 -31
View File
@@ -14,21 +14,15 @@
width: auto;
heigt: auto;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
}
div.header {
background-color: #00788a;
color: white;
padding: 8px;
font-size: 10px;
text-align: center;
border-radius: 10px;
}
div.container {
padding: 8px;
text-align: justify;
line-height: 1.5;
}
ol {
padding-right: 8px;
.header > img {
border-radius: 10px 10px 0px 0px
}
/*Alert box*/
.alert {
@@ -61,7 +55,7 @@
</style>
<main>
<h1 class="text-center sde-blue mb-0" style="margin-bottom: 2rem">{{ __('msg.aktiviteter') }}</h1>
<h1 class="text-center sde-blue mb-2rem">{{ __('msg.aktiviteter') }}</h1>
<!--Alert box, display when a event is delete: start-->
@if(count(\App\Notification::query()->where("user_id", "=", auth()->user()->id)->get()) > 0)
<div class="alertBoxBackground" id="notifications">
@@ -81,39 +75,30 @@
@foreach($events as $event)
<div class="card">
@if($event->resource_id !== null)
<div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $event->resource_id)->first()->filename) }}');">
<h3 style="text-shadow: 2px 2px 2px #00788A;">{{ $event->name }}</h3>
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{__('msg.af')}}: {{ $event->accountable }}</p>
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
</div>
@else
<div class="header">
<h3>{{ $event->name }}</h3>
<p class="text-center mt-0">Af: {{ $event->accountable }}</p>
<p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
<img class="w-100" src="{{ asset(\App\Resource::query()->where("id", "=", $event->resource_id)->first()->filename) }}">
</div>
@endif
<div class="container" style="margin-top: 8px;">
{!! \App\Helpers::closetags(substr($event->description, 0, 300) )!!}
<input type="hidden" name="event_id" value="{{ $event->id }}">
{!! session()->get('error#' . $event->id) !!}
{!! session()->get('signup#' . $event->id) !!}
<div class="row" style="justify-content: space-between; margin-top: 16px;">
<div class="container" class="mt-1">
<p class="m-none">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
<h4 class="m-none">{{ $event->name }}</h4>
<p class="mt-0">{{__('msg.af')}}: {{ $event->accountable }}</p>
<div class="row justify-content-space mt-1">
@if (count(\App\UserEvent::query()->where('event_id', '=', $event->id)->where('user_id', '=', Auth::user()->id)->get()) > 0)
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.afmeld')}}</a>
<a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.afmeld')}}</a>
@else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}}
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.tilmeld')}}</a>
<a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.tilmeld')}}</a>
@endif
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="{{route("events.show", ["event" => $event->id ])}}">{{__('msg.læsmere')}}</a>
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="{{route("events.accountsignups", ["event" => $event->id ])}}">{{__('msg.sedeltagere')}}</a>
<a class="sde-blue text-center m-none p-none bold" href="{{route("events.show", ["event" => $event->id ])}}">{{__('msg.læsmere')}}</a>
<a class="sde-blue text-center m-none p-none bold" href="{{route("events.accountsignups", ["event" => $event->id ])}}">{{__('msg.sedeltagere')}}</a>
</div>
</div>
</div>
@endforeach
@else
<p class="text-center" style="margin-bottom: auto">{{__('msg.dereringenaktiviteter')}}!</p>
<p class="text-center mb-auto">{{__('msg.dereringenaktiviteter')}}!</p>
@endif
<a href="{{ route("userevents.index") }}" style="margin-top: auto" class="mt-2 btn text-center btn-sde-blue" id="tilmeld">{{__('msg.setilmeldteaktiviteter')}}</a>
<a href="{{ route("userevents.index") }}" class="mt-auto btn text-center btn-sde-blue" id="tilmeld">{{__('msg.setilmeldteaktiviteter')}}</a>
<div id="snackbar"></div>
</main>
@endsection
skolehjem/resources/views/app/events/show.blade.php
+3 -7
View File
@@ -9,19 +9,15 @@
iframe, .ql-video {
width: 100%;
}
h2, h3, h4 {
margin-top: 0;
}
</style>
<main>
<h1 style="margin-bottom: 2rem" class="text-center sde-blue mt-0">{{__('msg.aktiviteter')}}</h1>
<div style="padding: 4px; margin-top: .25rem; text-align: justify; ">
<h1 class="text-center sde-blue mt-0 mb-2rem">{{__('msg.aktiviteter')}}</h1>
<div>
<h2 class="text-center sde-blue mt-0 mb-1">{{ $event->name }}</h2>
<p class="text-center mt-0">{{__('msg.af')}}: {{ $event->accountable }}</p>
<p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
{!!$event->description!!}
</div>
<button style="margin-top: auto" onclick="window.history.back()" class="btn btn-sde-blue text-white mb-1 mt-1" >{{__('msg.tilbage')}}</button>
<button onclick="window.history.back()" class="btn btn-sde-blue text-white mb-1 mt-auto" >{{__('msg.tilbage')}}</button>
</main>
@endsection
skolehjem/resources/views/app/events/signups.blade.php
+3 -3
View File
@@ -51,12 +51,12 @@
}
</style>
<main style="min-height: calc(100% - 61.3px)">
<table class="tbl" style="margin: 2rem 8px 0px 8px; width: calc(100% - 16px);">
<table class="tbl mt-2rem mr-1 mb-0 ml-1" style="width: calc(100% - 16px);">
@if(count($events) == 0)
<p class="text-center mt-2">{{__('msg.ingentilmeldte')}}</p>
@else
<tr>
<th style="text-align: center;">{{ __('msg.tilmeldtesnavn') }}</th>
<th class="text-center">{{ __('msg.tilmeldtesnavn') }}</th>
</tr>
@endif
@foreach($events as $UE)
@@ -67,6 +67,6 @@
@endif
@endforeach
</table>
<button onclick="document.location = document.referrer;" style="margin-top: auto; margin-bottom: 8px;" class="btn btn-sde-blue text-white">{{ __('msg.tilbage') }}</button>
<button onclick="document.location = document.referrer;" class="btn btn-sde-blue text-white mb-1 mt-auto">{{ __('msg.tilbage') }}</button>
</main>
@endsection
skolehjem/resources/views/app/events/yourevents.blade.php
+11 -11
View File
@@ -33,7 +33,7 @@
</style>
<main>
<h1 class="text-center sde-blue mb-0" style="margin-bottom: 2rem">{{__('msg.tilmeldteaktiviteter')}}</h1>
<h1 class="text-center sde-blue mb-2rem">{{__('msg.tilmeldteaktiviteter')}}</h1>
{!! session()->get('eventunsubscribed') !!}
@if(!$userevents->isEmpty())
@foreach($userevents as $userevent)
@@ -42,10 +42,10 @@
@method("delete")
<div class="card">
@if($userevent->resource_id !== null)
<div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $userevent->resource_id)->first()->filename) }}');">
<h3 style="text-shadow: 2px 2px 2px #00788A;">{{ $userevent->name }}</h3>
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{__('msg.af')}}: {{ $userevent->accountable }}</p>
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p>
<div class="header bs-cover bp-center" style="background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $userevent->resource_id)->first()->filename) }}');">
<h3 class="event-text-shadow">{{ $userevent->name }}</h3>
<p class="event-text-shadow text-center mt-0">{{__('msg.af')}}: {{ $userevent->accountable }}</p>
<p class="event-text-shadow text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p>
</div>
@else
<div class="header">
@@ -55,14 +55,14 @@
</div>
@endif
<div class="container">
<div class="row" style="justify-content: space-between;">
<div class="row justify-content-space">
@if (count(\App\UserEvent::query()->where('event_id', '=', $userevent->id)->where('user_id', '=', Auth::user()->id)->get()) > 0)
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="javascript:void(0);" onclick="ajaxCall({{ $userevent->id }}, this)" id="t">{{__('msg.afmeld')}}</a>
<a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $userevent->id }}, this)" id="t">{{__('msg.afmeld')}}</a>
@else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}}
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="javascript:void(0);" onclick="ajaxCall({{ $userevent->id }}, this)" >{{__('msg.tilmeld')}}</a>
<a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $userevent->id }}, this)" >{{__('msg.tilmeld')}}</a>
@endif
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="{{route("events.show", ["event" => $userevent->id ])}}">{{__('msg.læsmere')}}</a>
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="{{route("events.accountsignups", ["event" => $userevent->id ])}}">{{__('msg.sedeltagere')}}</a>
<a class="sde-blue text-center m-none p-none bold" href="{{route("events.show", ["event" => $userevent->id ])}}">{{__('msg.læsmere')}}</a>
<a class="sde-blue text-center m-none p-none bold" href="{{route("events.accountsignups", ["event" => $userevent->id ])}}">{{__('msg.sedeltagere')}}</a>
</div>
</div>
</div>
@@ -71,7 +71,7 @@
@else
<p class="text-center">{{__('msg.duharikketilmeldtdignogenaktiviteter')}}!</p>
@endif
<a onclick="window.history.back()" type="submit" style="margin-top: auto" class="mt-2 btn text-center btn-sde-blue">{{__('msg.tilbage')}}</a>
<a onclick="window.history.back()" type="submit" class="mt-auto btn text-center btn-sde-blue">{{__('msg.tilbage')}}</a>
<div id="snackbar"></div>
</main>
@endsection
skolehjem/resources/views/app/feedbacks/create.blade.php
+2 -7
View File
@@ -5,13 +5,8 @@
@endsection
@section("content")
<style>
textarea {
color: black;
}
</style>
<main style="min-height: calc(100% - 61.34px)" class="text-center">
<div method="post" style="margin-top: 4rem; margin-bottom: auto; max-width: 100%; padding: 0 0.45rem 0 0.45rem; display: flex; flex-direction: column; justify-content: center;">
<div method="post" class="mt-3 mb-auto d-flex flex-column pl-1 pr-1">
@csrf
<span>{{__("msg.risros")}}</span>
<select id="suggestion_form" name="suggestion_form" class="mb-2" required>
@@ -20,7 +15,7 @@
<option value="Andet">{{__("msg.andet")}}</option>
</select>
<span>{{__("msg.besked")}}:</span>
<textarea id="message" name="message" placeholder="{{__("msg.besked")}}" style="resize: vertical;" required></textarea>
<textarea class="text-black resize-vertical" id="message" name="message" placeholder="{{__("msg.besked")}}" required></textarea>
<button onclick="ajaxCall(document.getElementById('suggestion_form'), document.getElementById('message'))" class="btn btn-sde-blue mt-2">{{__("msg.send")}}</button>
</div>
<div id="snackbar"></div>
skolehjem/resources/views/app/guides/index.blade.php
+9 -24
View File
@@ -32,18 +32,9 @@
div.container {
padding: 8px;
text-align: justify;
line-height: 1.5;
}
ol {
padding-right: 8px;
}
input, select {
/* margin-bottom: 0;*/
}
.select2-container--default .select2-results > .select2-results__options {
max-height: 120px !important;
}
@@ -51,10 +42,6 @@
.select2-results__option, .select2-search__field {
color: black;
}
.justify-content-center {
justify-content: center;
}
</style>
<script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-beta.1/dist/css/select2.min.css" rel="stylesheet" />
@@ -66,11 +53,11 @@
});
</script>
<main style="min-height: calc(100% - 61.34px);">
<h1 class="text-center sde-blue mt-0" style="margin-bottom: 2rem;">{{__('msg.vejledning')}}</h1>
<h1 class="text-center sde-blue mt-0 mb-2rem">{{__('msg.vejledning')}}</h1>
@if(!$guides->isEmpty())
@if (count(\App\GuidesCategory::query()->get()) > 1)
<h4 class="mt-0 mb-0">{{ __("msg.kategorier") }}</h4>
<select id="categorySelect" class="js-example-basic-single" name="state" style="margin-bottom: 2rem !important;">
<select id="categorySelect" class="js-example-basic-single mb-2rem" name="state">
<option value="All" selected>{{ __("msg.allekategorier") }}</option>
@foreach (\App\GuidesCategory::query()->get() as $Category)
<option value="{{ $Category->id }}">{{ $Category->guidesCategoryName }}</option>
@@ -82,29 +69,27 @@
@foreach($guides as $guide)
<div class="card">
@if($guide->resource_id !== null)
<div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $guide->resource_id)->first()->filename) }}');">
<div class="header bs-cover bp-center" style="background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $guide->resource_id)->first()->filename) }}');">
</div>
@else
<div class="header d-flex justify-content-center">
<img src="{{ asset('/images/icons/image.svg') }}" style="width: calc(100% - 20px)">
<img alt="Image" src="{{ asset('/images/icons/image.svg') }}" style="width: calc(100% - 20px)">
</div>
@endif
<div class="container">
<div class="row" style="justify-content: center;">
<div class="container w-100">
<div class="row justify-content-center">
<h4>{{ $guide->name}}</h4>
</div>
<div class="row" style="justify-content: center;">
<a style="margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="{{route("guides.show", ["guide" => $guide->id ])}}">{{__('msg.læsmere')}}</a>
<div class="row justify-content-center">
<a class="text-center m-none p-none bold sde-blue" href="{{route("guides.show", ["guide" => $guide->id ])}}">{{__('msg.læsmere')}}</a>
</div>
</div>
</div>
@endforeach
</div>
@else
<p style="margin: 0 18px; margin-bottom: auto; text-align: center">{{__('msg.dereringenvejledninger')}}.</p>
<p class="mb-auto text-center">{{__('msg.dereringenvejledninger')}}.</p>
@endif
<button onclick="window.history.back()" style="margin-top: auto;" class="btn btn-sde-blue text-white mb-1 mt-1" >{{__('msg.tilbage')}}</button>
</main>
<script>
skolehjem/resources/views/app/guides/show.blade.php
+4 -10
View File
@@ -5,18 +5,12 @@
@endsection
@section("content")
<style>
h2, h3, h4 {
margin-top: 0;
}
</style>
<main>
<h1 style="margin-bottom: 2rem" class="text-center sde-blue mt-0">{{__('msg.vejledning')}}</h1>
<div style="padding: 4px; margin-top: .25rem; text-align: justify; ">
<h2 class="text-center sde-blue mt-0">{{ $guide->name }}</h2>
{!!$guide->guide_articles!!}
<div>
<h2 class="text-center sde-blue">{{ $guide->name }}</h2>
{!!$guide->guide_articles!!}
</div>
<button style="margin-top: auto" onclick="window.history.back()" class="btn btn-sde-blue text-white mb-1 mt-1" >{{__('msg.tilbage')}}</button>
<button onclick="window.history.back()" class="btn btn-sde-blue text-white mb-1 mt-auto" >{{__('msg.tilbage')}}</button>
</main>
skolehjem/resources/views/app/layout/base.blade.php
+3 -4
View File
@@ -42,14 +42,14 @@
</script>
</head>
<body onresize="setMain()" onload="setMain();">
<header class="row align-items-center" id="header" style="position: fixed; z-index: 100; top: 0; width: calc(100% - 1.75rem - 1.75rem); background: #00788a; transition: top 0.3s;">
<header class="row align-items-center position-fixed top-0 zindex-100 bg-sde-blue" id="header" style="width: calc(100% - 1.75rem - 1.75rem); transition: top 0.3s;">
@if(request()->cookie("mode") == "dark")
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" onclick="location.href = '{{ route("root.index") }}';" alt="Syddansk Erhvervsskole">
@else
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" onclick="location.href = '{{ route("root.index") }}';" alt="Syddansk Erhvervsskole">
@endif
<button class="ml-auto btn-sde-blue" style="border: none; font-size: 20px; outline: none;" id="toggle">
<i id="icon" class="fas fa-bars" style="color: white;"></i>
<button class="ml-auto btn-sde-blue font-20px border-none outline-none" id="toggle">
<i id="icon" class="fas fa-bars text-white"></i>
</button>
</header>
<div class="d-none bg-sde-blue col" id="menu">
@@ -176,7 +176,6 @@
}
document.getElementsByTagName("main")[0].style.paddingTop = (10+document.getElementById("header").clientHeight) + "px";
//document.getElementById("menu").style.paddingTop = document.getElementById("header").clientHeight + "px";
</script>
</body>
</html>
skolehjem/resources/views/app/menuplans/index.blade.php
+1 -1
View File
@@ -7,7 +7,7 @@
<?php
$Week = date('W'); //Current week
?>
<main style="justify-content: unset">
<main class="justify-unset">
@if($menuPlans->contains('week', $Week)) {{-- If any of the menues in the menu table has the number of the week in the 'week' column, do this --}}
@foreach($menuPlans as $menuplan)
@if($menuplan->week == $Week)
skolehjem/resources/views/app/news/index.blade.php
+2 -2
View File
@@ -120,7 +120,7 @@
</style>
<main style="justify-content: unset; padding: 0">
<main class="justify-unset p-none">
<?php
date_default_timezone_set('Europe/Copenhagen');
?>
@@ -204,7 +204,7 @@
<span class="createdat">{{__('msg.opret')}}{{ date('Y-m-d H:i:s', strtotime($new->created_at))}}</span>
</div>
@if($new->resource_id !== null)
<div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $new->resource_id)->first()->filename) }}');"></div>
<div class="header bs-cover bp-center" style="background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $new->resource_id)->first()->filename) }}');"></div>
<div class="information">{{__('msg.kategori')}} <span class="dot"></span> {{\App\GuidesCategory::query()->where('id', '=', \App\Guide::query()->where('id','=', $new->arrangement_id)->first()->guide_category_id)->first()->guidesCategoryName}}</div>
@endif
skolehjem/resources/views/app/settings/index.blade.php
+9 -9
View File
@@ -66,31 +66,31 @@
}
</style>
<script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
<main style="justify-content: unset">
<main class="justify-unset">
<label for="langu" class="mt-2">Sprog / Languages:</label>
<select name="langName" id="lang">
@if(request()->cookie('languagesSetting') == "dk")
<option style="color: black;" selected name="langDK" value="dk">Dansk</option>
<option class="text-black" selected name="langDK" value="dk">Dansk</option>
@else
<option style="color: black;" name="langDK" value="dk">Dansk</option>
<option class="text-black" name="langDK" value="dk">Dansk</option>
@endif
@if(request()->cookie('languagesSetting') == "en")
<option selected style="color: black;" name="langEN" value="en">English</option>
<option selected class="text-black" name="langEN" value="en">English</option>
@else
<option name="langEN" style="color: black;" value="en">English</option>
<option name="langEN" class="text-black" value="en">English</option>
@endif
</select>
<label for="dark">Tema / Theme:</label>
<select name="light" id="darkmode">
@if(request()->cookie('mode') == "light")
<option selected name="ligthmode" style="color: black;" value="Light">{{ __("msg.lys") }}</option>
<option selected name="ligthmode" class="text-black" value="Light">{{ __("msg.lys") }}</option>
@else
<option name="light" style="color: black;" value="light">{{ __("msg.lys") }}</option>
<option name="light" class="text-black" value="light">{{ __("msg.lys") }}</option>
@endif
@if(request()->cookie('mode') == "dark")
<option selected name="darkmode" style="color: black;" value="dark">{{ __("msg.mørk") }}</option>
<option selected name="darkmode" class="text-black" value="dark">{{ __("msg.mørk") }}</option>
@else
<option name="dark" style="color: black;" value="dark">{{ __("msg.mørk") }}</option>
<option name="dark" class="text-black" value="dark">{{ __("msg.mørk") }}</option>
@endif
</select>
<label for="dark">E-mail Notifikationer / E-mail Notifications:</label>
skolehjem/resources/views/app/users/account.blade.php
+4 -4
View File
@@ -6,15 +6,15 @@
@section("content")
<script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
<main style="justify-content: unset">
<main class="justify-unset">
<h1 class="text-center sde-blue mt-1">{{__('msg.konto')}}</h1>
@if(\App\Resource::query()->where("id", "=", Auth::user()->resource_id)->first() !== null)
<img style="width: calc(100% - 72px); margin: auto;" src="{{ \App\Resource::query()->where("id", "=",Auth::user()->resource_id)->first()->filename }}">
<img class="m-auto" style="width: calc(100% - 72px);" src="{{ \App\Resource::query()->where("id", "=",Auth::user()->resource_id)->first()->filename }}">
@else
@if(request()->cookie("mode") == "dark")
<img style="width: calc(100% - 72px); margin: auto;" src="{{ asset("/images/icons/user-hvid.svg") }}">
<img class="m-auto" style="width: calc(100% - 72px);" src="{{ asset("/images/icons/user-hvid.svg") }}">
@else
<img style="width: calc(100% - 72px); margin: auto;" src="{{ asset("/images/icons/user.svg") }}">
<img class="m-auto" style="width: calc(100% - 72px);" src="{{ asset("/images/icons/user.svg") }}">
@endif
@endif
<h4 class="mt-2">{{__('msg.navn')}}: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}</h4>
skolehjem/resources/views/app/users/edit.blade.php
+1 -1
View File
@@ -5,7 +5,7 @@
@endsection
@section("content")
<main style="justify-content: unset">
<main class="justify-unset">
<h1 class="text-center sde-blue mt-1">{{__('msg.konto')}}</h1>
<form method="post" action="{{ route("users.accountupdate", ['user' => Auth::user()]) }}" onsubmit="return checkInputs()">
@csrf
skolehjem/resources/views/app/users/editpass.blade.php
+2 -2
View File
@@ -5,7 +5,7 @@
@endsection
@section("content")
<main style="justify-content: unset">
<main class="justify-unset">
<h1 class="text-center sde-blue mt-1">{{__('msg.konto')}}</h1>
<form method="post" action="{{ route("users.accountupdate", ['user' => Auth::user()]) }}">
@csrf
@@ -27,7 +27,7 @@
</div>
{!! session()->get('error#notsamepass') !!}
{!! session()->get('error#oldpass') !!}
<button type="submit" style="margin-top: auto;" class="btn text-center btn-sde-blue mt-1">{{__('msg.rediger')}}</button>
<button type="submit" class="btn text-center btn-sde-blue mt-auto">{{__('msg.rediger')}}</button>
<a onclick="window.history.back()" class="btn text-center btn-sde-blue mt-1">{{__('msg.tilbage')}}</a>
</form>
skolehjem/resources/views/app/users/editpic.blade.php
+4 -4
View File
@@ -5,19 +5,19 @@
@endsection
@section("content")
<main style="justify-content: unset">
<main class="justify-unset">
<h1 class="text-center sde-blue mt-1">{{__('msg.konto')}}</h1>
<form method="post" action="{{ route("users.accountupdate", ['user' => Auth::user()]) }}" enctype="multipart/form-data">
@csrf
@method("put")
@if(\App\Resource::query()->where("id", "=", Auth::user()->resource_id)->first() !== null)
<img style="width: calc(100% - 72px); margin: auto;" src="{{ \App\Resource::query()->where("id", "=",Auth::user()->resource_id)->first()->filename }}">
<img class="m-auto" style="width: calc(100% - 72px);" src="{{ \App\Resource::query()->where("id", "=",Auth::user()->resource_id)->first()->filename }}">
@else
@if(request()->cookie("mode") == "dark")
<img style="width: calc(100% - 72px); margin: auto;" src="{{ asset("/images/icons/user-hvid.svg") }}">
<img class="m-auto" style="width: calc(100% - 72px);" src="{{ asset("/images/icons/user-hvid.svg") }}">
@else
<img style="width: calc(100% - 72px); margin: auto;" src="{{ asset("/images/icons/user.svg") }}">
<img class="m-auto" style="width: calc(100% - 72px);" src="{{ asset("/images/icons/user.svg") }}">
@endif
@endif
skolehjem/resources/views/app/users/forgot.blade.php
+1 -1
View File
@@ -5,7 +5,7 @@
@endsection
@section("content")
<main style="background-color: #00788a; height: 100%;">
<main class="h-100 bg-sde-blue">
<div class="brand">
<img src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" alt="Syddansk Erhvervsskole">
</div>
skolehjem/resources/views/app/users/index.blade.php
-40
View File
@@ -1,40 +0,0 @@
@extends('app.layout.base')
@section('content')
<p>/skolehjem-webapp/skolehjem/resources/views/app/users/index.blade.php</p>
<!--Kan i huske at vi nogen gange så det gammel gui, ja det er så det her-->
<!--
<main id="main" style="justify-content: space-between;">
<div class="d-flex col block-container mt-2">
<a href="{{ route('menu-plans.index') }}" class="block text-center mb-1">{{ __('msg.menuplan') }}</a>
<a href="{{ route('events.index') }}" class="block text-center mb-1">{{ __('msg.aktiviteter') }}</a>
<a href="{{ route('washing-reservations.appindex') }}" class="block text-center mb-1">{{ __('msg.reservationer') }}</a>
<a href="{{ route('contacts.index') }}" class="block text-center mb-1">{{ __('msg.kontoret') }}</a>
<a href="{{ route('phones.index') }}" class="block text-center mb-1">{{ __('msg.vagttelefon') }}</a>
<a href="{{ route('guides.index') }}" class="block text-center mb-1">{{ __('msg.vejledning') }}</a>
</div>
<div class="row" style="align-self: center; margin: 8px 0 8px 0;">
<a href="https://www.facebook.com" target="_blank" class="link">
<img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
</a>
<a href="https://www.youtube.com" target="_blank" class="link">
<img src="{{ URL::asset('/images/icons/yt.png') }}" class="h-100" alt="Youtube">
</a>
<a href="https://www.instagram.com" target="_blank" class="link">
<img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
</a>
</div>
</main>-->
@endsection
@section('scripts')
<script>
function mainHeight() {
document.getElementById('main').style.height = (window.innerHeight - document.getElementById('header').clientHeight) + "px";
}
window.onresize = mainHeight;
mainHeight();
</script>
@endsection
skolehjem/resources/views/app/users/login.blade.php
+3 -3
View File
@@ -5,7 +5,7 @@
@endsection
@section("content")
<main style="background-color: #00788a; height: 100%;">
<main class="bg-sde-blue h-100">
<!--Make the app open in fullscreen-->
<link rel="stylesheet" type="text/css" href="/../../../css/addtohomescreen.css">
<script src="/../../../js/addtohomescreen.js"></script>
@@ -18,7 +18,7 @@
<input class="appinput" type="email" name="email" placeholder="Email" required>
<div class="input-group text-left">
<input type="password" class="appinput form-control" name="password" id="password" placeholder="Password" required>
<span class="fa fa-fw fa-eye field-icon toggle-password" id="fa-password" onclick="show('password', 'fa-password')" style="background-color: #00788a; color: white;"></span>
<span class="fa fa-fw fa-eye field-icon toggle-password bg-sde-blue text-white" id="fa-password" onclick="show('password', 'fa-password')"></span>
</div>
<label class="toggle">
<input class="toggle__input" type="checkbox" name="rememberpassword">
@@ -30,7 +30,7 @@
{!! session()->get('error#wrongcredentials') !!}
{!! session()->get('success#loggedout') !!}
<input class="btn btn-dark" type="submit" value="Sign in">
<button type="button" class="btn btn-dark" onclick="location.href = '{{ route("users.signup") }}'" style="line-height: 2rem;">Register</button>
<button type="button" class="btn btn-dark lh-2" onclick="location.href = '{{ route("users.signup") }}'">Register</button>
</form>
<a class="text-white text-center" href="{{ route('users.show-forgot') }}">Forgot password?</a>
</main>
skolehjem/resources/views/app/users/register.blade.php
+1 -1
View File
@@ -5,7 +5,7 @@
@endsection
@section("content")
<main style="background-color: #00788a; height: 100%;">
<main class="bg-sde-blue h-100">
<div class="brand">
<img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" alt="Syddansk Erhvervsskole">
</div>
skolehjem/resources/views/app/users/signup.blade.php
+2 -15
View File
@@ -5,7 +5,7 @@
@endsection
@section("content")
<main style="background-color: #00788a; height: 100%;">
<main class="bg-sde-blue h-100">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<div class="brand">
<img src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" alt="Syddansk Erhvervsskole">
@@ -20,20 +20,7 @@
<input class="appinput" type="email" id="email" name="email" placeholder="E-mail" required>
<input class="appinput" type="password" pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" title="Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters" name="password" id="password1" placeholder="Password" required>
<input class="appinput" type="password" name="password2" id="password2" placeholder="Confirm password" required>
<input class="appinput" type="tel" id="phone" name="phone" placeholder="Phone number" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required style="margin-bottom: 1.5rem;">
<!--<label style="color: white">Education end date:</label>
<input class="appinput" type="date" name="eduenddate" placeholder="Education end date" required>-->
<!--Koncept-->
<!--<label style="color: white" for="edu">Education:</label>
<select style="color: white" name="edu" id="edu">
<option value="datapro">Datatekniker med programmering</option>
<option value="datainf">Datatekniker med infrastruktur</option>
<option value="dataits">Datatekniker med IT-Support</option>-->
<!--<option value="saab">Murer</option>
<option value="opel">Tømmer</option>
<option value="audi">Maler</option>-->
<!--</select>-->
<!--Koncept-->
<input class="appinput" type="tel" id="phone" name="phone" placeholder="Phone number" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required class="mb-2rem">
<input class="btn btn-dark" type="submit" id="disable" value="Sign up">
<input onclick="window.history.back()" class="btn btn-dark text-center " value="Back">
</form>
skolehjem/resources/views/app/vagttelefons/index.blade.php
+3 -3
View File
@@ -4,7 +4,7 @@
@endsection
@section("content")
<main style="justify-content: unset">
<main class="justify-unset">
<img class="mt-3" src="{{ URL::asset('/images/icons/Vagttelefon-normal.svg') }}" alt="Vagttelefon" style="height: 16vw;">
<h1 class="text-center sde-blue mt-0">{{__('msg.vagttelefon')}}</h1>
<p class="mt-0 mb-0">Den kan bruges i dagtimerne til almindelig kontakt om ting vedrørende kollegiet.</p>
@@ -17,8 +17,8 @@
<span class="toggle__text sde-blue semi-bold">{{__('msg.accepter')}}</span>
</span>
</label>
<span class="text-center sde-black-20 mt-2" style="margin-top: auto;">+45 24 62 94 50</span>
<a class="btn text-center btn-sde-blue btn-disabled" style="margin-bottom: 8px;" id="call">{{__('msg.ring')}}</a>
<span class="text-center sde-black-20 mt-auto">+45 24 62 94 50</span>
<a class="btn text-center btn-sde-blue btn-disabled mb-1" id="call">{{__('msg.ring')}}</a>
</main>
@endsection
skolehjem/resources/views/app/washing-reservations/create.blade.php
+1 -1
View File
@@ -10,7 +10,7 @@
color: black;
}
</style>
<main style="justify-content: unset">
<main class="justify-unset">
<h1 class="text-center sde-blue mb-0">{{__('msg.bookingliste')}}</h1>
{!! session()->get('ReservationExists') !!}
<div class="col w-100 mt-1">