Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
79bdfe9
Sprint01 Complete (#1)
Rikardo816 Aug 25, 2023
89d2366
Merge branch 'main' of github.com:DandoAlas/DandoAlas-Frontend into d…
Rikardo816 Aug 27, 2023
0538afe
feat(login): new component login with routes working
Rikardo816 Aug 28, 2023
5058770
feat(login): some changes that remain to be corrected
Rikardo816 Aug 29, 2023
e778df8
feat(login): login component partialy complete still need to add changes
Rikardo816 Sep 2, 2023
ae70f00
Modificacion para crear vuelo
bruceS6226 Sep 3, 2023
314426c
Mejoras
bruceS6226 Sep 5, 2023
5ae46bf
Implementacion de botones para realizar el pago
bruceS6226 Sep 6, 2023
3a69836
feat(paypal2): nueva version de paypal, sin enviar correos
Rikardo816 Sep 6, 2023
039f6f2
Mejoras en el carrito y resumen
bruceS6226 Sep 6, 2023
8a2ec6e
Agregar pago
bruceS6226 Sep 6, 2023
8aebb17
Agregando imagnes a promociones (#4)
EstherZumba Sep 7, 2023
2fcbb9c
Agregando front del boton eliminar y actualizar vuelos
KevinMaldonado99 Sep 8, 2023
fb0e6af
Merge pull request #5 from DandoAlas/Bruce
EstherZumba Sep 8, 2023
a99c6e4
Merge branch 'develop' into RTPayPal2
EstherZumba Sep 8, 2023
65b8954
Merge pull request #6 from DandoAlas/RTPayPal2
EstherZumba Sep 8, 2023
0aa0ebf
feat(paypalbutton): add a new paypalbutton working
EstherZumba Sep 8, 2023
d3e4d5a
Merge branch 'develop' into kevinC7
EstherZumba Sep 8, 2023
84ebee7
Merge pull request #7 from DandoAlas/kevinC7
EstherZumba Sep 8, 2023
20c5b91
agregado el cambio de kevin
EstherZumba Sep 8, 2023
c910a3c
Email + Paypal (#9)
Rikardo816 Sep 17, 2023
4017c7e
seleccionar asientos (#8)
Rikardo816 Sep 17, 2023
ace9d4a
fix
Rikardo816 Sep 17, 2023
c89c668
Promociones activos
KevinMaldonado99 Sep 17, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,8 @@
}
}
}
},
"cli": {
"analytics": false
}
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"@angular/platform-browser": "^16.1.0",
"@angular/platform-browser-dynamic": "^16.1.0",
"@angular/router": "^16.1.0",
"creditcardpayments": "^1.0.3",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.13.0"
Expand Down
12 changes: 10 additions & 2 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,19 @@ import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { EscogerRutaComponent } from './components/escoger-ruta/escoger-ruta.component';
import { CrearVueloComponent } from './components/crear-vuelo/crear-vuelo.component';
import { LoginComponent } from './components/login/login.component';
import { HomeComponent } from './components/home/home.component';
import { AsientosComponent } from './components/asientos/asientos.component';
import { PromocionesComponent } from './components/promociones/promociones.component';

const routes: Routes = [
{path:'inicio', component:EscogerRutaComponent},
{path:'inicio', component:HomeComponent},
{path:'buscar-vuelo', component:EscogerRutaComponent},
{path:'guardar-vuelo', component:CrearVueloComponent},
{path:'**', component:EscogerRutaComponent}];
{path:'login', component:LoginComponent},
{path:'promociones', component:PromocionesComponent},
{path:'**', component:HomeComponent},
];

@NgModule({
imports: [RouterModule.forRoot(routes)],
Expand Down
12 changes: 0 additions & 12 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
<header>
<menu>
<a [routerLink]="['/inicio']">Inicio</a>
<div
style="width: auto; height: 100%; padding-left: 20px; padding-right: 20px; background: #F23B88; justify-content: center; align-items: center;display: flex">
<a [routerLink]="['/guardar-vuelo']" style="color: #ffffff; font-weight: 550;">Vuelos</a>
</div>
<a href="#">Promociones</a>
<a href="#">Sign out</a>
<a href="#">?</a>
</menu>
</header>
<section id="content">
<router-outlet></router-outlet>
</section>
Expand Down
15 changes: 13 additions & 2 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,32 @@ import { HttpClientModule } from '@angular/common/http';
import { FormsModule } from '@angular/forms';
import { CrearVueloComponent } from './components/crear-vuelo/crear-vuelo.component';
import { PieComponent } from './components/pie/pie.component';
import { LoginComponent } from './components/login/login.component';
import { AuthService } from './services/auth.service';
import { HomeComponent } from './components/home/home.component';
import { PromocionesComponent } from './components/promociones/promociones.component';
import { AsientosComponent } from './components/asientos/asientos.component';

@NgModule({
declarations: [
AppComponent,
EscogerRutaComponent,
CrearVueloComponent,
PieComponent
PieComponent,
LoginComponent,
HomeComponent,
PromocionesComponent,
AsientosComponent
],
imports: [
BrowserModule,
AppRoutingModule,
HttpClientModule,
FormsModule
],
providers: [],
providers: [
AuthService
],
bootstrap: [AppComponent]
})
export class AppModule { }
262 changes: 262 additions & 0 deletions src/app/components/asientos/asientos.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,262 @@
.plane {
margin: 20px auto;
max-width: 450px;
}

.cockpit {
height: 250px;
position: relative;
overflow: hidden;
text-align: center;
border-bottom: 5px solid #3a3939;

&:before {
content: "";
display: block;
position: absolute;
top: 0;
left: 0;
height: 700px;
width: 98.2%;
border-radius: 60%;
border-right: 5px solid #3a3939;
border-left: 5px solid #3a3939;
}

h1 {
width: 60%;
margin: 100px auto 35px auto;
}
}

.fuselage {
border: 5px solid #3a3939;
border-top: 0px;
}

ol {
list-style: none;
padding: 0;
margin: 0;
}

.row {
--bs-gutter-x: 0rem;
--bs-gutter-y: 0;
}

.seats {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: flex-start;
}

.seat {
display: flex;
height: 40px;
flex: 0 0 14.28571428571429%;
padding: 2px;
position: relative;

&:nth-child(3) {
margin-right: 14.28571428571429%;
}

input[type="checkbox"] {
position: absolute;
opacity: 0;
}

input[type="checkbox"]:checked {
+label {
background: #bada55;
-webkit-animation-name: rubberBand;
animation-name: rubberBand;
animation-duration: 300ms;
animation-fill-mode: both;
}
}

input[type="checkbox"]:disabled {
+label {
background: #dddddd;
text-indent: -9999px;
overflow: hidden;

&:after {
content: "X";
text-indent: 0;
position: absolute;
top: 4px;
left: 50%;
transform: translate(-50%, 0%);
}

&:hover {
box-shadow: none;
cursor: not-allowed;
}
}
}

.active {
background-color: green;
/* Estilo activado */
}

.inactive {
background-color: red;
/* Estilo desactivado */
}

label {
display: block;
position: relative;
width: 100%;
text-align: center;
font-size: 14px;
font-weight: bold;
line-height: 1.5rem;
padding: 2px 0;
border-radius: 5px;
animation-duration: 300ms;
animation-fill-mode: both;

&:before {
content: "";
position: absolute;
width: 75%;
height: 75%;
top: 1px;
left: 50%;
transform: translate(-50%, 0%);
background: rgb(255, 0, 0);
border-radius: 3px;
}

&:hover {
cursor: pointer;
box-shadow: 0 0 0px 2px #00ff48;
}
}
}
h2 {
font-family: 'Hug';
margin: 15px;
font-size: 12px;
text-align: center;
color: #fed809;
}

h5 {
font-family: 'Hug';
margin: 15px;
font-size: 13px;
text-align: center;
color: #f8770f;
}

.btn-primary {
font-family: 'Asap';
border-radius: 20px;
background-color: #fed809;
color: white;
align-items: center;
padding: 10px 20px;
cursor: pointer;
border: none;
}

.btn-danger {
font-family: 'Asap';
border-radius: 20px;
background-color: #e2097e;
color: white;
border: 3px #be8fa8;
padding: 10px 20px;
cursor: pointer;
}

.btn-success {
font-family: 'Asap';
border-radius: 20px;
background-color: white;
color: #e2097e;
border: 2px #e2097e;
padding: 10px 20px;
cursor: pointer;
}

.modal-header {
align-items: center;
}

.modal-title {
font-family: 'Hug';
margin: 15px;
font-size: 13px;
margin-left: 20px;
color: #f8770f;
text-align: center;
}

label {
margin: 2px;
display: inline-block;
font-family: 'gro';
font-size: 15px;

}

/* Estilo para etiquetas con contenido del 1A al 5F (color rosado) */
label[for^="1"],
label[for^="2"],
label[for^="3"],
label[for^="4"],
label[for^="5"] {
color: #063147;
}

/* Estilo para etiquetas con contenido del 6A al 10F (color morado) */
label[for^="6"],
label[for^="7"],
label[for^="8"],
label[for^="9"],
label[for^="10"] {
color: #203b06;
}

/* Estilo para la leyenda de colores */
.legend {
list-style-type: none;
padding: 0;
margin: 0;
text-align: center;
}

/* Estilo para cada elemento de la leyenda */
.legend li {
margin-bottom: 10px;
}

/* Estilo para los cuadros de colores */
.legend-color {
display: inline-block;
width: 20px;
height: 20px;
margin-right: 10px;
border: 1px solid #ffffff;
border-radius: 50%;
/* Borde alrededor de los cuadros de colores (opcional) */
}

/* Estilo para las imágenes de los asientos */
.plane img {
position: absolute;
max-width: 40px;
max-height: 40px;
margin-left: 15px;
margin-bottom: 15px;
z-index: -1;
}
Loading