From 9f9daf0803d1642b84ff99cc276f015ec98e1d1c Mon Sep 17 00:00:00 2001 From: kazachilo Date: Thu, 10 Apr 2025 17:40:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=D0=B7=D0=BE=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B2=20=D0=BF=D0=BE=D0=B4?= =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B5=20=D0=BC=D0=B5=D0=BC?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/index.ts | 26 +++++++++++++++++++++++++- src/assets/memes.ts | 22 ++++++++++++---------- src/config/homeScreen.ts | 20 ++++++++++---------- 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/src/assets/index.ts b/src/assets/index.ts index 5786166..bcca9c2 100644 --- a/src/assets/index.ts +++ b/src/assets/index.ts @@ -35,6 +35,18 @@ import shieldIcon from './shield-icon.png'; import reactLogo from './react.svg'; import tokenIcon from './token_ico.png'; +// Импорты изображений для мемов +import meme1 from './meme/1_250x.png'; +import meme2 from './meme/2_250x.png'; +import meme3 from './meme/3_250x.png'; +import meme4 from './meme/4_250x.png'; +import meme5 from './meme/5_250x.png'; +import meme6 from './meme/6_250x.png'; +import meme7 from './meme/7_250x.png'; +import meme8 from './meme/8_250x.png'; +import meme9 from './meme/9_250x.png'; +import meme10 from './meme/10_250x.png'; + // Импорты изображений для эмоций import emoTrophy from './emo/1.png'; import emoTeddyBear from './emo/2.png'; @@ -147,5 +159,17 @@ export const images = { emoRider, emoFire, emoDrStrange, - emoCaptainAmerica + emoCaptainAmerica, + + // Изображения для мемов + meme1, + meme2, + meme3, + meme4, + meme5, + meme6, + meme7, + meme8, + meme9, + meme10 }; diff --git a/src/assets/memes.ts b/src/assets/memes.ts index 011529a..af0e6f1 100644 --- a/src/assets/memes.ts +++ b/src/assets/memes.ts @@ -1,3 +1,5 @@ +import { images } from './index'; + // Интерфейс для данных мема export interface MemeData { id: string; @@ -13,60 +15,60 @@ export const memes: MemeData[] = [ id: 'meme1', name: 'Мем 1', description: 'Описание мема 1', - thumbnailUrl: '/src/assets/meme/1_250x.png' + thumbnailUrl: images.meme1 }, { id: 'meme2', name: 'Мем 2', description: 'Описание мема 2', - thumbnailUrl: '/src/assets/meme/2_250x.png' + thumbnailUrl: images.meme2 }, { id: 'meme3', name: 'Мем 3', description: 'Описание мема 3', - thumbnailUrl: '/src/assets/meme/3_250x.png' + thumbnailUrl: images.meme3 }, { id: 'meme4', name: 'Мем 4', description: 'Описание мема 4', - thumbnailUrl: '/src/assets/meme/4_250x.png' + thumbnailUrl: images.meme4 }, { id: 'meme5', name: 'Мем 5', description: 'Описание мема 5', - thumbnailUrl: '/src/assets/meme/5_250x.png' + thumbnailUrl: images.meme5 }, { id: 'meme6', name: 'Мем 6', description: 'Описание мема 6', - thumbnailUrl: '/src/assets/meme/6_250x.png' + thumbnailUrl: images.meme6 }, { id: 'meme7', name: 'Мем 7', description: 'Описание мема 7', - thumbnailUrl: '/src/assets/meme/7_250x.png' + thumbnailUrl: images.meme7 }, { id: 'meme8', name: 'Мем 8', description: 'Описание мема 8', - thumbnailUrl: '/src/assets/meme/8_250x.png' + thumbnailUrl: images.meme8 }, { id: 'meme9', name: 'Мем 9', description: 'Описание мема 9', - thumbnailUrl: '/src/assets/meme/9_250x.png' + thumbnailUrl: images.meme9 }, { id: 'meme10', name: 'Мем 10', description: 'Описание мема 10', - thumbnailUrl: '/src/assets/meme/10_250x.png' + thumbnailUrl: images.meme10 } ]; diff --git a/src/config/homeScreen.ts b/src/config/homeScreen.ts index 1ca7a6d..2349375 100644 --- a/src/config/homeScreen.ts +++ b/src/config/homeScreen.ts @@ -244,7 +244,7 @@ export const homeScreenConfig: AppConfig = { colors: ['#FF69B4', '#FF1493'] }, title: 'Мем 1', - imageUrl: '/src/assets/meme/1_250x.png', + imageUrl: images.meme1, action: { type: 'selectMeme', value: 'meme1' @@ -258,7 +258,7 @@ export const homeScreenConfig: AppConfig = { colors: ['#2B9CFF', '#1E88E5'] }, title: 'Мем 2', - imageUrl: '/src/assets/meme/2_250x.png', + imageUrl: images.meme2, action: { type: 'selectMeme', value: 'meme2' @@ -272,7 +272,7 @@ export const homeScreenConfig: AppConfig = { colors: ['#4CAF50', '#45A049'] }, title: 'Мем 3', - imageUrl: '/src/assets/meme/3_250x.png', + imageUrl: images.meme3, action: { type: 'selectMeme', value: 'meme3' @@ -286,7 +286,7 @@ export const homeScreenConfig: AppConfig = { colors: ['#9C27B0', '#7B1FA2'] }, title: 'Мем 4', - imageUrl: '/src/assets/meme/4_250x.png', + imageUrl: images.meme4, action: { type: 'selectMeme', value: 'meme4' @@ -300,7 +300,7 @@ export const homeScreenConfig: AppConfig = { colors: ['#FF5722', '#F4511E'] }, title: 'Мем 5', - imageUrl: '/src/assets/meme/5_250x.png', + imageUrl: images.meme5, action: { type: 'selectMeme', value: 'meme5' @@ -314,7 +314,7 @@ export const homeScreenConfig: AppConfig = { colors: ['#FF9800', '#FB8C00'] }, title: 'Мем 6', - imageUrl: '/src/assets/meme/6_250x.png', + imageUrl: images.meme6, action: { type: 'selectMeme', value: 'meme6' @@ -328,7 +328,7 @@ export const homeScreenConfig: AppConfig = { colors: ['#607D8B', '#455A64'] }, title: 'Мем 7', - imageUrl: '/src/assets/meme/7_250x.png', + imageUrl: images.meme7, action: { type: 'selectMeme', value: 'meme7' @@ -342,7 +342,7 @@ export const homeScreenConfig: AppConfig = { colors: ['#795548', '#5D4037'] }, title: 'Мем 8', - imageUrl: '/src/assets/meme/8_250x.png', + imageUrl: images.meme8, action: { type: 'selectMeme', value: 'meme8' @@ -356,7 +356,7 @@ export const homeScreenConfig: AppConfig = { colors: ['#009688', '#00796B'] }, title: 'Мем 9', - imageUrl: '/src/assets/meme/9_250x.png', + imageUrl: images.meme9, action: { type: 'selectMeme', value: 'meme9' @@ -370,7 +370,7 @@ export const homeScreenConfig: AppConfig = { colors: ['#673AB7', '#512DA8'] }, title: 'Мем 10', - imageUrl: '/src/assets/meme/10_250x.png', + imageUrl: images.meme10, action: { type: 'selectMeme', value: 'meme10'