Skip to content

Commit

Permalink
Included jQuery and Bootstrap via NPM/Bower/Grunt; Added a license
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-k committed Apr 29, 2015
1 parent f4dbf17 commit 9a9965f
Show file tree
Hide file tree
Showing 11 changed files with 191 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@
!.gitignore
_site
.sass-cache
/node_modules/
/bower_components/
27 changes: 27 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
module.exports = function(grunt) {

var path = require('path');

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),

bower: {
install: {
options: {
targetDir: 'vendor',
cleanTargetDir: true,
layout: function(type, component, source) {
return type;
}
}
}
}
});

// These plugins provide necessary tasks.
grunt.loadNpmTasks('grunt-bower-task');

// Default task.
grunt.registerTask('default', ['bower:install']);

};
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2015 Michael Käufl

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
59 changes: 59 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# [DUSTI.X(yz)](http://www.dusti.xyz/)

Bezahlbare open source DIY Feinstaub-Sensoren

## Local builds

1. Create development environment

1. Clone [git](http://git-scm.com/) repository

```
git clone https://github.com/opendata-stuttgart/opendata-stuttgart.github.io.git
```
2. Install [Ruby](https://www.ruby-lang.org/en/downloads/) `>= 1.9.3`
3. Install [Bundler](http://bundler.io/)
```
gem install bundler
```
4. Install [Jekyll](http://jekyllrb.com/)
```
bundle install
```
5. Install [Node.js and npm](https://docs.npmjs.com/getting-started/installing-node)
6. Install javascript dependencies
```
$ npm install -g grunt-cli
$ npm install -g bower
$ npm install
$ grunt
```
2. Run Jekyll
```
bundle exec jekyll serve
```
3. Open [`http://localhost:4000/`](http://localhost:4000/) in your browser
## License
All code is licensed under the MIT License.
### Third party code
- [Bootstrap](http://getbootstrap.com/) is licensed under the MIT
License, Copyright (c) 2011-2015 Twitter, Inc.
- [jQuery](https://jquery.com/) is licensed under the MIT License,
Copyright (c) 2014 jQuery Foundation and other contributors.
2 changes: 1 addition & 1 deletion _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">

<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" href="{{ "/vendor/css/bootstrap.min.css" | prepend: site.baseurl }}">
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
</head>
4 changes: 2 additions & 2 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

{% include footer.html %}

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<script src="{{ "/vendor/js/jquery.min.js" | prepend: site.baseurl }}"></script>
<script src="{{ "/vendor/js/bootstrap.min.js" | prepend: site.baseurl }}"></script>
</body>
</html>
29 changes: 29 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"name": "dusti.xyz",
"version": "0.0.0",
"authors": [
"OK Lab Stuttgart"
],
"description": "Bezahlbare open source DIY Feinstaub-Sensoren",
"license": "MIT",
"homepage": "www.dusti.xyz",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"bootstrap": "~3.3.2"
},
"exportsOverride": {
"bootstrap": {
"css": "dist/css/bootstrap.min.css",
"js": "dist/js/bootstrap.min.js"
},
"jquery": {
"js": "dist/jquery.min.js"
}
}
}
33 changes: 33 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"name": "dusti.xyz",
"version": "0.0.0",
"description": "Bezahlbare open source DIY Feinstaub-Sensoren",
"main": "_site/index.html",
"author": "OK Lab Stuttgart",
"license": "MIT",
"homepage": "http://www.dusti.xyz",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "https://github.com/opendata-stuttgart/opendata-stuttgart.github.io"
},
"keywords": [
"feinstaub",
"opendata",
"stuttgart",
"ok lab",
"code for germany"
],
"bugs": {
"url": "https://github.com/opendata-stuttgart/opendata-stuttgart.github.io/issues"
},
"engines": {
"node": ">= 0.10.0"
},
"devDependencies": {
"grunt": "^0.4.5",
"grunt-bower-task": "^0.4.0"
}
}
5 changes: 5 additions & 0 deletions vendor/css/bootstrap.min.css

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions vendor/js/bootstrap.min.js

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions vendor/js/jquery.min.js

Large diffs are not rendered by default.

0 comments on commit 9a9965f

Please sign in to comment.