From 7275a9ce253142ae8453420e821cc5bc2d6ea6e3 Mon Sep 17 00:00:00 2001 From: Tom Raithel Date: Wed, 25 Jan 2017 21:05:21 +0100 Subject: [PATCH] Add new CSS and watch tasks --- js/radar.js | 2 +- package.json | 6 +++++- postcss.config.json | 5 +++-- radar/2016-02-01/methods-and-patterns/foo.md | 1 - .../2016-02-01/platforms-and-aoe-services/bar.md | 2 -- radar/2016-02-01/tools/grunt.md | 13 ++----------- radar/2016-02-02/languages-and-frameworks/vue.md | 3 +-- radar/2016-02-02/tools/grunt.md | 15 ++------------- .../2016-02-03/languages-and-frameworks/react.md | 3 +++ static-pages/index.pug | 6 ++++-- styles/{styles.css => base.css} | 4 ++-- styles/components/header.css | 3 +++ styles/main.css | 2 ++ tasks/radar.js | 13 +++++++++---- templates/item.pug | 6 +++++- 15 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 radar/2016-02-03/languages-and-frameworks/react.md rename styles/{styles.css => base.css} (66%) create mode 100644 styles/components/header.css create mode 100644 styles/main.css diff --git a/js/radar.js b/js/radar.js index 3840509..0e93b5a 100644 --- a/js/radar.js +++ b/js/radar.js @@ -1,3 +1,3 @@ const add = (x, y) => x + y; -add(1, 2); +add(1, 4); diff --git a/package.json b/package.json index bc67252..92389f6 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,10 @@ "build": "npm run clean && npm run build:radar && npm run build:js && npm run build:css", "build:radar": "babel-node ./tasks/build.js", "build:js": "webpack --config webpack.config.js", - "build:css": "postcss -c postcss.config.json -d dist/ styles/*.css ", + "build:css": "postcss -c postcss.config.json -o dist/styles.css styles/main.css", + "watch:radar": "nodemon -w radar -w static-pages -w templates -e md,pug --exec 'npm run build:radar'", + "watch:css": "nodemon -w styles -e css --exec 'npm run build:css'", + "watch:js": "nodemon -w js -e js --exec 'npm run build:js'", "clean": "babel-node ./tasks/clean.js", "test": "echo \"Error: no test specified\" && exit 1" }, @@ -24,6 +27,7 @@ "fs-extra": "2.0.0", "marked": "0.3.6", "postcss-cli": "2.6.0", + "postcss-easy-import": "2.0.0", "postcss-nested": "1.0.0", "pug": "2.0.0-beta8", "walk": "2.3.9", diff --git a/postcss.config.json b/postcss.config.json index e71e98f..9664146 100644 --- a/postcss.config.json +++ b/postcss.config.json @@ -1,7 +1,8 @@ { "use": [ - "autoprefixer", - "postcss-nested" + "postcss-easy-import", + "postcss-nested", + "autoprefixer" ], "autoprefixer": { "browsers": "> 5%" diff --git a/radar/2016-02-01/methods-and-patterns/foo.md b/radar/2016-02-01/methods-and-patterns/foo.md index e9b29a8..5e11bcf 100644 --- a/radar/2016-02-01/methods-and-patterns/foo.md +++ b/radar/2016-02-01/methods-and-patterns/foo.md @@ -1,5 +1,4 @@ --- -new: true --- Foo diff --git a/radar/2016-02-01/platforms-and-aoe-services/bar.md b/radar/2016-02-01/platforms-and-aoe-services/bar.md index e40148d..9ce9cab 100644 --- a/radar/2016-02-01/platforms-and-aoe-services/bar.md +++ b/radar/2016-02-01/platforms-and-aoe-services/bar.md @@ -1,8 +1,6 @@ --- -layout: post title: "Bar" ring: assess -new: true --- Bar diff --git a/radar/2016-02-01/tools/grunt.md b/radar/2016-02-01/tools/grunt.md index c93b129..d620832 100644 --- a/radar/2016-02-01/tools/grunt.md +++ b/radar/2016-02-01/tools/grunt.md @@ -1,17 +1,8 @@ --- -layout: post title: "Grunt" -ring: hold -new: true +ring: adopt --- -Hier steht was über *Grunt* +Hier steht was altes über *Grunt* Hier noch ein [link](http://www.google.de) zu google - - - -Hier steht der Rest! - -History -------- diff --git a/radar/2016-02-02/languages-and-frameworks/vue.md b/radar/2016-02-02/languages-and-frameworks/vue.md index 9c80fb7..e4241ee 100644 --- a/radar/2016-02-02/languages-and-frameworks/vue.md +++ b/radar/2016-02-02/languages-and-frameworks/vue.md @@ -1,6 +1,5 @@ --- -layout: post -title: "React" +title: "Vue" ring: adopt --- diff --git a/radar/2016-02-02/tools/grunt.md b/radar/2016-02-02/tools/grunt.md index c93b129..9527b04 100644 --- a/radar/2016-02-02/tools/grunt.md +++ b/radar/2016-02-02/tools/grunt.md @@ -1,17 +1,6 @@ --- -layout: post -title: "Grunt" +title: "Grunt 2" ring: hold -new: true --- -Hier steht was über *Grunt* - -Hier noch ein [link](http://www.google.de) zu google - - - -Hier steht der Rest! - -History -------- +Hier steht was neueres über *Grunt* diff --git a/radar/2016-02-03/languages-and-frameworks/react.md b/radar/2016-02-03/languages-and-frameworks/react.md new file mode 100644 index 0000000..4519d0b --- /dev/null +++ b/radar/2016-02-03/languages-and-frameworks/react.md @@ -0,0 +1,3 @@ +--- +isFeatured: false +--- diff --git a/static-pages/index.pug b/static-pages/index.pug index 6ca0239..036d08d 100644 --- a/static-pages/index.pug +++ b/static-pages/index.pug @@ -10,5 +10,7 @@ block content h4= translate(quadrantName) ul each radarItem, itemName in quadrant - li - a(href='/' + quadrantName + '/' + itemName + '.html')= radarItem.attributes.title + if radarItem.attributes.isFeatured === true + li + a(href='/' + quadrantName + '/' + itemName + '.html') + = radarItem.attributes.title diff --git a/styles/styles.css b/styles/base.css similarity index 66% rename from styles/styles.css rename to styles/base.css index 9e9c452..ba93193 100644 --- a/styles/styles.css +++ b/styles/base.css @@ -1,9 +1,9 @@ body { - background: red; + background: #fff; box-sizing: border-box; transform: translate3d(1,1,1); & h1 { - background: green; + color: blue; } } diff --git a/styles/components/header.css b/styles/components/header.css new file mode 100644 index 0000000..a8bf3a3 --- /dev/null +++ b/styles/components/header.css @@ -0,0 +1,3 @@ +.header { + background: blue; +} diff --git a/styles/main.css b/styles/main.css new file mode 100644 index 0000000..af4511e --- /dev/null +++ b/styles/main.css @@ -0,0 +1,2 @@ +@import "./base.css"; +@import "./components/*.css"; diff --git a/tasks/radar.js b/tasks/radar.js index 644adae..f4f5541 100644 --- a/tasks/radar.js +++ b/tasks/radar.js @@ -14,7 +14,7 @@ import { } from './template'; export const createRadar = async (tree) => { - const fileNames = (await getAllMarkdownFiles(radarPath())).reverse(); + const fileNames = (await getAllMarkdownFiles(radarPath())); const revisions = await createRevisionsFromFiles(fileNames); const allVersions = getAllVersions(revisions); const quadrants = createQuadrants(revisions); @@ -80,7 +80,9 @@ const addRevisionToQuadrant = (quadrant = {}, revision) => ({ }); const addRevisionToItem = (item = { - attributes: {}, + attributes: { + isFeatured: true, + }, revisions: [], }, revision) => { const { @@ -90,15 +92,18 @@ const addRevisionToItem = (item = { ...rest, } = revision; return { + ...item, attributes: { ...item.attributes, ...revision.attributes, }, - revisions: item.revisions.concat(rest), + revisions: [ + rest, + ...item.revisions, + ], }; }; - export const outputRadar = (radar) => { return Promise.all( Object.entries(radar).map(async ([quadrantName, quadrant]) => { diff --git a/templates/item.pug b/templates/item.pug index 82978a8..5c64cae 100644 --- a/templates/item.pug +++ b/templates/item.pug @@ -9,9 +9,13 @@ block content = ' ' small #{item.attributes.ring} - h2 New: #{item.isNew ? 'YES' : 'NO'} hr + + h4= item.revisions[0].version + h5 New: #{item.isNew ? 'YES' : 'NO'} + h5 Feature: #{item.attributes.isFeatured ? 'YES' : 'NO'} + section != item.revisions[0].body hr