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

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

 Conflicts:
	skolehjem/database/seeds/ContactSeeder.php
This commit is contained in:
frederikpyt 2020-08-05 13:30:32 +02:00
parent 76bea82eea 121476de60
commit 9b631843b0
8 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skolehjem/database/seeds/ContactSeeder.php
View File

@ -22,7 +22,7 @@ class ContactSeeder extends Seeder
[ [
'contactname' => "Birgitte True", 'contactname' => "Birgitte True",
'email' => "bit@sde.dk", 'email' => "bit@sde.dk",
'title' => "", 'title' => "Erhverskollegie Sekretær",
'phone' => "63126715", 'phone' => "63126715",
'phonetimes' => "<p><strong>Mandag-Torsdag:</strong> 8.00-15.00<br><strong>Fredag:</strong> 8.00-12.00</p>", 'phonetimes' => "<p><strong>Mandag-Torsdag:</strong> 8.00-15.00<br><strong>Fredag:</strong> 8.00-12.00</p>",
], ],

4
skolehjem/database/seeds/UserSeeder.php
View File

@ -35,8 +35,8 @@ class UserSeeder extends Seeder
Log::debug("OPRET"); Log::debug("OPRET");
$user = new \App\User(); $user = new \App\User();
$user->name_first = "admin"; $user->name_first = "Admin";
$user->name_last = "admin"; $user->name_last = "Admin";
$user->email = "admin@admin.local"; $user->email = "admin@admin.local";
$user->setPasswordAttribute("1234"); $user->setPasswordAttribute("1234");
$user->phone = 12345678; $user->phone = 12345678;

BIN
skolehjem/public/images/icons/Instagram.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 475 KiB

BIN
skolehjem/public/images/icons/facebook-icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
skolehjem/public/images/icons/instagram.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 58 KiB

BIN
skolehjem/public/images/icons/yt.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

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

@ -6,7 +6,7 @@
<link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}"> <link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
</head> </head>
<body> <body>
<header class="row align-items-center"> <header class="row align-items-center" id="header">
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" onclick="location.href = '{{ route("root.index") }}';" alt="Syddansk Erhvervsskole"> <img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" onclick="location.href = '{{ route("root.index") }}';" alt="Syddansk Erhvervsskole">
<button class="ml-auto" id="toggle"> <button class="ml-auto" id="toggle">
<i id="icon" class="fas fa-bars"></i> <i id="icon" class="fas fa-bars"></i>

3
skolehjem/resources/views/app/users/index.blade.php
View File

@ -10,7 +10,6 @@
<a href="{{ route('phones.index') }}" class="block text-center mb-1">Vagttelefon</a> <a href="{{ route('phones.index') }}" class="block text-center mb-1">Vagttelefon</a>
<a href="{{ route('guides.index') }}" class="block text-center mb-1">Vejledninger</a> <a href="{{ route('guides.index') }}" class="block text-center mb-1">Vejledninger</a>
</div> </div>
<!--
<div class="row" style="align-self: center; margin: 8px 0 8px 0;"> <div class="row" style="align-self: center; margin: 8px 0 8px 0;">
<a href="https://www.facebook.com" target="_blank" class="link"> <a href="https://www.facebook.com" target="_blank" class="link">
<img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook"> <img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
@ -21,7 +20,7 @@
<a href="https://www.instagram.com" target="_blank" class="link"> <a href="https://www.instagram.com" target="_blank" class="link">
<img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram"> <img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
</a> </a>
</div>--> </div>
</main> </main>
@endsection @endsection