vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
504 Commits 3 Branches 0 Tags 707 MiB
Commit Graph

235 Commits

Author SHA1 Message Date
frederikpyt 7fb4920354 Fixes 2020-06-29 13:55:47 +02:00
Neerholt 8df9869f28 remove , 2020-06-29 13:36:51 +02:00
frederikpyt c6ffa26baa Fixes 2020-06-29 13:18:58 +02:00
Neerholt 08d5436f22 Fix delete controller 2020-06-29 13:08:39 +02:00
Anders 9bc7369ffe Merge remote-tracking branch 'origin/master' 2020-06-29 12:56:14 +02:00
Anders f7786be665 Added Feedback index page + added routing in base.blade.php + Fixed routing in FeedbackController.php 2020-06-29 12:56:08 +02:00
Vedde 0306717822 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:54:56 +02:00
Vedde 4020fcf502 updated event migration and admin stuff 2020-06-29 12:53:08 +02:00
Neerholt f61f67d0bc slette s 2020-06-29 12:36:07 +02:00
Anders 91a34f3d08 Merge remote-tracking branch 'origin/master' 2020-06-29 12:29:30 +02:00
Anders 600bbe7746 Fixed routing and backend to staff section 2020-06-29 12:29:23 +02:00
Neerholt 6820dc3e3b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:21:27 +02:00
Neerholt 3f5886223b idk kev 2020-06-29 12:21:16 +02:00
Anders 97af5273be Merge remote-tracking branch 'origin/master' 2020-06-29 11:57:16 +02:00
Anders f5cdf848a3 Added Staff section and routing + some backend (That should be checked out) 2020-06-29 11:57:11 +02:00
Neerholt a0a6f1a9cb Laver edit, show, update,delete controller for contacts 2020-06-29 11:48:36 +02:00
Neerholt c86c067d07 added s to the end of contacts 2020-06-29 11:39:00 +02:00
Neerholt ba73440044 Lavet sådan at man kan adde information til contacts databasen 2020-06-29 11:14:07 +02:00
Neerholt f952ad33aa Added s til controller 2020-06-29 10:41:27 +02:00
Neerholt bb307df506 ikd kev 2020-06-29 10:37:37 +02:00
Neerholt b555af06c7 Lavet contact create controller 2020-06-29 10:30:09 +02:00
Sebastian Davaris 03c609175d Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/resources/views/admin/layout/base.blade.php
	skolehjem/resources/views/app/layout/base.blade.php
	skolehjem/routes/web.php
 2020-06-29 10:15:56 +02:00
Neerholt 3115b337cd jeg er ikke sikker på hvad der der sket :) 2020-06-29 10:07:42 +02:00
Sebastian Davaris 0afa8a7aa3 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 09:21:29 +02:00
Sebastian Davaris 1eaa34516b Fixed PhoneController.php 2020-06-29 09:21:17 +02:00
Vedde 874f0064a1 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 09:19:57 +02:00
Vedde 354a5952a7 updated Externallink. Should be able to do crud 2020-06-29 09:19:43 +02:00
Sebastian Davaris c1877cd180 DO NOT TOUCH MENUPLAN-STUFF!!! 2020-06-29 09:08:49 +02:00
Sebastian Davaris 0adc1ebf02 Added Contact-stuff 2020-06-29 08:50:50 +02:00
Sebastian Davaris 4061b590cb 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
Sebastian Davaris 66ddd32944 Working on MenuPlanController.php 2020-06-29 08:31:36 +02:00
Neerholt b1ae0f0964 Fix edit siden 2020-06-29 08:22:07 +02:00
Neerholt 7d13933ea7 Fix route link til edit på menuplan 2020-06-29 08:02:42 +02:00
Vedde 578dd8d522 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	skolehjem/app/Http/Controllers/MenuPlanController.php
#	skolehjem/resources/views/admin/external-links/index.blade.php
 2020-06-26 13:56:47 +02:00
Vedde 89082b281b added things to external link views and worked in controller 2020-06-26 13:56:28 +02:00
Sebastian Davaris b56f3d2a34 Working on MenuPlanController.php 2020-06-26 13:55:04 +02:00
Neerholt 44e70232cd Kinda Tryna fix 2020-06-26 13:11:24 +02:00
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 47f687d12c idk kev 2020-06-25 18:43:46 +02:00
Neerholt 795f7a919b Fix menu plan index 2020-06-25 15:29:43 +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
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 1105233f7c Edited BookingController.php 2020-06-25 13:14:08 +02:00
Neerholt 9a2cb7a98a idk kev 2020-06-25 12:44:06 +02:00
frederikpyt 41db59333b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-25 12:40:34 +02:00
frederikpyt b54bffb7a8 Updated Controllers 2020-06-25 12:40:26 +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
frederikpyt d73e540d09 Merge remote-tracking branch 'origin/master' 2020-06-25 11:20:04 +02:00
frederikpyt b16bb134da Updated Controllers 2020-06-25 11:19:51 +02:00
Vedde 10dc32c701 updated menuplan controller 2020-06-25 10:34:10 +02:00
Vedde 00f798b940 Merge remote-tracking branch 'origin/master' 2020-06-25 09:15:30 +02:00
Vedde 27b4f48af2 updated controller 2020-06-25 09:15:21 +02:00
Sebastian Davaris 47161e2615 Working on calendar.js 2020-06-25 08:28:36 +02:00
Sebastian Davaris ef58701a6e Fixed "Le Fix" Error 0x01 2020-06-24 10:33:43 +02:00
Sebastian Davaris 9690a30437 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-24 08:55:07 +02:00
Sebastian Davaris 39ecd64d04 Calendar stuff. 2020-06-24 08:54:56 +02:00
Vedde ccddf4d2f3 fixed wrong migration name of external link 
fixed wrong path on controller view
 2020-06-24 08:53:07 +02:00
Vedde 6a0a46453f Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	skolehjem/app/Http/Controllers/EventController.php
 2020-06-24 08:25:00 +02:00
Vedde e2ab661dc2 fixed path 2020-06-24 08:24:45 +02:00
Sebastian Davaris 79af2dee20 Fixed Controller dependencies. 2020-06-24 08:23:15 +02:00
Vedde 85989f5b04 added crud external-link blade and added menu plan 2020-06-23 11:59:26 +02:00
Vedde dbe6a4dcfe changed return view to Response::detect on controllers 2020-06-23 08:15:44 +02:00
Sebastian 4ddc765082 Got the mobile route to work 2020-06-23 06:42:43 +02:00
Sebastian 070ff2e3c6 Implemented first mobile detected route:) 2020-06-22 21:08:09 +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
Sebastian Davaris e056567f57 Fixed UserController.php 2020-06-19 08:15:24 +02:00
Sebastian Davaris 06bab0a120 Working on controllers 2020-06-18 08:01:42 +02:00
Sebastian Davaris a2c7d619b1 Added docs.xlsx 2020-06-16 08:28:37 +02:00
Sebastian Davaris 6106f67fe7 Began updating the View-routes. 2020-06-16 08:13:24 +02:00
Sebastian Davaris 07405d575d Added more routes. 2020-06-15 08:59:15 +02:00
Sebastian Davaris 2f0ec75278 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/routes/web.php
 2020-06-10 12:31:11 +02:00
Sebastian Davaris 3c02963c24 Began working on more controllers 2020-06-10 12:30:44 +02:00
Vedde 2febf83348 Merge remote-tracking branch 'origin/master' 2020-06-10 08:33:15 +02:00
Vedde 2cbc1ddaf9 added user folder/view 
updated EventController.php & web.php
 2020-06-10 08:33:06 +02:00
Sebastian Davaris 9c6d8c04cd Merge remote-tracking branch 'origin/master' 2020-06-10 08:25:57 +02:00
Sebastian Davaris af76cbca87 Added Swagger 2020-06-10 08:25:21 +02:00
Vedde fa6fdcd690 Added a few models and migrations 2020-06-09 10:45:16 +02:00
Vedde 7eaa3311cb Merge branch 'master' of C:\Users\vedr0021\PhpstormProjects\skolehjem-webapp with conflicts. 2020-06-09 09:05:07 +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