diff --git a/.gitignore b/.gitignore index 88c09017..77df9405 100644 --- a/.gitignore +++ b/.gitignore @@ -59,7 +59,6 @@ Thumbs.db *.jar *.rar *.tar -*.zip # Logs and databases *.log diff --git a/projects/botanical-gardens-of-barcelona/Groundhog - Barcelona Botanic Gardens_embedded_files/Barcelona Botanic Basemap.jpg b/projects/botanical-gardens-of-barcelona/Groundhog - Barcelona Botanic Gardens_embedded_files/Barcelona Botanic Basemap.jpg index ada6c33c..481c551f 100644 Binary files a/projects/botanical-gardens-of-barcelona/Groundhog - Barcelona Botanic Gardens_embedded_files/Barcelona Botanic Basemap.jpg and b/projects/botanical-gardens-of-barcelona/Groundhog - Barcelona Botanic Gardens_embedded_files/Barcelona Botanic Basemap.jpg differ diff --git a/projects/sony-forest/Groundhog - Sony Forest_embedded_files/Basemap.jpg b/projects/sony-forest/Groundhog - Sony Forest_embedded_files/Basemap.jpg index 75ea4a25..4ff890b0 100644 Binary files a/projects/sony-forest/Groundhog - Sony Forest_embedded_files/Basemap.jpg and b/projects/sony-forest/Groundhog - Sony Forest_embedded_files/Basemap.jpg differ diff --git a/site/assets/downloads/documentation/channels.zip b/site/assets/downloads/documentation/channels.zip new file mode 100644 index 00000000..df829ccb Binary files /dev/null and b/site/assets/downloads/documentation/channels.zip differ diff --git a/site/assets/downloads/documentation/contours.zip b/site/assets/downloads/documentation/contours.zip new file mode 100644 index 00000000..8301dd70 Binary files /dev/null and b/site/assets/downloads/documentation/contours.zip differ diff --git a/site/assets/downloads/documentation/fields.zip b/site/assets/downloads/documentation/fields.zip new file mode 100644 index 00000000..3fa1a11b Binary files /dev/null and b/site/assets/downloads/documentation/fields.zip differ diff --git a/site/assets/downloads/documentation/floods.zip b/site/assets/downloads/documentation/floods.zip new file mode 100644 index 00000000..f27dd70a Binary files /dev/null and b/site/assets/downloads/documentation/floods.zip differ diff --git a/site/assets/downloads/documentation/flows-catchments.zip b/site/assets/downloads/documentation/flows-catchments.zip new file mode 100644 index 00000000..4cbf2b41 Binary files /dev/null and b/site/assets/downloads/documentation/flows-catchments.zip differ diff --git a/site/assets/downloads/documentation/flows-saturation.zip b/site/assets/downloads/documentation/flows-saturation.zip new file mode 100644 index 00000000..0725f814 Binary files /dev/null and b/site/assets/downloads/documentation/flows-saturation.zip differ diff --git a/site/assets/downloads/documentation/flows.zip b/site/assets/downloads/documentation/flows.zip new file mode 100644 index 00000000..b832c3f7 Binary files /dev/null and b/site/assets/downloads/documentation/flows.zip differ diff --git a/site/assets/downloads/documentation/paths.zip b/site/assets/downloads/documentation/paths.zip new file mode 100644 index 00000000..0db807a3 Binary files /dev/null and b/site/assets/downloads/documentation/paths.zip differ diff --git a/site/assets/downloads/documentation/plants.zip b/site/assets/downloads/documentation/plants.zip new file mode 100644 index 00000000..2791afe4 Binary files /dev/null and b/site/assets/downloads/documentation/plants.zip differ diff --git a/site/assets/downloads/documentation/terrain.zip b/site/assets/downloads/documentation/terrain.zip new file mode 100644 index 00000000..b4b324df Binary files /dev/null and b/site/assets/downloads/documentation/terrain.zip differ diff --git a/site/assets/downloads/projects/botanical-gardens-of-barcelona.zip b/site/assets/downloads/projects/botanical-gardens-of-barcelona.zip new file mode 100644 index 00000000..f16fcb44 Binary files /dev/null and b/site/assets/downloads/projects/botanical-gardens-of-barcelona.zip differ diff --git a/site/assets/downloads/projects/busan-cinema-complex.zip b/site/assets/downloads/projects/busan-cinema-complex.zip new file mode 100644 index 00000000..7d6d2111 Binary files /dev/null and b/site/assets/downloads/projects/busan-cinema-complex.zip differ diff --git a/site/assets/downloads/projects/edaphic-effects.zip b/site/assets/downloads/projects/edaphic-effects.zip new file mode 100644 index 00000000..3db80886 Binary files /dev/null and b/site/assets/downloads/projects/edaphic-effects.zip differ diff --git a/site/assets/downloads/projects/keio-university-roof-garden.zip b/site/assets/downloads/projects/keio-university-roof-garden.zip new file mode 100644 index 00000000..70c9526d Binary files /dev/null and b/site/assets/downloads/projects/keio-university-roof-garden.zip differ diff --git a/site/assets/downloads/projects/max-iv-laboratory.zip b/site/assets/downloads/projects/max-iv-laboratory.zip new file mode 100644 index 00000000..3fc855ed Binary files /dev/null and b/site/assets/downloads/projects/max-iv-laboratory.zip differ diff --git a/site/assets/downloads/projects/sony-forest.zip b/site/assets/downloads/projects/sony-forest.zip new file mode 100644 index 00000000..a552fde7 Binary files /dev/null and b/site/assets/downloads/projects/sony-forest.zip differ diff --git a/site/assets/downloads/projects/south-park.zip b/site/assets/downloads/projects/south-park.zip new file mode 100644 index 00000000..dceaf8ce Binary files /dev/null and b/site/assets/downloads/projects/south-park.zip differ diff --git a/site/compile_assets.sh b/site/compile_assets.sh index e4911847..e36dcf59 100644 --- a/site/compile_assets.sh +++ b/site/compile_assets.sh @@ -17,6 +17,7 @@ for i in ../docs/*; do if [ -d $i ]; then zip -r -q -j "${i%/}.zip" "$i" -x "*.DS_Store"; fi done +rm -rf ../docs/**/*.3dmbak rm -rf ./downloads/documentation/*.zip mv ../docs/**.zip ./assets/downloads/documentation/ DOCS=$(ls -1 "./downloads/documentation/" | wc -l | xargs) @@ -32,6 +33,7 @@ for i in ./*; done cd "../site/" +rm -rf ../projects/**/*.3dmbak rm -rf ./downloads/projects/*.zip mv ../projects/**.zip ./assets/downloads/projects/ PROJECTS=$(ls -1 "./downloads/projects/" | wc -l | xargs) diff --git a/site/package.json b/site/package.json index 4e5b825e..d26698aa 100644 --- a/site/package.json +++ b/site/package.json @@ -20,8 +20,7 @@ "test": "htmlproofer ./_site", "compile-version": "bash ./compile_plugin.sh", "compile-assets": "bash ./compile_assets.sh", - "compile-deploy": "npm run compile-assets", - "build": "npm run compile-deploy && bundle exec jekyll build --config=_config.yml,_config_prod.yml", + "build": "bundle exec jekyll build --config=_config.yml,_config_prod.yml", "publish": "npm run purge && npm run build && npm run test && s3_website push" }, "author": "Philip Belesky",