Commit 9ab7d80e by Arash Sattari

Week 1 and 6 are added

parent 53b082a6
Pipeline #73942 passed with stage
in 33 seconds
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="">
<meta name="author" content="">
<title>Arash Fab Academy 2019</title>
<link rel="titlebar icon" href="../img/logos/logo_32pix.png">
<!-- Bootstrap core CSS -->
<link href="../vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<!-- Custom fonts for this template -->
<link href="../vendor/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
<link href='https://fonts.googleapis.com/css?family=Kaushan+Script' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700' rel='stylesheet' type='text/css'>
<!-- Custom styles for this template -->
<link href="../css/agency.min.css" rel="stylesheet">
<link href="../css/assignments.css" rel="stylesheet">
</head>
<body id="page-top" data-spy="scroll" data-target="#SidebarScrollspy" data-offset="70">
<!-- Top Navigation -->
<nav class="navbar navbar-expand-lg navbar-dark fixed-top" id="mainNav">
<div class="container">
<a class="navbar-brand js-scroll-trigger" href="../index.html#aboutMe">Arash Sattari</a>
<a class="navbar-brand js-scroll-trigger" href="../index.html#FabLabOulu" style="font-size:20px;color:#707070;"> (@FabLab Oulu)</a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
<i class="fas fa-bars"></i>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav text-uppercase ml-auto">
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="../index.html">Home</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="../index.html#aboutMe">About Me</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="../index.html#portfolio">portfolio</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Jump To</a>
<ul class="dropdown-menu">
<span class="dropdown-item">
<a href="week1.html">W1: Project Management</a>
</span>
<span class="dropdown-item">
<a href="week2.html">W2: Computer-aided Design</a>
</span>
<span class="dropdown-item">
<a href="week3.html">W3: Computer-controlled Cutting</a>
</span>
<span class="dropdown-item">
<a href="week4.html">W4: Electronics Production</a>
</span>
<span class="dropdown-item">
<a href="week5.html">W5: 3D scanning and printing</a>
</span>
<span class="dropdown-item">
<a href="week6.html">W6: Electronic Design</a>
</span>
</ul>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="../index.html#finalProject">Final Project</a>
</li>
</ul>
</div>
</div>
</nav>
<div id="top" class="container-fluid" id="wrapper">
<!-- Sidebar -->
<div style="width:280px;" class="row" id="sidebar-wrapper">
<nav id="SidebarScrollspy">
<ul class="nav nav-pills flex-column">
<li class="nav-item">
<a href="#top" class="nav-link active">Fab Academy Responsibilities</a>
</li>
<li class="nav-item">
<a href="#section-2" class="nav-link">Student Responsibilities</a>
</li>
</ul>
</nav>
</div>
<!-- /#sidebar-wrapper -->
<!-- Page Content -->
<div id="page-content-wrapper">
<div class="container-fluid">
<h1 id="contentTitle" class="mt-4">Fab Academy Student Agreement</h1>
<br>
<div class="section-content">
<h3 class="mt-4">The Fab Academy is responsible for:</h3>
<p style="padding-left:30px; padding-top: 10px;">
&#9679; &nbsp;Arranging lectures, recitations, meetings, and events for the class <br>
&#9679; &nbsp;Evaluating and providing feedback on student work Offering clear standards for completing assignments <br>
&#9679; &nbsp;Certifying and archiving student progress Supervising class preparation <br>
&#9679; &nbsp;Reviewing prospective students, instructors, and labs <br>
&#9679; &nbsp;Providing central staff and infrastructure for students, instructors, and labs <br>
&#9679; &nbsp;Fund-raising for costs not covered by student tuition <br>
&#9679; &nbsp;Managing and reporting on the program’s finances, results, and impacts <br>
&#9679; &nbsp;Publicizing the program <br>
&#9679; &nbsp;Promoting a respectful environment free of harassment and discrimination <br>
</p>
</div>
<div class="section-content">
<a class="anchor" id="section-2"></a>
<h3 class="mt-4">I am a Fab Academy student, responsible for:</h3>
<p style="padding-left:30px; padding-top: 10px;">
&#9679; &nbsp;Attending class lectures and participating in reviews <br>
&#9679; &nbsp;Developing and documenting projects assigned to introduce and demonstrate skills <br>
&#9679; &nbsp;Honestly reporting on my work <br>
&#9679; &nbsp;Working safely <br>
&#9679; &nbsp;Leaving workspaces in the same (or better) condition than I found them <br>
&#9679; &nbsp;Participating in the upkeep of my lab <br>
&#9679; &nbsp;Ensuring that my tuition to cover local and central class costs is covered <br>
&#9679; &nbsp;Promoting a respectful environment free of harassment and discrimination <br>
</p>
<br>
<p>
Signed by committing this file in my repository, <br>
<b>Arash Sattari</b>
</p>
</div>
</div>
</div>
<!-- /#page-content-wrapper -->
</div>
<!-- /#wrapper -->
<!-- Return to Top -->
<a href="javascript:" id="return-to-top"><i class="fa fa-arrow-up"></i></a>
<!-- Bootstrap core JavaScript -->
<script src="../vendor/jquery/jquery.min.js"></script>
<script src="../vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Plugin JavaScript -->
<script src="../vendor/jquery-easing/jquery.easing.min.js"></script>
<!-- Custom scripts for this template -->
<script src="../js/agency.min.js"></script>
<script src="../js/assignments.js"></script>
</body>
</html>
......@@ -49,21 +49,27 @@
<a class="nav-link js-scroll-trigger" href="../index.html#portfolio">portfolio</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Jump To</a>
<ul class="dropdown-menu">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Jump To</a>
<ul class="dropdown-menu">
<span class="dropdown-item">
<a href="">W1: Project Management</a>
<a href="week1.html">W1: Project Management</a>
</span>
<span class="dropdown-item active-item">
<a href="week2.html">W2: Computer-aided Design</a>
</span>
<span class="dropdown-item">
<a href="week3.html">W3: Computer-controlled Cutting</a>
</span>
<span class="dropdown-item">
<a href="week2.html">W2: Computer-aided Design</a>
<a href="week4.html">W4: Electronics Production</a>
</span>
<span class="dropdown-item">
<a href="week3.html">W3: Computer-controlled Cutting</a>
<a href="week5.html">W5: 3D scanning and printing</a>
</span>
<span class="dropdown-item">
<a href="week4.html">W4: Electronics Production</a>
<a href="week6.html">W6: Electronic Design</a>
</span>
</ul>
</ul>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="../index.html#finalProject">Final Project</a>
......
......@@ -49,21 +49,27 @@
<a class="nav-link js-scroll-trigger" href="../index.html#portfolio">portfolio</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Jump To</a>
<ul class="dropdown-menu">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Jump To</a>
<ul class="dropdown-menu">
<span class="dropdown-item">
<a href="">W1: Project Management</a>
<a href="week1.html">W1: Project Management</a>
</span>
<span class="dropdown-item">
<a href="week2.html">W2: Computer-aided Design</a>
<a href="week2.html">W2: Computer-aided Design</a>
</span>
<span class="dropdown-item active-item">
<a href="week3.html">W3: Computer-controlled Cutting</a>
</span>
<span class="dropdown-item">
<a href="week4.html">W4: Electronics Production</a>
</span>
<span class="dropdown-item">
<a href="week3.html">W3: Computer-controlled Cutting</a>
<a href="week5.html">W5: 3D scanning and printing</a>
</span>
<span class="dropdown-item">
<a href="week4.html">W4: Electronics Production</a>
<a href="week6.html">W6: Electronic Design</a>
</span>
</ul>
</ul>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="../index.html#finalProject">Final Project</a>
......
......@@ -49,21 +49,27 @@
<a class="nav-link js-scroll-trigger" href="../index.html#portfolio">portfolio</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Jump To</a>
<ul class="dropdown-menu">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Jump To</a>
<ul class="dropdown-menu">
<span class="dropdown-item">
<a href="">W1: Project Management</a>
<a href="week1.html">W1: Project Management</a>
</span>
<span class="dropdown-item">
<a href="week2.html">W2: Computer-aided Design</a>
<a href="week2.html">W2: Computer-aided Design</a>
</span>
<span class="dropdown-item">
<a href="week3.html">W3: Computer-controlled Cutting</a>
<a href="week3.html">W3: Computer-controlled Cutting</a>
</span>
<span class="dropdown-item active-item">
<a href="week4.html">W4: Electronics Production</a>
</span>
<span class="dropdown-item">
<a href="week5.html">W5: 3D scanning and printing</a>
</span>
<span class="dropdown-item">
<a href="week4.html">W4: Electronics Production</a>
<a href="week6.html">W6: Electronic Design</a>
</span>
</ul>
</ul>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="../index.html#finalProject">Final Project</a>
......
......@@ -49,21 +49,27 @@
<a class="nav-link js-scroll-trigger" href="../index.html#portfolio">portfolio</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Jump To</a>
<ul class="dropdown-menu">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Jump To</a>
<ul class="dropdown-menu">
<span class="dropdown-item">
<a href="">W1: Project Management</a>
<a href="week1.html">W1: Project Management</a>
</span>
<span class="dropdown-item">
<a href="week2.html">W2: Computer-aided Design</a>
<a href="week2.html">W2: Computer-aided Design</a>
</span>
<span class="dropdown-item">
<a href="week3.html">W3: Computer-controlled Cutting</a>
<a href="week3.html">W3: Computer-controlled Cutting</a>
</span>
<span class="dropdown-item">
<a href="week4.html">W4: Electronics Production</a>
<a href="week4.html">W4: Electronics Production</a>
</span>
</ul>
<span class="dropdown-item active-item">
<a href="week5.html">W5: 3D scanning and printing</a>
</span>
<span class="dropdown-item">
<a href="week6.html">W6: Electronic Design</a>
</span>
</ul>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="../index.html#finalProject">Final Project</a>
......@@ -116,6 +122,7 @@
that could not be made subtractively <br>
&#9679; &nbsp; 3D scan an object (and optionally print it) <br>
</p>
</div>
</div>
<div class="section-content">
<a class="anchor" id="section-2"></a>
......@@ -135,7 +142,7 @@
Here's a brief explanation of the steps that I took to design it:
</p>
<p style="padding-left:30px;">
1. Sketching a 40mm by 40mm rectangle from <span class="inText">Sketch > rectangle </span> (Figure 2).
1. &nbsp;Sketching a 40mm by 40mm rectangle from <span class="inText">Sketch > rectangle </span> (Figure 2).
</p>
<div class="img-container"><img style="height: 350px;" src="../img/assignments/w5/d1.PNG" alt=""><br><b>Figure 2. </b> Sketching a rectangle.</div>
<p style="padding-left:30px;">
......
......@@ -159,4 +159,14 @@ span.inText{
color: #909090;
margin-bottom: 15px;
margin-top: 30px;
}
\ No newline at end of file
}
.active-item {
background-color: #212529;
}
.commandText {
border-left: 4px solid grey;
background-color: #f0f0f0;
font-family: 'Courier New', Courier, monospace;
}
......@@ -67,6 +67,7 @@ header.divider{
align-items : center;
text-align: justify;
text-justify: inter-word;
margin-top: -50px;
}
#aboutMe {
......
......@@ -52,7 +52,7 @@
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Jump To</a>
<ul class="dropdown-menu">
<span class="dropdown-item" >
<a href="#">W1: Project Management</a>
<a href="assignments/week1.html">W1: Project Management</a>
</span>
<span class="dropdown-item" >
<a href="assignments/week2.html">W2: Computer-aided Design</a>
......@@ -66,6 +66,9 @@
<span class="dropdown-item">
<a href="assignments/week5.html">W5: 3D scanning and printing</a>
</span>
<span class="dropdown-item">
<a href="assignments/week5.html">W6: Electronic Design</a>
</span>
</ul>
</li>
<li class="nav-item">
......@@ -127,18 +130,27 @@
</div>
</div>
<div id="aboutMeTxt" class="col-xs-12 col-sm-12 col-md-6 col-lg-8 col-xl-9">
<p>Hello! My name is Arash Sattari. I am participating in Fab Academy 2019 from Fab Lab Oulu, in Finland. I got a Bachelor's degree in Electronics
and a master’s in Electrical Engineering in my homeland Iran. Then I moved to Finland to continue my journey in Computer Science. I graduated in Ubiquitous Computing
master’s program at University of Oulu in 2018, and started a PhD at UBICOMP research group of University of Oulu. <br>
My familiarity with Fab Lab concept comes from UBISS 2017 summer school (“Digital Product Realization: Making Things That Matter”), which was held in Fab Lab Oulu.
Also I have done multiple SMD soldering and PCB designs in FabLab. My research is focused on embedded web services, and I will require to build my own embedded
devices and related physical parts such as cases, wearable devices, holders, etc. Therefore, Extending my knowledge and skill regarding digital fabrication tools
will be really helpful for me in my further research. Beyond that, working with fabrication tools has been always one of my main interests.
</p>
<div>
<p>Hello! My name is Arash Sattari. I am participating in Fab Academy 2019 from Fab Lab Oulu, in Finland. I got a Bachelor's degree in Electronics
and a master’s in Electrical Engineering in my homeland Iran. Then I moved to Finland to continue my journey in Computer Science. I graduated in Ubiquitous Computing
master’s program at University of Oulu in 2018, and started a PhD at UBICOMP research group of University of Oulu. <br>
My familiarity with Fab Lab concept comes from UBISS 2017 summer school (“Digital Product Realization: Making Things That Matter”), which was held in Fab Lab Oulu.
Also I have done multiple SMD soldering and PCB designs in FabLab. My research is focused on embedded web services, and I will require to build my own embedded
devices and related physical parts such as cases, wearable devices, holders, etc. Therefore, Extending my knowledge and skill regarding digital fabrication tools
will be really helpful for me in my further research. Beyond that, working with fabrication tools has been always one of my main interests. <br>
</p>
<br>
<!-- Student Agreements -->
<div style="text-align:right; width:100%;">
<a style="color:#fed136;" class="btn btn-dark btn-lg text-uppercase js-scroll-trigger" href="assignments/student-agreement.html">Student Agreement</a>
</div>
</div>
</div>
</div>
</div>
</section>
</section>
<!-- Portfolio Grid -->
<section class="portfolio-background" id="portfolio">
......@@ -151,13 +163,13 @@
</div>
<div class="row">
<div class="col-md-4 col-sm-6 portfolio-item">
<a class="portfolio-link" data-toggle="modal" href="#week1">
<a class="portfolio-link" data-toggle="modal" href="assignments/week1.html">
<div class="portfolio-hover">
<div class="portfolio-hover-content">
<i class="fas fa-plus fa-3x"></i>
</div>
</div>
<img class="img-fluid" src="img/portfolio/under-constraction.jpg" alt="">
<img class="img-fluid" src="img/portfolio/01-thumbnail.jpg" alt="">
</a>
<div class="portfolio-caption">
<h4>Week 1</h4>
......@@ -221,13 +233,13 @@
</div>
</div>
<div class="col-md-4 col-sm-6 portfolio-item">
<a class="portfolio-link" data-toggle="modal" href="#week6">
<a class="portfolio-link" data-toggle="modal" href="assignments/week6.html">
<div class="portfolio-hover">
<div class="portfolio-hover-content">
<i class="fas fa-plus fa-3x"></i>
</div>
</div>
<img class="img-fluid" src="img/portfolio/coming-soon.jpg" alt="">
<img class="img-fluid" src="img/portfolio/06-thumbnail.jpg" alt="">
</a>
<div class="portfolio-caption">
<h4>Week 6</h4>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment