diff --git a/.env.production b/.env.production
index f0e99f6625df2d968cf36b92e7246f607629f26f..5b7a0837d8905fc101cdb1c9327b077f842f990c 100644
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,6 @@
DB_HOST=https://frutella-api.noodev.ru/api/v1
AUTH_TRUST_HOST=true
-HOST=https://fruit-moments.food.ru/
+HOST=https://fruit-moments.food.ru
AUTH_SECRET=OIU5S5HqQE7jZMA95BLPjqIZyz8EmXPruhvZyp5PuSU=
diff --git a/app/favicon.ico b/app/favicon.ico
index 44b063475488995135c0976a9900c0411bce9d3a..ea1553f2ece03f93df947bbc9a3c64936875845a 100644
Binary files a/app/favicon.ico and b/app/favicon.ico differ
diff --git a/docker-compose.prod.ci.yml b/docker-compose.prod.ci.yml
index a3f8db4ec0309230fe83bb9a3629dc7b80eea217..3c4428ff3b8ae64dc8b020bd538b95eb3c120e92 100644
--- a/docker-compose.prod.ci.yml
+++ b/docker-compose.prod.ci.yml
@@ -1,6 +1,6 @@
services:
client:
- restart: always
+ restart: unless-stopped
container_name: ${PROJECT_PREFIX}_client
image: $CI_REGISTRY_IMAGE:latest
volumes:
diff --git a/env.example b/env.example
new file mode 100644
index 0000000000000000000000000000000000000000..41e5262370433371cd1c92fba0700cc885507197
--- /dev/null
+++ b/env.example
@@ -0,0 +1,7 @@
+DB_HOST=
+AUTH_TRUST_HOST=
+HOST=
+AUTH_SECRET=
+
+
+
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
index adf68f9d08156e9c769563b3a46e3c9352bc3f54..bb4939f1b0bbf0122407a793e6556ad2d1217f50 100644
Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ
diff --git a/public/favicon-96x96.png b/public/favicon-96x96.png
index 132763cb668f14480601b807a1e9c89be698935e..cb646118f4c504e9d30cc6843b74a368ef84368f 100644
Binary files a/public/favicon-96x96.png and b/public/favicon-96x96.png differ
diff --git a/public/favicon.ico b/public/favicon.ico
index 9b729758426e37fb847a561152733d858ee7c313..ea1553f2ece03f93df947bbc9a3c64936875845a 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/favicon.svg b/public/favicon.svg
index d6ed30f26894de3c1c3f447bdca83dbd3ac1d4ac..c704620967bb68b2fdab42e2fcee62174c70caac 100644
--- a/public/favicon.svg
+++ b/public/favicon.svg
@@ -1,3 +1,3 @@
-
\ No newline at end of file
diff --git a/public/media/about/b-f-lg.png b/public/media/about/b-f-lg.png
index 5b4f24e0331d00297b2356d9ace5e16ff191053a..a35cf3f127954bfe6bf3656e32acb94cbccd3094 100644
Binary files a/public/media/about/b-f-lg.png and b/public/media/about/b-f-lg.png differ
diff --git a/public/media/about/b-f-sm.png b/public/media/about/b-f-sm.png
index 7fdda4c554168a646f0ac6cbc505a58dcc7b6f90..06abc90d92d013bbf1ea0cca4fc691fb3bc0e46f 100644
Binary files a/public/media/about/b-f-sm.png and b/public/media/about/b-f-sm.png differ
diff --git a/public/media/about/b-l-lg.png b/public/media/about/b-l-lg.png
index 2cfad1373d56237fc567de89423811d510cff84d..08dcf780498890b7c9316e5a3956e6645cda2ceb 100644
Binary files a/public/media/about/b-l-lg.png and b/public/media/about/b-l-lg.png differ
diff --git a/public/media/about/b-r-lg.png b/public/media/about/b-r-lg.png
index 38eec342002ee24a533516e10f69e48e72978671..fbc8cfe48c9b5ce097d0cb5761fe09c9bdc63de4 100644
Binary files a/public/media/about/b-r-lg.png and b/public/media/about/b-r-lg.png differ
diff --git a/public/media/about/b-r-sm.png b/public/media/about/b-r-sm.png
index f00386236f37eb52c789655eed9e1685436fc85d..abeb4492b7ef38a9e07f5fdb2c766a07bd2163dd 100644
Binary files a/public/media/about/b-r-sm.png and b/public/media/about/b-r-sm.png differ
diff --git a/public/media/cards/frame-closed.png b/public/media/cards/frame-closed.png
index 954d289b932cccb89ea86dad243510f634761f4e..e2fc37c6e6d5c9fe3e3a5fe7ca0630b33178600d 100644
Binary files a/public/media/cards/frame-closed.png and b/public/media/cards/frame-closed.png differ
diff --git a/public/media/cards/main-card.jpg b/public/media/cards/main-card.jpg
index 8ad0bf484480e683725e5b49f0394bec14fd5833..cf8110f67b16ae99867aaaab16a2b4678ec1761b 100644
Binary files a/public/media/cards/main-card.jpg and b/public/media/cards/main-card.jpg differ
diff --git a/public/media/cards/quiz/1.jpg b/public/media/cards/quiz/1.jpg
index daa8fe68bf7cee398652983859ab781d27e6d6ca..a5c4653bd0a421296185ebc07a12a5e65f44a56e 100644
Binary files a/public/media/cards/quiz/1.jpg and b/public/media/cards/quiz/1.jpg differ
diff --git a/public/media/cards/quiz/2.jpg b/public/media/cards/quiz/2.jpg
index ce94b6629a134a717fd66f3c0e645e29310d8082..251f974ee7f3d8ad3ef64b2ecb076d2c74eebf4f 100644
Binary files a/public/media/cards/quiz/2.jpg and b/public/media/cards/quiz/2.jpg differ
diff --git a/public/media/cards/quiz/3.jpg b/public/media/cards/quiz/3.jpg
index af0b26ce2a7bb082793441afce1c24cb41a3c947..0ba872db8227a348b24898099c0c8d558e7887ad 100644
Binary files a/public/media/cards/quiz/3.jpg and b/public/media/cards/quiz/3.jpg differ
diff --git a/public/media/cards/quiz/4.jpg b/public/media/cards/quiz/4.jpg
index 4088e6b3cf4b4ac1ffee6640dfd3fe996d33eecc..837d12d3d9fd5dc1979703e8d93d4001a3b53d65 100644
Binary files a/public/media/cards/quiz/4.jpg and b/public/media/cards/quiz/4.jpg differ
diff --git a/public/media/cards/quiz/5.jpg b/public/media/cards/quiz/5.jpg
index 73214309336dc827d4e99c37f1eed021310d7863..dd3932622fee0364fe5239fb329316bda83ab052 100644
Binary files a/public/media/cards/quiz/5.jpg and b/public/media/cards/quiz/5.jpg differ
diff --git a/public/media/cards/quiz/6.jpg b/public/media/cards/quiz/6.jpg
index e71f8cb84a6355ecc999d823ceed4e6be1e40b5a..f360cd44b0a08305f7d0438028bc12ece9f9ada2 100644
Binary files a/public/media/cards/quiz/6.jpg and b/public/media/cards/quiz/6.jpg differ
diff --git a/public/media/cards/quiz/7.jpg b/public/media/cards/quiz/7.jpg
index c5381332bbd2133c1d8561f69db1b5bdd2b6b934..8f4130be9f8d3c647ec8a8319def2fd211f50ca2 100644
Binary files a/public/media/cards/quiz/7.jpg and b/public/media/cards/quiz/7.jpg differ
diff --git a/public/media/cards/quiz/8.jpg b/public/media/cards/quiz/8.jpg
index 6cb5901d12c95ecf7fcac6b5cdaf52081322a5c2..bc75cfb54c174c7ffd7d4ad0697e2665b8858fbb 100644
Binary files a/public/media/cards/quiz/8.jpg and b/public/media/cards/quiz/8.jpg differ
diff --git a/public/media/faq/b-f-lg.png b/public/media/faq/b-f-lg.png
index bd6521ba85c24545311c3c58f705ef06a5690f8f..4de915bcedf61063759fb28d16281264535bee19 100644
Binary files a/public/media/faq/b-f-lg.png and b/public/media/faq/b-f-lg.png differ
diff --git a/public/media/faq/b-f-sm.png b/public/media/faq/b-f-sm.png
index 7ad81f8e09db6929eac2190309b825f5a02cecb3..60987326ecffc4412393b62a87dbe2e7df72e0ae 100644
Binary files a/public/media/faq/b-f-sm.png and b/public/media/faq/b-f-sm.png differ
diff --git a/public/media/faq/b-r-sm.png b/public/media/faq/b-r-sm.png
index f85ab46d438d6fe1beee3931360f0e94938c1556..bfc3c7ad7242f6d801bd1883f24f85380e09e64b 100644
Binary files a/public/media/faq/b-r-sm.png and b/public/media/faq/b-r-sm.png differ
diff --git a/public/media/faq/top-slime.png b/public/media/faq/top-slime.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ac5c9c2abd10548ef9ed7e078aae388cdfa89e2
Binary files /dev/null and b/public/media/faq/top-slime.png differ
diff --git a/public/media/home/b-f-sm.png b/public/media/home/b-f-sm.png
new file mode 100644
index 0000000000000000000000000000000000000000..41904939d94d421dc2d9b1c20a1a030890045a3e
Binary files /dev/null and b/public/media/home/b-f-sm.png differ
diff --git a/public/media/home/b-lg.png b/public/media/home/b-lg.png
index 428cd959729f0d3b5ab8d0d1fc6df92dabd2ebd9..efd6811c92f7a68cb1a36f2dfdf4d3292c50727d 100644
Binary files a/public/media/home/b-lg.png and b/public/media/home/b-lg.png differ
diff --git a/public/media/home/b-sm.png b/public/media/home/b-sm.png
index 0267f143c2451e78693693fa7c86a2bd6d2dfec3..9c6a817b312465ba61ce24770e6aa88586fc145a 100644
Binary files a/public/media/home/b-sm.png and b/public/media/home/b-sm.png differ
diff --git a/public/media/home/f-lg.png b/public/media/home/f-lg.png
index ead2419d1a964621899ffb5d39dff1724c1d2bf2..2780cacc3c1b5e2685936e8fcd36e391cc096ef1 100644
Binary files a/public/media/home/f-lg.png and b/public/media/home/f-lg.png differ
diff --git a/public/media/home/f-sm.png b/public/media/home/f-sm.png
index 931ae5ca573eed4cead5df102b2e8e5c626d3b1c..8a165e166f6268d761a1aae87a0765bbcc184808 100644
Binary files a/public/media/home/f-sm.png and b/public/media/home/f-sm.png differ
diff --git a/public/media/home/h-lg.png b/public/media/home/h-lg.png
index 756f79fc560522bd7243e1cbf2c183e4b7320aed..9ed01bbf688f885e03ec60f21d7d2d5c28e0211e 100644
Binary files a/public/media/home/h-lg.png and b/public/media/home/h-lg.png differ
diff --git a/public/media/home/h-sm.png b/public/media/home/h-sm.png
index f1c8290adb4eeed5f8d399f1fb0ba77c40ffa525..fda8cd4cb9762330926a5bdc00c8df7cd0bddde8 100644
Binary files a/public/media/home/h-sm.png and b/public/media/home/h-sm.png differ
diff --git a/public/media/home/sketch.png b/public/media/home/sketch.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d0488489b51e44077aecf19e667201e66903715
Binary files /dev/null and b/public/media/home/sketch.png differ
diff --git a/public/media/layout/footer-desktop.png b/public/media/layout/footer-desktop.png
index b047e6f5676641c7096f470f9f4ed5060d25c21b..b855327e7aab426c3559106c532a0eace6748229 100644
Binary files a/public/media/layout/footer-desktop.png and b/public/media/layout/footer-desktop.png differ
diff --git a/public/media/layout/l-lg.png b/public/media/layout/l-lg.png
index fe970127b2c947ea614606c363ce1f97e3a3bdc4..65b05ee6020262df97f5fe5a17341df895dc1d3a 100644
Binary files a/public/media/layout/l-lg.png and b/public/media/layout/l-lg.png differ
diff --git a/public/media/layout/l-sm.png b/public/media/layout/l-sm.png
index 85a8127ffe10e56268e8a71b8aaa598742f9fe36..3cfb63047df4cba6d920ae16d1b393e9fa709edf 100644
Binary files a/public/media/layout/l-sm.png and b/public/media/layout/l-sm.png differ
diff --git a/public/media/layout/t-sm.png b/public/media/layout/t-sm.png
index f51c7e5d379558ab6d6c198269691dcb70ff2d75..b9cf34ca0592a8dec4b608c79e9ae594cc3f055c 100644
Binary files a/public/media/layout/t-sm.png and b/public/media/layout/t-sm.png differ
diff --git a/public/media/layout/top-slime.png b/public/media/layout/top-slime.png
index 1dc5b67a4391c4389524da3a2625d603ccaf05a3..cd4943379eac6578b053537565e0d961e82756c1 100644
Binary files a/public/media/layout/top-slime.png and b/public/media/layout/top-slime.png differ
diff --git a/public/media/menu/j.png b/public/media/menu/j.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e22f8b36ffef16e689d75139ffe80ba8b46bc27
Binary files /dev/null and b/public/media/menu/j.png differ
diff --git a/public/media/not-found/b-f-lg.png b/public/media/not-found/b-f-lg.png
index 75586297c05807e597752e0bafe2c7922b4f7880..4de915bcedf61063759fb28d16281264535bee19 100644
Binary files a/public/media/not-found/b-f-lg.png and b/public/media/not-found/b-f-lg.png differ
diff --git a/public/media/not-found/b-f-sm.png b/public/media/not-found/b-f-sm.png
new file mode 100644
index 0000000000000000000000000000000000000000..60987326ecffc4412393b62a87dbe2e7df72e0ae
Binary files /dev/null and b/public/media/not-found/b-f-sm.png differ
diff --git a/public/media/prize/prize-lg.png b/public/media/prize/prize-lg.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecbfd46a10c1ad9d028799a5ead03315ce2f4997
Binary files /dev/null and b/public/media/prize/prize-lg.png differ
diff --git a/public/media/prize/prize-sm.png b/public/media/prize/prize-sm.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ccb7a0c3a60883ab1097a826164968542213e58
Binary files /dev/null and b/public/media/prize/prize-sm.png differ
diff --git a/public/media/prize/prize.png b/public/media/prize/prize.png
deleted file mode 100644
index bbf273cb0cb3db7a34718cff6edc01d2175ec2d5..0000000000000000000000000000000000000000
Binary files a/public/media/prize/prize.png and /dev/null differ
diff --git a/public/media/prize/underline-lg.png b/public/media/prize/underline-lg.png
new file mode 100644
index 0000000000000000000000000000000000000000..68cd3648ab5aecb9528a3702fbf28c1ff4b4af4d
Binary files /dev/null and b/public/media/prize/underline-lg.png differ
diff --git a/public/media/prize/underline-sm.png b/public/media/prize/underline-sm.png
new file mode 100644
index 0000000000000000000000000000000000000000..03440df83ee492eda1a7c07c63f9b58624b77ba5
Binary files /dev/null and b/public/media/prize/underline-sm.png differ
diff --git a/public/media/prize/underline.png b/public/media/prize/underline.png
deleted file mode 100644
index 3273ba2b4f1d92e39542c060d245bed6b5e4a80f..0000000000000000000000000000000000000000
Binary files a/public/media/prize/underline.png and /dev/null differ
diff --git a/public/media/step/arrow-2.png b/public/media/step/arrow-2.png
index f39ea2aab31f040375b3848347bf318dedad2c05..bd4babc00e7567a003a90ceae7dc3cc11ea7ce37 100644
Binary files a/public/media/step/arrow-2.png and b/public/media/step/arrow-2.png differ
diff --git a/public/media/utils/arrow-link-video-trigger.png b/public/media/utils/arrow-link-video-trigger.png
new file mode 100644
index 0000000000000000000000000000000000000000..5122b490b96fea337e10251d22b502add5c7fa74
Binary files /dev/null and b/public/media/utils/arrow-link-video-trigger.png differ
diff --git a/public/media/utils/navlink-line-dark.png b/public/media/utils/navlink-line-dark.png
index d98342b38484fd1dd5e812e8310241ca2f38d4dc..271b953d125ee592b69f5f741ba78d01c2747e9e 100644
Binary files a/public/media/utils/navlink-line-dark.png and b/public/media/utils/navlink-line-dark.png differ
diff --git a/public/media/utils/package-sm.png b/public/media/utils/package-sm.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b0570dbb9f557bfbe59459a78b23736e97f1c26
Binary files /dev/null and b/public/media/utils/package-sm.png differ
diff --git a/public/media/utils/package.png b/public/media/utils/package.png
index bc3ac9b3c986eff059fc5296bd9e681bd1479b4e..87ae65649127a5f08b8f76ec84e3f6f691dcf433 100644
Binary files a/public/media/utils/package.png and b/public/media/utils/package.png differ
diff --git a/public/media/utils/play-disabled.svg b/public/media/utils/play-disabled.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6c74050b2b0ff4afb3b48d79f365331cb98c5e0c
--- /dev/null
+++ b/public/media/utils/play-disabled.svg
@@ -0,0 +1,8 @@
+
diff --git a/public/media/utils/play.svg b/public/media/utils/play.svg
new file mode 100644
index 0000000000000000000000000000000000000000..98c055bfa14c24b2fb2e761eb65991008adb9324
--- /dev/null
+++ b/public/media/utils/play.svg
@@ -0,0 +1,7 @@
+
diff --git a/public/media/utils/video-preview.jpg b/public/media/utils/video-preview.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..39fb3abd08aa72d66097608092f66116b9fe80de
Binary files /dev/null and b/public/media/utils/video-preview.jpg differ
diff --git a/public/media/video/video.mp4 b/public/media/video/video.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..060446e62e179508961f573b6b16017c4c47629d
Binary files /dev/null and b/public/media/video/video.mp4 differ
diff --git a/public/rules/Rules_promotion_competition_Fruittella_Creative_family_competition.pdf b/public/rules/Rules_promotion_competition_Fruittella_Creative_family_competition.pdf
index e5af3a061d4a94844fd648d9cfe6b108b8419b5c..ea78197aafd31d8a973fec66e4273291f81f47ad 100644
Binary files a/public/rules/Rules_promotion_competition_Fruittella_Creative_family_competition.pdf and b/public/rules/Rules_promotion_competition_Fruittella_Creative_family_competition.pdf differ
diff --git a/public/rules/User_agreement.pdf b/public/rules/User_agreement.pdf
index 945eda1f52469deec216da9e3d7c7302f8e9d86a..1f705d460e17b6dac3a7d01a627706a93639e99f 100644
Binary files a/public/rules/User_agreement.pdf and b/public/rules/User_agreement.pdf differ
diff --git a/public/sharing.png b/public/sharing.png
new file mode 100644
index 0000000000000000000000000000000000000000..b039a692b7726c395061257c9aa55bc4bec12e32
Binary files /dev/null and b/public/sharing.png differ
diff --git a/public/web-app-manifest-192x192.png b/public/web-app-manifest-192x192.png
index 5996ea61bc3467790742577e295e8f1516022c5b..cb646118f4c504e9d30cc6843b74a368ef84368f 100644
Binary files a/public/web-app-manifest-192x192.png and b/public/web-app-manifest-192x192.png differ
diff --git a/public/web-app-manifest-512x512.png b/public/web-app-manifest-512x512.png
index 9a33577f7311e4ac849542a5a7880a0ad6eecf19..cb646118f4c504e9d30cc6843b74a368ef84368f 100644
Binary files a/public/web-app-manifest-512x512.png and b/public/web-app-manifest-512x512.png differ
diff --git a/src/app/appEntry.tsx b/src/app/appEntry.tsx
index 294807aabd237af2fbb5fe3680ed63a0a039321e..e64d39fbb1c772ad97e377495b6b542a3782863a 100644
--- a/src/app/appEntry.tsx
+++ b/src/app/appEntry.tsx
@@ -1,40 +1,52 @@
-import {QueryClientProvider} from "@/app/providers";
-import {Fragment, ReactNode} from "react";
-import {BaseLayout} from "@/app/layouts/base-layout";
-import {ModalView} from "@/feature/modal-view";
-import {SignUp} from "@/widgets/sign-up";
-import {UploadError, UploadSuccess, AuthError} from "@/widgets/modal-status";
-import {CookieAlert} from "@/feature/cookie-alert";
-import {NextAuthProvider} from "@/app/providers/NextAuthProvider";
-import {QuizDetailed} from "@/widgets/quiz-detailed/ui/QuizDetailed";
-import {UploadFile} from "@/widgets/upload-file";
-import {PreviewFile} from "@/widgets/preview-file";
+import { QueryClientProvider } from "@/app/providers";
+import { Fragment, ReactNode } from "react";
+import { BaseLayout } from "@/app/layouts/base-layout";
+import { ModalView } from "@/feature/modal-view";
+import { SignUp } from "@/widgets/sign-up";
+import { UploadError, UploadSuccess, AuthError } from "@/widgets/modal-status";
+import { CookieAlert } from "@/feature/cookie-alert";
+import { NextAuthProvider } from "@/app/providers/NextAuthProvider";
+import { QuizDetailed } from "@/widgets/quiz-detailed/ui/QuizDetailed";
+import { UploadFile } from "@/widgets/upload-file";
+import { PreviewFile } from "@/widgets/preview-file";
+import { VideoModal } from "@/widgets/video-modal";
export default function RootLayout(props: Readonly<{ children: ReactNode }>) {
+ const { children } = props;
- const {children} = props;
+ return (
+
+
+
+
+
+
+
+
- return (
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-