소스 검색

Adding Back button to fan pages

master
kj1352 4 년 전
부모
커밋
4329acfee6
11개의 변경된 파일116개의 추가작업 그리고 6개의 파일을 삭제
  1. +2
    -0
      src/app/booking/booking.page.html
  2. +20
    -0
      src/app/booking/booking.page.scss
  3. +7
    -1
      src/app/booking/booking.page.ts
  4. +2
    -0
      src/app/collections/collections.page.html
  5. +23
    -3
      src/app/collections/collections.page.scss
  6. +8
    -1
      src/app/collections/collections.page.ts
  7. +2
    -0
      src/app/quiz/quiz.page.html
  8. +20
    -0
      src/app/quiz/quiz.page.scss
  9. +3
    -0
      src/app/shop/shop.page.html
  10. +21
    -0
      src/app/shop/shop.page.scss
  11. +8
    -1
      src/app/shop/shop.page.ts

+ 2
- 0
src/app/booking/booking.page.html 파일 보기

@@ -1,4 +1,6 @@
<ion-content>
<button class="back-button" (click)="back()"> <ion-icon name="close-outline"></ion-icon> </button>

<div class="content-container">
<div class="heading-holder">
<h2 class="main-header"> # Booking </h2>


+ 20
- 0
src/app/booking/booking.page.scss 파일 보기

@@ -4,6 +4,26 @@
margin-bottom: 2.3rem;
}

.back-button {
position: fixed;
top: 10px;
right: 10px;
width: 40px;
height: 40px;
background: rgba(white, 0.5);
border: 0px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
z-index: 3;

ion-icon {
color: white;
font-size: 20px;
}
}

.main-header {
background: linear-gradient(90deg, lighten($brand-red, 0%), lighten($brand-red, 10%) 50%);
-webkit-background-clip: text;


+ 7
- 1
src/app/booking/booking.page.ts 파일 보기

@@ -4,6 +4,7 @@ import * as faker from 'faker';
import * as moment from 'moment';
import { Router } from '@angular/router';
import { ChatPage } from '../chat/chat.page';
import { Location } from '@angular/common';

@Component({
selector: 'app-booking',
@@ -79,9 +80,14 @@ export class BookingPage implements OnInit {

constructor(
private router: Router,
private modalController: ModalController
private modalController: ModalController,
private location: Location
) { }

back() {
this.location.back();
}

getFormattedDateTime(dateTime: Date) {
return moment(dateTime).format('DD MMM');
}


+ 2
- 0
src/app/collections/collections.page.html 파일 보기

@@ -1,5 +1,7 @@
<ion-content>

<button class="back-button" (click)="back()"> <ion-icon name="close-outline"></ion-icon> </button>

<ion-button (click)="showGrid = !showGrid"
class="grid-button">
<ion-icon *ngIf="!showGrid" name="apps-outline"></ion-icon>


+ 23
- 3
src/app/collections/collections.page.scss 파일 보기

@@ -1,7 +1,7 @@
@import '../colors';

.collections {
height: calc(100vh - 56px);
height: 100vh;
background-image: url('../../assets/collections/museum_background.png');
background-position: center;
background-size: 100% 100%;
@@ -105,7 +105,7 @@ ion-slides {
border-radius: 7px;
overflow: hidden;
padding: 15px;
top: 60vh;
top: 65vh;
box-shadow: 0px 0px 5px inset dimgray;

h5 {
@@ -126,7 +126,7 @@ ion-slides {
img {
position: absolute;
left: 40vw;
bottom: 50vh;
bottom: 42.5vh;
object-fit: contain;
object-position: bottom;

@@ -157,4 +157,24 @@ ion-slides {
opacity: 1;
transform: translateY(0vh);
}
}

.back-button {
position: fixed;
top: 15px;
right: 15px;
width: 40px;
height: 40px;
background: rgba(white, 0.5);
border: 0px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
z-index: 3;

ion-icon {
color: white;
font-size: 20px;
}
}

+ 8
- 1
src/app/collections/collections.page.ts 파일 보기

@@ -1,5 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { IonSlides } from '@ionic/angular';
import { Location } from '@angular/common';

@Component({
selector: 'app-collections',
@@ -29,7 +30,13 @@ export class CollectionsPage implements OnInit {

showGrid: boolean = false;

constructor() { }
constructor(
private location: Location
) { }

back() {
this.location.back();
}

ngOnInit() {
this.collections = [{


+ 2
- 0
src/app/quiz/quiz.page.html 파일 보기

@@ -1,6 +1,8 @@
<ion-content>
<img class="dotted-bg" src="https://www.searchpng.com/wp-content/uploads/2019/02/Polka-dot-Color-Pattern-PNG-Image.png">

<button class="back-button" (click)="back()"> <ion-icon name="close-outline"></ion-icon> </button>

<ng-container *ngIf="!showReport">
<section class="visual-timer">
<p class="time"> {{ secondsPerQuestion }} </p>


+ 20
- 0
src/app/quiz/quiz.page.scss 파일 보기

@@ -12,6 +12,26 @@
background-position: top;
}

.back-button {
position: fixed;
top: 10px;
right: 10px;
width: 40px;
height: 40px;
background: rgba(white, 0.5);
border: 0px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
z-index: 3;

ion-icon {
color: white;
font-size: 20px;
}
}

.visual-timer {
display: flex;
width: 80%;


+ 3
- 0
src/app/shop/shop.page.html 파일 보기

@@ -1,4 +1,7 @@
<ion-content>

<button class="back-button" (click)="back()"> <ion-icon name="close-outline"></ion-icon> </button>

<section class="upfold">
<h5> Just for you </h5>



+ 21
- 0
src/app/shop/shop.page.scss 파일 보기

@@ -1,5 +1,26 @@
@import '../colors';


.back-button {
position: fixed;
top: 10px;
right: 10px;
width: 40px;
height: 40px;
background: rgba(white, 0.5);
border: 0px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
z-index: 3;

ion-icon {
color: white;
font-size: 20px;
}
}

.upfold {
height: 50vh;
background-color: rgba($blue-grey, 0.1);


+ 8
- 1
src/app/shop/shop.page.ts 파일 보기

@@ -1,4 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { Location } from '@angular/common';

@Component({
selector: 'app-shop',
@@ -12,7 +13,13 @@ export class ShopPage implements OnInit {
image: string
}> = [];

constructor() { }
constructor(
private location: Location
) { }

back() {
this.location.back();
}

ngOnInit() {



불러오는 중...
취소
저장