From 9f1057ed2f9dfb13f9948192eb436352e8703dd0 Mon Sep 17 00:00:00 2001 From: He4eT Date: Sat, 3 Jun 2023 22:50:37 +0300 Subject: [PATCH] Rearrange components --- src/components/GameEntry/GameEntry.jsx | 2 +- src/components/Player/{ => InputBox}/InputBox.jsx | 2 +- .../{ => MenuButton}/MenuButton.module.scss | 0 .../Player/{ => MenuOverlay}/MenuOverlay.css | 0 .../Player/{ => MenuOverlay}/MenuOverlay.jsx | 0 .../Player/{ => OutputBox}/GridBuffer.jsx | 0 .../Player/{ => OutputBox}/TextBuffer.jsx | 0 .../Player/{ => OutputBox}/TextMessage.jsx | 0 src/components/Player/Player.jsx | 13 ++++++++----- src/components/Player/{ => Status}/Status.jsx | 0 src/components/Player/UrlPlayer.jsx | 2 +- .../Player/{ => common}/playerHandlers.js | 0 src/index.js | 2 +- src/{utils/utils.routing.js => routing.js} | 0 src/views/HomeView/HomeView.jsx | 2 +- src/views/PlayerView/PlayerView.jsx | 2 +- 16 files changed, 14 insertions(+), 11 deletions(-) rename src/components/Player/{ => InputBox}/InputBox.jsx (98%) rename src/components/Player/InputBox/{ => MenuButton}/MenuButton.module.scss (100%) rename src/components/Player/{ => MenuOverlay}/MenuOverlay.css (100%) rename src/components/Player/{ => MenuOverlay}/MenuOverlay.jsx (100%) rename src/components/Player/{ => OutputBox}/GridBuffer.jsx (100%) rename src/components/Player/{ => OutputBox}/TextBuffer.jsx (100%) rename src/components/Player/{ => OutputBox}/TextMessage.jsx (100%) rename src/components/Player/{ => Status}/Status.jsx (100%) rename src/components/Player/{ => common}/playerHandlers.js (100%) rename src/{utils/utils.routing.js => routing.js} (100%) diff --git a/src/components/GameEntry/GameEntry.jsx b/src/components/GameEntry/GameEntry.jsx index 7a638c1..b411eaf 100644 --- a/src/components/GameEntry/GameEntry.jsx +++ b/src/components/GameEntry/GameEntry.jsx @@ -3,7 +3,7 @@ import { Link } from 'wouter-preact' import { buildPlayLinkHref, -} from '~/src/utils/utils.routing' +} from '~/src/routing' export default function GameEntry ({ name, ifdb, url }) { return ( diff --git a/src/components/Player/InputBox.jsx b/src/components/Player/InputBox/InputBox.jsx similarity index 98% rename from src/components/Player/InputBox.jsx rename to src/components/Player/InputBox/InputBox.jsx index e636f6c..da8eddf 100644 --- a/src/components/Player/InputBox.jsx +++ b/src/components/Player/InputBox/InputBox.jsx @@ -1,7 +1,7 @@ import { h } from 'preact' import { useEffect, useRef, useState } from 'preact/hooks' -import s from './InputBox/MenuButton.module.scss' +import s from './MenuButton/MenuButton.module.scss' /* eslint-disable */ const keyCodes = { diff --git a/src/components/Player/InputBox/MenuButton.module.scss b/src/components/Player/InputBox/MenuButton/MenuButton.module.scss similarity index 100% rename from src/components/Player/InputBox/MenuButton.module.scss rename to src/components/Player/InputBox/MenuButton/MenuButton.module.scss diff --git a/src/components/Player/MenuOverlay.css b/src/components/Player/MenuOverlay/MenuOverlay.css similarity index 100% rename from src/components/Player/MenuOverlay.css rename to src/components/Player/MenuOverlay/MenuOverlay.css diff --git a/src/components/Player/MenuOverlay.jsx b/src/components/Player/MenuOverlay/MenuOverlay.jsx similarity index 100% rename from src/components/Player/MenuOverlay.jsx rename to src/components/Player/MenuOverlay/MenuOverlay.jsx diff --git a/src/components/Player/GridBuffer.jsx b/src/components/Player/OutputBox/GridBuffer.jsx similarity index 100% rename from src/components/Player/GridBuffer.jsx rename to src/components/Player/OutputBox/GridBuffer.jsx diff --git a/src/components/Player/TextBuffer.jsx b/src/components/Player/OutputBox/TextBuffer.jsx similarity index 100% rename from src/components/Player/TextBuffer.jsx rename to src/components/Player/OutputBox/TextBuffer.jsx diff --git a/src/components/Player/TextMessage.jsx b/src/components/Player/OutputBox/TextMessage.jsx similarity index 100% rename from src/components/Player/TextMessage.jsx rename to src/components/Player/OutputBox/TextMessage.jsx diff --git a/src/components/Player/Player.jsx b/src/components/Player/Player.jsx index 5af725d..9b93913 100644 --- a/src/components/Player/Player.jsx +++ b/src/components/Player/Player.jsx @@ -3,13 +3,16 @@ import { useState, useEffect } from 'preact/hooks' import CheapGlkOte from 'cheap-glkote' -import TextBuffer from './TextBuffer' -import GridBuffer from './GridBuffer' +import TextBuffer from './OutputBox/TextBuffer' +import GridBuffer from './OutputBox/GridBuffer' -import InputBox from './InputBox' -import Status from './Status' +import InputBox from './InputBox/InputBox' +import Status from './Status/Status' -import { Handlers, unhandledRejectionHandler } from './playerHandlers' +import { + Handlers, + unhandledRejectionHandler +} from './common/playerHandlers' import './player.css' diff --git a/src/components/Player/Status.jsx b/src/components/Player/Status/Status.jsx similarity index 100% rename from src/components/Player/Status.jsx rename to src/components/Player/Status/Status.jsx diff --git a/src/components/Player/UrlPlayer.jsx b/src/components/Player/UrlPlayer.jsx index 71a8d1e..d078111 100644 --- a/src/components/Player/UrlPlayer.jsx +++ b/src/components/Player/UrlPlayer.jsx @@ -4,7 +4,7 @@ import { useState, useEffect } from 'preact/hooks' import { engineByFilename } from './common/engines' import Player from './Player' -import Status from './Status' +import Status from './Status/Status' const INITIAL_STATUS = { stage: 'loading', diff --git a/src/components/Player/playerHandlers.js b/src/components/Player/common/playerHandlers.js similarity index 100% rename from src/components/Player/playerHandlers.js rename to src/components/Player/common/playerHandlers.js diff --git a/src/index.js b/src/index.js index d8a2956..6a6a80c 100644 --- a/src/index.js +++ b/src/index.js @@ -4,7 +4,7 @@ import { Route, Router, Switch } from 'wouter-preact' import { useHashLocation, extractView, -} from '~/src/utils/utils.routing' +} from './routing' import { useThemeEngine, } from '~/src/themes/themes' diff --git a/src/utils/utils.routing.js b/src/routing.js similarity index 100% rename from src/utils/utils.routing.js rename to src/routing.js diff --git a/src/views/HomeView/HomeView.jsx b/src/views/HomeView/HomeView.jsx index 1d88ca2..3f47509 100644 --- a/src/views/HomeView/HomeView.jsx +++ b/src/views/HomeView/HomeView.jsx @@ -4,7 +4,7 @@ import { Link } from 'wouter-preact' import { useHashLocation, buildPlayLinkHref, -} from '~/src/utils/utils.routing' +} from '~/src/routing' import LocalFileSelector from '~/src/components/FileSelector/LocalFileSelector' diff --git a/src/views/PlayerView/PlayerView.jsx b/src/views/PlayerView/PlayerView.jsx index 2597730..95f5230 100644 --- a/src/views/PlayerView/PlayerView.jsx +++ b/src/views/PlayerView/PlayerView.jsx @@ -2,7 +2,7 @@ import { h } from 'preact' import { useState, useEffect } from 'preact/hooks' import UrlPlayer from '~/src/components/Player/UrlPlayer' -import MenuOverlay from '~/src/components/Player/MenuOverlay' +import MenuOverlay from '~/src/components/Player/MenuOverlay/MenuOverlay' import './PlayerView.css'