Add new CSS and watch tasks

This commit is contained in:
Tom Raithel
2017-01-25 21:05:21 +01:00
parent 4766ec7774
commit 7275a9ce25
15 changed files with 42 additions and 42 deletions

View File

@@ -1,3 +1,3 @@
const add = (x, y) => x + y; const add = (x, y) => x + y;
add(1, 2); add(1, 4);

View File

@@ -7,7 +7,10 @@
"build": "npm run clean && npm run build:radar && npm run build:js && npm run build:css", "build": "npm run clean && npm run build:radar && npm run build:js && npm run build:css",
"build:radar": "babel-node ./tasks/build.js", "build:radar": "babel-node ./tasks/build.js",
"build:js": "webpack --config webpack.config.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", "clean": "babel-node ./tasks/clean.js",
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
}, },
@@ -24,6 +27,7 @@
"fs-extra": "2.0.0", "fs-extra": "2.0.0",
"marked": "0.3.6", "marked": "0.3.6",
"postcss-cli": "2.6.0", "postcss-cli": "2.6.0",
"postcss-easy-import": "2.0.0",
"postcss-nested": "1.0.0", "postcss-nested": "1.0.0",
"pug": "2.0.0-beta8", "pug": "2.0.0-beta8",
"walk": "2.3.9", "walk": "2.3.9",

View File

@@ -1,7 +1,8 @@
{ {
"use": [ "use": [
"autoprefixer", "postcss-easy-import",
"postcss-nested" "postcss-nested",
"autoprefixer"
], ],
"autoprefixer": { "autoprefixer": {
"browsers": "> 5%" "browsers": "> 5%"

View File

@@ -1,5 +1,4 @@
--- ---
new: true
--- ---
Foo Foo

View File

@@ -1,8 +1,6 @@
--- ---
layout: post
title: "Bar" title: "Bar"
ring: assess ring: assess
new: true
--- ---
Bar Bar

View File

@@ -1,17 +1,8 @@
--- ---
layout: post
title: "Grunt" title: "Grunt"
ring: hold ring: adopt
new: true
--- ---
Hier steht was über *Grunt* Hier steht was altes über *Grunt*
Hier noch ein [link](http://www.google.de) zu google Hier noch ein [link](http://www.google.de) zu google
<!--except-->
Hier steht der Rest!
History
-------

View File

@@ -1,6 +1,5 @@
--- ---
layout: post title: "Vue"
title: "React"
ring: adopt ring: adopt
--- ---

View File

@@ -1,17 +1,6 @@
--- ---
layout: post title: "Grunt 2"
title: "Grunt"
ring: hold ring: hold
new: true
--- ---
Hier steht was über *Grunt* Hier steht was neueres über *Grunt*
Hier noch ein [link](http://www.google.de) zu google
<!--except-->
Hier steht der Rest!
History
-------

View File

@@ -0,0 +1,3 @@
---
isFeatured: false
---

View File

@@ -10,5 +10,7 @@ block content
h4= translate(quadrantName) h4= translate(quadrantName)
ul ul
each radarItem, itemName in quadrant each radarItem, itemName in quadrant
li if radarItem.attributes.isFeatured === true
a(href='/' + quadrantName + '/' + itemName + '.html')= radarItem.attributes.title li
a(href='/' + quadrantName + '/' + itemName + '.html')
= radarItem.attributes.title

View File

@@ -1,9 +1,9 @@
body { body {
background: red; background: #fff;
box-sizing: border-box; box-sizing: border-box;
transform: translate3d(1,1,1); transform: translate3d(1,1,1);
& h1 { & h1 {
background: green; color: blue;
} }
} }

View File

@@ -0,0 +1,3 @@
.header {
background: blue;
}

2
styles/main.css Normal file
View File

@@ -0,0 +1,2 @@
@import "./base.css";
@import "./components/*.css";

View File

@@ -14,7 +14,7 @@ import {
} from './template'; } from './template';
export const createRadar = async (tree) => { export const createRadar = async (tree) => {
const fileNames = (await getAllMarkdownFiles(radarPath())).reverse(); const fileNames = (await getAllMarkdownFiles(radarPath()));
const revisions = await createRevisionsFromFiles(fileNames); const revisions = await createRevisionsFromFiles(fileNames);
const allVersions = getAllVersions(revisions); const allVersions = getAllVersions(revisions);
const quadrants = createQuadrants(revisions); const quadrants = createQuadrants(revisions);
@@ -80,7 +80,9 @@ const addRevisionToQuadrant = (quadrant = {}, revision) => ({
}); });
const addRevisionToItem = (item = { const addRevisionToItem = (item = {
attributes: {}, attributes: {
isFeatured: true,
},
revisions: [], revisions: [],
}, revision) => { }, revision) => {
const { const {
@@ -90,15 +92,18 @@ const addRevisionToItem = (item = {
...rest, ...rest,
} = revision; } = revision;
return { return {
...item,
attributes: { attributes: {
...item.attributes, ...item.attributes,
...revision.attributes, ...revision.attributes,
}, },
revisions: item.revisions.concat(rest), revisions: [
rest,
...item.revisions,
],
}; };
}; };
export const outputRadar = (radar) => { export const outputRadar = (radar) => {
return Promise.all( return Promise.all(
Object.entries(radar).map(async ([quadrantName, quadrant]) => { Object.entries(radar).map(async ([quadrantName, quadrant]) => {

View File

@@ -9,9 +9,13 @@ block content
= ' ' = ' '
small #{item.attributes.ring} small #{item.attributes.ring}
h2 New: #{item.isNew ? 'YES' : 'NO'}
hr hr
h4= item.revisions[0].version
h5 New: #{item.isNew ? 'YES' : 'NO'}
h5 Feature: #{item.attributes.isFeatured ? 'YES' : 'NO'}
section section
!= item.revisions[0].body != item.revisions[0].body
hr hr