Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pr/38 #40

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
8dc53b3
yo webapp
mabuelhagag Jul 23, 2016
8aef9f3
.nvmrc file
mabuelhagag Jul 23, 2016
0852f55
change jquery and bootstrap-sass versions
mabuelhagag Jul 23, 2016
3656bbc
change to boostrap 4.0.0-alpha.2
mabuelhagag Jul 23, 2016
672314a
remove old bootstrap pulgins files
mabuelhagag Jul 23, 2016
d342026
relative symbolic link to STLs folder
mabuelhagag Jul 23, 2016
967214e
bower install --save threejs#r73
mabuelhagag Jul 23, 2016
fe6ca06
bower install --save jquery-ui#1.11.4
mabuelhagag Jul 23, 2016
6ae976e
bower install --save zip-js#1.0.0
mabuelhagag Jul 23, 2016
80dbd42
threejs js files
mabuelhagag Jul 23, 2016
e5f175e
remove main.js
mabuelhagag Jul 23, 2016
716453b
migrate webapp's js files
mabuelhagag Jul 23, 2016
68afd1d
migrate html contents
mabuelhagag Jul 23, 2016
c459518
copy fonts
mabuelhagag Jul 23, 2016
ca28359
migrate scss files
mabuelhagag Jul 23, 2016
555b23f
jqueryui js dependencies
mabuelhagag Jul 23, 2016
4f3400f
copy images
mabuelhagag Jul 23, 2016
d19a802
copy designs
mabuelhagag Jul 23, 2016
3c7f4d3
zip-js z-worker and deflate files
mabuelhagag Jul 23, 2016
5752e54
fix three.js path
mabuelhagag Jul 23, 2016
0b2d9a0
move designs.json
mabuelhagag Jul 23, 2016
66b3e92
bower install --save underscore#1.8.3
mabuelhagag Jul 23, 2016
d854f8e
fix STLs symbolic link
mabuelhagag Jul 23, 2016
bccde3f
js linting
mabuelhagag Jul 23, 2016
b90c9dd
fix zip-js custom location
mabuelhagag Jul 23, 2016
1d51461
disable babel support
mabuelhagag Jul 23, 2016
9bd6dc2
remove all old files except STLs, README.md and LICENSE.md
mabuelhagag Jul 24, 2016
55dfa19
remove old .gitignore file
mabuelhagag Jul 24, 2016
9bea6ff
move yeoman project to root
mabuelhagag Jul 24, 2016
623b119
remove STLs symlink and move STLs folder into app folder
mabuelhagag Jul 24, 2016
314c9bc
copy STLs folder in building
mabuelhagag Jul 24, 2016
52d09cc
add tether
mabuelhagag Jul 24, 2016
0dd52e1
gitignore webstorm and sublime text files
mabuelhagag Jul 24, 2016
7287a62
added .DS_Store to .gitignore
matthova Jul 29, 2016
9088b11
updated gitignore and added npm scripts for gulp and bower
matthova Jul 29, 2016
4943bbe
updated readme with dev instructions
matthova Jul 29, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.DS_Store
*.log
node_modules
dist
.tmp
Expand Down Expand Up @@ -58,7 +59,7 @@ fabric.properties

# *.iml
# modules.xml
# .idea/misc.xml
# .idea/misc.xml
# *.ipr


Expand Down
6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
"engines": {
"node": ">=4"
},
"scripts": {
"postinstall": "node node_modules/bower/bin/bower install",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bower and gulp-cli needs to be installed globally
npm install -g bower gulp-cli && bower install

"start": "node node_modules/gulp/bin/gulp.js serve",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then you can replace with just gulp serve and all other tasks accordingly

"build": "node node_modules/gulp/bin/gulp.js build",
"serve": "node node_modules/gulp/bin/gulp.js serve:dist"
},
"devDependencies": {
"babel-core": "^6.4.0",
"babel-preset-es2015": "^6.3.13",
Expand Down