Skip to content

Redesigned FLEUR Frontend HTML/CSS Integration #211

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.

Sign up for GitHub

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

Open
dedztbh wants to merge 6 commits into
base: frontend/fleur/integration-staging
Choose a base branch
from
Open

Redesigned FLEUR Frontend HTML/CSS Integration #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7ce9ce0
Added redesign UI in FTA.vue via iframe + flask, updated readme
dedztbh Mar 6, 2023
62a4f87
using python instead of python3
dedztbh Mar 6, 2023
1b45496
hopefully fixed submodule
dedztbh Mar 6, 2023
5f49955
adapted fleur html to vue, removed flask from electron
dedztbh Mar 7, 2023
d9d23c2
integrated fleur css into vue
dedztbh Mar 8, 2023
ef12b01
fixed modal display after switch back to fleur
dedztbh Mar 8, 2023
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
4 changes: 4 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "Apps/FrontendSoftware/public/FLEUR"]
path = Apps/FrontendSoftware/public/FLEUR
url = git@github.com:PlanetaryRobotics/FLEUR.git
branch = integration-dev
5 changes: 5 additions & 0 deletions Apps/FrontendSoftware/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Iris Terminal (2022): A Mission Operations Center Interface v.1

## **Project setup**
First, run this to get FLEUR (you need access to the FLEUR repository)
```
git submodule update --init --recursive --remote
```

Install `node@14.20.1` (it's recommended to use `nvm`), `npm`, `yarn`, and a c-compiler (`xcode` if on a mac).

**NOTE:** If using MacOS and `nvm` make sure nvm setup is in `~/.zshenv` (what normally goes in `~/.bash_profile`)
Expand Down
201 changes: 103 additions & 98 deletions Apps/FrontendSoftware/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion Apps/FrontendSoftware/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"jquery": "^3.5.1",
"js-base64": "^3.4.5",
"js-sha256": "^0.9.0",
"luxon": "^1.24.1",
"luxon": "^1.28.1",
"mime-types": "^2.1.27",
"module": "^1.2.5",
"moment": "^2.27.0",
Expand All @@ -56,6 +56,7 @@
"vue-async-computed": "^3.8.2",
"vue-cli-plugin-electron-builder": "~2.1.1",
"vue-context": "^3.4.2",
"vue-plugin-load-script": "^1.3.6",
"vue-router": "^3.1.5",
"vue-simple-svg": "^1.3.2",
"vue-template-compiler": "^2.6.11",
Expand Down
1 change: 1 addition & 0 deletions Apps/FrontendSoftware/public/FLEUR
Open in desktop
Submodule FLEUR added at 9a7174
Loading