Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI base #15

Merged
merged 63 commits into from
May 5, 2024
Merged
Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
dd05218
docs: update readme and also put sveltekit into SPA mode.
Zakrok09 Apr 25, 2024
0417f96
chore: move test files
Zakrok09 Apr 26, 2024
70b407e
chore: setups Tauri + svelte (after 2 days)
Zakrok09 Apr 27, 2024
d80c3fe
feat: abstractions for initiating commands, generic event listener an…
Zakrok09 Apr 27, 2024
ea0bd0b
fix: name of tauri commands
Zakrok09 Apr 27, 2024
05767d6
fix: some debug content
Zakrok09 Apr 27, 2024
93414a4
feat: basic layout spots and theme
Zakrok09 Apr 28, 2024
2c6c19d
feat: updated basic layout
Zakrok09 Apr 28, 2024
9cf80a5
feat: layout with draggable panels + fixes
Zakrok09 Apr 28, 2024
3569cb8
chore: icons
Zakrok09 Apr 29, 2024
139269a
fix: configurable table
Zakrok09 Apr 29, 2024
fa3c3de
fix: general design updates
Zakrok09 Apr 29, 2024
7c84012
feat: fsm component
Zakrok09 Apr 29, 2024
7e9b67b
feat: procedures tab
Zakrok09 Apr 29, 2024
e4a2ad7
feat: basic keybinds
Zakrok09 Apr 29, 2024
f628abd
feat: basic logs and filtering
Zakrok09 Apr 29, 2024
f4b481e
fix: make logs browsable
Zakrok09 Apr 29, 2024
dd8540b
chore: note
Zakrok09 Apr 29, 2024
edc25a3
feat: error channel and toasts
Zakrok09 Apr 29, 2024
40ed071
feat: keyboard shortcut for abort with fixes in tabs
Zakrok09 Apr 29, 2024
bc630a2
fix: order of filters
Zakrok09 Apr 29, 2024
5f12367
feat: tab components
Zakrok09 Apr 29, 2024
f6890d3
feat: initialisation tab
Zakrok09 Apr 29, 2024
ce71423
feat: exo2 and nunitosans fonts
Zakrok09 Apr 29, 2024
b2a909d
feat: better mono font
Zakrok09 Apr 29, 2024
396dc67
fix: panel rearrangement
Zakrok09 Apr 29, 2024
97010b2
fix: info colours update and emerg braking state glows in red
Zakrok09 Apr 29, 2024
69a069d
fix: table style fixes and responsiveness for sidebar
Zakrok09 Apr 29, 2024
3da6b85
fix: table separators
Zakrok09 Apr 29, 2024
34460fe
feat: currents tab
Zakrok09 Apr 29, 2024
94f08b1
fix: table styling fixes
Zakrok09 Apr 29, 2024
ad75e68
fix: remove easter egg
Zakrok09 Apr 30, 2024
6c7be7e
chore: config
Zakrok09 Apr 30, 2024
e2d5d9b
Merge remote-tracking branch 'origin/tauri-testing' into tauri-testing
Zakrok09 Apr 30, 2024
1b0dcf8
ci: add workflow for cross building
Zakrok09 Apr 30, 2024
785be3c
ci: fix pipeline config
Zakrok09 Apr 30, 2024
dafdd29
ci: spam attempt
Zakrok09 Apr 30, 2024
75c0ed6
ci: fix 3
Zakrok09 Apr 30, 2024
389d0e5
ci: fix 4
Zakrok09 Apr 30, 2024
24e0804
fix 5
Zakrok09 Apr 30, 2024
d3b28ed
fix 6
Zakrok09 Apr 30, 2024
24cac27
fix 7
Zakrok09 Apr 30, 2024
e485ea1
fix 8
Zakrok09 Apr 30, 2024
99f620a
ci: revert, it did work last time
Zakrok09 Apr 30, 2024
5d0a569
chore: icons update
Zakrok09 Apr 30, 2024
a2fd747
perf: optimise icon loading with <enhance:img>
Zakrok09 Apr 30, 2024
b4e8ec0
fix: topbar not cursed
Zakrok09 May 1, 2024
08797a0
fix: style title bar
Zakrok09 May 2, 2024
d7520d2
fix: optimise inputs and make chart auto resize itself
Zakrok09 May 2, 2024
5431029
fix: modularize table
Zakrok09 May 2, 2024
fc1c365
fix: styling of vitals when closed
Zakrok09 May 2, 2024
3d970ba
feat: localiser
Zakrok09 May 3, 2024
32c5601
feat: pneumatics
Zakrok09 May 3, 2024
7655b66
Merge remote-tracking branch 'origin/tauri-testing' into tauri-testing
Zakrok09 May 4, 2024
e24b539
fix: migration fixes
Zakrok09 May 4, 2024
1f9d485
fix: optimise imports
Zakrok09 May 4, 2024
97609a4
feat: tell speed + location
Zakrok09 May 4, 2024
100a0f0
feat: auto populator script
Zakrok09 May 5, 2024
fb045b7
fix: commands naming and layout of the init form
Zakrok09 May 5, 2024
05f5cb3
fix: clear console logs
Zakrok09 May 5, 2024
143fde9
feat: init run overhaul
Zakrok09 May 5, 2024
6f3ec49
refactor: chart buffering massive rework
Zakrok09 May 5, 2024
b0165a8
chore: ver
Zakrok09 May 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 77 additions & 0 deletions .github/workflows/app-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: 'App Build'

# trigger on app-v* created tags.
on:
push:
tags:
- 'app-v*'
workflow_dispatch:

jobs:
publish-tauri:
permissions:
contents: write
defaults:
run:
working-directory: ./gs
strategy:
fail-fast: false
matrix:
settings:
- platform: 'macos-latest' # for Arm based macs (M1 and above).
args: '--target aarch64-apple-darwin'
- platform: 'macos-latest' # for Intel based macs.
args: '--target x86_64-apple-darwin'
- platform: 'ubuntu-22.04' # for Tauri v1 you could replace this with ubuntu-20.04.
args: ''
- platform: 'windows-latest'
args: ''

runs-on: ${{ matrix.settings.platform }}
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: install dependencies (ubuntu only)
if: matrix.settings.platform == 'ubuntu-22.04' # This must match the platform value defined above.
run: |
sudo apt-get update
sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
# webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
# You can remove the one that doesn't apply to your app to speed up the workflow a bit.

- name: setup node
uses: actions/setup-node@v4
with:
node-version: lts/*
cache-dependency-path: ./gs/
cache: 'npm'

- name: install Rust stable
uses: dtolnay/rust-toolchain@stable
with:
# Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
targets: ${{ matrix.settings.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}

- name: Rust cache
uses: swatinem/rust-cache@v2
with:
workspaces: './station -> target'

- name: install frontend dependencies
# If you don't have `beforeBuildCommand` configured you may want to build your frontend here too.
run: npm install

- name: Build Tauri App
id: build_tauri
uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
projectPath: 'gs/station/'
releaseName: 'App v__VERSION__'
releaseBody: 'See the assets to download this version and install.'
releaseDraft: true
prerelease: false
args: ${{ matrix.settings.args }}
47 changes: 22 additions & 25 deletions gs/README.md
Original file line number Diff line number Diff line change
@@ -1,38 +1,35 @@
# create-svelte
# Ground station

Everything you need to build a Svelte project, powered by [`create-svelte`](https://github.com/sveltejs/kit/tree/main/packages/create-svelte).
This folder includes the codebase for the front-end GUI and the ground station backend.
The GUI uses [Tauri](https://tauri.app/): a Rust framework for creating native applications.
Tauri is coupled with [SvelteKit](https://kit.svelte.dev/) here: a JavaScript framework for web applications.
Tauri builds its application using the front-end from SvelteKit and creates a native executable.

## Creating a project
## Sub-folder structure:

If you're seeing this, you've probably already done this step. Congrats!
- `station/` - contains Tauri backend and ground station backend
- `src/` - contains the SvelteKit front-end of the GUI. Check out its readme for more documentation.
- `tests/` - contains software tests for the front-end/back-end
- `static/` - contains static files like images, icons, fonts.

```bash
# create a new project in the current directory
npm create svelte@latest

# create a new project in my-app
npm create svelte@latest my-app
```
## How to run the ground station GUI:

## Developing

Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a development server:
Ensure you have Rust, Tauri and Node.js installed.
If not, follow the instructions [here](https://tauri.studio/en/docs/getting-started/installation).

1. Clone the repository
```bash
npm run dev

# or start the server and open the app in a new browser tab
npm run dev -- --open
git clone [email protected]:delft-hyperloop/Helios_III.git
```

## Building

To create a production version of your app:

2. Install dependencies
```bash
npm run build
cd Helios_III/gs
npm install
```

You can preview the production build with `npm run preview`.

> To deploy your app, you may need to install an [adapter](https://kit.svelte.dev/docs/adapters) for your target environment.
3. Run the GUI
```bash
npm run tauri dev
```
Binary file added gs/app-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading