Nada nuevo

.
arreglado bug de editar eventos
2021-03-02 18:49:54 +01:00 · 2021-02-25 13:16:46 +01:00 · 2021-02-23 19:39:36 +01:00 · 2021-02-23 19:18:46 +01:00 · 2021-02-23 16:54:27 +01:00
10 changed files with 176 additions and 66 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -358,6 +358,31 @@
        }
      }
    },
+    "@angular/animations": {
+      "version": "11.2.1",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-11.2.1.tgz",
+      "integrity": "sha512-U2gtMaiVfTNMn0FPpSDTgOgtYc45QUnQcc2Po40rCmgH7BGyJAOgmaXY9uv319Jjl+vNrX+bbXaZix73Zpjfyg==",
+      "requires": {
+        "tslib": "^2.0.0"
+      }
+    },
+    "@angular/cdk": {
+      "version": "11.2.1",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-11.2.1.tgz",
+      "integrity": "sha512-d+ERvvWqGykBm5ooWG8TmMjL6q6aOpUd13ha1sx960EfKJqNyideYUfPMp6xprTyxmUIUZ/G9AQ/pxnzrLGnsA==",
+      "requires": {
+        "parse5": "^5.0.0",
+        "tslib": "^2.0.0"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+          "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+          "optional": true
+        }
+      }
+    },
    "@angular/cli": {
      "version": "10.0.8",
      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-10.0.8.tgz",
@@ -832,6 +857,14 @@
      "integrity": "sha512-QQLYUjD0T6u2hLNYXUEUbupAGsz5egmhCAckaQojvXCe3SLL/hQsrK4odrNuspy7TvMB0H5ZNEHGlF6m/WLZ3g==",
      "dev": true
    },
+    "@angular/material": {
+      "version": "11.2.1",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-11.2.1.tgz",
+      "integrity": "sha512-unHC8W+GcZSNRNSZ4l3ABdbezf6PIUtShx5MMG6HXgieqlkEgkU0W0BAeGvO/61vl6yEebizMYD/+5yqM9lUlw==",
+      "requires": {
+        "tslib": "^2.0.0"
+      }
+    },
    "@angular/platform-browser": {
      "version": "10.0.14",
      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-10.0.14.tgz",
--- a/package.json
+++ b/package.json
@@ -13,9 +13,12 @@
  },
  "private": true,
  "dependencies": {
+    "@angular/animations": "^11.2.1",
+    "@angular/cdk": "^11.2.1",
    "@angular/common": "~10.0.0",
    "@angular/core": "~10.0.0",
    "@angular/forms": "~10.0.0",
+    "@angular/material": "^11.2.1",
    "@angular/platform-browser": "~10.0.0",
    "@angular/platform-browser-dynamic": "~10.0.0",
    "@angular/router": "~10.0.0",
@@ -75,4 +78,4 @@
      "android"
    ]
  }
-}
+}
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -11,12 +11,17 @@ import { AppComponent } from './app.component';
 import { PerfilDiscotecaPage } from './perfil-discoteca/perfil-discoteca.page';
 import { PromptEventoPage} from './prompt-evento/prompt-evento.page'
 import { GaleriamodalPageModule } from './galeriamodal/galeriamodal.module';
+import { MatMenuModule } from '@angular/material/menu';
+import { MatCardModule } from '@angular/material/card';
 import { LoginPage } from './login/login.page';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { MatIconModule } from '@angular/material/icon';
+

@NgModule({
  declarations: [AppComponent, PerfilDiscotecaPage, PromptEventoPage, LoginPage],
  entryComponents: [],
-  imports: [BrowserModule, HttpClientModule, IonicModule.forRoot(), AppRoutingModule, ReactiveFormsModule, GaleriamodalPageModule],
+  imports: [BrowserModule, HttpClientModule, IonicModule.forRoot(), AppRoutingModule, ReactiveFormsModule, GaleriamodalPageModule, MatMenuModule, BrowserAnimationsModule, MatIconModule, MatCardModule],
  providers: [
    StatusBar,
    SplashScreen,
--- a/src/app/discoteca.ts
+++ b/src/app/discoteca.ts
@@ -43,7 +43,7 @@ export class Discoteca {
        this.descripcion = desc;
    }

-    get Descripcion(): string{
+    getDescripcion(): string{
        return this.descripcion;
    }
 }
--- a/src/app/perfil-discoteca/perfil-discoteca.page.html
+++ b/src/app/perfil-discoteca/perfil-discoteca.page.html
@@ -8,40 +8,54 @@

 <ion-content [fullscreen]="true">

-
-  
-    <div class='fotoPerfil'>
+    <div class='main'>
      <ion-grid>
      <ion-row>
-        <ion-col>
+      <div class='fotoPerfil'>
          <ion-img class="fotoPerfil" width="100%" height="100%" [src]='fotoSrc' alt='barraquinha'></ion-img>
          <div class="textoPie">{{nombre}}</div>
-
-          <div class="addFoto">
-            <ion-button [disabled]='editDisabled'>
-              <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">
-            </ion-button>
-          </div>
-
-          <div>
-            <ion-button (click)="enableEdit()" label="editar" [disabled]='editEnabled'>
-              <ion-icon name="create"></ion-icon>
-            </ion-button>
-            <div id="botonesHidden1" class="botonesHidden">
-              <ion-button (click)="saveEdit()" label="guardar" [disabled]='editDisabled'>
-              <ion-icon name="save"></ion-icon>
-            </ion-button>
-            <ion-button (click)="cancelEdit()" [disabled]='editDisabled'>
-              Cancelar
-            </ion-button></div>
-          </div>
-          
-
-
-        </ion-col>
+      </div>
      </ion-row>
-    
+
+      <ion-row>
+      <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>
+    </ion-row>
+
+      <ion-row>
+        <div id="botonesHidden1" class="botonesHidden">
+          <button (click)="saveEdit()" label="guardar" [disabled]='editDisabled' id="saveButton">
+            <ion-icon name="save"></ion-icon>
+            </button>
+            <button (click)="cancelEdit()" [disabled]='editDisabled' id="cancelButton">
+              Cancelar
+            </button>
+        </div>
+      </ion-row>
+

      <ion-row>
        <ion-col>
@@ -52,10 +66,24 @@
            <div [contentEditable]='editEnabled'>{{localizacion}}</div>
          </div>
        </ion-col>
-
        <ion-col>
+          <div>
+            <mat-card>
+              <mat-card-header>
+                Descripción
+              </mat-card-header>
+              <mat-card-content>
+                {{descripcion}}
+              </mat-card-content>
+            </mat-card>
+          </div>
+        </ion-col>
+      </ion-row>
+
+      <ion-row>
          <div class="galeria">
            Galería de Fotos
+
            <input type="file" (change)="loadImageFromDevice($event)" id="file-input-galeria" accept="image/png, image/jpeg">
            <ion-slides (ionDrag)="onSlideChanged()" [options]="sliderOpts">
              <ion-slide *ngFor="let foto of galeriaFotos">
@@ -69,19 +97,10 @@
              </ion-slide>
            </ion-slides>
          </div>
-        </ion-col>
      </ion-row>
      
-      
-      <ion-row>
-          <ion-button (click)="addEvento()">
-            <ion-icon name="add-circle-outline">
-            </ion-icon>
-            Añadir evento
-          </ion-button>
-      </ion-row>
-
      <ion-row>
+        <ion-col size="12">
        <div *ngIf="eventos.length>0" class="eventos">
          <ion-list>
              <ion-item *ngFor="let evento of eventos" button (click)="mostrarEvento(evento)">
@@ -101,14 +120,13 @@
              </ion-item>
          </ion-list>
        </div>
+      </ion-col>
+      </ion-row>
+
+      <ion-row>
+      
      </ion-row>
    </ion-grid>  
    </div>

-  
-
-
-
-
-
 </ion-content>
--- a/src/app/perfil-discoteca/perfil-discoteca.page.scss
+++ b/src/app/perfil-discoteca/perfil-discoteca.page.scss
@@ -6,16 +6,20 @@
  }
    
    *{
-      padding: 5px;
+      padding: 10px;
      display: block;
-      margin: auto;
    }
    
+    .main{
+      max-width: 800px;
+      max-height: auto;
+      margin: auto;
+      text-align: justify;
+    }
+
    .fotoPerfil{
        text-align: end;
-        max-width: 800px;
-        max-height: auto;
-        margin: auto;
+
    }
    
    .textoPie{
@@ -35,6 +39,8 @@
      float: left;
      position: relative;
      margin: auto;
+      text-align: right;
+      padding-right: 50px;
        
    }
    
@@ -43,15 +49,14 @@
    }
    
    .galeria{
-      
-        display: block;
-        max-width: 300px;
-        max-height: auto;
+        text-align: center;
+        padding: 30px;
        margin: auto;
    }
    
    .botonesHidden{
        display: none;
+        padding: none;
    }
    
    .botonesVisible{
@@ -59,14 +64,21 @@
    }

    .eventos{
-      display:block;
+      text-align: justify;
+    }
+
+    .evento{
+      max-width:fit-content;
    }

    .evento:hover{
      background-color: rgb(97, 97, 97);
    }
+
    .eventoHeader{
      font-weight: bold;
+      float: left;
+
    }

    .eventoDesc{
@@ -76,3 +88,26 @@
    ion-slides {
      height: 200px;
    }
+
+    mat-card-header{
+      text-align: right;
+      font-weight: bold;
+    }
+
+
+    button{
+      background-color: transparent;
+    }
+
+    .settingsIcon{
+      font-size: large;
+      background-color: white;
+    }
+
+    .menuBotones{
+      position: relative;
+      float: left;
+      bottom: 60px;
+      left: 20px;
+      
+    }
--- a/src/app/perfil-discoteca/perfil-discoteca.page.ts
+++ b/src/app/perfil-discoteca/perfil-discoteca.page.ts
@@ -20,6 +20,7 @@ export class PerfilDiscotecaPage implements OnInit {
  nombre: string;
  telefono: number;
  localizacion: string;
+  descripcion: string;
  fotoSrc: string;
  fotoLoaded: string;
  someURL: string;
@@ -32,7 +33,6 @@ export class PerfilDiscotecaPage implements OnInit {
  sliderOpts = {
      slidesPerView: 1.5,
      centeredSlides: true,
-      spaceBetween: 20,
  };

  constructor(private tab1Service: Tab1Service, private router: Router, private modalController: ModalController) {
@@ -48,6 +48,7 @@ export class PerfilDiscotecaPage implements OnInit {
    this.getTelefono();
    this.getLocalizacion();
    this.getEventos();
+    this.getDescripcion();
    this.editDisabled="true";
    this.editEnabled="false";
    this.fotoSrc = '../assets/img/barraca.jpg';
@@ -73,6 +74,10 @@ export class PerfilDiscotecaPage implements OnInit {
    this.eventos = this.tab1Service.getEventos();
  }

+  getDescripcion(): void{
+    this.descripcion = this.tab1Service.getDescripcion();
+  }
+
  cargarImagen(){
      this.fotoSrc = this.someURL;
  }
@@ -117,10 +122,14 @@ export class PerfilDiscotecaPage implements OnInit {
    let cajaDatos = document.getElementById("cajaDatos");
    cajaDatos.style.background="white";
    cajaDatos.style.color="black";
+    cajaDatos.contentEditable = "true";
    let botones = document.getElementById("botonesHidden1");
    botones.style.display = "block";
-    botones = document.getElementById("botonesHidden2");
-    botones.style.display = "block";
+    let saveButton = document.getElementById("saveButton") as HTMLButtonElement;
+    saveButton.disabled=false;
+    let cancelButton = document.getElementById("cancelButton") as HTMLButtonElement;
+    cancelButton.disabled=false;
+

 

@@ -132,6 +141,7 @@ export class PerfilDiscotecaPage implements OnInit {
    let cajaDatos = document.getElementById("cajaDatos");
    cajaDatos.style.background="inherit";
    cajaDatos.style.color="inherit";
+    cajaDatos.contentEditable="false";
    let botones = document.getElementById("botonesHidden1");
    botones.style.display = "none";
    botones = document.getElementById("botonesHidden2");
--- a/src/app/prompt-evento/prompt-evento.page.html
+++ b/src/app/prompt-evento/prompt-evento.page.html
@@ -13,7 +13,7 @@
    <input type="text" id="nombre" formControlName = "nombre">
  </label>
  <span
-    *ngIf="nombre.errors.required && (nombre.touched||submitted)">
+    *ngIf="nombre?.errors?.required && (nombre.touched||submitted)">
    Tu evento necesita un nombre
  </span>
  </ion-item>
@@ -24,7 +24,7 @@
      <ion-datetime displayFormat="DD/MM, HH:mm"placeholder="Elegir Fecha" formControlName="fecha"></ion-datetime>
    </label>
    <span
-      *ngIf="fecha.errors.required && submitted">
+      *ngIf="fecha?.errors?.required && submitted">
      Tu evento necesita una fecha
    </span>
  </ion-item>
@@ -36,7 +36,7 @@
      <input type="number" formControlName = "precio1"><label>, </label><input type="number" formControlName = "precio2">
    </label>
    <span
-    *ngIf="precio1.errors.required && (precio1.touched||submitted)">
+    *ngIf="precio1?.errors?.required && (precio1.touched||submitted)">
    Tu evento necesita un precio (puede ser 0)
  </span>
  </ion-item>
@@ -47,7 +47,7 @@
      <textarea formControlName = "descripcion" rows="10"></textarea>
    </label>
    <span
-    *ngIf="descripcion.errors.required && (descripcion.touched||submitted)">
+    *ngIf="descripcion?.errors?.required && (descripcion.touched||submitted)">
    ¡Dale una descripción a tu evento!
  </span>
  </ion-item>
--- a/src/app/prompt-evento/prompt-evento.page.ts
+++ b/src/app/prompt-evento/prompt-evento.page.ts
@@ -12,6 +12,7 @@ import { Router } from '@angular/router';
 export class PromptEventoPage implements OnInit{

  submitted = false;
+  editarEvento = false;
  eventoForm = new FormGroup({
      nombre: new FormControl('', Validators.required),
      fecha: new FormControl('', Validators.required),
--- a/src/app/tab1/tab1.service.ts
+++ b/src/app/tab1/tab1.service.ts
@@ -32,6 +32,7 @@ export class Tab1Service implements OnInit{
    this.discoteca.setNombre('Barraca');
    this.discoteca.setTelefono(666666666);
    this.discoteca.setLocalizacion('Calle del Barquillo');
+    this.discoteca.setDescripcion('Barraca es una discoteca inaugurada en 1965 que tuvo su gran auge en los años 80, cuando se consolidó como la discoteca de mayor importancia de la movida valenciana, durante la conocida Ruta Destroy.');
    this.galeria = [];
    this.initEventos();
    this.editarEvento = false;
@@ -52,6 +53,10 @@ export class Tab1Service implements OnInit{
    return this.discoteca.getLocalizacion();
  }

+  getDescripcion(): string{
+    return this.discoteca.getDescripcion();
+  }
+
  getEventos(): Evento[]{
    return this.eventos;
  }
Author	SHA1	Message	Date
onsaliyo	3e7968ab7f	Nada nuevo	2021-03-02 18:49:54 +01:00
onsaliyo	9e0617e796	.	2021-02-25 13:16:46 +01:00
onsaliyo	07696694b3	arreglado bug de editar eventos	2021-02-23 19:39:36 +01:00
onsaliyo	638467e9c4	...	2021-02-23 19:18:46 +01:00
onsaliyo	0b84c0987e	botones incluidos en un menu desplegable (aún sin formato)	2021-02-23 16:54:27 +01:00