feat: merge develop

ICEI-PUC-Minas-PMV-ADS · Jun 25, 2023 · 953e46c · 953e46c
2 parents fa6be43 + ff3f1bf
commit 953e46c
Show file tree

Hide file tree

Showing 10 changed files with 363 additions and 171 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/src/focus-time/index.html b/src/focus-time/index.html
@@ -5,7 +5,7 @@
     <title>Focus Time</title>
     <link rel="stylesheet" href="style.css">
     <script defer src="script.js"></script>
-    <link REL="SHORTCUT ICON" HREF="../images/fav-icon.png">
+    <link REL="SHORTCUT ICON" HREF="/images/fav-icon.png">
     <link rel="stylesheet" href="">
 </head>
 <body>
@@ -34,7 +34,7 @@ <h1> Focus <span
                 name="refresh-outline"></ion-icon>
     </button>
 
-    <button onclick="window.history.back()">Voltar</button>
+    <button class="back-button" onclick="window.history.back()">Voltar</button>
 
 </div>
 

diff --git a/src/focus-time/style.css b/src/focus-time/style.css
@@ -3,17 +3,17 @@
 body{
     background-color: #00003F;
     color: #07D7FF;
+    padding-block: 2vh;
 }
 
 h1{
-    font-size: 35px;
+    font-size: 6vh;
     font-family: 'Quicksand', sans-serif;
     font-weight: 200;
     text-align: right;
     line-height: 59px;
     padding: 0 64px;
     margin: 0;
-
 }
 
 .focustime{
@@ -23,34 +23,33 @@ h1{
     grid-row-gap: 23px;
     width: 100%;
     padding-top: 25px;
-
 }
 
 .blue{
     font-weight: 900;
     color: #008CFF;
-    text-shadow: 0 0 0px #fff,
-0 0 50px #008CFF;
+    text-shadow: 0 0 50px #7ac3ff;
 }
 
 .time{
     font-family: sans-serif,
 monospace;
     font-weight: 300;
-    font-size: 38px;
+    font-size: 6vh;
 }
 
 .circle{
     display: flex;
     justify-content: center;
     align-items: center;
     border: 2px solid;
-    width: 170px;
-    height: 170px;
+    width: 35vh;
+    height: 35vh;
     -webkit-border-radius: 50%;
     -moz-border-radius: 50%;
     border-radius: 50%;
     font-family: sans-serif;
+    margin-block: 6vh;
 }
 
 .controls{
@@ -65,7 +64,7 @@ button{
     padding: 0;
     border: none;
     margin: 0;
-    font-size: 40px;
+    font-size: 6vh;
     color: #07D7FF;
     cursor: pointer;
     transition: all 0.3s ease;
@@ -86,3 +85,7 @@ button:hover{
 .pause{
     display: none;
 }
+
+.back-button {
+    font-size: 3vh; 
+}
diff --git a/src/home/home.html b/src/home/home.html
@@ -11,10 +11,10 @@
   </head>
   <body>
     <header>
+      <h3>Olá, <b class="username"></b>.</h3>
       <div class="container-logo">
         <img class="logo" src="../images/logo.png" alt="Logo" />
       </div>
-      <h3>Olá, <b class="username"></b>.</h3>
       <div class="container-focusTime-button">
         <button class="focusTime-button" id="focusTime-button">
           <img
@@ -28,9 +28,9 @@ <h3>Olá, <b class="username"></b>.</h3>
     </header>
 
     <div class="container-criarColuna">
-      <div class="criarColuna-button-container">
+      <div class="criarColuna-button-container" id="add-column-button">
         <img class="plus-icon" src="../images/plus-icon.png" alt="Ícone adição" />
-        <button class="criarColuna-button" id="add-column-button">
+        <button class="criarColuna-button">
           criar coluna
         </button>
       </div>
@@ -42,14 +42,14 @@ <h3>Olá, <b class="username"></b>.</h3>
         <div class="body-modal">
           <input
             type="text"
-            placeholder="nome da coluna (maximo de 16 caracteres)"
+            placeholder="Nome da coluna (máximo de 16 caracteres)."
             maxlength="16"
             id="name-column-input"
           />
-          <button class="save-column-name-button">salvar</button>
+          <button class="save-column-name-button">Salvar</button>
         </div>
         <div class="footer-modal">
-          <button class="modal-close">fechar</button>
+          <button class="modal-close">Fechar</button>
         </div>
       </div>
     </div>

diff --git a/src/home/home.js b/src/home/home.js
@@ -75,8 +75,7 @@ function renderColumn() {
 
     const removecolumn = document.createElement("button");
     removecolumn.classList.add("removecolumn");
-    removecolumn.innerHTML =
-      '<img class="trash-icon" src="/images/trash-icon.png"><p id="excluircolunas">EXCLUIR COLUNA</p>';
+    removecolumn.innerHTML = '<img class="trash-icon" src="../images/trash-icon.png"><p id="excluircolunas">EXCLUIR COLUNA</p>';
     removecolumn.id = column.id;
     removecolumn.addEventListener("click", delet);
 
@@ -223,3 +222,10 @@ function toggleDone(todoId, columnId) {
     }
   }
 }
+
+var item = document.getElementById("columns-container");
+
+  window.addEventListener("wheel", function (e) {
+    if (e.deltaY > 0) item.scrollLeft += 100;
+    else item.scrollLeft -= 100;
+  });