Merge pull request #8 from ThatSealgair/main

Restructured entire site
The-AhmadAA · Jan 28, 2023 · 86e1e75 · 86e1e75
2 parents 3a4933e + f886726
commit 86e1e75
Show file tree

Hide file tree

Showing 16 changed files with 46 additions and 46 deletions.
diff --git a/about.html b/about.html
@@ -45,10 +45,10 @@ <h1><a href="/index.html">UQ Mechatronics and Robotics Society</a></h1>
           <h2>Menu</h2>
           <ul class="links">
             <li><a href="/index.html">Home</a></li>
-            <li><a href="/events.html">Events</a></li>
+            <li><a href="/events/events.html">Events</a></li>
             <li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
-            <li><a href="/blog.html">Blog</a></li>
-            <li><a href="/projects.html">Projects</a></li>
+            <li><a href="/blog-posts/blog.html">Blog</a></li>
+            <li><a href="/projects/projects.html">Projects</a></li>
             <li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
             <li><a href="/signup.html">Join Us</a></li>
           </ul>

diff --git a/blog-posts/girls_in_computing.html → blog-posts/2020/girls_in_computing.html b/blog-posts/girls_in_computing.html → blog-posts/2020/girls_in_computing.html
diff --git a/blog-posts/2021-sem1-wrapup.html → blog-posts/2021/2021-sem1-wrapup.html b/blog-posts/2021-sem1-wrapup.html → blog-posts/2021/2021-sem1-wrapup.html
diff --git a/blog-posts/csiro_tour_2021.html → blog-posts/2021/csiro_tour_2021.html b/blog-posts/csiro_tour_2021.html → blog-posts/2021/csiro_tour_2021.html
diff --git a/blog-posts/arduino_hackathon_2022.html → blog-posts/2022/arduino_hackathon_2022.html b/blog-posts/arduino_hackathon_2022.html → blog-posts/2022/arduino_hackathon_2022.html
diff --git a/blog.html → blog-posts/blog.html b/blog.html → blog-posts/blog.html
@@ -47,8 +47,8 @@ <h2>Menu</h2>
             <li><a href="/index.html">Home</a></li>
             <li><a href="about.html">About Us</a></li>
             <li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
-            <li><a href="/events.html">Events</a></li>
-            <li><a href="/projects.html">Projects</a></li>
+            <li><a href="/events/events.html">Events</a></li>
+            <li><a href="/projects/projects.html">Projects</a></li>
             <li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
             <li><a href="/signup.html">Join Us</a></li>
           </ul>
@@ -77,25 +77,25 @@ <h2>Blog</h2>
 
             <section class="features">
               <article>
-                <a href="blog-posts/csiro_tour_2021.html" class="image"
+                <a href="blog-posts/2021/csiro_tour_2021.html" class="image"
                   ><img src="images/events/csiroTour2021/csiroApr2021.jpg" alt=""
                 /></a>
                 <h3 class="major">CSIRO Tour 2021</h3>
                 <p>
                   Joshua Lai describes our tour of CSIRO's QCAT facility, as we learned
                    about the research that creates Queensland's most advanced robots.
                 </p>
-                <a href="blog-posts/csiro_tour_2021.html" class="special">Read</a>
+                <a href="blog-posts/2021/csiro_tour_2021.html" class="special">Read</a>
               </article>
               <article>
-                <a href="blog-posts/2021-sem1-wrapup.html" class="image"
+                <a href="blog-posts//2021/2021-sem1-wrapup.html" class="image"
                   ><img src="images/events/2021-1-wrap/tgr2.jpg" alt=""
                 /></a>
                 <h3 class="major">2021 Semester 1 Wrap-Up</h3>
                 <p>
                   A summary of our most memorable events of the semester (pad this out)
                 </p>
-                <a href="blog-posts/2021-sem1-wrapup.html" class="special">Read</a>
+                <a href="blog-posts//2021/2021-sem1-wrapup.html" class="special">Read</a>
               </article>
             </section>
           </div>

diff --git a/competitions.html → competitions/competitions.html b/competitions.html → competitions/competitions.html
@@ -47,8 +47,8 @@ <h2>Menu</h2>
             <li><a href="/index.html">Home</a></li>
             <li><a href="about.html">About Us</a></li>
             <li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
-            <li><a href="/blog.html">Blog</a></li>
-            <li><a href="/projects.html">Projects</a></li>
+            <li><a href="/blog-posts/blog.html">Blog</a></li>
+            <li><a href="/projects/projects.html">Projects</a></li>
             <li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
             <li><a href="/signup.html">Join Us</a></li>
           </ul>
@@ -144,15 +144,15 @@ <h3 class="major">Tiny Giant Robot Talk</h3>
                       <a href="https://www.youtube.com/watch?v=B6Wr9C92uRA" target="_blank" class="special">Watch Recording</a>
                     </article>
                     <article>
-                      <a href="blog-posts/csiro_tour_2021.html" class="image"
+                      <a href="blog-posts/2021/csiro_tour_2021.html" class="image"
                         ><img src="images/events/csiroTour2021/csiroApr2021.jpg" alt=""
                       /></a>
                       <h3 class="major">CSIRO site visit 2021</h3>
                       <p>
                         A tour of the CSIRO's Queensland Centre for Advanced Technology's robotics
                         research and development facility.
                       </p>
-                      <a href="blog-posts/csiro_tour_2021.html" class="special">Read Blog Post</a>
+                      <a href="blog-posts/2021/csiro_tour_2021.html" class="special">Read Blog Post</a>
                     </article>
                     <article>
                       <a href="#" class="image"

diff --git a/events.html → events/events.html b/events.html → events/events.html
@@ -47,8 +47,8 @@ <h2>Menu</h2>
             <li><a href="/index.html">Home</a></li>
             <li><a href="about.html">About Us</a></li>
             <li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
-            <li><a href="/blog.html">Blog</a></li>
-            <li><a href="/projects.html">Projects</a></li>
+            <li><a href="/blog-posts/blog.html">Blog</a></li>
+            <li><a href="/projects/projects.html">Projects</a></li>
             <li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
             <li><a href="/signup.html">Join Us</a></li>
           </ul>
@@ -203,15 +203,15 @@ <h3 class="major">Tiny Giant Robot Talk</h3>
                       <a href="https://www.youtube.com/watch?v=B6Wr9C92uRA" target="_blank" class="special">Watch Recording</a>
                     </article>
                     <article>
-                      <a href="blog-posts/csiro_tour_2021.html" class="image"
+                      <a href="blog-posts/2021/csiro_tour_2021.html" class="image"
                         ><img src="images/events/csiroTour2021/csiroApr2021.jpg" alt=""
                       /></a>
                       <h3 class="major">CSIRO site visit 2021</h3>
                       <p>
                         A tour of the CSIRO's Queensland Centre for Advanced Technology's robotics
                         research and development facility.
                       </p>
-                      <a href="blog-posts/csiro_tour_2021.html" class="special">Read Blog Post</a>
+                      <a href="blog-posts/2021/csiro_tour_2021.html" class="special">Read Blog Post</a>
                     </article>
                     <article>
                       <a href="#" class="image"

diff --git a/exec_page/exec_2020.html b/exec_page/exec_2020.html
@@ -47,8 +47,8 @@ <h2>Menu</h2>
             <li><a href="/index.html">Home</a></li>
             <li><a href="/about.html">About Us</a></li>
             <li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
-            <li><a href="/blog.html">Blog</a></li>
-            <li><a href="/projects.html">Projects</a></li>
+            <li><a href="/blog-posts/blog.html">Blog</a></li>
+            <li><a href="/projects/projects.html">Projects</a></li>
             <li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
             <li><a href="/signup.html">Join Us</a></li>
           </ul>

diff --git a/exec_page/exec_2021.html b/exec_page/exec_2021.html
@@ -47,8 +47,8 @@ <h2>Menu</h2>
             <li><a href="/index.html">Home</a></li>
             <li><a href="/about.html">About Us</a></li>
             <li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
-            <li><a href="/blog.html">Blog</a></li>
-            <li><a href="/projects.html">Projects</a></li>
+            <li><a href="/blog-posts/blog.html">Blog</a></li>
+            <li><a href="/projects/projects.html">Projects</a></li>
             <li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
             <li><a href="/signup.html">Join Us</a></li>
           </ul>

diff --git a/exec_page/exec_2022.html b/exec_page/exec_2022.html
@@ -47,8 +47,8 @@ <h2>Menu</h2>
             <li><a href="/index.html">Home</a></li>
             <li><a href="/about.html">About Us</a></li>
             <li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
-            <li><a href="/blog.html">Blog</a></li>
-            <li><a href="/projects.html">Projects</a></li>
+            <li><a href="/blog-posts/blog.html">Blog</a></li>
+            <li><a href="/projects/projects.html">Projects</a></li>
             <li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
             <li><a href="/signup.html">Join Us</a></li>
           </ul>

diff --git a/exec_page/exec_2023.html b/exec_page/exec_2023.html
@@ -47,8 +47,8 @@ <h2>Menu</h2>
             <li><a href="/index.html">Home</a></li>
             <li><a href="/about.html">About Us</a></li>
             <li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
-            <li><a href="/blog.html">Blog</a></li>
-            <li><a href="/projects.html">Projects</a></li>
+            <li><a href="/blog-posts/blog.html">Blog</a></li>
+            <li><a href="/projects/projects.html">Projects</a></li>
             <li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
             <li><a href="/signup.html">Join Us</a></li>
           </ul>

diff --git a/index.html b/index.html
@@ -51,9 +51,9 @@ <h2>Menu</h2>
             <li><a href="/index.html">Home</a></li>
             <li><a href="/about.html">About Us</a></li>
             <li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
-            <li><a href="/events.html">Events</a></li>
-            <li><a href="/blog.html">Blog</a></li>
-            <li><a href="/projects.html">Projects</a></li>
+            <li><a href="/events/events.html">Events</a></li>
+            <li><a href="/blog-posts/blog.html">Blog</a></li>
+            <li><a href="/projects/projects.html">Projects</a></li>
             <li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
             <li><a href="/signup.html">Join Us</a></li>
           </ul>
@@ -121,7 +121,7 @@ <h2 class="major">We are UQ's student robotics society</h2>
         <!-- Two -->
         <section id="two" class="wrapper alt spotlight style2">
           <div class="inner">
-            <a href="/events.html" class="image"
+            <a href="/events/events.html" class="image"
               ><img src="/images/soldering.jpg" alt=""
             /></a>
             <div class="content">
@@ -132,7 +132,7 @@ <h2 class="major">Technical skills and networking</h2>
                 member and industry talks, and networking (insert more stuff
                 here?).
               </p>
-              <a href="/events.html" class="special">Events</a>
+              <a href="/events/events.html" class="special">Events</a>
             </div>
           </div>
         </section>
@@ -165,7 +165,7 @@ <h2 class="major">What we do</h2>
             </p>
             <section class="features">
               <article>
-                <a href="/projects.html" class="image"
+                <a href="/projects/projects.html" class="image"
                   ><img src="images/Robot Arm 05 - Small 2.png" alt=""
                 /></a>
                 <h3 class="major">Projects</h3>
@@ -175,10 +175,10 @@ <h3 class="major">Projects</h3>
                   prototyping, building and programming in a wide variety of
                   robotic activities.
                 </p>
-                <a href="/projects.html" class="special">Previous projects</a>
+                <a href="/projects/projects.html" class="special">Previous projects</a>
               </article>
               <article>
-                <a href="/events.html" class="image"
+                <a href="/events/events.html" class="image"
                   ><img
                     src="/images/20210409131331_IMG_9750-1024x683.jpg"
                     alt=""
@@ -189,7 +189,7 @@ <h3 class="major">Events</h3>
                   improving skills and connecting our members. These include
                   workshops, hackathons, site visits, games nights and more.
                 </p>
-                <a href="/events.html" class="special">See events</a>
+                <a href="/events/events.html" class="special">See events</a>
               </article>
               <article>
                 <a href="https://medium.com/@uqrobotics" class="image"
@@ -207,15 +207,15 @@ <h3 class="major">Tutorials</h3>
                 >
               </article>
               <article>
-                <a href="/competitions.html" class="image"
+                <a href="/competitions/competitions.html" class="image"
                   ><img src="images/DRC-2022-22.jpg" alt=""
                 /></a>
                 <h3 class="major">Competitions</h3>
                 <p>
                   We encouraged and supported members to compete in robotics
                   competitions such as Micromouse and Droid Race
                 </p>
-                <a href="/competitions.html" class="special"
+                <a href="/competitions/competitions.html" class="special"
                   >What have we competed in?</a
                 >
               </article>
@@ -232,14 +232,14 @@ <h3 class="major">Alumni</h3>
                 <a href="#" class="special">Meet our alumni</a>
               </article>
               <article>
-                <a href="/blog.html" class="image"
+                <a href="/blog-posts/blog.html" class="image"
                   ><img
                     src="images/events/csiroTour2021/csiroApr2021.jpg"
                     alt=""
                 /></a>
                 <h3 class="major">Blog</h3>
                 <p>Posts about events and talks.</p>
-                <a href="/blog.html" class="special">Browse blog</a>
+                <a href="/blog-posts/blog.html" class="special">Browse blog</a>
               </article>
               <article>
                 <a href="#" class="image"

diff --git a/projects.html → projects/projects.html b/projects.html → projects/projects.html
@@ -47,8 +47,8 @@ <h2>Menu</h2>
             <li><a href="/index.html">Home</a></li>
             <li><a href="about.html">About Us</a></li>
             <li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
-            <li><a href="/events.html">Events</a></li>
-            <li><a href="/blog.html">Blog</a></li>
+            <li><a href="/events/events.html">Events</a></li>
+            <li><a href="/blog-posts/blog.html">Blog</a></li>
             <li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
             <li><a href="/signup.html">Join Us</a></li>
           </ul>

diff --git a/signup.html b/signup.html
@@ -47,10 +47,10 @@ <h2>Menu</h2>
             <li><a href="/index.html">Home</a></li>
             <li><a href="about.html">About Us</a></li>
             <li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
-            <li><a href="/events.html">Events</a></li>
-            <li><a href="/blog.html">Blog</a></li>
+            <li><a href="/events/events.html">Events</a></li>
+            <li><a href="/blog-posts/blog.html">Blog</a></li>
             <li><a href="https://medium.com/@uqrobotics">Tutorials</a></li>
-            <li><a href="/projects.html">Projects</a></li>
+            <li><a href="/projects/projects.html">Projects</a></li>
           </ul>
           <a href="#" class="close">Close</a>
         </div>

diff --git a/tutorials.html → workshops/workshops.html b/tutorials.html → workshops/workshops.html
@@ -47,9 +47,9 @@ <h2>Menu</h2>
             <li><a href="/index.html">Home</a></li>
             <li><a href="about.html">About Us</a></li>
             <li><a href="/exec_page/exec_2023.html">Executive Team</a></li>
-            <li><a href="/events.html">Events</a></li>
-            <li><a href="/blog.html">Blog</a></li>
-            <li><a href="/projects.html">Projects</a></li>
+            <li><a href="/events/events.html">Events</a></li>
+            <li><a href="/blog-posts/blog.html">Blog</a></li>
+            <li><a href="/projects/projects.html">Projects</a></li>
             <li><a href="/signup.html">Join Us</a></li>
           </ul>
           <a href="#" class="close">Close</a>