flp
/
WowPress-Tailwind
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SKS-Order fix

master
Seph 2024-11-02 20:53:15 +01:00
parent b9d1865186
commit eeeef4e901
4 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
package-lock.json generated
View File

@ -4,6 +4,7 @@
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "WowPress-Tailwind",
"dependencies": { "dependencies": {
"alpinejs": "^3.13.8" "alpinejs": "^3.13.8"
}, },
@ -1054,12 +1055,13 @@
} }
}, },
"node_modules/braces": { "node_modules/braces": {
"version": "3.0.2", "version": "3.0.3",
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"fill-range": "^7.0.1" "fill-range": "^7.1.1"
}, },
"engines": { "engines": {
"node": ">=8" "node": ">=8"
@ -1873,10 +1875,11 @@
} }
}, },
"node_modules/fill-range": { "node_modules/fill-range": {
"version": "7.0.1", "version": "7.1.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"to-regex-range": "^5.0.1" "to-regex-range": "^5.0.1"
}, },
@ -2444,6 +2447,7 @@
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
"dev": true, "dev": true,
"license": "MIT",
"engines": { "engines": {
"node": ">=0.12.0" "node": ">=0.12.0"
} }
@ -2811,12 +2815,13 @@
} }
}, },
"node_modules/micromatch": { "node_modules/micromatch": {
"version": "4.0.5", "version": "4.0.8",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"braces": "^3.0.2", "braces": "^3.0.3",
"picomatch": "^2.3.1" "picomatch": "^2.3.1"
}, },
"engines": { "engines": {
@ -4446,6 +4451,7 @@
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"is-number": "^7.0.0" "is-number": "^7.0.0"
}, },

6
tailwind/tailwind.config.js
View File

@ -1,7 +1,9 @@
// Set the Preflight flag based on the build target. // Set the Preflight flag based on the build target.
const includePreflight = 'editor' === process.env._TW_TARGET ? false : true; const includePreflight = 'editor' === process.env._TW_TARGET ? false : true;
import themejson from '@_tw/themejson';
import plugin from 'tailwindcss/plugin'; import plugin from 'tailwindcss/plugin';
import themejson from '@_tw/themejson';
const themecolors = themejson().config.theme.extend.colors;
module.exports = { module.exports = {
presets: [ presets: [
@ -36,7 +38,7 @@ module.exports = {
plugin(function ({ theme, addUtilities }) { plugin(function ({ theme, addUtilities }) {
const colorUtilities = {}; const colorUtilities = {};
const colors = theme('colors'); const colors = theme('colors');
const themecolors = themejson().config.theme.extend.colors; // const themecolors = themejson.config.theme.extend.colors;
for (const color in themecolors) { for (const color in themecolors) {
colorUtilities[`.btn-${color}`] = { colorUtilities[`.btn-${color}`] = {
'--btn-color': themecolors[color] '--btn-color': themecolors[color]

4
theme/pages/sks.php
View File

@ -45,7 +45,7 @@ if (empty($GLOBALS['wowpress']['liste'])):
<input type="hidden" name="list_name" value="<?= $liste['list_name'] ?>"> <input type="hidden" name="list_name" value="<?= $liste['list_name'] ?>">
</form> </form>
<button type="submit" form="undoSKS" class="btn btn-outline btn-deepblue text-white hover:text-alliance"> <button type="submit" form="undoSKS" class="btn btn-outline btn-deepblue text-white hover:text-alliance">
Rückgängig (Stand vom <?= format_date($prevList->created_at, "dd.MM.yyyy HH:mm") ?>) Rückgängig (Stand vom <?= format_date($prevList->created_at, "dd.MM.yyyy HH:mm:ss") ?>)
</button> </button>
<?php endif; <?php endif;
if ($nextList = $liste->getNextList()): if ($nextList = $liste->getNextList()):
@ -56,7 +56,7 @@ if (empty($GLOBALS['wowpress']['liste'])):
<input type="hidden" name="list_name" value="<?= $liste['list_name'] ?>"> <input type="hidden" name="list_name" value="<?= $liste['list_name'] ?>">
</form> </form>
<button type="submit" form="redoSKS" class="btn btn-outline btn-deepblue text-white hover:text-alliance"> <button type="submit" form="redoSKS" class="btn btn-outline btn-deepblue text-white hover:text-alliance">
Wiederherstellen (Stand vom <?= format_date($nextList->created_at, "dd.MM.yyyy HH:mm") ?>) Wiederherstellen (Stand vom <?= format_date($nextList->created_at, "dd.MM.yyyy HH:mm:ss") ?>)
</button> </button>
<?php endif; ?> <?php endif; ?>
</div> </div>

4
theme/wowpress/Models/SKSHistory.php
View File

@ -205,12 +205,12 @@ class SKSHistory extends Model
public function getPreviousList() public function getPreviousList()
{ {
return SKSHistory::where('list_name', $this->list_name)->whereNot('active')->where('created_at', '<', $this->created_at)->latest()->first(); return SKSHistory::where('list_name', $this->list_name)->whereNot('active')->where('created_at', '<', $this->created_at)->orderBy('updated_at','DESC')->first();
} }
public function getNextList() public function getNextList()
{ {
return SKSHistory::where('list_name', $this->list_name)->whereNot('active')->where('created_at', '>', $this->created_at)->first(); return SKSHistory::where('list_name', $this->list_name)->whereNot('active')->where('created_at', '>', $this->created_at)->orderBy('updated_at','DESC')->first();
} }
public function undo() public function undo()