Skip to content

Commit

Permalink
use Bower instead of git submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
jiehanzheng committed Sep 19, 2016
1 parent 502a9b6 commit 0dd9af8
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 24 deletions.
12 changes: 0 additions & 12 deletions .gitmodules

This file was deleted.

1 change: 1 addition & 0 deletions Web/Client/.gitignore
@@ -0,0 +1 @@
bower_components/
1 change: 0 additions & 1 deletion Web/Client/ace-builds
Submodule ace-builds deleted from 8dcfcd
32 changes: 32 additions & 0 deletions Web/Client/bower.json
@@ -0,0 +1,32 @@
{
"name": "kviz-web-client",
"homepage": "https://github.com/krishauser/Klampt",
"authors": [
"Kris Hauser <kris.​hauser@duke.​edu>",
"David J. Zielinski <djzielin@duke.edu>",
"Jiehan Zheng <jiehan.zheng@duke.edu>"
],
"description": "Klamp't simple web client",
"main": "index.html",
"keywords": [
"webgl",
"3d",
"robotics"
],
"license": "BSD-3-Clause",
"private": true,
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"ace-builds": "^1.2.5",
"stats.js": "r16",
"threejs": "r81",
"w2ui": "^1.4.3",
"jquery": "^2.1.4"
}
}
16 changes: 8 additions & 8 deletions Web/Client/index.html
Expand Up @@ -4,15 +4,15 @@
<title>Klampt Three.js app</title>
<meta charset="UTF-8">

<script src="w2ui/libs/jquery/jquery-2.1.4.min.js"></script>
<script src="bower_components/jquery/dist/jquery.min.js"></script>

<link rel="stylesheet" type="text/css" href="w2ui/dist/w2ui.min.css" />
<script type="text/javascript" src="w2ui/dist/w2ui.min.js"></script>
<link rel="stylesheet" type="text/css" href="bower_components/w2ui/w2ui-1.4.3.min.css" />
<script type="text/javascript" src="bower_components/w2ui/w2ui-1.4.3.min.js"></script>

<script src="three.js/build/three.min.js"></script>
<script src="three.js/examples/js/controls/TrackballControls.js"></script>
<script src="bower_components/threejs/build/three.min.js"></script>
<script src="bower_components/threejs/examples/js/controls/TrackballControls.js"></script>

<script src="stats.js/build/stats.min.js"></script>
<script src="bower_components/stats.js/build/stats.min.js"></script>

<script src="DaveWebsocket.js"></script>

Expand All @@ -25,8 +25,8 @@
<script src="CodeMirror-master/mode/python/python.js"></script>
-->

<script src="ace-builds/src-noconflict/ace.js"></script>
<script src="ace-builds/src-noconflict/ext-language_tools.js"></script>
<script src="bower_components/ace-builds/src-min-noconflict/ace.js"></script>
<script src="bower_components/ace-builds/src-min-noconflict/ext-language_tools.js"></script>

</head>

Expand Down
1 change: 0 additions & 1 deletion Web/Client/stats.js
Submodule stats.js deleted from c93fcb
1 change: 0 additions & 1 deletion Web/Client/three.js
Submodule three.js deleted from a82f6b
1 change: 0 additions & 1 deletion Web/Client/w2ui
Submodule w2ui deleted from 2308f8

0 comments on commit 0dd9af8

Please sign in to comment.