uniclogs · lylashukur · Apr 6, 2025 · Apr 8, 2025 · Apr 8, 2025 · Apr 8, 2025
diff --git a/backend/Makefile b/backend/Makefile
@@ -1,5 +1,5 @@
 docker:
-	python -m pip wheel . -w build --no-deps
+	python3 -m pip wheel . -w build --no-deps
 	docker compose build --build-arg VERSION=`grep -i 'version' pyproject.toml | cut -d'"' -f2`
 
 hub:
@@ -17,4 +17,4 @@ tiles:
 
 clean:
 	rm -rf build cesium_api.egg-info
-	pyclean
+	pyclean
diff --git a/backend/cesium_api/__main__.py b/backend/cesium_api/__main__.py
@@ -84,9 +84,6 @@ def main():
         data_dir=args.data_dir,
         debug=args.debug,
     )
-    allowed_hosts = ['http://:localhost:3000', 'https://cesium-api.uniclogs.org']
-    CORS(app, origins=allowed_hosts)
-    LOG.info(f'Allowing CORs hosts: {allowed_hosts}')
 
     app.run()
 

diff --git a/backend/cesium_api/app.py b/backend/cesium_api/app.py
@@ -5,7 +5,6 @@
 from .views import view_czml, view_groundstation, view_passes, view_satellite, view_tiles
 from .data import Data
 
-
 class App(Flask):
     host: str
     port: int
@@ -30,6 +29,9 @@ def __init__(
         self.data = data
         self.debug = debug
 
+        # CORS(self, origins=["https://cesium-api.uniclogs.org"])
+        CORS(self, origins=["http://localhost:5173"])
+
         # Register app views
         self.register_blueprint(view_czml, url_prefix=f"{api_prefix}/czml")
         self.register_blueprint(view_groundstation, url_prefix=f"{api_prefix}/gs")

diff --git a/backend/cesium_api/views/czml.py b/backend/cesium_api/views/czml.py
@@ -10,4 +10,4 @@ def get_root():
     cz = current_app.data.czml
     while len(cz) == 0:
         cz = current_app.data.czml
-    return loads(cz)
+    return loads(cz)
diff --git a/backend/cesium_api/views/tiles.py b/backend/cesium_api/views/tiles.py
@@ -4,7 +4,6 @@
 
 view_tiles = Blueprint("view_tiles", __name__)
 
-
 @view_tiles.route("/<int:zoom>/<int:x>/<int:y>.png")
 def get_tile(zoom: int, x: int, y: int):
     data_dir = current_app.data_dir

diff --git a/frontend/.env b/frontend/.env
@@ -0,0 +1 @@
+VITE_API_BASE_URL=http://127.0.0.1:9000
diff --git a/frontend/.env.development b/frontend/.env.development
@@ -0,0 +1 @@
+VITE_API_BASE_URL=http://127.0.0.1:9000
diff --git a/frontend/.env.production b/frontend/.env.production
@@ -0,0 +1 @@
+VITE_API_BASE_URL=https://cesium-api.uniclogs.org
diff --git a/frontend/.eslintignore b/frontend/.eslintignore
diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json
diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -1,94 +1,24 @@
-# Custom
-out
-
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
-# compiled output
-/dist
-/tmp
-/out-tsc
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# IDEs and editors
-.idea
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# IDE - VSCode
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-
-# misc
-.sass-cache
-connect.lock
-typings
-
 # Logs
 logs
 *.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
 
+node_modules
+dist
+dist-ssr
+*.local
 
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-
-# next.js build output
-.next
-
-# Lerna
-lerna-debug.log
-
-# System Files
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
 .DS_Store
-Thumbs.db
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -1,33 +1,29 @@
 FROM node:lts-alpine3.21
 
-ARG REST_API
-ENV REST_API="https://cesium-api.uniclogs.org"
-
 ARG APP_HOST
-ENV APP_HOST="mission.uniclogs.org"
+ENV APP_HOST="cesium.uniclogs.org"
 
 ARG APP_PORT
-ENV APP_PORT=3000
+ENV APP_PORT=7008
 
 ARG APP_DIR
 ENV APP_DIR="/srv/cesium"
 
 RUN adduser -h ${APP_DIR} -D cesium users
-COPY --chown=cesium:users --chmod=600 next.config.js ${APP_DIR}
-COPY --chown=cesium:users --chmod=600 package.json ${APP_DIR}
-COPY --chown=cesium:users --chmod=600 yarn.lock ${APP_DIR}
 
-USER cesium
-WORKDIR ${APP_DIR}
+# COPY --chown=cesium:users --chmod=755 ./* ${APP_DIR}
+COPY --chown=cesium:users --chmod=600 ./vite.config.js ${APP_DIR}
+COPY --chown=cesium:users --chmod=600 ./package.json ${APP_DIR}
+COPY --chown=cesium:users --chmod=700 ./public ${APP_DIR}/public
+COPY --chown=cesium:users --chmod=700 ./src ${APP_DIR}/src
 
-RUN yarn install
+RUN npm install -g vite@latest
 
-COPY --chown=cesium:users --chmod=700 components ${APP_DIR}/components
-COPY --chown=cesium:users --chmod=700 pages ${APP_DIR}/pages
-COPY --chown=cesium:users --chmod=700 public ${APP_DIR}/public
+USER cesium
+WORKDIR ${APP_DIR}
 
-RUN yarn build
+RUN npm install
 
 EXPOSE ${APP_PORT}
 
-CMD yarn start -p ${APP_PORT}
+CMD vite --host 0.0.0.0 --port 7008
diff --git a/frontend/Makefile b/frontend/Makefile
diff --git a/frontend/README.md b/frontend/README.md
@@ -1,29 +1,13 @@
-### Cesium Front-End Application
+# React + Vite
 
-```bash
-cd frontend
-```
+This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
 
-Install `nodejs` and `yarn` for your system
+Currently, two official plugins are available:
 
-```bash
-sudo apt install nodejs yarnpkg
-```
+- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
+- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
 
-Install JavaScript dependencies
+## Expanding the ESLint configuration
 
-```bash
-yarn install
-```
+If you are developing a production application, we recommend using TypeScript and enable type-aware lint rules. Check out the [TS template](https://github.com/vitejs/vite/tree/main/packages/create-vite/template-react-ts) to integrate TypeScript and [`typescript-eslint`](https://typescript-eslint.io) in your project.
 
-Start the app
-
-```bash
-yarn dev
-```
-
-Goto `localhost3000` in a web browser
-
-[GDAL]:https//gdal.org
-[GDAL Download]:https//gdal.org/download.html
-[CesiumJS]:https//github.com/CesiumGS/cesium
diff --git a/frontend/components/Cesium.jsx b/frontend/components/Cesium.jsx
diff --git a/frontend/docker-compose.yaml b/frontend/docker-compose.yaml
@@ -4,4 +4,4 @@ services:
     build:
       context: .
     ports:
-      - '3000:3000'
+      - '7008:7008'
diff --git a/frontend/eslint.config.js b/frontend/eslint.config.js
@@ -0,0 +1,33 @@
+import js from '@eslint/js'
+import globals from 'globals'
+import reactHooks from 'eslint-plugin-react-hooks'
+import reactRefresh from 'eslint-plugin-react-refresh'
+
+export default [
+  { ignores: ['dist'] },
+  {
+    files: ['**/*.{js,jsx}'],
+    languageOptions: {
+      ecmaVersion: 2020,
+      globals: globals.browser,
+      parserOptions: {
+        ecmaVersion: 'latest',
+        ecmaFeatures: { jsx: true },
+        sourceType: 'module',
+      },
+    },
+    plugins: {
+      'react-hooks': reactHooks,
+      'react-refresh': reactRefresh,
+    },
+    rules: {
+      ...js.configs.recommended.rules,
+      ...reactHooks.configs.recommended.rules,
+      'no-unused-vars': ['error', { varsIgnorePattern: '^[A-Z_]' }],
+      'react-refresh/only-export-components': [
+        'warn',
+        { allowConstantExport: true },
+      ],
+    },
+  },
+]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		VITE_API_BASE_URL=https://cesium-api.uniclogs.org