initial restructure

antonybudianto · May 25, 2016 · 62a5db9 · 62a5db9
1 parent b9a3c30
commit 62a5db9
Show file tree

Hide file tree

Showing 96 changed files with 6,515 additions and 32 deletions.
diff --git a/assets/styles/bootstrap.scss b/assets/styles/bootstrap.scss
diff --git a/gulp.config.js b/gulp.config.js
@@ -1,12 +1,15 @@
 var historyApiFallback = require('connect-history-api-fallback')
 
 module.exports = function () {
-    var root = '';
+    var root = 'src/';
     var app = root + 'app/';
     var test = root + 'test/';
     var tmp = root + 'tmp/';
+    var tmpApp = tmp + 'app/';
+    var tmpTest = tmp + 'test/';
     var testHelper = test + 'test-helpers/';
     var e2e = test + 'e2e/';
+    var tmpE2E = tmpTest + 'e2e/';
     var assets = root + 'assets/';
     var assetsPath = {
         styles: assets + 'styles/',
@@ -41,8 +44,11 @@ module.exports = function () {
         dev: {
             port: 3000,
             server: {
-                baseDir: './',
-                middleware: [historyApiFallback()]
+                baseDir: './src/',
+                middleware: [historyApiFallback()],
+                routes: {
+                    "/node_modules": "node_modules"
+                }
             },
             files: [
                 "index.html",
@@ -81,6 +87,9 @@ module.exports = function () {
         app: app,
         test: test,
         tmp: tmp,
+        tmpApp: tmpApp,
+        tmpTest: tmpTest,
+        tmpE2E: tmpE2E,
         testHelper: testHelper,
         e2e: e2e,
         e2eConfig: e2eConfig,

diff --git a/karma-test-shim.js b/karma-test-shim.js
@@ -30,7 +30,7 @@ function onlySpecFiles(path) {
 // Normalize paths to module names.
 function file2moduleName(filePath) {
   return filePath.replace(/\\/g, '/')
-    .replace(/^\/base\//, '')
+    .replace(/^\/base\/src\/tmp\//, '')
     .replace(/\.js/, '');
 }
 

diff --git a/karma.conf.js b/karma.conf.js
@@ -4,16 +4,16 @@ module.exports = function(config) {
     'systemjs', 'zone.js', 'font-awesome'
   ];
   var configuration = {
-    basePath: '',
+    basePath: './',
 
     frameworks: ['jasmine'],
     browsers: ['PhantomJS'],
     reporters: ['progress', 'coverage'],
 
     preprocessors: {
-      'tmp/app/**/!(*.spec)+(.js)': ['coverage'],
-      'tmp/app/**/*.js': ['sourcemap'],
-      'tmp/test/**/*.js': ['sourcemap']
+      'src/tmp/app/**/!(*.spec)+(.js)': ['coverage'],
+      'src/tmp/app/**/*.js': ['sourcemap'],
+      'src/tmp/test/**/*.js': ['sourcemap']
     },
 
     // Generate json used for remap-istanbul
@@ -35,29 +35,28 @@ module.exports = function(config) {
       'node_modules/zone.js/dist/fake-async-test.js',
       'node_modules/systemjs/dist/system.src.js',
 
-      'tmp/test/test-helpers/global/**/*.js',
-      'systemjs.conf.js',
+      'src/tmp/test/test-helpers/global/**/*.js',
+      'src/systemjs.conf.js',
       'karma-test-shim.js',
 
-      { pattern: 'tmp/app/**/*.js', included: false },
-      { pattern: 'tmp/test/test-helpers/*.js', included: false },
+      { pattern: 'src/tmp/app/**/*.js', included: false },
+      { pattern: 'src/tmp/test/test-helpers/*.js', included: false },
 
       // paths loaded via Angular's component compiler
       // (these paths need to be rewritten, see proxies section)
-      { pattern: 'app/**/*.html', included: false },
-      { pattern: 'app/**/*.css', included: false },
+      { pattern: 'src/app/**/*.html', included: false },
+      { pattern: 'src/app/**/*.css', included: false },
 
       // paths to support debugging with source maps in dev tools
-      { pattern: 'app/**/*.ts', included: false, watched: false },
-      { pattern: 'tmp/app/**/*.js.map', included: false, watched: false }
+      { pattern: 'src/app/**/*.ts', included: false, watched: false },
+      { pattern: 'src/tmp/app/**/*.js.map', included: false, watched: false }
     ],
 
     // proxied base paths
     proxies: {
       // required for component assests fetched by Angular's compiler
-      "/app/": "/base/app/",
-      "/tmp/app/": "/base/tmp/app/",
-      "/tmp/test/": "/base/tmp/test/",
+      "/app/": "/base/src/app/",
+      "/tmp/": "/base/src/tmp/",
       "/node_modules/": "/base/node_modules/"
     },
 

diff --git a/app/app.component.spec.ts → src/app/app.component.spec.ts b/app/app.component.spec.ts → src/app/app.component.spec.ts
diff --git a/app/app.component.ts → src/app/app.component.ts b/app/app.component.ts → src/app/app.component.ts
diff --git a/app/app.html → src/app/app.html b/app/app.html → src/app/app.html
diff --git a/app/app.routes.ts → src/app/app.routes.ts b/app/app.routes.ts → src/app/app.routes.ts
diff --git a/app/blocks/logger.service.spec.ts → src/app/blocks/logger.service.spec.ts b/app/blocks/logger.service.spec.ts → src/app/blocks/logger.service.spec.ts
diff --git a/app/blocks/logger.service.ts → src/app/blocks/logger.service.ts b/app/blocks/logger.service.ts → src/app/blocks/logger.service.ts
diff --git a/app/bundle.ts → src/app/bundle.ts b/app/bundle.ts → src/app/bundle.ts
diff --git a/app/home/home.component.ts → src/app/home/home.component.ts b/app/home/home.component.ts → src/app/home/home.component.ts
diff --git a/app/home/home.css → src/app/home/home.css b/app/home/home.css → src/app/home/home.css
diff --git a/app/home/home.html → src/app/home/home.html b/app/home/home.html → src/app/home/home.html
diff --git a/app/main.ts → src/app/main.ts b/app/main.ts → src/app/main.ts
diff --git a/app/navbar/navbar.component.ts → src/app/navbar/navbar.component.ts b/app/navbar/navbar.component.ts → src/app/navbar/navbar.component.ts
diff --git a/app/navbar/navbar.html → src/app/navbar/navbar.html b/app/navbar/navbar.html → src/app/navbar/navbar.html
diff --git a/app/simplebind/child.component.spec.ts → src/app/simplebind/child.component.spec.ts b/app/simplebind/child.component.spec.ts → src/app/simplebind/child.component.spec.ts
diff --git a/app/simplebind/child.component.ts → src/app/simplebind/child.component.ts b/app/simplebind/child.component.ts → src/app/simplebind/child.component.ts
diff --git a/app/simplebind/simplebind.component.spec.ts → ...p/simplebind/simplebind.component.spec.ts b/app/simplebind/simplebind.component.spec.ts → ...p/simplebind/simplebind.component.spec.ts
diff --git a/app/simplebind/simplebind.component.ts → src/app/simplebind/simplebind.component.ts b/app/simplebind/simplebind.component.ts → src/app/simplebind/simplebind.component.ts
diff --git a/app/simplebind/simplebind.html → src/app/simplebind/simplebind.html b/app/simplebind/simplebind.html → src/app/simplebind/simplebind.html
diff --git a/app/todolist/completed-filter.pipe.spec.ts → ...pp/todolist/completed-filter.pipe.spec.ts b/app/todolist/completed-filter.pipe.spec.ts → ...pp/todolist/completed-filter.pipe.spec.ts
diff --git a/app/todolist/completed-filter.pipe.ts → src/app/todolist/completed-filter.pipe.ts b/app/todolist/completed-filter.pipe.ts → src/app/todolist/completed-filter.pipe.ts
diff --git a/app/todolist/todo.model.ts → src/app/todolist/todo.model.ts b/app/todolist/todo.model.ts → src/app/todolist/todo.model.ts
diff --git a/app/todolist/todolist.component.spec.ts → src/app/todolist/todolist.component.spec.ts b/app/todolist/todolist.component.spec.ts → src/app/todolist/todolist.component.spec.ts
diff --git a/app/todolist/todolist.component.ts → src/app/todolist/todolist.component.ts b/app/todolist/todolist.component.ts → src/app/todolist/todolist.component.ts
diff --git a/app/todolist/todolist.html → src/app/todolist/todolist.html b/app/todolist/todolist.html → src/app/todolist/todolist.html
diff --git a/...s/fonts/Roboto/Roboto-Regular-webfont.eot → ...s/fonts/Roboto/Roboto-Regular-webfont.eot b/...s/fonts/Roboto/Roboto-Regular-webfont.eot → ...s/fonts/Roboto/Roboto-Regular-webfont.eot
diff --git a/...s/fonts/Roboto/Roboto-Regular-webfont.svg → ...s/fonts/Roboto/Roboto-Regular-webfont.svg b/...s/fonts/Roboto/Roboto-Regular-webfont.svg → ...s/fonts/Roboto/Roboto-Regular-webfont.svg
diff --git a/...s/fonts/Roboto/Roboto-Regular-webfont.ttf → ...s/fonts/Roboto/Roboto-Regular-webfont.ttf b/...s/fonts/Roboto/Roboto-Regular-webfont.ttf → ...s/fonts/Roboto/Roboto-Regular-webfont.ttf
diff --git a/.../fonts/Roboto/Roboto-Regular-webfont.woff → .../fonts/Roboto/Roboto-Regular-webfont.woff b/.../fonts/Roboto/Roboto-Regular-webfont.woff → .../fonts/Roboto/Roboto-Regular-webfont.woff
diff --git a/assets/images/ng2.jpg → src/assets/images/ng2.jpg b/assets/images/ng2.jpg → src/assets/images/ng2.jpg
diff --git a/assets/styles/_bootstrap.variables.scss → src/assets/styles/_bootstrap.variables.scss b/assets/styles/_bootstrap.variables.scss → src/assets/styles/_bootstrap.variables.scss
diff --git a/src/assets/styles/bootstrap.scss b/src/assets/styles/bootstrap.scss
@@ -0,0 +1,2 @@
+@import 'bootstrap.variables';
+@import '../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap';
diff --git a/assets/styles/fonts.scss → src/assets/styles/fonts.scss b/assets/styles/fonts.scss → src/assets/styles/fonts.scss
diff --git a/assets/styles/functions.scss → src/assets/styles/functions.scss b/assets/styles/functions.scss → src/assets/styles/functions.scss