re-structures project to match the project guidelines

OhMeuMenino · Jan 5, 2016 · d71bbc7 · d71bbc7
1 parent 3be7110
commit d71bbc7
Show file tree

Hide file tree

Showing 11 changed files with 199 additions and 140 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,5 @@
 # ignore linux temp files recursively
 **/*~
 
-# do not copy the settings file to image
-app/app.settings.js
+# do not copy the settings file to the final image
+app/core/settings.js
diff --git a/.gitignore b/.gitignore
@@ -14,7 +14,10 @@ node_modules/*
 bower_components/*
 
 # project settings
-app/app.settings.js
+app/core/settings.js
+
+# ignore templates.js they are auto-generated
+app/core/templates.js
 
 # build folder
 build/
diff --git a/README.md b/README.md
@@ -76,6 +76,11 @@ $ gulp check
 * If you think a jshint rule does not make sense in a specific case, you can hide a warning with a snippet of code
 * To that, add the following snippet to your file (/* jshint -W034 */), the -W034 part must match the rule code your trying to hide
 
+#### Project Guidelines ####
+
+* We are currently migrating the project to match John Papa's angular-styleguide https://github.com/johnpapa/angular-styleguide
+* Use these guidelines as a reference, if you find something in the code that does not match, correct it or open an issue
+
 ### Who do I talk to? ###
 
 If you have something to say, feel free to contact:

diff --git a/app/app.js → app/app.module.js b/app/app.js → app/app.module.js
diff --git a/app/index.html b/app/index.html
diff --git a/app/app.css → content/app.css b/app/app.css → content/app.css
@@ -36,4 +36,4 @@ body{
     transform: translateY(-50%);
     left: 15px;
     font-size: 30px;
-}
+}
diff --git a/dist/angular/development/app.settings.js → dist/angular/development/settings.js b/dist/angular/development/app.settings.js → dist/angular/development/settings.js
@@ -2,7 +2,7 @@
     'use strict';
 
     angular
-        .module('app')
+        .module('app.core')
         .constant('AppSettings', {
             appName: 'Boxing Lab',
             appVersion: 0.1,

diff --git a/dist/angular/production/app.settings.js → dist/angular/production/settings.js b/dist/angular/production/app.settings.js → dist/angular/production/settings.js
@@ -2,7 +2,7 @@
     'use strict';
 
     angular
-        .module('app')
+        .module('app.core')
         .constant('AppSettings', {
             appName: 'Boxing Lab',
             appVersion: 0.1,