From 581429d99f7e97e279f899181f76c3dd79686869 Mon Sep 17 00:00:00 2001 From: s416422 Date: Sun, 8 Dec 2019 00:00:52 +0100 Subject: [PATCH] app deployed with Heroku --- Procfile | 1 + .../User/UserClassesController.php | 7 ++----- mapka/STUDENT/koncowastrona.css | 4 +++- mapka/STUDENT/koncowastrona.html | 8 +++++-- mapka/STUDENT/seatchart.html | 3 +-- mapka/STUDENT/seatchart.js | 8 +++++++ public/css/map/koncowastrona.css | 3 ++- public/css/map/seatchart.css | 4 ++++ public/js/map/seatchart-custom.js | 21 ++++++++++++------- public/js/map/seatchart.js | 8 ++++++- resources/views/layouts/map.blade.php | 3 ++- resources/views/map/seat_map.blade.php | 2 +- resources/views/map/start_map.blade.php | 2 +- resources/views/map/summary_map.blade.php | 2 +- 14 files changed, 52 insertions(+), 24 deletions(-) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..48aab52 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: vendor/bin/heroku-php-apache2 public/ diff --git a/app/Http/Controllers/User/UserClassesController.php b/app/Http/Controllers/User/UserClassesController.php index 200b9ce..c8631c7 100644 --- a/app/Http/Controllers/User/UserClassesController.php +++ b/app/Http/Controllers/User/UserClassesController.php @@ -8,10 +8,8 @@ use Illuminate\Http\Request; use App\Subject; use App\Classes; -use App\Room; use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Session; class UserClassesController extends Controller { @@ -40,11 +38,10 @@ class UserClassesController extends Controller { $subject_id = $request->input('subject_id'); $date = $request->input('date'); - Classes::create([ + $classes_id = Classes::create([ 'subject_id' => $subject_id, 'date' => $date - ]); - $classes_id = Classes::orderBy('created_at', 'desc')->first()->id; + ])->id; return redirect(route('user_start_classes', ['classes_id' => $classes_id])); } diff --git a/mapka/STUDENT/koncowastrona.css b/mapka/STUDENT/koncowastrona.css index 7f13c8e..929741a 100644 --- a/mapka/STUDENT/koncowastrona.css +++ b/mapka/STUDENT/koncowastrona.css @@ -21,11 +21,13 @@ body { font-size: 22px; } -#selected-seats { +#sel-seat { font-size: 30px; text-shadow: 1px 1px 1px rgb(160, 160, 160); margin-top: -15px; margin-bottom: 100px; + padding: 0; + } button { diff --git a/mapka/STUDENT/koncowastrona.html b/mapka/STUDENT/koncowastrona.html index 3051310..fb9baa5 100644 --- a/mapka/STUDENT/koncowastrona.html +++ b/mapka/STUDENT/koncowastrona.html @@ -15,7 +15,7 @@

Anna Kowalska

wybrane miejsce:

-

rząd 2 miejsce 3

+ @@ -24,7 +24,11 @@ \ No newline at end of file diff --git a/mapka/STUDENT/seatchart.html b/mapka/STUDENT/seatchart.html index c9fe1d7..86b7f94 100644 --- a/mapka/STUDENT/seatchart.html +++ b/mapka/STUDENT/seatchart.html @@ -24,7 +24,7 @@
-

Anna Kowalska

+

Anna Kowalska

Wybrane miejsce:

@@ -35,7 +35,6 @@
+ @CHECK | @yield('map_title') @yield('map_meta') @@ -14,7 +15,7 @@
- Zakończ zapisy + Zakończ zapisy @yield('map_content')
diff --git a/resources/views/map/seat_map.blade.php b/resources/views/map/seat_map.blade.php index 8f16643..658bdcd 100644 --- a/resources/views/map/seat_map.blade.php +++ b/resources/views/map/seat_map.blade.php @@ -21,7 +21,7 @@
-

{{ $student_name }} {{ $student_surname }}

+

{{ $student_name }} {{ $student_surname }}

{{ $student_id_number }}

Wybrane miejsce: diff --git a/resources/views/map/start_map.blade.php b/resources/views/map/start_map.blade.php index 14b6ee6..f37038b 100644 --- a/resources/views/map/start_map.blade.php +++ b/resources/views/map/start_map.blade.php @@ -28,7 +28,7 @@

- + @endsection diff --git a/resources/views/map/summary_map.blade.php b/resources/views/map/summary_map.blade.php index 33713d9..4076cce 100644 --- a/resources/views/map/summary_map.blade.php +++ b/resources/views/map/summary_map.blade.php @@ -11,7 +11,7 @@

{{ $student_id_number }}

wybrane miejsce:

-

{{ $seat_number }}

+ @endsection