Merge pull request #197 from valor-software/feat-update-after-merge

andsonjosef · web-flow · commit 1bde456439f6 · 2022-11-04T11:58:02.000-03:00
feat(general): update after merge
diff --git a/apps/valor-software-site/src/assets/img/feedback/tablesReady.png b/apps/valor-software-site/src/assets/img/feedback/tablesReady.png
diff --git a/libs/common-docs/src/components/blog-preview/blog-portfolio-item.component.ts b/libs/common-docs/src/components/blog-preview/blog-portfolio-item.component.ts
@@ -9,10 +9,10 @@ import { IPortfolio } from "../../models/portfolio.interface";
     template:`
         <div class="article-item">
             <div class="img-container zoom-img-scale">
-                <img class="w-full h-full object-cover" [src]="article ? article?.bgImg : project?.previewImg" [alt]="article ? article?.title : project?.name + 'img'">
+                <img class="w-full h-full object-cover" [src]="article ? article.bgImg : project?.previewImg" [alt]="article ? article.title : project?.name + 'img'">
             </div>
             <div class="text-container">
-                <p>{{article ? article?.title : project?.name}}</p>
+                <p>{{article ? article.title : project?.name}}</p>
             </div>
         </div>
     `
diff --git a/libs/common-docs/src/components/contact-modal/contactModal.components.ts b/libs/common-docs/src/components/contact-modal/contactModal.components.ts
@@ -41,7 +41,11 @@ export class ContactModalComponent implements OnDestroy {
     };
 
     @HostListener('document:keydown.escape', ['$event']) onKeydownHandler() {
+        const focused: HTMLElement | null = <HTMLElement>document.querySelector(':focus-visible');
         this.closeModal();
+        if(focused){
+            focused.blur();
+        }
     }
 
     constructor(
@@ -61,7 +65,7 @@ export class ContactModalComponent implements OnDestroy {
             element.style.display = 'block';
         }
 
-        if (this.router.url.includes('/services')) {
+        if (this.router.url.includes('/services') || this.router.url.includes('/clients')) {
             this.form.get('type')?.setValue('service');
         } else if (this.router.url.includes('/careers')) {
             this.form.get('type')?.setValue('career');
diff --git a/libs/common-docs/src/components/expandable-card/expandable-card.component.html b/libs/common-docs/src/components/expandable-card/expandable-card.component.html
@@ -1,29 +1,29 @@
-<div class="md:flex flex-column justify-between gap-4">
-  <div *ngFor="let card of cards; let i = index" class="bg-grey md:py-10 py-6 px-6 md:mb-0 mb-4"
+<div class="lg:flex flex-column justify-between gap-4">
+  <div *ngFor="let card of cards; let i = index" class="bg-grey lg:py-10 py-6 px-6 lg:mb-0 mb-4"
     [style.flex]="card.isExpanded ? '2.5' : '1'" (click)="selectCard(i)">
-    <div class="md:flex-auto md:flex flex-column justify-between align-center h-full items-center"
+    <div class="lg:flex-auto lg:flex flex-column justify-between align-center h-full items-center"
       *ngIf="card.isExpanded">
       <div [@enterBigCard]>
-        <img [src]="card.imgSource" class="block md:hidden w-2/4 h-2/4 m-auto mb-6" alt="slide img">
-        <h3 [innerHTML]="card.title" class="md:text-large text-2xl text-light_title_col leading-28 md:leading-44 mb-8">
+        <img [src]="card.imgSource" class="block lg:hidden w-2/4 h-2/4 md:w-1/3 lg:w-2/4 lg:h-2/4 md:h-1/3 m-auto mb-6" alt="slide img">
+        <h3 [innerHTML]="card.title" class="lg:text-large text-2xl text-light_title_col leading-28 lg:leading-44 mb-8">
         </h3>
         <ul class="list-disc text-grey_font_col pl-5 ">
           <li *ngFor="let item of card.list" class="mb-4 ">{{item}}</li>
         </ul>
-        <button class="flex justify-center md:justify-between mt-10 w-full md:w-auto">
+        <button class="flex justify-center lg:justify-between mt-10 w-full lg:w-auto">
           <a [routerLink]="['articles']" class="btn-pink flex justify-center w-full">Visit blog <img
               src="assets/img/icons/arrow.svg" class="ml-2" alt=""></a>
         </button>
       </div>
-      <div class="hidden md:block max-w-140 md:max-w-full mb-6 md:mb-0 h-full">
+      <div class="hidden lg:block max-w-140 lg:max-w-full mb-6 lg:mb-0 h-full">
         <img [src]="card.imgSource" class="w-full h-full" alt="slide img">
       </div>
     </div>
 
-    <div class="flex md:block md:flex-column justify-between align-center md:h-full h-106 items-center"
+    <div class="flex justify-between align-center md:h-full h-106 items-center gap-6"
       *ngIf="!card.isExpanded" (click)="selectCard(i)" [@enterSmallCard]>
-      <div class="max-w-140 md:max-w-full mb-6 md:h-1/2 w-1/2 md:w-full m-auto mr-6 md:mr-0">
-        <img [src]="card.imgSource" class="md:w-full m-auto md:h-full h-106" alt="slide img">
+      <div class="max-w-140 md:max-w-full mb-6 md:h-1/2 w-1/2 md:w-1/4 m-auto ">
+        <img [src]="card.imgSource" class="w-full m-auto h-106" alt="slide img">
       </div>
       <div class="md:h-1/2 ">
         <h3 [innerHTML]="card.title"
diff --git a/libs/common-docs/src/components/popover/popover.component.html b/libs/common-docs/src/components/popover/popover.component.html
@@ -12,11 +12,11 @@ <h3 class="ml-2.5">{{item.title}}</h3>
                         <div *ngIf="!item.route" class="bg-yellow_bg_col rounded-2xl text-dark_font_col text-xs ml-5 self-center px-1.5" >
                             Coming soon
                         </div>
+                    </div>             
+                    <div>
+                        <p class="text-grey_font_col text-sm">{{item.description}}</p>
                     </div>
-                </a>
-                <div>
-                    <p class="text-grey_font_col text-sm">{{item.description}}</p>
-                </div>
+                 </a>
             </div>
         </div>
     </div>
diff --git a/libs/common-docs/src/components/services_block/services.model.ts b/libs/common-docs/src/components/services_block/services.model.ts
@@ -12,7 +12,7 @@ export const servicesList = [
         path: '/services/software-engineering'
     },
     {
-        title: 'Quality Assuarance',
+        title: 'Quality Assurance',
         description: 'Enjoy thoroughly planned and polished quality assurance workflows on your project, including the test automation pipeline. Using edge JavaScript and TypeScript libraries, we ensure the best test coverage of your product.',
         img: 'assets/img/bg-img/services_img/services_3.svg',
         path: '/services/quality-assurance'
diff --git a/libs/feedback/src/feedback.component.html b/libs/feedback/src/feedback.component.html
@@ -23,7 +23,7 @@
                         </div>
                         <div class="w-35% ml-10 flex-column items-start ">
                             <img [src]="slide.img" alt=""
-                                 class="w-full m-auto mb-8 object-contain  rounded-full max-w-full h-auto align-middle border-none"
+                                 class="w-full m-auto mb-8 object-contain  rounded-full max-w-full h-auto align-middle border-none bg-white"
                                  style="max-width: 214px; max-height: 214px; width: 100%; height: 100%">
                             <div class="w-full flex justify-between">
                                 <p class="m-auto">
diff --git a/libs/route-pages/blog-portfolio/src/general-page.component.html b/libs/route-pages/blog-portfolio/src/general-page.component.html
@@ -34,14 +34,14 @@ <h1 class="text-light_title_col md:text-64 text-large md:leading-66 leading-44 m
                     <ng-container *ngIf="!isBlogPage(); else blogPageImage">
                         <ng-container *ngIf="activeProject && activeProject.name">
                             <a href="javascript:void(0)" [routerLink]="[getRouteLink(activeProject.name)]" class="block zoom-img-scale">
-                                <img [src]="activeProject?.previewImg" [alt]="activeProject?.name + 'image'">
+                                <img [src]="activeProject.previewImg" [alt]="activeProject.name + 'image'">
                             </a>
                         </ng-container>
                     </ng-container>
                     <ng-template #blogPageImage>
                         <ng-container *ngIf="activeArticle && activeArticle.title">
                             <a href="javascript:void(0)" [routerLink]="[getRouteLink(activeArticle.title)]" class="block zoom-img-scale">
-                                <img [src]="activeArticle?.bgImg" [alt]="activeArticle?.title + 'image'">
+                                <img [src]="activeArticle.bgImg" [alt]="activeArticle.title + 'image'">
                             </a>
                         </ng-container>
                     </ng-template>
diff --git a/libs/route-pages/for-clients/src/routes.ts b/libs/route-pages/for-clients/src/routes.ts
@@ -2,8 +2,9 @@ import { StartupsComponent } from './startups.component';
 import { SmallMediumBusinessesComponent } from './smallMediumBusinesses.component';
 import { EnterprisesComponent } from './enterprises.component';
 import { NonProfitComponent } from './nonProfit.component';
+import { Routes } from '@angular/router';
 
-export const routes = [
+export const routes: Routes = [
     {
         path: '',
         children: [
@@ -25,7 +26,8 @@ export const routes = [
             },
             {
                 path: '',
-                redirectTo: 'startups'
+                redirectTo: 'startups',
+                pathMatch: 'full'
             },
         ]
     }
diff --git a/libs/route-pages/home-page/src/businesses-card.component.html b/libs/route-pages/home-page/src/businesses-card.component.html
@@ -1,19 +1,19 @@
-<div class="md:flex-wrap md:flex flex-column gap-8">
-  <div *ngFor="let card of cards; let i = index" class="md:w-45% bg-grey md:py-10 py-6 px-6 md:mb-0 mb-4">
-    <div class=" md:flex flex-column justify-between align-center h-full items-center">
-      <div class="md:w-8/12">
-        <img [src]="card.imgSource" class="block md:hidden w-2/4 h-2/4 m-auto mb-6" alt="slide img">
-        <h3 [innerHTML]="card.title" class="md:text-32 text-2xl text-light_title_col leading-28 md:leading-44 mb-8">
+<div class="lg:flex-wrap lg:flex flex-column gap-8">
+  <div *ngFor="let card of cards; let i = index" class="lg:w-45% bg-grey lg:py-10 py-6 px-6 lg:mb-0 mb-4">
+    <div class=" lg:flex flex-column justify-between align-center h-full items-center">
+      <div class="lg:w-8/12">
+        <img [src]="card.imgSource" class="block lg:hidden w-2/4 h-2/4 m-auto mb-6" alt="slide img">
+        <h3 [innerHTML]="card.title" class="lg:text-32 text-2xl text-light_title_col leading-28 lg:leading-44 mb-8">
         </h3>
         <p class="text-grey_font_col tracking-tightest">
           {{card.description}}
         </p>
-        <button class="flex justify-center md:justify-between mt-10 w-full md:w-auto">
+        <button class="flex justify-center lg:justify-between mt-10 w-full lg:w-auto">
           <a [routerLink]="card.route" class="btn-pink flex justify-center w-full">{{card.buttonTitle}}<img src="assets/img/icons/arrow.svg"
               class="ml-2" alt=""></a>
         </button>
       </div>
-      <div class="hidden md:block md:max-w-full mb-6 md:mb-0 ">
+      <div class="hidden lg:block lg:max-w-full mb-6 lg:mb-0 ">
         <img [src]="card.imgSource" class="w-full" alt="slide img">
       </div>
     </div>
diff --git a/libs/route-pages/home-page/src/main-page.component.html b/libs/route-pages/home-page/src/main-page.component.html
@@ -26,9 +26,9 @@ <h1 class="font-bold text-light_title_col text-4xl leading-44 md:leading-66 md:t
 
 </section>
 
-<section class="landing-section pt-16 lg:!pt-0">
+<section class="landing-section pt-16 px-5 lg:!pt-0">
     <h1 class="main-title">Priorities</h1>
-    <div class="md:w-1296 m-auto">
+    <div class="md:max-w-[1296px] m-auto">
         <expandable-card [cards]="cards"></expandable-card>
     </div>
 </section>
@@ -49,7 +49,7 @@ <h1 class="main-title">Technology</h1>
                         [alt]="technology.id" class="mx-auto" style="width: 100%">
                 </div>
             </div>
-            <button class="mx-auto flex mt-8 mb-8 md:mb-0 btn-pink flex justify-center items-center" routerLink="/"
+            <button class="mx-auto flex mt-8 mb-8 lg:mb-0 btn-pink justify-center items-center" routerLink="/"
                 fragment="open-source">
                 Check our open source Contributions<img src="assets/img/icons/arrow.svg" class="ml-2 rotate-90" alt="">
             </button>
@@ -88,7 +88,7 @@ <h1 class="main-title mt-0">Services</h1>
     <h1 class="main-title mt-0">Businesses</h1>
     <div class="container">
         <h3
-            class="w-10/12 md:font-40 tracking-tightest text-20 md:text-large  text-light_title_col leading-28 md:leading-44 mb-10">
+            class="w-10/12 md:font-40 tracking-tightest text-20 md:text-large text-light_title_col leading-28 md:leading-44 mb-10">
             <span>Depending on </span>business <span>maturity, we try to </span>anticipate<span> and cover the most
                 common</span>
             challenges
@@ -115,10 +115,10 @@ <h3 class="md:text-large text-32 lg:text-56 text-light_title_col lg:leading-66 l
             open-source and what we give back. So we proudly sponsor promising technologies, contribute with our
             knowledge to make tools handier, and build open code solutions to ease engineers’ daily routines.</p>
 
-        <div [ngClass]="{'flex-row-reverse': slide.reverse } " class="md:flex flex-column justify-between w-full h-full gap-14 mt-32" *ngFor="let slide of openSourceSlides">
-            <div class="leading-44 md:w-10/12 h-full flex flex-col justify-between items-start ">
+        <div [ngClass]="{'flex-row-reverse': slide.reverse } " class="flex flex-col lg:flex-row justify-between w-full h-full gap-14 mt-32" *ngFor="let slide of openSourceSlides">
+            <div class="leading-44 lg:w-10/12 h-full flex flex-col justify-between items-start ">
                 <div class="mb-8">
-                    <div class="w-full flex flex-col justify-center items-center text-light_title_col md:hidden block">
+                    <div class="w-full flex flex-col justify-center items-center text-light_title_col lg:hidden">
                         <img [src]="slide.img" 
                             style="width: 100%; height: 100%" [alt]="slide.name + 'icon'">
                     </div>
@@ -129,14 +129,14 @@ <h3 class="md:text-large text-32 lg:text-56 text-light_title_col lg:leading-66 l
                         <li class="leading-4 mb-4" *ngFor="let item of slide.list">{{item}}</li>
                     </ul>
                 </div>
-                <button class="flex justify-center w-full md:w-214">
-                    <a class="btn-pink flex justify-center items-center md:w-214 w-full" [href]="slide.link" rel="noopener" target="_blank">
+                <button class="flex justify-center w-full lg:w-214">
+                    <a class="btn-pink flex justify-center items-center lg:w-214 w-full" [href]="slide.link" rel="noopener" target="_blank">
                         <p class="tracking-tightest"> {{ slide.button || 'Visit ' + slide.name }}</p>
                         <img src="assets/img/icons/arrow.svg" class="ml-2" alt="">
                     </a>
                 </button>
             </div>
-            <div class="w-full flex flex-col justify-center text-center items-center text-light_title_col hidden md:block">
+            <div class="w-full lg:flex flex-col justify-center text-center items-center text-light_title_col hidden">
                 <ng-container *ngIf="slide.downloads">
                     <div class="m-auto w-5/12 border-2 p-2 rounded-md">
                         <p class="text-xl">Monthly downloads</p>
diff --git a/libs/route-pages/services-page/src/components/vertical-services-card/vertical-services-card.component.html b/libs/route-pages/services-page/src/components/vertical-services-card/vertical-services-card.component.html
@@ -32,10 +32,10 @@ <h2 *ngIf="service.items && service.items.length > 0 && isServiceList"
             </ul>
 
             <div class=" flex-column lg:flex justify-start items-center" *ngIf="!isLinkList && service.button">
-              <button  class="w-full lg:w-auto flex lg:mr-6 mb-4 w-full">
-                <a (click)="onClick(service.button?.url)" target="_blank"
+              <button  class="w-full lg:w-auto flex lg:mr-6 mb-4">
+                <a (click)="onClick(service.button.url)" target="_blank"
                   class="btn-pink w-full flex justify-center items-center">
-                  {{service.button?.title}}
+                  {{service.button.title}}
                   <img src="assets/img/icons/arrow.svg" class="ml-2 my-auto" alt=""></a>
               </button>
             </div>
diff --git a/libs/route-pages/terminus-page/src/terminus-page.component.ts b/libs/route-pages/terminus-page/src/terminus-page.component.ts
@@ -186,7 +186,7 @@ const cloudTechnologies: ITechnologiesCard[] = [
                 title: "Elixir"
             },
             {
-                src: "assets/img/technologies/active/java_script.png",
+                src: "assets/img/technologies/active/node.png",
                 title: "NodeJs"
             },
         ]
@@ -231,7 +231,7 @@ const newFunctionalitiesTechnologies: ITechnologiesCard[] = [
         title: 'Backend',
         technologies: [
             {
-                src: "assets/img/technologies/active/java_script.png",
+                src: "assets/img/technologies/active/node.png",
                 title: "Node.js"
             }
         ],

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export const servicesList = [`
`12`	`12`	`path: '/services/software-engineering'`
`13`	`13`	`},`
`14`	`14`	`{`
`15`		`- title: 'Quality Assuarance',`
	`15`	`+ title: 'Quality Assurance',`
`16`	`16`	`description: 'Enjoy thoroughly planned and polished quality assurance workflows on your project, including the test automation pipeline. Using edge JavaScript and TypeScript libraries, we ensure the best test coverage of your product.',`
`17`	`17`	`img: 'assets/img/bg-img/services_img/services_3.svg',`
`18`	`18`	`path: '/services/quality-assurance'`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,9 @@ import { StartupsComponent } from './startups.component';`
`2`	`2`	`import { SmallMediumBusinessesComponent } from './smallMediumBusinesses.component';`
`3`	`3`	`import { EnterprisesComponent } from './enterprises.component';`
`4`	`4`	`import { NonProfitComponent } from './nonProfit.component';`
	`5`	`+import { Routes } from '@angular/router';`
`5`	`6`
`6`		`-export const routes = [`
	`7`	`+export const routes: Routes = [`
`7`	`8`	`{`
`8`	`9`	`path: '',`
`9`	`10`	`children: [`
`@@ -25,7 +26,8 @@ export const routes = [`
`25`	`26`	`},`
`26`	`27`	`{`
`27`	`28`	`path: '',`
`28`		`- redirectTo: 'startups'`
	`29`	`+ redirectTo: 'startups',`
	`30`	`+ pathMatch: 'full'`
`29`	`31`	`},`
`30`	`32`	`]`
`31`	`33`	`}`