Re-arrange *.md files, work on dockerizing SQL Server

hackforla · Jul 2, 2020 · 5cae00b · 5cae00b
1 parent e255c75
commit 5cae00b
Show file tree

Hide file tree

Showing 18 changed files with 3,737 additions and 1,002 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1 +1,2 @@
 **/node_modules
+**/db
diff --git a/.gitignore b/.gitignore
@@ -244,3 +244,5 @@ node_modules
 
 # Yarn lockfile
 yarn.lock
+
+.mssql.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Dockerfile b/Dockerfile
@@ -6,8 +6,6 @@ WORKDIR /app
 RUN npm install
 RUN npm run build
 
-
-
 FROM node
 
 COPY --from=clientBuilder /app/build /client

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -0,0 +1,6 @@
+FROM node:lts-slim
+WORKDIR /usr/app
+COPY ./package.json ./
+RUN npm install
+COPY ./ ./
+CMD ["npm", "start"]
diff --git a/README.md b/README.md
@@ -38,16 +38,16 @@ The city will benefit by having more time to review edge cases for building deve
 
 # Feature Descriptions
 
-- [register](./register.md)
-- [forgot-password](./forgot-password.md)
+- [register](./doc/register.md)
+- [forgot-password](./doc/forgot-password.md)
 
 # How to contribute
 
 - Join the team on the Hack For LA Slack channel (#tdm-calculator), or at our weekly hack night on Tuesdays in [Hack For LA](https://www.hackforla.org/)!
 
 - To help with user research, find other cities' TDM calculators. For example, check out [SF's TDM Tool](http://www.sftdmtool.org/)
 
-- To contribute to the code, see [Contributing](./Contributing.md)
+- To contribute to the code, see [Contributing](./doc/Contributing.md)
 
 ### Working with issues
 

diff --git a/client/.dockerignore b/client/.dockerignore
@@ -0,0 +1,2 @@
+**/node_modules
+**/db
diff --git a/client/Dockerfile.dev b/client/Dockerfile.dev
@@ -0,0 +1,6 @@
+FROM node:alpine
+WORKDIR '/app'
+COPY package.json .
+RUN npm install
+COPY . .
+CMD ["npm", "run", "start"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -244,3 +244,5 @@ node_modules

		# Yarn lockfile
		yarn.lock

		.mssql.json