Commit 73bdb4c4 authored by Arash Sattari's avatar Arash Sattari

Ivans comments added

parent 0117c03f
Pipeline #79747 passed with stage
in 32 seconds
......@@ -139,7 +139,9 @@
<p>
For the assignment page, I designed a fix sidebar that lets the user easily move between different sections of the page (figure 3). I also added the homepage navigation bar to the assignment
page and fixed on top of the page, so that the user can go to the other sections of the website with minimum effort. As mentioned before, an assignment page can be very long, so
having buttons for scrolling back to top seemed like a good idea (Thanks to <b><a href="http://fabacademy.org/2018/labs/fablaboulu/students/marta-cortesorduna/aboutme.html">Marta</a></b> for her reminder).
having buttons for scrolling back to top seemed like a good idea (Thanks to <b><a href="http://fabacademy.org/2018/labs/fablaboulu/students/marta-cortesorduna/aboutme.html">Marta</a></b> for her reminder). <br>
To add different features to the website, I went through multiple tutorials on the internet. For instance I followed these two tutorials ( <b><a href="https://www.w3schools.com/howto/howto_css_fixed_sidebar.asp">1</a></b>,
<b><a href="https://mladenplavsic.github.io/bootstrap-navbar-sidebar/"> 2</a></b> ) to implement the sidebar.
</p>
<div class="img-container"><img style="width: 700px;" src="../img/assignments/w1/3.jpg" alt=""><br><b>Figure 3. </b> Assignment page template.</div>
</div>
......@@ -181,22 +183,25 @@
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="commandText"><b>&nbsp;cat ~/.ssh/id_rsa.pub &nbsp;</b>></span> <br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Copy the SSH key (figure 5). <br>
<div class="img-container"><img style="width: 500px;" src="../img/assignments/w1/5.jpg" alt=""><br><b>Figure 5. </b> Copy the SSH key.</div>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Browse through the git.fabacademy site. Then, go to <span class="inText">User Settings > SSH Keys</span> (figure 6). Then, paste your SSH Key into the <b>Key</b> textbox.
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Browse through the git.fabcloud site. Then, go to <span class="inText">User Settings > SSH Keys</span> (figure 6). Then, paste your SSH Key into the <b>Key</b> textbox.
<div class="img-container"><img style="width: 800px;" src="../img/assignments/w1/6.jpg" alt=""><br><b>Figure 6. </b> Where to paste the SSH Key.</div>
</p>
<p class="sub-title">Cloning the FabAcademy Repository: </p>
<p style="padding-left:30px;">
I had used <b>Git</b> before, so basically I was familiar with that. But still I followed this <b><a href="http://fabacademy.org/2019/docs/FabAcademy-Tutorials/week01_principles_practices_project_management/git_simple.html">tutorial</a></b> to learn more. <br>
4. &nbsp; Creating a local copy of the remote repository using <b>clone</b> command (clone address can be found on your project page). <br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="commandText"><b>&nbsp;git clone "Fab Lab Oulu repository address" &nbsp;</b></span> <br>
5. &nbsp; Since I did not want to use website templates that was prepared by repository, I deleted all the files from my local repository. <br>
5. &nbsp; Since I did not want to use website templates that was prepared by repository, I deleted them. I did clone
the repository to a local directory on my laptop, deleted them and then push the empty directory back to the repository. However I found out later that it would be better to use
<b>git rm</b> command instead. <br>
6. &nbsp; I made a simple "Hello World!" page named index.html (figure 7) and put it in the local repository. <br>
<div class="img-container"><img style="width: 500px;" src="../img/assignments/w1/7.jpg" alt=""><br><b>Figure 7. </b> Hello World page.</div>
7. &nbsp; Uploading the created .html file to the remote repository through these steps: <br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- To download the last copy from the repository and synchronize local repository with the remote repository: <br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="commandText"><b>&nbsp; git pull &nbsp;</b></span> <br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Add the new files you added to the local repository: <br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- To add the new files or the ones you have modified to the index area: <br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="commandText"><b>&nbsp; git add . &nbsp;</b></span> <br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Name your update, so you know what you changed. <br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Name your update, so you know what you changed. Actually <b>'commit'</b> command, stores the files that are in the index area, into the local repository.<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="commandText"><b>&nbsp; git commit -m "change you did" &nbsp;</b></span> <br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Upload to the Repository. <br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="commandText"><b>&nbsp; git push &nbsp;</b></span> <br>
......
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