Merge pull request #16 from IFSP-SaoJoaodaBoaVista/adryel-wip

Alterando fonte e licença no footer
IFSP-SaoJoaodaBoaVista · Aug 15, 2024 · 8ce5059 · 8ce5059
2 parents 2096d20 + d2c73d6
commit 8ce5059
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 20 deletions.
diff --git a/index.html b/index.html
@@ -4,7 +4,11 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>TechBridge</title>
+  <link rel="icon" type="image/x-icon" href="/public/img/logo-techBridge.png">
   <script src="https://cdn.tailwindcss.com"></script>
+  <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=Montserrat:ital,wght@0,100..900;1,100..900&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">
   <script>
     // CORES DE FUNDO
     tailwind.config = {
@@ -43,7 +47,7 @@
             'oitava': '#0c2638'
           },
           fontFamily: {
-            'sans': ['Poppins', 'sans-serif'],
+            'sans': ['Montserrat', 'sans-serif'],
           },
           backgroundImage: {
             'dark-sea': "url('./public/img/dark-sea.jpeg')",
@@ -143,26 +147,28 @@ <h4 class="font-semibold text-white">Case 4</h4>
       <div class="mx-auto w-full max-w-screen-xl p-4 py-6 lg:py-8">
         <hr class="my-2 border-gray-500 sm:mx-auto lg:my-4" />
         <div class="sm:flex sm:items-center sm:justify-between">
-            <span class="text-sm text-gray-500 sm:text-center">© 2023 <a href="#" class="hover:underline">TechBridge</a>. All Rights Reserved.
+            <span class="text-sm text-gray-500 sm:text-left w-3/6">© 2024 
+              <a href="https://github.com/IFSP-SaoJoaodaBoaVista/20241-ptin-g2" class="underline">TechBridge</a>. by 
+              <a class="underline" href="http://github.com/zdearo">Adryel Dearo</a>, 
+              <a class="underline" href="">Lucas Giavaroti</a>, 
+              <a class="underline" href="">Willian Marques</a>, 
+              <a class="underline" href="">Giovanna Satiko</a> e 
+              <a class="underline" href="">Giulia Leticie</a> 
+              is licensed under 
+              <a class="underline" href="https://creativecommons.org/licenses/by-nc-sa/4.0/?ref=chooser-v1">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International </a>
             </span>
             <div class="flex mt-4 sm:justify-center sm:mt-0">
-                <a href="#" class="text-gray-500 hover:text-gray-900">
-                    <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 8 19">
-                          <path fill-rule="evenodd" d="M6.135 3H8V0H6.135a4.147 4.147 0 0 0-4.142 4.142V6H0v3h2v9.938h3V9h2.021l.592-3H5V3.591A.6.6 0 0 1 5.592 3h.543Z" clip-rule="evenodd"/>
-                      </svg>
-                    <span class="sr-only">Facebook page</span>
+                <a href="https://youtube.com/@techbrigde-t3r?si=wCVuK9C1fml25TZ9" class="text-gray-500 hover:text-gray-900" target="_blank">
+                    <svg class="w-6 h-6" fill="currentColor" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="96" height="96" viewBox="0 0 24 24">
+                      <path d="M 12 4 C 12 4 5.7455469 3.9999687 4.1855469 4.4179688 C 3.3245469 4.6479688 2.6479687 5.3255469 2.4179688 6.1855469 C 1.9999687 7.7455469 2 12 2 12 C 2 12 1.9999687 16.254453 2.4179688 17.814453 C 2.6479687 18.675453 3.3255469 19.352031 4.1855469 19.582031 C 5.7455469 20.000031 12 20 12 20 C 12 20 18.254453 20.000031 19.814453 19.582031 C 20.674453 19.352031 21.352031 18.674453 21.582031 17.814453 C 22.000031 16.254453 22 12 22 12 C 22 12 22.000031 7.7455469 21.582031 6.1855469 C 21.352031 5.3255469 20.674453 4.6479688 19.814453 4.4179688 C 18.254453 3.9999687 12 4 12 4 z M 12 6 C 14.882 6 18.490875 6.1336094 19.296875 6.3496094 C 19.465875 6.3946094 19.604391 6.533125 19.650391 6.703125 C 19.891391 7.601125 20 10.342 20 12 C 20 13.658 19.891391 16.397875 19.650391 17.296875 C 19.605391 17.465875 19.466875 17.604391 19.296875 17.650391 C 18.491875 17.866391 14.882 18 12 18 C 9.119 18 5.510125 17.866391 4.703125 17.650391 C 4.534125 17.605391 4.3956094 17.466875 4.3496094 17.296875 C 4.1086094 16.398875 4 13.658 4 12 C 4 10.342 4.1086094 7.6011719 4.3496094 6.7011719 C 4.3946094 6.5331719 4.533125 6.3946094 4.703125 6.3496094 C 5.508125 6.1336094 9.118 6 12 6 z M 10 8.5351562 L 10 15.464844 L 16 12 L 10 8.5351562 z"></path>
+                    </svg>
+                    <span class="sr-only">Youtube</span>
                 </a>
-                <a href="#" class="text-gray-500 hover:text-gray-900 ms-5">
-                    <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 17">
-                      <path fill-rule="evenodd" d="M20 1.892a8.178 8.178 0 0 1-2.355.635 4.074 4.074 0 0 0 1.8-2.235 8.344 8.344 0 0 1-2.605.98A4.13 4.13 0 0 0 13.85 0a4.068 4.068 0 0 0-4.1 4.038 4 4 0 0 0 .105.919A11.705 11.705 0 0 1 1.4.734a4.006 4.006 0 0 0 1.268 5.392 4.165 4.165 0 0 1-1.859-.5v.05A4.057 4.057 0 0 0 4.1 9.635a4.19 4.19 0 0 1-1.856.07 4.108 4.108 0 0 0 3.831 2.807A8.36 8.36 0 0 1 0 14.184 11.732 11.732 0 0 0 6.291 16 11.502 11.502 0 0 0 17.964 4.5c0-.177 0-.35-.012-.523A8.143 8.143 0 0 0 20 1.892Z" clip-rule="evenodd"/>
+                <a href="https://www.instagram.com/techbridg3/" class="text-gray-500 hover:text-gray-900 ms-5" target="_blank">
+                  <svg class="w-6 h-6" fill="currentColor" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="96" height="96" viewBox="0 0 48 48"> <path d="M 16.5 5 C 10.16639 5 5 10.16639 5 16.5 L 5 31.5 C 5 37.832757 10.166209 43 16.5 43 L 31.5 43 C 37.832938 43 43 37.832938 43 31.5 L 43 16.5 C 43 10.166209 37.832757 5 31.5 5 L 16.5 5 z M 16.5 8 L 31.5 8 C 36.211243 8 40 11.787791 40 16.5 L 40 31.5 C 40 36.211062 36.211062 40 31.5 40 L 16.5 40 C 11.787791 40 8 36.211243 8 31.5 L 8 16.5 C 8 11.78761 11.78761 8 16.5 8 z M 34 12 C 32.895 12 32 12.895 32 14 C 32 15.105 32.895 16 34 16 C 35.105 16 36 15.105 36 14 C 36 12.895 35.105 12 34 12 z M 24 14 C 18.495178 14 14 18.495178 14 24 C 14 29.504822 18.495178 34 24 34 C 29.504822 34 34 29.504822 34 24 C 34 18.495178 29.504822 14 24 14 z M 24 17 C 27.883178 17 31 20.116822 31 24 C 31 27.883178 27.883178 31 24 31 C 20.116822 31 17 27.883178 17 24 C 17 20.116822 20.116822 17 24 17 z">
+                    </path> 
                   </svg>
-                    <span class="sr-only">Twitter page</span>
-                </a>
-                <a href="#" class="text-gray-500 hover:text-gray-900 ms-5">
-                    <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
-                      <path fill-rule="evenodd" d="M10 0a10 10 0 1 0 10 10A10.009 10.009 0 0 0 10 0Zm6.613 4.614a8.523 8.523 0 0 1 1.93 5.32 20.094 20.094 0 0 0-5.949-.274c-.059-.149-.122-.292-.184-.441a23.879 23.879 0 0 0-.566-1.239 11.41 11.41 0 0 0 4.769-3.366ZM8 1.707a8.821 8.821 0 0 1 2-.238 8.5 8.5 0 0 1 5.664 2.152 9.608 9.608 0 0 1-4.476 3.087A45.758 45.758 0 0 0 8 1.707ZM1.642 8.262a8.57 8.57 0 0 1 4.73-5.981A53.998 53.998 0 0 1 9.54 7.222a32.078 32.078 0 0 1-7.9 1.04h.002Zm2.01 7.46a8.51 8.51 0 0 1-2.2-5.707v-.262a31.64 31.64 0 0 0 8.777-1.219c.243.477.477.964.692 1.449-.114.032-.227.067-.336.1a13.569 13.569 0 0 0-6.942 5.636l.009.003ZM10 18.556a8.508 8.508 0 0 1-5.243-1.8 11.717 11.717 0 0 1 6.7-5.332.509.509 0 0 1 .055-.02 35.65 35.65 0 0 1 1.819 6.476 8.476 8.476 0 0 1-3.331.676Zm4.772-1.462A37.232 37.232 0 0 0 13.113 11a12.513 12.513 0 0 1 5.321.364 8.56 8.56 0 0 1-3.66 5.73h-.002Z" clip-rule="evenodd"/>
-                  </svg>
-                    <span class="sr-only">Dribbble account</span>
+                    <span class="sr-only">Instagram</span>
                 </a>
             </div>
         </div>

diff --git a/src/assets/typing.js b/src/assets/typing.js
@@ -1,12 +1,11 @@
-// script de animação de digitação no techbridge vem aqui
 const text = "Bem vindo, somos a TechBridge!";
 const subtext = "Uma empresa de tecnologia que busca soluções inovadoras para o seu negócio.";
 
 let index = 0;
 
 function typeWriter() {
   if (index < text.length) {
-    document.getElementById("typing").innerHTML += text.charAt(index);
+    updateTextContent('typing', document.getElementById('typing').innerHTML + text.charAt(index));
     index++;
     setTimeout(typeWriter, 50);
   } else {
@@ -17,7 +16,7 @@ function typeWriter() {
 
 function typeWriterSubText() {
   if (index < subtext.length) {
-    document.getElementById("sub-typing").innerHTML += subtext.charAt(index);
+    updateTextContent('sub-typing', document.getElementById('sub-typing').innerHTML + subtext.charAt(index));
     index++;
     setTimeout(typeWriterSubText, 30);
   } else {
@@ -27,8 +26,16 @@ function typeWriterSubText() {
 }
 
 function showButton() {
+  const scrollPosition = window.scrollY;
   document.getElementById("learn-more").style.display = "flex";
+  window.scrollTo(0, scrollPosition);
 }
 
+function updateTextContent(elementId, newText) {
+    const scrollPosition = window.scrollY;
+    const element = document.getElementById(elementId);
+    element.innerHTML = newText;
+    window.scrollTo(0, scrollPosition);
+}
 
 typeWriter();