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

Conflicts: skolehjem/resources/views/admin/menuplans/edit.blade.php skolehjem/resources/views/admin/menuplans/index.blade.php skolehjem/resources/views/admin/menuplans/update.blade.php
2020-06-29 08:32:52 +02:00
parent 66ddd32944 4576140d2f
commit 4061b590cb
9 changed files with 53 additions and 25 deletions
@@ -14,7 +14,7 @@
    <form method="post" action="{{ route("external-links.store") }}">
        @csrf
        <label for="title">Titel:</label>
-        <input type="text" name="title" id="title" required>
+        <input type="text" name="name" id="title" required>
        <label for="link">Linket:</label>
        <input type="text" name="link" id="link" required>
        <input type="submit" class="btn btn-dark text-white" value="Opret">
@@ -6,12 +6,12 @@
@endsection

@section("path")
-    <a href="{{ route('external-links.edit') }}" class="text-white">Rediger Link</a> /
+    <a href="../external-links/edit.blade.php" class="text-white">Rediger Link</a> /
@endsection

@section("content")
    <h1>Rediger Link:</h1>
-    <form method="post" action="">
+    <form method="post" action="{{ route("external-links.edit", ['external_link' => $link]) }}">
        @csrf
        <label for="title">Titel:</label>
        <input type="text" name="title" id="title" required>
@@ -19,8 +19,8 @@
        </tr>
        @foreach($links as $link)
            <tr>
-                <th>{Titel}</th>
-                <th>{Link}</th>
+                <th>{{$link->name}}</th>
+                <th><a href="{{$link->link}}">{{$link->link}}</th>
                <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
                <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
            </tr>
@@ -0,0 +1,14 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Link - Opret
+@endsection
+
+@section("path")
+    <a href="{{ route('external-links.create') }}" class="text-white">Opret External Link</a> /
+@endsection
+
+@section("content")
+    Link blev (ikke) oprettet.
+@endsection
@@ -0,0 +1,14 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    link - Rediger
+@endsection
+
+@section("path")
+    <a href="{{ route('external-links.index') }}" class="text-white">External link</a> /
+@endsection
+
+@section("content")
+    Din link blev (ikke) redigeret.
+@endsection
@@ -34,7 +34,7 @@
                <a href="{{ route("washing-machines.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Vaskemaskiner</a>
            </div>
            <div class="row">
-                <a href="{{ route("washing-reservations.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vaske Reservationer</a>
+                <a href="{{ route("washing-reservations.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Vaskemaskine Reservationer</a>
            </div>
            <div class="row">
                <a href="{{ route('washing-machines.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Vaskemaskine</a>
@@ -2,11 +2,11 @@
@extends("admin.layout.header")

@section("title")
-    Booking - Vis
+    Vaskemaskine Reservationer - Vis
@endsection

@section("path")
-    <a href="{{ route('washing-reservations.index') }}" class="text-white">Vis Booking</a> /
+    <a href="{{ route('washing-reservations.index') }}" class="text-white">Vis Vaskemaskine Reservationer</a> /
@endsection

@section("content")