Skip to content

Commit

Permalink
ref: revert js display version
Browse files Browse the repository at this point in the history
  • Loading branch information
SharkEzz committed Jan 5, 2022
1 parent a533395 commit 17c3b44
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 17 deletions.
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ RUN npm i && npm run build

FROM debian:bullseye as sattrack_runner

ENV VITE_SATTRACK_VERSION=devel

RUN apt-get update && apt-get install curl -y
WORKDIR /app
COPY --from=sattrack-back_builder /app/sattrack .
RUN mkdir /app/database
RUN mkdir /app/data
COPY --from=sattrack-front_builder /app/dist ./public

ENTRYPOINT [ "/app/sattrack", "-update" ]
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ sattrack-front:
npm --prefix js run build
mkdir public
mv js/dist/* public
rm -rf js/dist

clean:
rm -rf sattrack public data database/local.db js/dist
rm -rf sattrack public data/local.db js/dist
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
networks:
- proxy
volumes:
- ./data:/app/database:delegated
- ./data:/app/data:delegated
labels:
- "traefik.enable=true"
- "traefik.http.routers.sattrack.entrypoints=http"
Expand Down
1 change: 0 additions & 1 deletion js/.env

This file was deleted.

1 change: 1 addition & 0 deletions js/src/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_APP_VERSION=v0.0.1
6 changes: 1 addition & 5 deletions js/src/components/UI/Navbar.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
import { Navbar as BSNavbar, Container, Nav } from 'react-bootstrap';
import { Link } from 'react-router-dom';
import getVersion from '../../utils/getVersion';

function Navbar() {
return (
<BSNavbar bg="dark" className="navbar-dark mb-3" expand="lg">
<Container>
<BSNavbar.Brand href="#home">
SatTrack
<small className="ms-1 fs-6 text-muted">{getVersion()}</small>
</BSNavbar.Brand>
<BSNavbar.Brand href="#home">SatTrack</BSNavbar.Brand>
<BSNavbar.Toggle aria-controls="basic-navbar-nav" />
<BSNavbar.Collapse id="basic-navbar-nav">
<Nav>
Expand Down
5 changes: 0 additions & 5 deletions js/src/utils/getVersion.ts

This file was deleted.

2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func main() {
log.Println("Starting", appName, version)
flag.Parse()

db := database.Init("./database/local.db")
db := database.Init("./data/local.db")

if *shouldUpdate {
services.UpdateDatabase(*tleListURL, db)
Expand Down

0 comments on commit 17c3b44

Please sign in to comment.