diff --git a/app/Http/Controllers/Admin/AreaController.php b/app/Http/Controllers/Admin/AreaController.php index 3e90c3f..ec3a3c5 100644 --- a/app/Http/Controllers/Admin/AreaController.php +++ b/app/Http/Controllers/Admin/AreaController.php @@ -13,7 +13,7 @@ class AreaController extends Controller // public function index() { - $areas = Area::all('name', 'icon'); + $areas = Area::all('name', 'icon')->sortBy('name'); return view('admin.areas.area-list', compact('areas')); } diff --git a/app/Models/Area.php b/app/Models/Area.php index 68df73a..83ae59d 100644 --- a/app/Models/Area.php +++ b/app/Models/Area.php @@ -20,12 +20,14 @@ class Area extends Model 'comments', 'clip', 'clips', + 'clips_page', 'comments', 'compare', 'customer', 'floats', 'footer', 'galleries', + 'galleries_page', 'gallery', 'group', 'groups', @@ -44,6 +46,7 @@ class Area extends Model 'product', 'products', 'products_page', + 'register', 'questions', 'search', 'slider', diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index 1b98882..25f4ad7 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -57,4 +57,12 @@ class Attachment extends Model return null; } } + + + public function webUrl() + { + return '#';// WIP + return route(''); + } + } diff --git a/database/seeders/AreaSeeder.php b/database/seeders/AreaSeeder.php index 12d57ae..3e72b47 100644 --- a/database/seeders/AreaSeeder.php +++ b/database/seeders/AreaSeeder.php @@ -24,28 +24,227 @@ class AreaSeeder extends Seeder 'preview' => null, 'icon' => 'ri-loader-2-line', ], + [ + 'name' => 'floats', + 'valid_segments' => json_encode( + ["floats"] + ), + 'max' => 2, + 'preview' => null, + 'icon' => 'ri-ai-generate', + ], [ 'name' => 'index', 'valid_segments' => json_encode( ["top", "slider", "header", "footer", "menu", "parallax", "other", "posts", "products", "attachments" - , "groups", "categories", "category", "group", "index"] + , "groups", "categories", "category", "group", "index", "ads"] ), 'max' => 10, 'preview' => 'client.welcome', - 'icon' => 'ri-layout-top-2-line', + 'icon' => 'ri-home-smile-line', ], [ 'name' => 'post', 'valid_segments' => json_encode( ["top", "header", "footer", "menu", - "parallax", "other", "post", "comments"] + "parallax", "other", "post", "comments", "ads"] ), 'max' => 6, 'preview' => 'client.post', - 'icon' => 'ri-layout-top-2-line', + 'icon' => 'ri-file-text-line', + ], + [ + 'name' => 'posts-list', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "posts_page", "ads"] + ), + 'max' => 6, + 'preview' => 'client.posts', + 'icon' => 'ri-archive-stack-line', + ], + [ + 'name' => 'clip', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "clip", "comments", "ads"] + ), + 'max' => 6, + 'preview' => 'client.clip', + 'icon' => 'ri-video-line', + ], + [ + 'name' => 'clips-list', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "clips_page", "ads"] + ), + 'max' => 6, + 'preview' => 'client.clips', + 'icon' => 'ri-movie-2-line', + ], + [ + 'name' => 'gallery', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "gallery", "comments", "ads"] + ), + 'max' => 6, + 'preview' => 'client.gallery', + 'icon' => 'ri-image-line', + ], + [ + 'name' => 'galleries-list', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "galleries_page", "ads"] + ), + 'max' => 6, + 'preview' => 'client.galleries', + 'icon' => 'ri-folder-image-line', + ], + [ + 'name' => 'product', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "product", "comments", "ads"] + ), + 'max' => 6, + 'preview' => 'client.product', + 'icon' => 'ri-vip-diamond-line', + ], + [ + 'name' => 'products-list', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "products_page", "ads"] + ), + 'max' => 6, + 'preview' => 'client.products', + 'icon' => 'ri-function-line', + ], + [ + 'name' => 'attachment', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "attachment", "comments", "ads"] + ), + 'max' => 6, + 'preview' => 'client.attachment', + 'icon' => 'ri-attachment-line', + ], + [ + 'name' => 'attachments-list', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "attachments_page", "ads"] + ), + 'max' => 6, + 'preview' => 'client.attachments', + 'icon' => 'ri-attachment-2', + ], + [ + 'name' => 'category', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "category", "ads", "products_page"] + ), + 'max' => 6, + 'preview' => 'client.attachment', + 'icon' => 'ri-book-3-line', + ], + [ + 'name' => 'categories-list', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "categories_page", "ads"] + ), + 'max' => 6, + 'preview' => 'client.categories', + 'icon' => 'ri-file-copy-2-line', + ], + [ + 'name' => 'group', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "group", "ads",'posts_page'] + ), + 'max' => 6, + 'preview' => 'client.group', + 'icon' => 'ri-book-line', + ], + [ + 'name' => 'groups-list', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "groups_page", "ads"] + ), + 'max' => 6, + 'preview' => 'client.groups', + 'icon' => 'ri-book-shelf-line', + ], + [ + 'name' => 'card', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "card", "ads"] + ), + 'max' => 6, + 'preview' => 'client.card', + 'icon' => 'ri-shopping-cart-2-line', + ], + [ + 'name' => 'login', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "login", "ads"] + ), + 'max' => 6, + 'preview' => 'client.login', + 'icon' => 'ri-login-circle-line', + ], + [ + 'name' => 'register', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "register", "ads"] + ), + 'max' => 6, + 'preview' => 'client.register', + 'icon' => 'ri-user-add-line', + ], + [ + 'name' => 'customer', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "customer", "ads"] + ), + 'max' => 6, + 'preview' => 'client.profile', + 'icon' => 'ri-profile-line', + ], + [ + 'name' => 'invoice', + 'valid_segments' => json_encode( + ["invoice", "other"] + ), + 'max' => 3, + 'preview' => null, + 'icon' => 'ri-list-check-3', + ], + [ + 'name' => 'compare', + 'valid_segments' => json_encode( + ["top", "header", "footer", "menu", + "parallax", "other", "compare", "ads"] + ), + 'max' => 4, + 'preview' => null, + 'icon' => 'ri-scales-3-line', ], ]; + foreach ($areas as $area) { $a = new Area(); $a->name = $area['name']; diff --git a/package.json b/package.json index ecf1ad3..66576ed 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dependencies": { "chart.js": "^4.4.3", "leaflet": "^1.9.4", - "remixicon": "^4.2.0", + "remixicon": "^4.3.0", "sortablejs": "^1.15.2", "three": "0.150.0", "tiny-slider": "^2.9.4", diff --git a/resources/js/client.js b/resources/js/client.js index b49c101..1f80654 100644 --- a/resources/js/client.js +++ b/resources/js/client.js @@ -6,11 +6,7 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; import "./client-custom/assetsNode.js"; import "./client-custom/confirm.js"; +import "./client-custom/safeForm.js"; import "./client-custom/windowLoader.js"; import "../views/segments/preloader/PreloaderCircle/PreloaderCircle.js"; -import "../views/segments/top/TopSimple/TopSimple.js"; -import "../views/segments/slider/SliderSimple/SliderSimple.js"; -import "../views/segments/posts/PostsIconSimple/PostsIconSimple.js"; -import "../views/segments/index/GradientTextLink/GradientTextLink.js"; -import "../views/segments/category/FavProductWithMeta/FavProductWithMeta.js"; -import "../views/segments/parallax/ParallaxShort/ParallaxShort.js"; +import "../views/segments/posts_page/SimplePostList/SimplePostList.js"; diff --git a/resources/sass/client.scss b/resources/sass/client.scss index 079ceed..9951df1 100644 --- a/resources/sass/client.scss +++ b/resources/sass/client.scss @@ -1,19 +1,19 @@ // PLEASE DO NOT EDIT THIS FILE, // IF YOU WANT ADD ANY CODE CREATE NEW SCSS INTO client-custom -$xshop-background:#ffffff; -$xshop-primary:#009dff; +$xshop-background:#eeeeee; +$xshop-primary:#6e0000; $xshop-diff:#ffffff; -$xshop-secondary:#0008ff; +$xshop-secondary:#ff0000; $xshop-text:#111111; -$xshop-border-radius:0px; +$xshop-border-radius:7px; $xshop-shadow:2px 2px 4px #777777; :root{ ---xshop-background:#ffffff; ---xshop-primary:#009dff; +--xshop-background:#eeeeee; +--xshop-primary:#6e0000; --xshop-diff:#ffffff; ---xshop-secondary:#0008ff; +--xshop-secondary:#ff0000; --xshop-text:#111111; ---xshop-border-radius:0px; +--xshop-border-radius:7px; --xshop-shadow:2px 2px 4px #777777; } @@ -21,9 +21,4 @@ $xshop-shadow:2px 2px 4px #777777; @import "client-custom/general"; @import "client-custom/zfix"; @import "../views/segments/preloader/PreloaderCircle/PreloaderCircle"; -@import "../views/segments/top/TopSimple/TopSimple"; -@import "../views/segments/slider/SliderSimple/SliderSimple"; -@import "../views/segments/posts/PostsIconSimple/PostsIconSimple"; -@import "../views/segments/index/GradientTextLink/GradientTextLink"; -@import "../views/segments/category/FavProductWithMeta/FavProductWithMeta"; -@import "../views/segments/parallax/ParallaxShort/ParallaxShort"; +@import "../views/segments/posts_page/SimplePostList/SimplePostList"; diff --git a/yarn.lock b/yarn.lock index d6a4ba2..67c58d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -563,10 +563,10 @@ readdirp@~3.6.0: dependencies: picomatch "^2.2.1" -remixicon@^4.2.0: - version "4.2.0" - resolved "https://registry.npmjs.org/remixicon/-/remixicon-4.2.0.tgz" - integrity sha512-MF5wApNveRh3n0iMVM+lr2nSWrj/rBbSD2eWapuD9ReYRGs5naAUR1BqVBCHGqm286FIS6zwwmUf96QjHQ9l4w== +remixicon@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/remixicon/-/remixicon-4.3.0.tgz#61c3fd6ca11149bd05850152f9c08e5f5de7b0c9" + integrity sha512-jRYQ37dTFSkJtvcxwTUAkIiXkYRvA9EDvVuXPNrmt2xf/VS//CRgFtsX2TAFBoQOhh9SDh7l6La4Xu12snEyxg== rollup@^4.13.0: version "4.17.2"