Merge pull request #2 from Alystrasz/feat/new-ui

Full UI rework
R2NorthstarTools · Oct 4, 2022 · dd2f376 · dd2f376
2 parents 7f0ee9b + 5912e98
commit dd2f376
Show file tree

Hide file tree

Showing 33 changed files with 2,769 additions and 13 deletions.
diff --git a/.github/workflows/push-test.yml b/.github/workflows/push-test.yml
@@ -43,7 +43,7 @@ jobs:
         TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
       run: |
         npm install
-        ./node_modules/.bin/rollup --config
+        cd src-vue && npm install && cd ..
         npm run tauri build
     - uses: tauri-apps/tauri-action@v0
       env:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -44,7 +44,7 @@ jobs:
         TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
       run: |
         npm install
-        ./node_modules/.bin/rollup --config
+        cd src-vue && npm install && cd ..
         npm run tauri build
     - uses: tauri-apps/tauri-action@v0
       env:

diff --git a/README.md b/README.md
@@ -17,14 +17,16 @@ Install `npm` dependencies with
 npm install
 ```
 
-Then for developing
+Install UI dependencies too
 
 ```sh
-# terminal 1 (UI localhost for hot-reload)
-npm run ui-dev
+cd src-vue && npm install
+```
 
-# terminal 2 (for the Rust/App hot-reload)
-npm run tauri dev
+Then for developing
+
+```sh
+npx tauri dev
 ```
 
 > **Note**

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,10 +1,10 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "build": {
-    "beforeBuildCommand": "",
-    "beforeDevCommand": "",
-    "devPath": "http://localhost:8080/",
-    "distDir": "../dist"
+    "beforeBuildCommand": "cd src-vue && npm run build",
+    "beforeDevCommand": "cd src-vue && npm run dev",
+    "devPath": "http://localhost:5173/",
+    "distDir": "../src-vue/dist"
   },
   "package": {
     "productName": "flightcore",
@@ -62,8 +62,13 @@
       {
         "fullscreen": false,
         "resizable": true,
-        "title": "FlightCore"
+        "decorations": false,
+        "title": "FlightCore",
+        "height": 600,
+        "minHeight": 300,
+        "width": 1000,
+        "minWidth": 600
       }
     ]
   }
-}
+}
diff --git a/src-ui/README.md b/src-ui/README.md
@@ -0,0 +1,3 @@
+# FlightCore frontend (deprecated)
+
+This folder holds old FlightCore frontend code that is no longer used and will be removed in the future!
diff --git a/src-vue/.gitignore b/src-vue/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/src-vue/.vscode/extensions.json b/src-vue/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+  "recommendations": ["Vue.volar"]
+}
diff --git a/src-vue/README.md b/src-vue/README.md
@@ -0,0 +1,18 @@
+# FlightCore UI
+
+This folder holds FlightCore's interface repository.
+
+This is a [Vue (v4)](https://vuejs.org/) project, using [Element Plus](https://element-plus.org/en-US/) component library.
+
+## Development
+
+```shell
+# Install dependencies
+npm install
+
+# Run in development mode
+npm run dev
+
+# Build for production
+npm run build
+```
diff --git a/src-vue/index.html b/src-vue/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + Vue + TS</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# FlightCore frontend (deprecated)

		This folder holds old FlightCore frontend code that is no longer used and will be removed in the future!