clean

iliakan · iliakan · commit 8f9f8e1925ed · 2018-07-01T07:59:35.000+03:00
diff --git a/gulpfile.js b/gulpfile.js
@@ -59,7 +59,7 @@ function requireModuleTasks(moduleName) {
 gulp.task("nodemon", lazyRequireTask('./tasks/nodemon', {
   // shared client/server code has require('template.jade) which precompiles template on run
   // so I have to restart server to pickup the template change
-  ext:    "js",
+  ext:    "js,yml",
 
   nodeArgs: process.env.NODE_DEBUG  ? ['--debug'] : [],
   script: "./bin/server.js",
diff --git a/handlers/tutorial/controller/frontpage.js b/handlers/tutorial/controller/frontpage.js
@@ -17,7 +17,7 @@ exports.get = async function (ctx, next) {
   ctx.locals.siteToolbarCurrentSection = "tutorial";
   ctx.locals.title = t('tutorial.frontpage.modern_javascript_tutorial');
 
-  let topArticlesRendered = await localStorage.getOrGenerate('tutorial:frontpage', renderTop);
+  let topArticlesRendered = await localStorage.getOrGenerate('tutorial:frontpage', renderTop, process.env.TUTORIAL_EDIT);
 
   if (!Object.keys(topArticlesRendered).length) {
     ctx.throw(404, "Database is empty?"); // empty db
diff --git a/handlers/tutorial/templates/frontpage.pug b/handlers/tutorial/templates/frontpage.pug
@@ -13,7 +13,7 @@ block append variables
 
 block append head
   !=js("tutorial", {defer: true})
-  meta(name="description" content=t("site.meta.description"))
+  meta(name="description" content=t("config.meta.description"))
 
 block content
   +frontpage-content({
diff --git a/modules/config/webpack.js b/modules/config/webpack.js
@@ -205,18 +205,18 @@ module.exports = function (config) {
       new WriteVersionsPlugin(path.join(config.cacheRoot, 'webpack.versions.json')),
 
       new MiniCssExtractPlugin({
-        filename: devMode ? '[name].css' : extHash("[name]", 'css'),
-        chunkFilename: devMode ? '[id].css' : extHash("[id]", 'css'),
+        filename: extHash("[name]", 'css'),
+        chunkFilename: extHash("[id]", 'css'),
       }),
 
       function () {
 
-        let styles = glob.sync('styles/**/*.styl', {cwd: config.projectRoot});
+        let styles = glob.sync('{styles,templates}/**/*.styl', {cwd: config.projectRoot});
 
-        config.handlers.forEach(handler => {
-          let handlerStyles = glob.sync(`handlers/${handler}/client/styles/**/*.styl`, {cwd: config.projectRoot});
-          styles.push(...handlerStyles);
-        });
+        // config.handlers.forEach(handler => {
+        //   let handlerStyles = glob.sync(`handlers/${handler}/client/styles/**/*.styl`, {cwd: config.projectRoot});
+        //   styles.push(...handlerStyles);
+        // });
 
         let content = styles.map(s => `@require '../${s}'`).join("\n");
 
diff --git a/templates/blocks/frontpage-content/index.pug b/templates/blocks/frontpage-content/index.pug
@@ -1,4 +1,4 @@
-mixin frontpage-contents(data)
+mixin frontpage-content(data)
   - let {tutorialTree, topArticlesRendered} = data;
 
   mixin partList(children)
@@ -16,7 +16,7 @@ mixin frontpage-contents(data)
           if (topic.children.length > 6)
             +e('li').more= t('tutorial.frontpage.more')
 
-  +b.main-en-contents
+  +b.frontpage-content
     +e.container
       - let folder = tutorialTree.bySlug('js')
       +e.inner
diff --git a/templates/blocks/frontpage-content/index.styl b/templates/blocks/frontpage-content/index.styl
@@ -1,4 +1,4 @@
-.main-en-contents
+.frontpage-content
   background white
   outline none
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.main-en-contents`
	`1`	`+.frontpage-content`
`2`	`2`	`background white`
`3`	`3`	`outline none`
`4`	`4`