Updated the navigation

This commit is contained in:
JunkJumper 2019-02-26 13:19:50 +01:00 committed by GitHub
parent ec594dc668
commit fa40a1fb94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 69 additions and 42 deletions

View File

@ -25,7 +25,7 @@
<a href="index.html">Homepage</a> <a href="index.html">Homepage</a>
</li> </li>
<li> <li>
<a href="" class="active">About</a> <a href="about.html" class="active">About</a>
</li> </li>
<li> <li>
<a href="story.html">Story</a> <a href="story.html">Story</a>
@ -34,10 +34,13 @@
<a href="license.html">License</a> <a href="license.html">License</a>
</li> </li>
<li> <li>
<a href="https://www.junkjumper-projects.com/_Project/slegpi/">Demo</a> <a href="https://www.junkjumper-projects.com/_Project/slegpi/">Demo</a>
</li>
<li>
<a href="https://github.com/JunkJumper/SLEGPI">Download on Github</a>
</li> </li>
<li class="last"> <li class="last">
<a href="https://github.com/JunkJumper/SLEGPI">Download on Github</a> <a href="https://www.junkjumper-projects.com/#projects">Back to Projects List</a>
</li> </li>
</ul> </ul>
</nav> </nav>
@ -53,47 +56,60 @@
<section> <section>
<article> <article>
<h1>About the project</h1> <h1>About the project</h1>
<p>Welcome on the About page of the project. SLEGPI is my project for my exams of june 2018. I have work on it from <p>Welcome on the About page of the project. SLEGPI is my project for my exams of june 2018. I have work on
October 2017 to May 2018. The goal of SLEGPI was to make me discover numeric and electronic aspect by considering it from
October 2017 to May 2018. The goal of SLEGPI was to make me discover numeric and electronic aspect by
considering
a lot the substainable developpement. a lot the substainable developpement.
<br /> <br />
<br /> When I start the project, I receive from my professor a contract notice with all the instruction that I must <br /> When I start the project, I receive from my professor a contract notice with all the instruction
that I must
to respect. to respect.
<br /> <br />
<br /> On the contract, was written that i must use a Raspebrry Pi 3, an Arduino Card, and try to respect the substainable <br /> On the contract, was written that i must use a Raspebrry Pi 3, an Arduino Card, and try to respect
the substainable
developpement. developpement.
<br /> <br />
<br /> <br />
</p> </p>
<h2 id="How">How the project works ?</h2> <h2 id="How">How the project works ?</h2>
<p>The project works by setting up a connection between a server hosted on a Raspebrry Pi 3 and the Arduino Card. <p>The project works by setting up a connection between a server hosted on a Raspebrry Pi 3 and the Arduino
Card.
To do that, the Arduino card and the Raspebrry Pi 3 need to b connected to the same network. To do that, the Arduino card and the Raspebrry Pi 3 need to b connected to the same network.
<br /> <br />
<br /> Firstly, the <br /> Firstly, the
<a href="https://en.wikipedia.org/wiki/LAMP_(software_bundle)" target="_blank">LAMP server</a> need to be configured with the <a href="https://en.wikipedia.org/wiki/LAMP_(software_bundle)" target="_blank">LAMP server</a> need to be
<a href="http://php.net/manual/en/book.pdo.php" target="_blank">PDO</a> function. Without it, all the connection between the databse and the website is deleted. When we use configured with the
the website to send an action to do to our Arduino card, we are in server mode. So we are asking to the Arduino <a href="http://php.net/manual/en/book.pdo.php" target="_blank">PDO</a> function. Without it, all the
connection between the databse and the website is deleted. When we use
the website to send an action to do to our Arduino card, we are in server mode. So we are asking to the
Arduino
Card to "display" a page with an URL like : Card to "display" a page with an URL like :
<xmp>ip-adress/action=what_we_want</xmp> <xmp>ip-adress/action=what_we_want</xmp>
And our Arduino Card understand what to do. And our Arduino Card understand what to do.
<br /> <br />
<br /> When the Arduino Card is receiving data from our anemometer or from the luxmeter, it sending informations <br /> When the Arduino Card is receiving data from our anemometer or from the luxmeter, it sending
to the website in client mode. And the website is understanding what Arduino send by using a file called "get_sql.php". informations
<br to the website in client mode. And the website is understanding what Arduino send by using a file called
/> "get_sql.php".
<br />
<br /> <br />
</p> </p>
<h2 id="Exam">How was the exam with this project ?</h2> <h2 id="Exam">How was the exam with this project ?</h2>
<p>The Exam is separated in two parts. One is a continuous assessment and the grade is given by the professor who <p>The Exam is separated in two parts. One is a continuous assessment and the grade is given by the
follow the project from the begining to the end. And the second one is given by a jury of two professors who professor who
follow the project from the begining to the end. And the second one is given by a jury of two professors
who
don't know anything about us or about our project (exept maybe the name of our project). don't know anything about us or about our project (exept maybe the name of our project).
<br /> <br />
<br /> Personally, I get 20/20 for the continuous assessment and 18/20 from the jury. So I get 19/20 for the project <br /> Personally, I get 20/20 for the continuous assessment and 18/20 from the jury. So I get 19/20 for
the project
(coefficient 12). (coefficient 12).
<br /> <br />
<br /> For the continuous assessment, we just have to seriously work. For the jury part, we have to do a slide show <br /> For the continuous assessment, we just have to seriously work. For the jury part, we have to do a
slide show
to project on a screen. We must do a general and personal recap into a .docx file. to project on a screen. We must do a general and personal recap into a .docx file.
</p> </p>
@ -129,10 +145,12 @@
<footer id="footer" class="clear"> <footer id="footer" class="clear">
<p class="fl_left"> <p class="fl_left">
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"> <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">
<img alt="Licence Creative Commons" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /> <img alt="Licence Creative Commons" style="border-width:0"
src="https://i.creativecommons.org/l/by/4.0/88x31.png" />
</a> </a>
<img src="img/footer.png" />This page is available under the terms of the <img src="img/footer.png" />This page is available under the terms of the
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"> Creative Commons Attribution 4.0 International License</a>.</p> <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"> Creative Commons Attribution 4.0
International License</a>.</p>
<br /> <br />
<p class="fl_right">Website made by <p class="fl_right">Website made by
<a target="_blank" href="https://junkjumper.github.io/">JunkJumper</a> <a target="_blank" href="https://junkjumper.github.io/">JunkJumper</a>
@ -141,4 +159,4 @@
</div> </div>
</body> </body>
</html> </html>

View File

@ -20,7 +20,7 @@
<nav> <nav>
<ul> <ul>
<li> <li>
<a href="" class="active">Homepage</a> <a href="index.html" class="active">Homepage</a>
</li> </li>
<li> <li>
<a href="about.html">About</a> <a href="about.html">About</a>
@ -34,9 +34,12 @@
<li> <li>
<a href="https://www.junkjumper-projects.com/_Project/slegpi/">Demo</a> <a href="https://www.junkjumper-projects.com/_Project/slegpi/">Demo</a>
</li> </li>
<li class="last"> <li>
<a href="https://github.com/JunkJumper/SLEGPI">Download on Github</a> <a href="https://github.com/JunkJumper/SLEGPI">Download on Github</a>
</li> </li>
<li class="last">
<a href="https://www.junkjumper-projects.com/#projects">Back to Projects List</a>
</li>
</ul> </ul>
</nav> </nav>
</header> </header>

View File

@ -21,7 +21,7 @@
</div> </div>
<nav> <nav>
<ul> <ul>
<li class="active"> <li>
<a href="index.html">Homepage</a> <a href="index.html">Homepage</a>
</li> </li>
<li> <li>
@ -31,14 +31,17 @@
<a href="story.html">Story</a> <a href="story.html">Story</a>
</li> </li>
<li> <li>
<a href="" class="active">License</a> <a href="license.html" class="active">License</a>
</li> </li>
<li> <li>
<a href="https://www.junkjumper-projects.com/_Project/slegpi/">Demo</a> <a href="https://www.junkjumper-projects.com/_Project/slegpi/">Demo</a>
</li> </li>
<li class="last"> <li>
<a href="https://github.com/JunkJumper/SLEGPI">Download on Github</a> <a href="https://github.com/JunkJumper/SLEGPI">Download on Github</a>
</li> </li>
<li class="last">
<a href="https://www.junkjumper-projects.com/#projects">Back to Projects List</a>
</li>
</ul> </ul>
</nav> </nav>
</header> </header>
@ -54,28 +57,28 @@
<article> <article>
<h1>License</h1> <h1>License</h1>
<p>The project was created using some softwares, here is the dedicated page to mention them.</p><br /><br /> <p>The project was created using some softwares, here is the dedicated page to mention them.</p><br /><br />
<center> <center>
<a href="https://en.wikipedia.org/wiki/HTML" target="_blank"><img src="img/icons/html5-plain.png" alt="Html 5" width="200px"></a> <a href="https://en.wikipedia.org/wiki/HTML" target="_blank"><img src="img/icons/html5-plain.png" alt="Html 5" width="200px"></a>
<a href="https://en.wikipedia.org/wiki/Cascading_Style_Sheets" target="_blank"><img src="img/icons/css3-plain.png" alt="Css 3" width="200px"></a> <a href="https://en.wikipedia.org/wiki/Cascading_Style_Sheets" target="_blank"><img src="img/icons/css3-plain.png" alt="Css 3" width="200px"></a>
<a href="https://en.wikipedia.org/wiki/JavaScript" target="_blank"><img src="img/icons/javascript-original.png" alt="JavaScript" width="200px"></a><br /><br /> <a href="https://en.wikipedia.org/wiki/JavaScript" target="_blank"><img src="img/icons/javascript-original.png" alt="JavaScript" width="200px"></a><br /><br />
<a href="https://www.arduino.cc/" target="_blank"><img src="img/icons/Arduino_Logo.png" alt="Arduino" width="200px"></a> <a href="https://www.arduino.cc/" target="_blank"><img src="img/icons/Arduino_Logo.png" alt="Arduino" width="200px"></a>
</center> </center>
</article> </article>
</section> </section>
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<!-- Copyright --> <!-- Copyright -->
<div class="wrapper row4"> <div class="wrapper row4">
<footer id="footer" class="clear"> <footer id="footer" class="clear">
<p class="fl_left"> <p class="fl_left">
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"> <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">
<img alt="Licence Creative Commons" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /> <img alt="Licence Creative Commons" style="border-width:0"
src="https://i.creativecommons.org/l/by/4.0/88x31.png" />
</a> </a>
<img src="img/footer.png" />This page is available under the terms of the <img src="img/footer.png" alt="footer" />This page is available under the terms of the
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"> Creative Commons Attribution 4.0 International License</a>.</p> <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"> Creative Commons Attribution 4.0
International License</a>.</p>
<br /> <br />
<p class="fl_right">Website made by <p class="fl_right">Website made by
<a target="_blank" href="https://junkjumper.github.io/">JunkJumper</a> <a target="_blank" href="https://junkjumper.github.io/">JunkJumper</a>
@ -84,4 +87,4 @@
</div> </div>
</body> </body>
</html> </html>

View File

@ -28,16 +28,19 @@
<a href="about.html">About</a> <a href="about.html">About</a>
</li> </li>
<li> <li>
<a href="" class="active">Story</a> <a href="story.html" class="active">Story</a>
</li> </li>
<li> <li>
<a href="license.html">License</a> <a href="license.html">License</a>
</li> </li>
<li> <li>
<a href="https://www.junkjumper-projects.com/_Project/slegpi/">Demo</a> <a href="https://www.junkjumper-projects.com/_Project/slegpi/">Demo</a>
</li>
<li>
<a href="https://github.com/JunkJumper/SLEGPI">Download on Github</a>
</li> </li>
<li class="last"> <li class="last">
<a href="https://github.com/JunkJumper/SLEGPI">Download on Github</a> <a href="https://www.junkjumper-projects.com/#projects">Back to Projects List</a>
</li> </li>
</ul> </ul>
</nav> </nav>