cleanup

weyj4 · Oct 18, 2015 · 98c5238 · 98c5238
1 parent e5aa944
commit 98c5238
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 412 deletions.
diff --git a/api/controllers/IndexController.js b/api/controllers/IndexController.js
diff --git a/config/routes.js b/config/routes.js
@@ -33,7 +33,7 @@ module.exports.routes = {
   ***************************************************************************/
 
   '/': {
-    view: 'homepage'
+    view: 'app'
   }
 
   /***************************************************************************

diff --git a/config/views.js b/config/views.js
@@ -92,4 +92,4 @@ module.exports.views = {
   partials: false
 
 
-};
+};
diff --git a/package.json b/package.json
@@ -32,6 +32,9 @@
     "start": "node devServer.js",
     "lint": "eslint src"
   },
+  "scripts": {
+    "start": "webpack && sails lift"
+  },
   "main": "app.js",
   "repository": {
     "type": "git",

diff --git a/views/403.ejs b/views/403.ejs
diff --git a/views/404.ejs b/views/404.ejs
diff --git a/views/500.ejs b/views/500.ejs
diff --git a/views/app.ejs b/views/app.ejs
@@ -0,0 +1,6 @@
+<!--<body>-->
+<!--<div id='root'>-->
+<!--</div>-->
+<!--<script src="/js/bundle.js"></script>-->
+<!--</body>-->
+<!---->
diff --git a/views/homepage.ejs b/views/homepage.ejs
diff --git a/views/index.ejs b/views/index.ejs
diff --git a/views/layout.ejs b/views/layout.ejs
@@ -2,96 +2,12 @@
 <html>
   <head>
     <title>New Sails App</title>
-
-    <!-- Viewport mobile tag for sensible mobile support -->
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-
-
-    <!--  
-        Stylesheets and Preprocessors
-        ==============================
-
-        You can always bring in CSS files manually with `<link>` tags, or asynchronously
-        using a solution like AMD (RequireJS).  Or, if you like, you can take advantage 
-        of Sails' conventional asset pipeline (boilerplate Gruntfile).
-
-        By default, stylesheets from your `assets/styles` folder are included
-        here automatically (between STYLES and STYLES END). Both CSS (.css) and LESS (.less)
-        are supported. In production, your styles will be minified and concatenated into
-        a single file.
-        
-        To customize any part of the built-in behavior, just edit `tasks/pipeline.js`.
-        For example, here are a few things you could do:
-            
-            + Change the order of your CSS files
-            + Import stylesheets from other directories
-            + Use a different or additional preprocessor, like SASS, SCSS or Stylus
-    -->
-
-    <!--STYLES-->
-    <!-- <link rel="stylesheet" href="/styles/importer.css"> -->
-    <!--STYLES END-->
   </head>
 
   <body>
-    <%- body %>
-
-
-
-    <!--
-        Client-side Templates
-        ========================
-
-        HTML templates are important prerequisites of modern, rich client applications.
-        To work their magic, frameworks like Backbone, Angular, Ember, and Knockout require
-        that you load these templates client-side.
-
-        By default, your Gruntfile is configured to automatically load and precompile
-        client-side JST templates in your `assets/templates` folder, then
-        include them here automatically (between TEMPLATES and TEMPLATES END).
-        
-        To customize this behavior to fit your needs, just edit `tasks/pipeline.js`.
-        For example, here are a few things you could do:
-
-            + Import templates from other directories
-            + Use a different template engine (handlebars, jade, dust, etc.)
-            + Internationalize your client-side templates using a server-side
-              stringfile before they're served.
-    -->
-
-    <!--TEMPLATES-->
-
-    <!--TEMPLATES END-->
-
-
-    <!--
-
-      Client-side Javascript
-      ========================
-
-      You can always bring in JS files manually with `script` tags, or asynchronously
-      on the client using a solution like AMD (RequireJS).  Or, if you like, you can 
-      take advantage of Sails' conventional asset pipeline (boilerplate Gruntfile).
-
-      By default, files in your `assets/js` folder are included here
-      automatically (between SCRIPTS and SCRIPTS END).  Both JavaScript (.js) and
-      CoffeeScript (.coffee) are supported. In production, your scripts will be minified
-      and concatenated into a single file.
-      
-      To customize any part of the built-in behavior, just edit `tasks/pipeline.js`.
-      For example, here are a few things you could do:
-          
-          + Change the order of your scripts
-          + Import scripts from other directories
-          + Use a different preprocessor, like TypeScript
-
-    -->
-
-    <!--SCRIPTS-->
-    <!-- // <script src="dist/bundle.js"></script> -->
-    <!-- // <script src="/js/dependencies/sails.io.js"></script> -->
-    <!--SCRIPTS END-->
-    <script src="/js/bundle.js"></script>
-
+  <div id='root'>
+  </div>
+  <script src="/js/bundle.js"></script>
   </body>
 </html>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -92,4 +92,4 @@ module.exports.views = {
		partials: false


		};
		};