From 811be6dbfd58f5c308d7d7bd95b6fe72288eb9ca Mon Sep 17 00:00:00 2001 From: cha0s Date: Thu, 24 Mar 2022 01:56:25 -0500 Subject: [PATCH] refactor: aliases ^_^ --- packages/app/src/components/app/index.jsx | 2 +- packages/app/src/components/app/play/index.jsx | 6 ++---- .../app/src/components/app/play/index.module.scss | 0 .../src/components/app/play/renderable/index.jsx | 3 +-- .../src/components/app/play/ui/hotbar/index.scss | 2 +- packages/app/src/components/app/play/ui/index.jsx | 6 +++--- .../src/components/app/play/ui/item-slot/index.scss | 2 +- .../{components/app => }/scss/fonts/Lato-Light.eot | Bin .../{components/app => }/scss/fonts/Lato-Light.ttf | Bin .../{components/app => }/scss/fonts/Lato-Light.woff | Bin .../app => }/scss/fonts/Lato-Regular.eot | Bin .../app => }/scss/fonts/Lato-Regular.ttf | Bin .../app => }/scss/fonts/Lato-Regular.woff | Bin .../src/{components/app => }/scss/fonts/Rooted.eot | Bin .../src/{components/app => }/scss/fonts/Rooted.ttf | Bin .../src/{components/app => }/scss/fonts/Rooted.woff | Bin .../{components/app => }/scss/fonts/dialogue.ttf | Bin .../app => }/scss/fonts/joystix-monospace.ttf | Bin .../app/src/{components/app => }/scss/graphics.scss | 0 .../app/src/{components/app => }/scss/index.scss | 0 .../app/src/{components/app => }/scss/reset.scss | 0 packages/universe/package.json | 1 + 22 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 packages/app/src/components/app/play/index.module.scss rename packages/app/src/{components/app => }/scss/fonts/Lato-Light.eot (100%) rename packages/app/src/{components/app => }/scss/fonts/Lato-Light.ttf (100%) rename packages/app/src/{components/app => }/scss/fonts/Lato-Light.woff (100%) rename packages/app/src/{components/app => }/scss/fonts/Lato-Regular.eot (100%) rename packages/app/src/{components/app => }/scss/fonts/Lato-Regular.ttf (100%) rename packages/app/src/{components/app => }/scss/fonts/Lato-Regular.woff (100%) rename packages/app/src/{components/app => }/scss/fonts/Rooted.eot (100%) rename packages/app/src/{components/app => }/scss/fonts/Rooted.ttf (100%) rename packages/app/src/{components/app => }/scss/fonts/Rooted.woff (100%) rename packages/app/src/{components/app => }/scss/fonts/dialogue.ttf (100%) rename packages/app/src/{components/app => }/scss/fonts/joystix-monospace.ttf (100%) rename packages/app/src/{components/app => }/scss/graphics.scss (100%) rename packages/app/src/{components/app => }/scss/index.scss (100%) rename packages/app/src/{components/app => }/scss/reset.scss (100%) diff --git a/packages/app/src/components/app/index.jsx b/packages/app/src/components/app/index.jsx index 4d3d9ac..5e6d704 100644 --- a/packages/app/src/components/app/index.jsx +++ b/packages/app/src/components/app/index.jsx @@ -11,13 +11,13 @@ import { } from '@flecks/react/router'; import {useSelector} from '@flecks/redux'; import {userIdSelector} from '@flecks/user'; +import '@humus/app/scss/index.scss'; import Ui from '../valent-ui'; import Login from './login'; import Overview from './overview'; import Play from './play'; -import './scss/index.scss'; import styles from './index.module.scss'; const Persea = () => { diff --git a/packages/app/src/components/app/play/index.jsx b/packages/app/src/components/app/play/index.jsx index fc4779b..acbea57 100644 --- a/packages/app/src/components/app/play/index.jsx +++ b/packages/app/src/components/app/play/index.jsx @@ -1,16 +1,14 @@ import {React} from '@flecks/react'; -import styles from './index.module.scss'; - import Renderable from './renderable'; import Ui from './ui'; function Play() { return ( -
+ <> -
+ ); } diff --git a/packages/app/src/components/app/play/index.module.scss b/packages/app/src/components/app/play/index.module.scss deleted file mode 100644 index e69de29..0000000 diff --git a/packages/app/src/components/app/play/renderable/index.jsx b/packages/app/src/components/app/play/renderable/index.jsx index af7c8d3..35142fd 100644 --- a/packages/app/src/components/app/play/renderable/index.jsx +++ b/packages/app/src/components/app/play/renderable/index.jsx @@ -10,8 +10,7 @@ import { import {Container, Renderer, Stage} from '@avocado/graphics'; import {Vector} from '@avocado/math'; import {createLoop, destroyLoop} from '@avocado/timing'; - -import {useRoom, useSelfEntity} from '../../../../hooks'; +import {useRoom, useSelfEntity} from '@humus/app/hooks'; const renderer = new Renderer(); diff --git a/packages/app/src/components/app/play/ui/hotbar/index.scss b/packages/app/src/components/app/play/ui/hotbar/index.scss index 855c695..01398c9 100644 --- a/packages/app/src/components/app/play/ui/hotbar/index.scss +++ b/packages/app/src/components/app/play/ui/hotbar/index.scss @@ -1,4 +1,4 @@ -@import '../../../scss/graphics.scss'; +@import '~@humus/app/scss/graphics.scss'; .hotbar { position: absolute; diff --git a/packages/app/src/components/app/play/ui/index.jsx b/packages/app/src/components/app/play/ui/index.jsx index 5995d21..97280f9 100644 --- a/packages/app/src/components/app/play/ui/index.jsx +++ b/packages/app/src/components/app/play/ui/index.jsx @@ -12,14 +12,14 @@ import { } from '@flecks/react'; import {useDispatch} from '@flecks/redux'; import {useSocket} from '@flecks/socket'; - import { useRoom, useSelfEntity, -} from '../../../../hooks'; +} from '@humus/app/hooks'; import { setSelfEntity, -} from '../../../../state'; +} from '@humus/app/state'; + import Hotbar from './hotbar'; const PlayUi = () => { diff --git a/packages/app/src/components/app/play/ui/item-slot/index.scss b/packages/app/src/components/app/play/ui/item-slot/index.scss index aeef8ff..31e477b 100644 --- a/packages/app/src/components/app/play/ui/item-slot/index.scss +++ b/packages/app/src/components/app/play/ui/item-slot/index.scss @@ -1,4 +1,4 @@ -@import '../../../scss/graphics.scss'; +@import '~@humus/app/scss/graphics.scss'; .item-slot { border: 4px dashed rgba(0, 0, 0, 0.5); diff --git a/packages/app/src/components/app/scss/fonts/Lato-Light.eot b/packages/app/src/scss/fonts/Lato-Light.eot similarity index 100% rename from packages/app/src/components/app/scss/fonts/Lato-Light.eot rename to packages/app/src/scss/fonts/Lato-Light.eot diff --git a/packages/app/src/components/app/scss/fonts/Lato-Light.ttf b/packages/app/src/scss/fonts/Lato-Light.ttf similarity index 100% rename from packages/app/src/components/app/scss/fonts/Lato-Light.ttf rename to packages/app/src/scss/fonts/Lato-Light.ttf diff --git a/packages/app/src/components/app/scss/fonts/Lato-Light.woff b/packages/app/src/scss/fonts/Lato-Light.woff similarity index 100% rename from packages/app/src/components/app/scss/fonts/Lato-Light.woff rename to packages/app/src/scss/fonts/Lato-Light.woff diff --git a/packages/app/src/components/app/scss/fonts/Lato-Regular.eot b/packages/app/src/scss/fonts/Lato-Regular.eot similarity index 100% rename from packages/app/src/components/app/scss/fonts/Lato-Regular.eot rename to packages/app/src/scss/fonts/Lato-Regular.eot diff --git a/packages/app/src/components/app/scss/fonts/Lato-Regular.ttf b/packages/app/src/scss/fonts/Lato-Regular.ttf similarity index 100% rename from packages/app/src/components/app/scss/fonts/Lato-Regular.ttf rename to packages/app/src/scss/fonts/Lato-Regular.ttf diff --git a/packages/app/src/components/app/scss/fonts/Lato-Regular.woff b/packages/app/src/scss/fonts/Lato-Regular.woff similarity index 100% rename from packages/app/src/components/app/scss/fonts/Lato-Regular.woff rename to packages/app/src/scss/fonts/Lato-Regular.woff diff --git a/packages/app/src/components/app/scss/fonts/Rooted.eot b/packages/app/src/scss/fonts/Rooted.eot similarity index 100% rename from packages/app/src/components/app/scss/fonts/Rooted.eot rename to packages/app/src/scss/fonts/Rooted.eot diff --git a/packages/app/src/components/app/scss/fonts/Rooted.ttf b/packages/app/src/scss/fonts/Rooted.ttf similarity index 100% rename from packages/app/src/components/app/scss/fonts/Rooted.ttf rename to packages/app/src/scss/fonts/Rooted.ttf diff --git a/packages/app/src/components/app/scss/fonts/Rooted.woff b/packages/app/src/scss/fonts/Rooted.woff similarity index 100% rename from packages/app/src/components/app/scss/fonts/Rooted.woff rename to packages/app/src/scss/fonts/Rooted.woff diff --git a/packages/app/src/components/app/scss/fonts/dialogue.ttf b/packages/app/src/scss/fonts/dialogue.ttf similarity index 100% rename from packages/app/src/components/app/scss/fonts/dialogue.ttf rename to packages/app/src/scss/fonts/dialogue.ttf diff --git a/packages/app/src/components/app/scss/fonts/joystix-monospace.ttf b/packages/app/src/scss/fonts/joystix-monospace.ttf similarity index 100% rename from packages/app/src/components/app/scss/fonts/joystix-monospace.ttf rename to packages/app/src/scss/fonts/joystix-monospace.ttf diff --git a/packages/app/src/components/app/scss/graphics.scss b/packages/app/src/scss/graphics.scss similarity index 100% rename from packages/app/src/components/app/scss/graphics.scss rename to packages/app/src/scss/graphics.scss diff --git a/packages/app/src/components/app/scss/index.scss b/packages/app/src/scss/index.scss similarity index 100% rename from packages/app/src/components/app/scss/index.scss rename to packages/app/src/scss/index.scss diff --git a/packages/app/src/components/app/scss/reset.scss b/packages/app/src/scss/reset.scss similarity index 100% rename from packages/app/src/components/app/scss/reset.scss rename to packages/app/src/scss/reset.scss diff --git a/packages/universe/package.json b/packages/universe/package.json index 089b65a..a487303 100644 --- a/packages/universe/package.json +++ b/packages/universe/package.json @@ -35,6 +35,7 @@ "dependencies": { "@avocado/resource": "^3.0.0", "@avocado/s13n": "^3.0.0", + "@avocado/timing": "^3.0.0", "@avocado/traits": "^3.0.0", "@flecks/core": "^1.4.1", "@flecks/react": "^1.4.1",