moved frontend out

visualDust · Dec 2, 2023 · 03b44cd · 03b44cd
1 parent 39d4925
commit 03b44cd
Show file tree

Hide file tree

Showing 59 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/build-and-publish-pypi.yml b/.github/workflows/build-and-publish-pypi.yml
@@ -25,14 +25,14 @@ jobs:
         with:
           node-version: 18
           cache: "yarn"
-          cache-dependency-path: "neetbox/frontend/yarn.lock"
+          cache-dependency-path: "frontend/yarn.lock"
       - name: setup yarn
         run: corepack enable
-        working-directory: neetbox/frontend
+        working-directory: frontend
       - run: yarn install --frozen-lockfile
-        working-directory: neetbox/frontend
+        working-directory: frontend
       - run: yarn build
-        working-directory: neetbox/frontend
+        working-directory: frontend
       - name: Build and publish to pypi
         uses: JRubics/[email protected]
         with:

diff --git a/.github/workflows/build-frontend.yml b/.github/workflows/build-frontend.yml
@@ -3,25 +3,25 @@ name: Frontend Build & Lint
 on:
   push:
     paths:
-      - 'neetbox/frontend/**'
+      - 'frontend/**'
   pull_request:
     paths:
-      - 'neetbox/frontend/**'
+      - 'frontend/**'
 
 
 jobs:
   build:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: neetbox/frontend
+        working-directory: frontend
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'yarn'
-          cache-dependency-path: 'neetbox/frontend/yarn.lock'
+          cache-dependency-path: 'frontend/yarn.lock'
       - name: setup yarn
         run: corepack enable
       - run: yarn install --frozen-lockfile

diff --git a/.github/workflows/maunal-build.yml b/.github/workflows/maunal-build.yml
@@ -23,14 +23,14 @@ jobs:
         with:
           node-version: 18
           cache: "yarn"
-          cache-dependency-path: "neetbox/frontend/yarn.lock"
+          cache-dependency-path: "frontend/yarn.lock"
       - name: setup yarn
         run: corepack enable
-        working-directory: neetbox/frontend
+        working-directory: frontend
       - run: yarn install --frozen-lockfile
-        working-directory: neetbox/frontend
+        working-directory: frontend
       - run: yarn build
-        working-directory: neetbox/frontend
+        working-directory: frontend
       - name: Build and publish to pypi
         uses: JRubics/[email protected]
         with:

diff --git a/neetbox/frontend/.eslintrc.cjs → frontend/.eslintrc.cjs b/neetbox/frontend/.eslintrc.cjs → frontend/.eslintrc.cjs
diff --git a/neetbox/frontend/.gitignore → frontend/.gitignore b/neetbox/frontend/.gitignore → frontend/.gitignore
diff --git a/neetbox/frontend/README.md → frontend/README.md b/neetbox/frontend/README.md → frontend/README.md
diff --git a/neetbox/frontend/index.html → frontend/index.html b/neetbox/frontend/index.html → frontend/index.html
diff --git a/neetbox/frontend/package.json → frontend/package.json b/neetbox/frontend/package.json → frontend/package.json
diff --git a/neetbox/frontend/public/logo.svg → frontend/public/logo.svg b/neetbox/frontend/public/logo.svg → frontend/public/logo.svg
diff --git a/neetbox/frontend/public/vite.svg → frontend/public/vite.svg b/neetbox/frontend/public/vite.svg → frontend/public/vite.svg
diff --git a/neetbox/frontend/src/App.tsx → frontend/src/App.tsx b/neetbox/frontend/src/App.tsx → frontend/src/App.tsx
diff --git a/.../components/dashboard/project/actions.tsx → .../components/dashboard/project/actions.tsx b/.../components/dashboard/project/actions.tsx → .../components/dashboard/project/actions.tsx
diff --git a/...s/dashboard/project/hardware/cpugraph.tsx → ...s/dashboard/project/hardware/cpugraph.tsx b/...s/dashboard/project/hardware/cpugraph.tsx → ...s/dashboard/project/hardware/cpugraph.tsx
diff --git a/...s/dashboard/project/hardware/gpugraph.tsx → ...s/dashboard/project/hardware/gpugraph.tsx b/...s/dashboard/project/hardware/gpugraph.tsx → ...s/dashboard/project/hardware/gpugraph.tsx
diff --git a/...ents/dashboard/project/hardware/index.tsx → ...ents/dashboard/project/hardware/index.tsx b/...ents/dashboard/project/hardware/index.tsx → ...ents/dashboard/project/hardware/index.tsx
diff --git a/...s/dashboard/project/hardware/ramgraph.tsx → ...s/dashboard/project/hardware/ramgraph.tsx b/...s/dashboard/project/hardware/ramgraph.tsx → ...s/dashboard/project/hardware/ramgraph.tsx
diff --git a/...nents/dashboard/project/hardware/utils.ts → ...nents/dashboard/project/hardware/utils.ts b/...nents/dashboard/project/hardware/utils.ts → ...nents/dashboard/project/hardware/utils.ts
diff --git a/...c/components/dashboard/project/images.tsx → ...c/components/dashboard/project/images.tsx b/...c/components/dashboard/project/images.tsx → ...c/components/dashboard/project/images.tsx
diff --git a/...omponents/dashboard/project/logs/logs.css → ...omponents/dashboard/project/logs/logs.css b/...omponents/dashboard/project/logs/logs.css → ...omponents/dashboard/project/logs/logs.css
diff --git a/...omponents/dashboard/project/logs/logs.tsx → ...omponents/dashboard/project/logs/logs.tsx b/...omponents/dashboard/project/logs/logs.tsx → ...omponents/dashboard/project/logs/logs.tsx
diff --git a/...nents/dashboard/project/platformProps.tsx → ...nents/dashboard/project/platformProps.tsx b/...nents/dashboard/project/platformProps.tsx → ...nents/dashboard/project/platformProps.tsx
diff --git a/neetbox/frontend/src/components/echarts.tsx → frontend/src/components/echarts.tsx b/neetbox/frontend/src/components/echarts.tsx → frontend/src/components/echarts.tsx
diff --git a/...ntend/src/components/layout/AppFooter.tsx → frontend/src/components/layout/AppFooter.tsx b/...ntend/src/components/layout/AppFooter.tsx → frontend/src/components/layout/AppFooter.tsx
diff --git a/...ntend/src/components/layout/AppHeader.tsx → frontend/src/components/layout/AppHeader.tsx b/...ntend/src/components/layout/AppHeader.tsx → frontend/src/components/layout/AppHeader.tsx
diff --git a/...ntend/src/components/layout/AppLayout.tsx → frontend/src/components/layout/AppLayout.tsx b/...ntend/src/components/layout/AppLayout.tsx → frontend/src/components/layout/AppLayout.tsx
diff --git a/...d/src/components/layout/ConsoleLayout.tsx → ...d/src/components/layout/ConsoleLayout.tsx b/...d/src/components/layout/ConsoleLayout.tsx → ...d/src/components/layout/ConsoleLayout.tsx
diff --git a/neetbox/frontend/src/components/loading.tsx → frontend/src/components/loading.tsx b/neetbox/frontend/src/components/loading.tsx → frontend/src/components/loading.tsx
diff --git a/...x/frontend/src/components/logo.module.css → frontend/src/components/logo.module.css b/...x/frontend/src/components/logo.module.css → frontend/src/components/logo.module.css
diff --git a/neetbox/frontend/src/components/logo.tsx → frontend/src/components/logo.tsx b/neetbox/frontend/src/components/logo.tsx → frontend/src/components/logo.tsx
diff --git a/.../frontend/src/components/sectionTitle.tsx → frontend/src/components/sectionTitle.tsx b/.../frontend/src/components/sectionTitle.tsx → frontend/src/components/sectionTitle.tsx
diff --git a/...frontend/src/components/themeSwitcher.tsx → frontend/src/components/themeSwitcher.tsx b/...frontend/src/components/themeSwitcher.tsx → frontend/src/components/themeSwitcher.tsx
diff --git a/neetbox/frontend/src/hooks/useMemoJSON.ts → frontend/src/hooks/useMemoJSON.ts b/neetbox/frontend/src/hooks/useMemoJSON.ts → frontend/src/hooks/useMemoJSON.ts
diff --git a/neetbox/frontend/src/hooks/useProject.ts → frontend/src/hooks/useProject.ts b/neetbox/frontend/src/hooks/useProject.ts → frontend/src/hooks/useProject.ts
diff --git a/neetbox/frontend/src/hooks/useTheme.tsx → frontend/src/hooks/useTheme.tsx b/neetbox/frontend/src/hooks/useTheme.tsx → frontend/src/hooks/useTheme.tsx
diff --git a/neetbox/frontend/src/index.css → frontend/src/index.css b/neetbox/frontend/src/index.css → frontend/src/index.css
diff --git a/neetbox/frontend/src/main.tsx → frontend/src/main.tsx b/neetbox/frontend/src/main.tsx → frontend/src/main.tsx
diff --git a/neetbox/frontend/src/pages/console/index.tsx → frontend/src/pages/console/index.tsx b/neetbox/frontend/src/pages/console/index.tsx → frontend/src/pages/console/index.tsx
diff --git a/...x/frontend/src/pages/console/overview.tsx → frontend/src/pages/console/overview.tsx b/...x/frontend/src/pages/console/overview.tsx → frontend/src/pages/console/overview.tsx
diff --git a/...nd/src/pages/console/projectDashboard.tsx → ...nd/src/pages/console/projectDashboard.tsx b/...nd/src/pages/console/projectDashboard.tsx → ...nd/src/pages/console/projectDashboard.tsx
diff --git a/...ox/frontend/src/pages/console/sidebar.tsx → frontend/src/pages/console/sidebar.tsx b/...ox/frontend/src/pages/console/sidebar.tsx → frontend/src/pages/console/sidebar.tsx
diff --git a/...frontend/src/pages/login/index.module.css → frontend/src/pages/login/index.module.css b/...frontend/src/pages/login/index.module.css → frontend/src/pages/login/index.module.css
diff --git a/neetbox/frontend/src/pages/login/index.tsx → frontend/src/pages/login/index.tsx b/neetbox/frontend/src/pages/login/index.tsx → frontend/src/pages/login/index.tsx
diff --git a/neetbox/frontend/src/services/api.ts → frontend/src/services/api.ts b/neetbox/frontend/src/services/api.ts → frontend/src/services/api.ts
diff --git a/...frontend/src/services/projectWebsocket.ts → frontend/src/services/projectWebsocket.ts b/...frontend/src/services/projectWebsocket.ts → frontend/src/services/projectWebsocket.ts
diff --git a/neetbox/frontend/src/services/projects.ts → frontend/src/services/projects.ts b/neetbox/frontend/src/services/projects.ts → frontend/src/services/projects.ts
diff --git a/...frontend/src/services/serviceProvider.tsx → frontend/src/services/serviceProvider.tsx b/...frontend/src/services/serviceProvider.tsx → frontend/src/services/serviceProvider.tsx
diff --git a/neetbox/frontend/src/services/types.ts → frontend/src/services/types.ts b/neetbox/frontend/src/services/types.ts → frontend/src/services/types.ts
diff --git a/neetbox/frontend/src/styles/global.css → frontend/src/styles/global.css b/neetbox/frontend/src/styles/global.css → frontend/src/styles/global.css
diff --git a/neetbox/frontend/src/utils/betterAtom.ts → frontend/src/utils/betterAtom.ts b/neetbox/frontend/src/utils/betterAtom.ts → frontend/src/utils/betterAtom.ts
diff --git a/neetbox/frontend/src/vite-env.d.ts → frontend/src/vite-env.d.ts b/neetbox/frontend/src/vite-env.d.ts → frontend/src/vite-env.d.ts
diff --git a/neetbox/frontend/tsconfig.json → frontend/tsconfig.json b/neetbox/frontend/tsconfig.json → frontend/tsconfig.json
diff --git a/neetbox/frontend/tsconfig.node.json → frontend/tsconfig.node.json b/neetbox/frontend/tsconfig.node.json → frontend/tsconfig.node.json
diff --git a/neetbox/frontend/vite.config.ts → frontend/vite.config.ts b/neetbox/frontend/vite.config.ts → frontend/vite.config.ts
@@ -28,6 +28,6 @@ export default defineConfig({
     },
   },
   build: {
-    outDir: "../frontend_dist",
+    outDir: "../neetbox/frontend_dist",
   },
 });
diff --git a/neetbox/frontend/yarn.lock → frontend/yarn.lock b/neetbox/frontend/yarn.lock → frontend/yarn.lock
diff --git a/neetbox.code-workspace b/neetbox.code-workspace
@@ -4,8 +4,8 @@
 			"path": "."
 		},
 		{
-			"path": "neetbox/frontend"
+			"path": "frontend"
 		}
 	],
 	"settings": {}
-}
+}
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,7 +26,7 @@ classifiers = [
     "Topic :: Utilities",
 ]
 
-exclude = ["neetbox/frontend"]
+exclude = ["frontend"]
 include = ["neetbox/frontend_dist"]
 
 # [[tool.poetry.source]]

diff --git a/scripts/dev.sh b/scripts/dev.sh
@@ -9,7 +9,7 @@ tmux split-window -h
 tmux send 'cd tests/client' ENTER
 tmux send 'python test.py' ENTER
 tmux split-window -f
-tmux send 'cd neetbox/frontend' ENTER
+tmux send 'cd frontend' ENTER
 tmux send 'yarn dev' ENTER
 tmux set mouse on
 tmux a -t neetbox
diff --git a/scripts/install.sh b/scripts/install.sh
@@ -4,5 +4,5 @@
 cd $(dirname $0)/..
 
 tmux new-session -d -s neetbox 'poetry install || sleep 5'
-tmux split-window -c neetbox/frontend 'yarn || sleep 5'
+tmux split-window -c frontend 'yarn || sleep 5'
 tmux a -t neetbox
diff --git a/scripts/release.linux.sh b/scripts/release.linux.sh
@@ -4,7 +4,7 @@
 cd $(dirname $0)/..
 
 # build frontend
-pushd neetbox/frontend
+pushd frontend
 yarn build
 popd