refactor: organize local artifacts into dir

code and data related to running and testing the app locally
cal-itp · Jun 10, 2021 · 536cc0b · 536cc0b
1 parent 03ec645
commit 536cc0b
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 12 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,8 +1,7 @@
 .git/
 .github/
 .vscode/
-keys/
-server/
+localhost/
 **/__pycache__/
 .devcontainer.json
 .flake8

diff --git a/.env.sample b/.env.sample
@@ -13,7 +13,7 @@ DJANGO_ADMIN=false
 DJANGO_ALLOWED_HOSTS="localhost 127.0.0.1 [::1]"
 DJANGO_DB=django
 DJANGO_DEBUG=true
-DJANGO_INIT_PATH=data/client.json
+DJANGO_INIT_PATH=localhost/data/client.json
 DJANGO_LOCAL_PORT=8000
 DJANGO_LOG_LEVEL=DEBUG
 DJANGO_SECRET_KEY=secret

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -24,7 +24,7 @@
             },
             "pathMappings": [
                 {
-                    "localRoot": "${workspaceFolder}/server",
+                    "localRoot": "${workspaceFolder}/localhost/server",
                     "remoteRoot": "/usr/src/server"
                 }
             ]

diff --git a/README.md b/README.md
@@ -36,7 +36,8 @@ After initialization, the client is running at `http://localhost:${DJANGO_LOCAL_
 If `DJANGO_ADMIN=true`, the backend administrative interface can be accessed with the superuser you setup at
 <http://localhost:8000/admin>.
 
-By default, sample data from [`data/client.json`](./data/client.json) is used to initialize Django. Alternatively you may:
+By default, sample data from [`localhost/data/client.json`](./localhost/data/client.json) is used to initialize Django.
+Alternatively you may:
 
 * Modify the sample data file; or
 * Point `DJANGO_INIT_PATH` at a different data file; or
@@ -59,7 +60,7 @@ docker-compose up [-d] --build server
 
 The API endpoint is running at `http://localhost:5000/verify`.
 
-Sample users and eligibility can be found in [`data/server.json`](./data/server.json).
+Sample users and eligibility can be found in [`localhost/data/server.json`](./localhost/data/server.json).
 
 ## Development
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
   dev:
     build:
       context: .
-      dockerfile: Dockerfile.dev
+      dockerfile: ./localhost/Dockerfile.dev
     image: benefits_client:dev
     environment:
       - ANALYTICS_KEY
@@ -53,7 +53,7 @@ services:
       - .:/home/calitp/app:cached
 
   server:
-    build: ./server
+    build: ./localhost/server
     image: eligibility_verification_server:dev
     command: python -m debugpy --listen 0.0.0.0:5789 app.py
     environment:
@@ -64,9 +64,9 @@ services:
       - "5000:5000"
       - "5789:5789"
     volumes:
-      - ./server:/usr/src/server:cached
-      - ./data:/usr/src/server/data
-      - ./keys:/usr/src/server/keys
+      - ./localhost/server:/usr/src/server:cached
+      - ./localhost/data:/usr/src/server/data
+      - ./localhost/keys:/usr/src/server/keys
 
   s3config:
     image: amazon/aws-cli

diff --git a/Dockerfile.dev → localhost/Dockerfile.dev b/Dockerfile.dev → localhost/Dockerfile.dev
diff --git a/data/client.json → localhost/data/client.json b/data/client.json → localhost/data/client.json
diff --git a/data/server.json → localhost/data/server.json b/data/server.json → localhost/data/server.json
diff --git a/keys/README.md → localhost/keys/README.md b/keys/README.md → localhost/keys/README.md
diff --git a/keys/client.key → localhost/keys/client.key b/keys/client.key → localhost/keys/client.key
diff --git a/keys/client.pub → localhost/keys/client.pub b/keys/client.pub → localhost/keys/client.pub
diff --git a/keys/server.key → localhost/keys/server.key b/keys/server.key → localhost/keys/server.key
diff --git a/keys/server.pub → localhost/keys/server.pub b/keys/server.pub → localhost/keys/server.pub
diff --git a/server/Dockerfile → localhost/server/Dockerfile b/server/Dockerfile → localhost/server/Dockerfile
diff --git a/server/app.py → localhost/server/app.py b/server/app.py → localhost/server/app.py
@@ -216,4 +216,4 @@ def get(self):
 
 
 if __name__ == "__main__":
-    app.run(host="0.0.0.0", debug=True)
+    app.run(host="0.0.0.0", debug=True)  # nosec
diff --git a/server/requirements.txt → localhost/server/requirements.txt b/server/requirements.txt → localhost/server/requirements.txt
diff --git a/server/static/tokenize.js → localhost/server/static/tokenize.js b/server/static/tokenize.js → localhost/server/static/tokenize.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -216,4 +216,4 @@ def get(self):


		if __name__ == "__main__":
		app.run(host="0.0.0.0", debug=True)
		app.run(host="0.0.0.0", debug=True) # nosec