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

Conflicts: skolehjem/resources/views/app/layout/base.blade.php
2020-07-28 14:30:37 +02:00
parent c4e4d64014 63f2cc31d9
commit fd2184c654
17 changed files with 158 additions and 23 deletions
@@ -9,10 +9,16 @@
        <h1 class="text-center sde-blue mb-0">Aktiviteter</h1>
        @if(!$events->isEmpty())
            @foreach($events as $event)
+                <form method="get" action="{{ route("userevents.create") }}">
                    <h3 class="sde-blue bold text-center mb-0">{{$event->name}}</h3>
                    <p class="text-center mt-0">{{$event->date}}</p>
                    <p class="text-center">{{$event->description}}</p>
-                    <a class="btn text-center btn-sde-blue" id="tilmeld">Tilmeld</a>
+                    <input type="hidden" name="user_id" value="{{ Auth::user()->id }}">
+                    <input type="hidden" name="event_id" value="{{ $event->id }}">
+                    {!! session()->get('error#' . $event->id) !!}
+                    {!! session()->get('signup#' . $event->id) !!}
+                    <button type="submit" class="btn text-center btn-sde-blue" id="tilmeld">Tilmeld</button>
+                </form>
            @endforeach
        @else
            <p class="text-center">Der er ingen aktiviteter!</p>
@@ -3,16 +3,12 @@
 <head>
    <title>@yield("title")</title>
    <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">--}}
-{{--    <script src="http://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>--}}
    <link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
 </head>
 <body>
-{{--    @yield("header")--}}
 <header class="row align-items-center">
    <img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole">
    <button class="ml-auto" id="toggle">
-{{--        <img src="{{URL::asset('/images/icons/icon.svg')}}" id="menuIcon" alt="-">--}}
        <i id="icon" class="fas fa-bars"></i>
    </button>
 </header>
@@ -16,6 +16,8 @@
            <input type="password" name="password" id="new" required>
            <span>Bekræft Nyt Password:</span>
            <input type="password" name="confirmpassword" id="confirm" required>
+            {!! session()->get('error#notsamepass') !!}
+            {!! session()->get('error#oldpass') !!}
            <button type="submit" class="btn text-center btn-sde-blue mt-1">Rediger</button>
        </form>
    </main>
@@ -19,6 +19,7 @@
                    <span class="toggle__text text-white">Remember password</span>
                </span>
            </label>
+            {!! session()->get('success#passwordchange') !!}
            <input class="btn btn-dark" type="submit" value="Sign in">
        </form>
        <a class="text-white text-center" href="{{ route('users.show-forgot') }}">Forgot password?</a>