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:54:27 +02:00
parent bafe8ba780
commit 5d737ba328
8 changed files with 65 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,9 @@ 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;
class ServerController extends Controller
@@ -47,6 +49,8 @@ class ServerController extends Controller
dispatch(new CreateServer($server));
Mail::to($request->user())->send(new ServerCreatedEmail($request->user(), $server));
return redirect()->route('servers.index');
}

2
app/Http/Controllers/SiteController.php
View File

@@ -3,10 +3,10 @@
namespace App\Http\Controllers;
use App\Models\Server;
use Illuminate\Http\Request;
use App\Jobs\Sites\CreateSite;
use App\Jobs\Sites\DeleteSite;
use App\Http\Requests\SiteRequest;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use App\Http\Resources\SiteResource;

42
app/Mail/Server/ServerCreatedEmail.php Normal file
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');
}
}

7
public/js/49.js vendored
View File

@@ -791,9 +791,12 @@ var render = function() {
key: "subtitle",
fn: function() {
return [
_vm._v(_vm._s(server.ip) + " "),
server.ip
? _c("span", [_vm._v("·")])
: _vm._e(),
_vm._v(
_vm._s(server.ip) +
" · " +
" " +
_vm._s(server.sites_count) +
" " +
_vm._s(

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":"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] + ""
/******/ 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":"73c0240195de665e40ba","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 }} &centerdot; {{ server.sites_count }} {{ __choice('site|sites', server.sites_count) }}</template>
<template #subtitle>{{ server.ip }} <span v-if="server.ip">&centerdot;</span> {{ server.sites_count }} {{ __choice('site|sites', server.sites_count) }}</template>
<template #suffix>
<Dropdown v-slot="{ isOpen, toggle, position }">
<IconButton @click="toggle">

2
resources/lang/nl.json
View File

@@ -160,6 +160,8 @@
"View ticket": "Bekijk aanvraag",
"Password creation": "Wachtwoord aangemaakt",
"You have set a password for your account": "Je hebt een wachtwoord aangemaakt voor je account",
"Your new server is being created": "Je nieuwe server wordt aangemaakt",
"You have created a new server :server, installation usually takes around 15 to 20 minutes. You will receive a email upon completion.": "Je hebt een nieuwe server :server aangemaakt, installatie duurt normaal tussen de 15 en 20 minuten. Je ontvangt een email zodra de installatie afgerond is.",
"New site :site created": "Nieuwe website :site aangemaakt",
"Site PHP version has changed": "Website PHP versie aangepast",

9
resources/views/emails/server/new-server.blade.php Normal file
View File

@@ -0,0 +1,9 @@
@component('mail::message')
{{ __('Hi!') }}
{{ __('You have created a new server :server, installation usually takes around 15 to 20 minutes. You will receive a email upon completion.', ['server' => $server->name]) }}
@component('mail::button', ['url' => route('servers.index')])
{{ __('View servers') }}
@endcomponent
@endcomponent