Skip to content

Commit

Permalink
Update bower folder structure and license. Closes #4
Browse files Browse the repository at this point in the history
  • Loading branch information
daraosn committed Apr 22, 2014
1 parent 4a7943f commit fe94a92
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.DS_Store
components
bower_components
node_modules
*.js
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2013 Diego Araos <[email protected]>
Copyright (C) 2014 Diego Araos <[email protected]>

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:

Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,10 @@ Web interface to control the AR Drone 2.0 with an Oculus Rift. This is based on

##### License: MIT

Disclaimer: This is just a weekend project, missed testing and code quality might not be the best, therefore I'm not resposible for any damages that this project can cause due to misusage or inexperience. If you are unsure about something please contact me at [email protected]
Copyright (C) 2014 Diego Araos <[email protected]>

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.
4 changes: 2 additions & 2 deletions component.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "drone-swarm",
"description": "Embrace the AR Drone swarm... using node.js",
"name": "oculus-drone",
"description": "Oculus Rift + AR Drone 2.0 controller",
"version": "0.1.0",
"dependencies": {
"jquery": "~1.7.2",
Expand Down
2 changes: 1 addition & 1 deletion index.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ app.configure ->
app.set('port', process.env.PORT || 3000)
app.use(app.router)
app.use(express.static(path.join(__dirname, 'public')))
app.use("/components", express.static(path.join(__dirname, 'components')))
app.use("/bower_components", express.static(path.join(__dirname, 'bower_components')))
server = require("http").createServer(app)

# Initialize Sockets
Expand Down
6 changes: 3 additions & 3 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html lang="en">
<head>
<meta charset="utf-8">
<link href="/components/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
<link href="/bower_components/bootstrap.css/css/bootstrap.min.css" rel="stylesheet"></link>
<link href="/style.css" rel="stylesheet"></link>
<script src="/components/jquery/jquery.js"></script>
<script src="/components/bootstrap/js/bootstrap.min.js"></script>
<script src="/bower_components/jquery/jquery.js"></script>
<script src="/bower_components/bootstrap.css/js/bootstrap.min.js"></script>
<script src="/jquery.colors.js"></script>
<script src="/faye/client.js"></script>
<script src="/drone.js"></script>
Expand Down

0 comments on commit fe94a92

Please sign in to comment.