From 675a84c14bf517d517a15a361b54f7321880d610 Mon Sep 17 00:00:00 2001 From: He4eT Date: Wed, 3 Mar 2021 02:40:43 +0500 Subject: [PATCH] Cleanup --- .../FileSelector/LocalFileSelector.jsx | 3 ++- .../FileSelector/TargetURLSelector.jsx | 3 ++- src/components/Player/InputBox.jsx | 14 ++++++------- src/components/Player/Player.jsx | 5 ++--- src/components/Player/Status.jsx | 13 ++++++++---- src/components/Player/common/if.js | 21 ------------------- src/components/Player/player.css | 1 - .../ThemeSelector/ThemeSelector.jsx | 3 ++- src/index.js | 2 +- src/style/views/HomeView.css | 5 ----- src/themes/themes.js | 9 ++++---- src/views/HomeView.jsx | 1 - src/views/NotFoundView.jsx | 8 +++++-- 13 files changed, 34 insertions(+), 54 deletions(-) delete mode 100644 src/components/Player/common/if.js diff --git a/src/components/FileSelector/LocalFileSelector.jsx b/src/components/FileSelector/LocalFileSelector.jsx index 1f73e7f..b1a73ad 100644 --- a/src/components/FileSelector/LocalFileSelector.jsx +++ b/src/components/FileSelector/LocalFileSelector.jsx @@ -11,5 +11,6 @@ export default function ({ theme, setLocation, buildLink }) { return ( ) + onChange={fileInputHandler} /> + ) } diff --git a/src/components/FileSelector/TargetURLSelector.jsx b/src/components/FileSelector/TargetURLSelector.jsx index 6b42b4b..c79fb36 100644 --- a/src/components/FileSelector/TargetURLSelector.jsx +++ b/src/components/FileSelector/TargetURLSelector.jsx @@ -17,5 +17,6 @@ export default function ({ theme, setLocation, buildLink }) { ) + onKeyPress={onKeyPress} /> + ) } diff --git a/src/components/Player/InputBox.jsx b/src/components/Player/InputBox.jsx index ecc550b..cb83f97 100644 --- a/src/components/Player/InputBox.jsx +++ b/src/components/Player/InputBox.jsx @@ -14,7 +14,8 @@ const keyCodes = { KEY_LEFT: 37, KEY_UP: 38, KEY_RIGHT: 39, - KEY_DOWN: 40} + KEY_DOWN: 40 +} const keyNames = { [keyCodes.KEY_BACKSPACE]: 'delete', @@ -28,7 +29,8 @@ const keyNames = { [keyCodes.KEY_LEFT]: 'left', [keyCodes.KEY_UP]: 'up', [keyCodes.KEY_RIGHT]: 'right', - [keyCodes.KEY_DOWN]: 'down'} + [keyCodes.KEY_DOWN]: 'down' +} /* eslint-enable */ export default function ({ currentWindow, inputType, sendMessage }) { @@ -62,18 +64,15 @@ export default function ({ currentWindow, inputType, sendMessage }) { const inputHandlers = { char: { + placeholder: 'Press any key', onKeyDown: charHandler }, line: { + placeholder: ' > ', onKeyPress: lineHandler } } - const placeholder = { - char: 'Press any key', - line: ' > ' - } - const enterFullscreen = _ => document.documentElement.requestFullscreen() @@ -82,7 +81,6 @@ export default function ({ currentWindow, inputType, sendMessage }) { className='inputBox' ref={inputEl} value={inputText} - placeholder={placeholder[inputType]} autofocus autocomplete='off' onDblClick={enterFullscreen} diff --git a/src/components/Player/Player.jsx b/src/components/Player/Player.jsx index f53daf7..bc25545 100644 --- a/src/components/Player/Player.jsx +++ b/src/components/Player/Player.jsx @@ -19,8 +19,6 @@ const INITIAL_STATUS = { } const runMachine = ({ Engine, file, handlers }) => { - console.log('runMachine') - const vm = new Engine() const { glkInterface, sendFn } = CheapGlkOte(handlers) @@ -117,5 +115,6 @@ export default function ({ vmParts: { file, engine } }) { inputType, sendMessage }} /> - ) + + ) } diff --git a/src/components/Player/Status.jsx b/src/components/Player/Status.jsx index 6391db7..dc3ff9e 100644 --- a/src/components/Player/Status.jsx +++ b/src/components/Player/Status.jsx @@ -1,15 +1,20 @@ import { h } from 'preact' +import { Link } from 'wouter-preact' const fail = details => (
-

Error

+

+ Error +

{details.map(x => (

{x}

))}
- + Home - + | - + Report bug
diff --git a/src/components/Player/common/if.js b/src/components/Player/common/if.js deleted file mode 100644 index 70b0c4b..0000000 --- a/src/components/Player/common/if.js +++ /dev/null @@ -1,21 +0,0 @@ -// import CheapGlkOte from 'cheap-glkote' -// import engine from 'emglken/src/tads.js' - -// import { engineByFilename } from './engines' - -// export const fetchGameFile = url => fetch(url) -// .then(response => (console.log(response), response)) -// .then(response => response.blob()) -// .then(blob => new Response(blob).arrayBuffer()) -// .then(buffer => new Uint8Array(buffer)) -// .then(file => { -// const { glkInterface, sendFn } = CheapGlkOte({ -// onUpdateContent: messages => console.log(messages) -// }) -// window.send = sendFn - -// const vm = new engine() -// vm.prepare(file, glkInterface) -// vm.start() -// }) -// .catch(console.log) diff --git a/src/components/Player/player.css b/src/components/Player/player.css index e1fcd55..5e6edf2 100644 --- a/src/components/Player/player.css +++ b/src/components/Player/player.css @@ -65,4 +65,3 @@ 66% { content: '..'; } 100% { content: '...'; } } - diff --git a/src/components/ThemeSelector/ThemeSelector.jsx b/src/components/ThemeSelector/ThemeSelector.jsx index 863edb7..8d1b69e 100644 --- a/src/components/ThemeSelector/ThemeSelector.jsx +++ b/src/components/ThemeSelector/ThemeSelector.jsx @@ -12,5 +12,6 @@ export default function ({ themeEngine }) { onChange={({ target }) => themeEngine.setTheme(target.value)}> {options} - ) + + ) } diff --git a/src/index.js b/src/index.js index 38b7528..9648c43 100644 --- a/src/index.js +++ b/src/index.js @@ -35,7 +35,7 @@ function App () { {params => } diff --git a/src/style/views/HomeView.css b/src/style/views/HomeView.css index 1dc622f..cdb5169 100644 --- a/src/style/views/HomeView.css +++ b/src/style/views/HomeView.css @@ -2,11 +2,6 @@ padding: var(--inner-padding); } -.view.home summary { - display: inline; - cursor: pointer; -} - .view.home input, .view.home select { box-sizing: border-box; diff --git a/src/themes/themes.js b/src/themes/themes.js index d5c999c..bb4be1a 100644 --- a/src/themes/themes.js +++ b/src/themes/themes.js @@ -1,4 +1,4 @@ -import { useState, useCallback } from 'preact/hooks' +import { useState } from 'preact/hooks' import '~/src/style/themes.css' @@ -12,8 +12,7 @@ const themes = [ 'solarized-light', 'solarized-light-borders', 'solarized-dark', - 'solarized-dark-borders', - '_raw' + 'solarized-dark-borders' ] const DEFAULT_THEME = themes[0] @@ -27,9 +26,9 @@ export const useThemeEngine = (initialTheme = DEFAULT_THEME) => { const [currentTheme, setCurrentTheme] = useState(initialTheme) - const setTheme = useCallback(theme => { + const setTheme = theme => { setCurrentTheme(assertTheme(theme)) - }, [currentTheme]) + } return { currentTheme, setTheme, themes } } diff --git a/src/views/HomeView.jsx b/src/views/HomeView.jsx index 36931ea..e6a9e68 100644 --- a/src/views/HomeView.jsx +++ b/src/views/HomeView.jsx @@ -117,6 +117,5 @@ export default function ({ themeEngine }) {

- ) } diff --git a/src/views/NotFoundView.jsx b/src/views/NotFoundView.jsx index 494c6cd..df49c6b 100644 --- a/src/views/NotFoundView.jsx +++ b/src/views/NotFoundView.jsx @@ -4,8 +4,12 @@ import { Link } from 'wouter-preact' export default () => (
-

404

-

Page not found

+

+ 404 +

+

+ Page not found +

Home