Merge pull request #1 from DonAurelio/dev

Deployment with docker-compose
DonAurelio · Jan 8, 2018 · 60b58fc · 60b58fc
2 parents 3fd70c4 + 9e725b3
commit 60b58fc
Show file tree

Hide file tree

Showing 178 changed files with 1,368 additions and 739 deletions.
diff --git a/README.md b/README.md
@@ -60,4 +60,4 @@ docker run -d -v ${PWD}:/usr/src/app --name  coder-back -p 8000:8000  coder-back
 
 # The Front-End
 
-!Constructing¡
+* [Angular 4 Toast Messages](https://github.com/scttcper/ngx-toastr)
diff --git a/back-end/coder/parallel_templates/admin.py b/back-end/coder/parallel_templates/admin.py
diff --git a/back-end/coder/parallel_templates/apps.py b/back-end/coder/parallel_templates/apps.py
diff --git a/back-end/coder/parallel_templates/models.py b/back-end/coder/parallel_templates/models.py
diff --git a/back-end/coder/parallel_templates/views.py b/back-end/coder/parallel_templates/views.py
diff --git a/back-end/coder/pragcc/admin.py b/back-end/coder/pragcc/admin.py
diff --git a/back-end/coder/pragcc/models.py b/back-end/coder/pragcc/models.py
diff --git a/back-end/coder/pragcc/views.py b/back-end/coder/pragcc/views.py
diff --git a/front-end/editor/.angular-cli.json → client/.angular-cli.json b/front-end/editor/.angular-cli.json → client/.angular-cli.json
@@ -20,7 +20,8 @@
       "prefix": "app",
       "styles": [
         "styles.css",
-        "../node_modules/bootstrap/dist/css/bootstrap.min.css"
+        "../node_modules/bootstrap/dist/css/bootstrap.min.css",
+        "../node_modules/ngx-toastr/toastr.css"
       ],
       "scripts": [
         "../node_modules/jquery/dist/jquery.min.js",

diff --git a/client/.dockerignore b/client/.dockerignore
@@ -0,0 +1 @@
+.git
diff --git a/front-end/editor/.editorconfig → client/.editorconfig b/front-end/editor/.editorconfig → client/.editorconfig
diff --git a/front-end/editor/.gitignore → client/.gitignore b/front-end/editor/.gitignore → client/.gitignore
Original file line number	Diff line number	Diff line change
Expand Up		@@ -60,4 +60,4 @@ docker run -d -v ${PWD}:/usr/src/app --name coder-back -p 8000:8000 coder-back

		# The Front-End

		!Constructing¡
		* [Angular 4 Toast Messages](https://github.com/scttcper/ngx-toastr)