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

v1.4.9 - Fixed (most of) style in all documents

Browse Source
This commit is contained in:
Anders
2020-11-26 10:19:12 +01:00
parent f7f449f366
commit cd8fcb8cac
60 changed files with 21912 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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>