acmupv · LathiasMaar · Apr 23, 2024 · Apr 23, 2024 · Apr 24, 2024 · May 7, 2024
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -0,0 +1,43 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Deploy static content to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Single deploy job since we're just deploying
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          # Upload entire repository
+          path: '.'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/CNAME b/CNAME
@@ -0,0 +1 @@
+orchallenge.es
diff --git a/README.md b/README.md
@@ -1,2 +1,2 @@
 Hola
-Esto es la página web de acm + makers
+Esto es la página web de makers a partir de la página web del 2024 de acm + makers.
diff --git a/calendario/calendario.html b/calendario/calendario.html
@@ -1,203 +1,111 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="../css/style.css" class="res">
     <link rel="stylesheet" href="../css/equipo.css" class="res">
     <link rel="stylesheet" href="../css/calendario.css" class="res">
     <script src="https://kit.fontawesome.com/094d8d7db9.js" crossorigin="anonymous"></script>
-    <!-- Poppins Font -->
+    <!-- Fonts -->
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link
+        href="https://fonts.googleapis.com/css2?family=Rubik+Mono+One&family=Rubik:ital,wght@0,300..900;1,300..900&display=swap"
+        rel="stylesheet">
     <title>ORC</title>
+    <!--Favicon-->
+    <link rel="icon" type="image/png" href="/favicon/favicon-96x96.png" sizes="96x96" />
+    <link rel="icon" type="image/svg+xml" href="/favicon/favicon.svg" />
+    <link rel="shortcut icon" href="/favicon/favicon.ico" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png" />
+    <meta name="apple-mobile-web-app-title" content="ORC" />
+    <link rel="manifest" href="/favicon/site.webmanifest" />
 </head>
+
 <body>
+    <div id="loadOverlay"
+        style="background-color:#f9cc3e; position:absolute; top:0px; left:0px; width:100%; height:100%; z-index:2000;">
+    </div>
     <div class="nav" id="nav">
         <a class="logo" href="../index.html"><img class="logo-img" src="../img/ORC.png"></a>
         <ul class="nav-links">
             <li><a href="../equipo/equipo.html" class="nav-button">Equipo</a></li>
             <li><a href="../retos/retos.html" class="nav-button">Retos</a></li>
             <li><a href="../calendario/calendario.html" class="nav-button">Calendario</a></li>
-            <li><a href="https://docs.google.com/forms/d/1-GG4jfs8V_4SNcSYxb2LY-yjqomBWsSHNVS87-mgDyQ/edit" target="_blank" class="form-button">Apúntate</a></li>
+            <li><a href="../normas/Normas y reglamentos de la ORC.pdf" target="_blank" class="nav-button">Normas</a>
+            </li>
         </ul>
         <label for="check" class="icon-class">
             <i class="fas fa-bars" id="btn"></i>
             <!-- <i class="fas fa-times" id="cancel"></i> -->
         </label>
     </div>
-    <section class="intro">
-      <h1>Calendario</h1>
-      <h3>La competición tendrá lugar del 9 al 16 de mayo </h3>
-  </section>
-    <section class="section-calendar">
-      <div class="calendar">
-          <div class="timeline">
-            <div class="spacer"></div>
-            <div class="time-marker">15.00</div>
-            <div class="time-marker">16.00</div>
-            <div class="time-marker">17.00</div>
-            <div class="time-marker">18.00</div>
-            <div class="time-marker">19.00</div>
-            <div class="time-marker">20.00</div>
-            <div class="time-marker">21.00</div>
-          </div>
-          <div class="days">
-            <div class="day mon">
-              <div class="date">
-                <p class="date-num">9</p>
-                <p class="date-day">Jue</p>
-              </div>
-              <div class="events">
-                <div class="event start-4 end-8 primer-dia">
-                  <p class="title">Presentación</p>
-                  <p class="time">16.30 h - 21.00 h</p>
-                  <p class="time">LUGAR: Casa del alumno (Informática 2ª planta) Edificio 4K<br>
-                  Prestación material y reparto pruebas</p>
-                </div>
-              </div>
-            </div>
-            <div class="day tues">
-              <div class="date">
-                <p class="date-num">10</p>
-                <p class="date-day">Vie</p>
-              </div>
-              <div class="events">
-                  <div class="event start-4 end-9 dias-reto">
-                      <p class="title">Día 1</p>
-                      <p class="time">16.30 h - 21.00 h</p>
-                      <p class="time">LUGAR: ETSID (Laboratorio Penyagolosa) Edificio 7E</p>
-                    </div>
-              </div>
-            </div>
-            <div class="day wed">
-              <div class="date">
-                <p class="date-num">11</p>
-                <p class="date-day">Sab</p>
-              </div>
-              <div class="events">
-                  <div class="event start-4 end-9 dias-reto">
-                      <p class="title">Día 2</p>
-                      <p class="time">16.30 h - 21.00 h</p>
-                      <p class="time">LUGAR: Casa del alumno (Planta baja) Edificio 4K</p>
-                    </div>
-              </div>
-            </div>
-            <div class="day fri">
-              <div class="date">
-                <p class="date-num">12</p>
-                <p class="date-day">Dom</p>
-              </div>
-              <div class="events">
-              </div>
-            </div>
-          </div>
-        </div>
+    <section class="intro" style="margin-bottom: 200px; margin-top: 200px;">
+        <h1>Calendario</h1>
+        <br>
+        <h3>La competición tendrá lugar del 10 de febrero de 2026 al 13 de marzo.</h3>
+        <br>
+        <h3>Los talleres de formación y construcción se imparten los miercoles y jueves <br>a las 17:00 en la ETSIADI,
+            con opción a talleres complementarios bajo petición.</h3>
+        <br>
+        <h3>El calendario detallado con sesiones saldrá próximamente™.</h3>
+        <br><br>
+        <h2>Calendario de Talleres</h2>
 
-          <div class="calendar">
-              <div class="timeline">
-                <div class="spacer"></div>
-                <div class="time-marker">15.00</div>
-                <div class="time-marker">16.00</div>
-                <div class="time-marker">17.00</div>
-                <div class="time-marker">18.00</div>
-                <div class="time-marker">19.00</div>
-                <div class="time-marker">20.00</div>
-                <div class="time-marker">21.00</div>
-              </div>
-              <div class="days">
-                <div class="day mon">
-                  <div class="date">
-                    <p class="date-num">13</p>
-                    <p class="date-day">Lun</p>
-                  </div>
-                  <div class="events">
-                      <div class="event start-4 end-9 dias-reto">
-                          <p class="title">Día 3</p>
-                          <p class="time">16.30 h - 21.00 h</p>
-                          <p class="time">LUGAR: ETSINF (1G 0.4)</p>
-                        </div>
-                  </div>
-                </div>
-                <div class="day tues">
-                  <div class="date">
-                    <p class="date-num">14</p>
-                    <p class="date-day">Mar</p>
-                  </div>
-                  <div class="events">
-                      <div class="event start-4 end-9 dias-reto">
-                          <p class="title">Día 4</p>
-                          <p class="time">16.30 h - 21.00 h</p>
-                          <p class="time">LUGAR: ETSID (Laboratorio Aitana) Edificio 7E</p>
-                        </div>
-                  </div>
-                </div>
-                <div class="day wed">
-                  <div class="date">
-                    <p class="date-num">15</p>
-                    <p class="date-day">Mie</p>
-                  </div>
-                  <div class="events">
-                      <div class="event start-4 end-9 dias-reto">
-                          <p class="title">Día 5</p>
-                          <p class="time">16.30 h - 21.00 h</p>
-                          <p class="time">LUGAR: ETSINF (1G 0.4)</p>
-                        </div>
-                  </div>
-                </div>
-                <div class="day fri">
-                  <div class="date">
-                    <p class="date-num">16</p>
-                    <p class="date-day">Jue</p>
-                  </div>
-                  <div class="events">
-                      <div class="event start-4 end-9 final">
-                          <p class="title">FINAL</p>
-                          <p class="time">16.30 h - 21.00 h</p>
-                          <p class="time">LUGAR: Casa del alumno (Planta baja) Edificio 4K</p>
-                        </div>
-                  </div>
-                </div>
-              </div>
-          </div>
+        <img src="../img/Horarios_Talleres_2026.png" style="max-width: 800px; width: 80%; margin-top: 50px;" alt="
+          Martes:
+          · 10/02: Conceptos generales        
+          · 17/02: Electrónica general.          
+          · 24/02: Programación del robot.          
+          · 03/03: Taller de dudas y libre.          
+          Viernes:
+          · 13/02: Diseño y prototipo.
+          · 06/03: Taller de dudas y libre.
+    ">
 
     </section>
 
     <section class="footer">
-        <div class="footer-socials">
-            <p class="titles footer-title">Información</p>
-            <ul>
-               <li><a href="../equipo/equipo.html">Equipos</a></li>
-               <li><a href="../retos/retos.html">Retos</a></li> 
-               <li><a href="../calendario/calendario.html">Calendario</a></li> 
-            </ul>
-        </div>
-        <div class="footer-socials socials-div">
-            <div class="logo-cover"><a target="_blank" href="https://www.acm.webs.upv.es"><img class="acm-logo" src="../img/acmLogo.png" ></a></div>
 
-            <ul>
-                <li><a target="_blank" class="fa-brands fa-x-twitter" href="https://twitter.com/acmupv"></a></li>
-                <li><a target="_blank" class="fa fa-github" href="https://github.com/acmupv"></a></li>
-                <li><a target="_blank" class="fa fa-linkedin" href="https://es.linkedin.com/company/acmupv"></a></li>
-                <li><a target="_blank" class="fa fa-instagram" href="https://www.instagram.com/acmupv/"></a></li>
-            </ul>
+        <div class="logos" style="background-color: #ffffff; 
+                  padding-top: 18px;
+                  padding-bottom: 18px;">
+            <img src="../img/banda_logos_UPV_VRAIN_nueva.jpg" alt="Logos">
+        </div>
+        <div class="logos" style=" padding: 32px;
+                  padding-bottom: 12px;
+                  width: 80%;
+                  align-self: center;">
+            <img src="../img/LogosRemake2.png" alt="Logos">
         </div>
 
-        <div class="footer-socials socials-div">
-            <div class="logo-cover"><a target="_blank" href="https://makersupv.com"><img class="makers-logo" src="../img/makersLogo.png" ></a></div>
+        <div class="widthLimit" style="gap:80px; margin-bottom: 24px;">
+            <div class="footer-socials">
+                <p class="titles footer-title"> Más Información</p>
+                <ul>
+                    <li><a href="./equipo/equipo.html">Equipos</a></li>
+                    <li><a href="./retos/retos.html">Retos</a></li>
+                    <li><a href="./calendario/calendario.html">Calendario</a></li>
+                </ul>
+            </div>
 
-            <ul>
-                <li><a target="_blank" class="fa-brands fa-x-twitter" href="https://twitter.com/makersupv"></a></li>
-                <li><a target="_blank" class="fa fa-github" href="https://github.com/makers-upv"></a></li>
-                <li><a target="_blank" class="fa fa-linkedin" href="https://www.linkedin.com/company/makers-upv/"></a></li>
-                <li><a target="_blank" class="fa fa-instagram" href="https://www.instagram.com/makersupv/"></a></li>
-            </ul>
-        </div>
-        <div class="logos ">
+            <div class="footer-socials socials-div">
+                <div class="logo-cover"><a target="_blank" href="https://makersupv.com"><img class="makers-logo"
+                            src="../img/makersLogo.png"></a></div>
+
+                <ul>
+                    <li><a target="_blank" class="fa-brands fa-x-twitter" href="https://twitter.com/makersupv"></a></li>
+                    <li><a target="_blank" class="fa fa-github" href="https://github.com/makers-upv"></a></li>
+                    <li><a target="_blank" class="fa fa-linkedin"
+                            href="https://www.linkedin.com/company/makers-upv/"></a></li>
+                    <li><a target="_blank" class="fa fa-instagram" href="https://www.instagram.com/makersupv/"></a></li>
+                </ul>
+            </div>
         </div>
     </section>
     <script src="../js/index.js"></script>
 </body>
-</html>
+
+</html>
diff --git a/css/calendario.css b/css/calendario.css
@@ -1,14 +1,13 @@
 :root {
-    --numDays: 5;
-    --numHours: 7;
-    --timeHeight: 60px;
-    --calBgColor: #EDEDED;
-    /* --eventBorderColor: #f2d3d8; */
-    --eventColor1: #7abf9c;
-    --eventColor2: #a3c182;
-    --eventColor3: #70a0ae;
-  }
-
+  --numDays: 5;
+  --numHours: 7;
+  --timeHeight: 60px;
+  --calBgColor: #EDEDED;
+  /* --eventBorderColor: #f2d3d8; */
+  --eventColor1: var(--color3);
+  --eventColor2: var(--color2);
+  --eventColor3: var(--color1);
+}
   .title-calendar {
     display: flex;
     flex-direction: column;
@@ -149,7 +148,7 @@
     }
   }
 
-  @media screen and (max-width: 600px) {
+  /* @media screen and (max-width: 600px) {
     .calendar {
       margin: 10px 4px;
       gap: 2px;
@@ -181,4 +180,4 @@
       width: max-content;
       --timeHeight: 45px;
     }
-  }
+  } */
diff --git a/css/equipo.css b/css/equipo.css
@@ -98,4 +98,4 @@
         margin-top: 10px;
     }
 
-}
+}
diff --git a/css/retos.css b/css/retos.css
@@ -30,4 +30,4 @@ p {
     p {
         font-size: 15px;
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,4 +98,4 @@ @@
             margin-top: 10px;
         }
-    }
+    }