From 8d0f1ee8eae65ba9e11dd6ae159b893d04d3590e Mon Sep 17 00:00:00 2001 From: Alexander <105300503+AlexWayke@users.noreply.github.com> Date: Sun, 13 Apr 2025 12:35:43 +0400 Subject: [PATCH 1/3] Refactor: refactored dir --- miner/.eslintignore => .eslintignore | 0 miner/.gitignore => .gitignore | 0 {miner/.husky => .husky}/pre-commit | 0 miner/README.md => README copy.md | 0 miner/eslint.config.js => eslint.config.js | 0 miner/index.html => index.html | 0 miner/package-lock.json => package-lock.json | 0 miner/package.json => package.json | 0 miner/prettier.config.js => prettier.config.js | 0 {miner/public => public}/favicon_miner.png | Bin {miner/src => src}/app/App.scss | 0 {miner/src => src}/app/App.tsx | 0 {miner/src => src}/entities/layout/index.ts | 0 {miner/src => src}/entities/layout/ui/Layout.tsx | 0 {miner/src => src}/entities/layout/ui/style.scss | 0 {miner/src => src}/entities/playField/index.ts | 0 .../src => src}/entities/playField/ui/PlayField.tsx | 0 {miner/src => src}/entities/playField/ui/style.scss | 0 {miner/src => src}/entities/score/index.ts | 0 {miner/src => src}/entities/score/ui/Score.tsx | 0 {miner/src => src}/entities/score/ui/style.scss | 0 {miner/src => src}/entities/smile/index.ts | 0 {miner/src => src}/entities/smile/ui/Smile.tsx | 0 {miner/src => src}/entities/smile/ui/style.scss | 0 {miner/src => src}/index.css | 0 {miner/src => src}/main.tsx | 0 {miner/src => src}/pages/playPage/ui/PlayPage.tsx | 0 {miner/src => src}/pages/playPage/ui/style.scss | 0 .../src => src}/shared/components/button/index.ts | 0 .../shared/components/button/ui/Button.tsx | 0 .../shared/components/button/ui/style.scss | 0 {miner/src => src}/shared/img/smile_1.svg | 0 {miner/src => src}/shared/img/smile_2.svg | 0 {miner/src => src}/shared/img/smile_3.svg | 0 {miner/src => src}/shared/img/smile_4.svg | 0 {miner/src => src}/shared/utils/generateMatrix.ts | 0 {miner/src => src}/vite-env.d.ts | 0 {miner/src => src}/widgets/index.ts | 0 {miner/src => src}/widgets/miner/index.ts | 0 {miner/src => src}/widgets/miner/ui/Miner.tsx | 0 {miner/src => src}/widgets/miner/ui/style.scss | 0 miner/tsconfig.app.json => tsconfig.app.json | 0 miner/tsconfig.json => tsconfig.json | 0 miner/tsconfig.node.json => tsconfig.node.json | 0 miner/vite.config.ts => vite.config.ts | 0 45 files changed, 0 insertions(+), 0 deletions(-) rename miner/.eslintignore => .eslintignore (100%) rename miner/.gitignore => .gitignore (100%) rename {miner/.husky => .husky}/pre-commit (100%) rename miner/README.md => README copy.md (100%) rename miner/eslint.config.js => eslint.config.js (100%) rename miner/index.html => index.html (100%) rename miner/package-lock.json => package-lock.json (100%) rename miner/package.json => package.json (100%) rename miner/prettier.config.js => prettier.config.js (100%) rename {miner/public => public}/favicon_miner.png (100%) rename {miner/src => src}/app/App.scss (100%) rename {miner/src => src}/app/App.tsx (100%) rename {miner/src => src}/entities/layout/index.ts (100%) rename {miner/src => src}/entities/layout/ui/Layout.tsx (100%) rename {miner/src => src}/entities/layout/ui/style.scss (100%) rename {miner/src => src}/entities/playField/index.ts (100%) rename {miner/src => src}/entities/playField/ui/PlayField.tsx (100%) rename {miner/src => src}/entities/playField/ui/style.scss (100%) rename {miner/src => src}/entities/score/index.ts (100%) rename {miner/src => src}/entities/score/ui/Score.tsx (100%) rename {miner/src => src}/entities/score/ui/style.scss (100%) rename {miner/src => src}/entities/smile/index.ts (100%) rename {miner/src => src}/entities/smile/ui/Smile.tsx (100%) rename {miner/src => src}/entities/smile/ui/style.scss (100%) rename {miner/src => src}/index.css (100%) rename {miner/src => src}/main.tsx (100%) rename {miner/src => src}/pages/playPage/ui/PlayPage.tsx (100%) rename {miner/src => src}/pages/playPage/ui/style.scss (100%) rename {miner/src => src}/shared/components/button/index.ts (100%) rename {miner/src => src}/shared/components/button/ui/Button.tsx (100%) rename {miner/src => src}/shared/components/button/ui/style.scss (100%) rename {miner/src => src}/shared/img/smile_1.svg (100%) rename {miner/src => src}/shared/img/smile_2.svg (100%) rename {miner/src => src}/shared/img/smile_3.svg (100%) rename {miner/src => src}/shared/img/smile_4.svg (100%) rename {miner/src => src}/shared/utils/generateMatrix.ts (100%) rename {miner/src => src}/vite-env.d.ts (100%) rename {miner/src => src}/widgets/index.ts (100%) rename {miner/src => src}/widgets/miner/index.ts (100%) rename {miner/src => src}/widgets/miner/ui/Miner.tsx (100%) rename {miner/src => src}/widgets/miner/ui/style.scss (100%) rename miner/tsconfig.app.json => tsconfig.app.json (100%) rename miner/tsconfig.json => tsconfig.json (100%) rename miner/tsconfig.node.json => tsconfig.node.json (100%) rename miner/vite.config.ts => vite.config.ts (100%) diff --git a/miner/.eslintignore b/.eslintignore similarity index 100% rename from miner/.eslintignore rename to .eslintignore diff --git a/miner/.gitignore b/.gitignore similarity index 100% rename from miner/.gitignore rename to .gitignore diff --git a/miner/.husky/pre-commit b/.husky/pre-commit similarity index 100% rename from miner/.husky/pre-commit rename to .husky/pre-commit diff --git a/miner/README.md b/README copy.md similarity index 100% rename from miner/README.md rename to README copy.md diff --git a/miner/eslint.config.js b/eslint.config.js similarity index 100% rename from miner/eslint.config.js rename to eslint.config.js diff --git a/miner/index.html b/index.html similarity index 100% rename from miner/index.html rename to index.html diff --git a/miner/package-lock.json b/package-lock.json similarity index 100% rename from miner/package-lock.json rename to package-lock.json diff --git a/miner/package.json b/package.json similarity index 100% rename from miner/package.json rename to package.json diff --git a/miner/prettier.config.js b/prettier.config.js similarity index 100% rename from miner/prettier.config.js rename to prettier.config.js diff --git a/miner/public/favicon_miner.png b/public/favicon_miner.png similarity index 100% rename from miner/public/favicon_miner.png rename to public/favicon_miner.png diff --git a/miner/src/app/App.scss b/src/app/App.scss similarity index 100% rename from miner/src/app/App.scss rename to src/app/App.scss diff --git a/miner/src/app/App.tsx b/src/app/App.tsx similarity index 100% rename from miner/src/app/App.tsx rename to src/app/App.tsx diff --git a/miner/src/entities/layout/index.ts b/src/entities/layout/index.ts similarity index 100% rename from miner/src/entities/layout/index.ts rename to src/entities/layout/index.ts diff --git a/miner/src/entities/layout/ui/Layout.tsx b/src/entities/layout/ui/Layout.tsx similarity index 100% rename from miner/src/entities/layout/ui/Layout.tsx rename to src/entities/layout/ui/Layout.tsx diff --git a/miner/src/entities/layout/ui/style.scss b/src/entities/layout/ui/style.scss similarity index 100% rename from miner/src/entities/layout/ui/style.scss rename to src/entities/layout/ui/style.scss diff --git a/miner/src/entities/playField/index.ts b/src/entities/playField/index.ts similarity index 100% rename from miner/src/entities/playField/index.ts rename to src/entities/playField/index.ts diff --git a/miner/src/entities/playField/ui/PlayField.tsx b/src/entities/playField/ui/PlayField.tsx similarity index 100% rename from miner/src/entities/playField/ui/PlayField.tsx rename to src/entities/playField/ui/PlayField.tsx diff --git a/miner/src/entities/playField/ui/style.scss b/src/entities/playField/ui/style.scss similarity index 100% rename from miner/src/entities/playField/ui/style.scss rename to src/entities/playField/ui/style.scss diff --git a/miner/src/entities/score/index.ts b/src/entities/score/index.ts similarity index 100% rename from miner/src/entities/score/index.ts rename to src/entities/score/index.ts diff --git a/miner/src/entities/score/ui/Score.tsx b/src/entities/score/ui/Score.tsx similarity index 100% rename from miner/src/entities/score/ui/Score.tsx rename to src/entities/score/ui/Score.tsx diff --git a/miner/src/entities/score/ui/style.scss b/src/entities/score/ui/style.scss similarity index 100% rename from miner/src/entities/score/ui/style.scss rename to src/entities/score/ui/style.scss diff --git a/miner/src/entities/smile/index.ts b/src/entities/smile/index.ts similarity index 100% rename from miner/src/entities/smile/index.ts rename to src/entities/smile/index.ts diff --git a/miner/src/entities/smile/ui/Smile.tsx b/src/entities/smile/ui/Smile.tsx similarity index 100% rename from miner/src/entities/smile/ui/Smile.tsx rename to src/entities/smile/ui/Smile.tsx diff --git a/miner/src/entities/smile/ui/style.scss b/src/entities/smile/ui/style.scss similarity index 100% rename from miner/src/entities/smile/ui/style.scss rename to src/entities/smile/ui/style.scss diff --git a/miner/src/index.css b/src/index.css similarity index 100% rename from miner/src/index.css rename to src/index.css diff --git a/miner/src/main.tsx b/src/main.tsx similarity index 100% rename from miner/src/main.tsx rename to src/main.tsx diff --git a/miner/src/pages/playPage/ui/PlayPage.tsx b/src/pages/playPage/ui/PlayPage.tsx similarity index 100% rename from miner/src/pages/playPage/ui/PlayPage.tsx rename to src/pages/playPage/ui/PlayPage.tsx diff --git a/miner/src/pages/playPage/ui/style.scss b/src/pages/playPage/ui/style.scss similarity index 100% rename from miner/src/pages/playPage/ui/style.scss rename to src/pages/playPage/ui/style.scss diff --git a/miner/src/shared/components/button/index.ts b/src/shared/components/button/index.ts similarity index 100% rename from miner/src/shared/components/button/index.ts rename to src/shared/components/button/index.ts diff --git a/miner/src/shared/components/button/ui/Button.tsx b/src/shared/components/button/ui/Button.tsx similarity index 100% rename from miner/src/shared/components/button/ui/Button.tsx rename to src/shared/components/button/ui/Button.tsx diff --git a/miner/src/shared/components/button/ui/style.scss b/src/shared/components/button/ui/style.scss similarity index 100% rename from miner/src/shared/components/button/ui/style.scss rename to src/shared/components/button/ui/style.scss diff --git a/miner/src/shared/img/smile_1.svg b/src/shared/img/smile_1.svg similarity index 100% rename from miner/src/shared/img/smile_1.svg rename to src/shared/img/smile_1.svg diff --git a/miner/src/shared/img/smile_2.svg b/src/shared/img/smile_2.svg similarity index 100% rename from miner/src/shared/img/smile_2.svg rename to src/shared/img/smile_2.svg diff --git a/miner/src/shared/img/smile_3.svg b/src/shared/img/smile_3.svg similarity index 100% rename from miner/src/shared/img/smile_3.svg rename to src/shared/img/smile_3.svg diff --git a/miner/src/shared/img/smile_4.svg b/src/shared/img/smile_4.svg similarity index 100% rename from miner/src/shared/img/smile_4.svg rename to src/shared/img/smile_4.svg diff --git a/miner/src/shared/utils/generateMatrix.ts b/src/shared/utils/generateMatrix.ts similarity index 100% rename from miner/src/shared/utils/generateMatrix.ts rename to src/shared/utils/generateMatrix.ts diff --git a/miner/src/vite-env.d.ts b/src/vite-env.d.ts similarity index 100% rename from miner/src/vite-env.d.ts rename to src/vite-env.d.ts diff --git a/miner/src/widgets/index.ts b/src/widgets/index.ts similarity index 100% rename from miner/src/widgets/index.ts rename to src/widgets/index.ts diff --git a/miner/src/widgets/miner/index.ts b/src/widgets/miner/index.ts similarity index 100% rename from miner/src/widgets/miner/index.ts rename to src/widgets/miner/index.ts diff --git a/miner/src/widgets/miner/ui/Miner.tsx b/src/widgets/miner/ui/Miner.tsx similarity index 100% rename from miner/src/widgets/miner/ui/Miner.tsx rename to src/widgets/miner/ui/Miner.tsx diff --git a/miner/src/widgets/miner/ui/style.scss b/src/widgets/miner/ui/style.scss similarity index 100% rename from miner/src/widgets/miner/ui/style.scss rename to src/widgets/miner/ui/style.scss diff --git a/miner/tsconfig.app.json b/tsconfig.app.json similarity index 100% rename from miner/tsconfig.app.json rename to tsconfig.app.json diff --git a/miner/tsconfig.json b/tsconfig.json similarity index 100% rename from miner/tsconfig.json rename to tsconfig.json diff --git a/miner/tsconfig.node.json b/tsconfig.node.json similarity index 100% rename from miner/tsconfig.node.json rename to tsconfig.node.json diff --git a/miner/vite.config.ts b/vite.config.ts similarity index 100% rename from miner/vite.config.ts rename to vite.config.ts From ece39e890e02b65878d8c9bf8f9c77e62969227e Mon Sep 17 00:00:00 2001 From: Alexander <105300503+AlexWayke@users.noreply.github.com> Date: Sun, 13 Apr 2025 12:55:33 +0400 Subject: [PATCH 2/3] Refactor --- {src/shared/img => public}/smile_1.svg | 0 {src/shared/img => public}/smile_2.svg | 0 {src/shared/img => public}/smile_3.svg | 0 {src/shared/img => public}/smile_4.svg | 0 src/entities/smile/ui/Smile.tsx | 42 +++++++++++++------------- 5 files changed, 21 insertions(+), 21 deletions(-) rename {src/shared/img => public}/smile_1.svg (100%) rename {src/shared/img => public}/smile_2.svg (100%) rename {src/shared/img => public}/smile_3.svg (100%) rename {src/shared/img => public}/smile_4.svg (100%) diff --git a/src/shared/img/smile_1.svg b/public/smile_1.svg similarity index 100% rename from src/shared/img/smile_1.svg rename to public/smile_1.svg diff --git a/src/shared/img/smile_2.svg b/public/smile_2.svg similarity index 100% rename from src/shared/img/smile_2.svg rename to public/smile_2.svg diff --git a/src/shared/img/smile_3.svg b/public/smile_3.svg similarity index 100% rename from src/shared/img/smile_3.svg rename to public/smile_3.svg diff --git a/src/shared/img/smile_4.svg b/public/smile_4.svg similarity index 100% rename from src/shared/img/smile_4.svg rename to public/smile_4.svg diff --git a/src/entities/smile/ui/Smile.tsx b/src/entities/smile/ui/Smile.tsx index 832195f..1a6e2d2 100644 --- a/src/entities/smile/ui/Smile.tsx +++ b/src/entities/smile/ui/Smile.tsx @@ -1,21 +1,21 @@ -import "./style.scss"; - -function Smile({ - pause, - dead, - win, -}: { - pause: boolean; - dead: boolean; - win: boolean; -}) { - const currentSmile = win ? "4" : dead ? "1" : pause ? "3" : "2"; - - return ( -