Merge pull request #11 from frc9611/dev

Dev

.github/workflows/main.yml

@@ -16,3 +16,4 @@ jobs:
         host: ${{ secrets.HOST }} 
         user: ${{ secrets.USER }}
         password: ${{ secrets.PASS }}
+        localDir: "src"

about-us.html → src/about-us.html

@@ -114,12 +114,12 @@
 
     <section class="cr-moments-section">
         <div class="cr-moments">
-            <img src="./assets/cr-team-moment-1.png" alt="Um momento compartilhado pela CyberRain" class="cr-moment">
-            <img src="./assets/cr-team-moment-2.png" alt="Um momento compartilhado pela CyberRain" class="cr-moment">
-            <img src="./assets/cr-team-moment-3.png" alt="Um momento compartilhado pela CyberRain" class="cr-moment">
-            <img src="./assets/cr-team-moment-6.png" alt="Um momento compartilhado pela CyberRain" class="cr-moment">
-            <img src="./assets/cr-team-moment-5.png" alt="Um momento compartilhado pela CyberRain" class="cr-moment">
-            <img src="./assets/cr-team-moment-4.png" alt="Um momento compartilhado pela CyberRain" class="cr-moment">
+            <img src="./assets/moments/cr-team-moment-1.png" alt="Um momento compartilhado pela CyberRain" class="cr-moment">
+            <img src="./assets/moments/cr-team-moment-2.png" alt="Um momento compartilhado pela CyberRain" class="cr-moment">
+            <img src="./assets/moments/cr-team-moment-3.png" alt="Um momento compartilhado pela CyberRain" class="cr-moment">
+            <img src="./assets/moments/cr-team-moment-6.png" alt="Um momento compartilhado pela CyberRain" class="cr-moment">
+            <img src="./assets/moments/cr-team-moment-5.png" alt="Um momento compartilhado pela CyberRain" class="cr-moment">
+            <img src="./assets/moments/cr-team-moment-4.png" alt="Um momento compartilhado pela CyberRain" class="cr-moment">
         </div>
     </section>
 
@@ -130,19 +130,19 @@
                 <span class="cr-member-list-title">Mentores</span>
                 <ul class="cr-member-list">
                     <li class="cr-member-card">
-                        <img src="./assets/members/jean.JPG" alt="Foto de um dos membros da CyverRain"
+                        <img src="./assets/members/jean.jpg" alt="Foto de um dos membros da CyverRain"
                             class="cr-member-photo">
                         <span class="cr-member-name">Jean Lucas Hoffmann</span>
                         <span class="cr-member-tag" data-func="mentorship">Mentor</span>
                     </li>
                     <li class="cr-member-card">
-                        <img src="./assets/members/akira.JPG" alt="Foto de um dos membros da CyverRain"
+                        <img src="./assets/members/akira.jpg" alt="Foto de um dos membros da CyverRain"
                             class="cr-member-photo">
                         <span class="cr-member-name">Akira Rosa</span>
                         <span class="cr-member-tag" data-func="mentorship">Mentor</span>
                     </li>
                     <li class="cr-member-card">
-                        <img src="./assets/members/ogawa.JPG" alt="Foto de um dos membros da CyverRain"
+                        <img src="./assets/members/ogawa.jpg" alt="Foto de um dos membros da CyverRain"
                             class="cr-member-photo">
                         <span class="cr-member-name">Lucas Hitoshi Ogawa</span>
                         <span class="cr-member-tag" data-func="mentorship">Mentor</span>
@@ -154,13 +154,13 @@
                 <span class="cr-member-list-title">Marketing</span>
                 <ul class="cr-member-list">
                     <li class="cr-member-card">
-                        <img src="./assets/members/karol.JPG" alt="Foto de um dos membros da CyverRain"
+                        <img src="./assets/members/karol.jpg" alt="Foto de um dos membros da CyverRain"
                             class="cr-member-photo">
                         <span class="cr-member-name">Karol Zomer</span>
                         <span class="cr-member-tag" data-func="marketing">Marketing</span>
                     </li>
                     <li class="cr-member-card">
-                        <img src="./assets/members/paula.JPG" alt="Foto de um dos membros da CyverRain"
+                        <img src="./assets/members/paula.jpg" alt="Foto de um dos membros da CyverRain"
                             class="cr-member-photo">
                         <span class="cr-member-name">Paula Malisia Moreira</span>
                         <span class="cr-member-tag" data-func="marketing">Marketing</span>
@@ -171,7 +171,7 @@
                 <span class="cr-member-list-title">Montagem</span>
                 <ul class="cr-member-list">
                     <li class="cr-member-card">
-                        <img src="./assets/members/enzo.JPG" alt="Foto de um dos membros da CyverRain"
+                        <img src="./assets/members/enzo.jpg" alt="Foto de um dos membros da CyverRain"
                             class="cr-member-photo">
                         <span class="cr-member-name">Enzo Caetano</span>
                         <span class="cr-member-tag" data-func="building">Building Lead</span>
@@ -183,13 +183,13 @@
                         <span class="cr-member-tag" data-func="building">Building</span>
                     </li>
                     <li class="cr-member-card">
-                        <img src="./assets/members/eiji.JPG" alt="Foto de um dos membros da CyverRain"
+                        <img src="./assets/members/eiji.jpg" alt="Foto de um dos membros da CyverRain"
                             class="cr-member-photo">
                         <span class="cr-member-name">Eiji Eduardo T. Uda</span>
                         <span class="cr-member-tag" data-func="building">Building</span>
                     </li>
                     <li class="cr-member-card">
-                        <img src="./assets/members/evelise.JPG" alt="Foto de um dos membros da CyverRain"
+                        <img src="./assets/members/evelise.jpg" alt="Foto de um dos membros da CyverRain"
                             class="cr-member-photo">
                         <span class="cr-member-name">Evelise Fellini</span>
                         <span class="cr-member-tag" data-func="building">Building</span>
@@ -200,13 +200,13 @@
                 <span class="cr-member-list-title">Programação</span>
                 <ul class="cr-member-list">
                     <li class="cr-member-card">
-                        <img src="./assets/members/j-rodrigo.JPG" alt="Foto de um dos membros da CyverRain"
+                        <img src="./assets/members/j-rodrigo.jpg" alt="Foto de um dos membros da CyverRain"
                             class="cr-member-photo">
                         <span class="cr-member-name">João Rodrigo</span>
                         <span class="cr-member-tag" data-func="proggraming">Programing Lead</span>
                     </li>
                     <li class="cr-member-card">
-                        <img src="./assets/members/bruno.JPG" alt="Foto de um dos membros da CyverRain"
+                        <img src="./assets/members/bruno.jpg" alt="Foto de um dos membros da CyverRain"
                             class="cr-member-photo">
                         <span class="cr-member-name">Bruno Slominski</span>
                         <span class="cr-member-tag" data-func="proggraming">Programing</span>
@@ -217,13 +217,13 @@
                 <span class="cr-member-list-title">Design</span>
                 <ul class="cr-member-list">
                     <li class="cr-member-card">
-                        <img src="./assets/members/lcc.JPG" alt="Foto de um dos membros da CyverRain"
+                        <img src="./assets/members/lcc.jpg" alt="Foto de um dos membros da CyverRain"
                             class="cr-member-photo">
                         <span class="cr-member-name">Lucas Candinho</span>
                         <span class="cr-member-tag" data-func="design">Design Lead</span>
                     </li>
                     <li class="cr-member-card">
-                        <img src="./assets/members/helena.JPG" alt="Foto de um dos membros da CyverRain"
+                        <img src="./assets/members/helena.jpg" alt="Foto de um dos membros da CyverRain"
                             class="cr-member-photo">
                         <span class="cr-member-name">Helena Cani</span>
                         <span class="cr-member-tag" data-func="design">Design</span>
@@ -352,15 +352,15 @@
         </div>
     </div>
 
-    <div id="page-loading">
+    <!-- <div id="page-loading">
         <div id="loading-bar">
             <div id="loading-bar-effect"></div>
         </div>
         <div class="loading-page-content-wrapper">
             <img src="./assets/cr-header-logo.png" alt="Logo da CyberRain" class="logo">
             <div id="ignore-load-button" class="yellow-unfilled-button">Pular</div>
         </div>
-    </div>
+    </div> -->
 </body>
 
 </html>

src/javascripts/loading-state-manager.js

@@ -0,0 +1,18 @@
+// var w = window;
+// var d = document;
+
+// window.scrollTo(0, 0);
+// disableScroll();
+
+// /** @type {HTMLDivElement} */
+// const loading = document.querySelector("#page-loading");
+// /** @type {HTMLButtonElement} */
+// const ignoreLoadButton = document.querySelector("#ignore-load-button");
+
+// function endUpLoading() {
+//     loading.style.display = "none";
+//     enableScroll();
+// }
+
+// ignoreLoadButton.addEventListener("click", endUpLoading);
+// w.addEventListener("load", endUpLoading);

styles/about-us.css → src/styles/about-us.css

@@ -295,6 +295,7 @@
     padding: 25rem 0;
     width: 100%;
     height: fit-content;
+    backdrop-filter: blur(.5rem);
 }
 
 .cr-members-section-title {