WIP

Author: ilestis

app/Http/Controllers/PresetController.php

@@ -47,6 +47,9 @@ public function create(Campaign $campaign, PresetType $presetType)
     public function store(StorePreset $request, Campaign $campaign, PresetType $presetType)
     {
         $this->authorize('mapPresets', $campaign);
+        if ($request->ajax()) {
+            return response()->json(['success' => true]);
+        }
 
         $data = $request->only('name', 'config', 'visibility_id');
         $data['type_id'] = $presetType->id;
@@ -81,6 +84,9 @@ public function edit(Campaign $campaign, PresetType $presetType, Preset $preset)
     public function update(StorePreset $request, Campaign $campaign, PresetType $presetType, Preset $preset)
     {
         $this->authorize('mapPresets', $campaign);
+        if ($request->ajax()) {
+            return response()->json(['success' => true]);
+        }
 
         $data = $request->only('name', 'config', 'visibility_id');
         $preset->update($data);
@@ -99,6 +105,9 @@ public function update(StorePreset $request, Campaign $campaign, PresetType $pre
     public function destroy(Request $request, Campaign $campaign, PresetType $presetType, Preset $preset)
     {
         $this->authorize('mapPresets', $campaign);
+        if ($request->ajax()) {
+            return response()->json(['success' => true]);
+        }
         $preset->delete();
 
         [$route, $params] = $this->parseFrom($request);

resources/js/components/attributes/Manager.vue

@@ -105,7 +105,7 @@
                 </optgroup>
             </select>
         </article>
-        <footer class="bg-base-200 flex flex-wrap gap-3 justify-end items-center p-3 md:rounded-b">
+        <footer class="flex flex-wrap gap-3 justify-end items-center p-4 md:px-6">
             <menu class="flex flex-wrap gap-3 ps-0">
                 <div class="submit-group">
                     <a role="button" class="btn2 btn-primary" @click="loadTemplate()" v-html="trans('templates.load')">

resources/js/components/families/FamilyTree.vue

@@ -146,7 +146,7 @@
         </div>
       </div>
     </article>
-    <footer class="bg-base-200 flex flex-wrap gap-3 justify-end items-center p-3 md:rounded-b">
+    <footer class="flex flex-wrap gap-3 justify-end items-center p-4 md:px-6">
         <menu class="flex flex-wrap gap-3 ps-0">
           <div class="submit-group">
             <button class="btn2 btn-primary" @click="saveModal()">

resources/js/components/subscription/BillingManagement.vue

@@ -29,7 +29,7 @@
             <p class="help-block text-neutral-content grow">
                 {{ translate('add_one') }}
             </p>
-            <a href="#" v-on:click.close="toggleShowNewPaymentMethod" class="btn2 btn-sm">
+            <a href="#" v-on:click.close="toggleShowNewPaymentMethod" class="btn2 btn-outline">
                 <i class="fa-regular fa-credit-card" aria-hidden="true"></i> {{ translate('actions.add_new') }}
             </a>
         </div>

resources/js/entities/Entity.vue

@@ -1,7 +1,7 @@
 <template>
     <div v-if="stacked()" class="stack inline-grid items-center align-items-end w-[47%] xs:w-[25%] sm:w-48" v-bind:data-stack="entity.children">
         <div
-            class="entity overflow-hidden rounded shadow-sm hover:shadow-md aspect-square w-full flex flex-col bg-box"
+            class="entity overflow-hidden rounded shadow-xs hover:shadow aspect-square w-full flex flex-col bg-box"
             v-bind="dataAttributes()">
             <a
                 :href="entity.urls.children"
@@ -30,7 +30,7 @@
         </div>
         <div
             v-for="s in entity.children"
-            class="entity entity-stack bg-base-300 w-full overflow-hidden rounded aspect-square flex flex-col shadow-sm" title="{{ __('datagrids.tooltips.nested') }}" v-bind:data-stack="s">
+            class="entity entity-stack bg-base-300 w-full overflow-hidden rounded aspect-square flex flex-col shadow-xs" title="{{ __('datagrids.tooltips.nested') }}" v-bind:data-stack="s">
             <div class="block grow"></div>
             <div class="block h-12 p-4 bg-box"></div>
         </div>
@@ -76,7 +76,7 @@ const props = defineProps<{
 }>()
 
 const entityClass = () => {
-    let css = 'entity overflow-hidden rounded shadow-sm hover:shadow-md w-[47%] xs:w-[25%] sm:w-48 aspect-square flex flex-col bg-box';
+    let css = 'entity overflow-hidden rounded shadow-xs hover:shadow w-[47%] xs:w-[25%] sm:w-48 aspect-square flex flex-col bg-box';
 
     if (props.isParent) {
         css += 'shadow-lg stacking-parent font-bold'

resources/js/entities/Explorer.vue

@@ -9,7 +9,7 @@
             </div>
         </div>
         <div class="flex gap-2 items-start">
-        <div class="rounded shadow-sm w-[47%] xs:w-[25%] sm:w-48 aspect-square flex items-center justify-center text-xl text-neutral-content">
+        <div class="rounded shadow-xs w-[47%] xs:w-[25%] sm:w-48 aspect-square flex items-center justify-center text-xl text-neutral-content">
             <i class="fa-solid fa-spinner fa-spin" aria-label="Loading"></i>
         </div>
         </div>
@@ -195,7 +195,7 @@
         </div>
         <div class="flex gap-1 items-start">
             <div class="entities-grid flex flex-wrap gap-3 lg:gap-5">
-                <a v-if="parent" :href="parent.urls.parent" class="entity w-[47%] xs:w-[25%] sm:w-48 overflow-hidden rounded flex flex-col shadow-sm hover:shadow-md sm">
+                <a v-if="parent" :href="parent.urls.parent" class="entity w-[47%] xs:w-[25%] sm:w-48 overflow-hidden rounded flex flex-col shadow-xs hover:shadow sm">
                     <div class="w-46 flex items-center justify-center grow  text-6xl">
                         <i class="fa-solid fa-arrow-left" aria-hidden="true"></i>
                     </div>

resources/js/gallery/Gallery.vue

@@ -101,7 +101,7 @@
                         </div>
                         <div v-else-if="hasPreview()" class="cover-background w-full h-full flex p-2" :style="{backgroundImage: 'url(\'' + imagePreview + '\')'}">
                             <div class="progress h-1 w-full self-end">
-                                <div class="h-1 bg-accent shadow-sm" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" :style="{'width': progressPercentage()}">
+                                <div class="h-1 bg-accent shadow-xs" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" :style="{'width': progressPercentage()}">
                                     <span class="sr-only"></span>
                                 </div>
                             </div>
@@ -147,7 +147,7 @@
                 <span class="sr-only">Close</span>
             </button>
         </header>
-        <article class="max-w-4xl flex flex-col gap-2 text-left">
+        <article class="max-w-4xl flex flex-col gap-2 text-left p-4 md:px-6">
             <div class="flex flex-col gap-1 w-full">
                 <label v-html="trans('name')"></label>
                 <input type="text" class="w-full" v-model="folderName" ref="folderNameField" @keyup.enter="createFolder">
@@ -159,7 +159,7 @@
                 </select>
             </div>
         </article>
-        <footer class="bg-base-200 p-2">
+        <footer class="bp-4 md:px-6">
             <menu class="">
                 <button type="submit" class="btn2 btn-primary" @click="createFolder" v-html="trans('create')">
                 </button>
@@ -175,7 +175,7 @@
                 <span class="sr-only">Close</span>
             </button>
         </header>
-        <article class="max-w-4xl flex flex-col gap-2 text-left">
+        <article class="max-w-4xl flex flex-col gap-2 text-left p-4 md:px-6">
             <div class="flex flex-col gap-1 w-full">
                 <label v-html="trans('visibility')"></label>
                 <select class="w-full" v-model="bulkVisibility">

resources/js/gallery/Selection.vue

@@ -19,7 +19,7 @@
         </div>
         <div v-if="uploading" class="flex gap-2 flex-col w-full">
             <div class="progress h-1 w-full">
-                <div class="h-1 bg-accent shadow-sm" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" :style="{'width': progressPercentage()}">
+                <div class="h-1 bg-accent shadow-xs" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" :style="{'width': progressPercentage()}">
                     <span class="sr-only"></span>
                 </div>
             </div>
@@ -48,13 +48,13 @@
                 <span class="sr-only">Close</span>
             </button>
         </header>
-        <article class="max-w-4xl flex flex-col gap-2 text-left">
+        <article class="max-w-4xl flex flex-col gap-2 text-left p-4 md:px-6">
             <div class="flex flex-col gap-1 w-full">
                 <p v-html="storageFull"></p>
                 <p v-html="trans.cta_helper" v-if="!hasPremium"></p>
             </div>
         </article>
-        <footer class="bg-base-200 p-2" v-if="!hasPremium">
+        <footer class="p-4 md:px-6" v-if="!hasPremium">
             <menu class="">
                 <a v-bind:href="props.cta" class="btn2 btn-primary">
                     <i class="fa-solid fa-gem" aria-hidden="true" />

resources/js/recovery/Element.vue

@@ -46,7 +46,7 @@ const click = () => {
 }
 
 const modelClass = () => {
-    let css = 'rounded shadow bg-base-100 flex flex-col gap-2 md:gap-4 p-4 hover:shadow-lg'
+    let css = 'rounded-xl shadow-xs bg-base-100 flex flex-col gap-2 md:gap-4 p-4 hover:shadow'
 
     if (!props.model.url) {
         css = css + ' cursor-pointer'

resources/js/recovery/Recovery.vue

@@ -65,12 +65,12 @@
                 <span class="sr-only">Close</span>
             </button>
         </header>
-        <article class="max-w-4xl flex flex-col gap-2 text-left">
+        <article class="max-w-4xl flex flex-col gap-2 text-left p-4 md:px-6">
             <div class="flex flex-col gap-1 w-full">
                 <label v-html="trans('premium')"></label>
             </div>
         </article>
-        <footer class="bg-base-200 p-2">
+        <footer class="p-4 md:px-6">
             <menu class="">
                 <a :href="upgradeLink" v-html="trans('upgrade')" class="btn2 btn-default"></a>
             </menu>

resources/sass/buttons.scss

@@ -182,11 +182,11 @@
     }
     .btn2.btn-outline:hover {
         --tw-border-opacity: 1;
-        border-color:hsl(var(--bc)/var(--tw-border-opacity));
+        border-color:hsl(var(--b2)/var(--tw-border-opacity));
         --tw-bg-opacity: 1;
-        background-color:hsl(var(--bc)/var(--tw-bg-opacity));
+        background-color:hsl(var(--b2)/var(--tw-bg-opacity));
         --tw-text-opacity: 1;
-        color:hsl(var(--b1)/var(--tw-text-opacity))
+        color:hsl(var(--bc)/var(--tw-text-opacity))
     }
     .btn2.btn-outline.btn-primary:hover {
         --tw-border-opacity: 1;
@@ -464,21 +464,21 @@
     outline-color:currentColor
 }
 .btn2.btn-outline {
-    border-color:currentColor;
     background-color:transparent;
     --tw-text-opacity: 1;
     color:hsl(var(--bc)/var(--tw-text-opacity));
     --tw-shadow: 0 0 #0000;
     --tw-shadow-colored: 0 0 #0000;
-    box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)
+    box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow);
+    --border-btn: 1px;
 }
 .btn2.btn-outline.btn-active {
     --tw-border-opacity: 1;
-    border-color:hsl(var(--bc)/var(--tw-border-opacity));
+    border-color:hsl(var(--b2)/var(--tw-border-opacity));
     --tw-bg-opacity: 1;
-    background-color:hsl(var(--bc)/var(--tw-bg-opacity));
+    background-color:hsl(var(--b2)/var(--tw-bg-opacity));
     --tw-text-opacity: 1;
-    color:hsl(var(--b1)/var(--tw-text-opacity))
+    color:hsl(var(--bc)/var(--tw-text-opacity))
 }
 .btn2.btn-outline.btn-primary {
     --tw-text-opacity: 1;

resources/sass/themes/light.scss

@@ -74,7 +74,7 @@
         --btn-focus-scale: 1;
 
         // Button border width
-        --border-btn: 1px;
+        //--border-btn: 1px;
         // Button text transform
         --btn-text-case: inherit;
 

resources/views/abilities/entities/create.blade.php

@@ -10,10 +10,9 @@
 
 @section('content')
     <x-form :action="$formOptions">
-        @include('partials.forms.form', [
+        @include('partials.forms._dialog', [
             'title' => __('abilities.children.create.modal', ['name' => $model->name]),
             'content' => 'abilities.entities._form',
-            'dialog' => true,
         ])
         <input type="hidden" name="ability_id" value="{{ $model->entity->id }}" />
     </x-form>

resources/views/account/billing/information/form.blade.php

@@ -2,7 +2,6 @@
     @include('partials.forms._dialog', [
         'title' => __('billing/information.title'),
         'content' => 'account.billing.information._form',
-        'dialog' => true,
         'submit' => __('settings.billing.save')
     ])
 </x-form>

resources/views/account/email/form.blade.php

@@ -2,6 +2,5 @@
     @include('partials.forms._dialog', [
         'title' => __('account/email.title'),
         'content' => 'account.email._form',
-        'dialog' => true,
     ])
 </x-form>

resources/views/account/password/form.blade.php

@@ -2,6 +2,5 @@
     @include('partials.forms._dialog', [
         'title' => __('account/password.title'),
         'content' => 'account.password._form',
-        'dialog' => true,
     ])
 </x-form>

resources/views/account/social/form.blade.php

@@ -2,6 +2,5 @@
     @include('partials.forms._dialog', [
         'title' => __('account/social.title'),
         'content' => 'account.social._form',
-        'dialog' => true,
     ])
 </x-form>

resources/views/billing/payment-method.blade.php

@@ -78,15 +78,15 @@
 
         <div class="flex flex-col gap-4">
             <div class="flex gap-2 justify-between">
-                @if (\Illuminate\Support\Arr::exists($user->profile, 'billing'))
+                @if (\Illuminate\Support\Arr::exists($user->profile ?? [], 'billing'))
                     <x-helper>
                         {!! nl2br($user->profile['billing']) !!}
                     </x-helper>
                 @else
                     <x-helper>{{ __('billing/information.helper') }}</x-helper>
                 @endif
                 <div class="">
-                    <button class="btn2" data-toggle="dialog" data-target="primary-dialog" data-url="{{  route('account.billing.info') }}">
+                    <button class="btn2 btn-outline" data-toggle="dialog" data-target="primary-dialog" data-url="{{  route('account.billing.info') }}">
                         {{ __('billing/information.actions.update') }}
                     </button>
                 </div>

resources/views/calendars/reminders/create.blade.php

@@ -13,10 +13,9 @@
 @section('content')
     <x-form :action="['calendars.event.store', $campaign, $calendar->id]" class="entity-calendar-subform">
 
-    @include('partials.forms.form', [
+    @include('partials.forms._dialog', [
         'title' => __('calendars.event.create.title', ['name' => $calendar->name]),
         'content' => 'calendars.reminders._form',
-        'dialog' => true,
         'dropdownParent' => '#primary-dialog',
     ])
 

resources/views/calendars/reminders/create_from_entity.blade.php

@@ -12,10 +12,9 @@
 
     <x-form :action="['entities.reminders.store', $campaign, $entity->id]" class="">
 
-    @include('partials.forms.form', [
+    @include('partials.forms._dialog', [
         'title' => __('calendars.event.create.title', ['name' => $entity->name]),
         'content' => 'calendars.reminders._entity_form',
-        'dialog' => true,
         'dropdownParent' => request()->ajax() ? '#primary-dialog' : null,
     ])
 

resources/views/calendars/reminders/edit.blade.php

@@ -17,11 +17,10 @@
 @section('content')
     <x-form method="PATCH" :action="['entities.reminders.update', $campaign, $entity->id, $reminder->id]" class="entity-calendar-subform">
 
-    @include('partials.forms.form', [
+    @include('partials.forms._dialog', [
         'title' => __('calendars.event.edit.title', ['name' => '<a href="' . $entity->url() . '">' . $entity->name . '</a>']),
         'content' => 'calendars.reminders._form',
         'deleteID' => '#delete-reminder-' . $reminder->id,
-        'dialog' => true,
         'dropdownParent' => request()->ajax() ? '#primary-dialog' : null,
     ])
 

resources/views/calendars/weather/create.blade.php

@@ -12,10 +12,9 @@
 @section('content')
     <x-form :action="['calendars.calendar_weather.store', $campaign, $calendar->id]">
 
-    @include('partials.forms.form', [
+    @include('partials.forms._dialog', [
         'title' => __('calendars/weather.create.title', ['name' => $calendar->name]),
         'content' => 'calendars.weather._form',
-        'dialog' => true,
     ])
 
     <input type="hidden" name="year" value="{{ $year }}" />

resources/views/calendars/weather/edit.blade.php

@@ -13,11 +13,10 @@
 @section('content')
     <x-form method="PATCH" :action="['calendars.calendar_weather.update', $campaign, $weather->calendar->id, $weather->id]">
 
-    @include('partials.forms.form', [
+    @include('partials.forms._dialog', [
         'title' => __('calendars/weather.edit.title'),
         'content' => 'calendars.weather._form',
         'deleteID' => '#delete-weather-' . $weather->id,
-        'dialog' => true,
     ])
 
     <input type="hidden" name="year" value="{{ $weather->year }}" />

resources/views/campaigns/_overview.blade.php

@@ -3,7 +3,7 @@
 ?>
 
 <div class="grid grid-cols-1 md:grid-cols-2 gap-5">
-    <x-box class="flex items-center gap-5">
+    <x-box class="flex items-center gap-5 rounded-xl shadow-xs">
         @if ($campaign->boosted())
             @php
                 $booster = $campaign->boosts()->first();
@@ -34,16 +34,16 @@
         </div>
         @if (!$campaign->boosted() && auth()->check())
             @if (auth()->user()->hasBoosterNomenclature())
-                <a class="rounded-full border h-12 w-12 gap-2 flex items-center justify-center cursor-pointer neutral-link" href="{{ route('settings.boost', ['campaign' => $campaign->id]) }}">
+                <a class="rounded-full border h-12 w-12 gap-2 flex items-center justify-center cursor-pointer neutral-link hover:bg-base-200" href="{{ route('settings.boost', ['campaign' => $campaign->id]) }}">
                     <x-icon class="fa-solid fa-angle-right" />
                 </a>
             @else
-                <a class="rounded-full border h-12 w-12 flex gap-2 items-center justify-center cursor-pointer neutral-link" href="{{ route('settings.premium', ['campaign' => $campaign->id]) }}" data-tooltip data-title="{{ __('campaigns/overview.premium.enable') }}">
+                <a class="rounded-full border h-12 w-12 flex gap-2 items-center justify-center cursor-pointer neutral-link hover:bg-base-200" href="{{ route('settings.premium', ['campaign' => $campaign->id]) }}" data-tooltip data-title="{{ __('campaigns/overview.premium.enable') }}">
                     <x-icon class="fa-solid fa-angle-right" />
                 </a>
             @endif
         @elseif (auth()->check())
-            <a class="rounded-full border h-12 w-12 flex items-center justify-center cursor-pointer neutral-link" href="{{ route('settings.premium') }}" >
+            <a class="rounded-full border h-12 w-12 flex items-center justify-center cursor-pointer neutral-link hover:bg-base-200" href="{{ route('settings.premium') }}" >
                 <x-icon class="fa-solid fa-angle-right" />
             </a>
         @endif

resources/views/campaigns/achievements/_finished.blade.php

@@ -1,7 +1,7 @@
 @php
     use \Illuminate\Support\Arr;
 @endphp
-<div class="achievement shadow-xl rounded-xl bg-base-100 w-full sm:w-80 md:w-96 flex flex-col gap-2 md:gap-3 p-5 md:p-5 level-{{ $stat['level'] }}" data-achievement="{{ $key }}">
+<div class="achievement shadow-xs hover:shadow rounded-xl bg-base-100 w-full sm:w-80 md:w-96 flex flex-col gap-2 md:gap-3 p-5 md:p-5 level-{{ $stat['level'] }}" data-achievement="{{ $key }}">
 
     <div class="flex gap-2 md:gap-5 items-center grow">
         <div class="flex-none text-accent text-8xl border-accent border-opacity-20 rounded-full border-4 flex items-center justify-center w-36 h-36">