Merge branch 'master' into dependabot/npm_and_yarn/acorn-6.4.1

SharebookBR · Mar 24, 2020 · 486b2b0 · 486b2b0
2 parents bd1a257 + 6937474
commit 486b2b0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 38 deletions.
diff --git a/src/app/components/footer/footer.component.html b/src/app/components/footer/footer.component.html
@@ -56,7 +56,7 @@ <h5 class="text-uppercase">Github</h5>
   <!-- Footer Links -->
 
   <!-- Copyright? OpenSource! -->
-  <div class="footer-copyright text-center py-3">© 2019 Copyleft: sharebook.com.br</div>
+  <div class="footer-copyright text-center py-3">© 2019-2020 Copyleft: sharebook.com.br</div>
   <!-- Copyright? OpenSource! -->
 </footer>
-<!-- Footer -->
+<!-- Footer -->
diff --git a/src/app/components/header/header.component.html b/src/app/components/header/header.component.html
@@ -2,64 +2,50 @@
 
 <div class="container">
   <nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top">
-    <a class="navbar-brand" href="#">
-      <img src="assets/img/logo.png" alt="logotipo" id="logotipo" />
+    <a class="navbar-brand" routerLink="/">
+      <img src="assets/img/logo.png" alt="logotipo" id="logotipo" class="d-inline-block align-top" />
     </a>
-    <button
-      class="navbar-toggler"
-      type="button"
-      data-toggle="collapse"
-      data-target="#navbarText"
-      aria-controls="navbarText"
-      aria-expanded="false"
-      aria-label="Toggle navigation"
-    >
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText"
+      aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
     <div class="collapse navbar-collapse" id="navbarText" #menu>
       <ul class="navbar-nav mr-auto">
         <li class="nav-item">
-          <div class="ml-5 mt-1">
+          <div class="mt-1">
             <app-input-search></app-input-search>
           </div>
         </li>
-        <li class="nav-item ml-5">
+        <li class="nav-item">
           <!-- adicinando evento de click nos links que chama o metodo que esconde o menu -->
-          <a class="nav-link hvr-underline-from-center" routerLink="/" (click)="showHideMenu()"
-            >Início
+          <a class="nav-link hvr-underline-from-center" routerLink="/" (click)="showHideMenu()">Início
             <span class="sr-only">(current)</span>
           </a>
         </li>
         <li class="nav-item">
-          <a class="nav-link hvr-underline-from-center" routerLink="/livros/doar" (click)="showHideMenu()"
-            >Doe um Livro</a
-          >
+          <a class="nav-link hvr-underline-from-center" routerLink="/livros/doar" (click)="showHideMenu()">Doe um
+            Livro</a>
         </li>
         <li class="nav-item ">
-          <a class="nav-link hvr-underline-from-center" routerLink="/apoie-projeto" (click)="showHideMenu()"
-            >Apoie o projeto</a
-          >
+          <a class="nav-link hvr-underline-from-center" routerLink="/apoie-projeto" (click)="showHideMenu()">Apoie o
+            projeto</a>
         </li>
         <li class="nav-item ">
           <a class="nav-link hvr-underline-from-center" routerLink="/quem-somos" (click)="showHideMenu()">Quem somos</a>
         </li>
         <li class="nav-item ">
-          <a *ngIf="userLogged" class="nav-link hvr-underline-from-center" routerLink="/panel" (click)="showHideMenu()"
-            >Meu Painel</a
-          >
+          <a *ngIf="userLogged" class="nav-link hvr-underline-from-center" routerLink="/panel"
+            (click)="showHideMenu()">Meu Painel</a>
         </li>
         <li class="nav-item ">
-          <a class="nav-link hvr-underline-from-center" routerLink="/contact-us" (click)="showHideMenu()"
-            >Fale Conosco</a
-          >
+          <a class="nav-link hvr-underline-from-center" routerLink="/contact-us" (click)="showHideMenu()">Fale
+            Conosco</a>
         </li>
         <li class="nav-item ">
-          <a *ngIf="!userLogged" class="nav-link hvr-underline-from-center" routerLink="/login" (click)="showHideMenu()"
-            >Entrar</a
-          >
-          <a *ngIf="userLogged" class="nav-link hvr-underline-from-center" routerLink="/login" (click)="showHideMenu()"
-            >Sair</a
-          >
+          <a *ngIf="!userLogged" class="nav-link hvr-underline-from-center" routerLink="/login"
+            (click)="showHideMenu()">Entrar</a>
+          <a *ngIf="userLogged" class="nav-link hvr-underline-from-center" routerLink="/login"
+            (click)="showHideMenu()">Sair</a>
         </li>
       </ul>
 
@@ -69,4 +55,4 @@
 </div>
 
 <!-- para afastar o miolo do menu. -->
-<div style="width: 100%; height: 118px;"></div>
+<div style="width: 100%; height: 118px;"></div>
diff --git a/src/app/core/services/technologies/technologies.service.ts b/src/app/core/services/technologies/technologies.service.ts
@@ -14,13 +14,13 @@ export class TechnologiesService {
       {
         image: 'assets/img/contribute-project/angular.jpg',
         title: 'Frontend',
-        text: 'Angular 6, Bootstrap 4, HTML 5',
+        text: 'Angular 7+, Typescript 3, Bootstrap 4, HTML 5',
         links: [{ url: RepositoriesUrls.FRONTEND, content: 'Github' }, { url: TrelloUrls.SHAREBOOK, content: 'Trello' }]
       },
       {
         image: 'assets/img/contribute-project/ionic.jpg',
         title: 'Mobile',
-        text: 'Cordova, Ionic, Angular<br/>',
+        text: 'Cordova, Ionic 3, Angular<br/>',
         links: [{ url: RepositoriesUrls.MOBILE, content: 'Github' }, { url: TrelloUrls.MOBILE, content: 'Trello' }]
       },
       {