From 65b1787ba77bd3830bbeb7aca081afbe5ea28dc8 Mon Sep 17 00:00:00 2001 From: checktheroads Date: Mon, 24 Feb 2020 09:06:07 -0700 Subject: [PATCH] move ui & assets to package directory --- .../images}/favicons/android-chrome-192x192.png | Bin .../images}/favicons/android-chrome-512x512.png | Bin .../images}/favicons/apple-touch-icon.png | Bin .../images}/favicons/browserconfig.xml | 0 .../images}/favicons/favicon-16x16.png | Bin .../images}/favicons/favicon-32x32.png | Bin {images => hyperglass/images}/favicons/favicon.ico | Bin .../images}/favicons/mstile-150x150.png | Bin .../images}/favicons/safari-pinned-tab.svg | 0 .../images}/favicons/site.webmanifest | 0 {images => hyperglass/images}/hyperglass-dark.png | Bin {images => hyperglass/images}/hyperglass-light.png | Bin .../images}/hyperglass-opengraph.png | Bin {images => hyperglass/images}/icon.svg | 0 {ui => hyperglass/ui}/.alias.js | 0 {ui => hyperglass/ui}/.gitignore | 0 {ui => hyperglass/ui}/README.md | 0 {ui => hyperglass/ui}/components/ChakraSelect.js | 0 {ui => hyperglass/ui}/components/CodeBlock.js | 0 {ui => hyperglass/ui}/components/CopyButton.js | 0 {ui => hyperglass/ui}/components/Debugger.js | 0 {ui => hyperglass/ui}/components/Footer.js | 0 {ui => hyperglass/ui}/components/FooterButton.js | 0 {ui => hyperglass/ui}/components/FooterContent.js | 0 {ui => hyperglass/ui}/components/FormField.js | 0 {ui => hyperglass/ui}/components/Header.js | 0 {ui => hyperglass/ui}/components/HelpModal.js | 0 {ui => hyperglass/ui}/components/HyperglassForm.js | 0 .../ui}/components/HyperglassProvider.js | 0 {ui => hyperglass/ui}/components/Label.js | 0 {ui => hyperglass/ui}/components/Layout.js | 0 {ui => hyperglass/ui}/components/Loading.js | 0 {ui => hyperglass/ui}/components/MarkDown.js | 0 {ui => hyperglass/ui}/components/MediaProvider.js | 0 {ui => hyperglass/ui}/components/Meta.js | 0 {ui => hyperglass/ui}/components/QueryLocation.js | 0 {ui => hyperglass/ui}/components/QueryTarget.js | 0 {ui => hyperglass/ui}/components/QueryType.js | 0 {ui => hyperglass/ui}/components/QueryVrf.js | 0 {ui => hyperglass/ui}/components/RequeryButton.js | 0 {ui => hyperglass/ui}/components/ResetButton.js | 0 {ui => hyperglass/ui}/components/ResolvedTarget.js | 0 {ui => hyperglass/ui}/components/Result.js | 0 {ui => hyperglass/ui}/components/ResultHeader.js | 0 {ui => hyperglass/ui}/components/Results.js | 0 {ui => hyperglass/ui}/components/SubmitButton.js | 0 {ui => hyperglass/ui}/components/Table.js | 0 {ui => hyperglass/ui}/components/Title.js | 0 {ui => hyperglass/ui}/components/useConfig.js | 0 {ui => hyperglass/ui}/hooks/useColored.js | 0 {ui => hyperglass/ui}/next.config.js | 0 {ui => hyperglass/ui}/nextdev.js | 0 {ui => hyperglass/ui}/package.json | 0 {ui => hyperglass/ui}/pages/_app.js | 0 {ui => hyperglass/ui}/pages/_document.js | 0 {ui => hyperglass/ui}/pages/_error.js | 0 {ui => hyperglass/ui}/pages/index.js | 0 {ui => hyperglass/ui}/public/noflash.js | 0 {ui => hyperglass/ui}/theme.js | 0 {ui => hyperglass/ui}/util.js | 0 {ui => hyperglass/ui}/webpack.config.js | 0 {ui => hyperglass/ui}/yarn.lock | 0 hyperglass/util.py | 8 ++++---- pyproject.toml | 2 -- 64 files changed, 4 insertions(+), 6 deletions(-) rename {images => hyperglass/images}/favicons/android-chrome-192x192.png (100%) rename {images => hyperglass/images}/favicons/android-chrome-512x512.png (100%) rename {images => hyperglass/images}/favicons/apple-touch-icon.png (100%) rename {images => hyperglass/images}/favicons/browserconfig.xml (100%) rename {images => hyperglass/images}/favicons/favicon-16x16.png (100%) rename {images => hyperglass/images}/favicons/favicon-32x32.png (100%) rename {images => hyperglass/images}/favicons/favicon.ico (100%) rename {images => hyperglass/images}/favicons/mstile-150x150.png (100%) rename {images => hyperglass/images}/favicons/safari-pinned-tab.svg (100%) rename {images => hyperglass/images}/favicons/site.webmanifest (100%) rename {images => hyperglass/images}/hyperglass-dark.png (100%) rename {images => hyperglass/images}/hyperglass-light.png (100%) rename {images => hyperglass/images}/hyperglass-opengraph.png (100%) rename {images => hyperglass/images}/icon.svg (100%) rename {ui => hyperglass/ui}/.alias.js (100%) rename {ui => hyperglass/ui}/.gitignore (100%) rename {ui => hyperglass/ui}/README.md (100%) rename {ui => hyperglass/ui}/components/ChakraSelect.js (100%) rename {ui => hyperglass/ui}/components/CodeBlock.js (100%) rename {ui => hyperglass/ui}/components/CopyButton.js (100%) rename {ui => hyperglass/ui}/components/Debugger.js (100%) rename {ui => hyperglass/ui}/components/Footer.js (100%) rename {ui => hyperglass/ui}/components/FooterButton.js (100%) rename {ui => hyperglass/ui}/components/FooterContent.js (100%) rename {ui => hyperglass/ui}/components/FormField.js (100%) rename {ui => hyperglass/ui}/components/Header.js (100%) rename {ui => hyperglass/ui}/components/HelpModal.js (100%) rename {ui => hyperglass/ui}/components/HyperglassForm.js (100%) rename {ui => hyperglass/ui}/components/HyperglassProvider.js (100%) rename {ui => hyperglass/ui}/components/Label.js (100%) rename {ui => hyperglass/ui}/components/Layout.js (100%) rename {ui => hyperglass/ui}/components/Loading.js (100%) rename {ui => hyperglass/ui}/components/MarkDown.js (100%) rename {ui => hyperglass/ui}/components/MediaProvider.js (100%) rename {ui => hyperglass/ui}/components/Meta.js (100%) rename {ui => hyperglass/ui}/components/QueryLocation.js (100%) rename {ui => hyperglass/ui}/components/QueryTarget.js (100%) rename {ui => hyperglass/ui}/components/QueryType.js (100%) rename {ui => hyperglass/ui}/components/QueryVrf.js (100%) rename {ui => hyperglass/ui}/components/RequeryButton.js (100%) rename {ui => hyperglass/ui}/components/ResetButton.js (100%) rename {ui => hyperglass/ui}/components/ResolvedTarget.js (100%) rename {ui => hyperglass/ui}/components/Result.js (100%) rename {ui => hyperglass/ui}/components/ResultHeader.js (100%) rename {ui => hyperglass/ui}/components/Results.js (100%) rename {ui => hyperglass/ui}/components/SubmitButton.js (100%) rename {ui => hyperglass/ui}/components/Table.js (100%) rename {ui => hyperglass/ui}/components/Title.js (100%) rename {ui => hyperglass/ui}/components/useConfig.js (100%) rename {ui => hyperglass/ui}/hooks/useColored.js (100%) rename {ui => hyperglass/ui}/next.config.js (100%) rename {ui => hyperglass/ui}/nextdev.js (100%) rename {ui => hyperglass/ui}/package.json (100%) rename {ui => hyperglass/ui}/pages/_app.js (100%) rename {ui => hyperglass/ui}/pages/_document.js (100%) rename {ui => hyperglass/ui}/pages/_error.js (100%) rename {ui => hyperglass/ui}/pages/index.js (100%) rename {ui => hyperglass/ui}/public/noflash.js (100%) rename {ui => hyperglass/ui}/theme.js (100%) rename {ui => hyperglass/ui}/util.js (100%) rename {ui => hyperglass/ui}/webpack.config.js (100%) rename {ui => hyperglass/ui}/yarn.lock (100%) diff --git a/images/favicons/android-chrome-192x192.png b/hyperglass/images/favicons/android-chrome-192x192.png similarity index 100% rename from images/favicons/android-chrome-192x192.png rename to hyperglass/images/favicons/android-chrome-192x192.png diff --git a/images/favicons/android-chrome-512x512.png b/hyperglass/images/favicons/android-chrome-512x512.png similarity index 100% rename from images/favicons/android-chrome-512x512.png rename to hyperglass/images/favicons/android-chrome-512x512.png diff --git a/images/favicons/apple-touch-icon.png b/hyperglass/images/favicons/apple-touch-icon.png similarity index 100% rename from images/favicons/apple-touch-icon.png rename to hyperglass/images/favicons/apple-touch-icon.png diff --git a/images/favicons/browserconfig.xml b/hyperglass/images/favicons/browserconfig.xml similarity index 100% rename from images/favicons/browserconfig.xml rename to hyperglass/images/favicons/browserconfig.xml diff --git a/images/favicons/favicon-16x16.png b/hyperglass/images/favicons/favicon-16x16.png similarity index 100% rename from images/favicons/favicon-16x16.png rename to hyperglass/images/favicons/favicon-16x16.png diff --git a/images/favicons/favicon-32x32.png b/hyperglass/images/favicons/favicon-32x32.png similarity index 100% rename from images/favicons/favicon-32x32.png rename to hyperglass/images/favicons/favicon-32x32.png diff --git a/images/favicons/favicon.ico b/hyperglass/images/favicons/favicon.ico similarity index 100% rename from images/favicons/favicon.ico rename to hyperglass/images/favicons/favicon.ico diff --git a/images/favicons/mstile-150x150.png b/hyperglass/images/favicons/mstile-150x150.png similarity index 100% rename from images/favicons/mstile-150x150.png rename to hyperglass/images/favicons/mstile-150x150.png diff --git a/images/favicons/safari-pinned-tab.svg b/hyperglass/images/favicons/safari-pinned-tab.svg similarity index 100% rename from images/favicons/safari-pinned-tab.svg rename to hyperglass/images/favicons/safari-pinned-tab.svg diff --git a/images/favicons/site.webmanifest b/hyperglass/images/favicons/site.webmanifest similarity index 100% rename from images/favicons/site.webmanifest rename to hyperglass/images/favicons/site.webmanifest diff --git a/images/hyperglass-dark.png b/hyperglass/images/hyperglass-dark.png similarity index 100% rename from images/hyperglass-dark.png rename to hyperglass/images/hyperglass-dark.png diff --git a/images/hyperglass-light.png b/hyperglass/images/hyperglass-light.png similarity index 100% rename from images/hyperglass-light.png rename to hyperglass/images/hyperglass-light.png diff --git a/images/hyperglass-opengraph.png b/hyperglass/images/hyperglass-opengraph.png similarity index 100% rename from images/hyperglass-opengraph.png rename to hyperglass/images/hyperglass-opengraph.png diff --git a/images/icon.svg b/hyperglass/images/icon.svg similarity index 100% rename from images/icon.svg rename to hyperglass/images/icon.svg diff --git a/ui/.alias.js b/hyperglass/ui/.alias.js similarity index 100% rename from ui/.alias.js rename to hyperglass/ui/.alias.js diff --git a/ui/.gitignore b/hyperglass/ui/.gitignore similarity index 100% rename from ui/.gitignore rename to hyperglass/ui/.gitignore diff --git a/ui/README.md b/hyperglass/ui/README.md similarity index 100% rename from ui/README.md rename to hyperglass/ui/README.md diff --git a/ui/components/ChakraSelect.js b/hyperglass/ui/components/ChakraSelect.js similarity index 100% rename from ui/components/ChakraSelect.js rename to hyperglass/ui/components/ChakraSelect.js diff --git a/ui/components/CodeBlock.js b/hyperglass/ui/components/CodeBlock.js similarity index 100% rename from ui/components/CodeBlock.js rename to hyperglass/ui/components/CodeBlock.js diff --git a/ui/components/CopyButton.js b/hyperglass/ui/components/CopyButton.js similarity index 100% rename from ui/components/CopyButton.js rename to hyperglass/ui/components/CopyButton.js diff --git a/ui/components/Debugger.js b/hyperglass/ui/components/Debugger.js similarity index 100% rename from ui/components/Debugger.js rename to hyperglass/ui/components/Debugger.js diff --git a/ui/components/Footer.js b/hyperglass/ui/components/Footer.js similarity index 100% rename from ui/components/Footer.js rename to hyperglass/ui/components/Footer.js diff --git a/ui/components/FooterButton.js b/hyperglass/ui/components/FooterButton.js similarity index 100% rename from ui/components/FooterButton.js rename to hyperglass/ui/components/FooterButton.js diff --git a/ui/components/FooterContent.js b/hyperglass/ui/components/FooterContent.js similarity index 100% rename from ui/components/FooterContent.js rename to hyperglass/ui/components/FooterContent.js diff --git a/ui/components/FormField.js b/hyperglass/ui/components/FormField.js similarity index 100% rename from ui/components/FormField.js rename to hyperglass/ui/components/FormField.js diff --git a/ui/components/Header.js b/hyperglass/ui/components/Header.js similarity index 100% rename from ui/components/Header.js rename to hyperglass/ui/components/Header.js diff --git a/ui/components/HelpModal.js b/hyperglass/ui/components/HelpModal.js similarity index 100% rename from ui/components/HelpModal.js rename to hyperglass/ui/components/HelpModal.js diff --git a/ui/components/HyperglassForm.js b/hyperglass/ui/components/HyperglassForm.js similarity index 100% rename from ui/components/HyperglassForm.js rename to hyperglass/ui/components/HyperglassForm.js diff --git a/ui/components/HyperglassProvider.js b/hyperglass/ui/components/HyperglassProvider.js similarity index 100% rename from ui/components/HyperglassProvider.js rename to hyperglass/ui/components/HyperglassProvider.js diff --git a/ui/components/Label.js b/hyperglass/ui/components/Label.js similarity index 100% rename from ui/components/Label.js rename to hyperglass/ui/components/Label.js diff --git a/ui/components/Layout.js b/hyperglass/ui/components/Layout.js similarity index 100% rename from ui/components/Layout.js rename to hyperglass/ui/components/Layout.js diff --git a/ui/components/Loading.js b/hyperglass/ui/components/Loading.js similarity index 100% rename from ui/components/Loading.js rename to hyperglass/ui/components/Loading.js diff --git a/ui/components/MarkDown.js b/hyperglass/ui/components/MarkDown.js similarity index 100% rename from ui/components/MarkDown.js rename to hyperglass/ui/components/MarkDown.js diff --git a/ui/components/MediaProvider.js b/hyperglass/ui/components/MediaProvider.js similarity index 100% rename from ui/components/MediaProvider.js rename to hyperglass/ui/components/MediaProvider.js diff --git a/ui/components/Meta.js b/hyperglass/ui/components/Meta.js similarity index 100% rename from ui/components/Meta.js rename to hyperglass/ui/components/Meta.js diff --git a/ui/components/QueryLocation.js b/hyperglass/ui/components/QueryLocation.js similarity index 100% rename from ui/components/QueryLocation.js rename to hyperglass/ui/components/QueryLocation.js diff --git a/ui/components/QueryTarget.js b/hyperglass/ui/components/QueryTarget.js similarity index 100% rename from ui/components/QueryTarget.js rename to hyperglass/ui/components/QueryTarget.js diff --git a/ui/components/QueryType.js b/hyperglass/ui/components/QueryType.js similarity index 100% rename from ui/components/QueryType.js rename to hyperglass/ui/components/QueryType.js diff --git a/ui/components/QueryVrf.js b/hyperglass/ui/components/QueryVrf.js similarity index 100% rename from ui/components/QueryVrf.js rename to hyperglass/ui/components/QueryVrf.js diff --git a/ui/components/RequeryButton.js b/hyperglass/ui/components/RequeryButton.js similarity index 100% rename from ui/components/RequeryButton.js rename to hyperglass/ui/components/RequeryButton.js diff --git a/ui/components/ResetButton.js b/hyperglass/ui/components/ResetButton.js similarity index 100% rename from ui/components/ResetButton.js rename to hyperglass/ui/components/ResetButton.js diff --git a/ui/components/ResolvedTarget.js b/hyperglass/ui/components/ResolvedTarget.js similarity index 100% rename from ui/components/ResolvedTarget.js rename to hyperglass/ui/components/ResolvedTarget.js diff --git a/ui/components/Result.js b/hyperglass/ui/components/Result.js similarity index 100% rename from ui/components/Result.js rename to hyperglass/ui/components/Result.js diff --git a/ui/components/ResultHeader.js b/hyperglass/ui/components/ResultHeader.js similarity index 100% rename from ui/components/ResultHeader.js rename to hyperglass/ui/components/ResultHeader.js diff --git a/ui/components/Results.js b/hyperglass/ui/components/Results.js similarity index 100% rename from ui/components/Results.js rename to hyperglass/ui/components/Results.js diff --git a/ui/components/SubmitButton.js b/hyperglass/ui/components/SubmitButton.js similarity index 100% rename from ui/components/SubmitButton.js rename to hyperglass/ui/components/SubmitButton.js diff --git a/ui/components/Table.js b/hyperglass/ui/components/Table.js similarity index 100% rename from ui/components/Table.js rename to hyperglass/ui/components/Table.js diff --git a/ui/components/Title.js b/hyperglass/ui/components/Title.js similarity index 100% rename from ui/components/Title.js rename to hyperglass/ui/components/Title.js diff --git a/ui/components/useConfig.js b/hyperglass/ui/components/useConfig.js similarity index 100% rename from ui/components/useConfig.js rename to hyperglass/ui/components/useConfig.js diff --git a/ui/hooks/useColored.js b/hyperglass/ui/hooks/useColored.js similarity index 100% rename from ui/hooks/useColored.js rename to hyperglass/ui/hooks/useColored.js diff --git a/ui/next.config.js b/hyperglass/ui/next.config.js similarity index 100% rename from ui/next.config.js rename to hyperglass/ui/next.config.js diff --git a/ui/nextdev.js b/hyperglass/ui/nextdev.js similarity index 100% rename from ui/nextdev.js rename to hyperglass/ui/nextdev.js diff --git a/ui/package.json b/hyperglass/ui/package.json similarity index 100% rename from ui/package.json rename to hyperglass/ui/package.json diff --git a/ui/pages/_app.js b/hyperglass/ui/pages/_app.js similarity index 100% rename from ui/pages/_app.js rename to hyperglass/ui/pages/_app.js diff --git a/ui/pages/_document.js b/hyperglass/ui/pages/_document.js similarity index 100% rename from ui/pages/_document.js rename to hyperglass/ui/pages/_document.js diff --git a/ui/pages/_error.js b/hyperglass/ui/pages/_error.js similarity index 100% rename from ui/pages/_error.js rename to hyperglass/ui/pages/_error.js diff --git a/ui/pages/index.js b/hyperglass/ui/pages/index.js similarity index 100% rename from ui/pages/index.js rename to hyperglass/ui/pages/index.js diff --git a/ui/public/noflash.js b/hyperglass/ui/public/noflash.js similarity index 100% rename from ui/public/noflash.js rename to hyperglass/ui/public/noflash.js diff --git a/ui/theme.js b/hyperglass/ui/theme.js similarity index 100% rename from ui/theme.js rename to hyperglass/ui/theme.js diff --git a/ui/util.js b/hyperglass/ui/util.js similarity index 100% rename from ui/util.js rename to hyperglass/ui/util.js diff --git a/ui/webpack.config.js b/hyperglass/ui/webpack.config.js similarity index 100% rename from ui/webpack.config.js rename to hyperglass/ui/webpack.config.js diff --git a/ui/yarn.lock b/hyperglass/ui/yarn.lock similarity index 100% rename from ui/yarn.lock rename to hyperglass/ui/yarn.lock diff --git a/hyperglass/util.py b/hyperglass/util.py index 6a7126d..aad36cc 100644 --- a/hyperglass/util.py +++ b/hyperglass/util.py @@ -88,7 +88,7 @@ async def build_ui(app_path): import asyncio from pathlib import Path - ui_dir = Path(__file__).parent.parent / "ui" + ui_dir = Path(__file__).parent / "ui" build_dir = app_path / "static" / "ui" build_command = "node_modules/.bin/next build" @@ -262,7 +262,7 @@ def migrate_static_assets(app_path): from pathlib import Path from filecmp import dircmp - asset_dir = Path(__file__).parent.parent / "images" + asset_dir = Path(__file__).parent / "images" target_dir = app_path / "static" / "images" target_exists = target_dir.exists() @@ -302,7 +302,7 @@ async def check_node_modules(): """ from pathlib import Path - ui_path = Path(__file__).parent.parent / "ui" + ui_path = Path(__file__).parent / "ui" node_modules = ui_path / "node_modules" exists = node_modules.exists() @@ -327,7 +327,7 @@ async def node_initial(dev_mode=False): import asyncio from pathlib import Path - ui_path = Path(__file__).parent.parent / "ui" + ui_path = Path(__file__).parent / "ui" mode = "" if not dev_mode: diff --git a/pyproject.toml b/pyproject.toml index 01d2910..004d87e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,8 +11,6 @@ readme = "README.md" homepage = "https://hyperglass.io" repository = "https://github.com/checktheroads/hyperglass" license = "BSD-3-Clause-Clear" -packages = [{include = "images"}, {include = "ui"}] -include = ["images/**/*", "ui/**/*"] [tool.poetry.scripts] hyperglass = "hyperglass.console:CLI"