Compare commits

...

141 Commits
1.0.3 ... 1.5.2

Author SHA1 Message Date
Dennis
120b4c9df7 prod mix 2021-05-13 20:37:41 +02:00
Dennis
0eb66c10f6 Merge branch 'develop' 2021-05-13 20:37:09 +02:00
Dennis
1a6b14a250 Ran psr formatting 2021-05-13 20:37:03 +02:00
Dennis
072c8569eb added indian rupee 2021-05-13 20:36:41 +02:00
Dennis
5b9378255b Loading state to select country dropdown 2021-05-11 14:59:34 +02:00
Dennis
ac3cf16377 Production mix 2021-05-11 11:55:08 +02:00
Dennis
31154d20f6 wip 2021-05-11 11:54:43 +02:00
Dennis
f8031ac71a Merge branch 'develop'
# Conflicts:
#	public/css/app.css
#	public/js/2035.js
#	public/js/2407.js
#	public/js/2741.js
#	public/js/4104.js
#	public/js/4627.js
#	public/js/547.js
#	public/js/5727.js
#	public/js/630.js
#	public/js/6341.js
#	public/js/6675.js
#	public/js/6974.js
#	public/js/7438.js
#	public/js/9039.js
#	public/js/9202.js
#	public/js/9737.js
#	public/js/9989.js
#	public/js/app.js
#	public/js/app.js.LICENSE.txt
2021-05-11 11:54:09 +02:00
Dennis
898ec6a454 Stripe billing details used for india regulations 2021-05-11 11:50:41 +02:00
Dennis
9dbd54fdf6 wip 2021-05-07 11:07:48 +02:00
Dennis
934017384d wip 2021-05-07 11:04:38 +02:00
Dennis
aee3dc0d93 Merge branch 'develop' 2021-05-05 15:50:42 +02:00
Dennis
8046687ae7 Bugfix for settings 2021-05-05 15:49:05 +02:00
Dennis
a89ee796c1 Prod mix 2021-05-05 11:25:07 +02:00
Dennis
af1d3c3edc wip 2021-05-05 11:24:19 +02:00
Dennis
e1a54c2781 wip 2021-05-05 11:23:54 +02:00
Dennis
2d9f7d49b5 Merge branch 'develop' 2021-05-05 11:22:23 +02:00
Dennis
d10b046033 New features
- Few bugfixes
- Updated to TW2.0
- Updated Laravel Mix
- Documentation is now working
2021-05-05 11:21:48 +02:00
Dennis
1725c0ff65 Merge branch 'develop' 2021-05-01 08:25:59 +02:00
Dennis
b852756c82 Bugfix 2021-05-01 08:25:46 +02:00
Dennis
f164d878d7 Linking storage 2021-04-01 09:49:44 +02:00
Dennis
ecc10fffcb Merge branch 'develop' 2021-03-15 10:51:30 +01:00
Dennis
5c75b015ba Register fix 2021-03-15 10:51:23 +01:00
Dennis
65f7dc697e Production mix 2021-03-12 14:20:30 +01:00
Dennis
d981f0f899 Merge branch 'develop'
# Conflicts:
#	public/js/13.js
#	public/js/23.js
#	public/js/app.js
2021-03-12 14:20:12 +01:00
Dennis
ab50beefab Package updates & GBP currency 2021-03-12 14:20:00 +01:00
Dennis
58d1215fd6 Production mix 2021-02-10 13:56:20 +01:00
Dennis
1dc137c314 Merge branch 'develop'
# Conflicts:
#	package-lock.json
#	public/js/10.js
#	public/js/11.js
#	public/js/12.js
#	public/js/13.js
#	public/js/14.js
#	public/js/15.js
#	public/js/16.js
#	public/js/17.js
#	public/js/18.js
#	public/js/19.js
#	public/js/20.js
#	public/js/21.js
#	public/js/22.js
#	public/js/23.js
#	public/js/24.js
#	public/js/25.js
#	public/js/26.js
#	public/js/27.js
#	public/js/28.js
#	public/js/29.js
#	public/js/30.js
#	public/js/31.js
#	public/js/32.js
#	public/js/33.js
#	public/js/58.js
#	public/js/62.js
#	public/js/63.js
#	public/js/64.js
#	public/js/65.js
#	public/js/66.js
#	public/js/67.js
#	public/js/68.js
#	public/js/69.js
#	public/js/70.js
#	public/js/71.js
#	public/js/72.js
#	public/js/73.js
#	public/js/74.js
#	public/js/75.js
#	public/js/76.js
#	public/js/77.js
#	public/js/78.js
#	public/js/79.js
#	public/js/8.js
#	public/js/80.js
#	public/js/9.js
#	public/js/app.js
2021-02-10 13:55:43 +01:00
Dennis
ca51e9bf5f package updates 2021-02-10 13:55:18 +01:00
Dennis
c588583dfc Few tweaks 2021-02-10 13:54:30 +01:00
Dennis
57c7c53eae Added spanish 2021-01-20 09:18:21 +01:00
Dennis
76a62d9992 rm 2021-01-20 09:16:43 +01:00
Dennis
575aa1c6b1 wip 2020-12-29 08:39:05 +01:00
Dennis
4867a61fd0 Production mixed 2020-12-14 12:55:09 +01:00
Dennis
a63e8f350b Merge branch 'develop'
# Conflicts:
#	public/js/52.js
#	public/js/app.js
2020-12-14 12:54:39 +01:00
Dennis
6c1b4f28af Portuguese added 2020-12-14 12:54:22 +01:00
Dennis
09adccf752 Flush version data 2020-12-02 11:00:28 +01:00
Dennis
79bb522dee Don’t allow horizon in production 2020-12-02 10:58:39 +01:00
Dennis
2adc4bc7ca Production mixed 2020-11-28 11:41:34 +01:00
Dennis
0a81d58051 Merge branch 'develop'
# Conflicts:
#	public/css/app.css
#	public/js/0.js
#	public/js/1.js
#	public/js/18.js
#	public/js/19.js
#	public/js/20.js
#	public/js/21.js
#	public/js/22.js
#	public/js/23.js
#	public/js/24.js
#	public/js/25.js
#	public/js/26.js
#	public/js/27.js
#	public/js/31.js
#	public/js/49.js
#	public/js/5.js
#	public/js/50.js
#	public/js/51.js
#	public/js/52.js
#	public/js/61.js
#	public/js/71.js
#	public/js/72.js
#	public/js/73.js
#	public/js/74.js
#	public/js/app.js
2020-11-28 11:41:00 +01:00
Dennis
cb84438778 Improve ping command 2020-11-28 11:12:54 +01:00
Dennis
b0a76d311c Change this 2020-11-28 10:23:26 +01:00
Dennis
5604503d26 wip 2020-11-28 09:48:50 +01:00
Dennis
bf55092b3a wip 2020-11-28 09:13:42 +01:00
Dennis
8286e7f9af customizing 2020-11-27 19:46:53 +01:00
Dennis
1255221550 wip 2020-11-26 15:59:48 +01:00
Dennis
f4062cd6e7 wip 2020-11-26 15:23:38 +01:00
Dennis
93377ae753 Ability to allow custom styling 2020-11-25 15:56:16 +01:00
Dennis
a43cd19efd production mixing 2020-11-24 14:49:44 +01:00
Dennis
e5eec000d3 Merge branch 'develop'
# Conflicts:
#	public/js/0.js
#	public/js/1.js
#	public/js/10.js
#	public/js/11.js
#	public/js/12.js
#	public/js/13.js
#	public/js/14.js
#	public/js/15.js
#	public/js/16.js
#	public/js/17.js
#	public/js/18.js
#	public/js/19.js
#	public/js/20.js
#	public/js/21.js
#	public/js/22.js
#	public/js/23.js
#	public/js/24.js
#	public/js/25.js
#	public/js/26.js
#	public/js/27.js
#	public/js/28.js
#	public/js/29.js
#	public/js/30.js
#	public/js/31.js
#	public/js/32.js
#	public/js/33.js
#	public/js/34.js
#	public/js/35.js
#	public/js/36.js
#	public/js/37.js
#	public/js/38.js
#	public/js/39.js
#	public/js/40.js
#	public/js/41.js
#	public/js/42.js
#	public/js/43.js
#	public/js/44.js
#	public/js/45.js
#	public/js/46.js
#	public/js/47.js
#	public/js/48.js
#	public/js/49.js
#	public/js/50.js
#	public/js/51.js
#	public/js/52.js
#	public/js/53.js
#	public/js/54.js
#	public/js/55.js
#	public/js/56.js
#	public/js/57.js
#	public/js/58.js
#	public/js/59.js
#	public/js/60.js
#	public/js/61.js
#	public/js/62.js
#	public/js/63.js
#	public/js/64.js
#	public/js/65.js
#	public/js/66.js
#	public/js/67.js
#	public/js/68.js
#	public/js/69.js
#	public/js/70.js
#	public/js/71.js
#	public/js/72.js
#	public/js/73.js
#	public/js/74.js
#	public/js/75.js
#	public/js/9.js
#	public/js/app.js
2020-11-24 14:48:46 +01:00
Dennis
e5c8a62b32 wip 2020-11-24 14:48:02 +01:00
Dennis
9ae1c145b6 wip 2020-11-24 13:35:48 +01:00
Dennis
eb8b75e4f9 wip 2020-11-19 14:49:46 +01:00
Dennis
7378b82adf wip 2020-11-19 14:27:37 +01:00
Dennis
6f3b588f3d fx 2020-11-19 11:48:22 +01:00
Dennis
a2154cf37c wip 2020-11-18 12:06:34 +01:00
Dennis
9dab5f8093 wip 2020-11-18 11:22:44 +01:00
Dennis
9c9469d2f6 Title fixes 2020-11-17 13:29:35 +01:00
Dennis
94acc313b1 Alerts added 2020-11-17 12:40:39 +01:00
Dennis
448398322f Production mix 2020-11-12 20:42:40 +01:00
Dennis
3a78339396 Merge branch 'develop'
# Conflicts:
#	public/js/10.js
#	public/js/app.js
2020-11-12 20:42:04 +01:00
Dennis
a925a70448 Providers fix 2020-11-12 20:41:41 +01:00
Dennis
e283eacaa3 Production mixed 2020-11-12 13:34:27 +01:00
Dennis
3df6b6baed Merge branch 'develop'
# Conflicts:
#	public/js/0.js
#	public/js/10.js
#	public/js/11.js
#	public/js/12.js
#	public/js/13.js
#	public/js/14.js
#	public/js/15.js
#	public/js/16.js
#	public/js/17.js
#	public/js/18.js
#	public/js/19.js
#	public/js/20.js
#	public/js/21.js
#	public/js/22.js
#	public/js/23.js
#	public/js/24.js
#	public/js/25.js
#	public/js/26.js
#	public/js/27.js
#	public/js/28.js
#	public/js/29.js
#	public/js/30.js
#	public/js/31.js
#	public/js/32.js
#	public/js/33.js
#	public/js/34.js
#	public/js/35.js
#	public/js/36.js
#	public/js/37.js
#	public/js/38.js
#	public/js/39.js
#	public/js/40.js
#	public/js/41.js
#	public/js/42.js
#	public/js/43.js
#	public/js/44.js
#	public/js/45.js
#	public/js/46.js
#	public/js/47.js
#	public/js/48.js
#	public/js/49.js
#	public/js/50.js
#	public/js/52.js
#	public/js/67.js
#	public/js/68.js
#	public/js/69.js
#	public/js/75.js
#	public/js/8.js
#	public/js/9.js
#	public/js/app.js
2020-11-12 13:33:57 +01:00
Dennis
b65526e040 Stripe coupon fix && general updates 2020-11-12 13:33:34 +01:00
Dennis
673bbf73be Responsive progress 2020-11-11 16:27:16 +01:00
Dennis
094d22eaa8 Added API link here 2020-11-11 14:10:29 +01:00
Dennis
0fdba5fdec default to en here 2020-11-11 13:42:05 +01:00
Dennis
cf0730be89 Production mix 2020-11-11 13:09:48 +01:00
Dennis
221e67fd12 Merge branch 'develop' 2020-11-11 13:06:15 +01:00
Dennis
f9074309d1 Added coupon feature 2020-11-11 12:30:33 +01:00
Dennis
b2bdbb9e30 Allow sorting in billing 2020-11-11 12:07:06 +01:00
Dennis
63d0cb9626 Default language setting & fixed norwegian keys 2020-11-11 10:58:19 +01:00
Dennis
e3bb3ae4d1 Merge branch 'develop' 2020-11-06 08:42:09 +01:00
Dennis
31890005ac Fix 2020-11-06 08:41:52 +01:00
Dennis
04a216dee1 Merge branch 'develop' 2020-11-05 11:21:40 +01:00
Dennis
5d403c1202 Fix currency displayer 2020-11-05 11:21:29 +01:00
Dennis
a2d92c67b3 Merge branch 'develop' 2020-11-04 14:00:41 +01:00
Dennis
0fec3d82a3 Ugly bug 2020-11-04 14:00:36 +01:00
Dennis
6530a64f97 Production mixed 2020-11-04 13:42:50 +01:00
Dennis
656f02d652 Merge branch 'develop'
# Conflicts:
#	public/js/0.js
#	public/js/13.js
#	public/js/14.js
#	public/js/18.js
#	public/js/20.js
#	public/js/21.js
#	public/js/22.js
#	public/js/23.js
#	public/js/24.js
#	public/js/25.js
#	public/js/26.js
#	public/js/27.js
#	public/js/28.js
#	public/js/29.js
#	public/js/30.js
#	public/js/31.js
#	public/js/32.js
#	public/js/33.js
#	public/js/34.js
#	public/js/35.js
#	public/js/36.js
#	public/js/37.js
#	public/js/38.js
#	public/js/39.js
#	public/js/40.js
#	public/js/41.js
#	public/js/42.js
#	public/js/43.js
#	public/js/44.js
#	public/js/45.js
#	public/js/46.js
#	public/js/47.js
#	public/js/48.js
#	public/js/49.js
#	public/js/50.js
#	public/js/51.js
#	public/js/52.js
#	public/js/53.js
#	public/js/54.js
#	public/js/55.js
#	public/js/56.js
#	public/js/57.js
#	public/js/58.js
#	public/js/59.js
#	public/js/60.js
#	public/js/61.js
#	public/js/62.js
#	public/js/63.js
#	public/js/64.js
#	public/js/65.js
#	public/js/66.js
#	public/js/67.js
#	public/js/68.js
#	public/js/69.js
#	public/js/70.js
#	public/js/app.js
2020-11-04 13:42:17 +01:00
Dennis
0dbf3bba4d Wip 2020-11-04 13:41:46 +01:00
Dennis
ea47c0c3c6 wip 2020-11-04 12:15:19 +01:00
Dennis
b4072c7892 wip 2020-10-27 10:05:52 +01:00
Dennis
e80cd1990a Added more currencies 2020-10-27 08:40:26 +01:00
Dennis
2585cc1db4 Production mix 2020-10-26 07:51:05 +01:00
Dennis
0225828445 Add Norwegian language 2020-10-26 07:49:58 +01:00
Dennis
63af93592d Keyboard shortcuts disable-able 2020-10-22 14:06:23 +02:00
Dennis
b87fcd0f25 Danish language 2020-10-22 11:54:27 +02:00
Dennis
23a6b3cc55 Tweaks 2020-10-21 09:39:44 +02:00
Dennis
dac3d229fd Support MariaDB better 2020-10-21 09:03:35 +02:00
Dennis
e360d9c5df Add update script 2020-10-21 08:50:48 +02:00
Dennis
8f100fc027 wip 2020-10-21 08:47:06 +02:00
Dennis
06fb331ae4 Sorting 2020-10-20 15:53:59 +02:00
Dennis
2bcf02a779 Production mixed 2020-10-20 15:47:32 +02:00
Dennis
1b24664b60 Merge branch 'feature/server-management'
# Conflicts:
#	public/css/app.css
#	public/js/0.js
#	public/js/1.js
#	public/js/10.js
#	public/js/11.js
#	public/js/12.js
#	public/js/13.js
#	public/js/14.js
#	public/js/15.js
#	public/js/16.js
#	public/js/17.js
#	public/js/18.js
#	public/js/19.js
#	public/js/20.js
#	public/js/21.js
#	public/js/22.js
#	public/js/23.js
#	public/js/24.js
#	public/js/25.js
#	public/js/26.js
#	public/js/27.js
#	public/js/28.js
#	public/js/29.js
#	public/js/30.js
#	public/js/31.js
#	public/js/32.js
#	public/js/33.js
#	public/js/34.js
#	public/js/35.js
#	public/js/36.js
#	public/js/37.js
#	public/js/38.js
#	public/js/39.js
#	public/js/4.js
#	public/js/40.js
#	public/js/41.js
#	public/js/42.js
#	public/js/43.js
#	public/js/44.js
#	public/js/45.js
#	public/js/46.js
#	public/js/47.js
#	public/js/48.js
#	public/js/49.js
#	public/js/50.js
#	public/js/51.js
#	public/js/52.js
#	public/js/53.js
#	public/js/54.js
#	public/js/55.js
#	public/js/56.js
#	public/js/57.js
#	public/js/58.js
#	public/js/59.js
#	public/js/60.js
#	public/js/61.js
#	public/js/62.js
#	public/js/63.js
#	public/js/64.js
#	public/js/65.js
#	public/js/66.js
#	public/js/67.js
#	public/js/68.js
#	public/js/8.js
#	public/js/9.js
#	public/js/app.js
2020-10-20 15:46:59 +02:00
Dennis
2ce96a2062 wip 2020-10-20 15:46:18 +02:00
Dennis
5d737ba328 wip 2020-10-20 13:54:27 +02:00
Dennis
bafe8ba780 wip 2020-10-20 13:43:26 +02:00
Dennis
b7ff40fd72 wip 2020-10-20 12:30:21 +02:00
Dennis
8e036b1c01 wip 2020-10-20 12:21:13 +02:00
Dennis
b016c18880 wip 2020-10-20 12:16:40 +02:00
Dennis
d17ae49155 PSR formatting 2020-10-20 12:03:44 +02:00
Dennis
6ef5cd25f5 wip 2020-10-20 12:03:19 +02:00
Dennis
c98f077a0e wip 2020-10-20 11:25:32 +02:00
Dennis
a1f58c8e13 wip 2020-10-20 10:21:00 +02:00
Dennis
37281b01e4 wip 2020-10-14 13:19:24 +02:00
Dennis
65b0a768af Progress 2020-10-14 12:25:15 +02:00
Dennis
39af06d3b2 Tailwind 1.9 2020-10-13 15:12:21 +02:00
Dennis Smink
7d137dd612 wip 2020-10-09 12:51:29 +02:00
Dennis Smink
ce5e6c18f0 wip 2020-10-08 14:56:48 +02:00
Dennis Smink
3d445ca61a Allow attaching providers to packages 2020-10-06 12:47:20 +02:00
Dennis Smink
8566eaaa6c wip 2020-10-05 14:57:18 +02:00
Dennis Smink
db1647569c wip 2020-10-05 14:56:44 +02:00
Dennis Smink
204afb7eb1 wip 2020-10-05 14:34:24 +02:00
Dennis Smink
37f82d4579 Production mixed 2020-09-28 14:08:11 +02:00
Dennis Smink
2ed440e65f Merge branch 'develop'
# Conflicts:
#	public/js/1.js
#	public/js/10.js
#	public/js/11.js
#	public/js/12.js
#	public/js/13.js
#	public/js/14.js
#	public/js/15.js
#	public/js/16.js
#	public/js/17.js
#	public/js/18.js
#	public/js/19.js
#	public/js/2.js
#	public/js/20.js
#	public/js/21.js
#	public/js/22.js
#	public/js/23.js
#	public/js/24.js
#	public/js/25.js
#	public/js/26.js
#	public/js/27.js
#	public/js/28.js
#	public/js/29.js
#	public/js/3.js
#	public/js/30.js
#	public/js/31.js
#	public/js/32.js
#	public/js/33.js
#	public/js/34.js
#	public/js/35.js
#	public/js/36.js
#	public/js/37.js
#	public/js/38.js
#	public/js/39.js
#	public/js/4.js
#	public/js/40.js
#	public/js/41.js
#	public/js/42.js
#	public/js/43.js
#	public/js/44.js
#	public/js/45.js
#	public/js/46.js
#	public/js/47.js
#	public/js/48.js
#	public/js/49.js
#	public/js/50.js
#	public/js/51.js
#	public/js/52.js
#	public/js/53.js
#	public/js/54.js
#	public/js/55.js
#	public/js/56.js
#	public/js/57.js
#	public/js/58.js
#	public/js/59.js
#	public/js/6.js
#	public/js/60.js
#	public/js/61.js
#	public/js/62.js
#	public/js/63.js
#	public/js/64.js
#	public/js/65.js
#	public/js/66.js
#	public/js/8.js
#	public/js/9.js
#	public/js/app.js
2020-09-28 14:07:31 +02:00
Dennis Smink
57a5ec2206 Mixes 2020-09-28 13:56:23 +02:00
Dennis Smink
f14bc0494b finalize 2020-09-28 13:53:30 +02:00
Dennis Smink
c4147f0125 wip 2020-09-28 13:35:54 +02:00
Dennis Smink
cfd0c3cbe9 wip 2020-09-28 11:11:37 +02:00
Dennis Smink
0d0e2732b5 wip 2020-09-28 10:45:05 +02:00
Dennis Smink
0a7b072eeb wip 2020-09-27 19:06:33 +02:00
Dennis Smink
af6e12ca01 wip 2020-09-27 13:30:52 +02:00
Dennis Smink
5eba94fd9b wip 2020-09-25 20:44:18 +02:00
Dennis Smink
e9756494d9 wip 2020-09-25 15:17:18 +02:00
Dennis Smink
f7f919b5de Update columns 2020-09-25 15:00:04 +02:00
Dennis Smink
6f434f3b07 Initial start on stripe 2020-09-25 14:56:01 +02:00
Dennis Smink
8820851afa wip 2020-09-25 14:42:20 +02:00
Dennis Smink
4582e955d0 wip 2020-09-25 14:05:37 +02:00
Dennis Smink
e07395b3d5 Wip 2020-09-25 09:45:59 +02:00
Dennis Smink
3ad7d06976 Less logging days 2020-09-25 09:37:54 +02:00
Dennis Smink
f57cbb76e3 Ability to read up into laravel logs 2020-09-25 09:29:57 +02:00
Dennis Smink
bb3151a2fe Progress 2020-09-24 16:06:56 +02:00
Dennis Smink
5b48d204a0 Wip 2020-09-24 15:26:26 +02:00
Dennis Smink
680d96882a Progress 2020-09-24 15:09:09 +02:00
Dennis Smink
7347356646 Progress on improved permissions 2020-09-24 11:49:00 +02:00
Dennis Smink
2652e7ed71 Improve installation 2020-09-23 21:48:27 +02:00
Dennis Smink
a068da2a54 Production mixed 2020-09-22 14:11:52 +02:00
Dennis Smink
de69a2687a Merge branch 'develop'
# Conflicts:
#	public/js/41.js
#	public/js/42.js
#	public/js/43.js
#	public/js/44.js
#	public/js/45.js
#	public/js/46.js
#	public/js/47.js
#	public/js/48.js
#	public/js/49.js
#	public/js/50.js
#	public/js/51.js
#	public/js/52.js
#	public/js/53.js
#	public/js/54.js
#	public/js/55.js
#	public/js/56.js
#	public/js/57.js
#	public/js/58.js
#	public/js/59.js
#	public/js/6.js
#	public/js/60.js
#	public/js/61.js
#	public/js/62.js
#	public/js/63.js
#	public/js/app.js
2020-09-22 14:11:20 +02:00
Dennis Smink
59552cf8e5 Progress on server management for users 2020-09-22 13:56:34 +02:00
402 changed files with 31402 additions and 15649 deletions

View File

@@ -36,6 +36,10 @@ MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS=null
MAIL_FROM_NAME="${APP_NAME}"
STRIPE_KEY=your-stripe-key
STRIPE_SECRET=your-stripe-secret
CASHIER_MODEL=App\Models\User
AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1

1
.gitignore vendored
View File

@@ -12,3 +12,4 @@ npm-debug.log
yarn-error.log
.idea
.php_cs.cache
/public/js/resources*.js

View File

@@ -8,11 +8,11 @@ $finder = Symfony\Component\Finder\Finder::create()
->name('*.php')
->notName('*.blade.php');
return PhpCsFixer\Config::create()
return (new PhpCsFixer\Config)
->setRules([
'@PSR2' => true,
'array_syntax' => ['syntax' => 'short'],
'ordered_imports' => ['sortAlgorithm' => 'length'],
'ordered_imports' => ['sort_algorithm' => 'length'],
'no_unused_imports' => true,
])
->setFinder($finder);

View File

@@ -0,0 +1,44 @@
<?php
namespace App\Casts;
use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
class PermissionCast implements CastsAttributes
{
/**
* Cast the given value.
*
* @param \Illuminate\Database\Eloquent\Model $model
* @param string $key
* @param mixed $value
* @param array $attributes
* @return mixed
*/
public function get($model, $key, $value, $attributes)
{
if (!$value) {
return [
'create' => false,
'update' => false,
'delete' => false,
];
}
return json_decode($value, true);
}
/**
* Prepare the given value for storage.
*
* @param \Illuminate\Database\Eloquent\Model $model
* @param string $key
* @param array $value
* @param array $attributes
* @return mixed
*/
public function set($model, $key, $value, $attributes)
{
return json_encode($value);
}
}

View File

@@ -0,0 +1,31 @@
<?php
namespace App\Console\Commands\Core;
use Illuminate\Console\Command;
use Illuminate\Filesystem\Filesystem;
class Css extends Command
{
protected $signature = 'core:css';
protected $description = 'Generates an theme.css file for you to customize';
public function handle()
{
if (file_exists(storage_path('app/public/theme.css')) && !$this->confirm('You seem to already have a theme.css published, are you sure you want to overwrite?')) {
$this->warn('Aborted publishing of theme.css.');
return 0;
}
$this->info('Publishing theme.css file..');
(new Filesystem)->copy(
__DIR__ . '/stubs/theme.css',
storage_path('app/public/theme.css')
);
$this->info('Done! You can edit the theme.css file inside storage/public/theme.css');
}
}

View File

@@ -0,0 +1,31 @@
<?php
namespace App\Console\Commands\Core;
use Illuminate\Console\Command;
use Illuminate\Filesystem\Filesystem;
class CssBackup extends Command
{
protected $signature = 'core:css-backup';
protected $description = 'Creates a backup from your own created theme.css';
public function handle()
{
if (!file_exists(storage_path('app/public/theme.css'))) {
$this->warn('There is no custom theme.css, aborting backup.');
return 0;
}
$this->info('Backing up theme.css file..');
(new Filesystem)->copy(
storage_path('app/public/theme.css'),
storage_path('app/public/theme-backup.css')
);
$this->info('Done! You can find the CSS backup file here storage/public/theme-backup.css');
}
}

View File

@@ -12,6 +12,7 @@ use Illuminate\Console\Command;
use App\Services\VersionChecker;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Artisan;
class Install extends Command
{
@@ -21,15 +22,9 @@ class Install extends Command
protected $versionChecker;
protected $installationFile = 'app/installation';
public function __construct()
{
parent::__construct();
$this->versionChecker = (new VersionChecker)->getVersions();
}
public function handle()
{
$this->init();
$this->intro();
$this->isInstalled();
$this->checkApplicationKey();
@@ -40,11 +35,17 @@ class Install extends Command
$this->askAboutDefaultPackages();
$this->checkApplicationUrl();
$this->createInstallationFile();
$this->linkStorage();
$this->info('Succes! Installation has finished.');
$this->info('Visit your platform at ' . env('APP_URL'));
}
protected function init()
{
$this->versionChecker = (new VersionChecker)->getVersions();
}
protected function askAboutAdministrationAccount()
{
$this->info('Let\'s start by setting up your administration account.');
@@ -85,16 +86,46 @@ class Install extends Command
Package::create([
'name' => 'Basic',
'maximum_sites' => 5,
'site_permissions' => [
'create' => true,
'update' => true,
'delete' => true
],
'server_permissions' => [
'create' => false,
'update' => false,
'delete' => false
]
]);
Package::create([
'name' => 'Professional',
'maximum_sites' => 5,
'maximum_sites' => 30,
'site_permissions' => [
'create' => true,
'update' => true,
'delete' => true
],
'server_permissions' => [
'create' => false,
'update' => false,
'delete' => false
]
]);
Package::create([
'name' => 'Unlimited',
'maximum_sites' => 0,
'site_permissions' => [
'create' => true,
'update' => true,
'delete' => true
],
'server_permissions' => [
'create' => false,
'update' => false,
'delete' => false
]
]);
}
@@ -174,6 +205,11 @@ class Install extends Command
file_put_contents(storage_path($this->installationFile), json_encode($this->getInstallationPayload(), JSON_PRETTY_PRINT));
}
protected function linkStorage()
{
Artisan::call('storage:link');
}
protected function createDatabaseCredentials(): bool
{
$storeCredentials = $this->confirm(

View File

@@ -0,0 +1,78 @@
:root {
--font-body: 'Inter', sans-serif;
--color-white: #fff;
--color-gray-1: #f7f7f7;
--color-gray-2: #e6e6e6;
--color-gray-3: #cacaca;
--color-gray-4: #888;
--color-gray-5: #666;
--color-gray-6: #2f2f2f;
--color-gray-7: #1b1a1a;
--color-gray-8: #101010;
--color-primary: #1b8ae8;
--color-success: #17b35d;
--color-warning: #f5a623;
--color-danger: #c90c4c;
--color-text-high-emphasis: var(--color-gray-8);
--color-text-medium-emphasis: var(--color-gray-5);
--color-text-low-emphasis: var(--color-gray-3);
--color-text-on-primary: var(--color-white);
--color-text-on-success: var(--color-gray-8);
--color-text-on-warning: var(--color-white);
--color-text-on-danger: var(--color-white);
--color-border-high-emphasis: var(--color-gray-4);
--color-border-medium-emphasis: var(--color-gray-3);
--color-border-low-emphasis: var(--color-gray-2);
--color-backdrop: rgba(0, 0, 0, 0.5);
--color-overlay: rgba(255, 255, 255, 0.8);
--color-surface-1: var(--color-white);
--color-surface-2: var(--color-gray-1);
--color-surface-3: var(--color-white);
--border-radius: 0.5rem;
--border-radius-avatar: 4rem;
--border-radius-circle: 100%;
--top-bar-container: 64rem;
--top-bar-logo-height: 3.5rem;
--top-bar-background-color: var(--color-surface-1);
--top-bar-text-color: var(--color-text-medium-emphasis);
--tab-bar-background-color: var(--color-surface-2);
--tab-bar-item-active-background-color: var(--color-surface-1);
--tab-bar-item-text-color: var(--color-text-medium-emphasis);
--tab-bar-item-active-text-color: var(--color-text-high-emphasis);
--breadcrumbs-text-color: var(--color-text-medium-emphasis);
}
.theme--dark {
--color-primary: #63a6f5;
--color-success: #50e3c2;
--color-warning: #f5a623;
--color-danger: #d4667c;
--color-text-high-emphasis: var(--color-white);
--color-text-medium-emphasis: var(--color-gray-3);
--color-text-low-emphasis: var(--color-gray-5);
--color-text-on-primary: var(--color-gray-7);
--color-text-on-success: var(--color-gray-7);
--color-text-on-warning: var(--color-gray-7);
--color-text-on-danger: var(--color-gray-7);
--color-border-high-emphasis: var(--color-gray-4);
--color-border-medium-emphasis: var(--color-gray-5);
--color-border-low-emphasis: var(--color-gray-6);
--color-surface-1: var(--color-gray-7);
--color-surface-2: var(--color-gray-6);
--color-surface-3: var(--color-gray-6);
--color-overlay: rgba(0, 0, 0, 0.8);
}

View File

@@ -3,7 +3,9 @@
namespace App\Console;
use App\Jobs\Core\Ping;
use App\Console\Commands\Core\Css;
use App\Console\Commands\Core\Install;
use App\Console\Commands\Core\CssBackup;
use App\Console\Commands\Core\Synchronize;
use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
@@ -11,6 +13,8 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
class Kernel extends ConsoleKernel
{
protected $commands = [
Css::class,
CssBackup::class,
Install::class,
Synchronize::class,
];

281
app/Helpers/Country.php Normal file
View File

@@ -0,0 +1,281 @@
<?php
if (!function_exists('countries')) {
function countries($key = null)
{
$arr = [
'af' => 'Afghanistan',
'al' => 'Albania',
'dz' => 'Algeria',
'as' => 'American Samoa',
'ad' => 'Andorra',
'ao' => 'Angola',
'ai' => 'Anguilla',
'aq' => 'Antarctica',
'ag' => 'Antigua and Barbuda',
'ar' => 'Argentina',
'am' => 'Armenia',
'aw' => 'Aruba',
'au' => 'Australia',
'at' => 'Austria',
'az' => 'Azerbaijan',
'bs' => 'Bahamas',
'bh' => 'Bahrain',
'bd' => 'Bangladesh',
'bb' => 'Barbados',
'by' => 'Belarus',
'be' => 'Belgium',
'bz' => 'Belize',
'bj' => 'Benin',
'bm' => 'Bermuda',
'bt' => 'Bhutan',
'bo' => 'Bolivia',
'ba' => 'Bosnia and Herzegovina',
'bw' => 'Botswana',
'bv' => 'Bouvet Island',
'br' => 'Brazil',
'bq' => 'British Antarctic Territory',
'io' => 'British Indian Ocean Territory',
'vg' => 'British Virgin Islands',
'bn' => 'Brunei',
'bg' => 'Bulgaria',
'bf' => 'Burkina Faso',
'bi' => 'Burundi',
'kh' => 'Cambodia',
'cm' => 'Cameroon',
'ca' => 'Canada',
'ct' => 'Canton and Enderbury Islands',
'cv' => 'Cape Verde',
'ky' => 'Cayman Islands',
'cf' => 'Central African Republic',
'td' => 'Chad',
'cl' => 'Chile',
'cn' => 'China',
'cx' => 'Christmas Island',
'cc' => 'Cocos [Keeling] Islands',
'co' => 'Colombia',
'km' => 'Comoros',
'cg' => 'Congo - Brazzaville',
'cd' => 'Congo - Kinshasa',
'ck' => 'Cook Islands',
'cr' => 'Costa Rica',
'hr' => 'Croatia',
'cu' => 'Cuba',
'cy' => 'Cyprus',
'cz' => 'Czech Republic',
'ci' => 'Côte dIvoire',
'dk' => 'Denmark',
'dj' => 'Djibouti',
'dm' => 'Dominica',
'do' => 'Dominican Republic',
'nq' => 'Dronning Maud Land',
'dd' => 'East Germany',
'ec' => 'Ecuador',
'eg' => 'Egypt',
'sv' => 'El Salvador',
'gq' => 'Equatorial Guinea',
'er' => 'Eritrea',
'ee' => 'Estonia',
'et' => 'Ethiopia',
'fk' => 'Falkland Islands',
'fo' => 'Faroe Islands',
'fj' => 'Fiji',
'fi' => 'Finland',
'fr' => 'France',
'gf' => 'French Guiana',
'pf' => 'French Polynesia',
'tf' => 'French Southern Territories',
'fq' => 'French Southern and Antarctic Territories',
'ga' => 'Gabon',
'gm' => 'Gambia',
'ge' => 'Georgia',
'de' => 'Germany',
'gh' => 'Ghana',
'gi' => 'Gibraltar',
'gr' => 'Greece',
'gl' => 'Greenland',
'gd' => 'Grenada',
'gp' => 'Guadeloupe',
'gu' => 'Guam',
'gt' => 'Guatemala',
'gg' => 'Guernsey',
'gn' => 'Guinea',
'gw' => 'Guinea-Bissau',
'gy' => 'Guyana',
'ht' => 'Haiti',
'hm' => 'Heard Island and McDonald Islands',
'hn' => 'Honduras',
'hk' => 'Hong Kong SAR China',
'hu' => 'Hungary',
'is' => 'Iceland',
'in' => 'India',
'id' => 'Indonesia',
'ir' => 'Iran',
'iq' => 'Iraq',
'ie' => 'Ireland',
'im' => 'Isle of Man',
'il' => 'Israel',
'it' => 'Italy',
'jm' => 'Jamaica',
'jp' => 'Japan',
'je' => 'Jersey',
'jt' => 'Johnston Island',
'jo' => 'Jordan',
'kz' => 'Kazakhstan',
'ke' => 'Kenya',
'ki' => 'Kiribati',
'kw' => 'Kuwait',
'kg' => 'Kyrgyzstan',
'la' => 'Laos',
'lv' => 'Latvia',
'lb' => 'Lebanon',
'ls' => 'Lesotho',
'lr' => 'Liberia',
'ly' => 'Libya',
'li' => 'Liechtenstein',
'lt' => 'Lithuania',
'lu' => 'Luxembourg',
'mo' => 'Macau SAR China',
'mk' => 'Macedonia',
'mg' => 'Madagascar',
'mw' => 'Malawi',
'my' => 'Malaysia',
'mv' => 'Maldives',
'ml' => 'Mali',
'mt' => 'Malta',
'mh' => 'Marshall Islands',
'mq' => 'Martinique',
'mr' => 'Mauritania',
'mu' => 'Mauritius',
'yt' => 'Mayotte',
'fx' => 'Metropolitan France',
'mx' => 'Mexico',
'fm' => 'Micronesia',
'mi' => 'Midway Islands',
'md' => 'Moldova',
'mc' => 'Monaco',
'mn' => 'Mongolia',
'me' => 'Montenegro',
'ms' => 'Montserrat',
'ma' => 'Morocco',
'mz' => 'Mozambique',
'mm' => 'Myanmar [Burma]',
'na' => 'Namibia',
'nr' => 'Nauru',
'np' => 'Nepal',
'nl' => 'Netherlands',
'an' => 'Netherlands Antilles',
'nt' => 'Neutral Zone',
'nc' => 'New Caledonia',
'nz' => 'New Zealand',
'ni' => 'Nicaragua',
'ne' => 'Niger',
'ng' => 'Nigeria',
'nu' => 'Niue',
'nf' => 'Norfolk Island',
'kp' => 'North Korea',
'vd' => 'North Vietnam',
'mp' => 'Northern Mariana Islands',
'no' => 'Norway',
'om' => 'Oman',
'pc' => 'Pacific Islands Trust Territory',
'pk' => 'Pakistan',
'pw' => 'Palau',
'ps' => 'Palestinian Territories',
'pa' => 'Panama',
'pz' => 'Panama Canal Zone',
'pg' => 'Papua New Guinea',
'py' => 'Paraguay',
'yd' => 'People\'s Democratic Republic of Yemen',
'pe' => 'Peru',
'ph' => 'Philippines',
'pn' => 'Pitcairn Islands',
'pl' => 'Poland',
'pt' => 'Portugal',
'pr' => 'Puerto Rico',
'qa' => 'Qatar',
'ro' => 'Romania',
'ru' => 'Russia',
'rw' => 'Rwanda',
're' => 'Réunion',
'bl' => 'Saint Barthélemy',
'sh' => 'Saint Helena',
'kn' => 'Saint Kitts and Nevis',
'lc' => 'Saint Lucia',
'mf' => 'Saint Martin',
'pm' => 'Saint Pierre and Miquelon',
'vc' => 'Saint Vincent and the Grenadines',
'ws' => 'Samoa',
'sm' => 'San Marino',
'sa' => 'Saudi Arabia',
'sn' => 'Senegal',
'rs' => 'Serbia',
'cs' => 'Serbia and Montenegro',
'sc' => 'Seychelles',
'sl' => 'Sierra Leone',
'sg' => 'Singapore',
'sk' => 'Slovakia',
'si' => 'Slovenia',
'sb' => 'Solomon Islands',
'so' => 'Somalia',
'za' => 'South Africa',
'gs' => 'South Georgia and the South Sandwich Islands',
'kr' => 'South Korea',
'es' => 'Spain',
'lk' => 'Sri Lanka',
'sd' => 'Sudan',
'sr' => 'Suriname',
'sj' => 'Svalbard and Jan Mayen',
'sz' => 'Swaziland',
'se' => 'Sweden',
'ch' => 'Switzerland',
'sy' => 'Syria',
'st' => 'São Tomé and Príncipe',
'tw' => 'Taiwan',
'tj' => 'Tajikistan',
'tz' => 'Tanzania',
'th' => 'Thailand',
'tl' => 'Timor-Leste',
'tg' => 'Togo',
'tk' => 'Tokelau',
'to' => 'Tonga',
'tt' => 'Trinidad and Tobago',
'tn' => 'Tunisia',
'tr' => 'Turkey',
'tm' => 'Turkmenistan',
'tc' => 'Turks and Caicos Islands',
'tv' => 'Tuvalu',
'um' => 'U.S. Minor Outlying Islands',
'pu' => 'U.S. Miscellaneous Pacific Islands',
'vi' => 'U.S. Virgin Islands',
'ug' => 'Uganda',
'ua' => 'Ukraine',
'su' => 'Union of Soviet Socialist Republics',
'ae' => 'United Arab Emirates',
'en' => 'United Kingdom (EN)',
'uk' => 'United Kingdom (UK)',
'gb' => 'United Kingdom (GB)',
'us' => 'United States',
'zz' => 'Unknown or Invalid Region',
'uy' => 'Uruguay',
'uz' => 'Uzbekistan',
'vu' => 'Vanuatu',
'va' => 'Vatican City',
've' => 'Venezuela',
'vn' => 'Vietnam',
'wk' => 'Wake Island',
'wf' => 'Wallis and Futuna',
'eh' => 'Western Sahara',
'ye' => 'Yemen',
'zm' => 'Zambia',
'zw' => 'Zimbabwe',
'ax' => 'Åland Islands',
];
if ($key && array_key_exists($key, $arr)) {
return $arr[strtolower($key)];
}
return $arr;
}
}

View File

@@ -1,7 +1,7 @@
<?php
if (!function_exists('languages')) {
function languages()
function languages(): array
{
$languages = [
'en'

View File

@@ -0,0 +1,80 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Models\Alert;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\AlertRequest;
class AlertController extends Controller
{
public function index()
{
return inertia('Admin/Alerts/Index', [
'alerts' => Alert::query()->latest()->paginate()
]);
}
public function create()
{
return inertia('Admin/Alerts/Create');
}
public function store(AlertRequest $request)
{
Alert::create($request->all());
return redirect()->route('admin.alerts.index');
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
return inertia('Admin/Alerts/Edit', [
'alert' => Alert::findOrFail($id)
]);
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(AlertRequest $request, $id)
{
Alert::findOrFail($id)->update($request->all());
return redirect()->route('admin.alerts.index');
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
Alert::findOrFail($id)->delete();
return redirect()->route('admin.alerts.index');
}
}

View File

@@ -0,0 +1,98 @@
<?php
namespace App\Http\Controllers\Admin;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
class ApplicationLogController extends Controller
{
protected $final = [];
protected $config = [
'date' => null
];
public function index(Request $request)
{
$this->config['date'] = date('Y-m-d');
if ($date = $request->input('date')) {
$this->config['date'] = $date;
} else {
$request->merge(['date' => date('Y-m-d')]);
}
return inertia('Admin/ApplicationLogs', [
'logData' => $this->get(),
'filters' => $request->all('date')
]);
}
public function getLogFileDates()
{
$dates = [];
$files = glob(storage_path('logs/laravel-*.log'));
$files = array_reverse($files);
foreach ($files as $path) {
$fileName = basename($path);
preg_match('/(?<=laravel-)(.*)(?=.log)/', $fileName, $dtMatch);
$date = $dtMatch[0];
array_push($dates, $date);
}
return $dates;
}
public function get()
{
$availableDates = $this->getLogFileDates();
if (count($availableDates) == 0) {
return response()->json([
'success' => false,
'message' => 'No log available'
]);
}
$configDate = $this->config['date'];
if ($configDate == null) {
$configDate = $availableDates[0];
}
if (!in_array($configDate, $availableDates)) {
return response()->json([
'success' => false,
'message' => 'No log file found with selected date ' . $configDate
]);
}
$pattern = "/^\[(?<date>.*)\]\s(?<env>\w+)\.(?<type>\w+):(?<message>.*)/m";
$fileName = 'laravel-' . $configDate . '.log';
$content = file_get_contents(storage_path('logs/' . $fileName));
preg_match_all($pattern, $content, $matches, PREG_SET_ORDER, 0);
$logs = [];
foreach ($matches as $match) {
$logs[] = [
'timestamp' => $match['date'],
'env' => $match['env'],
'type' => $match['type'],
'message' => trim($match['message'])
];
}
preg_match('/(?<=laravel-)(.*)(?=.log)/', $fileName, $dtMatch);
$date = $dtMatch[0];
$data = [
'available_dates' => $availableDates,
'date' => $date,
'filename' => $fileName,
'logs' => array_reverse($logs)
];
return $data;
}
}

View File

@@ -0,0 +1,69 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Models\DocumentationItem;
use App\Http\Controllers\Controller;
use App\Models\DocumentationCategory;
use App\Http\Requests\Admin\DocumentationArticleRequest;
class DocumentationArticleController extends Controller
{
public function index()
{
$articles = DocumentationItem::query()->with('category:id,title')->latest()->paginate();
return inertia('Admin/Documentation/Articles/Index', [
'articles' => $articles
]);
}
public function create()
{
$categories = DocumentationCategory::pluck('title', 'id');
return inertia('Admin/Documentation/Articles/Create', [
'categories' => $categories,
]);
}
public function store(DocumentationArticleRequest $request)
{
$article = DocumentationItem::create([
'title' => $request->input('title'),
'content' => $request->input('content')
]);
$article->documentation_category_id = $request->input('category_id');
$article->save();
return redirect()->route('admin.documentation.articles.index')->with('success', __('Documentation article has been created'));
}
public function edit($id)
{
$article = DocumentationItem::findOrFail($id);
$categories = DocumentationCategory::pluck('title', 'id');
return inertia('Admin/Documentation/Articles/Edit', [
'article' => $article,
'categories' => $categories
]);
}
public function update(DocumentationArticleRequest $request, $id)
{
$article = DocumentationItem::findOrFail($id);
$article->update([
'title' => $request->input('title'),
'content' => $request->input('content')
]);
$article->documentation_category_id = $request->input('category_id');
$article->save();
return redirect()->route('admin.documentation.articles.index')->with('success', __('Documentation article has been updated'));
}
}

View File

@@ -3,11 +3,53 @@
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Models\DocumentationCategory;
use App\Http\Requests\Admin\DocumentationCategoryRequest;
class DocumentationController extends Controller
{
public function index()
{
return inertia('Admin/Documentation/Index');
$categories = DocumentationCategory::query()->latest()->paginate();
return inertia('Admin/Documentation/Index', [
'categories' => $categories
]);
}
public function create()
{
return inertia('Admin/Documentation/Create');
}
public function store(DocumentationCategoryRequest $request)
{
DocumentationCategory::create([
'title' => $request->input('title'),
'description' => $request->input('description')
]);
return redirect()->route('admin.documentation.index')->with('success', __('Documentation category has been created'));
}
public function edit($id)
{
$category = DocumentationCategory::findOrFail($id);
return inertia('Admin/Documentation/Edit', [
'category' => $category
]);
}
public function update(DocumentationCategoryRequest $request, $id)
{
$category = DocumentationCategory::findOrFail($id);
$category->update([
'title' => $request->input('title'),
'description' => $request->input('description'),
]);
return redirect()->route('admin.documentation.index')->with('success', __('Documentation category has been updated'));
}
}

View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Admin;
use App\Models\Package;
use App\Models\Provider;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\PackageRequest;
@@ -19,25 +20,32 @@ class PackageController extends Controller
public function create()
{
return inertia('Admin/Packages/Create');
$providers = Provider::get(['name', 'label', 'id'])->pluck('nameWithLabel', 'id');
return inertia('Admin/Packages/Create', [
'providers' => $providers
]);
}
public function store(PackageRequest $request)
{
Package::create($request->all());
$package = Package::create($request->validated());
return redirect()->route('admin.packages.index')->with('success', 'Package has been created');
}
$package->providers()->sync($request->input('providers'));
public function show($id)
{
//
return redirect()->route('admin.packages.index')->with('success', __('Package has been created'));
}
public function edit($id)
{
$package = Package::with('providers:id')->findOrFail($id);
$providers = Provider::get(['name', 'label', 'id'])->pluck('nameWithLabel', 'id');
return inertia('Admin/Packages/Edit', [
'package' => Package::findOrFail($id)
'package' => $package,
'providers' => $providers,
'syncedProviders' => $package->providers->pluck('id')
]);
}
@@ -47,7 +55,9 @@ class PackageController extends Controller
$package->update($request->validated());
return redirect()->route('admin.packages.index')->with('success', 'Package has been updated');
$package->providers()->sync($request->input('providers'));
return redirect()->route('admin.packages.index')->with('success', __('Package has been updated'));
}
public function destroy($id)
@@ -56,6 +66,6 @@ class PackageController extends Controller
$package->delete();
return redirect()->route('admin.packages.index')->with('success', 'Package has been removed');
return redirect()->route('admin.packages.index')->with('success', __('Package has been removed'));
}
}

View File

@@ -2,9 +2,36 @@
namespace App\Http\Controllers\Admin;
use App\Models\Provider;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\ProviderRequest;
class ProviderController extends Controller
{
//
public function edit($id)
{
$provider = Provider::findOrFail($id);
return inertia('Admin/Services/Provider/Edit', [
'provider' => $provider,
]);
}
public function update(ProviderRequest $request, $id)
{
$provider = Provider::findOrFail($id);
$provider->update($request->validated());
return redirect()->route('admin.services.index')->with('success', __('Provider has been updated'));
}
public function destroy($id)
{
$provider = Provider::findOrFail($id);
$provider->delete();
return redirect()->route('admin.services.index')->with('success', __('Provider has been deleted'));
}
}

View File

@@ -2,11 +2,11 @@
namespace App\Http\Controllers\Admin;
use App\Http\Requests\Admin\ServerAttachRequest;
use App\Models\Server;
use App\Models\User;
use App\Models\Server;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\ServerAttachRequest;
class ServerController extends Controller
{
@@ -14,7 +14,7 @@ class ServerController extends Controller
{
$server = Server::findOrFail($id);
$users = $server->users()->select('id', 'name', 'email')->get()->map(function($user){
$users = $server->users()->select('id', 'name', 'email')->get()->map(function ($user) {
return [
'id' => $user->id,
'name' => $user->name,

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
use App\Models\Site;
use App\Models\Server;
use App\Models\Provider;
use App\Http\Controllers\Controller;
class ServiceController extends Controller
@@ -13,6 +14,10 @@ class ServiceController extends Controller
return inertia('Admin/Services/Index', [
'servers' => Server::withCount('sites')->latest()->paginate(5, ['*'], 'servers_per_page'),
'sites' => Site::with('server:id,name')->latest()->paginate(5, ['*'], 'sites_per_page'),
'providers' => Provider::query()
->withCount('regions', 'plans', 'servers')
->latest()
->paginate(5, ['*'], 'providers_per_page'),
]);
}
}

View File

@@ -3,7 +3,9 @@
namespace App\Http\Controllers\Admin;
use App\Models\Package;
use Illuminate\Support\Str;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Storage;
use App\Http\Requests\Admin\SettingRequest;
class SettingController extends Controller
@@ -18,15 +20,19 @@ class SettingController extends Controller
'documentation' => setting('documentation'),
'allow_registration' => setting('allow_registration'),
'default_package' => setting('default_package'),
'receive_email_on_server_creation' => setting('receive_email_on_server_creation'),
'isolate_per_site_per_user' => setting('isolate_per_site_per_user'),
'enable_api' => setting('enable_api'),
'api_token' => setting('api_token') ? decrypt(setting('api_token')) : null,
'default_language' => setting('default_language', 'en')
];
$packages = Package::pluck('name', 'id');
return inertia('Admin/Settings', [
'company_settings' => $settings,
'packages' => $packages
'packages' => $packages,
'languages' => languages()
]);
}
@@ -40,16 +46,43 @@ class SettingController extends Controller
'allow_registration',
'documentation',
'default_package',
'receive_email_on_server_creation',
'isolate_per_site_per_user',
'enable_api',
'api_token',
'default_language'
]) as $key => $value) {
if ($key === 'api_token') {
$value = encrypt($value);
}
if ($key === 'default_package' && $value === 'false') {
$value = null;
}
if ($value === 'false') {
$value = 0;
}
if ($value === 'true') {
$value = 1;
}
setting([$key => $value]);
}
if ($logo = $request->file('logo')) {
// If we previously had a logo, rotate that
if ($oldLogo = setting('logo')) {
Storage::delete(str_replace('/storage/', '/public/', $oldLogo));
}
$version = Str::random();
$request->file('logo')->storePubliclyAs('logo', 'logo-' . $version . '.' . $request->file('logo')->extension(), 'public');
setting(['logo' => '/storage/logo/logo-' . $version . '.' . $request->file('logo')->extension()]);
}
cache()->forget('core.settings');
return redirect()->route('admin.settings')->with('success', __('Settings have been updated'));

View File

@@ -2,12 +2,11 @@
namespace App\Http\Controllers\Admin;
use App\Http\Requests\Admin\ServerAttachRequest;
use App\Models\Server;
use App\Models\Site;
use App\Models\User;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\ServerAttachRequest;
class SiteController extends Controller
{
@@ -15,7 +14,7 @@ class SiteController extends Controller
{
$site = Site::findOrFail($id);
$users = $site->users()->select('id', 'name', 'email')->get()->map(function($user){
$users = $site->users()->select('id', 'name', 'email')->get()->map(function ($user) {
return [
'id' => $user->id,
'name' => $user->name,

View File

@@ -0,0 +1,57 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Models\Provider;
use App\Services\Ploi\Ploi;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
class SynchronizeProviderController extends Controller
{
public function index()
{
if (config('app.demo')) {
return redirect('/')->with('info', __('This feature is not available in demo mode.'));
}
$ploi = new Ploi(config('services.ploi.token'));
$availableProviders = $ploi->user()->serverProviders()->getData();
$currentProviders = Provider::whereNotIn('id', array_keys((array)$availableProviders))->get();
return inertia('Admin/Services/Providers', [
'availableProviders' => $availableProviders,
'currentProviders' => $currentProviders
]);
}
public function synchronize(Request $request, $providerId)
{
$ploiProvider = (new Ploi)->user()->serverProviders($providerId)->getData();
$provider = Provider::updateOrCreate([
'ploi_id' => $ploiProvider->id,
], [
'label' => $ploiProvider->label,
'name' => $ploiProvider->name
]);
foreach ($ploiProvider->provider->plans as $plan) {
$provider->plans()->updateOrCreate([
'plan_id' => $plan->id
], [
'label' => $plan->name,
]);
}
foreach ($ploiProvider->provider->regions as $region) {
$provider->regions()->updateOrCreate([
'region_id' => $region->id
], [
'label' => $region->name,
]);
}
}
}

View File

@@ -2,10 +2,10 @@
namespace App\Http\Controllers\Admin;
use Illuminate\Http\Request;
use App\Jobs\Core\UpdateSystem;
use App\Services\VersionChecker;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
class SystemController extends Controller
{

View File

@@ -31,7 +31,8 @@ class UserController extends Controller
return inertia('Admin/Users/Create', [
'packages' => $packages,
'languages' => languages(),
'defaultPackage' => (string)setting('default_package')
'defaultPackage' => (string)setting('default_package'),
'defaultLanguage' => (string)setting('default_language', 'en'),
]);
}
@@ -54,7 +55,7 @@ class UserController extends Controller
public function show($id)
{
//
// TODO: Implement show feature for a user
}
public function edit($id)

View File

@@ -2,11 +2,10 @@
namespace App\Http\Controllers\Api;
use App\Models\User;
use App\Http\Controllers\Controller;
use App\Http\Requests\Api\UserRequest;
use App\Http\Resources\Api\UserResource;
use App\Models\User;
use Illuminate\Http\Request;
class UserController extends Controller
{

View File

@@ -45,8 +45,8 @@ class RegisterController extends Controller
protected function registered(Request $request, $user)
{
if ($defaultPackage = setting('default_package')) {
$user->package_id = $defaultPackage;
if (setting('default_package') && setting('default_package') != 'false') {
$user->package_id = setting('default_package');
$user->save();
}
}

View File

@@ -8,8 +8,6 @@ class DashboardController extends Controller
{
public function index()
{
$package = auth()->user()->package;
$logs = auth()->user()->systemLogs()
->with('model')
->latest()
@@ -31,9 +29,6 @@ class DashboardController extends Controller
return inertia('Dashboard/Index', [
'sites' => auth()->user()->sites()->count(),
'servers' => auth()->user()->servers()->count(),
'package' => [
'name' => $package->name ?? 'None'
],
'logs' => $logs,
]);
}

View File

@@ -2,17 +2,43 @@
namespace App\Http\Controllers;
use Illuminate\Support\Str;
use App\Models\DocumentationItem;
use App\Http\Resources\DocumentationItemResource;
use App\Models\DocumentationCategory;
use App\Http\Resources\DocumentationCategoryRouteResource;
class DocumentationController extends Controller
{
public function index()
{
$documentationItems = DocumentationItem::latest()->paginate();
$items = DocumentationCategory::query()->oldest()->get();
return inertia('Documentation/Index', [
'items' => DocumentationItemResource::collection($documentationItems)
'items' => DocumentationCategoryRouteResource::collection($items)
]);
}
public function show(DocumentationCategory $documentationCategory)
{
$items = DocumentationCategory::query()->oldest()->get();
return inertia('Documentation/Show', [
'category' => $documentationCategory,
'articles' => $documentationCategory->items()->latest()->get(),
'items' => DocumentationCategoryRouteResource::collection($items)
]);
}
public function showArticle(DocumentationCategory $documentationCategory, DocumentationItem $documentationItem)
{
$items = DocumentationCategory::query()->oldest()->get();
$documentationItem->content = Str::markdown($documentationItem->content);
return inertia('Documentation/Article', [
'category' => $documentationCategory,
'article' => $documentationItem,
'items' => DocumentationCategoryRouteResource::collection($items)
]);
}
}

View File

@@ -0,0 +1,198 @@
<?php
namespace App\Http\Controllers\Profile;
use Carbon\Carbon;
use App\Models\User;
use App\Models\Package;
use Illuminate\Support\Arr;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Stripe\Exception\InvalidRequestException;
class ProfileBillingController extends Controller
{
public function index(Request $request)
{
/* @var $user User */
$user = auth()->user();
$sortByType = array_key_first($request->input('sortBy', []));
$packages = Package::query()
->where(function ($query) {
return $query
->where('price_monthly', '>', 0)
->whereNotNull('plan_id');
})
->when($request->input('sortBy.' . $sortByType), function ($query, $value) use ($sortByType) {
if ($sortByType === 'price') {
return $value === 'asc'
? $query->orderBy('price_monthly', 'asc')
: $query->orderBy('price_monthly', 'desc');
}
if ($sortByType === 'servers') {
return $value === 'asc'
? $query->orderBy('maximum_servers', 'asc')
: $query->orderBy('maximum_servers', 'desc');
}
if ($sortByType === 'sites') {
return $value === 'asc'
? $query->orderBy('maximum_sites', 'asc')
: $query->orderBy('maximum_sites', 'desc');
}
if ($sortByType === 'name') {
return $value === 'asc'
? $query->orderBy('name', 'asc')
: $query->orderBy('name', 'desc');
}
return $query;
}, function ($query) {
return $query->orderBy('price_monthly', 'asc');
})
->get()
->transform(function (Package $package) {
$currencies = [
Package::CURRENCY_EURO => '€',
Package::CURRENCY_USD => '$',
Package::CURRENCY_NOK => 'KR ',
Package::CURRENCY_CAD => 'CAD $',
Package::CURRENCY_AUD => 'AUD $',
Package::CURRENCY_GBP => 'GBP £',
Package::CURRENCY_INR => 'INR ',
];
$package->price_monthly = ($currencies[$package->currency] ?? '[Unknown currency]') . number_format($package->price_monthly, 2, ',', '.');
return $package;
});
try {
$clientSecret = $user->createSetupIntent()->client_secret;
} catch (\Exception $exception) {
return inertia('Profile/BillingError');
}
return inertia('Profile/Billing', [
'packages' => $packages,
'countries' => countries(),
'subscription' => $user->subscription('default'),
'public_key' => config('cashier.key'),
'data_client_secret' => $clientSecret,
'card' => [
'last_four' => $user->card_last_four,
'brand' => $user->card_brand
],
'filters' => [
'sort' => [
$sortByType => $request->input('sortBy.' . $sortByType, 'asc'),
]
]
]);
}
public function updateCard(Request $request)
{
/** @var User $user */
$user = $request->user();
$user->createOrGetStripeCustomer([
'name' => $request->input('billing_details.name'),
'description' => 'Ploi Core Customer ' . $request->input('billing_details.name'),
'address' => [
'line1' => $request->input('billing_details.address.line1'),
'postal_code' => $request->input('billing_details.address.postal_code'),
'city' => $request->input('billing_details.address.city'),
'country' => $request->input('billing_details.address.country'),
]
]);
foreach ($user->paymentMethods() as $paymentMethod) {
$paymentMethod->delete();
}
$user->addPaymentMethod($request->get('payment_method'));
$user->updateDefaultPaymentMethod($request->get('payment_method'));
$user->updateDefaultPaymentMethodFromStripe();
return redirect()->route('profile.billing.index')->with('success', 'Your card has been added, you can now update your plan');
}
public function updatePlan(Request $request)
{
/** @var User $user */
$user = auth()->user();
if (!$user->hasStripeId() || !$user->defaultPaymentMethod()) {
return redirect()->route('profile.billing.index')->with('error', 'You cannot change your plan without a valid creditcard, please update your billing details first');
}
$plan = Package::query()->findOrFail($request->input('plan'));
$planId = $plan->plan_id;
// Only do something if the user is not already subscribed to this plan.
if ($user->subscribedToPlan($planId, 'default')) {
return redirect()->route('profile.billing.index')->with('error', 'You did not select a different plan');
}
// If the user is already subscribed to the default plan, we have to swap it. Otherwise create a new one.
try {
if ($user->subscribed('default')) {
$user->subscription('default')->swap($planId);
} else {
if ($coupon = $request->input('coupon')) {
$user->newSubscription('default', $planId)
->withCoupon($coupon)
->create($user->defaultPaymentMethod()->id);
} else {
$user->newSubscription('default', $planId)->create($user->defaultPaymentMethod()->id);
}
}
} catch (InvalidRequestException $exception) {
$error = $exception->getJsonBody();
return redirect()->route('profile.billing.index')->with('error', Arr::get($error, 'error.message'));
}
$user->package_id = $plan->id;
$user->save();
return redirect()->route('profile.billing.index')->with('success', sprintf("Your plan has been updated to %s", $plan->name));
}
public function cancel(Request $request)
{
/* @var $user \App\Models\User */
$user = $request->user();
$subscription = $user->subscription('default')->cancel();
return redirect()->route('profile.billing.index')->with('success', __('Your subscription has been cancelled, your end date is ' . $subscription->ends_at));
}
public function invoices(Request $request)
{
return $request->user()->invoices()->map(function ($invoice) {
$symbol = $invoice->currency === Package::CURRENCY_EURO ? '€' : '$';
return [
'id' => $invoice->id,
'created' => Carbon::createFromTimestamp($invoice->created)->format('Y-m-d H:i:s'),
'number' => $invoice->number,
'status' => $invoice->status,
'total' => $symbol . number_format($invoice->total / 100, 2, ',', '.'),
'currency' => $invoice->currency,
];
});
}
public function pdf(Request $request, $id)
{
return $request->user()->downloadInvoice($id, [
'vendor' => setting('name'),
'product' => 'Webhosting'
]);
}
}

View File

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Profile;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Hash;
use App\Http\Requests\UserProfileRequest;
use App\Http\Resources\UserProfileResource;
@@ -13,7 +12,8 @@ class ProfileController extends Controller
public function index()
{
return inertia('Profile/Index', [
'profile' => new UserProfileResource(auth()->user())
'profile' => new UserProfileResource(auth()->user()),
'countries' => countries()
]);
}
@@ -37,22 +37,4 @@ class ProfileController extends Controller
return $mode;
}
public function requestFtpPassword(Request $request)
{
$this->validate($request, ['password' => 'required|string']);
if (!Hash::check($request->input('password'), $request->user()->password)) {
return response([
'message' => 'The given data was invalid',
'errors' => [
'password' => [
trans('auth.failed')
]
]
], 422);
}
return ['ftp_password' => decrypt($request->user()->ftp_password)];
}
}

View File

@@ -0,0 +1,47 @@
<?php
namespace App\Http\Controllers\Profile;
use App\Models\UserProvider;
use App\Http\Controllers\Controller;
use App\Http\Requests\ProfileIntegrationRequest;
class ProfileIntegrationController extends Controller
{
public function index()
{
$providers = auth()->user()->providers()->latest()->get()->map(function ($provider) {
return [
'id' => $provider->id,
'type' => $provider->type,
'created_at' => $provider->created_at->format('Y-m-d H:i:s')
];
});
return inertia('Profile/Integrations', [
'providers' => $providers,
]);
}
public function store(ProfileIntegrationRequest $request)
{
$request->user()->providers()->updateOrCreate([
'type' => UserProvider::TYPE_CLOUDFLARE
], [
'type' => UserProvider::TYPE_CLOUDFLARE,
'token' => $request->input('meta.api_key'),
'meta' => [
'cloudflare_email' => encrypt($request->input('meta.cloudflare_email'))
]
]);
return redirect()->route('profile.integrations.index');
}
public function destroy($providerId)
{
auth()->user()->providers()->findOrFail($providerId)->delete();
return redirect()->route('profile.integrations.index');
}
}

View File

@@ -2,9 +2,9 @@
namespace App\Http\Controllers\Profile;
use App\Http\Controllers\Controller;
use App\Rules\MatchOldPassword;
use Illuminate\Http\Request;
use App\Rules\MatchOldPassword;
use App\Http\Controllers\Controller;
class ProfilePasswordController extends Controller
{

View File

@@ -2,9 +2,9 @@
namespace App\Http\Controllers\Profile;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use App\Http\Controllers\Controller;
class ProfileSettingController extends Controller
{
@@ -12,7 +12,8 @@ class ProfileSettingController extends Controller
{
return inertia('Profile/Settings', [
'profile' => [
'theme' => auth()->user()->theme
'theme' => auth()->user()->theme,
'keyboard_shortcuts' => auth()->user()->keyboard_shortcuts,
]
]);
}
@@ -27,7 +28,10 @@ class ProfileSettingController extends Controller
]
]);
$request->user()->update(['theme' => $request->input('theme')]);
$request->user()->update([
'theme' => $request->input('theme'),
'keyboard_shortcuts' => $request->input('keyboard_shortcuts', true),
]);
return redirect()->route('profile.settings.index')->with('success', __('Instellingen zijn aangepast'));
}

View File

@@ -2,25 +2,111 @@
namespace App\Http\Controllers;
use App\Models\Server;
use App\Models\User;
use Illuminate\Http\Request;
use App\Jobs\Servers\CreateServer;
use App\Jobs\Servers\DeleteServer;
use App\Http\Requests\ServerRequest;
use Illuminate\Support\Facades\Mail;
use App\Http\Resources\ServerResource;
use App\Mail\Server\ServerCreatedEmail;
use App\Http\Requests\ServerUpdateRequest;
use App\Mail\Admin\Server\AdminServerCreatedEmail;
class ServerController extends Controller
{
public function index()
{
$servers = auth()->user()->servers()->latest()->paginate();
$servers = auth()->user()->servers()
->withCount('sites')
->latest()
->paginate();
$providers = auth()->user()->package ? auth()->user()->package->providers()->pluck('name', 'id') : [];
return inertia('Servers/Index', [
'servers' => ServerResource::collection($servers)
'servers' => ServerResource::collection($servers),
'dataProviders' => $providers
]);
}
public function store(Request $request)
public function store(ServerRequest $request)
{
abort_if(!$request->user()->can('create', Server::class), 403);
$provider = $request->user()->package->providers()->findOrFail($request->input('provider'));
$region = $provider->regions()->findOrFail($request->input('region'));
$plan = $provider->plans()->findOrFail($request->input('plan'));
return 'test';
/* @var $server \App\Models\Server */
$server = $request->user()->servers()->create([
'name' => $request->input('name')
]);
$server->provider()->associate($provider);
$server->providerRegion()->associate($region);
$server->providerPlan()->associate($plan);
$server->save();
dispatch(new CreateServer($server));
Mail::to($request->user())->send(new ServerCreatedEmail($request->user(), $server));
if (setting('receive_email_on_server_creation')) {
$admins = User::query()->where('role', User::ADMIN)->get();
foreach ($admins as $admin) {
Mail::to($admin)->send(new AdminServerCreatedEmail($request->user(), $server));
}
}
return redirect()->route('servers.index');
}
public function show($id)
{
$server = auth()->user()->servers()->findOrFail($id);
return inertia('Servers/Show', [
'server' => $server,
'sites' => $server->sites()->latest()->paginate(5, ['*'], 'sites_per_page'),
]);
}
public function update(ServerUpdateRequest $request, $id)
{
$server = $request->user()->servers()->findOrFail($id);
$server->update([
'name' => $request->input('name')
]);
return redirect()->route('servers.settings.show', $id)->with('success', __('Server information has been updated'));
}
public function destroy(Request $request, $id)
{
$server = $request->user()->servers()->findOrFail($id);
$this->authorize('delete', $server);
dispatch(new DeleteServer($server->ploi_id));
$request->user()->systemLogs()->create([
'title' => 'Server ' . $server->name . ' has been deleted',
'description' => 'The server ' . $server->name . ' has been deleted by user ' . $request->user()->name
]);
$server->delete();
return redirect()->route('servers.index')->with('success', __('Your server is deleted'));
}
public function plansAndRegions(Request $request, $providerId)
{
$provider = $request->user()->package->providers()->findOrFail($providerId);
return [
'regions' => $provider->regions()->pluck('label', 'id'),
'plans' => $provider->plans()->pluck('label', 'id'),
];
}
}

View File

@@ -0,0 +1,15 @@
<?php
namespace App\Http\Controllers;
class ServerSettingController extends Controller
{
public function show($id)
{
$server = auth()->user()->servers()->findOrFail($id);
return inertia('Servers/Settings', [
'server' => $server
]);
}
}

View File

@@ -3,11 +3,13 @@
namespace App\Http\Controllers;
use App\Models\Server;
use Illuminate\Support\Arr;
use Illuminate\Http\Request;
use App\Jobs\Sites\CreateSite;
use App\Jobs\Sites\DeleteSite;
use App\Http\Requests\SiteRequest;
use Illuminate\Support\Facades\DB;
use App\Http\Resources\SiteResource;
use Illuminate\Support\Facades\Hash;
class SiteController extends Controller
{
@@ -37,9 +39,12 @@ class SiteController extends Controller
$server = Server::query()
->doesntHave('users')
->withCount('sites')
->having('sites_count', '<', DB::raw('maximum_sites'))
->inRandomOrder()
->first();
if ($server && $server->sites_count >= $server->maximum_sites) {
$server = null;
}
}
if (!$server) {
@@ -72,13 +77,16 @@ class SiteController extends Controller
return inertia('Sites/Show', [
'site' => $site,
'system_user' => $site->getSystemUser(false),
'ip_address' => $site->server->ip
]);
}
public function destroy($id)
public function destroy(Request $request, $id)
{
$site = auth()->user()->sites()->findOrFail($id);
$site = $request->user()->sites()->findOrFail($id);
$this->authorize('delete', $site);
dispatch(new DeleteSite($site->server->ploi_id, $site->ploi_id));
@@ -86,4 +94,28 @@ class SiteController extends Controller
return redirect()->route('sites.index')->with('success', __('Your website is deleted'));
}
public function requestFtpPassword(Request $request, $id)
{
if ($request->user()->requires_password_for_ftp) {
$this->validate($request, ['password' => 'required|string']);
if (!Hash::check($request->input('password'), $request->user()->password)) {
return response([
'message' => 'The given data was invalid',
'errors' => [
'password' => [
trans('auth.failed')
]
]
], 422);
}
}
$site = $request->user()->sites()->findOrFail($id);
$systemUser = $site->getSystemUser();
return ['ftp_password' => decrypt(Arr::get($systemUser, 'ftp_password'))];
}
}

View File

@@ -2,7 +2,12 @@
namespace App\Http\Controllers;
use App\Models\Site;
use Illuminate\Support\Arr;
use App\Models\UserProvider;
use App\Services\Cloudflare;
use Illuminate\Http\Request;
use App\Http\Requests\SiteDnsRequest;
class SiteDnsController extends Controller
{
@@ -16,9 +21,18 @@ class SiteDnsController extends Controller
]);
}
public function store(Request $request)
public function store(SiteDnsRequest $request, $id)
{
//
$site = auth()->user()->sites()->findOrFail($id);
$dns = $this->getDnsInstance($site);
$dns->addRecord(
$request->input('name'),
$request->input('address'),
);
return redirect()->route('sites.dns.index', $id)->with('success', __('DNS record has been created'));
}
public function update(Request $request, $id)
@@ -28,10 +42,31 @@ class SiteDnsController extends Controller
public function records($id)
{
$site = auth()->user()->sites()->findOrFail($id);
$dns = $this->getDnsInstance($site);
return $dns->listRecords();
}
public function destroy($id)
public function destroy($id, $recordId)
{
//
$site = auth()->user()->sites()->findOrFail($id);
$dns = $this->getDnsInstance($site);
$dns->deleteRecord($recordId);
return redirect()->route('sites.dns.index', $id)->with('success', __('DNS record has been removed'));
}
private function getDnsInstance(Site $site)
{
$provider = auth()->user()->providers()->where('type', UserProvider::TYPE_CLOUDFLARE)->first();
$cloudflare = new Cloudflare(decrypt(Arr::get($provider->meta, 'cloudflare_email')), decrypt($provider->token));
$cloudflare->zone(decrypt($site->dns_id));
return $cloudflare;
}
}

View File

@@ -11,6 +11,8 @@ class SiteSettingController extends Controller
{
$site = auth()->user()->sites()->findOrFail($id);
$this->authorize('update', $site);
$availablePhpVersions = $site->server->available_php_versions;
return inertia('Sites/Settings', [
@@ -23,6 +25,8 @@ class SiteSettingController extends Controller
{
$site = $request->user()->sites()->findOrFail($id);
$this->authorize('update', $site);
$site->update($request->all());
return redirect()->route('sites.settings.show', $id)->with('success', __('Site settings have been updated'));
@@ -32,6 +36,8 @@ class SiteSettingController extends Controller
{
$site = $request->user()->sites()->findOrFail($id);
$this->authorize('update', $site);
dispatch(new ChangePhpVersion($site, $request->input('version')));
$request->user()->systemLogs()->create([

View File

@@ -45,6 +45,7 @@ class Kernel extends HttpKernel
\App\Http\Middleware\SetLocale::class,
\App\Http\Middleware\Demo::class,
\App\Http\Middleware\InstallationComplete::class,
\App\Http\Middleware\HandleInertiaRequests::class,
],
'api' => [

View File

@@ -2,9 +2,9 @@
namespace App\Http\Middleware;
use App\Services\Ploi\Exceptions\Http\Unauthenticated;
use Closure;
use Illuminate\Http\Request;
use App\Services\Ploi\Exceptions\Http\Unauthenticated;
class GlobalApiAuthenticated
{

View File

@@ -0,0 +1,130 @@
<?php
namespace App\Http\Middleware;
use App\Models\Alert;
use Inertia\Middleware;
use Illuminate\Support\Arr;
use App\Models\UserProvider;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Session;
class HandleInertiaRequests extends Middleware
{
/**
* Determines the current asset version.
*
* @see https://inertiajs.com/asset-versioning
* @param \Illuminate\Http\Request $request
* @return string|null
*/
public function version(Request $request)
{
return parent::version($request);
}
/**
* Defines the props that are shared by default.
*
* @see https://inertiajs.com/shared-data
* @param \Illuminate\Http\Request $request
* @return array
*/
public function share(Request $request)
{
return array_merge(parent::share($request), [
'auth' => function () use ($request) {
$package = auth()->user()->package ?? [];
$can = $package ? [
'servers' => [
'create' => Arr::get($package->server_permissions, 'create', false),
'update' => Arr::get($package->server_permissions, 'update', false),
'delete' => Arr::get($package->server_permissions, 'delete', false),
],
'sites' => [
'create' => Arr::get($package->site_permissions, 'create', false),
'update' => Arr::get($package->site_permissions, 'update', false),
'delete' => Arr::get($package->site_permissions, 'delete', false),
]
] : [];
return [
'user' => Auth::user() ? [
'id' => Auth::user()->id,
'name' => Auth::user()->name,
'email' => Auth::user()->email,
'role' => Auth::user()->role,
'user_name' => Auth::user()->user_name,
'avatar' => Auth::user()->getGravatar(),
'theme' => Auth::user()->theme,
'keyboard_shortcuts' => Auth::user()->keyboard_shortcuts,
'requires_password_for_ftp' => Auth::user()->requires_password_for_ftp,
'address' => Auth::user()->address,
'country' => Auth::user()->country,
'zip' => Auth::user()->zip,
'city' => Auth::user()->city,
] : null,
'package' => auth()->user() && auth()->user()->package ? [
'name' => auth()->user()->package->name,
'maximum_sites' => auth()->user()->package->maximum_sites
] : [
'name' => __('None')
],
'can' => $can,
'integrations' => [
'cloudflare' => (bool)auth()->user() ? auth()->user()->providers()->where('type', UserProvider::TYPE_CLOUDFLARE)->count() : false,
]
];
},
'settings' => function () {
return [
'demo' => config('app.demo'),
'name' => setting('name', 'Company'),
'support' => setting('support', false),
'documentation' => setting('documentation', false),
'logo' => setting('logo'),
'allow_registration' => setting('allow_registration'),
'billing' => config('cashier.key') && config('cashier.secret')
];
},
'flash' => function () {
return [
'success' => Session::get('success'),
'error' => Session::get('error'),
'info' => Session::get('info'),
];
},
'errors' => function () {
return Session::get('errors')
? Session::get('errors')->getBag('default')->getMessages()
: (object)[];
},
'errors_count' => function () {
return Session::get('errors')
? count(Session::get('errors')->getBag('default')->getMessages())
: 0;
},
'system_alert' => function () {
$alert = Alert::query()
->where(function ($query) {
return $query
->whereNull('expires_at')
->orWhere('expires_at', '>', now());
})
->first(['message', 'expires_at', 'type']);
if (!$alert) {
return null;
}
return [
'message' => $alert->message,
'type' => $alert->type
];
}
]);
}
}

View File

@@ -0,0 +1,50 @@
<?php
namespace App\Http\Requests\Admin;
use App\Models\Alert;
use Illuminate\Validation\Rule;
use Illuminate\Foundation\Http\FormRequest;
class AlertRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return auth()->check() && auth()->user()->isAdmin();
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'message' => [
'required',
'string',
'max:500'
],
'type' => [
'required',
'string',
Rule::in([
Alert::TYPE_INFO,
Alert::TYPE_DANGER,
Alert::TYPE_WARNING
])
],
'expires_at' => [
'nullable',
'date',
'date_format:Y-m-d H:i:s'
]
];
}
}

View File

@@ -0,0 +1,42 @@
<?php
namespace App\Http\Requests\Admin;
use Illuminate\Foundation\Http\FormRequest;
class DocumentationArticleRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return auth()->check() && auth()->user()->isAdmin();
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'title' => [
'required',
'string',
'max:255'
],
'content' => [
'required',
'min:2'
],
'category_id' => [
'required',
'exists:documentation_categories,id'
]
];
}
}

View File

@@ -0,0 +1,38 @@
<?php
namespace App\Http\Requests\Admin;
use Illuminate\Foundation\Http\FormRequest;
class DocumentationCategoryRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return auth()->check() && auth()->user()->isAdmin();
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'title' => [
'required',
'string',
'max:255'
],
'description' => [
'nullable',
'string'
]
];
}
}

View File

@@ -2,6 +2,8 @@
namespace App\Http\Requests\Admin;
use App\Models\Package;
use Illuminate\Validation\Rule;
use Illuminate\Foundation\Http\FormRequest;
class PackageRequest extends FormRequest
@@ -29,15 +31,58 @@ class PackageRequest extends FormRequest
'string',
'max:255'
],
'currency' => [
'nullable',
Rule::in([
Package::CURRENCY_USD,
Package::CURRENCY_EURO,
Package::CURRENCY_NOK,
Package::CURRENCY_AUD,
Package::CURRENCY_CAD,
Package::CURRENCY_GBP,
Package::CURRENCY_INR,
])
],
'maximum_sites' => [
'required',
'numeric',
'min:0',
],
'server_creation' => [
'maximum_servers' => [
'required',
'boolean'
'numeric',
'min:0',
],
'plan_id' => [
'nullable',
],
'price_monthly' => [
'nullable',
'numeric'
],
'server_permissions' => [
'array'
],
'site_permissions' => [
'array'
]
];
}
protected function prepareForValidation()
{
$merge = [];
// If we don't have the monthly price filled in, merge a default
if (!$this->price_monthly) {
$merge['price_monthly'] = 0.000;
}
// If we don't have the currency filled in, merge a default
if (!$this->price_monthly) {
$merge['currency'] = Package::CURRENCY_USD;
}
$this->merge($merge);
}
}

View File

@@ -0,0 +1,34 @@
<?php
namespace App\Http\Requests\Admin;
use Illuminate\Foundation\Http\FormRequest;
class ProviderRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return auth()->check() && auth()->user()->isAdmin();
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'name' => [
'required',
'string',
'max:255'
]
];
}
}

View File

@@ -33,6 +33,12 @@ class SettingRequest extends FormRequest
'email' => [
'nullable',
'email'
],
'logo' => [
'nullable',
'image',
'max:2000'
]
];
}

View File

@@ -0,0 +1,63 @@
<?php
namespace App\Http\Requests;
use App\Models\UserProvider;
use Illuminate\Validation\Rule;
use App\Rules\CloudflareGeneralTest;
use Illuminate\Foundation\Http\FormRequest;
class ProfileIntegrationRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return auth()->check();
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
$rules = [
'provider' => [
'required',
'string',
Rule::in([
UserProvider::TYPE_CLOUDFLARE
])
]
];
if ($this->input('provider') === UserProvider::TYPE_CLOUDFLARE) {
$rules['meta.api_key'] = [
'required',
'string',
new CloudflareGeneralTest($this->input('meta.cloudflare_email'))
];
$rules['meta.cloudflare_email'] = [
'required',
'string',
'email'
];
}
return $rules;
}
public function messages()
{
return [
'meta.api_key.required' => __('The API key field is required'),
'meta.cloudflare_email.required' => __('The Cloudflare email field is required'),
];
}
}

View File

@@ -0,0 +1,51 @@
<?php
namespace App\Http\Requests;
use App\Models\Server;
use Illuminate\Foundation\Http\FormRequest;
class ServerRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return $this->user()->can('create', Server::class);
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'name' => [
'required',
'string',
'alpha_dash',
'max:40'
],
'provider' => [
'required',
'not_in:0',
'exists:provider_plans,id'
],
'region' => [
'required',
'not_in:0',
'exists:provider_regions,id'
],
'plan' => [
'required',
'not_in:0',
'exists:provider_plans,id'
]
];
}
}

View File

@@ -0,0 +1,36 @@
<?php
namespace App\Http\Requests;
use App\Models\Server;
use Illuminate\Foundation\Http\FormRequest;
class ServerUpdateRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return $this->user()->can('update', Server::class);
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'name' => [
'required',
'string',
'alpha_dash',
'max:40'
]
];
}
}

View File

@@ -0,0 +1,37 @@
<?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
class SiteDnsRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return auth()->check();
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'name' => [
'required',
'string',
],
'address' => [
'required',
'ipv4'
]
];
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests;
use App\Models\Site;
use App\Rules\Hostname;
use App\Rules\ValidateMaximumSites;
use Illuminate\Foundation\Http\FormRequest;
@@ -15,7 +16,7 @@ class SiteRequest extends FormRequest
*/
public function authorize()
{
return auth()->check();
return $this->user()->can('create', Site::class);
}
/**

View File

@@ -41,6 +41,22 @@ class UserProfileRequest extends FormRequest
'required',
'string',
Rule::in(languages()),
],
'address' => [
'nullable',
'string'
],
'country' => [
'nullable',
'string'
],
'zip' => [
'nullable',
'string'
],
'city' => [
'nullable',
'string'
]
];
}

View File

@@ -0,0 +1,23 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
class DocumentationCategoryRouteResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @return array
*/
public function toArray($request)
{
return [
'title' => $this->title,
'to' => route('documentation.show', $this->id),
'active' => object_get(request()->route('documentationCategory'), 'id') === $this->id ? true : false
];
}
}

View File

@@ -19,7 +19,11 @@ class UserProfileResource extends JsonResource
return [
'name' => $this->name,
'email' => $this->email,
'language' => $this->language
'language' => $this->language,
'address' => $this->address,
'country' => $this->country,
'zip' => $this->zip,
'city' => $this->city
];
}
}

View File

@@ -4,6 +4,7 @@ namespace App\Jobs\Core;
use App\Services\Ploi\Ploi;
use Illuminate\Bus\Queueable;
use App\Services\VersionChecker;
use Illuminate\Support\Facades\Http;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
@@ -16,21 +17,29 @@ class Ping implements ShouldQueue
public function handle()
{
$version = new VersionChecker;
$version->flushVersionData();
$response = Http::withHeaders([
'Accept' => 'application/json',
'Content-Type' => 'application/json',
'X-Ploi-Core-Key' => config('services.ploi.core-token')
])
->withToken(config('services.ploi.token'))
->get((new Ploi)->url . 'ping');
->post((new Ploi)->url . 'ping', [
'version' => $version->getApplicationVersion(),
'php_version' => phpversion(),
'panel_url' => config('app.url')
]);
if (!$response->ok() || !$response->json()) {
// Something went wrong..
return;
return 1;
}
$response->json();
return 0;
}
}

View File

@@ -4,6 +4,7 @@ namespace App\Jobs\Core;
use Illuminate\Bus\Queueable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
@@ -12,26 +13,13 @@ class UpdateSystem implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
/**
* Create a new job instance.
*
* @return void
*/
public function __construct()
{
//
}
/**
* Execute the job.
*
* @return void
*/
public function handle()
{
shell_exec('git pull origin master');
shell_exec('composer install --no-interaction --prefer-dist --no-dev --optimize-autoloader --quiet');
Artisan::call('horizon:terminate');
cache()->forget('ploi-core-current-version');
}
}

View File

@@ -0,0 +1,57 @@
<?php
namespace App\Jobs\Servers;
use App\Models\Server;
use App\Services\Ploi\Ploi;
use Illuminate\Bus\Queueable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
class CreateServer implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
public $server;
public $tries = 1;
/**
* Create a new job instance.
*
* @param Server $server
*/
public function __construct(Server $server)
{
$this->server = $server;
}
/**
* Execute the job.
*
* @return void
*/
public function handle()
{
$ploi = new Ploi(config('services.ploi.token'));
$ploiServer = $ploi->server()->create(
$this->server->name,
$this->server->provider->ploi_id,
$this->server->providerRegion->region_id,
$this->server->providerPlan->plan_id,
);
$this->server->ploi_id = $ploiServer->id;
$this->server->save();
// Lets fetch the status after 5 minutes
dispatch(new FetchServerStatus($this->server))->delay(now()->addMinutes(5));
}
public function failed(\Exception $exception)
{
$this->server->delete();
}
}

View File

@@ -0,0 +1,39 @@
<?php
namespace App\Jobs\Servers;
use App\Services\Ploi\Ploi;
use Illuminate\Bus\Queueable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
class DeleteServer implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
public $serverPloiId;
/**
* Create a new job instance.
*
* @param $serverPloiId
*/
public function __construct($serverPloiId)
{
$this->serverPloiId = $serverPloiId;
}
/**
* Execute the job.
*
* @return void
*/
public function handle()
{
$ploi = new Ploi(config('services.ploi.token'));
$ploi->server($this->serverPloiId)->delete();
}
}

View File

@@ -0,0 +1,70 @@
<?php
namespace App\Jobs\Servers;
use App\Models\Server;
use App\Services\Ploi\Ploi;
use Illuminate\Bus\Queueable;
use App\Traits\JobHasThresholds;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
class FetchServerStatus implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds;
public $server;
/**
* Create a new job instance.
*
* @param Server $server
* @param int $threshold
*/
public function __construct(Server $server, $threshold = 0)
{
$this->server = $server;
$this->setThreshold($threshold);
}
/**
* Execute the job.
*
* @return void
*/
public function handle()
{
// If we tried over 10 times, game over, delete the site
if ($this->hasReachedThresholdLimit(10)) {
$this->server->delete();
return;
}
$ploi = new Ploi;
$ploiServer = $ploi->server($this->server->ploi_id)->get()->getData();
if ($ploiServer->status !== Server::STATUS_ACTIVE) {
$this->incrementThreshold();
dispatch(new self($this->server, $this->threshold))->delay(now()->addMinutes(2));
// Check if an IP address is present already
if ($ploiServer->ip_address && !$this->server->ip) {
$this->server->ip = $ploiServer->ip_address;
$this->server->save();
}
return;
}
$this->server->status = $ploiServer->status;
$this->server->ip = $ploiServer->ip_address;
$this->server->internal_ip = $ploiServer->internal_ip;
$this->server->available_php_versions = $ploiServer->installed_php_versions;
$this->server->save();
}
}

View File

@@ -4,6 +4,7 @@ namespace App\Jobs\Sites;
use App\Models\Site;
use App\Services\Ploi\Ploi;
use Illuminate\Support\Arr;
use Illuminate\Bus\Queueable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
@@ -35,14 +36,14 @@ class CreateSite implements ShouldQueue
{
$ploi = new Ploi(config('services.ploi.token'));
$owner = $this->site->users()->first();
$systemUser = $this->site->getSystemUser();
$ploiSite = $ploi->server($this->site->server->ploi_id)->sites()->create(
$this->site->domain,
'/public',
'/',
$owner->user_name,
decrypt($owner->ftp_password)
Arr::get($systemUser, 'user_name'),
decrypt(Arr::get($systemUser, 'ftp_password'))
);
$this->site->ploi_id = $ploiSite->data->id;

View File

@@ -43,7 +43,7 @@ class FetchSiteStatus implements ShouldQueue
return;
}
$ploi = new Ploi(config('services.ploi.token'));
$ploi = new Ploi;
$ploiSite = $ploi->server($this->site->server->ploi_id)->sites()->get($this->site->ploi_id)->getData();

View File

@@ -0,0 +1,42 @@
<?php
namespace App\Mail\Admin\Server;
use App\Models\User;
use App\Models\Server;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Contracts\Queue\ShouldQueue;
class AdminServerCreatedEmail extends Mailable implements ShouldQueue
{
use Queueable, SerializesModels;
public $user;
public $server;
/**
* Create a new message instance.
*
* @param User $user
* @param Server $server
*/
public function __construct(User $user, Server $server)
{
$this->user = $user;
$this->server = $server;
}
/**
* Build the message.
*
* @return $this
*/
public function build()
{
return $this
->subject(__('A user has created a new server'))
->markdown('emails.admin.server.new-server');
}
}

View File

@@ -0,0 +1,42 @@
<?php
namespace App\Mail\Server;
use App\Models\User;
use App\Models\Server;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Contracts\Queue\ShouldQueue;
class ServerCreatedEmail extends Mailable implements ShouldQueue
{
use Queueable, SerializesModels;
public $user;
public $server;
/**
* Create a new message instance.
*
* @param User $user
* @param Server $server
*/
public function __construct(User $user, Server $server)
{
$this->user = $user;
$this->server = $server;
}
/**
* Build the message.
*
* @return $this
*/
public function build()
{
return $this
->subject(__('Your new server is being created'))
->markdown('emails.server.new-server');
}
}

View File

@@ -4,10 +4,10 @@ namespace App\Mail\User;
use App\Models\User;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Support\Facades\URL;
use Illuminate\Queue\SerializesModels;
use Illuminate\Contracts\Queue\ShouldQueue;
class WelcomeEmail extends Mailable implements ShouldQueue
{

28
app/Models/Alert.php Normal file
View File

@@ -0,0 +1,28 @@
<?php
namespace App\Models;
use DateTimeInterface;
use Illuminate\Database\Eloquent\Model;
class Alert extends Model
{
const TYPE_INFO = 'info';
const TYPE_WARNING = 'warning';
const TYPE_DANGER = 'danger';
public $fillable = [
'type',
'message',
'expires_at'
];
public $dates = [
'expires_at'
];
protected function serializeDate(DateTimeInterface $date)
{
return $date->format('Y-m-d H:i:s');
}
}

View File

@@ -0,0 +1,18 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class DocumentationCategory extends Model
{
public $fillable = [
'title',
'description'
];
public function items()
{
return $this->hasMany(DocumentationItem::class);
}
}

View File

@@ -6,5 +6,13 @@ use Illuminate\Database\Eloquent\Model;
class DocumentationItem extends Model
{
//
public $fillable = [
'title',
'content'
];
public function category()
{
return $this->belongsTo(DocumentationCategory::class, 'documentation_category_id');
}
}

View File

@@ -2,19 +2,34 @@
namespace App\Models;
use App\Casts\PermissionCast;
use Illuminate\Database\Eloquent\Model;
class Package extends Model
{
const CURRENCY_EURO = 'eur';
const CURRENCY_USD = 'usd';
const CURRENCY_NOK = 'nok';
const CURRENCY_AUD = 'aud';
const CURRENCY_CAD = 'cad';
const CURRENCY_GBP = 'gbp';
const CURRENCY_INR = 'inr';
public $fillable = [
'name',
'plan_id', // This does not reflect a internal database relation, it reflects the plan ID from the PSP
'currency',
'price_hourly',
'price_monthly',
'maximum_sites',
'maximum_servers',
'server_creation'
'site_permissions',
'server_permissions'
];
public $casts = [
'server_creation' => 'boolean'
'site_permissions' => PermissionCast::class,
'server_permissions' => PermissionCast::class,
];
public function users()
@@ -22,6 +37,11 @@ class Package extends Model
return $this->hasMany(User::class);
}
public function providers()
{
return $this->belongsToMany(Provider::class);
}
protected static function booted()
{
static::deleting(function ($package) {

View File

@@ -8,6 +8,17 @@ class Provider extends Model
{
protected $guarded = [];
public function getNameWithLabelAttribute()
{
$string = $this->name;
if ($this->label) {
$string .= ' (' . $this->label . ')';
}
return $string;
}
public function plans()
{
return $this->hasMany(ProviderPlan::class);
@@ -17,4 +28,30 @@ class Provider extends Model
{
return $this->hasMany(ProviderRegion::class);
}
public function packages()
{
return $this->belongsToMany(Package::class);
}
public function servers()
{
return $this->hasMany(Server::class);
}
public static function booted()
{
static::deleting(function (self $provider) {
$provider->regions()->delete();
$provider->plans()->delete();
$provider->packages()->detach();
foreach ($provider->servers as $server) {
$server->provider_id = null;
$server->provider_plan_id = null;
$server->provider_region_id = null;
$server->save();
}
});
}
}

View File

@@ -41,6 +41,21 @@ class Server extends Model
return $this->morphMany(SystemLog::class, 'model');
}
public function provider()
{
return $this->belongsTo(Provider::class);
}
public function providerRegion()
{
return $this->belongsTo(ProviderRegion::class);
}
public function providerPlan()
{
return $this->belongsTo(ProviderPlan::class);
}
public static function booted()
{
static::deleting(function (self $server) {

View File

@@ -65,6 +65,11 @@ class Site extends Model
return $this->morphMany(SystemLog::class, 'model');
}
public function systemUsers()
{
return $this->belongsToMany(SiteSystemUser::class, 'site_system_user_attached');
}
protected function serializeDate(DateTimeInterface $date)
{
return $date->format('Y-m-d H:i:s');
@@ -75,12 +80,42 @@ class Site extends Model
return $this->status === self::STATUS_ACTIVE;
}
public function getSystemUser($withPassword = true)
{
if (setting('isolate_per_site_per_user') && $this->systemUsers()->first()) {
$user = $this->systemUsers()->first();
} else {
$user = $this->users()->first();
}
return [
'user_name' => $user->user_name,
] + ($withPassword ? ['ftp_password' => $user->ftp_password] : []);
}
public static function booted()
{
static::created(function (self $site) {
$site->systemUsers()->create();
});
static::deleting(function (self $site) {
foreach ($site->databases as $database) {
$database->delete();
}
$ids = $site->systemUsers->pluck('id');
// Detach all db users
$site->systemUsers()->detach();
// Loop through ids an remove old users.
foreach ($ids as $id) {
$record = SiteSystemUser::find($id);
if ($record) {
$record->delete();
}
}
$site->redirects()->delete();
$site->cronjobs()->delete();
$site->certificates()->delete();

View File

@@ -0,0 +1,37 @@
<?php
namespace App\Models;
use App\Casts\Encrypted;
use Illuminate\Support\Str;
use Illuminate\Database\Eloquent\Model;
class SiteSystemUser extends Model
{
public $fillable = [
'user_name',
'ftp_password'
];
protected $casts = [
'ftp_password' => Encrypted::class,
];
public function site()
{
return $this->belongsToMany(Site::class, 'site_system_user_attached');
}
public function user()
{
return $this->belongsTo(User::class);
}
protected static function booted()
{
static::creating(function (self $siteSystemUser) {
$siteSystemUser->user_name = strtolower(Str::random(10));
$siteSystemUser->ftp_password = Str::random();
});
}
}

View File

@@ -3,17 +3,18 @@
namespace App\Models;
use App\Casts\Encrypted;
use App\Mail\User\WelcomeEmail;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Str;
use Laravel\Cashier\Billable;
use App\Mail\User\WelcomeEmail;
use Illuminate\Support\Facades\Mail;
use Illuminate\Notifications\Notifiable;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Contracts\Translation\HasLocalePreference;
class User extends Authenticatable implements HasLocalePreference
{
use Notifiable;
use Billable, Notifiable;
const ADMIN = 'admin';
const RESELLER = 'reseller';
@@ -27,10 +28,13 @@ class User extends Authenticatable implements HasLocalePreference
'address',
'city',
'country',
'zip',
'notes',
'language',
'blocked',
'theme'
'theme',
'keyboard_shortcuts',
'requires_password_for_ftp'
];
protected $hidden = [
@@ -42,6 +46,8 @@ class User extends Authenticatable implements HasLocalePreference
protected $casts = [
'email_verified_at' => 'datetime',
'ftp_password' => Encrypted::class,
'keyboard_shortcuts' => 'boolean',
'requires_password_for_ftp' => 'boolean'
];
protected $appends = [
@@ -119,13 +125,17 @@ class User extends Authenticatable implements HasLocalePreference
static::creating(function (self $user) {
$user->user_name = strtolower(Str::random(10));
$user->ftp_password = Str::random();
if (!$user->language) {
$user->language = setting('default_language', 'en');
}
});
static::created(function (self $user) {
Mail::to($user)->send(new WelcomeEmail($user));
});
static::deleting(function(self $user){
static::deleting(function (self $user) {
$user->systemLogs()->delete();
$user->servers()->detach();
$user->sites()->detach();

View File

@@ -2,16 +2,29 @@
namespace App\Models;
use App\Casts\Encrypted;
use Illuminate\Database\Eloquent\Model;
class UserProvider extends Model
{
const TYPE_DNS = 'dns';
const TYPE_CLOUDFLARE = 'cloudflare';
public $hidden = [
'token'
];
public $fillable = [
'type',
'token',
'meta'
];
protected $casts = [
'meta' => 'array',
'token' => Encrypted::class,
];
public function user()
{
return $this->belongsTo(User::class);

View File

@@ -3,20 +3,25 @@
namespace App\Policies;
use App\Models\User;
use Illuminate\Support\Arr;
use Illuminate\Auth\Access\HandlesAuthorization;
class ServerPolicy
{
use HandlesAuthorization;
/**
* Determine whether the user can create models.
*
* @param \App\Models\User $user
* @return mixed
*/
public function create(User $user)
{
return $user->package->server_creation ?? false;
return Arr::get($user->package->server_permissions, 'create', false);
}
public function update(User $user)
{
return Arr::get($user->package->server_permissions, 'update', false);
}
public function delete(User $user)
{
return Arr::get($user->package->server_permissions, 'delete', false);
}
}

View File

@@ -0,0 +1,27 @@
<?php
namespace App\Policies;
use App\Models\User;
use Illuminate\Support\Arr;
use Illuminate\Auth\Access\HandlesAuthorization;
class SitePolicy
{
use HandlesAuthorization;
public function create(User $user)
{
return Arr::get($user->package->site_permissions, 'create', false);
}
public function update(User $user)
{
return Arr::get($user->package->site_permissions, 'update', false);
}
public function delete(User $user)
{
return Arr::get($user->package->site_permissions, 'delete', false);
}
}

View File

@@ -5,9 +5,7 @@ namespace App\Providers;
use App\Models\Setting;
use Illuminate\Support\Collection;
use Illuminate\Pagination\UrlWindow;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\ServiceProvider;
use Illuminate\Pagination\LengthAwarePaginator;
@@ -31,68 +29,10 @@ class AppServiceProvider extends ServiceProvider
});
if (!$this->app->request->is('api*')) {
$this->registerInertia();
$this->registerLengthAwarePaginator();
}
}
public function registerInertia()
{
inertia()->version(function () {
return md5_file(public_path('mix-manifest.json'));
});
inertia()->share([
'auth' => function () {
return [
'user' => Auth::user() ? [
'id' => Auth::user()->id,
'name' => Auth::user()->name,
'email' => Auth::user()->email,
'role' => Auth::user()->role,
'user_name' => Auth::user()->user_name,
'avatar' => Auth::user()->getGravatar(),
'theme' => Auth::user()->theme,
] : null,
'package' => auth()->user() && auth()->user()->package ? [
'maximum_sites' => auth()->user()->package->maximum_sites
] : null,
'can' => auth()->user() && auth()->user()->package ? [
'server_creation' => auth()->user()->package->server_creation
] : [],
];
},
'settings' => function () {
return [
'demo' => config('app.demo'),
'name' => setting('name', 'Company'),
'support' => setting('support', false),
'documentation' => setting('documentation', false),
'logo' => setting('logo'),
'allow_registration' => setting('allow_registration'),
];
},
'flash' => function () {
return [
'success' => Session::get('success'),
'error' => Session::get('error'),
'info' => Session::get('info'),
];
},
'errors' => function () {
return Session::get('errors')
? Session::get('errors')->getBag('default')->getMessages()
: (object)[];
},
'errors_count' => function () {
return Session::get('errors')
? count(Session::get('errors')->getBag('default')->getMessages())
: 0;
},
]);
}
protected function registerLengthAwarePaginator()
{
$this->app->bind(LengthAwarePaginator::class, function ($app, $values) {

View File

@@ -2,7 +2,9 @@
namespace App\Providers;
use App\Models\Site;
use App\Models\Server;
use App\Policies\SitePolicy;
use App\Policies\ServerPolicy;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
@@ -15,6 +17,7 @@ class AuthServiceProvider extends ServiceProvider
*/
protected $policies = [
Server::class => ServerPolicy::class,
Site::class => SitePolicy::class,
];
/**

View File

@@ -34,7 +34,7 @@ class HorizonServiceProvider extends HorizonApplicationServiceProvider
protected function gate()
{
Gate::define('viewHorizon', function ($user) {
return $user->isAdmin();
return $user->isAdmin() && !config('app.demo');
});
}
}

View File

@@ -2,11 +2,11 @@
namespace App\Providers;
use Illuminate\Cache\RateLimiting\Limit;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Support\Facades\Route;
use Illuminate\Cache\RateLimiting\Limit;
use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
class RouteServiceProvider extends ServiceProvider
{

View File

@@ -0,0 +1,58 @@
<?php
namespace App\Rules;
use App\Services\Cloudflare;
use Illuminate\Contracts\Validation\Rule;
class CloudflareGeneralTest implements Rule
{
public $cloudflareEmail;
/**
* Create a new rule instance.
*
* @param $cloudflareEmail
*/
public function __construct($cloudflareEmail)
{
$this->cloudflareEmail = $cloudflareEmail;
}
/**
* Determine if the validation rule passes.
*
* @param string $attribute
* @param mixed $value
*
* @return bool
*/
public function passes($attribute, $value)
{
if (!$this->cloudflareEmail) {
return false;
}
try {
$cloudflare = new Cloudflare($this->cloudflareEmail, $value);
if ($cloudflare->user()) {
return true;
}
} catch (\Exception $e) {
return false;
}
return false;
}
/**
* Get the validation error message.
*
* @return string
*/
public function message()
{
return __('We could not authenticate you with Cloudflare, are you sure this is the right API key? Also make sure your profile e-mail matches the one in Cloudflare.');
}
}

View File

@@ -2,8 +2,8 @@
namespace App\Rules;
use Illuminate\Contracts\Validation\Rule;
use Illuminate\Support\Facades\Hash;
use Illuminate\Contracts\Validation\Rule;
class MatchOldPassword implements Rule
{

140
app/Services/Cloudflare.php Normal file
View File

@@ -0,0 +1,140 @@
<?php
namespace App\Services;
use Illuminate\Support\Str;
use GuzzleHttp\Exception\ClientException;
class Cloudflare
{
public $adapter;
public $zoneId;
public function __construct($email, $key)
{
$key = new \Cloudflare\API\Auth\APIKey($email, $key);
$this->adapter = new \Cloudflare\API\Adapter\Guzzle($key);
}
public function domains($match = '')
{
$zones = new \Cloudflare\API\Endpoints\Zones($this->adapter);
return collect(object_get($zones->listZones($match), 'result'));
}
public function zone($zoneId)
{
$this->zoneId = $zoneId;
return $this;
}
public function listRecords($page = 1, $perPage = 50, $order = '', $direction = '', $type = '', $name = '', $content = '', $match = 'all')
{
$dns = new \Cloudflare\API\Endpoints\DNS($this->adapter);
if (!$dns || !$this->zoneId) {
return null;
}
return collect($dns->listRecords($this->zoneId, $type, $name, $content, $page, $perPage, $order, $direction, $match)->result)
->map(function ($record) {
// We add this property so our UI panel can see whether a record is being edited.
$record->edit = false;
$record->display_content = Str::limit($record->content, 25);
return $record;
});
}
/**
* @param string $name
* @param null $content
* @param string $type
* @param int $ttl
* @param bool $proxied
* @param int $priority
*
* @return bool
*/
public function addRecord($name, $content = null, $type = 'A', $ttl = 0, $proxied = true, $priority = '0')
{
if ($content == null && $type = 'A') {
$content = $_SERVER['SERVER_ADDR'];
}
$dns = new \Cloudflare\API\Endpoints\DNS($this->adapter);
try {
return $dns->addRecord($this->zoneId, $type, $name, $content, $ttl, $proxied, $priority);
} catch (ClientException $e) {
return false;
}
}
public function getRecordByValues($name, $type)
{
$dns = new \Cloudflare\API\Endpoints\DNS($this->adapter);
try {
return $dns->getRecordID($this->zoneId, $type, $name);
} catch (ClientException $e) {
return false;
}
}
public function deleteRecord($id)
{
$dns = new \Cloudflare\API\Endpoints\DNS($this->adapter);
try {
return $dns->deleteRecord($this->zoneId, $id);
} catch (ClientException $e) {
return false;
}
}
public function updateRecord($id, array $data = [])
{
$dns = new \Cloudflare\API\Endpoints\DNS($this->adapter);
try {
$record = $dns->getRecordDetails($this->zoneId, $id);
return $dns->updateRecordDetails($this->zoneId, $id, [
'type' => object_get($record, 'type'),
'name' => array_get($data, 'name'),
'content' => array_get($data, 'content'),
]);
} catch (ClientException $e) {
return false;
}
}
public function toggleProxy($id)
{
$dns = new \Cloudflare\API\Endpoints\DNS($this->adapter);
try {
$record = $dns->getRecordDetails($this->zoneId, $id);
return $dns->updateRecordDetails($this->zoneId, $id, [
'type' => object_get($record, 'type'),
'name' => object_get($record, 'name'),
'content' => object_get($record, 'content'),
'proxied' => !object_get($record, 'proxied')
]);
} catch (ClientException $e) {
return false;
}
}
public function user()
{
$user = new \Cloudflare\API\Endpoints\User($this->adapter);
return $user->getUserDetails();
}
}

View File

@@ -83,7 +83,7 @@ class Resource
return $this->server;
}
public function setServer(Server $server): self
public function setServer(Server $server)
{
$this->server = $server;

View File

@@ -2,7 +2,9 @@
namespace App\Services\Ploi\Resources;
use stdClass;
use App\Services\Ploi\Ploi;
use App\Services\Ploi\Exceptions\Http\NotValid;
use Services\Ploi\Exceptions\Resource\RequiresId;
class Server extends Resource
@@ -29,6 +31,19 @@ class Server extends Resource
return $this->getPloi()->makeAPICall($this->getEndpoint());
}
public function delete(int $id = null)
{
if ($id) {
$this->setId($id);
}
if ($this->getId()) {
$this->setEndpoint($this->endpoint . '/' . $this->getId());
}
return $this->getPloi()->makeAPICall($this->getEndpoint(), 'delete');
}
public function logs(int $id = null)
{
if ($id) {
@@ -44,6 +59,48 @@ class Server extends Resource
return $this->getPloi()->makeAPICall($this->getEndpoint());
}
public function create(
string $name,
int $provider,
int $region,
int $plan
): stdClass {
// Remove the id
$this->setId(null);
// Set the options
$options = [
'body' => json_encode([
'name' => $name,
'plan' => $plan,
'region' => $region,
'credential' => $provider,
'type' => 'server',
'database_type' => 'mysql',
'webserver_type' => 'nginx',
'php_version' => '7.4'
]),
];
// Make the request
try {
$response = $this->getPloi()->makeAPICall($this->getEndpoint(), 'post', $options);
} catch (NotValid $exception) {
$errors = json_decode($exception->getMessage())->errors;
dd($errors);
throw $exception;
}
// Set the id of the site
$this->setId($response->getJson()->data->id);
// Return the data
return $response->getData();
}
public function sites($id = null): Site
{
return new Site($this, $id);

View File

@@ -43,7 +43,7 @@ class Site extends Resource
return $this->server;
}
public function setServer(Server $server): self
public function setServer(Server $server)
{
$this->server = $server;

View File

@@ -20,8 +20,14 @@ class User extends Resource
return $this->getPloi()->makeAPICall($this->getEndpoint());
}
public function serverProviders()
public function serverProviders($id = null)
{
return $this->getPloi()->makeAPICall($this->getEndpoint() . '/server-providers');
$url = $this->getEndpoint() . '/server-providers';
if ($id) {
$url .= '/' . $id;
}
return $this->getPloi()->makeAPICall($url);
}
}

View File

@@ -34,4 +34,13 @@ class VersionChecker
{
return $this->currentVersion < $this->remoteVersion || $this->currentVersion != $this->remoteVersion;
}
public function flushVersionData()
{
try {
cache()->forget('ploi-core-current-version');
cache()->forget('ploi-core-remote-version');
} catch (\Exception $exception) {
}
}
}

View File

@@ -15,13 +15,15 @@
"fideloper/proxy": "^4.2",
"fruitcake/laravel-cors": "^1.0",
"guzzlehttp/guzzle": "^6.2|^7.0.1",
"inertiajs/inertia-laravel": "^0.2.12",
"inertiajs/inertia-laravel": "^0.3.1",
"laravel/cashier": "^12.3",
"laravel/framework": "^8.4",
"laravel/horizon": "^5.0",
"laravel/tinker": "^2.0",
"laravel/ui": "^2.1",
"league/glide": "^1.6",
"pragmarx/google2fa-laravel": "^1.3",
"predis/predis": "^1.1",
"tightenco/ziggy": "^0.9.4"
},
"require-dev": {
@@ -29,9 +31,10 @@
"facade/ignition": "^2.3",
"friendsofphp/php-cs-fixer": "^2.16",
"fzaninotto/faker": "^1.9.1",
"laravel/dusk": "^6.15",
"mockery/mockery": "^1.3.1",
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^8.5"
"phpunit/phpunit": "^9.5.4"
},
"config": {
"optimize-autoloader": true,

3915
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -17,7 +17,7 @@ return [
|
*/
'default' => env('LOG_CHANNEL', 'daily'),
'default' => env('LOG_CHANNEL', 'stack'),
/*
|--------------------------------------------------------------------------
@@ -36,8 +36,8 @@ return [
'channels' => [
'stack' => [
'driver' => 'daily',
'channels' => ['single'],
'driver' => 'stack',
'channels' => ['daily'],
'ignore_exceptions' => false,
],
@@ -51,7 +51,7 @@ return [
'driver' => 'daily',
'path' => storage_path('logs/laravel.log'),
'level' => 'debug',
'days' => 14,
'days' => 7,
],
'slack' => [

View File

@@ -4,7 +4,6 @@ namespace Database\Factories;
use App\Models\Server;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Str;
class ServerFactory extends Factory
{

View File

@@ -3,8 +3,8 @@
namespace Database\Factories;
use App\Models\User;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Str;
use Illuminate\Database\Eloquent\Factories\Factory;
class UserFactory extends Factory
{

View File

@@ -1,8 +1,8 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateFailedJobsTable extends Migration
{

View File

@@ -0,0 +1,35 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddPermissionsToPackagesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('packages', function (Blueprint $table) {
$table->json('server_permissions')->nullable()->after('maximum_servers');
$table->json('site_permissions')->nullable()->after('server_permissions');
$table->dropColumn('server_creation');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('packages', function (Blueprint $table) {
$table->dropColumn('server_permissions', 'site_permissions');
});
}
}

View File

@@ -0,0 +1,43 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreatePaymentColumns extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('packages', function (Blueprint $table) {
$table->decimal('price_hourly', 10, 4)->after('maximum_servers')->default(0);
$table->decimal('price_monthly', 10, 4)->after('price_hourly')->default(0);
$table->string('plan_id')->after('price_monthly')->nullable();
$table->string('currency')->after('plan_id')->default(\App\Models\Package::CURRENCY_USD);
});
Schema::table('users', function (Blueprint $table) {
$table->text('billing_details')->after('notes')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('packages', function (Blueprint $table) {
$table->dropColumn('price_hourly', 'price_monthly', 'plan_id', 'currency');
});
Schema::table('users', function (Blueprint $table) {
$table->dropColumn('billing_details');
});
}
}

View File

@@ -0,0 +1,36 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreatePackageProviderTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('package_provider', function (Blueprint $table) {
$table->bigInteger('package_id')->unsigned()->nullable();
$table->foreign('package_id')->references('id')->on('packages');
$table->bigInteger('provider_id')->unsigned()->nullable();
$table->foreign('provider_id')->references('id')->on('providers');
$table->boolean('default')->default(false);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('package_provider');
}
}

View File

@@ -0,0 +1,39 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddAdditionalColumnsToServersTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('servers', function (Blueprint $table) {
$table->bigInteger('provider_id')->after('maximum_sites')->unsigned()->nullable();
$table->foreign('provider_id')->references('id')->on('providers');
$table->bigInteger('provider_plan_id')->after('provider_id')->unsigned()->nullable();
$table->foreign('provider_plan_id')->references('id')->on('provider_plans');
$table->bigInteger('provider_region_id')->after('provider_plan_id')->unsigned()->nullable();
$table->foreign('provider_region_id')->references('id')->on('provider_regions');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('servers', function (Blueprint $table) {
//
});
}
}

View File

@@ -0,0 +1,32 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddKeyboardShortcutsToUsersTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('users', function (Blueprint $table) {
$table->boolean('keyboard_shortcuts')->default(true)->after('blocked');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('users', function (Blueprint $table) {
$table->dropColumn('keyboard_shortcuts');
});
}
}

Some files were not shown because too many files have changed in this diff Show More