FrontEndDev #4

Merged
onsaliyo merged 17 commits from FrontEndDev into master 2021-05-14 15:45:24 +02:00
4 changed files with 51 additions and 40 deletions
Showing only changes of commit 3e7968ab7f - Show all commits

View File

@ -12,6 +12,7 @@ import { PerfilDiscotecaPage } from './perfil-discoteca/perfil-discoteca.page';
import { PromptEventoPage} from './prompt-evento/prompt-evento.page' import { PromptEventoPage} from './prompt-evento/prompt-evento.page'
import { GaleriamodalPageModule } from './galeriamodal/galeriamodal.module'; import { GaleriamodalPageModule } from './galeriamodal/galeriamodal.module';
import { MatMenuModule } from '@angular/material/menu'; import { MatMenuModule } from '@angular/material/menu';
import { MatCardModule } from '@angular/material/card';
import { LoginPage } from './login/login.page'; import { LoginPage } from './login/login.page';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
@ -20,7 +21,7 @@ import { MatIconModule } from '@angular/material/icon';
@NgModule({ @NgModule({
declarations: [AppComponent, PerfilDiscotecaPage, PromptEventoPage, LoginPage], declarations: [AppComponent, PerfilDiscotecaPage, PromptEventoPage, LoginPage],
entryComponents: [], entryComponents: [],
imports: [BrowserModule, HttpClientModule, IonicModule.forRoot(), AppRoutingModule, ReactiveFormsModule, GaleriamodalPageModule, MatMenuModule, BrowserAnimationsModule, MatIconModule], imports: [BrowserModule, HttpClientModule, IonicModule.forRoot(), AppRoutingModule, ReactiveFormsModule, GaleriamodalPageModule, MatMenuModule, BrowserAnimationsModule, MatIconModule, MatCardModule],
providers: [ providers: [
StatusBar, StatusBar,
SplashScreen, SplashScreen,

View File

@ -14,40 +14,43 @@
<div class='fotoPerfil'> <div class='fotoPerfil'>
<ion-img class="fotoPerfil" width="100%" height="100%" [src]='fotoSrc' alt='barraquinha'></ion-img> <ion-img class="fotoPerfil" width="100%" height="100%" [src]='fotoSrc' alt='barraquinha'></ion-img>
<div class="textoPie">{{nombre}}</div> <div class="textoPie">{{nombre}}</div>
<div class="menuBotones">
<button mat-icon-button [matMenuTriggerFor]="menu">
<ion-icon name="settings" class="settingsIcon"></ion-icon>
</button>
<mat-menu #menu="matMenu" xPositon="after" yPosition="above">
<button mat-menu-item>
<ion-icon name="image" slot="icon-only"></ion-icon>
<input type="file" (change)="loadImageFromDevice($event);cargarImagen()" id="file-input-perfil" accept="image/png, image/jpeg">
</button>
<button mat-menu-item (click)="enableEdit()" label="editar" [disabled]='editEnabled'>
<ion-icon name="create"></ion-icon>
</button>
<button mat-menu-item (click)="addEvento()">
<ion-icon name="add-circle-outline">
</ion-icon>
Añadir evento
</button>
</mat-menu>
</div>
</div> </div>
</ion-row> </ion-row>
<ion-row> <ion-row>
<div class="botonesHidden"> <div class="menuBotones">
<button (click)="saveEdit()" label="guardar" [disabled]='editDisabled' id="botonesHidden1">
<button mat-icon-button [matMenuTriggerFor]="menu">
<ion-icon name="settings" class="settingsIcon"></ion-icon>
</button>
<mat-menu #menu="matMenu" xPositon="after" yPosition="above">
<button mat-menu-item>
<ion-icon name="image" slot="icon-only"></ion-icon>
<input type="file" (change)="loadImageFromDevice($event);cargarImagen()" id="file-input-perfil" accept="image/png, image/jpeg">
</button>
<button mat-menu-item (click)="enableEdit()" label="editar" [disabled]='editEnabled'>
<ion-icon name="create"></ion-icon>
</button>
<button mat-menu-item (click)="addEvento()">
<ion-icon name="add-circle-outline">
</ion-icon>
Añadir evento
</button>
</mat-menu>
</div>
</ion-row>
<ion-row>
<div id="botonesHidden1" class="botonesHidden">
<button (click)="saveEdit()" label="guardar" [disabled]='editDisabled' id="saveButton">
<ion-icon name="save"></ion-icon> <ion-icon name="save"></ion-icon>
</button> </button>
<button (click)="cancelEdit()" [disabled]='editDisabled' id="botonesHidden2"> <button (click)="cancelEdit()" [disabled]='editDisabled' id="cancelButton">
Cancelar Cancelar
</button> </button>
</div> </div>
@ -97,6 +100,7 @@
</ion-row> </ion-row>
<ion-row> <ion-row>
<ion-col size="12">
<div *ngIf="eventos.length>0" class="eventos"> <div *ngIf="eventos.length>0" class="eventos">
<ion-list> <ion-list>
<ion-item *ngFor="let evento of eventos" button (click)="mostrarEvento(evento)"> <ion-item *ngFor="let evento of eventos" button (click)="mostrarEvento(evento)">
@ -116,6 +120,7 @@
</ion-item> </ion-item>
</ion-list> </ion-list>
</div> </div>
</ion-col>
</ion-row> </ion-row>
<ion-row> <ion-row>

View File

@ -8,7 +8,6 @@
*{ *{
padding: 10px; padding: 10px;
display: block; display: block;
margin: auto;
} }
.main{ .main{
@ -57,6 +56,7 @@
.botonesHidden{ .botonesHidden{
display: none; display: none;
padding: none;
} }
.botonesVisible{ .botonesVisible{
@ -64,14 +64,21 @@
} }
.eventos{ .eventos{
float: left; text-align: justify;
}
.evento{
max-width:fit-content;
} }
.evento:hover{ .evento:hover{
background-color: rgb(97, 97, 97); background-color: rgb(97, 97, 97);
} }
.eventoHeader{ .eventoHeader{
font-weight: bold; font-weight: bold;
float: left;
} }
.eventoDesc{ .eventoDesc{
@ -82,12 +89,6 @@
height: 200px; height: 200px;
} }
mat-menu{
position: relative;
margin: inherit;
color: pink;
}
mat-card-header{ mat-card-header{
text-align: right; text-align: right;
font-weight: bold; font-weight: bold;

View File

@ -33,7 +33,6 @@ export class PerfilDiscotecaPage implements OnInit {
sliderOpts = { sliderOpts = {
slidesPerView: 1.5, slidesPerView: 1.5,
centeredSlides: true, centeredSlides: true,
spaceBetween: 20,
}; };
constructor(private tab1Service: Tab1Service, private router: Router, private modalController: ModalController) { constructor(private tab1Service: Tab1Service, private router: Router, private modalController: ModalController) {
@ -123,10 +122,14 @@ export class PerfilDiscotecaPage implements OnInit {
let cajaDatos = document.getElementById("cajaDatos"); let cajaDatos = document.getElementById("cajaDatos");
cajaDatos.style.background="white"; cajaDatos.style.background="white";
cajaDatos.style.color="black"; cajaDatos.style.color="black";
cajaDatos.contentEditable = "true";
let botones = document.getElementById("botonesHidden1"); let botones = document.getElementById("botonesHidden1");
botones.style.display = "block"; botones.style.display = "block";
botones = document.getElementById("botonesHidden2"); let saveButton = document.getElementById("saveButton") as HTMLButtonElement;
botones.style.display = "block"; saveButton.disabled=false;
let cancelButton = document.getElementById("cancelButton") as HTMLButtonElement;
cancelButton.disabled=false;
@ -138,6 +141,7 @@ export class PerfilDiscotecaPage implements OnInit {
let cajaDatos = document.getElementById("cajaDatos"); let cajaDatos = document.getElementById("cajaDatos");
cajaDatos.style.background="inherit"; cajaDatos.style.background="inherit";
cajaDatos.style.color="inherit"; cajaDatos.style.color="inherit";
cajaDatos.contentEditable="false";
let botones = document.getElementById("botonesHidden1"); let botones = document.getElementById("botonesHidden1");
botones.style.display = "none"; botones.style.display = "none";
botones = document.getElementById("botonesHidden2"); botones = document.getElementById("botonesHidden2");