WIP

Stillat · Jul 8, 2023 · 6b8f795 · 6b8f795
1 parent ac80656
commit 6b8f795
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 28 deletions.
diff --git a/composer.json b/composer.json
@@ -8,8 +8,8 @@
     ],
     "license": "proprietary",
     "require": {
-        "php": "^7.3|^8.0",
-        "statamic/cms": "^3.3"
+        "php": "^8.0",
+        "statamic/cms": "^4"
     },
     "authors": [
         {

diff --git a/resources/dist/js/bootstrap.js b/resources/dist/js/bootstrap.js
diff --git a/resources/dist/js/meerkat.min.js b/resources/dist/js/meerkat.min.js
diff --git a/resources/dist/js/meerkat.min.js.map b/resources/dist/js/meerkat.min.js.map
diff --git a/resources/ui/src/App/CommentThread/template.html b/resources/ui/src/App/CommentThread/template.html
@@ -1,17 +1,17 @@
 <div>
-    <div class="flex justify-between">
+    <div class="flex justify-between items-center mb-6">
         <h1 class="flex-1">{{ trans('display.header_comments') }}</h1>
 
         <loader v-if="state.loadingData" :display-inline="true" class="mr-1"></loader>
 
         <dropdown-list class="mr-2">
-            <button class="flex items-center" slot="trigger">{{ trans('actions.export') }} <svg-icon name="chevron-down-xs" class="w-2 ml-1"></svg-icon></button>
+            <button class="button flex items-center pr-4" slot="trigger">{{ trans('actions.export') }} <svg-icon name="micro/chevron-down-xs" class="w-2 ml-2" /></button>
             <dropdown-item :text="trans('actions.export_csv')" :redirect="exportLinks.csv"></dropdown-item>
             <dropdown-item :text="trans('actions.export_json')" :redirect="exportLinks.json"></dropdown-item>
         </dropdown-list>
         <dropdown-list>
-            <button class="flex items-center" slot="trigger">
-                {{ trans('actions.spam') }} <svg-icon name="chevron-down-xs" class="w-2 ml-1"></svg-icon>
+            <button class="button btn-primary flex items-center pr-4" slot="trigger">
+                {{ trans('actions.spam') }} <svg-icon name="micro/chevron-down-xs" class="w-2 ml-2" />
             </button>
             <dropdown-item :text="trans('actions.check_for_spam')" :disabled="state.isCheckingAllForSpam" v-if="canCheckForSpam" v-on:click="checkForSpam"></dropdown-item>
             <dropdown-item :text="trans('actions.remove_all_spam')" v-if="permissions.canRemoveComments" v-on:click="removeAllSpam"></dropdown-item>

diff --git a/resources/ui/src/App/Configurator/Panels/Email/template.html b/resources/ui/src/App/Configurator/Panels/Email/template.html
@@ -1,5 +1,5 @@
 <div class="w-full publish-fields" v-if="settings != null">
-  <div class="form-group publish-field section-fieldtype field-w-full">
+  <div class="form-group publish-field section-fieldtype w-full">
     <div class="field-inner">
       <label class="publish-field-label"><span>{{ trans('config.email_general_title') }}</span></label>
       <div class="help-block -mt-1">
@@ -30,7 +30,7 @@
                       :read-only="settings.items['email.check_with_spam_guard'].behavior === 0"></toggle-fieldtype>
   </div>
 
-  <div class="form-group publish-field list-fieldtype field-w-full" v-if="typeof settings.items['email.addresses'] !== 'undefined'">
+  <div class="form-group publish-field list-fieldtype w-full" v-if="typeof settings.items['email.addresses'] !== 'undefined'">
     <div class="field-inner">
       <label><span>{{ trans('config.email_addresses') }}</span></label>
       <div class="help-block -mt-1">

diff --git a/resources/ui/src/App/Configurator/Panels/Guard/template.html b/resources/ui/src/App/Configurator/Panels/Guard/template.html
@@ -1,7 +1,7 @@
 <div class="w-full">
   <div class="publish-fields w-full" v-if="settings != null">
 
-    <div class="form-group publish-field section-fieldtype field-w-full">
+    <div class="form-group publish-field section-fieldtype w-full">
       <div class="field-inner">
         <label class="publish-field-label"><span>{{ trans('config.spam_general_title') }}</span></label>
         <div class="help-block -mt-1">
@@ -65,7 +65,7 @@
                         :read-only="settings.items['publishing.auto_submit_results'].behavior === 0"></toggle-fieldtype>
     </div>
 
-    <div class="form-group publish-field section-fieldtype field-w-full">
+    <div class="form-group publish-field section-fieldtype w-full">
       <div class="field-inner">
         <label class="publish-field-label"><span>{{ trans('config.spam_guards_title') }}</span></label>
         <div class="help-block -mt-1">
@@ -95,7 +95,7 @@
       </table>
     </div>
 
-    <div class="form-group publish-field section-fieldtype field-w-full" v-if="$parent.akismetFilterEnabled === true">
+    <div class="form-group publish-field section-fieldtype w-full" v-if="$parent.akismetFilterEnabled === true">
       <div class="field-inner">
         <label class="publish-field-label"><span>{{ trans('config.akismet_title') }}</span></label>
         <div class="help-block -mt-1">
@@ -124,7 +124,7 @@
       <text-fieldtype name="akismet_front_page" v-model="settings.items['akismet.front_page'].value" :read-only="settings.items['akismet.front_page'].behavior === 0" handle="akismet_front_page" :config="{'handle':'akismet_front_page'}"></text-fieldtype>
     </div>
 
-    <div class="field-w-full p-4"  v-if="hasAkismetSettings && $parent.akismetFilterEnabled === true">
+    <div class="w-full p-4"  v-if="hasAkismetSettings && $parent.akismetFilterEnabled === true">
       <p><button class="btn btn-primary" v-on:click="validateConfiguration" v-if="state.isValidating === false">{{ trans('config.validate_akismet_prompt') }}</button> <span style="position: relative; display: inline-block"><loader v-if="state.isValidating" :display-inline="true" class="mr-1"></loader> {{ state.currentMessage }}</span></p>
     </div>
   </div>

diff --git a/resources/ui/src/App/Configurator/Panels/IpFilter/template.html b/resources/ui/src/App/Configurator/Panels/IpFilter/template.html
@@ -1,5 +1,5 @@
 <div class="w-full publish-fields">
-  <div class="form-group publish-field section-fieldtype field-w-full">
+  <div class="form-group publish-field section-fieldtype w-full">
     <div class="field-inner">
       <label class="publish-field-label"><span>{{ trans('config.ip_filter_title') }}</span></label>
       <div class="help-block -mt-1">
@@ -8,7 +8,7 @@
     </div>
   </div>
 
-  <div class="form-group publish-field list-fieldtype field-w-full" v-if="typeof settings.items['iplist.block'] !== 'undefined'">
+  <div class="form-group publish-field list-fieldtype w-full" v-if="typeof settings.items['iplist.block'] !== 'undefined'">
     <div class="field-inner">
       <label><span>{{ trans('config.ip_filter_blocked') }}</span></label>
       <div class="help-block -mt-1">

diff --git a/resources/ui/src/App/Configurator/Panels/Permissions/template.html b/resources/ui/src/App/Configurator/Panels/Permissions/template.html
@@ -1,6 +1,6 @@
 <div class="w-full">
 
-  <div class="form-group publish-field section-fieldtype field-w-full">
+  <div class="form-group publish-field section-fieldtype w-full">
     <div class="field-inner">
       <label class="publish-field-label"><span>{{ trans('config.permissions_title') }}</span></label>
       <div class="help-block -met-1">

diff --git a/resources/ui/src/App/Configurator/Panels/Privacy/template.html b/resources/ui/src/App/Configurator/Panels/Privacy/template.html
@@ -1,5 +1,5 @@
 <div class="w-full">
-  <div class="form-group publish-field section-fieldtype field-w-full">
+  <div class="form-group publish-field section-fieldtype w-full">
     <div class="field-inner">
       <label class="publish-field-label"><span>{{ trans('config.privacy_title') }}</span></label>
       <div class="help-block">

diff --git a/resources/ui/src/App/Configurator/Panels/Publishing/template.html b/resources/ui/src/App/Configurator/Panels/Publishing/template.html
@@ -1,5 +1,5 @@
 <div class="w-full">
-  <div class="form-group publish-field section-fieldtype field-w-full">
+  <div class="form-group publish-field section-fieldtype w-full">
     <div class="field-inner">
       <label class="publish-field-label"><span>{{ trans('config.preferences_title') }}</span></label>
       <div class="help-block">
@@ -53,7 +53,7 @@
     </div>
   </div>
 
-  <div class="form-group publish-field section-fieldtype field-w-full" v-if="$parent.canChangeConfig">
+  <div class="form-group publish-field section-fieldtype w-full" v-if="$parent.canChangeConfig">
     <div class="field-inner">
       <label class="publish-field-label"><span>{{ trans('config.publishing_title') }}</span></label>
       <div class="help-block">

diff --git a/resources/ui/src/App/Configurator/Panels/WordFilter/template.html b/resources/ui/src/App/Configurator/Panels/WordFilter/template.html
@@ -1,6 +1,6 @@
 <div class="w-full publish-fields">
 
-  <div class="form-group publish-field section-fieldtype field-w-full">
+  <div class="form-group publish-field section-fieldtype w-full">
     <div class="field-inner">
       <label class="publish-field-label"><span>{{ trans('config.word_filter_title') }}</span></label>
       <div class="help-block -mt-1">
@@ -9,7 +9,7 @@
     </div>
   </div>
 
-  <div class="form-group publish-field list-fieldtype field-w-full">
+  <div class="form-group publish-field list-fieldtype w-full">
     <div class="field-inner">
       <label><span>{{ trans('config.word_filter_banned') }}</span></label>
       <div class="help-block -mt-1">

diff --git a/resources/ui/src/App/Configurator/template.html b/resources/ui/src/App/Configurator/template.html
@@ -1,4 +1,4 @@
-<div>
+<div class="page-wrapper max-w-xl">
   <div class="flex items-center justify-between mb-3">
     <h1 class="flex-1">{{ trans('display.header_configure') }}</h1>
 
@@ -15,7 +15,7 @@ <h3 class="mb-2">{{ trans('config.server_changes_warning_title') }}</h3>
 
   <div class="flex relative">
     <div class="w-full">
-      <div class="publish-tabs tabs">
+      <div class="tabs-container relative">
         <a class="tab-button" :class="{'active': activePage == 'publishing'}" v-on:click="activePage = 'publishing'">{{ trans('config.tab_general') }}</a>
         <a class="tab-button" :class="{'active': activePage == 'guard'}" v-on:click="activePage = 'guard'" v-if="canChangeConfig === true">{{ trans('config.tab_spam') }}</a>
         <a class="tab-button" :class="{'active': activePage == 'ip-filter'}" v-on:click="activePage = 'ip-filter'" v-if="ipFilterEnabled === true && canChangeConfig === true" >{{ trans('config.tab_ip_address_filter') }}</a>
@@ -25,7 +25,7 @@ <h3 class="mb-2">{{ trans('config.server_changes_warning_title') }}</h3>
         <a class="tab-button" :class="{'active': activePage == 'privacy'}" v-on:click="activePage = 'privacy'" v-if="canChangeConfig === true">{{ trans('config.tab_privacy') }}</a>
       </div>
 
-      <div class="flex justify-between">
+      <div class="card p-0 flex justify-between">
         <div class="publish-section rounded-tl-none">
           <component :is="activePage" :settings="settings"></component>
         </div>

diff --git a/src/Addon.php b/src/Addon.php
@@ -21,7 +21,7 @@ class Addon
 
     public const ADDON_ID = 'stillat/meerkat';
 
-    public const VERSION = '2.4.14';
+    public const VERSION = '3.0.0-dev';
 
     /**
      * Gets the addon API prefix.

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -397,8 +397,7 @@ protected function afterBoot()
             ->view('meerkat::validation')
             ->routes(function ($router) {
                 $router->post('cache', [UtilitiesController::class, 'clearSiteRoutesCache'])->name('meerkat.routes.clear.cache');
-            })
-            ->register();
+            });
     }
 
     protected function beforeBoot()