fix: rename entities folder and fix all stager errors after rename

sanua356 · Aug 11, 2024 · 7fe40bf · 7fe40bf
1 parent c44ebb3
commit 7fe40bf
Show file tree

Hide file tree

Showing 54 changed files with 162 additions and 152 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -22,6 +22,7 @@ module.exports = {
       'warn',
       { allowConstantExport: true },
     ],
-    'import/order': ['off']
+    'import/order': ['off'],
+    'import/no-internal-modules': ['off'],
   },
 }
diff --git a/src/app/App.tsx b/src/app/App.tsx
@@ -1,7 +1,7 @@
 import { ToastContainer } from 'react-toastify';
 
-import '@/shared/fonts/zaychik/Zaychik.css';
 import 'react-toastify/dist/ReactToastify.css';
+import 'shared/fonts/zaychik/Zaychik.css';
 
 import { MainProviders } from "./providers";
 import { AppRouter } from "./routers";

diff --git a/src/app/routers/AppRouter.tsx b/src/app/routers/AppRouter.tsx
@@ -3,8 +3,8 @@ import {
 	RouterProvider
 } from "react-router-dom";
 
-import { GamePage } from "@/pages/game";
-import { HomePage } from "@/pages/home";
+import { GamePage } from "pages/game";
+import { HomePage } from "pages/home";
 
 const router = createHashRouter([
 	{

diff --git a/src/app/stores/mainStore.ts b/src/app/stores/mainStore.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { settingsReducer } from "@/entites/settings";
-import { deskReducer } from "@/pages/game";
 import { combineReducers, configureStore } from "@reduxjs/toolkit";
 
+import { settingsReducer } from "entities/settings";
+import { deskReducer } from "pages/game";
+
 const mainReducer = combineReducers({
 	"desk": deskReducer as any,
 	"sound": settingsReducer as any,

diff --git a/src/app/styles/global.css b/src/app/styles/global.css
@@ -5,7 +5,7 @@
 	font-family: 'Zaychik';
 }
 body {
-	cursor: url('@/shared/assets/images/cursor.png'), pointer;
+	cursor: url('shared/assets/images/cursor.png'), pointer;
 }
 .noevents {
 	pointer-events: none;
@@ -15,7 +15,7 @@ body {
 }
 .Toastify__toast {
 	background-color: transparent;
-	background-image: url('@/shared/assets/images/panel.png');
+	background-image: url('shared/assets/images/panel.png');
 	background-size: cover;
 	background-repeat: no-repeat;
 	background-position: center;

diff --git a/src/entites/IconButton/index.ts b/src/entites/IconButton/index.ts
diff --git a/src/entites/gameCards/index.ts b/src/entites/gameCards/index.ts
diff --git a/src/entites/gameCards/lib/constants.ts b/src/entites/gameCards/lib/constants.ts
diff --git a/src/entites/gameCards/lib/index.ts b/src/entites/gameCards/lib/index.ts
diff --git a/src/entites/hatchButton/index.ts → src/entities/hatchButtons/index.ts b/src/entites/hatchButton/index.ts → src/entities/hatchButtons/index.ts
diff --git a/...tes/hatchButton/ui/HatchButton.module.css → ...es/hatchButtons/ui/HatchButton.module.css b/...tes/hatchButton/ui/HatchButton.module.css → ...es/hatchButtons/ui/HatchButton.module.css
@@ -28,7 +28,7 @@
 	left: -10%;
 	width: 140%;
 	height: 140%;
-	background-image: url('@/shared/assets/images/plashka.png');
+	background-image: url('shared/assets/images/plashka.png');
 	background-position: center;
 	background-size: contain;
 	background-repeat: no-repeat;

diff --git a/src/entites/hatchButton/ui/HatchButton.tsx → src/entities/hatchButtons/ui/HatchButton.tsx b/src/entites/hatchButton/ui/HatchButton.tsx → src/entities/hatchButtons/ui/HatchButton.tsx
diff --git a/src/entites/hatchButton/ui/index.ts → src/entities/hatchButtons/ui/index.ts b/src/entites/hatchButton/ui/index.ts → src/entities/hatchButtons/ui/index.ts
diff --git a/src/entites/settings/index.ts → src/entities/settings/index.ts b/src/entites/settings/index.ts → src/entities/settings/index.ts
diff --git a/src/entites/settings/lib/index.ts → src/entities/settings/lib/index.ts b/src/entites/settings/lib/index.ts → src/entities/settings/lib/index.ts
diff --git a/src/entites/settings/lib/translates.ts → src/entities/settings/lib/translates.ts b/src/entites/settings/lib/translates.ts → src/entities/settings/lib/translates.ts
diff --git a/src/entites/settings/lib/useTranslates.ts → src/entities/settings/lib/useTranslates.ts b/src/entites/settings/lib/useTranslates.ts → src/entities/settings/lib/useTranslates.ts
diff --git a/src/entites/settings/model/index.ts → src/entities/settings/model/index.ts b/src/entites/settings/model/index.ts → src/entities/settings/model/index.ts
diff --git a/src/entites/settings/model/settings.slice.ts → ...entities/settings/model/settings.slice.ts b/src/entites/settings/model/settings.slice.ts → ...entities/settings/model/settings.slice.ts
diff --git a/src/entites/settings/model/types.ts → src/entities/settings/model/types.ts b/src/entites/settings/model/types.ts → src/entities/settings/model/types.ts
diff --git a/src/entites/settings/ui/index.ts → src/entities/settings/ui/index.ts b/src/entites/settings/ui/index.ts → src/entities/settings/ui/index.ts
diff --git a/...laySoundButton/PlaySoundButton.module.css → ...laySoundButton/PlaySoundButton.module.css b/...laySoundButton/PlaySoundButton.module.css → ...laySoundButton/PlaySoundButton.module.css
diff --git a/...gs/ui/playSoundButton/PlaySoundButton.tsx → ...gs/ui/playSoundButton/PlaySoundButton.tsx b/...gs/ui/playSoundButton/PlaySoundButton.tsx → ...gs/ui/playSoundButton/PlaySoundButton.tsx
@@ -1,9 +1,9 @@
 import clsx from 'clsx';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { setActivateSound, TSettingsSliceStore } from '@/entites/settings';
-import mutedImage from '@/shared/assets/images/muted.png';
-import soundImage from '@/shared/assets/images/sound.png';
+import { setActivateSound, TSettingsSliceStore } from 'entities/settings';
+import mutedImage from 'shared/assets/images/muted.png';
+import soundImage from 'shared/assets/images/sound.png';
 
 import s from './PlaySoundButton.module.css';
 

diff --git a/...ites/settings/ui/playSoundButton/index.ts → ...ties/settings/ui/playSoundButton/index.ts b/...ites/settings/ui/playSoundButton/index.ts → ...ties/settings/ui/playSoundButton/index.ts
diff --git a/src/pages/game/lib/cards.ts b/src/pages/game/lib/cards.ts
@@ -0,0 +1,53 @@
+import card10 from 'shared/assets/images/cards/10.jpg';
+import card11 from 'shared/assets/images/cards/11.jpg';
+import card2 from 'shared/assets/images/cards/2.jpg';
+import card3 from 'shared/assets/images/cards/3.jpg';
+import card4 from 'shared/assets/images/cards/4.jpg';
+import card5 from 'shared/assets/images/cards/5.jpg';
+import card6 from 'shared/assets/images/cards/6.jpg';
+import card7 from 'shared/assets/images/cards/7.jpg';
+import card8 from 'shared/assets/images/cards/8.jpg';
+import card9 from 'shared/assets/images/cards/9.jpg';
+
+import { TGameCard } from './types';
+
+export const GAME_CARDS: TGameCard[] = [{
+	value: 2,
+	image: card2,
+},
+{
+	value: 3,
+	image: card3,
+},
+{
+	value: 4,
+	image: card4,
+},
+{
+	value: 5,
+	image: card5,
+},
+{
+	value: 6,
+	image: card6,
+},
+{
+	value: 7,
+	image: card7,
+},
+{
+	value: 8,
+	image: card8,
+},
+{
+	value: 9,
+	image: card9,
+},
+{
+	value: 10,
+	image: card10,
+},
+{
+	value: 11,
+	image: card11,
+}]
diff --git a/src/pages/game/lib/constants.ts b/src/pages/game/lib/constants.ts
@@ -1,26 +1,26 @@
-import draw1 from '@/shared/assets/images/draw1.png';
-import lose1 from '@/shared/assets/images/lose1.png';
-import lose2 from '@/shared/assets/images/lose2.png';
-import lose3 from '@/shared/assets/images/lose3.png';
-import lose4 from '@/shared/assets/images/lose4.png';
-import win1 from '@/shared/assets/images/win.png';
-import win2 from '@/shared/assets/images/win2.png';
-import win3 from '@/shared/assets/images/win3.png';
-import win4 from '@/shared/assets/images/win4.png';
-import draw1sound from '@/shared/assets/sounds/endVoices/draw1.ogg';
-import draw2sound from '@/shared/assets/sounds/endVoices/draw2.ogg';
-import draw3sound from '@/shared/assets/sounds/endVoices/draw3.ogg';
-import lose1sound from '@/shared/assets/sounds/endVoices/lose1.ogg';
-import lose2sound from '@/shared/assets/sounds/endVoices/lose2.ogg';
-import lose3sound from '@/shared/assets/sounds/endVoices/lose3.ogg';
-import lose4sound from '@/shared/assets/sounds/endVoices/lose4.ogg';
-import lose5sound from '@/shared/assets/sounds/endVoices/lose5.ogg';
-import lose6sound from '@/shared/assets/sounds/endVoices/lose6.ogg';
-import win1sound from '@/shared/assets/sounds/endVoices/win1.ogg';
-import win2sound from '@/shared/assets/sounds/endVoices/win2.ogg';
-import win3sound from '@/shared/assets/sounds/endVoices/win3.ogg';
-import win4sound from '@/shared/assets/sounds/endVoices/win4.ogg';
-import win5sound from '@/shared/assets/sounds/endVoices/win5.ogg';
+import draw1 from 'shared/assets/images/draw1.png';
+import lose1 from 'shared/assets/images/lose1.png';
+import lose2 from 'shared/assets/images/lose2.png';
+import lose3 from 'shared/assets/images/lose3.png';
+import lose4 from 'shared/assets/images/lose4.png';
+import win1 from 'shared/assets/images/win.png';
+import win2 from 'shared/assets/images/win2.png';
+import win3 from 'shared/assets/images/win3.png';
+import win4 from 'shared/assets/images/win4.png';
+import draw1sound from 'shared/assets/sounds/endVoices/draw1.ogg';
+import draw2sound from 'shared/assets/sounds/endVoices/draw2.ogg';
+import draw3sound from 'shared/assets/sounds/endVoices/draw3.ogg';
+import lose1sound from 'shared/assets/sounds/endVoices/lose1.ogg';
+import lose2sound from 'shared/assets/sounds/endVoices/lose2.ogg';
+import lose3sound from 'shared/assets/sounds/endVoices/lose3.ogg';
+import lose4sound from 'shared/assets/sounds/endVoices/lose4.ogg';
+import lose5sound from 'shared/assets/sounds/endVoices/lose5.ogg';
+import lose6sound from 'shared/assets/sounds/endVoices/lose6.ogg';
+import win1sound from 'shared/assets/sounds/endVoices/win1.ogg';
+import win2sound from 'shared/assets/sounds/endVoices/win2.ogg';
+import win3sound from 'shared/assets/sounds/endVoices/win3.ogg';
+import win4sound from 'shared/assets/sounds/endVoices/win4.ogg';
+import win5sound from 'shared/assets/sounds/endVoices/win5.ogg';
 
 export enum GameStatuses {
 	StepPlayer,

diff --git a/src/pages/game/lib/index.ts b/src/pages/game/lib/index.ts
@@ -1,2 +1,4 @@
+export { GAME_CARDS } from './cards';
 export { END_GAME_STATE, GameStatuses, GameWinners } from './constants';
 export { shuffleArray } from './shuffleArray';
+export type { TGameCard } from './types';
diff --git a/src/entites/gameCards/lib/types.ts → src/pages/game/lib/types.ts b/src/entites/gameCards/lib/types.ts → src/pages/game/lib/types.ts
diff --git a/src/pages/game/model/desk.slice.ts b/src/pages/game/model/desk.slice.ts
@@ -1,8 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 
-import { GAME_CARDS, TGameCard } from '@/entites/gameCards';
-
-import { GameStatuses, GameWinners, shuffleArray } from '../lib';
+import { GAME_CARDS, GameStatuses, GameWinners, shuffleArray, TGameCard } from '../lib';
 import { TGameStatus, TWinnerGame } from './types';
 
 export const GAME_STEP_TRANSLATE = {

diff --git a/src/pages/game/ui/Game.module.css b/src/pages/game/ui/Game.module.css
@@ -2,7 +2,7 @@
 	width: 100%;
 	min-height: 100dvh;
 	overflow: hidden;
-	background-image: url('@/shared/assets/images/fon.png');
+	background-image: url('shared/assets/images/fon.png');
 	background-position: center;
 	background-repeat: no-repeat;
 	background-size: cover;

diff --git a/src/pages/game/ui/Game.tsx b/src/pages/game/ui/Game.tsx
@@ -2,13 +2,13 @@ import { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
 
-import { IconButton } from '@/entites/IconButton';
-import { PlaySoundButton, TSettingsSliceStore } from '@/entites/settings';
-import gameSound from '@/shared/assets/sounds/game.ogg';
+import { PlaySoundButton, TSettingsSliceStore } from 'entities/settings';
+import gameSound from 'shared/assets/sounds/game.ogg';
 
 import { GameStatuses } from '../lib';
 import { startGame, TDeskSliceStore, TGameStatus } from '../model';
 import { EndGameModal } from './endGameModal';
+import { IconButton } from './iconButton';
 import { PlayerActions } from './playerActions';
 import { ViewOpponentCardAmount } from './viewOpponentCardAmount';
 import { ViewOpponentCards } from './viewOpponentCards';

diff --git a/src/pages/game/ui/endGameModal/EndGameModal.module.css b/src/pages/game/ui/endGameModal/EndGameModal.module.css
@@ -5,7 +5,7 @@
 	transform: translate(-50%, -50%);
 	width: 50vw;
 	height: auto;
-	background-image: url('@/shared/assets/images/end.jpg');
+	background-image: url('shared/assets/images/end.jpg');
 	background-repeat: no-repeat;
 	background-size: cover;
 	background-position: center;

diff --git a/src/pages/game/ui/endGameModal/EndGameModal.tsx b/src/pages/game/ui/endGameModal/EndGameModal.tsx
@@ -3,10 +3,10 @@ import { useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
 
-import { HatchButton } from '@/entites/hatchButton';
-import { TSettingsSliceStore, useTranslates } from '@/entites/settings';
-import endGameSound from '@/shared/assets/sounds/end_game.ogg';
-import { Modal } from '@/shared/ui/Modal';
+import { HatchButton } from 'entities/hatchButtons';
+import { TSettingsSliceStore, useTranslates } from 'entities/settings';
+import endGameSound from 'shared/assets/sounds/end_game.ogg';
+import { Modal } from 'shared/ui';
 
 import { END_GAME_STATE, GameWinners } from '../../lib';
 import { setGameWinner, startGame, TDeskSliceStore, TWinnerGame } from '../../model';

diff --git a/...tites/IconButton/ui/IconButton.module.css → .../game/ui/iconButton/IconButton.module.css b/...tites/IconButton/ui/IconButton.module.css → .../game/ui/iconButton/IconButton.module.css
@@ -14,7 +14,7 @@
 	right: 0;
 	left: 0;
 	bottom: 0;
-	background-image: url('@/shared/assets/images/interactive_button.png');
+	background-image: url('shared/assets/images/interactive_button.png');
 	background-repeat: no-repeat;
 	background-size: cover;
 	background-position: center;

diff --git a/src/entites/IconButton/ui/IconButton.tsx → src/pages/game/ui/iconButton/IconButton.tsx b/src/entites/IconButton/ui/IconButton.tsx → src/pages/game/ui/iconButton/IconButton.tsx
@@ -1,7 +1,7 @@
 import clsx from 'clsx';
 
-import backIcon from '@/shared/assets/images/back.png';
-import refreshIcon from '@/shared/assets/images/refresh.png';
+import backIcon from 'shared/assets/images/back.png';
+import refreshIcon from 'shared/assets/images/refresh.png';
 
 import s from './IconButton.module.css';
 

diff --git a/src/entites/IconButton/ui/index.ts → src/pages/game/ui/iconButton/index.ts b/src/entites/IconButton/ui/index.ts → src/pages/game/ui/iconButton/index.ts
diff --git a/src/pages/game/ui/playerActions/PlayerActions.tsx b/src/pages/game/ui/playerActions/PlayerActions.tsx
@@ -1,13 +1,13 @@
 import { useDispatch, useSelector } from 'react-redux';
 import { toast } from 'react-toastify';
 
-import { TGameCard } from '@/entites/gameCards';
-import { HatchButton } from '@/entites/hatchButton';
-import { TSettingsSliceStore, useTranslates } from '@/entites/settings';
-import getCardSound from '@/shared/assets/sounds/get_card.ogg';
-import hoverSound from '@/shared/assets/sounds/hover.ogg';
-import nextStepSound from '@/shared/assets/sounds/next_step.ogg';
-import viewCardsSound from '@/shared/assets/sounds/view_cards.ogg';
+import { TGameCard } from 'entities/gameCards';
+import { HatchButton } from 'entities/hatchButtons';
+import { TSettingsSliceStore, useTranslates } from 'entities/settings';
+import getCardSound from 'shared/assets/sounds/get_card.ogg';
+import hoverSound from 'shared/assets/sounds/hover.ogg';
+import nextStepSound from 'shared/assets/sounds/next_step.ogg';
+import viewCardsSound from 'shared/assets/sounds/view_cards.ogg';
 
 import { GameStatuses } from '../../lib';
 import {

diff --git a/src/pages/game/ui/viewOpponentCardAmount/ViewOpponentCardAmount.tsx b/src/pages/game/ui/viewOpponentCardAmount/ViewOpponentCardAmount.tsx
@@ -1,7 +1,7 @@
 import { useSelector } from 'react-redux';
 
-import { TGameCard } from '@/entites/gameCards';
-import { useTranslates } from '@/entites/settings';
+import { TGameCard } from 'entities/gameCards';
+import { useTranslates } from 'entities/settings';
 
 import { TDeskSliceStore } from '../../model';
 import s from './ViewOpponentCardAmount.module.css';

diff --git a/src/pages/game/ui/viewOpponentCards/ViewOpponentCards.tsx b/src/pages/game/ui/viewOpponentCards/ViewOpponentCards.tsx
@@ -2,10 +2,10 @@ import clsx from 'clsx';
 import { ReactNode, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { TGameCard } from '@/entites/gameCards';
-import { TSettingsSliceStore } from '@/entites/settings';
-import TShirtCard from '@/shared/assets/images/tshirt.png';
-import getCardSound from '@/shared/assets/sounds/get_card.ogg';
+import { TGameCard } from 'entities/gameCards';
+import { TSettingsSliceStore } from 'entities/settings';
+import TShirtCard from 'shared/assets/images/tshirt.png';
+import getCardSound from 'shared/assets/sounds/get_card.ogg';
 
 import { GameStatuses } from '../../lib';
 import {

diff --git a/src/pages/game/ui/viewUnusedCards/ViewUnusedCards.tsx b/src/pages/game/ui/viewUnusedCards/ViewUnusedCards.tsx
@@ -1,11 +1,11 @@
 import clsx from 'clsx';
 import { useSelector } from 'react-redux';
 
-import { TGameCard } from '@/entites/gameCards';
-import { useTranslates } from '@/entites/settings';
-import TShirtCard from '@/shared/assets/images/tshirt_h.png';
-import useDebounce from '@/shared/lib/useDebounce';
+import { useTranslates } from 'entities/settings';
+import TShirtCard from 'shared/assets/images/tshirt_h.png';
+import { useDebounce } from 'shared/lib';
 
+import { TGameCard } from '../../lib';
 import { GAME_STEP_TRANSLATE, TDeskSliceStore, TGameStatus } from '../../model';
 
 import s from './ViewUnusedCards.module.css';