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

This commit is contained in:
Neerholt 2020-08-11 10:24:49 +02:00
parent 40b0c8c805 366f66215e
commit 7e985aef49
10 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
skolehjem/.env.example
View File

@ -1,6 +1,6 @@
APP_NAME=Laravel
APP_ENV=local
APP_KEY=
APP_KEY=base64:xxOWN1DEzzMxOUEi981cuqkLQs68/dnw2vmv4JtNXjA=
APP_DEBUG=true
APP_URL=http://localhost
@ -9,9 +9,9 @@ LOG_CHANNEL=stack
DB_CONNECTION=sqlite
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=laravel
DB_USERNAME=root
DB_PASSWORD=
DB_DATABASE=/home/frederikpyt/Documents/PhpstormProjects/skolehjem-webapp/skolehjem/database/laravel.sqlite
DB_USERNAME=phpstorm
DB_PASSWORD=12345
BROADCAST_DRIVER=log
CACHE_DRIVER=file
@ -44,3 +44,16 @@ PUSHER_APP_CLUSTER=mt1
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
LDAP_LOGGING=true
LDAP_CONNECTION=default
LDAP_HOST=127.0.0.1
LDAP_USERNAME="cn=user,dc=local,dc=com"
LDAP_PASSWORD=secret
LDAP_PORT=389
LDAP_BASE_DN="dc=local,dc=com"
LDAP_TIMEOUT=5
LDAP_SSL=false
LDAP_TLS=false
HTTPS_ONLY=false

4
skolehjem/public/js/jquery-3.2.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
skolehjem/resources/views/admin/layout/base.blade.php
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link type="text/css" rel="stylesheet" href="{{ mix("/css/admin.css") }}">
<script src="http://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
<script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
</head>
<body>
@yield("header")

2
skolehjem/resources/views/admin/locations/show.blade.php
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link type="text/css" rel="stylesheet" href="{{ mix("/css/admin.css") }}">
<script src="http://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
<script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
</head>
<body>
<header class="row align-items-center" style="background-color: #00788a;">

2
skolehjem/resources/views/admin/menuplans/index.blade.php
View File

@ -10,7 +10,7 @@
@endsection
@section("content")
<script src="http://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
<script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('menu-plans.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Menuplan</a>
</div>

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

@ -33,7 +33,7 @@
</style>
<main>
<h1 class="text-center sde-blue mb-0">{{ __('msg.aktiviteter') }}</h1>
<h1 class="text-center sde-blue mb-0" style="margin-bottom: auto">{{ __('msg.aktiviteter') }}</h1>
@if(!$events->isEmpty())
@foreach($events as $event)
<form method="get" action="{{ route("userevents.create") }}" id="form{{$event->id}}">
@ -57,8 +57,8 @@
</form>
@endforeach
@else
<p class="text-center">{{__('msg.dereringenaktiviteter')}}!</p>
<p class="text-center" style="margin-bottom: auto">{{__('msg.dereringenaktiviteter')}}!</p>
@endif
<a href="{{ route("userevents.index") }}" type="submit" class="mt-2 btn text-center btn-sde-blue" id="tilmeld">{{__('msg.setilmeldteaktiviteter')}}</a>
<a href="{{ route("userevents.index") }}" style="margin-top: auto" class="mt-2 btn text-center btn-sde-blue" id="tilmeld">{{__('msg.setilmeldteaktiviteter')}}</a>
</main>
@endsection

4
skolehjem/resources/views/app/feedbacks/create.blade.php
View File

@ -6,11 +6,11 @@
@section("content")
<main style="min-height: calc(100% - 61.34px)" class="text-center">
<form action="{{ action('FeedbackController@store') }}" method="post">
<form action="{{ action('FeedbackController@store') }}" method="post" style="margin-top: 4rem; margin-bottom: auto;">
@csrf
<span>Ris el. Ros?</span>
<select name="suggestion_form" class="mb-2" required>
<option>Ros</option>
<option selected>Ros</option>
<option>Ris</option>
</select>
<textarea name="message" placeholder="Skriv Ris/Ros besked her" style="resize: vertical;" required></textarea>

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

@ -47,7 +47,7 @@
</div>
@endforeach
@else
<p style="margin: 0 18px;">{{__('msg.dereringenvejledninger')}}.</p>
<p style="margin: 0 18px; margin-bottom: auto; text-align: 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>

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

@ -9,7 +9,7 @@
<link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
@endif
</head>
<body>
<body onresize="setMain()" onload="setMain()">
<header class="row align-items-center" id="header">
@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">
@ -107,5 +107,14 @@
};
</script>
@endif
<script type="text/javascript">
function setMain() {
var main = document.getElementsByTagName("main")[0];
var header = document.getElementsByTagName("header")[0];
main.style.minHeight = 'calc(100% - ' + header.clientHeight + 'px)';
}
</script>
</body>
</html>

2
skolehjem/resources/views/app/users/account.blade.php
View File

@ -5,7 +5,7 @@
@endsection
@section("content")
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
<main>
<h1 class="text-center sde-blue mt-0">{{__('msg.konto')}}</h1>
<h4 class="mt-0">{{__('msg.navn')}}: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}</h4>