Merge pull request #119 from flanksource/v2

V2
flanksource · Apr 5, 2022 · ecbf152 · ecbf152
2 parents c6db008 + d31f8fe
commit ecbf152
Show file tree

Hide file tree

Showing 171 changed files with 31,956 additions and 1,095 deletions.
diff --git a/.env b/.env
@@ -1,3 +1,5 @@
 SKIP_PREFLIGHT_CHECK=true
 PORT=3004
 
+REACT_APP_TEMP_USER_ID=2e8872ff-eaa1-473f-9fd9-823235804d30
+REACT_APP_INCIDENT_COMMANDER_BASE_API=https://incident-commander.canary.lab.flanksource.com:443/db
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,6 @@ yarn-debug.log*
 yarn-error.log*
 src/data/*.real.json
 .vscode
+.idea/
+
+/src/setupProxy.js
diff --git a/.prettierrc b/.prettierrc
@@ -1,6 +1,6 @@
 {
-    "semi": true,
-    "singleQuote": false,
-    "trailingComma": "none"
-  }
-  
+  "semi": true,
+  "singleQuote": false,
+  "trailingComma": "none",
+  "endOfLine": "auto"
+}