meged a commit

Author: anastasia-escher

.devcontainer/devcontainer.json

@@ -8,6 +8,7 @@
 	// The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.
 	"dockerComposeFile": [
 		"../docker-compose.yml",
+		"../docker-compose.dev.yml",
 		"docker-compose.yml"
 	],
 
@@ -17,27 +18,31 @@
 
 	// The optional 'workspaceFolder' property is the path VS Code should open by default when
 	// connected. This is typically a file mount in .devcontainer/docker-compose.yml
-	"workspaceFolder": "/app",
+	"workspaceFolder": "/workspace",
 
 	// Set *default* container specific settings.json values on container create.
 	"settings": {
-		// "python.analysis.extraPaths": [
-    // 	"${workspaceFolder}/svip_api"
-  	// ],
-		// "python.testing.unittestArgs": [
-		// 	"-v",
-		// 	"-s",
-		// 	"./svip_api/api/tests",
-		// 	"-p",
-		// 	"test*.py"
-		// ],
-		"python.testing.unittestEnabled": false,
+		"remote.autoForwardPorts": false,
+		"python.analysis.extraPaths": ["${workspaceFolder}/svip_api/api"],
+		"editor.tabSize": 2,
+		"editor.insertSpaces": true,
+		"editor.formatOnSave": true,
+		"editor.formatOnPaste": false,
+		"eslint.validate": ["javascript"],
+		"python.formatting.provider": "autopep8",
 		"python.testing.pytestArgs": [
-			"./api/tests/",
+			"./svip_api/api/tests/",
 			"--exitfirst",
 			"--verbose"
 		],
-		"python.testing.pytestEnabled": true
+		"python.testing.pytestEnabled": true,
+		"python.testing.unittestEnabled": false,
+		"[vue]": {
+			"editor.defaultFormatter": "esbenp.prettier-vscode",
+			"editor.codeActionsOnSave": {
+				"source.fixAll.eslint": true
+			}
+		},
 	},
 
 	// Add the IDs of extensions you want installed when the container is created.
@@ -49,9 +54,16 @@
 		"editorconfig.editorconfig",
 		"hbenl.vscode-test-explorer",
 		"ms-vscode.test-adapter-converter",
-		"littlefoxteam.vscode-python-test-adapter"
+		"littlefoxteam.vscode-python-test-adapter",
+		"ms-azuretools.vscode-docker"
 	],
 
+	"features": {
+    "github-cli": "latest",
+		"git-lfs": "latest"
+		// "docker": "latest"
+	},
+
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
 
@@ -63,7 +75,7 @@
 
 	// Uncomment the next line to run commands after the container is created - for example installing curl.
 	// "postCreateCommand": "apt-get update && apt-get install -y curl",
-	"postCreateCommand": "pip install -r ./requirements.dev.txt"
+	"postCreateCommand": "pip install -r ./svip_api/requirements.dev.txt"
 
 	// Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
 	// "remoteUser": "vscode"

.devcontainer/docker-compose.yml

@@ -1,38 +1,8 @@
 version: '3.5'
 services:
-  # Update this to the name of the service you want to work with in your docker-compose.yml file
   api:
-    # If you want add a non-root user to your Dockerfile, you can use the "remoteUser"
-    # property in devcontainer.json to cause VS Code its sub-processes (terminals, tasks, 
-    # debugging) to execute as the user. Uncomment the next line if you want the entire 
-    # container to run as this user instead. Note that, on Linux, you may need to 
-    # ensure the UID and GID of the container user you create matches your local user. 
-    # See https://aka.ms/vscode-remote/containers/non-root for details.
-    #
-    # user: vscode
-
-    # Uncomment if you want to override the service's Dockerfile to one in the .devcontainer 
-    # folder. Note that the path of the Dockerfile and context is relative to the *primary* 
-    # docker-compose.yml file (the first in the devcontainer.json "dockerComposeFile"
-    # array). The sample below assumes your primary file is in the root of your project.
-    #
-    # build:
-    #   context: .
-    #   dockerfile: .devcontainer/Dockerfile
-
     volumes:
-      # Update this to wherever you want VS Code to mount the folder of your project
-      # - .:/workspace:cached
-
-      # Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker-compose for details.
-      - /var/run/docker.sock:/var/run/docker.sock 
-
-    # Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust.
-    # cap_add:
-    #   - SYS_PTRACE
-    # security_opt:
-    #   - seccomp:unconfined
-
-    # Overrides default command so things don't shut down after the process ends.
-    command: /bin/sh -c "while sleep 1000; do :; done"
- 
+      - .:/workspace:cached
+      - ${HOME}/.gitconfig:/root/.gitconfig
+      - ${HOME}/.ssh:/root/.ssh
+      - /var/run/docker.sock:/var/run/docker.sock

.gitignore

@@ -3,6 +3,7 @@
 .history
 .venv
 __pycache__
+.pytest_cache
 /.ipynb_checkpoints
 .vscode
 /svip_db_backups/**/*.dump
@@ -18,12 +19,11 @@ TODO.md
 /scratch
 
 svip_api/api/views/beacon_v2.py
-# docker-compose.override.yml
 
 # support folder containing project organization files
 .0
 svip-o-vue/src/components/help/json/convert.py
 
 svip_api/docs/site
 
-/node_modules
+/node_modules