From 688e19e2f1cf3a1e825944ba514d1ce06cc53989 Mon Sep 17 00:00:00 2001 From: Halit Aksoy Date: Thu, 14 Jul 2022 13:38:00 +0300 Subject: [PATCH] reorder some files --- src/App.tsx | 4 ++-- src/animation/PitAnimator.ts | 2 +- src/components/Button.tsx | 2 +- src/components/FloatingPanel.tsx | 2 +- src/components/HeaderBar.tsx | 2 +- src/components/InfoPanel.tsx | 2 +- src/components/board/BoardView.tsx | 2 +- src/components/board/StoreView.tsx | 2 +- src/{ => const}/channel_names.ts | 0 src/{ => context}/context.tsx | 10 +++++----- src/{ => routes}/Home.tsx | 26 +++++++++++++------------- 11 files changed, 27 insertions(+), 27 deletions(-) rename src/{ => const}/channel_names.ts (100%) rename src/{ => context}/context.tsx (63%) rename src/{ => routes}/Home.tsx (90%) diff --git a/src/App.tsx b/src/App.tsx index a89acdd..4879b0c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { render } from 'react-dom'; -import { initContext } from './context'; +import { initContext } from './context/context'; -import Home from './Home'; +import Home from './routes/Home'; initContext(); diff --git a/src/animation/PitAnimator.ts b/src/animation/PitAnimator.ts index b657833..38cf540 100644 --- a/src/animation/PitAnimator.ts +++ b/src/animation/PitAnimator.ts @@ -9,7 +9,7 @@ import { GAME_STEP_DOUBLE_STONE_IN_PIT, } from "mancala.js"; import { v4 } from "uuid"; -import { Context } from "../context"; +import { Context } from "../context/context"; import BoardViewModelFactory from "../factory/BoardViewModelFactory"; import { PitViewModelFactory } from "../factory/PitViewModelFactory"; import { getColorByBrightness } from "../util/ColorUtil"; diff --git a/src/components/Button.tsx b/src/components/Button.tsx index f1c3a30..1d43a30 100644 --- a/src/components/Button.tsx +++ b/src/components/Button.tsx @@ -1,6 +1,6 @@ import * as React from "react"; import { FunctionComponent } from "react"; -import { Context } from "../context"; +import { Context } from "../context/context"; import { getColorByBrightness } from "../util/ColorUtil"; const Button: FunctionComponent<{ diff --git a/src/components/FloatingPanel.tsx b/src/components/FloatingPanel.tsx index 979a129..540bced 100644 --- a/src/components/FloatingPanel.tsx +++ b/src/components/FloatingPanel.tsx @@ -1,6 +1,6 @@ import * as React from "react"; import { FunctionComponent } from "react"; -import { Context } from "../context"; +import { Context } from "../context/context"; const FloatingPanel: FunctionComponent<{ context: Context; diff --git a/src/components/HeaderBar.tsx b/src/components/HeaderBar.tsx index 78d8c98..202d479 100644 --- a/src/components/HeaderBar.tsx +++ b/src/components/HeaderBar.tsx @@ -2,7 +2,7 @@ import * as React from "react"; import { FunctionComponent } from "react"; import { Menu, MenuItem } from "@szhsin/react-menu"; import { MancalaGame } from "mancala.js"; -import { Context } from "../context"; +import { Context } from "../context/context"; import { getColorByBrightness } from "../util/ColorUtil"; import Button from "./Button"; import "@szhsin/react-menu/dist/index.css"; diff --git a/src/components/InfoPanel.tsx b/src/components/InfoPanel.tsx index 1462ca9..b219a01 100644 --- a/src/components/InfoPanel.tsx +++ b/src/components/InfoPanel.tsx @@ -1,7 +1,7 @@ import { MancalaGame } from "mancala.js"; import * as React from "react"; import { FunctionComponent } from "react"; -import { Context } from "../context"; +import { Context } from "../context/context"; import { getColorByBrightness } from "../util/ColorUtil"; function getInfoPanelTextByGameState(params: { diff --git a/src/components/board/BoardView.tsx b/src/components/board/BoardView.tsx index 673e28e..922ef91 100644 --- a/src/components/board/BoardView.tsx +++ b/src/components/board/BoardView.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { MancalaGame, Pit } from "mancala.js"; import { FunctionComponent } from "react"; -import { Context } from "../../context"; +import { Context } from "../../context/context"; import BoardViewModel from "../../viewmodel/BoardViewModel"; import PitViewModel from "../../viewmodel/PitViewModel"; import PitView from "./PitView"; diff --git a/src/components/board/StoreView.tsx b/src/components/board/StoreView.tsx index 375481f..f149d30 100644 --- a/src/components/board/StoreView.tsx +++ b/src/components/board/StoreView.tsx @@ -1,6 +1,6 @@ import * as React from "react"; import { FunctionComponent } from "react"; -import { Context } from "../../context"; +import { Context } from "../../context/context"; import { getColorByBrightness } from "../../util/ColorUtil"; import Util from "../../util/Util"; import PitViewModel from "../../viewmodel/PitViewModel"; diff --git a/src/channel_names.ts b/src/const/channel_names.ts similarity index 100% rename from src/channel_names.ts rename to src/const/channel_names.ts diff --git a/src/context.tsx b/src/context/context.tsx similarity index 63% rename from src/context.tsx rename to src/context/context.tsx index 0fd4cc5..28d2485 100644 --- a/src/context.tsx +++ b/src/context/context.tsx @@ -1,8 +1,8 @@ -import { Texts, TrTr } from "./const/texts"; -import { RTMT } from "./rtmt/rtmt"; -import { RTMTWS } from "./rtmt/rtmt_websocket"; -import { UserKeyStore, UserKeyStoreImpl } from "./store/key_store"; -import ThemeManager from "./theme/ThemeManager"; +import { Texts, TrTr } from "../const/texts"; +import { RTMT } from "../rtmt/rtmt"; +import { RTMTWS } from "../rtmt/rtmt_websocket"; +import { UserKeyStore, UserKeyStoreImpl } from "../store/key_store"; +import ThemeManager from "../theme/ThemeManager"; export type Context = { rtmt: RTMT; diff --git a/src/Home.tsx b/src/routes/Home.tsx similarity index 90% rename from src/Home.tsx rename to src/routes/Home.tsx index d05ecb4..1ffb2f4 100644 --- a/src/Home.tsx +++ b/src/routes/Home.tsx @@ -1,8 +1,8 @@ import * as React from "react"; import { FunctionComponent, useEffect, useState } from "react"; -import BoardView from "./components/board/BoardView"; -import { context } from "./context"; -import { RTMTWS } from "./rtmt/rtmt_websocket"; +import BoardView from "../components/board/BoardView"; +import { context } from "../context/context"; +import { RTMTWS } from "../rtmt/rtmt_websocket"; import { channel_game_move, channel_leave_game, @@ -10,18 +10,18 @@ import { channel_on_game_start, channel_on_game_update, channel_on_game_user_leave, -} from "./channel_names"; -import InfoPanel from "./components/InfoPanel"; +} from "../const/channel_names"; +import InfoPanel from "../components/InfoPanel"; import { CommonMancalaGame, MancalaGame, Pit } from "mancala.js"; -import { GameMove } from "./models/GameMove"; -import PitAnimator from "./animation/PitAnimator"; -import BoardViewModel from "./viewmodel/BoardViewModel"; +import { GameMove } from "../models/GameMove"; +import PitAnimator from "../animation/PitAnimator"; +import BoardViewModel from "../viewmodel/BoardViewModel"; import { v4 } from "uuid"; -import { getColorByBrightness } from "./util/ColorUtil"; -import { Theme } from "./theme/Theme"; -import HeaderBar from "./components/HeaderBar"; -import FloatingPanel from "./components/FloatingPanel"; -import PageContainer from "./components/PageContainer"; +import { getColorByBrightness } from "../util/ColorUtil"; +import { Theme } from "../theme/Theme"; +import HeaderBar from "../components/HeaderBar"; +import FloatingPanel from "../components/FloatingPanel"; +import PageContainer from "../components/PageContainer"; type ConnectionState = "connecting" | "error" | "connected" | "reconnecting";