#7 - SCSS directory structure update

FuelFrontend · Feb 26, 2015 · 21d21ee · 21d21ee
1 parent e8973cc
commit 21d21ee
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 24 deletions.
diff --git a/app/index.js b/app/index.js
@@ -1,12 +1,4 @@
-'use strict';
-var yeoman = require('yeoman-generator'),
-    fs = require('fs'),
-    util = require('util'),
-    path = require('path'),
-    yosay = require('yosay'),
-    chalk = require('chalk');
-
-// STRUCTURE
+// JS STRUCTURE
 
 // constructor
 // initializing
@@ -18,6 +10,14 @@ var yeoman = require('yeoman-generator'),
 // install
 // end
 
+'use strict';
+var yeoman = require('yeoman-generator'),
+    fs = require('fs'),
+    util = require('util'),
+    path = require('path'),
+    yosay = require('yosay'),
+    chalk = require('chalk');
+
 var smacssGenerator = yeoman.generators.Base.extend({
 
     constructor: function () {
@@ -47,7 +47,6 @@ var smacssGenerator = yeoman.generators.Base.extend({
 });
 
 smacssGenerator.prototype.initializing = function initializing() {
-
     this.pkg = require('../package.json');
 };
 
@@ -131,7 +130,7 @@ smacssGenerator.prototype.askAppFeatures = function askAppFeatures() {
         // this.includeRubySass = !answers.libsass;
 
         this.log(chalk.gray('================================================================'));
-        this.log(chalk.gray('Creating the project for you, please wait...'));
+        this.log(chalk.gray('Creating the project structure'));
 
         done();
     }.bind(this));
@@ -169,14 +168,15 @@ smacssGenerator.prototype.copyMainFiles = function copyMainFiles() {
     // CSS
     // TODO: Create seperate folder for module and pages
     this.copy("_master.css", this.appName + "/app/css/master.css");
+
     this.copy("scss/_master.scss", this.appName + "/app/scss/master.scss");
     this.copy("scss/_base.scss", this.appName + "/app/scss/base.scss");
     this.copy("scss/_layout.scss", this.appName + "/app/scss/layout.scss");
-    this.copy("scss/_module.scss", this.appName + "/app/scss/module.scss");
     this.copy("scss/_reset.scss", this.appName + "/app/scss/reset.scss");
     this.copy("scss/_variables.scss", this.appName + "/app/scss/variables.scss");
     this.copy("scss/_mixins.scss", this.appName + "/app/scss/mixins.scss");
-    this.copy("scss/_page_landing.scss", this.appName + "/app/scss/page-landing.scss");
+    this.copy("scss/_module.scss", this.appName + "/app/scss/modules/module.scss");
+    this.copy("scss/_page_landing.scss", this.appName + "/app/scss/pages/page-landing.scss");
 
     // JS
     // TODO: Add JS Structure
@@ -214,22 +214,22 @@ smacssGenerator.prototype.errorHanding = function errorHanding() {
 };
 
 smacssGenerator.prototype.install = function install() {
-    this.log(chalk.green('================================================================'));
-    this.log(chalk.green('Your project is created and now installation will start automatically!'));
+    this.log(chalk.gray('================================================================'));
+    this.log(chalk.gray('Your project strcuture created!'));
 
     //Change directory and install bower and npm
     var curr_dir = process.cwd();
     process.chdir(curr_dir+"/"+ this.appName);
     this.installDependencies({
         skipInstall: this.options['skip-install']
     });
-    this.log(chalk.green('================================================================'));
-    this.log(chalk.green('List of Installed packages through npm!'));
+    this.log(chalk.gray('================================================================'));
+    this.log(chalk.gray('Installing Dependencies, please wait...'));
     var exec = require('child_process').exec;
-    var child;
-    child = exec('npm ls', function (error, stdout, stderr) {
-     console.log(stdout);
-    });
+    // var child;
+    // child = exec('gulp', function (error, stdout, stderr) {
+    //     console.log(stdout);
+    // });
 };
 
 smacssGenerator.prototype.paths = function paths() {

diff --git a/app/templates/scss/_master.scss b/app/templates/scss/_master.scss
@@ -24,7 +24,6 @@ MASTER: IMPORTING STYLESHEETS
 @import "mixins";
 
 @import "layout";
-@import "module";
 
-// PAGES
-@import "page-landing";
+@import "modules/module";
+@import "pages/page-landing";