Skip to content

Commit

Permalink
update my blog
Browse files Browse the repository at this point in the history
  • Loading branch information
LeuisKen committed Aug 1, 2015
1 parent 5f2256a commit f70acb6
Show file tree
Hide file tree
Showing 120 changed files with 38,220 additions and 1,071 deletions.
17 changes: 17 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,18 @@
#jekyll & grunt build
_site
release
_includes/head.html
pages/1_articles.md

#temporary files produced by grunt
.tmp

#PhpStorm configure files
.idea

#npm
node_modules

#react cache
build/.module-cache
build/articles.js
12 changes: 0 additions & 12 deletions 404.html

This file was deleted.

64 changes: 32 additions & 32 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,52 @@ GEM
remote: https://ruby.taobao.org/
specs:
RedCloth (4.2.9)
activesupport (4.1.8)
i18n (~> 0.6, >= 0.6.9)
activesupport (4.2.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
blankslate (2.1.2.4)
celluloid (0.16.0)
timers (~> 4.0.0)
classifier-reborn (2.0.2)
classifier-reborn (2.0.3)
fast-stemmer (~> 1.0)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.8.0)
coffee-script-source (1.9.1)
colorator (0.1)
execjs (2.2.2)
execjs (2.4.0)
fast-stemmer (1.0.2)
ffi (1.9.6-x64-mingw32)
gemoji (2.1.0)
github-pages (29)
github-pages (33)
RedCloth (= 4.2.9)
github-pages-health-check (~> 0.1)
github-pages-health-check (~> 0.2)
jekyll (= 2.4.0)
jekyll-coffeescript (= 1.0.0)
jekyll-mentions (= 0.1.3)
jekyll-coffeescript (= 1.0.1)
jekyll-mentions (= 0.2.1)
jekyll-redirect-from (= 0.6.2)
jekyll-sass-converter (= 1.2.0)
jekyll-sitemap (= 0.6.0)
jemoji (= 0.3.0)
kramdown (= 1.3.1)
jekyll-sitemap (= 0.6.3)
jemoji (= 0.4.0)
kramdown (= 1.5.0)
liquid (= 2.6.1)
maruku (= 0.7.0)
mercenary (~> 0.3)
pygments.rb (= 0.6.0)
pygments.rb (= 0.6.1)
rdiscount (= 2.1.7)
redcarpet (= 3.1.2)
terminal-table (~> 1.4)
github-pages-health-check (0.2.1)
github-pages-health-check (0.2.2)
net-dns (~> 0.6)
public_suffix (~> 1.4)
hitimes (1.2.2)
html-pipeline (1.9.0)
activesupport (>= 2)
nokogiri (~> 1.4)
i18n (0.6.11)
i18n (0.7.0)
jekyll (2.4.0)
classifier-reborn (~> 2.0)
colorator (~> 0.1)
Expand All @@ -63,52 +63,52 @@ GEM
redcarpet (~> 3.1)
safe_yaml (~> 1.0)
toml (~> 0.1.0)
jekyll-coffeescript (1.0.0)
jekyll-coffeescript (1.0.1)
coffee-script (~> 2.2)
jekyll-gist (1.1.0)
jekyll-mentions (0.1.3)
jekyll-mentions (0.2.1)
html-pipeline (~> 1.9.0)
jekyll (~> 2.0)
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.6.2)
jekyll (~> 2.0)
jekyll-sass-converter (1.2.0)
sass (~> 3.2)
jekyll-sitemap (0.6.0)
jekyll-watch (1.2.0)
jekyll-sitemap (0.6.3)
jekyll-watch (1.2.1)
listen (~> 2.7)
jemoji (0.3.0)
jemoji (0.4.0)
gemoji (~> 2.0)
html-pipeline (~> 1.9)
jekyll (~> 2.0)
json (1.8.1)
kramdown (1.3.1)
json (1.8.2)
kramdown (1.5.0)
liquid (2.6.1)
listen (2.8.3)
listen (2.8.6)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
maruku (0.7.0)
mercenary (0.3.5)
mini_portile (0.6.1)
minitest (5.4.3)
mini_portile (0.6.2)
minitest (5.5.1)
net-dns (0.8.0)
nokogiri (1.6.5-x64-mingw32)
nokogiri (1.6.6.2-x64-mingw32)
mini_portile (~> 0.6.0)
parslet (1.5.0)
blankslate (~> 2.0)
posix-spawn (0.3.9)
posix-spawn (0.3.10)
public_suffix (1.4.6)
pygments.rb (0.6.0)
pygments.rb (0.6.1)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
yajl-ruby (~> 1.2.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rdiscount (2.1.7)
redcarpet (3.1.2)
safe_yaml (1.0.4)
sass (3.4.9)
sass (3.4.13)
terminal-table (1.4.5)
thread_safe (0.3.4)
timers (4.0.1)
Expand All @@ -117,7 +117,7 @@ GEM
parslet (~> 1.5.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
yajl-ruby (1.1.0)
yajl-ruby (1.2.1)

PLATFORMS
x64-mingw32
Expand Down
108 changes: 108 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
module.exports = function(grunt) {

// Project configuration.
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
copy: {
includes: {
src: '_includes/head.raw.html',
dest: '_includes/head.html'
}
},
useminPrepare: {
html: '_includes/head.html',
options: {
root: '.',
dest: '.tmp'
}
},
filerev: {
files: {
src: ['<%= pkg.srcRoot %>/js/**/*.js', '.tmp/<%= pkg.dstRoot %>/style.css'],
dest: '<%= pkg.dstRoot %>'
}
},
usemin: {
html: '_includes/head.html',
options: {
assetsDirs: ['.tmp']
}
},
concat: {
react_debug: {
src: ['articles.raw/articles.md', 'articles.raw/debug.html'],
dest: 'pages/1_articles.md'
},
react_release: {
src: ['articles.raw/articles.md', 'articles.raw/release.html'],
dest: 'pages/1_articles.md'
}
},
shell: {
jekyll_build: {
command: 'jekyll build'
},
jekyll_serve: {
command: 'jekyll serve --watch'
},
clean_tmp: {
command: 'rm -r .tmp'
},
react_parse: {
command: 'jsx pages/ build/'
}
}
});

grunt.loadNpmTasks('grunt-shell');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-usemin');
grunt.loadNpmTasks('grunt-filerev');

grunt.task.registerTask('debug_test', 'A sample task that logs stuff.', function(arg1, arg2) {
//console.log(grunt.config('cssmin.generated'));
console.log(grunt.filerev.summary);
});

grunt.registerTask('build', [
'copy:includes',
'concat:react_debug',
'shell:jekyll_build'
]);

grunt.registerTask('debug', [
'copy:includes',
'concat:react_debug',
'shell:jekyll_serve'
]);

grunt.registerTask('release', [
'copy:includes',
'concat:react_release',
'useminPrepare',
'concat:generated',
'cssmin:generated',
'filerev',
'usemin',
'shell:clean_tmp',
'shell:react_parse',
'shell:jekyll_build'
]);

grunt.registerTask('serve', [
'copy:includes',
'concat:react_release',
'useminPrepare',
'concat:generated',
'cssmin:generated',
'filerev',
'usemin',
'shell:clean_tmp',
'shell:react_parse',
'shell:jekyll_serve'
]);
};
Loading

0 comments on commit f70acb6

Please sign in to comment.