diff --git a/docs/about/agreement.md b/docs/about/agreement.md new file mode 100644 index 0000000000000000000000000000000000000000..3d48e2d2d7062f7ac27bbbec6b6131e695329748 --- /dev/null +++ b/docs/about/agreement.md @@ -0,0 +1,5 @@ +# Student Agreement + +This page is a placeholder. + +Paste here your agreement. diff --git a/docs/about/index.md b/docs/about/index.md new file mode 100644 index 0000000000000000000000000000000000000000..3a9ec3f8b75c0ab2d0a42a85f81e713dcd467df5 --- /dev/null +++ b/docs/about/index.md @@ -0,0 +1,25 @@ +# About me + + + +Hi! I am Emma Brewer. I am an art director & graphic designer based in New York City working on branding, visual identities, editorial design and web design. + +Visit this website to see my work! + +## My background + +I was born in a nice city called.. + +## Previous work + +I'm a paragraph. Edit the page on Gitlab to add your own text and edit me. I’m a great place for you to tell a story and let your users know a little more about you.​ + +### Project A + +This is an image from an external site: + + + +While this is an image from the assets/images folder. Never use absolute paths (starting with /) when linking local images, always relative. + + diff --git a/docs/assignments/week01.md b/docs/assignments/week01.md index 02104f22e9efc870a878c9127005fe89d5488803..88ca38e9d1e3ca3edbf956386a4d686f42762eac 100644 --- a/docs/assignments/week01.md +++ b/docs/assignments/week01.md @@ -1,4 +1,4 @@ -# 1. State of the art, project management and documentation +# 1. Principles and practices This week I worked on defining my final project idea and started to getting used to the documentation process. @@ -14,7 +14,6 @@ This week I worked on defining my final project idea and started to getting used - [Google](http://google.com) - [Markdown](https://en.wikipedia.org/wiki/Markdown) - ## Code Example Use the three backticks to separate code. @@ -35,7 +34,6 @@ void loop() { } ``` - ## Gallery  @@ -60,4 +58,4 @@ void loop() { by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> </p> -</div> \ No newline at end of file +</div> diff --git a/docs/assignments/week02.md b/docs/assignments/week02.md index 46a473bcacf8363aff01f9e2ce9eb99a60123b9f..d38843a182864c31b2572b5027cbcdb96948d9e4 100644 --- a/docs/assignments/week02.md +++ b/docs/assignments/week02.md @@ -1,5 +1,4 @@ -# 2. Digital bodies - +# 2. Project management This week I worked on defining my final project idea and started to getting used to the documentation process. @@ -15,7 +14,6 @@ This week I worked on defining my final project idea and started to getting used - [Google](http://google.com) - [Markdown](https://en.wikipedia.org/wiki/Markdown) - ## Code Example Use the three backticks to separate code. @@ -36,7 +34,6 @@ void loop() { } ``` - ## Gallery  @@ -61,4 +58,4 @@ void loop() { by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> </p> -</div> \ No newline at end of file +</div> diff --git a/docs/assignments/week03.md b/docs/assignments/week03.md index 4495abc672fa42064db48bd139d161095e4d5fd0..e8f7c0aa91181b1de35b1385fbcf4f2ea5f57352 100644 --- a/docs/assignments/week03.md +++ b/docs/assignments/week03.md @@ -1,5 +1,4 @@ -# 3. Circular fashion - +# 3. Computer Aided design This week I worked on defining my final project idea and started to getting used to the documentation process. @@ -15,7 +14,6 @@ This week I worked on defining my final project idea and started to getting used - [Google](http://google.com) - [Markdown](https://en.wikipedia.org/wiki/Markdown) - ## Code Example Use the three backticks to separate code. @@ -36,7 +34,6 @@ void loop() { } ``` - ## Gallery  @@ -61,4 +58,4 @@ void loop() { by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> </p> -</div> \ No newline at end of file +</div> diff --git a/docs/assignments/week04.md b/docs/assignments/week04.md index c13a7128447c712fb8716b35d8b7f4e238d18f2a..025a5c185d45655f304319f24de5f28fbbf991e5 100644 --- a/docs/assignments/week04.md +++ b/docs/assignments/week04.md @@ -1,5 +1,4 @@ -# 4. Biofabricating Dyes and Materials - +# 4. Computer controlled cutting This week I worked on defining my final project idea and started to getting used to the documentation process. @@ -15,7 +14,6 @@ This week I worked on defining my final project idea and started to getting used - [Google](http://google.com) - [Markdown](https://en.wikipedia.org/wiki/Markdown) - ## Code Example Use the three backticks to separate code. @@ -36,7 +34,6 @@ void loop() { } ``` - ## Gallery  @@ -61,4 +58,4 @@ void loop() { by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> </p> -</div> \ No newline at end of file +</div> diff --git a/docs/assignments/week05.md b/docs/assignments/week05.md index 836d1a81c4b6687774975169319fab50ddac76a3..0389b949432b956f560df55fe132e7d1446a303c 100644 --- a/docs/assignments/week05.md +++ b/docs/assignments/week05.md @@ -1,4 +1,4 @@ -# 5. E-Textiles and Wearables I +# 5. Electronics production This week I worked on defining my final project idea and started to getting used to the documentation process. @@ -14,7 +14,6 @@ This week I worked on defining my final project idea and started to getting used - [Google](http://google.com) - [Markdown](https://en.wikipedia.org/wiki/Markdown) - ## Code Example Use the three backticks to separate code. @@ -35,7 +34,6 @@ void loop() { } ``` - ## Gallery  @@ -60,4 +58,4 @@ void loop() { by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> </p> -</div> \ No newline at end of file +</div> diff --git a/docs/assignments/week06.md b/docs/assignments/week06.md index e419e74ff866ca02f7ce4178b1757f2deb3f0044..027e62937685ab7bc2163b93be72c3dc1799de0f 100644 --- a/docs/assignments/week06.md +++ b/docs/assignments/week06.md @@ -1,4 +1,4 @@ -# 6. Computational Couture +# 6. 3D Scanning and printing This week I worked on defining my final project idea and started to getting used to the documentation process. @@ -14,7 +14,6 @@ This week I worked on defining my final project idea and started to getting used - [Google](http://google.com) - [Markdown](https://en.wikipedia.org/wiki/Markdown) - ## Code Example Use the three backticks to separate code. @@ -35,7 +34,6 @@ void loop() { } ``` - ## Gallery  @@ -60,4 +58,4 @@ void loop() { by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> </p> -</div> \ No newline at end of file +</div> diff --git a/docs/assignments/week07.md b/docs/assignments/week07.md index b47218865a6280406dd53b8fc6575faca5c75fe0..44039eab4b2e2a8c89a14997b7ec928c15ad77f9 100644 --- a/docs/assignments/week07.md +++ b/docs/assignments/week07.md @@ -1,4 +1,4 @@ -# 7. Textile as Scaffold +# 7. Electronics design This week I worked on defining my final project idea and started to getting used to the documentation process. @@ -14,7 +14,6 @@ This week I worked on defining my final project idea and started to getting used - [Google](http://google.com) - [Markdown](https://en.wikipedia.org/wiki/Markdown) - ## Code Example Use the three backticks to separate code. @@ -35,7 +34,6 @@ void loop() { } ``` - ## Gallery  @@ -60,4 +58,4 @@ void loop() { by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> </p> -</div> \ No newline at end of file +</div> diff --git a/docs/assignments/week08.md b/docs/assignments/week08.md index 7e2961d388e7bd02fdbaeb7036ddf5ab267f74cd..613ae35e4dfa4c3c99000b7e864d4fd258088df6 100644 --- a/docs/assignments/week08.md +++ b/docs/assignments/week08.md @@ -1,4 +1,4 @@ -# 8. Open source hardware: from fibers to fabric +# 8. Computer controlled machining This week I worked on defining my final project idea and started to getting used to the documentation process. @@ -14,7 +14,6 @@ This week I worked on defining my final project idea and started to getting used - [Google](http://google.com) - [Markdown](https://en.wikipedia.org/wiki/Markdown) - ## Code Example Use the three backticks to separate code. @@ -35,7 +34,6 @@ void loop() { } ``` - ## Gallery  @@ -60,4 +58,4 @@ void loop() { by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> </p> -</div> \ No newline at end of file +</div> diff --git a/docs/assignments/week09.md b/docs/assignments/week09.md index 1ee211e9f31ccf6f45434532e5e3e88f918c420d..20df450e8fb77cfccc5a0fc2f7c1890c0c8616c2 100644 --- a/docs/assignments/week09.md +++ b/docs/assignments/week09.md @@ -1,4 +1,4 @@ -# 9. E-Textiles and Wearables II +# 9. Embedded programming This week I worked on defining my final project idea and started to getting used to the documentation process. @@ -14,7 +14,6 @@ This week I worked on defining my final project idea and started to getting used - [Google](http://google.com) - [Markdown](https://en.wikipedia.org/wiki/Markdown) - ## Code Example Use the three backticks to separate code. @@ -35,7 +34,6 @@ void loop() { } ``` - ## Gallery  @@ -60,4 +58,4 @@ void loop() { by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> </p> -</div> \ No newline at end of file +</div> diff --git a/docs/assignments/week10.md b/docs/assignments/week10.md index 6f3ddc64990e86567ec30b98bf1497c8dbac271d..03c95f84e30e20fd80767ce85854366229df1970 100644 --- a/docs/assignments/week10.md +++ b/docs/assignments/week10.md @@ -1,4 +1,4 @@ -# 10. Implications and applications +# 10. Molding and casting This week I worked on defining my final project idea and started to getting used to the documentation process. @@ -14,7 +14,6 @@ This week I worked on defining my final project idea and started to getting used - [Google](http://google.com) - [Markdown](https://en.wikipedia.org/wiki/Markdown) - ## Code Example Use the three backticks to separate code. @@ -35,7 +34,6 @@ void loop() { } ``` - ## Gallery  @@ -60,4 +58,4 @@ void loop() { by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> </p> -</div> \ No newline at end of file +</div> diff --git a/docs/assignments/week11.md b/docs/assignments/week11.md index ded194805f17825080b0f1e27c0f98e251b14406..b3088f0a601af402c0e8b831c5eca9b0adee1fb8 100644 --- a/docs/assignments/week11.md +++ b/docs/assignments/week11.md @@ -1,5 +1,4 @@ -# 11. Soft robotics - +# 11. Input devices This week I worked on defining my final project idea and started to getting used to the documentation process. @@ -15,7 +14,6 @@ This week I worked on defining my final project idea and started to getting used - [Google](http://google.com) - [Markdown](https://en.wikipedia.org/wiki/Markdown) - ## Code Example Use the three backticks to separate code. @@ -36,7 +34,6 @@ void loop() { } ``` - ## Gallery  @@ -61,4 +58,4 @@ void loop() { by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> </p> -</div> \ No newline at end of file +</div> diff --git a/docs/assignments/week12.md b/docs/assignments/week12.md index 615c9225cb1ccd2a4f9f7feb25a6b1778e64c054..d4ad6396051c9d4bc00b6982a3845580f0a276c0 100644 --- a/docs/assignments/week12.md +++ b/docs/assignments/week12.md @@ -1,4 +1,4 @@ -# 12. Skin Electronics +# 12. Output devices This week I worked on defining my final project idea and started to getting used to the documentation process. @@ -14,7 +14,6 @@ This week I worked on defining my final project idea and started to getting used - [Google](http://google.com) - [Markdown](https://en.wikipedia.org/wiki/Markdown) - ## Code Example Use the three backticks to separate code. @@ -35,7 +34,6 @@ void loop() { } ``` - ## Gallery  @@ -60,4 +58,4 @@ void loop() { by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> </p> -</div> \ No newline at end of file +</div> diff --git a/docs/assignments/week13.md b/docs/assignments/week13.md new file mode 100644 index 0000000000000000000000000000000000000000..0291406ff14ad5ce727dec4c2477107d1d6b7fd8 --- /dev/null +++ b/docs/assignments/week13.md @@ -0,0 +1,61 @@ +# 13. Applications and implications + +This week I worked on defining my final project idea and started to getting used to the documentation process. + +## Research + +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +## Useful links + +- [Jekyll](http://jekyll.org) +- [Google](http://google.com) +- [Markdown](https://en.wikipedia.org/wiki/Markdown) + +## Code Example + +Use the three backticks to separate code. + +``` +// the setup function runs once when you press reset or power the board +void setup() { + // initialize digital pin LED_BUILTIN as an output. + pinMode(LED_BUILTIN, OUTPUT); +} + +// the loop function runs over and over again forever +void loop() { + digitalWrite(LED_BUILTIN, HIGH); // turn the LED on (HIGH is the voltage level) + delay(1000); // wait for a second + digitalWrite(LED_BUILTIN, LOW); // turn the LED off by making the voltage LOW + delay(1000); // wait for a second +} +``` + +## Gallery + + + +## Video + +### From Vimeo + +<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe> +<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p> + +### From Youtube + +<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe> + +## 3D Models + +<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe> + +<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;"> + <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita's Gown</a> + by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> + on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> +</p> +</div> diff --git a/docs/assignments/week14.md b/docs/assignments/week14.md new file mode 100644 index 0000000000000000000000000000000000000000..82c4169b0acbd6f1ea9201ee25028f7e749c0c96 --- /dev/null +++ b/docs/assignments/week14.md @@ -0,0 +1,61 @@ +# 14. Networking and communications + +This week I worked on defining my final project idea and started to getting used to the documentation process. + +## Research + +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +## Useful links + +- [Jekyll](http://jekyll.org) +- [Google](http://google.com) +- [Markdown](https://en.wikipedia.org/wiki/Markdown) + +## Code Example + +Use the three backticks to separate code. + +``` +// the setup function runs once when you press reset or power the board +void setup() { + // initialize digital pin LED_BUILTIN as an output. + pinMode(LED_BUILTIN, OUTPUT); +} + +// the loop function runs over and over again forever +void loop() { + digitalWrite(LED_BUILTIN, HIGH); // turn the LED on (HIGH is the voltage level) + delay(1000); // wait for a second + digitalWrite(LED_BUILTIN, LOW); // turn the LED off by making the voltage LOW + delay(1000); // wait for a second +} +``` + +## Gallery + + + +## Video + +### From Vimeo + +<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe> +<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p> + +### From Youtube + +<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe> + +## 3D Models + +<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe> + +<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;"> + <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita's Gown</a> + by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> + on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> +</p> +</div> diff --git a/docs/assignments/week15.md b/docs/assignments/week15.md new file mode 100644 index 0000000000000000000000000000000000000000..09a7ed57d0e4acdb4965044fa2ab68e7784ce85b --- /dev/null +++ b/docs/assignments/week15.md @@ -0,0 +1,61 @@ +# 15. Mechanical design + +This week I worked on defining my final project idea and started to getting used to the documentation process. + +## Research + +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +## Useful links + +- [Jekyll](http://jekyll.org) +- [Google](http://google.com) +- [Markdown](https://en.wikipedia.org/wiki/Markdown) + +## Code Example + +Use the three backticks to separate code. + +``` +// the setup function runs once when you press reset or power the board +void setup() { + // initialize digital pin LED_BUILTIN as an output. + pinMode(LED_BUILTIN, OUTPUT); +} + +// the loop function runs over and over again forever +void loop() { + digitalWrite(LED_BUILTIN, HIGH); // turn the LED on (HIGH is the voltage level) + delay(1000); // wait for a second + digitalWrite(LED_BUILTIN, LOW); // turn the LED off by making the voltage LOW + delay(1000); // wait for a second +} +``` + +## Gallery + + + +## Video + +### From Vimeo + +<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe> +<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p> + +### From Youtube + +<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe> + +## 3D Models + +<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe> + +<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;"> + <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita's Gown</a> + by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> + on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> +</p> +</div> diff --git a/docs/assignments/week16.md b/docs/assignments/week16.md new file mode 100644 index 0000000000000000000000000000000000000000..b217fcb911948d69a8bd87d83680c20a5c111c00 --- /dev/null +++ b/docs/assignments/week16.md @@ -0,0 +1,61 @@ +# 16. Interface and application programming + +This week I worked on defining my final project idea and started to getting used to the documentation process. + +## Research + +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +## Useful links + +- [Jekyll](http://jekyll.org) +- [Google](http://google.com) +- [Markdown](https://en.wikipedia.org/wiki/Markdown) + +## Code Example + +Use the three backticks to separate code. + +``` +// the setup function runs once when you press reset or power the board +void setup() { + // initialize digital pin LED_BUILTIN as an output. + pinMode(LED_BUILTIN, OUTPUT); +} + +// the loop function runs over and over again forever +void loop() { + digitalWrite(LED_BUILTIN, HIGH); // turn the LED on (HIGH is the voltage level) + delay(1000); // wait for a second + digitalWrite(LED_BUILTIN, LOW); // turn the LED off by making the voltage LOW + delay(1000); // wait for a second +} +``` + +## Gallery + + + +## Video + +### From Vimeo + +<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe> +<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p> + +### From Youtube + +<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe> + +## 3D Models + +<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe> + +<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;"> + <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita's Gown</a> + by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> + on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> +</p> +</div> diff --git a/docs/assignments/week17.md b/docs/assignments/week17.md new file mode 100644 index 0000000000000000000000000000000000000000..fdcbd360c1055d69668f60e02d748c75eeb920d3 --- /dev/null +++ b/docs/assignments/week17.md @@ -0,0 +1,61 @@ +# 17. Machine design + +This week I worked on defining my final project idea and started to getting used to the documentation process. + +## Research + +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +## Useful links + +- [Jekyll](http://jekyll.org) +- [Google](http://google.com) +- [Markdown](https://en.wikipedia.org/wiki/Markdown) + +## Code Example + +Use the three backticks to separate code. + +``` +// the setup function runs once when you press reset or power the board +void setup() { + // initialize digital pin LED_BUILTIN as an output. + pinMode(LED_BUILTIN, OUTPUT); +} + +// the loop function runs over and over again forever +void loop() { + digitalWrite(LED_BUILTIN, HIGH); // turn the LED on (HIGH is the voltage level) + delay(1000); // wait for a second + digitalWrite(LED_BUILTIN, LOW); // turn the LED off by making the voltage LOW + delay(1000); // wait for a second +} +``` + +## Gallery + + + +## Video + +### From Vimeo + +<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe> +<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p> + +### From Youtube + +<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe> + +## 3D Models + +<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe> + +<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;"> + <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita's Gown</a> + by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> + on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> +</p> +</div> diff --git a/docs/assignments/week18.md b/docs/assignments/week18.md new file mode 100644 index 0000000000000000000000000000000000000000..77b124f0457a404d58440b612a6935d9ea8b95ee --- /dev/null +++ b/docs/assignments/week18.md @@ -0,0 +1,61 @@ +# 18. Wildcard week + +This week I worked on defining my final project idea and started to getting used to the documentation process. + +## Research + +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +## Useful links + +- [Jekyll](http://jekyll.org) +- [Google](http://google.com) +- [Markdown](https://en.wikipedia.org/wiki/Markdown) + +## Code Example + +Use the three backticks to separate code. + +``` +// the setup function runs once when you press reset or power the board +void setup() { + // initialize digital pin LED_BUILTIN as an output. + pinMode(LED_BUILTIN, OUTPUT); +} + +// the loop function runs over and over again forever +void loop() { + digitalWrite(LED_BUILTIN, HIGH); // turn the LED on (HIGH is the voltage level) + delay(1000); // wait for a second + digitalWrite(LED_BUILTIN, LOW); // turn the LED off by making the voltage LOW + delay(1000); // wait for a second +} +``` + +## Gallery + + + +## Video + +### From Vimeo + +<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe> +<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p> + +### From Youtube + +<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe> + +## 3D Models + +<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe> + +<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;"> + <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita's Gown</a> + by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> + on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> +</p> +</div> diff --git a/docs/assignments/week19.md b/docs/assignments/week19.md new file mode 100644 index 0000000000000000000000000000000000000000..4435eba56bd8f57dfb1355a033693745a44a4cdc --- /dev/null +++ b/docs/assignments/week19.md @@ -0,0 +1,61 @@ +# 19. Invention, intellectual property and income + +This week I worked on defining my final project idea and started to getting used to the documentation process. + +## Research + +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +## Useful links + +- [Jekyll](http://jekyll.org) +- [Google](http://google.com) +- [Markdown](https://en.wikipedia.org/wiki/Markdown) + +## Code Example + +Use the three backticks to separate code. + +``` +// the setup function runs once when you press reset or power the board +void setup() { + // initialize digital pin LED_BUILTIN as an output. + pinMode(LED_BUILTIN, OUTPUT); +} + +// the loop function runs over and over again forever +void loop() { + digitalWrite(LED_BUILTIN, HIGH); // turn the LED on (HIGH is the voltage level) + delay(1000); // wait for a second + digitalWrite(LED_BUILTIN, LOW); // turn the LED off by making the voltage LOW + delay(1000); // wait for a second +} +``` + +## Gallery + + + +## Video + +### From Vimeo + +<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe> +<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p> + +### From Youtube + +<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe> + +## 3D Models + +<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe> + +<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;"> + <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita's Gown</a> + by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> + on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> +</p> +</div> diff --git a/docs/assignments/week20.md b/docs/assignments/week20.md new file mode 100644 index 0000000000000000000000000000000000000000..5929c33d7666b126962089d50149b93222ebe2bd --- /dev/null +++ b/docs/assignments/week20.md @@ -0,0 +1,61 @@ +# 20. Project development + +This week I worked on defining my final project idea and started to getting used to the documentation process. + +## Research + +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +## Useful links + +- [Jekyll](http://jekyll.org) +- [Google](http://google.com) +- [Markdown](https://en.wikipedia.org/wiki/Markdown) + +## Code Example + +Use the three backticks to separate code. + +``` +// the setup function runs once when you press reset or power the board +void setup() { + // initialize digital pin LED_BUILTIN as an output. + pinMode(LED_BUILTIN, OUTPUT); +} + +// the loop function runs over and over again forever +void loop() { + digitalWrite(LED_BUILTIN, HIGH); // turn the LED on (HIGH is the voltage level) + delay(1000); // wait for a second + digitalWrite(LED_BUILTIN, LOW); // turn the LED off by making the voltage LOW + delay(1000); // wait for a second +} +``` + +## Gallery + + + +## Video + +### From Vimeo + +<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe> +<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p> + +### From Youtube + +<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe> + +## 3D Models + +<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe> + +<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;"> + <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita's Gown</a> + by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a> + on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a> +</p> +</div> diff --git a/docs/images/week01/assignment-photo.jpg b/docs/images/week01/assignment-photo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a32a393fb075f0a620d9982ca42674b75de10696 Binary files /dev/null and b/docs/images/week01/assignment-photo.jpg differ diff --git a/docs/index.md b/docs/index.md index b926fb887728a3dd9fa9953454dafb595dcffd74..027e348edfcd3f1777ec7068a522a08bf73b70f0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,40 +1,22 @@ -Hello! +# Hello, new student! -This is an example blog for the Fabricademy Course. + -You can edit it on [Gitlab](http://gitlab.fabcloud.org). The software used turns simple text files -written in [Markdown](https://en.wikipedia.org/wiki/Markdown) format, into the site you are navigating. - -Each time you change a page using the Gitlab interface the site is rebuilt and all the changes published -in few minutes. - -If this is your site, go on and edit this page clicking the Gitlab link on the upper right, changing the text below and deleting this. - -No worries, you can't break anything, all the changes you make are saved under [Version Control](https://en.wikipedia.org/wiki/Version_control) using [GIT](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control). This means that you have all the different versions of your page saved and available all the time in the Gitlab interface. - -## About me - - - -Hi! I am Emma Brewer. I am an art director & graphic designer based in New York City working on branding, visual identities, editorial design and web design. +## Welcome to your new Fab Academy site -Visit this website to see my work! +This is an example student blog for the Fab Academy. -## My background +## How to edit it -I was born in a nice city called.. - -## Previous work - -I'm a paragraph. Edit the page on Gitlab to add your own text and edit me. I’m a great place for you to tell a story and let your users know a little more about you.​ - -### Project A - -This is an image from an external site: - - +You can edit it on [Gitlab](http://gitlab.fabcloud.org). The software used turns simple text files +written in [Markdown](https://en.wikipedia.org/wiki/Markdown) format, into the site you are navigating. -While this is an image from the assets/images folder. Never use absolute paths (starting with /) when linking local images, always relative. +No worries, you can't break anything, all the changes you make are saved under [Version Control](https://en.wikipedia.org/wiki/Version_control) using [GIT](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control). This means that you have all the different versions of your page saved and available all the time in the Gitlab interface. - +## In short +- This website is built automatically by gitlab every time you edit the files in the docs folder +- It does so thanks to [Mkdocs](https://mkdocs.org) a static site generator written in Python +- You must start customizing the file `mkdocs.yml` with your information +- You can change the looks of your website using mkdocs themes, you can find in the `mkdocs.yml` the options for the [Material Mkdocs theme](https://squidfunk.github.io/mkdocs-material/) +- If you want to start from scratch, you can delete everything (using [git-rm](https://git-scm.com/docs/git-rm)) in this repository and push any other static website diff --git a/docs/projects/sample-project.md b/docs/projects/sample-project.md index 150e8d8fa995ae03ab05be663ad00afe123e8af3..635cc08db0fc0de0e63427d6a6ad24324ced5686 100644 --- a/docs/projects/sample-project.md +++ b/docs/projects/sample-project.md @@ -1,9 +1,10 @@ -# Vimeo +# Another project + +### Vimeo <iframe src="https://player.vimeo.com/video/269013987" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe> <p><a href="https://vimeo.com/269013987">Ricardo O Nascimento- prototyping movement</a> from <a href="https://vimeo.com/fabricademy">Textile Academy</a> on <a href="https://vimeo.com">Vimeo</a>.</p> -# Youtube +### Youtube <iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe> - diff --git a/mkdocs.yml b/mkdocs.yml index b882352db213145393b47db2577722517a7062b7..de98fa278a402b7e72a98a8433d7b87f86950487 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,18 +1,39 @@ # Replace the text below to customize your site -site_name: Fiore Basile - Fab Academy 2019 +site_name: Fab Academy Student Name site_description: My Fabacademy site -site_url: http://fibasile.fabcloud.io/mkdocs -repo_url: https://gitlab.fabcloud.org/fibasile/mkdocs -site_author: Fiore Basile -docs_dir: docs + +site_author: Your name here +docs_dir: docs site_dir: _site copyright: Creative Commons Attribution Non Commercial -theme: - name: spacelab # try also cerulean, cosmo, cyborg, amelia, darkly, spacelab, united - extra: - include_sidebar: false +theme: + name: material + # see https://squidfunk.github.io/mkdocs-material/getting-started/#color-palette + palette: + primary: "deep" + accent: "indigo" + font: + false + # text: "Ubuntu" + # code: "Ubuntu Mono" + feature: + tabs: true +extra: + social: + - type: "github" + link: "https://github.com/academany" + - type: "twitter" + link: "https://twitter.com/fabacademany" + - type: "linkedin" + link: "https://linkedin.com/in/academany" + - type: "instagram" + link: "https://instagram.com/fabacademany" + markdown_extensions: - - toc: - permalink: '#' - - extra - - smarty + - extra + - smarty + - admonition + - codehilite: + guess_lang: false + - toc: + permalink: true diff --git a/requirements.txt b/requirements.txt index 7be02d58c6268bac15c4a1d47321171d132f188f..21f876b4370ca81d6c924c4c21206bb30467af94 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ mkdocs -mkdocs-bootswatch +mkdocs-material \ No newline at end of file