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

352 Commits

Author SHA1 Message Date
Anders 1cf39cbbd2 Merge remote-tracking branch 'origin/master' 2020-06-30 08:35:49 +02:00
Anders d93fff517a Users can now create a feedback to the admins (Needing a new way to see the message in the admin panel) 2020-06-30 08:35:40 +02:00
Sebastian Davaris f638777878 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
	skolehjem/resources/views/admin/users/index.blade.php
 2020-06-30 08:25:18 +02:00
Sebastian Davaris 4a0840b104 Modified base.blade.php? 2020-06-30 08:24:29 +02:00
frederikpyt 2f22ae275e Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:23:14 +02:00
frederikpyt 2562c69c36 Fixed delete on indexes 2020-06-30 08:23:07 +02:00
Anders d6a9aa0c4f Merge remote-tracking branch 'origin/master' 2020-06-30 08:21:45 +02:00
Anders c732d8eec0 Fixed menuplan create 2020-06-30 08:21:36 +02:00
frederikpyt c803d12299 Frontend support for role selection in user create, read and update. 2020-06-30 08:03:42 +02:00
frederikpyt a4ff9a3590 Fixed calender CSS 2020-06-30 07:45:58 +02:00
Sebastian Davaris 4d35b368c6 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 14:50:08 +02:00
Sebastian Davaris 988ceb7c8a Fixed error AND 0x01 2020-06-29 14:49:57 +02:00
Vedde a3209bc422 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/app/Http/Controllers/ContactController.php
 2020-06-29 14:48:53 +02:00
Vedde 7234304496 worked on event blade files. 2020-06-29 14:48:31 +02:00
Sebastian Davaris eb749e58a5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 14:28:17 +02:00
Sebastian Davaris b5ede965fe Began working on security. 2020-06-29 14:28:09 +02:00
Anders 45a7302640 Removed unnecessary code from StaffController.php 2020-06-29 14:26:39 +02:00
frederikpyt 5a136c537c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 14:11:27 +02:00
frederikpyt e329f3f383 Fixes 2020-06-29 14:11:15 +02:00
Anders 58da7e8136 Merge remote-tracking branch 'origin/master' 2020-06-29 14:08:32 +02:00
Anders b32a782b17 Added feedbacks.index in root->index. Added Feedbacks page to app. Added a send feedback button on contacts->index 2020-06-29 14:08:26 +02:00
frederikpyt 7fb4920354 Fixes 2020-06-29 13:55:47 +02:00
frederikpyt 357c046e44 Fixes 2020-06-29 13:47:18 +02:00
frederikpyt 204a7497e0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 13:38:11 +02:00
frederikpyt 5e624d7561 Fixes 2020-06-29 13:38:05 +02:00
Neerholt 8df9869f28 remove , 2020-06-29 13:36:51 +02:00
Anders 6441a8838a Added a new column to feedbacks 2020-06-29 13:30:13 +02:00
Anders b942d8c1e1 Updated create_staff_table 2020-06-29 13:29:19 +02:00
Neerholt b48907b523 Made staff migrate 2020-06-29 13:27:48 +02:00
frederikpyt 8f74a8b649 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 13:19:33 +02:00
frederikpyt c6ffa26baa Fixes 2020-06-29 13:18:58 +02:00
Anders 42aa2b5c83 Renamed contact to contacts in app 2020-06-29 13:18:39 +02:00
Neerholt b1f2fdd2b7 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/app/Http/Controllers/ContactController.php
 2020-06-29 13:09:29 +02:00
Neerholt 08d5436f22 Fix delete controller 2020-06-29 13:08:39 +02:00
frederikpyt 626dddbb06 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 13:07:28 +02:00
frederikpyt f16018cb15 Kontakt frontend 2020-06-29 13:07:17 +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 7b691b8c94 added event migration 2020-06-29 12:54:43 +02:00
Vedde 4020fcf502 updated event migration and admin stuff 2020-06-29 12:53:08 +02:00
frederikpyt 8047e33ad3 Kontakt frontend 2020-06-29 12:45:27 +02:00
Neerholt e00da21506 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:37:03 +02:00
Neerholt f61f67d0bc slette s 2020-06-29 12:36:07 +02:00
frederikpyt 04ad9f6d1c Kontakt frontend 2020-06-29 12:35:24 +02:00
frederikpyt 79d6ffe52d Merge remote-tracking branch 'origin/master' 2020-06-29 12:32:46 +02:00
frederikpyt 7d80b014c7 Kontakt frontend 2020-06-29 12:32:34 +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
frederikpyt 0e7bf85d26 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:25:04 +02:00
frederikpyt d37c0c63f6 Kontakt frontend 2020-06-29 12:24:45 +02:00
Neerholt 85846eab6c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:23:08 +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
frederikpyt 30b31e0309 Kontakt frontend 2020-06-29 12:20:09 +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 76cd9663c2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:48:46 +02:00
Neerholt a0a6f1a9cb Laver edit, show, update,delete controller for contacts 2020-06-29 11:48:36 +02:00
frederikpyt 7641deaeef Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:42:38 +02:00
frederikpyt 137c12cbee Kontakt frontend 2020-06-29 11:41:33 +02:00
Neerholt cee2818046 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:39:22 +02:00
Neerholt c86c067d07 added s to the end of contacts 2020-06-29 11:39:00 +02:00
frederikpyt ad0f61dd51 Kontakt frontend 2020-06-29 11:38:18 +02:00
frederikpyt 78992f6a61 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:34:30 +02:00
frederikpyt b198f830c3 Kontakt frontend 2020-06-29 11:34:21 +02:00
Neerholt 0ce8e109b2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:14:19 +02:00
Neerholt ba73440044 Lavet sådan at man kan adde information til contacts databasen 2020-06-29 11:14:07 +02:00
Anders 02faa63b98 Removed Fredag-Søndag in menuplans 2020-06-29 11:09:39 +02:00
Vedde 7f7226e12d "fixed" events migration 2020-06-29 11:05:07 +02:00
Anders 469c21645a Added Event route in admins left navbar 2020-06-29 10:56:53 +02:00
frederikpyt 1863d953f8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/resources/views/admin/menuplans/create.blade.php
 2020-06-29 10:52:18 +02:00
frederikpyt 0f93f4ca97 Fixes 2020-06-29 10:50:04 +02:00
Anders 7120b85784 Merge remote-tracking branch 'origin/master' 2020-06-29 10:46:35 +02:00
Anders 246ae2235d Removed Fredag-Søndag on menuplan 2020-06-29 10:46:28 +02:00
Neerholt 419672a302 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 10:41:38 +02:00
Neerholt f952ad33aa Added s til controller 2020-06-29 10:41:27 +02:00
frederikpyt e8f13d81ec Contact frontend 2020-06-29 10:40:34 +02:00
frederikpyt 4feb85f91c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 10:37:49 +02:00
frederikpyt 86bf8cbc6e Contact frontend 2020-06-29 10:37:42 +02:00
Neerholt bb307df506 ikd kev 2020-06-29 10:37:37 +02:00
frederikpyt 94b0d73cc4 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 10:31:31 +02:00
frederikpyt 488995ca37 Contact frontend 2020-06-29 10:31:24 +02:00
Neerholt b555af06c7 Lavet contact create controller 2020-06-29 10:30:09 +02:00
Vedde 3f3984ddab Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 10:28:45 +02:00
Vedde 62d6fe62e3 added temporary trial event fetcher 2020-06-29 10:28:35 +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
Sebastian Davaris c823bdd963 Added button to calendar.js 2020-06-29 10:14:47 +02:00
frederikpyt d4abbfc189 Fixes 2020-06-29 10:12:58 +02:00
Neerholt 3115b337cd jeg er ikke sikker på hvad der der sket :) 2020-06-29 10:07:42 +02:00
frederikpyt 6bdf7d3447 Fixes 2020-06-29 09:57:21 +02:00
frederikpyt 2726ccadbf Fixes 2020-06-29 09:28:57 +02:00
frederikpyt fc1d7c5a5b Fixes 2020-06-29 09:26:07 +02:00
frederikpyt ac74aa3f82 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 09:22:01 +02:00
frederikpyt b8f2c57fc0 Created konto entry in hamburger menu 2020-06-29 09:21:54 +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 0683b122fe Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 09:08:58 +02:00
Sebastian Davaris c1877cd180 DO NOT TOUCH MENUPLAN-STUFF!!! 2020-06-29 09:08:49 +02:00
frederikpyt a98b259b9b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 09:03:31 +02:00
frederikpyt 42e3ece4aa Updated Contact 2020-06-29 09:03:24 +02:00
Sebastian Davaris 0adc1ebf02 Added Contact-stuff 2020-06-29 08:50:50 +02:00
Anders 4eb2a29af9 Merge remote-tracking branch 'origin/master' 2020-06-29 08:47:09 +02:00
Sebastian Davaris 72a23933a8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 08:43:46 +02:00
Sebastian Davaris 5be4b752d7 Finished Menuplan;) 2020-06-29 08:43:35 +02:00
frederikpyt 2e948b29e8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 08:35:16 +02:00
frederikpyt 8001c46a1e Fixed hamburger menu 2020-06-29 08:35:08 +02:00
Anders 0c3d6dab25 Merge remote-tracking branch 'origin/master' 2020-06-29 08:34:49 +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
Vedde 4576140d2f Merge remote-tracking branch 'origin/master' 2020-06-29 08:31:27 +02:00
Neerholt a7c3a54778 Data bliver nu vist på edit siden 2020-06-29 08:31:26 +02:00
Vedde d33a89757d Merge remote-tracking branch 'origin/master' 2020-06-29 08:30:48 +02:00
Vedde b46f8f7b0a changed route name and table data to show correct info 2020-06-29 08:30:31 +02:00
Neerholt 7588e05299 Merge remote-tracking branch 'origin/master' 2020-06-29 08:22:15 +02:00
Neerholt b1ae0f0964 Fix edit siden 2020-06-29 08:22:07 +02:00
Anders 8987db9d31 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	skolehjem/resources/views/admin/washing-reservations/index.blade.php
 2020-06-29 08:19:55 +02:00
frederikpyt b790d2cf65 Fixes 2020-06-29 08:15:11 +02:00
frederikpyt 09040f0a36 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 08:14:01 +02:00
frederikpyt 0ba866ec29 Fixes 2020-06-29 08:13:53 +02:00
Neerholt 7d13933ea7 Fix route link til edit på menuplan 2020-06-29 08:02:42 +02:00
Anders f517e53557 Merge remote-tracking branch 'origin/master' 2020-06-29 07:54:41 +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
Sebastian Davaris a84f1729f0 Fixed Vector 0x01 2020-06-26 13:17:18 +02:00
Sebastian Davaris 22c578bc4b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-26 13:14:10 +02:00
Sebastian Davaris 4173986df7 Fixed Routes in base.blade.php 2020-06-26 13:14:02 +02:00
Neerholt 44e70232cd Kinda Tryna fix 2020-06-26 13:11:24 +02:00
Sebastian Davaris df8eb6c8cb Finished calendar.js (for now) 2020-06-26 13:07:57 +02:00
Sebastian Davaris 812ff6e855 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-26 12:51:16 +02:00
Sebastian Davaris de607a2d3c Fixed basic calendar functionality 2020-06-26 12:51:05 +02:00
Anders c6282b77d1 Renamed 'Booking' to 'Vaske Reservationer' in washing-reservations 2020-06-26 12:20:20 +02:00
Anders 400f2e563f Removed ID From all admin sites. 
Added washing-reservations under washing-machines instead of being alone
 2020-06-26 12:17:46 +02:00
Sebastian Davaris ecf1488bef Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-26 10:52:39 +02:00
Sebastian Davaris 933172777f Working on calendar.js some more.. 2020-06-26 10:52:26 +02:00
Anders 8569496d3d Renamed Booking to Reservationer - Removed reused washing-reservations.index 2020-06-26 09:15:40 +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 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 ec8eba98c8 Fixed Menu Button (Still unnecessary code in resources->js->navmenu->menu.js) 2020-06-25 15:20:42 +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