davidl/ploi-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Dennis
2020-10-20 13:43:26 +02:00
parent b7ff40fd72
commit bafe8ba780
10 changed files with 80 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/ServerController.php
View File

@@ -14,7 +14,10 @@ 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->providers()->pluck('name', 'id');

2
app/Jobs/Servers/FetchServerStatus.php
View File

@@ -63,6 +63,8 @@ class FetchServerStatus implements ShouldQueue
$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();
}
}

53
public/js/38.js vendored
View File

@@ -102,6 +102,10 @@ __webpack_require__.r(__webpack_exports__);
//
//
//
//
//
//
//
@@ -405,17 +409,46 @@ var render = function() {
"Container",
[
_c("PageHeader", {
scopedSlots: _vm._u([
{
key: "start",
fn: function() {
return [
_c("PageHeaderTitle", [_vm._v(_vm._s(_vm.server.name))])
]
scopedSlots: _vm._u(
[
{
key: "start",
fn: function() {
return [
_c("PageHeaderTitle", [
_vm._v(_vm._s(_vm.server.name))
])
]
},
proxy: true
},
proxy: true
}
])
_vm.can("sites", "create")
? {
key: "end",
fn: function() {
return [
_c(
"Button",
{
attrs: {
as: "inertia-link",
href: _vm.route("sites.index", {
create: true,
server: _vm.server.id
})
}
},
[_vm._v(_vm._s(_vm.__("Create site")))]
)
]
},
proxy: true
}
: null
],
null,
true
)
}),
_vm._v(" "),
_c(

15
public/js/49.js vendored
View File

@@ -790,7 +790,20 @@ var render = function() {
{
key: "subtitle",
fn: function() {
return [_vm._v(_vm._s(server.ip))]
return [
_vm._v(
_vm._s(server.ip) +
" · " +
_vm._s(server.sites_count) +
" " +
_vm._s(
_vm.__choice(
"site|sites",
server.sites_count
)
)
)
]
},
proxy: true
},

5
public/js/50.js vendored
View File

@@ -193,6 +193,11 @@ __webpack_require__.r(__webpack_exports__);
if (window.location.search.includes('create=true')) {
this.modalIsOpen = true;
}
if (window.location.search.includes('server=')) {
var urlParams = new URLSearchParams(window.location.search);
this.form.server_id = urlParams.get('server');
}
},
watch: {
shouldBePolling: function shouldBePolling(value) {

2
public/js/app.js vendored
View File

@@ -43,7 +43,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
/******/ return __webpack_require__.p + "js/" + ({}[chunkId]||chunkId) + ".js?id=" + {"0":"0dcde053981f92959e59","1":"40f269324eb90e7c5005","2":"d2a49802291d427ca7c8","3":"a0f4c2f49863abbfe7f1","4":"27416beeac7dd90b6c9f","5":"fbfbcf45610d060d921e","6":"73fc0264b5cc06f5bd55","7":"140acb8c38018bb7c822","8":"45200cc4fd126fda2ffc","9":"3347d79d05ca0ac7a350","10":"f4b9874849329e009671","11":"6f387eba6830da61b997","12":"61c7f47dc4727d867fa7","13":"b5722f8cbeefb2bb0cde","14":"5a60048db4d9ace9558a","15":"b406efe2b2eb8988be0b","16":"ae392c0d7939c1834713","17":"031677a852ea3f5eb57a","18":"6e9cd6162ae0d47d846c","19":"0cefe5adcf3c9c67917d","20":"29bbd0539d7b23324a3d","21":"249168af665133b418ec","22":"db25f600926c9f3cd79f","23":"0924f149c1e3f1ccc23b","24":"e0139a753b3037348bd3","25":"523a459f15606706e0f4","26":"78ea723a4d8f6c925287","27":"61b4c089c608f7f27b57","28":"df81cbcdc7dddac9a1cf","29":"1d1e4072de9faa984b8c","30":"34254d5ab54e1b77af57","31":"b24fe053d9586525bd04","32":"d40da2a9d0dfcdfcf40e","33":"4ee1d57db25ce73da07a","34":"a792244f1d2629ddd5e3","35":"13384dcc57163b2c15fb","36":"07128eb2197b6a6d9955","37":"8b8ab95aeaa851c57033","38":"d123e29b59d771ee7750","39":"fe834feb15b9160591f0","40":"90e1e3b80ac15780aa45","41":"26e0438c5430defefcb4","42":"f7e025a8a96b2e66d300","43":"8c53f0e16f44ae918000","44":"ae179ec931d5c3e7d89f","45":"13d7329da027c1e0cca4","46":"96963330e5744696f861","47":"b9dd7aafbd529e03b008","48":"303c80c25410a7039819","49":"3bada47ff33752bb86b7","50":"94a682e9b6d6472e060f","51":"d5a713429e4ed79b884b","52":"22fc8b2d90e12bd3f5eb","53":"327b50ce903b0f348341","54":"cb30fead7b74df252e66","55":"0953446db22303519e08","56":"6bc136b4c9a35e9a1836","57":"3f7b6082e37f0f114055","58":"a1668de9111dbf09572b","59":"b6ab5d03b46b7ae139a7","60":"37d00800b71f79260df7","61":"7799c0088535883cfcdc","62":"5e0875a9e333d029edcb","63":"3fbf8bbeb22bdf1a3538","64":"35e94b96c17d9176fdd1","65":"c40d3bc7ae4294705195","66":"54405ebd171bf0a0be8a","67":"0cf2c9062ba4048c4d16","68":"47e5da1f84b24bfeab25","69":"6258b9920cf545ad6043","70":"cf0dc959ae07c017ed3e","71":"a82af2a3c60b498c6b10","72":"adda6ceb50c78f5aae68","73":"884f5978ac8bcb4fdc45","74":"cf1ca882da11e35bea7c","75":"7e7c004989bdfef01a71"}[chunkId] + ""
/******/ return __webpack_require__.p + "js/" + ({}[chunkId]||chunkId) + ".js?id=" + {"0":"0dcde053981f92959e59","1":"40f269324eb90e7c5005","2":"d2a49802291d427ca7c8","3":"a0f4c2f49863abbfe7f1","4":"27416beeac7dd90b6c9f","5":"fbfbcf45610d060d921e","6":"73fc0264b5cc06f5bd55","7":"140acb8c38018bb7c822","8":"45200cc4fd126fda2ffc","9":"3347d79d05ca0ac7a350","10":"f4b9874849329e009671","11":"6f387eba6830da61b997","12":"61c7f47dc4727d867fa7","13":"b5722f8cbeefb2bb0cde","14":"5a60048db4d9ace9558a","15":"b406efe2b2eb8988be0b","16":"ae392c0d7939c1834713","17":"031677a852ea3f5eb57a","18":"6e9cd6162ae0d47d846c","19":"0cefe5adcf3c9c67917d","20":"29bbd0539d7b23324a3d","21":"249168af665133b418ec","22":"db25f600926c9f3cd79f","23":"0924f149c1e3f1ccc23b","24":"e0139a753b3037348bd3","25":"523a459f15606706e0f4","26":"78ea723a4d8f6c925287","27":"61b4c089c608f7f27b57","28":"df81cbcdc7dddac9a1cf","29":"1d1e4072de9faa984b8c","30":"34254d5ab54e1b77af57","31":"b24fe053d9586525bd04","32":"d40da2a9d0dfcdfcf40e","33":"4ee1d57db25ce73da07a","34":"a792244f1d2629ddd5e3","35":"13384dcc57163b2c15fb","36":"07128eb2197b6a6d9955","37":"8b8ab95aeaa851c57033","38":"1b49c17866375747e001","39":"fe834feb15b9160591f0","40":"90e1e3b80ac15780aa45","41":"26e0438c5430defefcb4","42":"f7e025a8a96b2e66d300","43":"8c53f0e16f44ae918000","44":"ae179ec931d5c3e7d89f","45":"13d7329da027c1e0cca4","46":"96963330e5744696f861","47":"b9dd7aafbd529e03b008","48":"303c80c25410a7039819","49":"e22bcc53d82f2b385baf","50":"893429aa6a4bf82f5f0d","51":"d5a713429e4ed79b884b","52":"22fc8b2d90e12bd3f5eb","53":"327b50ce903b0f348341","54":"cb30fead7b74df252e66","55":"0953446db22303519e08","56":"6bc136b4c9a35e9a1836","57":"3f7b6082e37f0f114055","58":"a1668de9111dbf09572b","59":"b6ab5d03b46b7ae139a7","60":"37d00800b71f79260df7","61":"7799c0088535883cfcdc","62":"5e0875a9e333d029edcb","63":"3fbf8bbeb22bdf1a3538","64":"35e94b96c17d9176fdd1","65":"c40d3bc7ae4294705195","66":"54405ebd171bf0a0be8a","67":"0cf2c9062ba4048c4d16","68":"47e5da1f84b24bfeab25","69":"6258b9920cf545ad6043","70":"cf0dc959ae07c017ed3e","71":"a82af2a3c60b498c6b10","72":"adda6ceb50c78f5aae68","73":"884f5978ac8bcb4fdc45","74":"cf1ca882da11e35bea7c","75":"7e7c004989bdfef01a71"}[chunkId] + ""
/******/ }
/******/
/******/ // The require function

2
resources/js/Pages/Servers/Index.vue
View File

@@ -57,7 +57,7 @@
{{ server.name }}
</inertia-link>
</template>
<template #subtitle>{{ server.ip }}</template>
<template #subtitle>{{ server.ip }} &centerdot; {{ server.sites_count }} {{ __choice('site|sites', server.sites_count) }}</template>
<template #suffix>
<Dropdown v-slot="{ isOpen, toggle, position }">
<IconButton @click="toggle">

4
resources/js/Pages/Servers/Show.vue
View File

@@ -8,6 +8,10 @@
<template #start>
<PageHeaderTitle>{{ server.name }}</PageHeaderTitle>
</template>
<template v-if="can('sites', 'create')" #end>
<Button as="inertia-link" :href="route('sites.index', {create: true, server: server.id})">{{ __('Create site') }}</Button>
</template>
</PageHeader>
<PageBody>

5
resources/js/Pages/Sites/Index.vue
View File

@@ -160,6 +160,11 @@
if(window.location.search.includes('create=true')){
this.modalIsOpen = true;
}
if(window.location.search.includes('server=')){
let urlParams = new URLSearchParams(window.location.search);
this.form.server_id = urlParams.get('server');
}
},
watch: {

1
resources/lang/nl.json
View File

@@ -102,6 +102,7 @@
"Light": "Licht",
"Dark": "Donker",
"Auto": "Automatisch",
"site|sites": "website|websites",
"Support requests": "Support aanvragen",
"Open support requests": "Openstaande aanvragen",