Merge pull request #62 from Linggo-App/develop

Release v0.1-beta
Linggo-App · Jun 2, 2021 · 6065952 · 6065952
2 parents e47726b + ec399c5
commit 6065952
Show file tree

Hide file tree

Showing 20 changed files with 1,021 additions and 76 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,17 @@
-# flex-schedule
+<h1 align="center">
+  <img src="https://user-images.githubusercontent.com/62577482/118065834-036d3900-b374-11eb-8356-7070926ee3b7.png" width="350px">
+</h1>
 
-Projeto de conclusão de curso(Técnico em TI), oferecido pela instituição de ensino [EME Prof.ª Alcina Dantas Feijão](http://www.alcinadantas.com.br/ti).
+<h2 align="center">Um programa que permite usuário criar projetos de curto/médio prazo, onde é possível definir tarefas para melhorar sua organização.</h2>
+
+<p align="center">
+  <img src="https://user-images.githubusercontent.com/62577482/118067979-f18d9500-b377-11eb-8c9c-ae7ab8def6c0.png" width="200px">
+  <p align="center"></p>
+</p>
+
+<hr>
+
+<h2>Telas Aplicação WEB</h2>
+<h2>Telas APP</h2>
+
+<h1 align="center"></h1>
diff --git a/assets/GitHub-Mark-64px.png b/assets/GitHub-Mark-64px.png
diff --git a/assets/LingoApp_Branco.png b/assets/LingoApp_Branco.png
diff --git a/assets/LingoApp_Branco_Cortada.png b/assets/LingoApp_Branco_Cortada.png
diff --git a/global.css b/global.css
@@ -21,24 +21,36 @@ ul li a{
 header{
     width: 100%;
     padding: 10px;
-    background: black;
-    color: white;
+    /* background: #fff; */
+    background: #5b5ca8;
+    /* background: #5b5ca8b6; */
     display: grid;
     grid-template-columns: repeat(3,1fr);
     grid-template-rows: 50px 1fr;
     grid-template-areas: 
      "menu logo user"
     ;
     align-items: center;
-    /* overflow: hidden; */
+    border-bottom: 1px solid #dadce0;
+    overflow: hidden;
 }
-.logo, .user{
+ /* .user{
     align-self: flex-start;
-}
+} */
 
+.cont_logo{
+    width: 10px;
+    margin: 0px auto;
+}
 .logo{
     grid-area: logo;
-    text-align: center;
+    width: auto;
+    height: 120px;
+
+}
+
+.logo:hover{
+    transform: scale(1.1);
 }
 
 .menu ul{
@@ -53,40 +65,36 @@ header{
 .menu ul li a{
     display: block;
     padding: 10px;
-    color: white;
     font-size: 0.8em;
+    /* color: black; */
+    /* color: #5b5ca8; */
+    color: white;
 }
 
-.logs{
-    padding: 0;
-    height: auto;
-    width: auto;
-    background: transparent !important;
-    border: none !important;
-    color:blue;
-    font-size: 0.8em !important;
-    cursor: pointer;
-    box-shadow: none !important;
-}
 
 
 #menu_btn{
     grid-area: menu_btn;
     cursor: pointer;
     display: none;
     padding: 5px;
+    color: white;
+
 }
 
 #menu_btn i{
     font-size: 1.3em;
 }
 .menu__createbtn{
-    background:purple;
+    background:#f49236;
     border-radius: 10px;
-    border: 1px solid rgb(190, 65, 190);
+    border: 1px solid #f39339;
     flex-grow: 1;
     text-align: center;
 }
+.menu__createbtn a{
+    color: white !important;
+}
 .user{
     grid-area: user;
     display: flex;
@@ -99,6 +107,8 @@ header{
     margin-right: 10px;
     width: 50px;
     height: 50px;
+    /* border: 1px solid black; */
+    /* border: 1px solid #5b5ca8; */
     border: 1px solid white;
     border-radius: 100%;
     overflow: hidden;
@@ -200,7 +210,7 @@ header{
 .form_btn .bg{
     position: absolute;
     width: 0;
-    background: #23518c;
+    background: #5b5ca8;
     padding: 10px;
     left: 0;
     height: 100vh;
@@ -225,7 +235,7 @@ header{
 
 .input{
     position: relative;
-    border: 1px solid #23518c;
+    border: 1px solid #5b5ca8;
     padding: 10px;
     background: white;
     width: 80%;
@@ -246,7 +256,7 @@ header{
     left: 0;
     margin-left: 10px;
     font-size: 1.2rem;
-    color: #23518c;
+    color: #5b5ca8;
     background: white;
     opacity: 0.5;
     user-select: none;
@@ -261,6 +271,8 @@ header{
 
 .user a{
     text-decoration: none;
+    /* color: black; */
+    /* color:  #5b5ca8; */
     color: white;
 }
 
@@ -292,6 +304,8 @@ header{
         display: none;
         margin-top: 10px;
 
+
+
         /*---Caso no futuro incomode, configs para tornar o menu flutuante---*/
 
         /* position: absolute;
@@ -302,6 +316,10 @@ header{
 
         /*--------------------*/
     }
+
+    .cont_logo{
+        margin-left:0 ;
+    }
 
     .user{
         margin-right: 0px;
@@ -390,40 +408,40 @@ header{
     display: block;
 }
 
-
 /* footer css */
 footer{
     width: 100%;
     height: auto;
     /* margin-top:100px; */
-    color: #3c4043;
+    /* color: #3c4043; */
+    /* color: black; */
+    color: white;
     font-size: 12px;
     line-height: 50px;
-    background:#fff;
-    padding: 0.5em 5em;
+    padding: 2em 5em 0.5em 5em;
+    background: #5b5ca8;
     border-top: 1px solid #dadce0;
 }
 
 footer ul{ height: 100%; }
 
-footer ul, .siga,.collaborators, .collaborators a{ box-sizing: unset; display: flex; }
+footer ul, .siga,.collaborators, .collaborators a{box-sizing: unset;display: flex;}
 
-footer ul{ justify-content: space-between; }
+footer ul{justify-content: space-around;align-items: center;}
 
-#Logo > p{ align-self: center; }
+#Logo > p{ margin: 0 10px; }
 
-#Logo { display: flex; }
+#Logo {display: flex;flex-direction: column;}
 
 #Logo img{margin: 0 10px;width: 100px;height: 100px;}
 
-.siga, .collaborators,.collaborators a{ align-items: center; }
+/* .siga, .collaborators,.collaborators a{align-items: center;} */
 
-.siga{ margin-right: 150px; }
+/* .siga{ margin-right: 150px; } */
 
 #Logo img{
-    margin: 0 10px;
-    width: 100px;
-    height: 100px;
+    width: auto;
+    height: 14vh;
 }
 
 /* footer ul li .footer-link-content{
@@ -494,15 +512,16 @@ label[for="checkGit"] img{
     width: 25px;
     border-radius: 40px;
     -webkit-border-radius: 40px;
-    background-color: #171516;
+    background-color: #27274f;
     transition-timing-function: ease;
-    box-shadow: 1px 2px 5px 1px black;
+    box-shadow: 0 1px 1px 0 rgb(60 64 67 / 42%), 
+    0 1px 4px 1px rgb(60 64 67 / 40%);
 }
 
 .collaborators a:hover{
     cursor: pointer;
     width: 170px;
-    background-color: #1f1c1d;
+    background-color: #27274f;
 }
 
 .collaborators img{
@@ -556,7 +575,7 @@ label[for="checkGit"] img{
         text-align: center;
         align-items: center;
         flex-direction: column;
-        justify-content: center;
+        justify-content: space-between;
     }
 
     .siga{ margin-right: 0px; }

diff --git a/index.php b/index.php
@@ -26,33 +26,33 @@
                 <li><a href="#" target="blank"><i class="fas fa-info-circle"></i> Sobre</a></li>
                 <li><a href="#" target="blank"><i class="fas fa-users"></i> Equipe</a></li>
                 <li><a href="#" target="blank"><i class="fas fa-question-circle"></i> Suporte</a></li>
-                <li class="menu__createbtn"><a href="./src/php/add_agenda.php" target="self"><i class="fas fa-plus"></i> Criar Projeto</a></li>
+                <li class="menu__createbtn"><a href="./src/php/add_agenda.php" target="_self"><i class="fas fa-plus"></i> Criar Projeto</a></li>
             </ul>
         </nav>
-        <h1 class="logo">logo</h1>
+        <a class="cont_logo" href="./index.php" target="_self"><img class="logo" src="./assets/LingoApp_Branco.png" alt="Logo da página com cores em roxo e laranja"></a>
         <div class="user">
             <?php
                     if(!isset($_SESSION["username"])){
-                    echo "<a href='./src/php/cadastro.php' target='self' class='perfil_img'>
+                    echo "<a href='./src/php/cadastro.php' target='_self' class='perfil_img'>
                     <i class='fas fa-user'></i>
                  </a>";
                    }else{
-                    echo "<a href='./src/php/perfil.php' target='self' class='perfil_img'>
+                    echo "<a href='./src/php/perfil.php' target='_self' class='perfil_img'>
                     <i class='fas fa-user'></i>
                  </a>";
                    }
             ?>
 
             <h3 class="username"><?php 
                 if(!isset($_SESSION["username"])){
-                    echo "<a href='./src/php/cadastro.php' target='self' >
+                    echo "<a href='./src/php/cadastro.php' target='_self' >
                     "."Logar"."
                  </a>";
 
 
                }else{
                     //echo $_SESSION["username"];
-                    echo "<a href='./src/php/perfil.php' target='self'>
+                    echo "<a href='./src/php/perfil.php' target='_self'>
                     ".$_SESSION["username"]."
                  </a>";
                  //   echo "<script>location.reload();</script>";
@@ -65,14 +65,14 @@
 
 <div class="container_index">
   <img src="./assets/Linggo-Logo.png" alt="" >
-  <div class="btn-primary"><a href="./src/php/add_agenda.php" target="_self"><i class="fas fa-plus"></i> Criar Projeto</a></div>
+  <div class="btn-primary"><a href="./src/php/add_agenda.php" target="__self"><i class="fas fa-plus"></i> Criar Projeto</a></div>
 </div>
 
 <footer>
 <ul>
     <li>
     <div id="Logo">
-        <img src="./assets/Linggo-Logo.png" alt="">
+        <img src="./assets/LingoApp_Branco_Cortada.png" alt="">
         <p>Linggo APP - Organizador de tarefas.</p>
     </div>
     </li>

diff --git a/src/css/add_quadros.css b/src/css/add_quadros.css
@@ -89,7 +89,8 @@
 .add_agenda{
     width: 95%;
     height: 70vh;
-    border: 3px solid #23518c;
+    /* border: 3px solid #f49236; */
+     border: 3px solid #5b5ca8;
     align-self: center;
     display: flex;
     flex-direction: column;