diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9b46e748ce7fcd7aa2ead40f2233f90712a43f12..1d984e1989d0dfb99eec47add93fbde9a8cf3f57 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,6 +2,7 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="33061d0c-84e3-4051-bf3c-7d807428912a" name="Default" comment=""> + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" /> </list> <ignored path="$PROJECT_DIR$/.tmp/" /> @@ -54,12 +55,12 @@ </usages-collector> <usages-collector id="statistics.file.extensions.edit"> <counts> - <entry key="html" value="9" /> + <entry key="html" value="244" /> </counts> </usages-collector> <usages-collector id="statistics.file.types.edit"> <counts> - <entry key="HTML" value="9" /> + <entry key="HTML" value="244" /> </counts> </usages-collector> </session> @@ -69,8 +70,8 @@ <file pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/index.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-2"> - <caret line="384" column="13" lean-forward="true" selection-start-line="384" selection-start-column="13" selection-end-line="384" selection-end-column="13" /> + <state relative-caret-position="1315"> + <caret line="153" column="20" lean-forward="true" selection-start-line="153" selection-start-column="20" selection-end-line="153" selection-end-column="20" /> <folding> <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> @@ -116,10 +117,10 @@ <sorting>DEFINITION_ORDER</sorting> </component> <component name="ProjectFrameBounds" extendedState="6"> - <option name="x" value="-1901" /> - <option name="y" value="300" /> - <option name="width" value="1936" /> - <option name="height" value="1056" /> + <option name="x" value="-9" /> + <option name="y" value="-9" /> + <option name="width" value="1938" /> + <option name="height" value="1048" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectView"> @@ -209,18 +210,18 @@ <workItem from="1535771879523" duration="9399000" /> <workItem from="1536473512076" duration="5223000" /> <workItem from="1536522854762" duration="5054000" /> - <workItem from="1536532362270" duration="2283000" /> + <workItem from="1536532362270" duration="3600000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="41101000" /> + <option name="totallyTimeSpent" value="42418000" /> </component> <component name="ToolWindowManager"> - <frame x="-1928" y="-8" width="1936" height="1056" extended-state="6" /> + <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> <editor active="true" /> <layout> - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14172813" /> + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17779246" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Favorites" order="2" side_tool="true" /> <window_info anchor="bottom" id="Message" order="0" /> @@ -258,8 +259,8 @@ </entry> <entry file="file://$PROJECT_DIR$/index.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-2"> - <caret line="384" column="13" lean-forward="true" selection-start-line="384" selection-start-column="13" selection-end-line="384" selection-end-column="13" /> + <state relative-caret-position="1315"> + <caret line="153" column="20" lean-forward="true" selection-start-line="153" selection-start-column="20" selection-end-line="153" selection-end-column="20" /> <folding> <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> diff --git a/index.html b/index.html index b0aed40c2152a178f4e977782a17c3ff33221ee1..def87dded7f8e9685b8cdeedccd3f90e95b66be8 100644 --- a/index.html +++ b/index.html @@ -79,7 +79,8 @@ home of the 1000 Fab Labs around the world and sister lab of the Media Lab. <br> <br> - I am a participating to the famous <b>How to Make (<i>almost</i>) Anything</b> and the <b>Machines that Make Machines + I am a participating to the famous <b>How to Make (<i>almost</i>) Anything</b> and the <b>Machines that Make + Machines </b> class taught by Prof. Neil Gershenfeld from CBA and the <b>Fluid Mechanics</b> class by Prof. John Bush from the Dpt. of Mathematics at MIT!<br> Check them out below! @@ -99,8 +100,8 @@ <div class="card-img-overlay h-100 d-flex flex-column align-items-center d-flex justify-content-center"> <h2 class="card-title">How to Make <i>(almost)</i> Anything <br><br> <br> - <a href="#" class="btn btn-primary btn-lg">Weekly Log</a> - <a href="#" class="btn btn-primary btn-lg">Final Project</a> + <a href="https://tourlomousis.pages.cba.mit.edu/my-htmaa-2018" class="btn btn-primary btn-lg">Read + More</a> </h2> </div> </div> @@ -110,8 +111,8 @@ <div class="card-img-overlay h-100 d-flex flex-column align-items-center d-flex justify-content-center"> <h2 class="card-title">Machines that Make Machines<br><br> <br> - <a href="#" class="btn btn-primary btn-lg">Weekly Log</a> - <a href="#" class="btn btn-primary btn-lg">Final Project</a> + <a href="http://fab.cba.mit.edu/classes/865.18/people/filippos/" class="btn btn-primary btn-lg">Read + More</a> </h2> </div> </div> @@ -122,8 +123,7 @@ <h2 class="card-title">Fluid Mechanics<br><br> <br> <br> - <a href="#" class="btn btn-primary btn-lg">Weekly Log</a> - <a href="#" class="btn btn-primary btn-lg">Final Project</a> + <a href="#" class="btn btn-primary btn-lg">Read More</a> </h2> </div> </div> @@ -149,8 +149,9 @@ <h3>Papers:</h3> <ul> <li><i> [Electrohydrodynamics] [Electrowriting] [Biometrology]</i>:<br> - <b>2018</b> - Tourlomousis F. et al. <i>"An Integrated Precision Manufacturing – Metrology Platform - for Studying Cell-Matrix Interactions"</i> (under submission to Advanced Healthcare Materials) + <b>2018</b> - Tourlomousis F. et al. <i>"Machine Learning Metrology of Cell Confinement in Melt + Electrowritten Three-Dimensional Biomaterial Substrates"</i> (submitted to Nature Microsystems & + Nanoengineering) </li> <li><i>[Biometrology]</i><br> <b>2018</b> - Tourlomousis F. et al. <i>"Investigation of Cellular Confinement in Three-Dimensional @@ -269,8 +270,10 @@ <img class="card-img-top" src="images/x-axis.PNG" alt=""> <div class="card-body"> <h4 class="card-title">Melt Electrowriting</h4> - <p class="card-text">Rapid Prototyping of an Electrohydrodynamics-based Additive Manufacturing System</p> - <a href="https://tourlomousis.pages.cba.mit.edu/3dp-mini-linear-axes" class="btn btn-danger">Read More</a> + <p class="card-text">Rapid Prototyping of an Electrohydrodynamics-based Additive Manufacturing + System</p> + <a href="https://tourlomousis.pages.cba.mit.edu/3dp-mini-linear-axes" class="btn btn-danger">Read + More</a> </div> <div> on-going work| img updated 2018/08/28