diff --git a/app/Console/Commands/clientAssetGenerator.php b/app/Console/Commands/clientAssetGenerator.php index 2960b6f..bccec19 100644 --- a/app/Console/Commands/clientAssetGenerator.php +++ b/app/Console/Commands/clientAssetGenerator.php @@ -32,8 +32,8 @@ class clientAssetGenerator extends Command $vars['xshop-background'] = $gfxes['background'] ?? '#000000'; $vars['xshop-primary'] = $gfxes['primary'] ?? '#6e0000'; - $vars['xshop-diff'] = getGrayscaleTextColor($gfxes['primary']) ?? '#6e0000'; - $vars['xshop-diff2'] = getGrayscaleTextColor($gfxes['secondary']) ?? '#6e0000'; + $vars['xshop-diff'] = getGrayscaleTextColor($gfxes['primary']) ?? '#6e0000'; + $vars['xshop-diff2'] = getGrayscaleTextColor($gfxes['secondary']) ?? '#6e0000'; $vars['xshop-secondary'] = $gfxes['secondary'] ?? '#ff0000'; $vars['xshop-text'] = $gfxes['text'] ?? '#111111'; $vars['xshop-border-radius'] = $gfxes['border-radius'] ?? '7px'; @@ -43,21 +43,23 @@ class clientAssetGenerator extends Command // prepare client.scss and add gfx variable $js = "// PLEASE DO NOT EDIT THIS FILE, \n// IF YOU WANT ADD ANY CODE CREATE NEW JS INTO client-custom \n import axios from 'axios'; \n window.axios = axios; \n \n window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';" . PHP_EOL; $variables = "// PLEASE DO NOT EDIT THIS FILE, \n// IF YOU WANT ADD ANY CODE CREATE NEW SCSS INTO client-custom" . PHP_EOL; + $appVariables = ''; foreach ($vars as $k => $var) { - $variables .= '$'."$k:$var;" . PHP_EOL; + $appVariables .= '$' . "$k:$var;" . PHP_EOL; } - $variables .= ":root{" . PHP_EOL; + $appVariables .= ":root{" . PHP_EOL; foreach ($vars as $k => $var) { - $variables .= "--$k:$var;" . PHP_EOL; + $appVariables .= "--$k:$var;" . PHP_EOL; } - $variables .= "}" . PHP_EOL . PHP_EOL; + $appVariables .= "}" . PHP_EOL . PHP_EOL; + file_put_contents(resource_path() . '/sass/client-custom/_app_variables.scss', $appVariables); // add custom scss and js $files = File::allFiles(resource_path() . '/sass/client-custom'); foreach ($files as $file) { if ($file->getType() == 'file' && $file->getExtension() == 'scss') { - $variables .= '@import "client-custom/' . + $variables .= '@use "client-custom/' . substr(trim($file->getBasename(), '_'), 0, -5) . '";' . PHP_EOL; } @@ -74,18 +76,28 @@ class clientAssetGenerator extends Command } // add parts scss & js foreach (Part::distinct()->get() as $part) { - if (filesize(__DIR__.'/../../../resources/views/segments/' . $part->segment . '/' . $part->part .'/' . $part->part . '.scss' ) > 10) { - $variables .= '@import "../views/segments/' . $part->segment . '/' + if (filesize(__DIR__ . '/../../../resources/views/segments/' . $part->segment . '/' . $part->part . '/' . $part->part . '.scss') > 10) { + $variables .= '@use "../views/segments/' . $part->segment . '/' . $part->part . '/' . $part->part . '";' . PHP_EOL; } - if (filesize(__DIR__.'/../../../resources/views/segments/' . $part->segment . '/' . $part->part .'/' . $part->part . '.js' ) > 10){ + if (filesize(__DIR__ . '/../../../resources/views/segments/' . $part->segment . '/' . $part->part . '/' . $part->part . '.js') > 10) { $js .= 'import "../views/segments/' . $part->segment . '/' . $part->part . '/' . $part->part . '.js";' . PHP_EOL; } } // save scss - file_put_contents(resource_path() . '/sass/client.scss', $variables); - file_put_contents(resource_path() . '/js/client.js', $js); + file_put_contents(resource_path() . '/sass/client.scss', $this->removeDuplicateLines($variables)); + file_put_contents(resource_path() . '/js/client.js', $this->removeDuplicateLines( $js )); + } + + + // remove duplicate lines + private function removeDuplicateLines($text) + { + $lines = explode("\n", $text); + $uniqueLines = array_unique($lines); + $uniqueText = implode("\n", $uniqueLines); + return $uniqueText; } } diff --git a/package.json b/package.json index cea43d9..6c08a3c 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,8 @@ "laravel-vite-plugin": "^1.0", "sass": "^1.56.1", "vite": "^5.0", - "vue": "^3.2.37" + "vue": "^3.2.37", + "path": "^0.12.7" }, "dependencies": { "bs5-lightbox": "^1.8.3", diff --git a/public/assets/vendor/editor/plugins/about/dialogs/hidpi/logo_ckeditor.png b/public/assets/vendor/editor/plugins/about/dialogs/hidpi/logo_ckeditor.png new file mode 100644 index 0000000..d6c8839 Binary files /dev/null and b/public/assets/vendor/editor/plugins/about/dialogs/hidpi/logo_ckeditor.png differ diff --git a/public/assets/vendor/editor/plugins/about/dialogs/logo_ckeditor.png b/public/assets/vendor/editor/plugins/about/dialogs/logo_ckeditor.png new file mode 100644 index 0000000..cdf17c0 Binary files /dev/null and b/public/assets/vendor/editor/plugins/about/dialogs/logo_ckeditor.png differ diff --git a/public/assets/vendor/editor/plugins/icons.png b/public/assets/vendor/editor/plugins/icons.png new file mode 100644 index 0000000..b2f6d6d Binary files /dev/null and b/public/assets/vendor/editor/plugins/icons.png differ diff --git a/public/assets/vendor/editor/plugins/icons_hidpi.png b/public/assets/vendor/editor/plugins/icons_hidpi.png new file mode 100644 index 0000000..bc5403c Binary files /dev/null and b/public/assets/vendor/editor/plugins/icons_hidpi.png differ diff --git a/public/assets/vendor/editor/plugins/iframe/images/placeholder.png b/public/assets/vendor/editor/plugins/iframe/images/placeholder.png new file mode 100644 index 0000000..4af0956 Binary files /dev/null and b/public/assets/vendor/editor/plugins/iframe/images/placeholder.png differ diff --git a/public/assets/vendor/editor/plugins/image/images/noimage.png b/public/assets/vendor/editor/plugins/image/images/noimage.png new file mode 100644 index 0000000..74c6ee9 Binary files /dev/null and b/public/assets/vendor/editor/plugins/image/images/noimage.png differ diff --git a/public/assets/vendor/editor/plugins/link/images/anchor.png b/public/assets/vendor/editor/plugins/link/images/anchor.png new file mode 100644 index 0000000..d94adb4 Binary files /dev/null and b/public/assets/vendor/editor/plugins/link/images/anchor.png differ diff --git a/public/assets/vendor/editor/plugins/link/images/hidpi/anchor.png b/public/assets/vendor/editor/plugins/link/images/hidpi/anchor.png new file mode 100644 index 0000000..186c3e9 Binary files /dev/null and b/public/assets/vendor/editor/plugins/link/images/hidpi/anchor.png differ diff --git a/public/assets/vendor/editor/plugins/magicline/images/hidpi/icon-rtl.png b/public/assets/vendor/editor/plugins/magicline/images/hidpi/icon-rtl.png new file mode 100644 index 0000000..4a8d2bf Binary files /dev/null and b/public/assets/vendor/editor/plugins/magicline/images/hidpi/icon-rtl.png differ diff --git a/public/assets/vendor/editor/plugins/magicline/images/hidpi/icon.png b/public/assets/vendor/editor/plugins/magicline/images/hidpi/icon.png new file mode 100644 index 0000000..b981bb5 Binary files /dev/null and b/public/assets/vendor/editor/plugins/magicline/images/hidpi/icon.png differ diff --git a/public/assets/vendor/editor/plugins/magicline/images/icon-rtl.png b/public/assets/vendor/editor/plugins/magicline/images/icon-rtl.png new file mode 100644 index 0000000..55b5b5f Binary files /dev/null and b/public/assets/vendor/editor/plugins/magicline/images/icon-rtl.png differ diff --git a/public/assets/vendor/editor/plugins/magicline/images/icon.png b/public/assets/vendor/editor/plugins/magicline/images/icon.png new file mode 100644 index 0000000..e063433 Binary files /dev/null and b/public/assets/vendor/editor/plugins/magicline/images/icon.png differ diff --git a/public/assets/vendor/editor/plugins/showblocks/images/block_address.png b/public/assets/vendor/editor/plugins/showblocks/images/block_address.png new file mode 100644 index 0000000..5abdae1 Binary files /dev/null and b/public/assets/vendor/editor/plugins/showblocks/images/block_address.png differ diff --git a/public/assets/vendor/editor/plugins/showblocks/images/block_blockquote.png b/public/assets/vendor/editor/plugins/showblocks/images/block_blockquote.png new file mode 100644 index 0000000..a8f4973 Binary files /dev/null and b/public/assets/vendor/editor/plugins/showblocks/images/block_blockquote.png differ diff --git a/public/assets/vendor/editor/plugins/showblocks/images/block_div.png b/public/assets/vendor/editor/plugins/showblocks/images/block_div.png new file mode 100644 index 0000000..87b3c17 Binary files /dev/null and b/public/assets/vendor/editor/plugins/showblocks/images/block_div.png differ diff --git a/public/assets/vendor/editor/plugins/showblocks/images/block_h1.png b/public/assets/vendor/editor/plugins/showblocks/images/block_h1.png new file mode 100644 index 0000000..3933325 Binary files /dev/null and b/public/assets/vendor/editor/plugins/showblocks/images/block_h1.png differ diff --git a/public/assets/vendor/editor/plugins/showblocks/images/block_h2.png b/public/assets/vendor/editor/plugins/showblocks/images/block_h2.png new file mode 100644 index 0000000..c99894c Binary files /dev/null and b/public/assets/vendor/editor/plugins/showblocks/images/block_h2.png differ diff --git a/public/assets/vendor/editor/plugins/showblocks/images/block_h3.png b/public/assets/vendor/editor/plugins/showblocks/images/block_h3.png new file mode 100644 index 0000000..cb73d67 Binary files /dev/null and b/public/assets/vendor/editor/plugins/showblocks/images/block_h3.png differ diff --git a/public/assets/vendor/editor/plugins/showblocks/images/block_h4.png b/public/assets/vendor/editor/plugins/showblocks/images/block_h4.png new file mode 100644 index 0000000..7af6bb4 Binary files /dev/null and b/public/assets/vendor/editor/plugins/showblocks/images/block_h4.png differ diff --git a/public/assets/vendor/editor/plugins/showblocks/images/block_h5.png b/public/assets/vendor/editor/plugins/showblocks/images/block_h5.png new file mode 100644 index 0000000..ce5bec1 Binary files /dev/null and b/public/assets/vendor/editor/plugins/showblocks/images/block_h5.png differ diff --git a/public/assets/vendor/editor/plugins/showblocks/images/block_h6.png b/public/assets/vendor/editor/plugins/showblocks/images/block_h6.png new file mode 100644 index 0000000..e67b982 Binary files /dev/null and b/public/assets/vendor/editor/plugins/showblocks/images/block_h6.png differ diff --git a/public/assets/vendor/editor/plugins/showblocks/images/block_p.png b/public/assets/vendor/editor/plugins/showblocks/images/block_p.png new file mode 100644 index 0000000..63a5820 Binary files /dev/null and b/public/assets/vendor/editor/plugins/showblocks/images/block_p.png differ diff --git a/public/assets/vendor/editor/plugins/showblocks/images/block_pre.png b/public/assets/vendor/editor/plugins/showblocks/images/block_pre.png new file mode 100644 index 0000000..955a868 Binary files /dev/null and b/public/assets/vendor/editor/plugins/showblocks/images/block_pre.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/angel_smile.png b/public/assets/vendor/editor/plugins/smiley/images/angel_smile.png new file mode 100644 index 0000000..559e5e7 Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/angel_smile.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/angry_smile.png b/public/assets/vendor/editor/plugins/smiley/images/angry_smile.png new file mode 100644 index 0000000..c05d2be Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/angry_smile.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/broken_heart.png b/public/assets/vendor/editor/plugins/smiley/images/broken_heart.png new file mode 100644 index 0000000..a711c0d Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/broken_heart.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/confused_smile.png b/public/assets/vendor/editor/plugins/smiley/images/confused_smile.png new file mode 100644 index 0000000..e0b8e5c Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/confused_smile.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/cry_smile.png b/public/assets/vendor/editor/plugins/smiley/images/cry_smile.png new file mode 100644 index 0000000..a1891a3 Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/cry_smile.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/devil_smile.png b/public/assets/vendor/editor/plugins/smiley/images/devil_smile.png new file mode 100644 index 0000000..53247a8 Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/devil_smile.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/embarrassed_smile.png b/public/assets/vendor/editor/plugins/smiley/images/embarrassed_smile.png new file mode 100644 index 0000000..34904b6 Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/embarrassed_smile.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/envelope.png b/public/assets/vendor/editor/plugins/smiley/images/envelope.png new file mode 100644 index 0000000..44398ad Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/envelope.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/heart.png b/public/assets/vendor/editor/plugins/smiley/images/heart.png new file mode 100644 index 0000000..df409e6 Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/heart.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/kiss.png b/public/assets/vendor/editor/plugins/smiley/images/kiss.png new file mode 100644 index 0000000..a4f2f36 Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/kiss.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/lightbulb.png b/public/assets/vendor/editor/plugins/smiley/images/lightbulb.png new file mode 100644 index 0000000..0c4a924 Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/lightbulb.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/omg_smile.png b/public/assets/vendor/editor/plugins/smiley/images/omg_smile.png new file mode 100644 index 0000000..abc4e2d Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/omg_smile.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/regular_smile.png b/public/assets/vendor/editor/plugins/smiley/images/regular_smile.png new file mode 100644 index 0000000..0f2649b Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/regular_smile.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/sad_smile.png b/public/assets/vendor/editor/plugins/smiley/images/sad_smile.png new file mode 100644 index 0000000..f20f3bf Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/sad_smile.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/shades_smile.png b/public/assets/vendor/editor/plugins/smiley/images/shades_smile.png new file mode 100644 index 0000000..fdaa28b Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/shades_smile.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/teeth_smile.png b/public/assets/vendor/editor/plugins/smiley/images/teeth_smile.png new file mode 100644 index 0000000..5e63785 Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/teeth_smile.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/thumbs_down.png b/public/assets/vendor/editor/plugins/smiley/images/thumbs_down.png new file mode 100644 index 0000000..1823481 Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/thumbs_down.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/thumbs_up.png b/public/assets/vendor/editor/plugins/smiley/images/thumbs_up.png new file mode 100644 index 0000000..d4e8b22 Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/thumbs_up.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/tongue_smile.png b/public/assets/vendor/editor/plugins/smiley/images/tongue_smile.png new file mode 100644 index 0000000..56553fb Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/tongue_smile.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/whatchutalkingabout_smile.png b/public/assets/vendor/editor/plugins/smiley/images/whatchutalkingabout_smile.png new file mode 100644 index 0000000..f9714d1 Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/whatchutalkingabout_smile.png differ diff --git a/public/assets/vendor/editor/plugins/smiley/images/wink_smile.png b/public/assets/vendor/editor/plugins/smiley/images/wink_smile.png new file mode 100644 index 0000000..7c99c3f Binary files /dev/null and b/public/assets/vendor/editor/plugins/smiley/images/wink_smile.png differ diff --git a/public/assets/vendor/editor/plugins/widget/images/handle.png b/public/assets/vendor/editor/plugins/widget/images/handle.png new file mode 100644 index 0000000..ba8cda5 Binary files /dev/null and b/public/assets/vendor/editor/plugins/widget/images/handle.png differ diff --git a/public/assets/vendor/editor/samples/img/github-top.png b/public/assets/vendor/editor/samples/img/github-top.png new file mode 100644 index 0000000..7b9cbb1 Binary files /dev/null and b/public/assets/vendor/editor/samples/img/github-top.png differ diff --git a/public/assets/vendor/editor/samples/img/header-bg.png b/public/assets/vendor/editor/samples/img/header-bg.png new file mode 100644 index 0000000..a14166a Binary files /dev/null and b/public/assets/vendor/editor/samples/img/header-bg.png differ diff --git a/public/assets/vendor/editor/samples/img/header-separator.png b/public/assets/vendor/editor/samples/img/header-separator.png new file mode 100644 index 0000000..8c4fb9b Binary files /dev/null and b/public/assets/vendor/editor/samples/img/header-separator.png differ diff --git a/public/assets/vendor/editor/samples/img/logo.png b/public/assets/vendor/editor/samples/img/logo.png new file mode 100644 index 0000000..f3d4391 Binary files /dev/null and b/public/assets/vendor/editor/samples/img/logo.png differ diff --git a/public/assets/vendor/editor/samples/img/navigation-tip.png b/public/assets/vendor/editor/samples/img/navigation-tip.png new file mode 100644 index 0000000..2286114 Binary files /dev/null and b/public/assets/vendor/editor/samples/img/navigation-tip.png differ diff --git a/public/assets/vendor/editor/samples/old/assets/inlineall/logo.png b/public/assets/vendor/editor/samples/old/assets/inlineall/logo.png new file mode 100644 index 0000000..b4d5979 Binary files /dev/null and b/public/assets/vendor/editor/samples/old/assets/inlineall/logo.png differ diff --git a/public/assets/vendor/editor/skins/moono-dark/icons.png b/public/assets/vendor/editor/skins/moono-dark/icons.png new file mode 100644 index 0000000..c0b3ac8 Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-dark/icons.png differ diff --git a/public/assets/vendor/editor/skins/moono-dark/icons_hidpi.png b/public/assets/vendor/editor/skins/moono-dark/icons_hidpi.png new file mode 100644 index 0000000..8d6811c Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-dark/icons_hidpi.png differ diff --git a/public/assets/vendor/editor/skins/moono-dark/images/arrow.png b/public/assets/vendor/editor/skins/moono-dark/images/arrow.png new file mode 100644 index 0000000..0d1eb39 Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-dark/images/arrow.png differ diff --git a/public/assets/vendor/editor/skins/moono-dark/images/close.png b/public/assets/vendor/editor/skins/moono-dark/images/close.png new file mode 100644 index 0000000..900ae87 Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-dark/images/close.png differ diff --git a/public/assets/vendor/editor/skins/moono-dark/images/hidpi/close.png b/public/assets/vendor/editor/skins/moono-dark/images/hidpi/close.png new file mode 100644 index 0000000..5a288b6 Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-dark/images/hidpi/close.png differ diff --git a/public/assets/vendor/editor/skins/moono-dark/images/hidpi/lock-open.png b/public/assets/vendor/editor/skins/moono-dark/images/hidpi/lock-open.png new file mode 100644 index 0000000..6f465a8 Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-dark/images/hidpi/lock-open.png differ diff --git a/public/assets/vendor/editor/skins/moono-dark/images/hidpi/lock.png b/public/assets/vendor/editor/skins/moono-dark/images/hidpi/lock.png new file mode 100644 index 0000000..07b2381 Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-dark/images/hidpi/lock.png differ diff --git a/public/assets/vendor/editor/skins/moono-dark/images/hidpi/refresh.png b/public/assets/vendor/editor/skins/moono-dark/images/hidpi/refresh.png new file mode 100644 index 0000000..53b610d Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-dark/images/hidpi/refresh.png differ diff --git a/public/assets/vendor/editor/skins/moono-dark/images/lock-open.png b/public/assets/vendor/editor/skins/moono-dark/images/lock-open.png new file mode 100644 index 0000000..10b348f Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-dark/images/lock-open.png differ diff --git a/public/assets/vendor/editor/skins/moono-dark/images/lock.png b/public/assets/vendor/editor/skins/moono-dark/images/lock.png new file mode 100644 index 0000000..7c535df Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-dark/images/lock.png differ diff --git a/public/assets/vendor/editor/skins/moono-dark/images/refresh.png b/public/assets/vendor/editor/skins/moono-dark/images/refresh.png new file mode 100644 index 0000000..3c10f06 Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-dark/images/refresh.png differ diff --git a/public/assets/vendor/editor/skins/moono-lisa/icons.png b/public/assets/vendor/editor/skins/moono-lisa/icons.png new file mode 100644 index 0000000..b2f6d6d Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-lisa/icons.png differ diff --git a/public/assets/vendor/editor/skins/moono-lisa/icons_hidpi.png b/public/assets/vendor/editor/skins/moono-lisa/icons_hidpi.png new file mode 100644 index 0000000..bc5403c Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-lisa/icons_hidpi.png differ diff --git a/public/assets/vendor/editor/skins/moono-lisa/images/arrow.png b/public/assets/vendor/editor/skins/moono-lisa/images/arrow.png new file mode 100644 index 0000000..d72b5f3 Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-lisa/images/arrow.png differ diff --git a/public/assets/vendor/editor/skins/moono-lisa/images/close.png b/public/assets/vendor/editor/skins/moono-lisa/images/close.png new file mode 100644 index 0000000..40caa6d Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-lisa/images/close.png differ diff --git a/public/assets/vendor/editor/skins/moono-lisa/images/hidpi/close.png b/public/assets/vendor/editor/skins/moono-lisa/images/hidpi/close.png new file mode 100644 index 0000000..fa00f4f Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-lisa/images/hidpi/close.png differ diff --git a/public/assets/vendor/editor/skins/moono-lisa/images/hidpi/lock-open.png b/public/assets/vendor/editor/skins/moono-lisa/images/hidpi/lock-open.png new file mode 100644 index 0000000..c899789 Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-lisa/images/hidpi/lock-open.png differ diff --git a/public/assets/vendor/editor/skins/moono-lisa/images/hidpi/lock.png b/public/assets/vendor/editor/skins/moono-lisa/images/hidpi/lock.png new file mode 100644 index 0000000..25ad0f4 Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-lisa/images/hidpi/lock.png differ diff --git a/public/assets/vendor/editor/skins/moono-lisa/images/hidpi/refresh.png b/public/assets/vendor/editor/skins/moono-lisa/images/hidpi/refresh.png new file mode 100644 index 0000000..117a2d4 Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-lisa/images/hidpi/refresh.png differ diff --git a/public/assets/vendor/editor/skins/moono-lisa/images/lock-open.png b/public/assets/vendor/editor/skins/moono-lisa/images/lock-open.png new file mode 100644 index 0000000..42df5f4 Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-lisa/images/lock-open.png differ diff --git a/public/assets/vendor/editor/skins/moono-lisa/images/lock.png b/public/assets/vendor/editor/skins/moono-lisa/images/lock.png new file mode 100644 index 0000000..bde6772 Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-lisa/images/lock.png differ diff --git a/public/assets/vendor/editor/skins/moono-lisa/images/refresh.png b/public/assets/vendor/editor/skins/moono-lisa/images/refresh.png new file mode 100644 index 0000000..e363764 Binary files /dev/null and b/public/assets/vendor/editor/skins/moono-lisa/images/refresh.png differ diff --git a/resources/images/pattern.png b/resources/images/pattern.png new file mode 100644 index 0000000..702fa69 Binary files /dev/null and b/resources/images/pattern.png differ diff --git a/resources/js/client-vue/vueDateTimePickerClient.vue b/resources/js/client-vue/vueDateTimePickerClient.vue index 3f165b7..1da544b 100644 --- a/resources/js/client-vue/vueDateTimePickerClient.vue +++ b/resources/js/client-vue/vueDateTimePickerClient.vue @@ -918,7 +918,6 @@ export default { #dp-modal { position: fixed; -//display: none; left: 0; right: 0; top: 0; bottom: 0; z-index: 999; background: #00000033; backdrop-filter: blur(4px); } #picker { diff --git a/resources/js/components/FontAwesomeIconPicker.vue b/resources/js/components/FontAwesomeIconPicker.vue index c785a0a..f5ce1b8 100644 --- a/resources/js/components/FontAwesomeIconPicker.vue +++ b/resources/js/components/FontAwesomeIconPicker.vue @@ -2574,7 +2574,6 @@ export default { } #icon-dropdown{ - //display: block; min-height: 45px; padding-right: 2rem; padding-left: 2rem; diff --git a/resources/js/components/MetaInput.vue b/resources/js/components/MetaInput.vue index 5893936..4fce5cf 100644 --- a/resources/js/components/MetaInput.vue +++ b/resources/js/components/MetaInput.vue @@ -47,7 +47,7 @@ + diff --git a/resources/sass/app.scss b/resources/sass/app.scss index 7731c8b..a24daae 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -1,9 +1,18 @@ +@use "sass:color"; // Fonts -@import 'vazirmatn/Vazirmatn-font-face.css'; -@import "remixicon/fonts/remixicon.css"; -@import "vue-toast-notification/dist/theme-bootstrap.css"; +@use 'vazirmatn/Vazirmatn-font-face.css'; +@use "remixicon/fonts/remixicon.css"; +@use "vue-toast-notification/dist/theme-bootstrap.css"; // Variables -@import 'panel/variables'; +@use 'panel/variables'; + +@use "panel/common"; +@use "panel/raw"; +@use "panel/fix"; +@use "panel/navbar"; +@use "panel/breadcrumbs"; +@use "panel/item-list"; +@use "panel/steps"; // Bootstrap //@import 'bootstrap/scss/bootstrap'; @@ -53,7 +62,7 @@ a{ >aside{ background-image: url("../images/pattern.png"); - background-color: lighten($body-bg,7); + background-color: color.adjust(variables.$body-bg, $lightness: 7%); position: relative; } &.sided{ @@ -65,10 +74,3 @@ a{ } -@import "panel/common"; -@import "panel/raw"; -@import "panel/fix"; -@import "panel/navbar"; -@import "panel/breadcrumbs"; -@import "panel/item-list"; -@import "panel/steps"; diff --git a/resources/sass/client-custom/.gitignore b/resources/sass/client-custom/.gitignore new file mode 100644 index 0000000..b072a61 --- /dev/null +++ b/resources/sass/client-custom/.gitignore @@ -0,0 +1 @@ +_app_variables.scss diff --git a/resources/sass/client-custom/_app_variables.scss b/resources/sass/client-custom/_app_variables.scss new file mode 100644 index 0000000..1cd9648 --- /dev/null +++ b/resources/sass/client-custom/_app_variables.scss @@ -0,0 +1,19 @@ +$xshop-background:#eeeeee; +$xshop-primary:#03b2b5; +$xshop-diff:#ffffff; +$xshop-diff2:#ffffff; +$xshop-secondary:#0064c2; +$xshop-text:#111111; +$xshop-border-radius:7px; +$xshop-shadow:2px 2px 4px #777777; +:root{ +--xshop-background:#eeeeee; +--xshop-primary:#03b2b5; +--xshop-diff:#ffffff; +--xshop-diff2:#ffffff; +--xshop-secondary:#0064c2; +--xshop-text:#111111; +--xshop-border-radius:7px; +--xshop-shadow:2px 2px 4px #777777; +} + diff --git a/resources/sass/client-custom/_assetsNode.scss b/resources/sass/client-custom/_assetsNode.scss index ef435e4..cc1aea4 100644 --- a/resources/sass/client-custom/_assetsNode.scss +++ b/resources/sass/client-custom/_assetsNode.scss @@ -1,5 +1,5 @@ -@import "remixicon/fonts/remixicon.css"; -@import "tiny-slider/dist/tiny-slider.css"; -@import "vue-toast-notification/dist/theme-bootstrap.css"; -@import "vazir-xui/font-face.css"; -@import "vazirmatn/Vazirmatn-font-face.css"; +@use "remixicon/fonts/remixicon.css"; +@use "tiny-slider/dist/tiny-slider.css"; +@use "vue-toast-notification/dist/theme-bootstrap.css"; +@use "vazir-xui/font-face.css"; +@use "vazirmatn/Vazirmatn-font-face.css"; diff --git a/resources/sass/panel/_common.scss b/resources/sass/panel/_common.scss index 8254aaa..18190f7 100644 --- a/resources/sass/panel/_common.scss +++ b/resources/sass/panel/_common.scss @@ -1,12 +1,14 @@ +@use "sass:color"; +@use "variables"; body { - background: $body-bg; + background: variables.$body-bg; } .circle-btn { width: 75px; height: 75px; border-radius: 50%; - background: $secondary-color-panel; + background: variables.$secondary-color-panel; backdrop-filter: blur(4px); border: 0; box-shadow: 0px 3px 5px #11111177, inset 0 0 0 0 darkred; @@ -56,7 +58,7 @@ a.btn, a.action-btn, a.circle-btn { } .general-form { - background: $lighter-color; + background: variables.$lighter-color; border-radius: 7px; margin-bottom: 4rem; position: relative; @@ -155,11 +157,11 @@ a.btn, a.action-btn, a.circle-btn { color: white; &.active { - background: $primary-color-panel; + background: variables.$primary-color-panel; } &:hover { - background: rgba($primary-color-panel, .7); + background: rgba(variables.$primary-color-panel, .7); } } } @@ -167,7 +169,7 @@ a.btn, a.action-btn, a.circle-btn { #setting-sections { section { display: none; - background: $lighter-color; + background: variables.$lighter-color; padding: 1rem; .setting-field { @@ -206,10 +208,10 @@ a.btn, a.action-btn, a.circle-btn { height: 125px; text-align: center; display: block; - color: $text-muted; + color: variables.$text-muted; &:hover { - color: lighten($primary-color-panel, 10); + color: color.adjust(variables.$primary-color-panel, $lightness: 7%); } i { @@ -224,12 +226,12 @@ a.btn, a.action-btn, a.circle-btn { } .avatar-x64 { - background: $body-bg; + background: variables.$body-bg; width: 64px; height: 64px; border-radius: 50%; object-fit: cover; - border: 3px rgba($primary-color-panel, 127) solid; + border: 3px rgba(variables.$primary-color-panel, 127) solid; } .skewed-container { @@ -253,7 +255,7 @@ a.btn, a.action-btn, a.circle-btn { .card-header { background: #ffffff22 !important; - color: $secondary-color-panel; + color: variables.$secondary-color-panel; } .card-body { @@ -275,7 +277,7 @@ a.btn, a.action-btn, a.circle-btn { .card-header { background: #ffffff22 !important; - color: $secondary-color-panel; + color: variables.$secondary-color-panel; } .card-body { @@ -319,7 +321,7 @@ a.btn, a.action-btn, a.circle-btn { display: flex; align-items: center; justify-content: center; - color: lighten($primary-color-panel, 15); + color: color.adjust(variables.$primary-color-panel, $lightness: 15%); .loader { position: relative; @@ -554,7 +556,7 @@ a.btn, a.action-btn, a.circle-btn { bottom: -50vh; left: 1rem; right: 1rem; - background: $lighter-color; + background: variables.$lighter-color; height: 40vh; border-radius: 7px 7px 0 0; border: 1px solid #aaaaaa55; diff --git a/resources/sass/panel/_fix.scss b/resources/sass/panel/_fix.scss index eaa6fb7..3ec3041 100644 --- a/resources/sass/panel/_fix.scss +++ b/resources/sass/panel/_fix.scss @@ -1,3 +1,4 @@ +@use "variables"; .form-control:focus,.form-check-input:focus{ box-shadow: 0 0 0 0.25rem rgba(133, 13, 253, 0.25); border-color: #bc86fe; @@ -7,7 +8,7 @@ border-color: #bc86fe; .card{ background-color: rgba(var(--bs-body-bg),.5); - background-image: url("../../images/pattern.png"); + background-image: url("$resImage/pattern.png"); backdrop-filter: blur(4px); box-shadow: -2px -2px 7px #560000, 2px 2px 7px #5e00b5; } @@ -15,7 +16,7 @@ border-color: #bc86fe; main{ .card{ - background-color: $lighter-color; + background-color: variables.$lighter-color; border: 0; .card-header{ background: #00000011; diff --git a/resources/sass/panel/_item-list.scss b/resources/sass/panel/_item-list.scss index 3ae94ca..1fea75a 100644 --- a/resources/sass/panel/_item-list.scss +++ b/resources/sass/panel/_item-list.scss @@ -1,6 +1,8 @@ +@use "sass:color"; +@use "variables"; .item-list { overflow: hidden; - background: $lighter-color; + background: variables.$lighter-color; //margin: 0 1rem; border-radius: 4px; @@ -74,7 +76,7 @@ border-radius: 3px; } input:checked + label{ - background: lighten($primary-color-panel,10); + background: color.adjust(variables.$primary-color-panel, $lightness: 10%) } input{ display: none; diff --git a/resources/sass/panel/_navbar.scss b/resources/sass/panel/_navbar.scss index 3625176..66ad714 100644 --- a/resources/sass/panel/_navbar.scss +++ b/resources/sass/panel/_navbar.scss @@ -1,3 +1,4 @@ +@use "variables"; #panel-navbar { height: 100%; overflow-y: auto; @@ -38,7 +39,7 @@ color: white; &:hover { - color: $secondary-color-panel; + color: variables.$secondary-color-panel; } } } diff --git a/resources/sass/panel/_steps.scss b/resources/sass/panel/_steps.scss index 9513fef..49e4391 100644 --- a/resources/sass/panel/_steps.scss +++ b/resources/sass/panel/_steps.scss @@ -1,3 +1,5 @@ +@use "variables"; +@use "sass:color"; .steps { @@ -25,14 +27,14 @@ top: 50%; inset-inline-start: 0; inset-inline-end: calc(100% - var(--progress)); - border-bottom: 1px solid lighten($primary-color-panel,20); + border-bottom: 1px solid color.adjust(variables.$primary-color-panel, $lightness: 20%); transition: all 0.3s ease-in-out; } li { position: relative; z-index: 2; - background: $lighter-color; + background: variables.$lighter-color; cursor: pointer; border: 1px solid #ccc; border-radius: 50%; @@ -47,8 +49,8 @@ } &.active { - border-color: lighten($primary-color-panel,20); - background-color: $primary-color-panel; + border-color: color.adjust(variables.$primary-color-panel, $lightness: 20%); + background-color: variables.$primary-color-panel; } } } @@ -86,11 +88,11 @@ justify-content: center; &:hover { - border-color: $primary-color-panel; + border-color: variables.$primary-color-panel; } } #upload-drag-drop.active { - border-color: $primary-color-panel; + border-color: variables.$primary-color-panel; } .img-preview{ @@ -105,7 +107,7 @@ .indexed{ - background: $primary-color-panel; + background: variables.$primary-color-panel; } #upload-image-select{ diff --git a/resources/views/segments/clips_page/ClipListGrid/ClipListGrid.scss b/resources/views/segments/clips_page/ClipListGrid/ClipListGrid.scss index 308acaa..4e23506 100644 --- a/resources/views/segments/clips_page/ClipListGrid/ClipListGrid.scss +++ b/resources/views/segments/clips_page/ClipListGrid/ClipListGrid.scss @@ -1,3 +1,5 @@ +@use "../../../../sass/client-custom/app_variables"; + .ClipListGrid { .container,.container-fluid{ overflow: hidden; @@ -33,7 +35,7 @@ display: flex; position: absolute; z-index: 2; - background: rgba($xshop-diff, .7); + background: rgba(app_variables.$xshop-diff, .7); padding: 7px; bottom: 0; left: 0; diff --git a/resources/views/segments/default-assets/coin-left.png b/resources/views/segments/default-assets/coin-left.png new file mode 100644 index 0000000..78a2741 Binary files /dev/null and b/resources/views/segments/default-assets/coin-left.png differ diff --git a/resources/views/segments/default-assets/gold-right.png b/resources/views/segments/default-assets/gold-right.png new file mode 100644 index 0000000..c5b4d3a Binary files /dev/null and b/resources/views/segments/default-assets/gold-right.png differ diff --git a/resources/views/segments/default-assets/hodhod.png b/resources/views/segments/default-assets/hodhod.png new file mode 100644 index 0000000..8519082 Binary files /dev/null and b/resources/views/segments/default-assets/hodhod.png differ diff --git a/resources/views/segments/products/PedramProducts/PedramProducts.scss b/resources/views/segments/products/PedramProducts/PedramProducts.scss index 5c75d08..d2ffaf7 100644 --- a/resources/views/segments/products/PedramProducts/PedramProducts.scss +++ b/resources/views/segments/products/PedramProducts/PedramProducts.scss @@ -19,11 +19,6 @@ svg:last-child { width: calc(100%); - //height: 171px; - //transform: rotateY(180deg) ; - //display: block; - //left: 50%; - //position: relative; } h1 { diff --git a/vite.config.js b/vite.config.js index 3b3887d..66b9db3 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,6 +1,7 @@ import { defineConfig } from 'vite'; import laravel from 'laravel-vite-plugin'; import vue from '@vitejs/plugin-vue'; +import { resolve } from 'path'; export default defineConfig({ plugins: [ @@ -25,6 +26,36 @@ export default defineConfig({ resolve: { alias: { vue: 'vue/dist/vue.esm-bundler.js', + $resImage: resolve('./resources/images') + }, + }, + css: { + preprocessorOptions: { + scss: { + api: 'modern-compiler' // or "modern" + } + } + }, + build: { + chunkSizeWarningLimit: 500, // adjust this value to your needs + rollupOptions: { + output: { + manualChunks: (id) => { + if (id.includes('node_modules/tns')|| id.includes('node_modules/axios') || id.includes('node_modules/bootstrap')) { + return 'vendor-tns-axios'; + } else if (id.includes('node_modules/@vue') || id.includes('node_modules/vue') || id.includes('node_modules/vuex') || id.includes('node_modules/vue-toast-notification') ) { + return 'vendor-vue'; + } else if (id.includes('node_modules/chart.js')) { + return 'vendor-chart'; + } else if (id.includes('node_modules/three')) { + return 'vendor-three'; + } else if (id.includes('node_modules')) { + return 'vendor-others'; + } + return 'app'; + }, + + }, }, }, });