Commit Graph

464 Commits

Author SHA1 Message Date
Anders e6d9ddf7d8 Fixed EventController to go to Events instead of bookings
Added app->events->index page (needed backend and a foreach loop (foreach event do...))

Changed name in menu 'Vaske Booking Liste' to 'Reservationer'
2020-06-26 08:56:18 +02:00
Neerholt 659fe23bb7 Menu plan form fix 2020-06-26 08:20:43 +02:00
Neerholt c917a26738 Merge remote-tracking branch 'origin/master' 2020-06-26 08:16:05 +02:00
Anders ff1fbaf53f Added href to the first 3 buttons in the menu button.
(Missing routing to the last 3)
2020-06-26 08:07:12 +02:00
Neerholt 47f687d12c idk kev 2020-06-25 18:43:46 +02:00
Neerholt bbd9a26b91 Create pages fix 2020-06-25 16:16:08 +02:00
Neerholt 795f7a919b Fix menu plan index 2020-06-25 15:29:43 +02:00
Anders 1d08ddbf58 Fixed mistakes 2020-06-25 15:11:59 +02:00
Anders 8bda01c1dc Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-25 15:02:06 +02:00
Anders bad4196e95 bleh 2020-06-25 15:01:33 +02:00
Sebastian Davaris b55fd18c71 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/resources/views/app/root/index.blade.php
2020-06-25 14:56:45 +02:00
frederikpyt 7f083860f1 Fixes 2020-06-25 14:52:04 +02:00
frederikpyt 3976d37af2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-25 14:24:08 +02:00
frederikpyt 9e9f48aca1 Edited frontpage 2020-06-25 14:23:52 +02:00
Anders 65ec87af51 Added washing-reservations 2020-06-25 13:30:58 +02:00
Anders a77b266999 Removed:
BookingController.php, Booking.php - Was already made being called washing-reservation
Route in web.php (Bookings not needed)

Fixed:
WashingReservationController.php
admin->layout->base (washing-reservations instead of booking)
2020-06-25 13:28:51 +02:00
Sebastian Davaris 3d9cc63241 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-25 13:20:59 +02:00
Anders db3620763f Merge remote-tracking branch 'origin/master' 2020-06-25 13:02:58 +02:00
Anders 103dfa6830 (Maybe) Fixed Menuplans 2020-06-25 13:01:53 +02:00
frederikpyt 49d6853170 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-25 12:50:23 +02:00
frederikpyt 635d91915a Fixes 2020-06-25 12:50:09 +02:00
Anders f3956e1e9b Added Booking to base.blade.php 2020-06-25 12:48:44 +02:00
Vedde 80bf962f38 Le fix is not fix le 2020-06-25 12:37:17 +02:00
Neerholt 6447d9274f Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-25 12:22:43 +02:00
Neerholt 9a3d16bc61 Add some routes to menuplan 2020-06-25 12:22:22 +02:00
Anders 233a1e6add Added BookingController.php, uncommented routed code in admin/layout/base.blade.php, 2020-06-25 11:56:38 +02:00
Vedde 10dc32c701 updated menuplan controller 2020-06-25 10:34:10 +02:00
Anders c627e4e1af Added text in external-links. Added admin->menuplans->index Added foreach in admin->washing-machines->index, fixed title in app->vagttelefons->index 2020-06-25 09:04:23 +02:00
Sebastian Davaris 32da29dd49 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-25 08:28:48 +02:00
Sebastian Davaris 47161e2615 Working on calendar.js 2020-06-25 08:28:36 +02:00
Anders bf57ec9d99 Added 2 more pages to Menuplans - Edited Href in Menuplans, Users & Washing-Machines 2020-06-25 08:12:53 +02:00
Anders 4ed33e4f99 Edited washing-machines, app\root\index & admin\layout\base 2020-06-24 14:19:55 +02:00
Anders d7d33d1696 Added Bookings to admin panel - Fixed app->root->index.blade.php 2020-06-24 11:21:16 +02:00
frederikpyt d4d0615a4e Merge remote-tracking branch 'origin/master' 2020-06-24 09:26:53 +02:00
frederikpyt 7cb1fe6ed6 Moved files 2020-06-24 09:25:59 +02:00
Vedde fb90868be6 Merge remote-tracking branch 'origin/master' 2020-06-24 07:40:33 +02:00
Sebastian Davaris dd5a9fdbc6 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/resources/js/navmenu/menu.js
2020-06-23 15:34:12 +02:00
Sebastian Davaris 8ac68ef7b9 Added FontAwesome 2020-06-23 15:32:42 +02:00
Vedde a6c20f8ee8 Merge remote-tracking branch 'origin/master' 2020-06-23 12:01:45 +02:00
frederikpyt d5ddc0901c Created Calender 2020-06-23 12:01:27 +02:00
Vedde 85989f5b04 added crud external-link blade and added menu plan 2020-06-23 11:59:26 +02:00
Sebastian 4ddc765082 Got the mobile route to work 2020-06-23 06:42:43 +02:00
Sebastian Davaris fed853093b Last 22-06 2020-06-22 15:25:39 +02:00
Sebastian Davaris 3a345b1417 Fixed Routes and blades. 2020-06-22 14:53:00 +02:00
Sebastian Davaris 9c3796220f Fixed blade references. 2020-06-22 10:08:18 +02:00
frederikpyt fe9a97656f Updated hrefs 2020-06-17 11:28:48 +02:00
frederikpyt 99c2b16752 Changed create.blade.php 2020-06-17 09:08:26 +02:00
Frederikmillingpytlick 7478766927 Created views 2020-06-16 09:06:45 +02:00
Frederikmillingpytlick 60bd31e54b Created, moved and renamed views 2020-06-16 09:04:25 +02:00
Sebastian Davaris 9212a543f8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-16 08:13:36 +02:00
Frederikmillingpytlick 5ce1e69d65 Fixes 2020-06-15 15:09:13 +02:00
Frederikmillingpytlick eb2ce43928 Fixes on Menuplan sites 2020-06-15 12:42:09 +02:00
Frederikmillingpytlick 390969cf96 Added Menuplan sites 2020-06-15 12:29:03 +02:00
Frederikmillingpytlick 563f5ac694 Edited read.blade.php 2020-06-15 11:29:38 +02:00
Frederikmillingpytlick a840a4b2f0 Fixes 2020-06-15 11:28:37 +02:00
Sebastian Davaris aa2380023b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-15 08:59:26 +02:00
Sebastian Davaris 07405d575d Added more routes. 2020-06-15 08:59:15 +02:00
Frederikmillingpytlick e73e2aacdc Added admin sites 2020-06-15 08:56:21 +02:00
Frederikmillingpytlick 88b7012f69 Merge remote-tracking branch 'origin/master' 2020-06-11 14:54:05 +02:00
Frederikmillingpytlick a341e61bad Added Images, fonts, vagttelefon and menuplan 2020-06-11 14:52:15 +02:00
Vedde 2cbc1ddaf9 added user folder/view
updated EventController.php & web.php
2020-06-10 08:33:06 +02:00
Sebastian Davaris bab4c6d72e Removed Vue 2020-06-09 08:38:05 +02:00
Sebastian Davaris bd23d10a9d Added first seeder. 2020-06-08 15:08:46 +02:00
Sebastian Davaris da00009fe9 Initial Commit 2020-06-08 10:04:45 +02:00