Merge branch 'mobibyte:main' into main

mambov · Mar 29, 2024 · ab83ffb · ab83ffb
2 parents c7eed04 + 5bb1902
commit ab83ffb
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 21 deletions.
diff --git a/src/about/about.html b/src/about/about.html
@@ -1,9 +1,9 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
    <head>
       <meta charset="UTF-8" />
       <title>MOBI | About</title>
-      <link rel="icon" href="../src/public/mobi logo.png" />
+      <link rel="icon" href="../../src/public/mobi logo.png" />
       <meta name="viewport" content="width=device-width,initial-scale=1" />
       <meta name="og:site_name" content="MOBI" />
       <meta name="og:type" content="website" />
@@ -87,20 +87,9 @@ <h2>About Us</h2>
             </div>
          </div>
          <div class="container">
-            <div class="content">
-               <div class="heading">
-                  <h2>About Us</h2>
-                  <hr />
-                  <p>
-                     We're Mobi, an app development club just for you. We're a
-                     community of developer friends that are here to help you
-                     code and have fun!
-                  </p>
-               </div>
-            </div>
             <div class="image">
                <img
-                  src="../public/mobi_about_us.jpg"
+                  src="../public/Membership_Photo.JPG"
                   alt="img"
                   style="
                      width: 350px;
@@ -109,22 +98,36 @@ <h2>About Us</h2>
                   "
                />
             </div>
+            <div class="content">
+               <div class="heading">
+                  <h2>Membership</h2>
+                  <hr />
+                  <p>
+                     All of our events are completely free, so membership is
+                     free. We want to make sure no one is excluded in our
+                     events. If you would like to additionally support Mobi and
+                     its events, you can purchase a membership package for a
+                     tshirt.
+                  </p>
+               </div>
+            </div>
          </div>
          <div class="container">
             <div class="content">
                <div class="heading">
-                  <h2>About Us</h2>
+                  <h2>Philosophy</h2>
                   <hr />
                   <p>
-                     We're Mobi, an app development club just for you. We're a
-                     community of developer friends that are here to help you
-                     code and have fun!
+                     We’re a community-first group. You don’t have to be an
+                     engineer to code, and you don’t have to be super smart!
+                     Everyone can build! We’re just here to help you make it
+                     real.
                   </p>
                </div>
             </div>
             <div class="image">
                <img
-                  src="../public/mobi_about_us.jpg"
+                  src="../public/Philosophy_Photo.jpg"
                   alt="img"
                   style="
                      width: 350px;
@@ -134,6 +137,27 @@ <h2>About Us</h2>
                />
             </div>
          </div>
+         <div class="container">
+            <div class="image">
+               <img
+                  src="../public/Events_Photo.png"
+                  alt="img"
+                  style="
+                     width: 350px;
+                     justify-content: center;
+                     align-items: center;
+                  "
+               />
+            </div>
+            <div class="content">
+               <div class="heading">
+                  <h2>Events</h2>
+                  <hr />
+                  <p>
+                     We have bunch of cool events happening throughout the semester, one of them being social coding. Bring your friends! You can particpate in our events just by coming in person!
+                  </p>
+               </div> 
+            </div>
       </div>
    </body>
 </html>
diff --git a/src/assets/icons/twitch-icon.svg b/src/assets/icons/twitch-icon.svg
diff --git a/src/events/events.html b/src/events/events.html
@@ -32,10 +32,52 @@ <h1>MOBI Events</h1>
          </div>
       </div>
 
+      <!-- https://www.twitch.tv/mobibytes -->
+
       <div class="container">
          <h2 class="events-heading">Upcoming Events</h2>
-         <!-- Events will be dynamically added here -->
-         <div id="event-list"></div>
+         <!-- Events will be Statically added here -->
+         <div class="event">
+            <h1>Social Coding</h1>
+            <p><strong>🗓️Thursday, March 28, 2024</strong></p>
+            <p><strong>🗺️UC Pinto Palo</strong></p>
+            <p><strong>🕕5:00 PM - 7:00 PM CDT</strong></p>
+            <p>Discover the magic of making apps with Mobi!🪄</p>
+            <p>Social Coding is a super beginner friendly way to get hands-on experience. Learn to code and even deploy your own app with others!💻</p>
+            <p>There is complete creative freedom, so the coding wizards can show off their skills too! 🧙</p>   
+         </div>
+         <div class="event">
+            <h1>Social Coding (Online)</h1>
+            <p><strong>Saturday, March 30, 2024</strong></p>
+            <p><strong>🗺️Discord</strong></p>
+            <p><strong>🕕5:00 PM - 7:00 PM CDT</strong></p>
+            <p>Discover the magic of making apps with Mobi!🪄</p>
+            <p>Social Coding is a super beginner friendly way to get hands-on experience. Learn to code and even deploy your own app with others!💻</p>
+            <p>There is complete creative freedom, so the coding wizards can show off their skills too! 🧙</p>
+            <p style="display: flex;">
+               <a href="https://www.twitch.tv/mobibytes">Join our Twitch Stream here
+                  <img src="../assets/icons/twitch-icon.svg" width="15" height="15" alt="">
+               </a>
+            </p>
+         </div>
+         <div class="event">
+            <h1>Social Coding</h1>
+            <p><strong>Monday, April 1, 2024</strong></p>
+            <p><strong>🗺️Commons Caddo</strong></p>
+            <p><strong>🕕5:00 PM - 7:00 PM CDT</strong></p>
+            <p>Discover the magic of making apps with Mobi!🪄</p>
+            <p>Social Coding is a super beginner friendly way to get hands-on experience. Learn to code and even deploy your own app with others!💻</p>
+            <p>There is complete creative freedom, so the coding wizards can show off their skills too! 🧙</p>   
+         </div>
+         <div class="event">
+            <h1>Social Coding</h1>
+            <p><strong>🗓️Thursday, April 12, 2024</strong></p>
+            <p><strong>🗺️To Be Determined</strong></p>
+            <p><strong>🕕5:00 PM - 7:00 PM CDT</strong></p>
+            <p>Discover the magic of making apps with Mobi!🪄</p>
+            <p>Social Coding is a super beginner friendly way to get hands-on experience. Learn to code and even deploy your own app with others!💻</p>
+            <p>There is complete creative freedom, so the coding wizards can show off their skills too! 🧙</p>   
+         </div>
       </div>
 
       <script src="./script.js"></script>

diff --git a/src/public/Events_Photo.png b/src/public/Events_Photo.png
diff --git a/src/public/Membership_Photo.JPG b/src/public/Membership_Photo.JPG
diff --git a/src/public/Philosophy_Photo.jpg b/src/public/Philosophy_Photo.jpg