Commit dc49b0de authored by Solomon Embafrash's avatar Solomon Embafrash

Add files from last year

parent 52906311
Pipeline #71458 passed with stages
in 35 seconds
The MIT License (MIT)
Copyright (c) 2018 Embafrash Solomon
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
# FabAcademy_Template
An html/ajax template for the students of Fab Academy
## License
MIT
## Includes
* <a href="http://getbootstrap.com/">Twitter Bootstrap</a>
* <a href="http://jquery.com/">JQuery</a>
* <a href="https://code.google.com/p/google-code-prettify/">google-code-prettify</a>
* <a href="http://jmblog.github.io/color-themes-for-google-code-prettify/github/">GitHub theme for google-code-prettify</a>
* <a href="https://code.google.com/p/jsc3d/">JSC3D</a>
* <a href="https://github.com/thegrubbsian/jquery.ganttView">jquery.ganttView</a>
## Notes
Ajax functionalities won't work locally on Chrome because of "safety settings" (but will work online).
## Welcome to your new Fab Academy site
- 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 names of the available themes
- If you want to start from scratch, you can delete everything in this repository and push any other static website
solomon.embafrash's website
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="Solomon Embafrash">
<link rel="icon" href="media/favicon.ico">
<title>Fab Academy 2018 - Embafrash Solomon</title>
<!-- Bootstrap core CSS -->
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
<!-- Custom styles for this template -->
<link href="media/fabacademy.css" rel="stylesheet">
<!-- 3D files viewer -->
<script type="text/javascript" src="media/jsc3d_ie.min.js"></script>
<script type="text/javascript" src="media/jsc3d.min.js"></script>
<script type="text/javascript" src="media/jsc3d.webgl.js"></script>
<script type="text/javascript" src="media/jsc3d.touch.js"></script>
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="bootstrap/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="bootstrap/js/ie-emulation-modes-warning.js"></script>
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<!-- Load the menu file -->
<script>
function menu() {
$('#exercises').load("exercises-menu.html");
$('#project').load("project-menu.html");
$('#cclicense').load("license.html");
}
</script>
</head>
<body onload="menu()">
<!-- Static navbar -->
<nav class="navbar navbar-default navbar-static-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">Solomon Embafrash</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a href="about.html">About</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Exercises <span class="caret"></span></a>
<ul id="exercises" class="dropdown-menu" role="menu">
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Final Project <span class="caret"></span></a>
<ul id="project" class="dropdown-menu" role="menu">
</ul>
</li>
<li><a href="contact.html">Contact</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>
<div class="container">
<!-- Insert your content here below! -->
<p class="pic">
<img src="media/Pictures/About/me%20at%20work.JPG">
<legend>Life is an experiment...</legend>
</p>
<p>
I am 33 years old industrial engineer from Helsinki. For the last 3 years I have been working as a Fablab workshop master in Aalto university, Aalto Fablab.
Travelling, meeting new people and learning new cultures are my hobbies.
My spare time also goes to doing and following sports, DIY projects and recycling.
</p>
<p>
My work duties as a Fablab workshop master in Aalto University includes,
<li>
arranging lectures and workshops to students and staff on electronics Prototyping and digital fabrication tools such as 3d model software (Rhino, Solid Works, Auto cad), visualization software (adobe Photoshop, Illustrator, Corel draw) , Cam software ( Mastercam, Cambam) and Machines know-how on 3D printers, Laser cutters, Three and four axis CNC machines, 3D scanners and PNP machines.</li>
<li>managing inventories, Purchasing and testing of sourced electronic and automation components.</li>
<li>Technical environment: Cura, Processing, Arduino, Skanect, Eagle, MS Project, MS Office</li>
</p>
<p>
From 01.09.2012-01.12.14 I was an entrepreneur. I had the chance to work on the field of merchandise printing which gave me chance to develop a knowledge in marketing and understand proficient customer demand patterns. The fact that I was using machines that I build myself ,cnc machine and screen printing press, made my initial investment necessary to inter the market very low.
<li>Technical environment: Linux cnc, adobe Photoshop, Illustrator, Corel draw, MS Office, Cut studio, V carve pro</li>
</p>
<P>
After graduating from University in August 2009, I was offered a job in the school as an assistant lecturer in application of Comsol software in Fluid mechanics course. This involved the use of solidwork software for designing machine parts and evaluating their physical properties using a simuliation software called Comsol. One good example of my work is the simulation of Non-Newtonian fluid in title "3-D Comsol Analysis of Extruder Dies" where I had the privilege of presenting it to the European COMSOL Conference 2009 held in Milan Oct. 14-16. 2010. The documentation was also published on <a href="http://www.designworldonline.com/3d-comsol-analysis-of-extruder-dies/">Design world</a>.
<li>Technical environment: Solidworks, Comsol, STL</li>
</P>
<!--<h3>Would you like to insert more style/elements?</h3>
<p>
Check the documentation of Bootstrap <a href="">here</a>.
</p>
<!-- End of your content -->
</div> <!-- /container -->
<!-- footer -->
<footer id="footer">
<p id="cclicense">
</p>
<p class="license">
Theme: <a href="https://github.com/openp2pdesign/FabAcademy_Template">Fab Academy Template</a> by <a href="http://openp2pdesign.org">Solomon EMbafrash</a> <br>
Based on <a href="http://getbootstrap.com/">Twitter Bootstrap</a>+<a href="http://jquery.com/">JQuery</a>+<a href="https://code.google.com/p/google-code-prettify/">google-code-prettify</a>+<a href="http://jmblog.github.io/color-themes-for-google-code-prettify/github/">GitHub theme for google-code-prettify</a>+<a href="https://code.google.com/p/jsc3d/">JSC3D</a>+<a href="https://github.com/thegrubbsian/jquery.ganttView">jquery.ganttView</a>.
</p>
</footer>
<!-- Do not touch this! -->
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="media/jquery-1.9.1.min.js"></script>
<!-- Syntax Highlighter -->
<script src="https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js?skin=desert">
</script>
<!-- From https://github.com/jmblog/color-themes-for-google-code-prettify -->
<link href="media/github.css" type="text/css" rel="stylesheet">
<script type="text/javascript">
!function ($) {
$(function(){
window.prettyPrint && prettyPrint()
})
}(window.jQuery)
</script>
<script src="bootstrap/js/bootstrap.min.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="bootstrap/js/ie10-viewport-bug-workaround.js"></script>
</body>
</html>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
require('../../js/transition.js')
require('../../js/alert.js')
require('../../js/button.js')
require('../../js/carousel.js')
require('../../js/collapse.js')
require('../../js/dropdown.js')
require('../../js/modal.js')
require('../../js/tooltip.js')
require('../../js/popover.js')
require('../../js/scrollspy.js')
require('../../js/tab.js')
require('../../js/affix.js')
cable.jpg

3.33 KB

<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="Solomon Embafrash">
<link rel="icon" href="media/favicon.ico">
<title>Fab Academy 2018- Solomon Embafrash</title>
<!-- Bootstrap core CSS -->
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
<!-- Custom styles for this template -->
<link href="media/fabacademy.css" rel="stylesheet">
<!-- 3D files viewer -->
<script type="text/javascript" src="media/jsc3d_ie.min.js"></script>
<script type="text/javascript" src="media/jsc3d.min.js"></script>
<script type="text/javascript" src="media/jsc3d.webgl.js"></script>
<script type="text/javascript" src="media/jsc3d.touch.js"></script>
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="bootstrap/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="bootstrap/js/ie-emulation-modes-warning.js"></script>
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<!-- Load the menu file -->
<script>
function menu() {
$('#exercises').load("exercises-menu.html");
$('#project').load("project-menu.html");
$('#cclicense').load("license.html");
}
</script>
</head>
<body onload="menu()">
<!-- Static navbar -->
<nav class="navbar navbar-default navbar-static-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">Solomon Embafrash</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a href="about.html">About</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Exercises <span class="caret"></span></a>
<ul id="exercises" class="dropdown-menu" role="menu">
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Final Project <span class="caret"></span></a>
<ul id="project" class="dropdown-menu" role="menu">
</ul>
</li>
<li><a href="contact.html">Contact</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>
<div class="container">
<!-- Insert your content here below! -->
<h2>Contact</h2>
<p>
solomon.embafrash@aalto.fi<br />
pienen villasaaren tie 6 h 76 <br />
00960 helsinki
</p>
<!-- <h3>Would you like to insert more style/elements?</h3>
<p>
Check the documentation of Bootstrap <a href="">here</a>.
</p>
<!-- End of your content -->
</div> <!-- /container -->
<!-- footer -->
<footer id="footer">
<p id="cclicense">
</p>
<p class="license">
Theme: <a href="https://github.com/openp2pdesign/FabAcademy_Template">Fab Academy Template</a> by <a href="http://openp2pdesign.org">Massimo Menichinelli</a> <br>
Based on <a href="http://getbootstrap.com/">Twitter Bootstrap</a>+<a href="http://jquery.com/">JQuery</a>+<a href="https://code.google.com/p/google-code-prettify/">google-code-prettify</a>+<a href="http://jmblog.github.io/color-themes-for-google-code-prettify/github/">GitHub theme for google-code-prettify</a>+<a href="https://code.google.com/p/jsc3d/">JSC3D</a>+<a href="https://github.com/thegrubbsian/jquery.ganttView">jquery.ganttView</a>.
</p>
</footer>
<!-- Do not touch this! -->
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="media/jquery-1.9.1.min.js"></script>
<!-- Syntax Highlighter -->
<script src="https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js?skin=desert">
</script>
<!-- From https://github.com/jmblog/color-themes-for-google-code-prettify -->
<link href="media/github.css" type="text/css" rel="stylesheet">
<script type="text/javascript">
!function ($) {
$(function(){
window.prettyPrint && prettyPrint()
})
}(window.jQuery)
</script>
<script src="bootstrap/js/bootstrap.min.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="bootstrap/js/ie10-viewport-bug-workaround.js"></script>
</body>
</html>
......@@ -6,7 +6,7 @@
## Welcome to your new Fab Academy site
This is an example student blog for the Fab Academy.
This is an example blog for the Fab Academy.
## How to edit it
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="Solomon Embafrash">
<link rel="icon" href="media/favicon.ico">
<title>Fab Academy 2018- Solomon Embafrash</title>
<!-- Bootstrap core CSS -->
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
<!-- Custom styles for this template -->
<link href="media/fabacademy.css" rel="stylesheet">
<!-- 3D files viewer -->
<script type="text/javascript" src="media/jsc3d_ie.min.js"></script>
<script type="text/javascript" src="media/jsc3d.min.js"></script>
<script type="text/javascript" src="media/jsc3d.webgl.js"></script>
<script type="text/javascript" src="media/jsc3d.touch.js"></script>
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="bootstrap/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="bootstrap/js/ie-emulation-modes-warning.js"></script>
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<!-- Load the menu file -->
<script>
function menu() {
$('#exercises').load("exercises-menu.html");
$('#project').load("project-menu.html");
$('#cclicense').load("license.html");
}
</script>
</head>
<body onload="menu()">
<!-- Static navbar -->
<nav class="navbar navbar-default navbar-static-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">Solomon Embafrash</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a href="about.html">About</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Exercises <span class="caret"></span></a>
<ul id="exercises" class="dropdown-menu" role="menu">
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Final Project <span class="caret"></span></a>
<ul id="project" class="dropdown-menu" role="menu">
</ul>
</li>
<li><a href="contact.html">Contact</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>
<div class="container">
<!-- Insert your content here below! -->
<h2>Exercise...</h1>
<h3>Menu</h3>
<p>
You can edit it by changing the <em>exercises-menu.html</em> and <em>project-menu.html</em>. Do <strong>not</strong> add any &ltol&gt; or &ltul&gt;, leave the structure as it is.
</p>
<h3>Text</h3>
<p>
You can set it up with:
<pre class="prettyprint linenums">
&ltp&gt;
Your text here
&lt/p&gt;</pre>
</p>