Skip to content

Commit

Permalink
Merge pull request #117 from sinahab/master
Browse files Browse the repository at this point in the history
Implement new site
  • Loading branch information
sickpig authored Apr 29, 2017
2 parents b6a32ca + ff54b3b commit 9527966
Show file tree
Hide file tree
Showing 151 changed files with 7,183 additions and 2,070 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.dist
.idea
node_modules
src/public/components
src/public/components
.DS_Store
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ module.exports = function(grunt) {
fileExtensions: ['js']
});

grunt.registerTask('build', ['clean:dist', 'babel', 'browserify', 'copy']);
grunt.registerTask('build', ['clean:dist', 'babel', 'browserify', 'copy', 'stylus']);

};
4 changes: 0 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"name": "bitcoin-unlimited-web",
"dependencies": {
"jquery": "~2.1.4",
"bootstrap": "~3.3.6",
"bxslider-4": "~4.2.5",
"marked": "~0.3.5",
"bitcoin-unlimited-web-downloads": "*"
}
}
15 changes: 10 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,29 @@
"homepage": "https://www.bitcoinunlimited.info/",
"dependencies": {
"bower": "^1.7.9",
"express": "^4.13.3"
"express": "^4.13.3",
"react-modal": "^1.7.7"
},
"devDependencies": {
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
"babelify": "^7.2.0",
"basscss": "^8.0.2",
"grunt": "^0.4.5",
"grunt-babel": "^6.0.0",
"grunt-browserify": "^4.0.1",
"grunt-cli": "^1.2.0",
"grunt-config-dir": "^0.3.2",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-copy": "^0.8.2",
"grunt-contrib-stylus": "^1.2.0",
"grunt-contrib-watch": "^0.6.1",
"history": "^1.17.0",
"nodemon": "^1.11.0",
"react": "^0.14.5",
"react-dom": "^0.14.5",
"react-router": "^1.0.3"
"prop-types": "^15.5.7",
"radium": "^0.18.2",
"react": "^15.4.2",
"react-burger-menu": "^1.10.14",
"react-dom": "^15.4.2",
"react-router": "^2.0.0"
}
}
Loading

0 comments on commit 9527966

Please sign in to comment.