Prod mix

- Few bugfixes
- Updated to TW2.0
- Updated Laravel Mix
- Documentation is now working

.gitignore

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

app/Console/Commands/Core/Install.php

@@ -4,6 +4,7 @@ namespace App\Console\Commands\Core;
 
 use Exception;
 use App\Models\User;
+use Illuminate\Support\Facades\Artisan;
 use RuntimeException;
 use App\Models\Package;
 use App\Services\Ploi\Ploi;
@@ -34,6 +35,7 @@ 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'));
@@ -98,7 +100,7 @@ class Install extends Command
 
         Package::create([
             'name' => 'Professional',
-            'maximum_sites' => 5,
+            'maximum_sites' => 30,
             'site_permissions' => [
                 'create' => true,
                 'update' => true,
@@ -203,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(

app/Http/Controllers/Admin/SettingController.php

@@ -56,6 +56,10 @@ class SettingController extends Controller
                 $value = encrypt($value);
             }
 
+            if ($key === 'default_package' && $value === 'false') {
+                $value = null;
+            }
+
             setting([$key => $value]);
         }
 

app/Http/Controllers/Auth/RegisterController.php

@@ -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();
         }
     }

app/Http/Controllers/DocumentationController.php

@@ -2,17 +2,43 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\DocumentationCategory;
+use App\Http\Resources\DocumentationCategoryRouteResource;
 use App\Models\DocumentationItem;
-use App\Http\Resources\DocumentationItemResource;
+use Illuminate\Support\Str;
 
 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)
         ]);
     }
 }

app/Http/Controllers/Profile/ProfileBillingController.php

@@ -59,6 +59,7 @@ class ProfileBillingController extends Controller
                     Package::CURRENCY_NOK => 'KR ',
                     Package::CURRENCY_CAD => 'CAD $',
                     Package::CURRENCY_AUD => 'AUD $',
+                    Package::CURRENCY_GBP => 'GBP £',
                 ];
 
                 $package->price_monthly = ($currencies[$package->currency] ?? '[Unknown currency]') . number_format($package->price_monthly, 2, ',', '.');
@@ -66,14 +67,17 @@ class ProfileBillingController extends Controller
                 return $package;
             });
 
+        try {
+            $clientSecret = $user->createSetupIntent()->client_secret;
+        } catch (\Exception $exception) {
+            return inertia('Profile/BillingError');
+        }
+
         return inertia('Profile/Billing', [
             'packages' => $packages,
             'subscription' => $user->subscription('default'),
             'public_key' => config('cashier.key'),
-            'data_client_secret' => function () use ($user) {
-                $intent = $user->createSetupIntent();
-                return $intent->client_secret;
-            },
+            'data_client_secret' => $clientSecret,
             'card' => [
                 'last_four' => $user->card_last_four,
                 'brand' => $user->card_brand

app/Http/Requests/Admin/PackageRequest.php

@@ -39,6 +39,7 @@ class PackageRequest extends FormRequest
                     Package::CURRENCY_NOK,
                     Package::CURRENCY_AUD,
                     Package::CURRENCY_CAD,
+                    Package::CURRENCY_GBP,
                 ])
             ],
             'maximum_sites' => [

app/Http/Resources/DocumentationCategoryRouteResource.php

@@ -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
+        ];
+    }
+}

app/Jobs/Core/Ping.php

@@ -19,6 +19,8 @@ class Ping implements ShouldQueue
     {
         $version = new VersionChecker;
 
+        $version->flushVersionData();
+
         $response = Http::withHeaders([
             'Accept' => 'application/json',
             'Content-Type' => 'application/json',

app/Models/Package.php

@@ -12,6 +12,7 @@ class Package extends Model
     const CURRENCY_NOK = 'nok';
     const CURRENCY_AUD = 'aud';
     const CURRENCY_CAD = 'cad';
+    const CURRENCY_GBP = 'gbp';
 
     public $fillable = [
         'name',

app/Providers/HorizonServiceProvider.php

@@ -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');
         });
     }
 }

app/Services/VersionChecker.php

@@ -34,4 +34,14 @@ 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) {
+
+        }
+    }
 }

composer.json

@@ -23,6 +23,7 @@
         "laravel/ui": "^2.1",
         "league/glide": "^1.6",
         "pragmarx/google2fa-laravel": "^1.3",
+        "predis/predis": "^1.1",
         "tightenco/ziggy": "^0.9.4"
     },
     "require-dev": {

package.json

@@ -1,13 +1,11 @@
 {
     "private": true,
     "scripts": {
-        "dev": "npm run development",
-        "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "watch": "npm run development -- --watch",
-        "watch-poll": "npm run watch -- --watch-poll",
-        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "prod": "npm run production",
-        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+        "development": "mix",
+        "watch": "mix watch",
+        "watch-poll": "mix watch -- --watch-options-poll=1000",
+        "hot": "mix watch --hot",
+        "production": "rm -rf ./public/js/*.js && mix --production"
     },
     "devDependencies": {
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
@@ -18,18 +16,25 @@
         "axios": "^0.19",
         "balloon-css": "^1.2.0",
         "cross-env": "^7.0",
-        "laravel-mix": "^5.0.1",
+        "laravel-mix": "^6.0.18",
         "lodash": "^4.17.15",
         "portal-vue": "^2.1.7",
         "resolve-url-loader": "^3.1.0",
         "sass": "^1.15.2",
         "sass-loader": "^8.0.0",
-        "tailwindcss": "^1.9.6",
+        "tailwindcss": "^2.1.2",
         "v-click-outside": "^3.0.1",
         "vue": "^2.6.11",
         "vue-clipboard2": "^0.3.1",
+        "vue-loader": "^15.9.6",
         "vue-meta": "^2.4.0",
         "vue-template-compiler": "^2.6.11",
         "vuex": "^3.5.1"
+    },
+    "dependencies": {
+        "@tailwindcss/forms": "^0.3.2",
+        "@tailwindcss/typography": "^0.4.0",
+        "autoprefixer": "^10.2.5",
+        "postcss": "^8.2.13"
     }
 }

public/js/1355.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[1355],{1355:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>r});const i={data:function(){return{items:[{title:this.__("Categories"),to:this.route("admin.documentation.index"),active:this.route().current("admin.documentation.index")},{title:this.__("Create category"),to:this.route("admin.documentation.create"),active:this.route().current("admin.documentation.create")},{title:this.__("Articles"),to:this.route("admin.documentation.articles.index"),active:this.route().current("admin.documentation.articles.index")},{title:this.__("Create article"),to:this.route("admin.documentation.articles.create"),active:this.route().current("admin.documentation.articles.create")}]}}};const r=(0,n(1900).Z)(i,(function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("ul",{staticClass:"-ml-4 space-y-1"},t._l(t.items,(function(e){return n("li",[n("inertia-link",{staticClass:"flex items-center h-10 px-4 font-medium text-medium-emphasis",class:{"rounded shadow text-primary bg-surface-3":e.active},attrs:{href:e.to}},[t._v(t._s(e.title)+" "+t._s(e.route)+"\n        ")])],1)})),0)}),[],!1,null,null,null).exports},1900:(t,e,n)=>{"use strict";function i(t,e,n,i,r,s,o,a){var c,u="function"==typeof t?t.options:t;if(e&&(u.render=e,u.staticRenderFns=n,u._compiled=!0),i&&(u.functional=!0),s&&(u._scopeId="data-v-"+s),o?(c=function(t){(t=t||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(t=__VUE_SSR_CONTEXT__),r&&r.call(this,t),t&&t._registeredComponents&&t._registeredComponents.add(o)},u._ssrRegister=c):r&&(c=a?function(){r.call(this,(u.functional?this.parent:this).$root.$options.shadowRoot)}:r),c)if(u.functional){u._injectStyles=c;var d=u.render;u.render=function(t,e){return c.call(e),d(t,e)}}else{var l=u.beforeCreate;u.beforeCreate=l?[].concat(l,c):[c]}return{exports:t,options:u}}n.d(e,{Z:()=>i})}}]);

public/js/1966.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[1966],{3852:(e,t,s)=>{"use strict";s.r(t),s.d(t,{default:()=>r});const i={data:function(){return{items:[{title:this.__("Overview"),to:this.route("admin.services.index"),active:this.route().current("admin.services.index")},{title:this.__("Synchronize servers"),to:this.route("admin.services.servers.index"),active:this.route().current("admin.services.servers.index")},{title:this.__("Synchronize providers"),to:this.route("admin.services.providers.index"),active:this.route().current("admin.services.providers.index")}]}}};const r=(0,s(1900).Z)(i,(function(){var e=this,t=e.$createElement,s=e._self._c||t;return s("ul",{staticClass:"-ml-4 space-y-1"},e._l(e.items,(function(t){return s("li",[s("inertia-link",{staticClass:"flex items-center h-10 px-4 font-medium text-medium-emphasis",class:{"rounded shadow text-primary bg-surface-3":t.active},attrs:{href:t.to}},[e._v(e._s(t.title)+" "+e._s(t.route))])],1)})),0)}),[],!1,null,null,null).exports},1900:(e,t,s)=>{"use strict";function i(e,t,s,i,r,n,o,a){var c,d="function"==typeof e?e.options:e;if(t&&(d.render=t,d.staticRenderFns=s,d._compiled=!0),i&&(d.functional=!0),n&&(d._scopeId="data-v-"+n),o?(c=function(e){(e=e||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(e=__VUE_SSR_CONTEXT__),r&&r.call(this,e),e&&e._registeredComponents&&e._registeredComponents.add(o)},d._ssrRegister=c):r&&(c=a?function(){r.call(this,(d.functional?this.parent:this).$root.$options.shadowRoot)}:r),c)if(d.functional){d._injectStyles=c;var u=d.render;d.render=function(e,t){return c.call(t),u(e,t)}}else{var l=d.beforeCreate;d.beforeCreate=l?[].concat(l,c):[c]}return{exports:e,options:d}}s.d(t,{Z:()=>i})}}]);

public/js/2446.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[2446],{2446:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>i});const s={data:function(){return{items:[{title:this.__("Overview"),to:this.route("admin.packages.index"),active:this.route().current("admin.packages.index")},{title:this.__("Create"),to:this.route("admin.packages.create"),active:this.route().current("admin.packages.create")}]}}};const i=(0,n(1900).Z)(s,(function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("ul",{staticClass:"-ml-4 space-y-1"},t._l(t.items,(function(e){return n("li",[n("inertia-link",{staticClass:"flex items-center h-10 px-4 font-medium text-medium-emphasis",class:{"rounded shadow text-primary bg-surface-3":e.active},attrs:{href:e.to}},[t._v(t._s(e.title)+" "+t._s(e.route))])],1)})),0)}),[],!1,null,null,null).exports},1900:(t,e,n)=>{"use strict";function s(t,e,n,s,i,r,a,o){var c,u="function"==typeof t?t.options:t;if(e&&(u.render=e,u.staticRenderFns=n,u._compiled=!0),s&&(u.functional=!0),r&&(u._scopeId="data-v-"+r),a?(c=function(t){(t=t||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(t=__VUE_SSR_CONTEXT__),i&&i.call(this,t),t&&t._registeredComponents&&t._registeredComponents.add(a)},u._ssrRegister=c):i&&(c=o?function(){i.call(this,(u.functional?this.parent:this).$root.$options.shadowRoot)}:i),c)if(u.functional){u._injectStyles=c;var l=u.render;u.render=function(t,e){return c.call(e),l(t,e)}}else{var d=u.beforeCreate;u.beforeCreate=d?[].concat(d,c):[c]}return{exports:t,options:u}}n.d(e,{Z:()=>s})}}]);

public/js/3379.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[3379],{3379:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>i});const s={data:function(){return{items:[{title:this.__("Overview"),to:this.route("admin.status.index"),active:this.route().current("admin.status.index")}]}}};const i=(0,n(1900).Z)(s,(function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("ul",{staticClass:"-ml-4 space-y-1"},t._l(t.items,(function(e){return n("li",[n("inertia-link",{staticClass:"flex items-center h-10 px-4 font-medium text-medium-emphasis",class:{"rounded shadow text-primary bg-surface-3":e.active},attrs:{href:e.to}},[t._v(t._s(e.title)+" "+t._s(e.route))])],1)})),0)}),[],!1,null,null,null).exports},1900:(t,e,n)=>{"use strict";function s(t,e,n,s,i,r,o,a){var c,u="function"==typeof t?t.options:t;if(e&&(u.render=e,u.staticRenderFns=n,u._compiled=!0),s&&(u.functional=!0),r&&(u._scopeId="data-v-"+r),o?(c=function(t){(t=t||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(t=__VUE_SSR_CONTEXT__),i&&i.call(this,t),t&&t._registeredComponents&&t._registeredComponents.add(o)},u._ssrRegister=c):i&&(c=a?function(){i.call(this,(u.functional?this.parent:this).$root.$options.shadowRoot)}:i),c)if(u.functional){u._injectStyles=c;var l=u.render;u.render=function(t,e){return c.call(e),l(t,e)}}else{var d=u.beforeCreate;u.beforeCreate=d?[].concat(d,c):[c]}return{exports:t,options:u}}n.d(e,{Z:()=>s})}}]);

public/js/3788.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[3788],{3788:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>i});const s={data:function(){return{items:[{title:this.__("Overview"),to:this.route("admin.support.index"),active:this.route().current("admin.support.index")}]}}};const i=(0,n(1900).Z)(s,(function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("ul",{staticClass:"-ml-4 space-y-1"},t._l(t.items,(function(e){return n("li",[n("inertia-link",{staticClass:"flex items-center h-10 px-4 font-medium text-medium-emphasis",class:{"rounded shadow text-primary bg-surface-3":e.active},attrs:{href:e.to}},[t._v(t._s(e.title)+" "+t._s(e.route))])],1)})),0)}),[],!1,null,null,null).exports},1900:(t,e,n)=>{"use strict";function s(t,e,n,s,i,r,o,a){var c,u="function"==typeof t?t.options:t;if(e&&(u.render=e,u.staticRenderFns=n,u._compiled=!0),s&&(u.functional=!0),r&&(u._scopeId="data-v-"+r),o?(c=function(t){(t=t||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(t=__VUE_SSR_CONTEXT__),i&&i.call(this,t),t&&t._registeredComponents&&t._registeredComponents.add(o)},u._ssrRegister=c):i&&(c=a?function(){i.call(this,(u.functional?this.parent:this).$root.$options.shadowRoot)}:i),c)if(u.functional){u._injectStyles=c;var l=u.render;u.render=function(t,e){return c.call(e),l(t,e)}}else{var d=u.beforeCreate;u.beforeCreate=d?[].concat(d,c):[c]}return{exports:t,options:u}}n.d(e,{Z:()=>s})}}]);

public/js/4622.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[4622],{4622:(t,e,s)=>{"use strict";s.r(e),s.d(e,{default:()=>r});const n={data:function(){return{items:[{title:this.__("Overview"),to:this.route("admin.users.index"),active:this.route().current("admin.users.index")},{title:this.__("Create"),to:this.route("admin.users.create"),active:this.route().current("admin.users.create")}]}}};const r=(0,s(1900).Z)(n,(function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("ul",{staticClass:"-ml-4 space-y-1"},t._l(t.items,(function(e){return s("li",[s("inertia-link",{staticClass:"flex items-center h-10 px-4 font-medium text-medium-emphasis",class:{"rounded shadow text-primary bg-surface-3":e.active},attrs:{href:e.to}},[t._v(t._s(e.title)+" "+t._s(e.route))])],1)})),0)}),[],!1,null,null,null).exports},1900:(t,e,s)=>{"use strict";function n(t,e,s,n,r,i,o,a){var u,c="function"==typeof t?t.options:t;if(e&&(c.render=e,c.staticRenderFns=s,c._compiled=!0),n&&(c.functional=!0),i&&(c._scopeId="data-v-"+i),o?(u=function(t){(t=t||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(t=__VUE_SSR_CONTEXT__),r&&r.call(this,t),t&&t._registeredComponents&&t._registeredComponents.add(o)},c._ssrRegister=u):r&&(u=a?function(){r.call(this,(c.functional?this.parent:this).$root.$options.shadowRoot)}:r),u)if(c.functional){c._injectStyles=u;var l=c.render;c.render=function(t,e){return u.call(e),l(t,e)}}else{var d=c.beforeCreate;c.beforeCreate=d?[].concat(d,u):[u]}return{exports:t,options:c}}s.d(e,{Z:()=>n})}}]);