{{ banners }}
+
+ | Заголовок | +Ссылка | +Изображение | +Действия | +
| + + | +
+ |
+
+
+ Минимальный размер: 370×200
+ + Рекомендуется: 740×400 или больше, в тех же пропорциях (1.85:1) + Картинка будет автоматически обрезана под нужный формат. + |
+ + + | +
| + | + + | +||
+
+
+
+
+
+
+
diff --git a/frontend/admin/src/components/Banners/LinkSelector.vue b/frontend/admin/src/components/Banners/LinkSelector.vue
new file mode 100644
index 0000000..807fd15
--- /dev/null
+++ b/frontend/admin/src/components/Banners/LinkSelector.vue
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
diff --git a/frontend/admin/src/components/Banners/ProductSelect.vue b/frontend/admin/src/components/Banners/ProductSelect.vue
new file mode 100644
index 0000000..698837c
--- /dev/null
+++ b/frontend/admin/src/components/Banners/ProductSelect.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Не поддерживается: {{ link.type }}
+
+
+
+
+
+
+
+
diff --git a/frontend/admin/src/components/OcImagePIcker.vue b/frontend/admin/src/components/OcImagePIcker.vue
new file mode 100644
index 0000000..d916798
--- /dev/null
+++ b/frontend/admin/src/components/OcImagePIcker.vue
@@ -0,0 +1,41 @@
+
+
+
+ ![Image]()
+
+
+
+
+
+
diff --git a/frontend/admin/src/main.js b/frontend/admin/src/main.js
new file mode 100644
index 0000000..5dcad83
--- /dev/null
+++ b/frontend/admin/src/main.js
@@ -0,0 +1,14 @@
+import './assets/main.css'
+
+import { createApp } from 'vue'
+import { createPinia } from 'pinia'
+
+import App from './App.vue'
+import router from './router'
+
+const app = createApp(App)
+
+app.use(createPinia())
+app.use(router)
+
+app.mount('#app')
diff --git a/frontend/admin/src/router/index.js b/frontend/admin/src/router/index.js
new file mode 100644
index 0000000..4569e2f
--- /dev/null
+++ b/frontend/admin/src/router/index.js
@@ -0,0 +1,15 @@
+import {createMemoryHistory, createRouter} from 'vue-router'
+import HomeView from '../views/HomeView.vue'
+
+const router = createRouter({
+ history: createMemoryHistory(),
+ routes: [
+ {
+ path: '/',
+ name: 'home',
+ component: HomeView,
+ },
+ ],
+})
+
+export default router
diff --git a/frontend/admin/src/stores/counter.js b/frontend/admin/src/stores/counter.js
new file mode 100644
index 0000000..b6757ba
--- /dev/null
+++ b/frontend/admin/src/stores/counter.js
@@ -0,0 +1,12 @@
+import { ref, computed } from 'vue'
+import { defineStore } from 'pinia'
+
+export const useCounterStore = defineStore('counter', () => {
+ const count = ref(0)
+ const doubleCount = computed(() => count.value * 2)
+ function increment() {
+ count.value++
+ }
+
+ return { count, doubleCount, increment }
+})
diff --git a/frontend/admin/src/views/HomeView.vue b/frontend/admin/src/views/HomeView.vue
new file mode 100644
index 0000000..87ba401
--- /dev/null
+++ b/frontend/admin/src/views/HomeView.vue
@@ -0,0 +1,7 @@
+
+
@@ -442,6 +447,16 @@
{% endfor %}
{% endfor %}
+
+
diff --git a/module/oc_telegram_shop/upload/catalog/controller/extension/tgshop/handle.php b/module/oc_telegram_shop/upload/catalog/controller/extension/tgshop/handle.php
index 3bce5d4..00cdd73 100755
--- a/module/oc_telegram_shop/upload/catalog/controller/extension/tgshop/handle.php
+++ b/module/oc_telegram_shop/upload/catalog/controller/extension/tgshop/handle.php
@@ -94,7 +94,7 @@ class ControllerExtensionTgshopHandle extends Controller
$this->config->get('module_tgshop_feature_vouchers'),
FILTER_VALIDATE_BOOLEAN
),
- 'home_banner_id' => $this->config->get('module_tgshop_home_banner_id'),
+ 'mainpage_banners' => $this->safeJsonDecode($this->config->get('module_tgshop_mainpage_banners'), []),
'texts' => [
'no_more_products' => $this->config->get('module_tgshop_text_no_more_products'),
'empty_cart' => $this->config->get('module_tgshop_text_empty_cart'),
@@ -141,6 +141,15 @@ class ControllerExtensionTgshopHandle extends Controller
return '';
}
+ private function safeJsonDecode(string $input, $default = null)
+ {
+ try {
+ return json_decode($input, true, 512, JSON_THROW_ON_ERROR);
+ } catch (JsonException $e) {
+ return $default;
+ }
+ }
+
public function ya_metrika(): void
{
$raw = html_entity_decode($this->config->get('module_tgshop_yandex_metrika'), ENT_QUOTES | ENT_HTML5);
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ImageTool/ImageTool.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ImageTool/ImageTool.php
index bc592f1..f674b08 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ImageTool/ImageTool.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ImageTool/ImageTool.php
@@ -79,4 +79,44 @@ class ImageTool implements ImageToolInterface
return [$img->getWidth(), $img->getHeight()];
}
+
+ public function cover(string $path, int $width, int $height, string $position = 'center'): ?string
+ {
+ $format = 'webp';
+
+ if (! $width && ! $height) {
+ throw new InvalidArgumentException('Width or height must be set');
+ }
+
+ if (! $path || ! is_file($this->imageDir . $path)) {
+ return null;
+ }
+
+ $realPath = realpath($this->imageDir . $path);
+ if (strpos($realPath, realpath($this->imageDir)) !== 0) {
+ return null; // безопасность
+ }
+
+ $extless = utf8_substr($path, 0, utf8_strrpos($path, '.'));
+ $imageNew = 'cache/' . $extless . '-' . $width . 'x' . $height . '.' . $format;
+
+ $fullNewPath = $this->imageDir . $imageNew;
+ $fullOldPath = $this->imageDir . $path;
+
+ if (! is_file($fullNewPath) || filemtime($fullOldPath) > filemtime($fullNewPath)) {
+ $dirPath = dirname($fullNewPath);
+ if (! is_dir($dirPath)) {
+ mkdir($dirPath, 0777, true);
+ }
+
+ $image = $this->manager->make($fullOldPath)
+ ->fit($width, $height, function ($constraint) {
+ $constraint->upsize();
+ }, $position);
+
+ $image->encode($format, 75)->save($fullNewPath, 75, $format);
+ }
+
+ return rtrim($this->siteUrl, '/') . '/image/' . str_replace($this->imageDir, '', $fullNewPath);
+ }
}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ImageTool/ImageToolInterface.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ImageTool/ImageToolInterface.php
index 6bd6b72..6ef4fb4 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ImageTool/ImageToolInterface.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/ImageTool/ImageToolInterface.php
@@ -14,4 +14,6 @@ interface ImageToolInterface
?string $default = null,
string $format = 'webp'
): ?string;
+
+ public function cover(string $path, int $width, int $height, string $position = 'center'): ?string;
}
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/phpunit.xml b/module/oc_telegram_shop/upload/oc_telegram_shop/phpunit.xml
old mode 100644
new mode 100755
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/BannerHandler.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/BannerHandler.php
index 3a733c5..875243c 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/BannerHandler.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/BannerHandler.php
@@ -25,17 +25,16 @@ class BannerHandler
public function show(): JsonResponse
{
$data = [];
- $bannerId = $this->settings->get('home_banner_id');
+ $slides = $this->settings->get('mainpage_banners', []);
- if ($bannerId) {
- $banner = $this->registry->model_design_banner->getBanner($bannerId);
- foreach ($banner as $index => $result) {
- if (is_file(DIR_IMAGE . $result['image'])) {
+ if ($slides) {
+ foreach ($slides as $index => $slide) {
+ if (is_file(DIR_IMAGE . $slide['image'])) {
$data[] = [
'id' => $index,
- 'title' => $result['title'],
- 'link' => rtrim($this->settings->get('base_url'), '/') . '/' . $result['link'],
- 'image' => $this->imageTool->resize($result['image'], null, 200),
+ 'title' => $slide['title'],
+ 'link' => $slide['link'],
+ 'image' => $this->imageTool->cover($slide['image'], 1110, 600),
];
}
}
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
index 33fca1c..b5c2c1d 100755
--- a/scripts/ci/build.sh
+++ b/scripts/ci/build.sh
@@ -29,14 +29,22 @@ if [ -z "$SRC_PATH" ]; then
exit 1
fi
-echo "Build SPA..."
-cd "${SRC_PATH}/spa"
+echo "Build Telecart Frontend..."
+cd "${SRC_PATH}/frontend/spa"
bun install
bun run build
echo "Move manifest file"
cp "${SRC_PATH}/module/oc_telegram_shop/upload/image/catalog/tgshopspa/.vite/manifest.json" "${SRC_PATH}/module/oc_telegram_shop/upload/image/catalog/tgshopspa/manifest.json"
+echo "Build Admin Frontend"
+cd "${SRC_PATH}/frontend/admin"
+bun install
+bun run build
+
+echo "Move manifest file"
+cp "${SRC_PATH}/module/oc_telegram_shop/upload/admin/view/javascript/.vite/manifest.json" "${SRC_PATH}/module/oc_telegram_shop/upload/admin/view/javascript/manifest.json"
+
cd - > /dev/null
echo "Install Composer dependencies."