Skip to content

Commit

Permalink
rename app to frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
vincerubinetti committed Sep 25, 2024
1 parent f85206c commit 0b7dd78
Show file tree
Hide file tree
Showing 146 changed files with 16 additions and 310 deletions.
4 changes: 2 additions & 2 deletions .env.TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
# specified environment
DEFAULT_ENV=dev

# if 0, doesn't open a browser to the frontend webapp on a normal stack launch
# if 0, doesn't open a browser to the frontend web app on a normal stack launch
DO_OPEN_BROWSER=1

# app database (postgres)
# database (postgres)
POSTGRES_USER=molevolvr
POSTGRES_PASSWORD=
POSTGRES_DB=molevolvr
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MolEvolvR Stack

This repo contains the implementation of the MolEvolvR stack, i.e.:
- `app`: the frontend webapp, written in React
- `frontend`: the frontend web app, written in React
- `backend`: a backend written in [Plumber](https://www.rplumber.io/index.html)
- `cluster`: the containerized SLURM "cluster" on which jobs are run
- `services`: a collection of services on which the stack relies:
Expand Down
284 changes: 0 additions & 284 deletions app/public/mockServiceWorker.js

This file was deleted.

6 changes: 3 additions & 3 deletions docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ services:
depends_on:
- "dev-db"

app:
frontend:
build:
context: ./app
context: ./frontend
target: dev
volumes:
- ./app/src:/app/src
- ./frontend:/app/frontend
environment:
- 'VITE_API=http://localhost:9050'
ports:
Expand Down
12 changes: 6 additions & 6 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
volumes:
app_bundle:
frontend_dist:
caddy_data:
caddy_config:

services:
app:
frontend:
image: molevolvr-frontend
build:
context: ./app
context: ./frontend
target: release
volumes:
- app_bundle:/app/dist
- frontend_dist:/app/frontend/dist
depends_on:
- backend

Expand All @@ -20,9 +20,9 @@ services:
- "80:80"
- "443:443"
volumes:
- app_bundle:/srv
- frontend_dist:/srv
- ./services/caddy/Caddyfile:/etc/caddy/Caddyfile
- caddy_data:/data
- caddy_config:/config
depends_on:
- app
- frontend
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ services:
db:
condition: service_healthy

app:
hostname: app-${TARGET_ENV}
frontend:
hostname: frontend-${TARGET_ENV}
image: molevolvr-frontend
build: ./app
build: ./frontend
depends_on:
- backend

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 1 addition & 11 deletions run_stack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#
# the current environments are as follows (contact FSA for details):
# - prod: the production environment, which runs the full stack, including the
# shiny app, the job scheduler, and the accounting database. it's the most
# web app, the job scheduler, and the accounting database. it's the most
# resource-intensive environment, and is intended for use in production.
# - dev/staging: these are effectively dev environments that specific users run
# on the server for testing purposes.
Expand Down Expand Up @@ -140,16 +140,6 @@ case ${TARGET_ENV} in
# watch the logs after, since we detached after bringing up the stack
POST_LAUNCH_CMD="${COMPOSE_CMD} logs -f"
;;
"app")
# launches just the services necessary to run the shiny app, for frontend development.
# note that you won't be able to submit jobs or query the accounting database.
DEFAULT_ARGS="up"
COMPOSE_CMD="docker compose -f docker-compose.apponly.yml"
DO_CLEAR="1"
SKIP_BUILD="1" # don't build images for the app environment, since it uses so few of them
# watch the logs after, since we detached after bringing up the stack
# POST_LAUNCH_CMD="${COMPOSE_CMD} logs -f app"
;;
*)
echo "ERROR: Unknown target environment: ${TARGET_ENV}"
exit 1
Expand Down

0 comments on commit 0b7dd78

Please sign in to comment.