Skip to content

Commit

Permalink
Merge pull request #54 from teamq-ec/DM2-2833-estado-de-su-solicitud-…
Browse files Browse the repository at this point in the history 
…de-arreglo-de-electrodomesticos

Style adjustment
  • Loading branch information
@fe222004
fe222004 authored Aug 11, 2024
2 parents 72a0d23 + 8fd7dbd commit ed5d7ff
Show file tree
Hide file tree
Showing 5 changed files with 101 additions and 119 deletions.
23 changes: 1 addition & 22 deletions src/app/pages/appliance-registration/appliance-registration.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="bg-white">
<div class="bg-white mt-8">
<div class="bg-white py-4 sm:py-4 text-center">
<div class="mx-auto max-w-7xl px-6 lg:px-8">
<h2 class="text-3xl font-bold tracking-tight text-gray-900 sm:text-4xl">
Expand All @@ -13,19 +13,10 @@ <h2 class="text-3xl font-bold tracking-tight text-gray-900 sm:text-4xl">
<div class="bg-white shadow-lg rounded-lg w-full p-8 border" style="max-width: 90%">
<form [formGroup]="form" (ngSubmit)="onSubmit()">
<div>
<div class="px-4 sm:px-6 border-b border-gray-200">

<h2 class="text-lg font-medium leading-6 text-gray-900">{{
'formProduct.APPLICANT_INFO_TITLE' | translate }}</h2>
<p class="mt-1 text-sm text-gray-600" style=" margin-bottom: 40px;">{{
'formProduct.APPLICANT_INFO_DESCRIPTION' | translate }}
</p>
</div>
<div class="mt-6">
<div class="grid grid-cols-1 gap-y-6 sm:grid-cols-2 sm:gap-x-6">
<div class="space-y-6" style="margin-left: 30px;">
<div class="grid grid-cols-1 gap-6 sm:grid-cols-2">
<!-- First Name Field -->
<div class="sm:col-span-1">
<label for="first_name" class="block text-sm font-medium leading-6 text-gray-900">
{{ 'formProduct.FIRST_NAME_LABEL' | translate }}<span class="text-red-500">*</span>
Expand All @@ -52,8 +43,6 @@ <h2 class="text-lg font-medium leading-6 text-gray-900">{{
</div>
</div>
</div>

<!-- Last Name Field -->
<div class="sm:col-span-1">
<label for="last_name" class="block text-sm font-medium leading-6 text-gray-900">
{{ 'formProduct.LAST_NAME_LABEL' | translate }}<span class="text-red-500">*</span>
Expand Down Expand Up @@ -147,7 +136,6 @@ <h2 class="text-lg font-medium leading-6 text-gray-900">{{
</div>
</div>
<div class="grid grid-cols-1 gap-6 sm:grid-cols-2">
<!-- State Field -->
<div class="sm:col-span-1">
<label for="state" class="block text-sm font-medium leading-6 text-gray-900">
{{ 'formProduct.STATE_PLACEHOLDER' | translate }}<span class="text-red-500">*</span>
Expand All @@ -166,8 +154,6 @@ <h2 class="text-lg font-medium leading-6 text-gray-900">{{
</div>
</div>
</div>

<!-- Preferred Contact Method Field -->
<div class="sm:col-span-1">
<label for="preferred-contact-method" class="block text-sm font-medium leading-6 text-gray-900">
{{ 'formProduct.PREFERRED_CONTACT_METHOD_LABEL' | translate }}<span class="text-red-500">*</span>
Expand All @@ -188,14 +174,9 @@ <h2 class="text-lg font-medium leading-6 text-gray-900">{{
</div>
</div>
</div>


</div>


<div class="space-y-6" style="margin-right: 30px;">
<div class="grid grid-cols-1 gap-6 sm:grid-cols-2">
<!-- Appliance Type Field -->
<div class="sm:col-span-1">
<label for="appliance-type"
class="block text-sm font-medium leading-6 text-gray-900">
Expand Down Expand Up @@ -227,8 +208,6 @@ <h2 class="text-lg font-medium leading-6 text-gray-900">{{
</div>
</div>
</div>

<!-- Brand Field -->
<div class="sm:col-span-1">
<label for="brand" class="block text-sm font-medium leading-6 text-gray-900">
{{ 'formProduct.BRAND_LABEL' | translate }} <span
Expand Down
55 changes: 25 additions & 30 deletions src/app/pages/components/menu/menu.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,36 +17,6 @@
</button>
</div>

<div class="hidden lg:flex lg:gap-x-12">
<a [routerLink]="getFormRoute()" class="text-sm font-semibold leading-6 text-gray-900">{{ 'header.servicios' |
translate }}</a>
<a [routerLink]="goProduct()" class="text-sm font-semibold leading-6 text-gray-900">{{
'header.seguimiento_productos' | translate }}</a>
</div>

<div class="hidden lg:flex lg:ml-8">
<div class="relative">
<button (click)="toggleMenuI()"
class="flex items-center text-gray-700 hover:text-gray-800 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-800">
<img [src]="getFlagUrl(currentLanguage)" alt="Current Language"
class="block h-auto w-5 flex-shrink-0 rounded-full border-none">
<span class="ml-3 block text-sm font-medium">{{ currentLanguage.toUpperCase() }}</span>
</button>
<div *ngIf="showMenuI"
class="absolute right-0 mt-2 w-32 bg-white border border-gray-200 rounded-lg shadow-lg z-40">
<a href="#" (click)="changeLanguage('en', $event)"
class="flex items-center px-4 py-2 text-gray-700 hover:bg-gray-100">
<img [src]="getFlagUrl('en')" alt="English" class="block h-auto w-5 flex-shrink-0 rounded-full">
<span class="ml-3 text-sm font-medium">English</span>
</a>
<a href="#" (click)="changeLanguage('es', $event)"
class="flex items-center px-4 py-2 text-gray-700 hover:bg-gray-100">
<img [src]="getFlagUrl('es')" alt="Spanish" class="block h-auto w-5 flex-shrink-0 rounded-full">
<span class="ml-3 text-sm font-medium">Español</span>
</a>
</div>
</div>
</div>

<div class="hidden lg:flex lg:flex-1 lg:justify-end items-center relative">
<span class="mr-3 text-sm font-semibold" *ngIf="userName">
Expand All @@ -67,6 +37,31 @@
<a href="#" (click)="logout()" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100">{{
'header.cerrar_sesion' | translate }}</a>
</div>

<div class="hidden lg:flex lg:ml-8">
<div class="relative">
<button (click)="toggleMenuI()"
class="flex items-center text-gray-700 hover:text-gray-800 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-800">
<img [src]="getFlagUrl(currentLanguage)" alt="Current Language"
class="block h-auto w-5 flex-shrink-0 rounded-full border-none">
<span class="ml-3 block text-sm font-medium">{{ currentLanguage.toUpperCase() }}</span>
</button>
<div *ngIf="showMenuI"
class="absolute right-0 mt-2 w-32 bg-white border border-gray-200 rounded-lg shadow-lg z-40">
<a href="#" (click)="changeLanguage('en', $event)"
class="flex items-center px-4 py-2 text-gray-700 hover:bg-gray-100">
<img [src]="getFlagUrl('en')" alt="English" class="block h-auto w-5 flex-shrink-0 rounded-full">
<span class="ml-3 text-sm font-medium">English</span>
</a>
<a href="#" (click)="changeLanguage('es', $event)"
class="flex items-center px-4 py-2 text-gray-700 hover:bg-gray-100">
<img [src]="getFlagUrl('es')" alt="Spanish" class="block h-auto w-5 flex-shrink-0 rounded-full">
<span class="ml-3 text-sm font-medium">Español</span>
</a>
</div>
</div>
</div>

</div>
</nav>
</header>
126 changes: 67 additions & 59 deletions src/app/pages/product/product.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,70 +9,78 @@
</button>
</div>

<div class="card">
<div class="mx-auto grid max-w-2xl grid-cols-1 gap-x-8 gap-y-16 sm:gap-y-20 lg:mx-0 lg:max-w-none lg:grid-cols-2">
<div class="lg:pr-8 lg:pt-4">
<div class="lg:max-w-lg">
<h2 class="text-base font-semibold leading-7 text-indigo-600">{{ 'repair' | translate }}</h2>
<p class="mt-2 text-3xl font-bold tracking-tight text-gray-900 sm:text-4xl">{{ product?.appliance_type
}}-{{ product?.brand }}</p>
<p class="mt-6 text-lg leading-8 text-gray-600">{{ product?.problem_details}}</p>
<dl class="mt-10 max-w-xl space-y-8 text-base leading-7 text-gray-600 lg:max-w-none">
<div class="relative pl-9">
<dt class="inline font-semibold text-gray-900">
<svg class="absolute left-1 top-1 h-5 w-5 text-indigo-600" viewBox="0 0 20 20" fill="currentColor"
aria-hidden="true">
<path fill-rule="evenodd"
d="M5.5 17a4.5 4.5 0 01-1.44-8.765 4.5 4.5 0 018.302-3.046 3.5 3.5 0 014.504 4.272A4 4 0 0115 17H5.5zm3.75-2.75a.75.75 0 001.5 0V9.66l1.95 2.1a.75.75 0 101.1-1.02l-3.25-3.5a.75.75 0 00-1.1 0l-3.25 3.5a.75.75 0 101.1 1.02l1.95-2.1v4.59z"
clip-rule="evenodd" />
</svg>
{{ 'service' | translate }}
</dt>
<br>
<dd class="inline">{{ product?.service_type}}</dd>
</div>
<div class="relative pl-9">
<dt class="inline font-semibold text-gray-900">
<svg class="absolute left-1 top-1 h-5 w-5 text-indigo-600" viewBox="0 0 20 20" fill="currentColor"
aria-hidden="true">
<path fill-rule="evenodd"
d="M10 1a4.5 4.5 0 00-4.5 4.5V9H5a2 2 0 00-2 2v6a2 2 0 002 2h10a2 2 0 002-2v-6a2 2 0 00-2-2h-.5V5.5A4.5 4.5 0 0010 1zm3 8V5.5a3 3 0 10-6 0V9h6z"
clip-rule="evenodd" />
</svg>
{{ 'contact' | translate }}
</dt>
<br>
<dd class="inline">{{ product?.preferred_contact_method}}</dd>
<br>
<dd class="inline">{{ product?.user?.email}}</dd>
<br>
<dd class="inline">{{ product?.user?.phone_number}}</dd>
</div>
<div class="relative pl-9">
<dt class="inline font-semibold text-gray-900">
<svg class="absolute left-1 top-1 h-5 w-5 text-indigo-600" viewBox="0 0 20 20" fill="currentColor"
aria-hidden="true">
<path
d="M4.632 3.533A2 2 0 016.577 2h6.846a2 2 0 011.945 1.533l1.976 8.234A3.489 3.489 0 0016 11.5H4c-.476 0-.93.095-1.344.267l1.976-8.234z" />
<path fill-rule="evenodd"
d="M4 13a2 2 0 100 4h12a2 2 0 100-4H4zm11.24 2a.75.75 0 01.75-.75H16a.75.75 0 01.75.75v.01a.75.75 0 01-.75.75h-.01a.75.75 0 01-.75-.75V15zm-2.25-.75a.75.75 0 00-.75.75v.01c0 .414.336.75.75.75H13a.75.75 0 00.75-.75V15a.75.75 0 00-.75-.75h-.01z"
clip-rule="evenodd" />
</svg>
{{ 'collection_address' | translate }}
</dt>
<br>
<dd class="inline">{{ product?.collection_address}}-{{ product?.application_date}}</dd>
</div>
</dl>

<div class="flex justify-center items-center p-4">
<div class="card bg-white shadow-lg rounded-lg overflow-hidden mx-auto p-6 max-w-4xl">
<div class="grid grid-cols-1 lg:grid-cols-2 gap-x-8 gap-y-16">
<div class="flex flex-col items-center lg:items-start lg:pr-8 lg:pt-4">
<div class="text-center lg:text-left lg:max-w-lg">
<h2 class="text-base font-semibold leading-7 text-indigo-600">{{ 'repair' | translate }}</h2>
<p class="mt-2 text-3xl font-bold tracking-tight text-gray-900 sm:text-4xl">{{ product?.appliance_type }}-{{
product?.brand }}</p>
<p class="mt-6 text-lg leading-8 text-gray-600">{{ product?.problem_details}}</p>
<dl class="mt-10 max-w-xl space-y-8 text-base leading-7 text-gray-600 lg:max-w-none">
<div class="relative pl-9">
<dt class="inline font-semibold text-gray-900">
<svg class="absolute left-1 top-1 h-5 w-5 text-indigo-600" viewBox="0 0 20 20" fill="currentColor"
aria-hidden="true">
<path fill-rule="evenodd"
d="M5.5 17a4.5 4.5 0 01-1.44-8.765 4.5 4.5 0 018.302-3.046 3.5 3.5 0 014.504 4.272A4 4 0 0115 17H5.5zm3.75-2.75a.75.75 0 001.5 0V9.66l1.95 2.1a.75.75 0 101.1-1.02l-3.25-3.5a.75.75 0 00-1.1 0l-3.25 3.5a.75.75 0 101.1 1.02l1.95-2.1v4.59z"
clip-rule="evenodd" />
</svg>
{{ 'service' | translate }}
</dt>
<br>
<dd class="inline">{{ product?.service_type}}</dd>
</div>
<div class="relative pl-9">
<dt class="inline font-semibold text-gray-900">
<svg class="absolute left-1 top-1 h-5 w-5 text-indigo-600" viewBox="0 0 20 20" fill="currentColor"
aria-hidden="true">
<path fill-rule="evenodd"
d="M10 1a4.5 4.5 0 00-4.5 4.5V9H5a2 2 0 00-2 2v6a2 2 0 002 2h10a2 2 0 002-2v-6a2 2 0 00-2-2h-.5V5.5A4.5 4.5 0 0010 1zm3 8V5.5a3 3 0 10-6 0V9h6z"
clip-rule="evenodd" />
</svg>
{{ 'contact' | translate }}
</dt>
<br>
<dd class="inline">{{ product?.preferred_contact_method}}</dd>
<br>
<dd class="inline">{{ product?.user?.email}}</dd>
<br>
<dd class="inline">{{ product?.user?.phone_number}}</dd>
</div>
<div class="relative pl-9">
<dt class="inline font-semibold text-gray-900">
<svg class="absolute left-1 top-1 h-5 w-5 text-indigo-600" viewBox="0 0 20 20" fill="currentColor"
aria-hidden="true">
<path
d="M4.632 3.533A2 2 0 016.577 2h6.846a2 2 0 011.945 1.533l1.976 8.234A3.489 3.489 0 0016 11.5H4c-.476 0-.93.095-1.344.267l1.976-8.234z" />
<path fill-rule="evenodd"
d="M4 13a2 2 0 100 4h12a2 2 0 100-4H4zm11.24 2a.75.75 0 01.75-.75H16a.75.75 0 01.75.75v.01a.75.75 0 01-.75.75h-.01a.75.75 0 01-.75-.75V15zm-2.25-.75a.75.75 0 00-.75.75v.01c0 .414.336.75.75.75H13a.75.75 0 00.75-.75V15a.75.75 0 00-.75-.75h-.01z"
clip-rule="evenodd" />
</svg>
{{ 'collection_address' | translate }}
</dt>
<br>
<dd class="inline">{{ product?.collection_address}}-{{ product?.application_date}}</dd>
</div>
</dl>
</div>
<div class="flex items-center justify-center lg:justify-end space-x-4 mt-6">
<button class="bg-indigo-600 text-white py-2 px-4 rounded hover:bg-indigo-700">
{{ 'header.gestion_pagos' | translate }}
</button>
</div>
</div>
<img [src]="product?.damaged_appliance_image" alt="Product screenshot"
class="w-[48rem] max-w-none rounded-xl shadow-xl ring-1 ring-gray-400/10 sm:w-[30rem] md:-ml-4 lg:-ml-0"
width="2432" height="1442">
</div>
<img [src]="product?.damaged_appliance_image" alt="Product screenshot"
class="w-[48rem] max-w-none rounded-xl shadow-xl ring-1 ring-gray-400/10 sm:w-[30rem] md:-ml-4 lg:-ml-0"
width="2432" height="1442">
</div>

</div>


<div class="bg-white mt-8 ml-10 mr-10">
<div
class="relative isolate overflow-hidden bg-white-900 px-6 pt-16 shadow-2xl sm:rounded-3xl sm:px-16 md:pt-24 lg:px-24 lg:pt-0">
Expand Down
8 changes: 4 additions & 4 deletions src/assets/i18n/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
"abrir_menu": "Open main menu",
"servicios": "Services",
"seguimiento_productos": "Product Tracking",
"gestion_pagos": "Payment Management",
"gestion_pagos": "Make Payment",
"abrir_menu_usuario": "Open user menu",
"imagen_clickeable": "Clickable image",
"perfil": "Profile",
"perfil": "Account",
"cerrar_sesion": "Sign Out"
},
"alert": {
Expand Down Expand Up @@ -112,8 +112,8 @@
}
},
"formProduct": {
"CONTACT_US_TITLE": "Contact Us",
"CONTACT_US_DESCRIPTION": "Please fill out the form below, and we will get in touch as soon as possible.",
"CONTACT_US_TITLE": "Submit Request",
"CONTACT_US_DESCRIPTION": "Complete the form below to submit your request, and we will get in touch as soon as possible.",
"APPLICANT_INFO_TITLE": "Applicant Information",
"APPLICANT_INFO_DESCRIPTION": "Please provide your personal details.",
"FIRST_NAME_LABEL": "First Name",
Expand Down
8 changes: 4 additions & 4 deletions src/assets/i18n/es.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
"abrir_menu": "Abrir menú principal",
"servicios": "Servicios",
"seguimiento_productos": "Seguimiento de Productos",
"gestion_pagos": "Gestión de Pagos",
"gestion_pagos": "Realizar Pago",
"abrir_menu_usuario": "Abrir menú de usuario",
"imagen_clickeable": "Imagen clickeable",
"perfil": "Perfil",
"perfil": "Cuenta",
"cerrar_sesion": "Cerrar sesión"
},
"alert": {
Expand Down Expand Up @@ -115,8 +115,8 @@
}
},
"formProduct": {
"CONTACT_US_TITLE": "Contáctenos",
"CONTACT_US_DESCRIPTION": "Complete el formulario a continuación y nos pondremos en contacto lo antes posible.",
"CONTACT_US_TITLE": "Ingresar solicitud ",
"CONTACT_US_DESCRIPTION": "Complete el formulario a continuación para enviar su solicitud y nos pondremos en contacto lo antes posible.",
"APPLICANT_INFO_TITLE": "Información del solicitante",
"APPLICANT_INFO_DESCRIPTION": "Por favor, proporciona tus datos personales.",
"FIRST_NAME_LABEL": "Nombre",
Expand Down

0 comments on commit ed5d7ff

Please sign in to comment.