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

Merge branch 'develop'

Browse Source 
# Conflicts:
#	public/css/app.css
#	public/js/app.js
This commit is contained in:
Dennis
2021-09-16 09:50:07 +02:00
parent 105126e498 7c896243a5
commit 0f100d6159
11 changed files with 188273 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Kernel.php
View File

@@ -68,6 +68,7 @@ class Kernel extends HttpKernel
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'has.access' => \App\Http\Middleware\HasAccessToThisGroup::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'global.api.authenticated' => \App\Http\Middleware\GlobalApiAuthenticated::class,
'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,

2
app/Http/Middleware/Demo.php
View File

@@ -10,7 +10,7 @@ class Demo
protected $safeRoutes = [
'login',
'logout',
//'profile/toggle-theme'
'profile/toggle-theme'
];
protected $allowedIps = [

27
app/Http/Middleware/HasAccessToThisGroup.php Normal file
View File

@@ -0,0 +1,27 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
class HasAccessToThisGroup
{
public function handle(Request $request, Closure $next, $group)
{
if ($group === 'servers') {
$package = $request->user()->package ?? [];
if (
!Arr::get($package->server_permissions, 'create', false) &&
!Arr::get($package->server_permissions, 'update', false) &&
!Arr::get($package->server_permissions, 'delete', false)
) {
abort(404);
}
}
return $next($request);
}
}

7
app/Models/Site.php
View File

@@ -5,6 +5,9 @@ namespace App\Models;
use DateTimeInterface;
use Illuminate\Database\Eloquent\Model;
/**
* @property mixed|string domain
*/
class Site extends Model
{
const STATUS_BUSY = 'busy';
@@ -95,6 +98,10 @@ class Site extends Model
public static function booted()
{
static::creating(function (self $site) {
$site->domain = strtolower($site->domain);
});
static::created(function (self $site) {
$site->systemUsers()->create();
});

160768
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

27333
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

17
resources/js/Pages/Dashboard/Index.vue
View File

@@ -12,7 +12,7 @@
<PageBody>
<div>
<ul class="grid grid-cols-1 md:grid-cols-3 gap-4">
<ul class="grid grid-cols-1 gap-4" :class="{'md:grid-cols-3': hasAccessToServers, 'md:grid-cols-2': !hasAccessToServers}">
<li class="p-6 rounded shadow bg-surface-3 transform transition duration-fast ease-in-out hover:scale-95">
<inertia-link :href="route('sites.index')" class="flex space-x-4">
<div>
@@ -24,7 +24,7 @@
</div>
</inertia-link>
</li>
<li class="p-6 rounded shadow bg-surface-3 transform transition duration-fast ease-in-out hover:scale-95">
<li class="p-6 rounded shadow bg-surface-3 transform transition duration-fast ease-in-out hover:scale-95" v-if="hasAccessToServers">
<inertia-link :href="route('servers.index')" class="flex space-x-4">
<div>
<IconStorage class="w-6 h-6"/>
@@ -36,7 +36,9 @@
</inertia-link>
</li>
<li class="p-6 rounded shadow bg-surface-3 transform transition duration-fast ease-in-out hover:scale-95">
<inertia-link :href="$page.props.settings.billing ? route('profile.billing.index') : route('profile.index')" class="flex space-x-4">
<inertia-link
:href="$page.props.settings.billing ? route('profile.billing.index') : route('profile.index')"
class="flex space-x-4">
<div>
<IconBox class="w-6 h-6"/>
</div>
@@ -55,7 +57,8 @@
{{ log.title }}
</template>
<template #subtitle>{{ log.description }}</template>
<template #suffix><span class="text-medium-emphasis">{{ log.created_at_human }}</span></template>
<template #suffix><span class="text-medium-emphasis">{{ log.created_at_human }}</span>
</template>
</ListItem>
</List>
</PageBody>
@@ -137,6 +140,12 @@
}
},
computed: {
hasAccessToServers () {
return (this.$page.props.auth.can.servers.create || this.$page.props.auth.can.servers.update || this.$page.props.auth.can.servers.delete);
}
},
mounted() {
if (this.$page.props.flash.info) {
useNotification({

12
resources/js/Pages/Dashboard/components/TopBar.vue
View File

@@ -29,6 +29,14 @@ export default {
breadcrumbs: Array,
},
computed: {
hasServerAccess() {
return this.$page.props.auth.can.servers.create ||
this.$page.props.auth.can.servers.delete ||
this.$page.props.auth.can.servers.update
}
},
data() {
return {
tabBars: [
@@ -41,10 +49,10 @@ export default {
title: this.__('Sites'),
to: this.route('sites.index'),
},
{
(this.$page.props.auth.can.servers.create || this.$page.props.auth.can.servers.update || this.$page.props.auth.can.servers.delete) ? {
title: this.__('Servers'),
to: this.route('servers.index'),
},
} : null,
],
}
},

6
resources/js/Pages/Sites/components/TopBar.vue
View File

@@ -42,10 +42,10 @@ export default {
to: this.route('sites.index'),
active: this.route().current('sites.*')
},
{
title: 'Servers',
(this.$page.props.auth.can.servers.create || this.$page.props.auth.can.servers.update || this.$page.props.auth.can.servers.delete) ? {
title: this.__('Servers'),
to: this.route('servers.index'),
},
} : null,
],
}
},

35
resources/sass/app.scss vendored
View File

@@ -5,8 +5,6 @@
@tailwind utilities;
@import 'nprogress';
//$balloon-bg: var(--color-surface-1);
@import "~balloon-css/src/balloon";
.bf-blur {
@@ -29,3 +27,36 @@
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
.theme--dark {
.prose {
color: var(--text-medium-emphasis);
}
.vue-simplemde {
.editor-toolbar {
border-left: 1px solid var(--color-surface-3);
border-top: 1px solid var(--color-surface-3);
border-right: 1px solid var(--color-surface-3);
.separator {
border-left: 1px solid var(--color-surface-3);
border-right: transparent;
}
a {
color: var(--text-medium-emphasis) !important;
}
a:hover {
background: var(--color-surface-3);
}
}
.CodeMirror {
background: var(--color-surface-1);
color: var(--text-medium-emphasis);
border: 1px solid var(--color-surface-3);
}
}
}

2
routes/web.php
View File

@@ -75,7 +75,7 @@ Route::group(['middleware' => ['auth', 'auth.blocked']], function () {
});
// Server routes
Route::group(['prefix' => 'servers', 'as' => 'servers.'], function () {
Route::group(['prefix' => 'servers', 'as' => 'servers.', 'middleware' => 'has.access:servers'], function () {
Route::get('/', 'ServerController@index')->name('index');
Route::get('{provider}/plans-and-regions', 'ServerController@plansAndRegions')->name('plans-and-regions');
Route::get('{server}', 'ServerController@show')->name('show');