ad0f61dd51
Kontakt frontend
2020-06-29 11:38:18 +02:00
78992f6a61
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 11:34:30 +02:00
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
02faa63b98
Removed Fredag-Søndag in menuplans
2020-06-29 11:09:39 +02:00
7f7226e12d
"fixed" events migration
2020-06-29 11:05:07 +02:00
469c21645a
Added Event route in admins left navbar
2020-06-29 10:56:53 +02:00
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
0f93f4ca97
Fixes
2020-06-29 10:50:04 +02:00
7120b85784
Merge remote-tracking branch 'origin/master'
2020-06-29 10:46:35 +02:00
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
e8f13d81ec
Contact frontend
2020-06-29 10:40:34 +02:00
4feb85f91c
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 10:37:49 +02:00
86bf8cbc6e
Contact frontend
2020-06-29 10:37:42 +02:00
Neerholt
bb307df506
ikd kev
2020-06-29 10:37:37 +02:00
94b0d73cc4
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 10:31:31 +02:00
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
3f3984ddab
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 10:28:45 +02:00
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
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
6bdf7d3447
Fixes
2020-06-29 09:57:21 +02:00
2726ccadbf
Fixes
2020-06-29 09:28:57 +02:00
fc1d7c5a5b
Fixes
2020-06-29 09:26:07 +02:00
ac74aa3f82
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 09:22:01 +02:00
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
874f0064a1
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 09:19:57 +02:00
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
a98b259b9b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 09:03:31 +02:00
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
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
2e948b29e8
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 08:35:16 +02:00
8001c46a1e
Fixed hamburger menu
2020-06-29 08:35:08 +02:00
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
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
d33a89757d
Merge remote-tracking branch 'origin/master'
2020-06-29 08:30:48 +02:00
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
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
b790d2cf65
Fixes
2020-06-29 08:15:11 +02:00
09040f0a36
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 08:14:01 +02:00
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
f517e53557
Merge remote-tracking branch 'origin/master'
2020-06-29 07:54:41 +02:00
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
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
c6282b77d1
Renamed 'Booking' to 'Vaske Reservationer' in washing-reservations
2020-06-26 12:20:20 +02:00
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
8569496d3d
Renamed Booking to Reservationer - Removed reused washing-reservations.index
2020-06-26 09:15:40 +02:00
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
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
ec8eba98c8
Fixed Menu Button (Still unnecessary code in resources->js->navmenu->menu.js)
2020-06-25 15:20:42 +02:00
1d08ddbf58
Fixed mistakes
2020-06-25 15:11:59 +02:00
8bda01c1dc
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-25 15:02:06 +02:00
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
7f083860f1
Fixes
2020-06-25 14:52:04 +02:00
3976d37af2
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-25 14:24:08 +02:00
9e9f48aca1
Edited frontpage
2020-06-25 14:23:52 +02:00
65ec87af51
Added washing-reservations
2020-06-25 13:30:58 +02:00
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
Sebastian Davaris
3f9eaa7f8d
Working on calendar.js again
2020-06-25 13:20:47 +02:00
1105233f7c
Edited BookingController.php
2020-06-25 13:14:08 +02:00
db3620763f
Merge remote-tracking branch 'origin/master'
2020-06-25 13:02:58 +02:00
103dfa6830
(Maybe) Fixed Menuplans
2020-06-25 13:01:53 +02:00
49d6853170
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-25 12:50:23 +02:00
635d91915a
Fixes
2020-06-25 12:50:09 +02:00
5b85da54f2
Merge remote-tracking branch 'origin/master'
2020-06-25 12:48:50 +02:00
f3956e1e9b
Added Booking to base.blade.php
2020-06-25 12:48:44 +02:00
Neerholt
9a2cb7a98a
idk kev
2020-06-25 12:44:06 +02:00
41db59333b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-25 12:40:34 +02:00
b54bffb7a8
Updated Controllers
2020-06-25 12:40:26 +02:00
c51f5812e6
Merge remote-tracking branch 'origin/master'
2020-06-25 12:37:41 +02:00
80bf962f38
Le fix is not fix le
2020-06-25 12:37:17 +02:00
2349b52100
Added Booking Model
2020-06-25 12:32:16 +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
233a1e6add
Added BookingController.php, uncommented routed code in admin/layout/base.blade.php,
2020-06-25 11:56:38 +02:00
d73e540d09
Merge remote-tracking branch 'origin/master'
2020-06-25 11:20:04 +02:00
b16bb134da
Updated Controllers
2020-06-25 11:19:51 +02:00
10dc32c701
updated menuplan controller
2020-06-25 10:34:10 +02:00
00f798b940
Merge remote-tracking branch 'origin/master'
2020-06-25 09:15:30 +02:00
27b4f48af2
updated controller
2020-06-25 09:15:21 +02:00
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
bf57ec9d99
Added 2 more pages to Menuplans - Edited Href in Menuplans, Users & Washing-Machines
2020-06-25 08:12:53 +02:00
4ed33e4f99
Edited washing-machines, app\root\index & admin\layout\base
2020-06-24 14:19:55 +02:00
d7d33d1696
Added Bookings to admin panel - Fixed app->root->index.blade.php
2020-06-24 11:21:16 +02:00
Sebastian Davaris
ef58701a6e
Fixed "Le Fix" Error 0x01
2020-06-24 10:33:43 +02:00
Sebastian Davaris
730e77b0e0
Fixed detector.php
2020-06-24 10:32:07 +02:00
Sebastian Davaris
e8d44d7852
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-24 10:15:49 +02:00
d4d0615a4e
Merge remote-tracking branch 'origin/master'
2020-06-24 09:26:53 +02:00
7cb1fe6ed6
Moved files
2020-06-24 09:25:59 +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
ccddf4d2f3
fixed wrong migration name of external link
...
fixed wrong path on controller view
2020-06-24 08:53:07 +02:00
6a0a46453f
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# skolehjem/app/Http/Controllers/EventController.php
2020-06-24 08:25:00 +02:00
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
Sebastian Davaris
e6244027bd
Fixed ViewDetector.
2020-06-24 08:21:00 +02:00
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
a6c20f8ee8
Merge remote-tracking branch 'origin/master'
2020-06-23 12:01:45 +02:00
d5ddc0901c
Created Calender
2020-06-23 12:01:27 +02:00
85989f5b04
added crud external-link blade and added menu plan
2020-06-23 11:59:26 +02:00
dbe6a4dcfe
changed return view to Response::detect on controllers
2020-06-23 08:15:44 +02:00
4ddc765082
Got the mobile route to work
2020-06-23 06:42:43 +02:00
070ff2e3c6
Implemented first mobile detected route:)
2020-06-22 21:08:09 +02:00
f5fd0eb5bd
Added Mobile Detection.
2020-06-22 20:55:40 +02:00
8ac8930844
Merge remote-tracking branch 'origin/master'
2020-06-22 15:28:32 +02:00
c31a3e2c11
updated controller and layout blade
2020-06-22 15:28:20 +02:00
Sebastian Davaris
fed853093b
Last 22-06
2020-06-22 15:25:39 +02:00
4a8336e677
Merge remote-tracking branch 'origin/master'
2020-06-22 14:57:21 +02:00
5dcae7895a
updated controller
2020-06-22 14:57:11 +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
ca4bcbd5be
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-18 08:01:53 +02:00
Sebastian Davaris
06bab0a120
Working on controllers
2020-06-18 08:01:42 +02:00
fe9a97656f
Updated hrefs
2020-06-17 11:28:48 +02:00
99c2b16752
Changed create.blade.php
2020-06-17 09:08:26 +02:00
7478766927
Created views
2020-06-16 09:06:45 +02:00
60bd31e54b
Created, moved and renamed views
2020-06-16 09:04:25 +02:00
Sebastian Davaris
a2c7d619b1
Added docs.xlsx
2020-06-16 08:28:37 +02:00
Sebastian Davaris
9212a543f8
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-16 08:13:36 +02:00
Sebastian Davaris
6106f67fe7
Began updating the View-routes.
2020-06-16 08:13:24 +02:00
5ce1e69d65
Fixes
2020-06-15 15:09:13 +02:00
eb2ce43928
Fixes on Menuplan sites
2020-06-15 12:42:09 +02:00
390969cf96
Added Menuplan sites
2020-06-15 12:29:03 +02:00
563f5ac694
Edited read.blade.php
2020-06-15 11:29:38 +02:00
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
e73e2aacdc
Added admin sites
2020-06-15 08:56:21 +02:00
88b7012f69
Merge remote-tracking branch 'origin/master'
2020-06-11 14:54:05 +02:00
a341e61bad
Added Images, fonts, vagttelefon and menuplan
2020-06-11 14:52: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
643ac9e3de
added values to migrations.
2020-06-10 12:29:18 +02:00
2febf83348
Merge remote-tracking branch 'origin/master'
2020-06-10 08:33:15 +02:00
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
fa6fdcd690
Added a few models and migrations
2020-06-09 10:45:16 +02:00
Sebastian Davaris
5c6f37eaf7
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-09 10:02:20 +02:00
Sebastian Davaris
bb03c4fc93
Added Models
2020-06-09 10:02:07 +02:00
7eaa3311cb
Merge branch 'master' of C:\Users\vedr0021\PhpstormProjects\skolehjem-webapp with conflicts.
2020-06-09 09:05:07 +02:00
Sebastian Davaris
bab4c6d72e
Removed Vue
2020-06-09 08:38:05 +02:00
Sebastian Davaris
43fc299642
Added Vue
2020-06-09 08:24:20 +02:00
Sebastian Davaris
fbf1673fc0
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-08 15:08:58 +02:00
Sebastian Davaris
bd23d10a9d
Added first seeder.
2020-06-08 15:08:46 +02:00
e2562f6960
added migrations of events, feedback, washing machines, and calendar events.
...
changed migration users table name into name first and name last.
added migration external link table string: name and link.
2020-06-08 14:59:25 +02:00
cb20b1f862
added feedback, external link and washing reservations migrations
2020-06-08 10:56:37 +02:00
Sebastian Davaris
da00009fe9
Initial Commit
2020-06-08 10:04:45 +02:00
frederikpyt
Neerholt
Anders
Vedde
Sebastian Davaris
Sebastian