Skip to content

Commit

Permalink
Not very good but at least im working on something
Browse files Browse the repository at this point in the history
  • Loading branch information
KenwoodFox committed Dec 26, 2023
1 parent dc6499a commit d0388d5
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 21 deletions.
12 changes: 10 additions & 2 deletions Houston-UI/MissionController/static/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ body {
background: rgb(49, 49, 49);
}

#system {
grid-column: 3;
grid-row: 1;
background: rgb(49, 49, 49);
}

#camera {
background: rgb(84, 84, 84);
grid-column: 1;
Expand All @@ -45,12 +51,14 @@ body {

#graphs {
background: rgb(84, 84, 84);
grid-column: 2;
grid-column-start: 2;
grid-column-end: 3;
grid-row: 2;
}

#status {
grid-column: 1 / span 2;
grid-column-start: 1;
grid-column-end: 3;
grid-row: 3;
font-size: 10vh;
background: rgb(49, 49, 49);
Expand Down
1 change: 1 addition & 0 deletions Houston-UI/MissionController/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<div id="wrapper">
{% include "windows/logbook.html" %}
{% include "windows/system.html" %}
{% include "windows/camera.html" %}
{% include "windows/graphs.html" %}
{% include "windows/statusbar.html" %}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="logbook" class="logbook">
<div id="system" class="system">
<table>
<tr>
<th>t-</th>
Expand Down
14 changes: 14 additions & 0 deletions Houston-UI/MissionController/templates/windows/system.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<div id="logbook" class="logbook">
<table>
<tr>
<th>Container</th>
<th>Version</th>
<th>Health</th>
</tr>
<tr>
<td>Houston-UI</td>
<td>None</td>
<td>Healthy</td>
</tr>
</table>
</div>
40 changes: 23 additions & 17 deletions Houston-UI/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,34 @@
version: '3.7'
version: "3.7"

services:
# db:
# image: postgres:10.5
# restart: always
# environment:
# - POSTGRES_USER=postgres
# - POSTGRES_PASSWORD=postgres
# - POSTGRES_DB=snub_db
# logging:
# options:
# max-size: 10m
# max-file: "3"
db:
image: postgres:latest
restart: "no"
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
- POSTGRES_DB=snub_db
logging:
options:
max-size: 10m
max-file: "3"
ports:
- "5438:5432"
tmpfs: /var/lib/postgresql/data

# adminer:
# image: adminer
# restart: "no"
# ports:
# - '5438:5432'
# tmpfs: /var/lib/postgresql/data
# - 8080:8081

Houston-UI:
image: houston_ui:$TAG
build:
context: .
dockerfile: Dockerfile
# links:
# - "db:database"
links:
- "db:database"
ports:
- '8080:8080'
- "8080:8080"
restart: "no"
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3.8'
version: "3.8"

services:
MissionController:
Expand Down

0 comments on commit d0388d5

Please sign in to comment.