Liness/framadate-responsive
5
0
Fork 0
forked from tykayn/funky-framadate-front
Code Pull Requests Activity

set min height for each step

Browse Source
This commit is contained in:
Tykayn 2021-10-19 12:53:19 +02:00 committed by tykayn
parent 303457afd6
commit dfb3e98159
10 changed files with 180 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/core/services/poll.service.ts
View File

@ -165,7 +165,6 @@ export class PollService implements Resolve<Poll> {
} }
public async loadPollBySlug(slug: string): Promise<void> { public async loadPollBySlug(slug: string): Promise<void> {
console.log('slug', slug);
if (slug) { if (slug) {
const poll: Poll | undefined = await this.apiService.getPollBySlug(slug); const poll: Poll | undefined = await this.apiService.getPollBySlug(slug);
console.log({ loadPollBySlugResponse: poll }); console.log({ loadPollBySlugResponse: poll });
@ -213,14 +212,11 @@ export class PollService implements Resolve<Poll> {
keyOnChoice($event: KeyboardEvent, choice_number: number): void { keyOnChoice($event: KeyboardEvent, choice_number: number): void {
$event.preventDefault(); $event.preventDefault();
console.log('this.choices.length', this.choices.length);
console.log('choice_number', choice_number);
const lastChoice = this.choices.length - 1 === choice_number; const lastChoice = this.choices.length - 1 === choice_number;
// reset field with Ctrl + D // reset field with Ctrl + D
// add a field with Ctrl + N // add a field with Ctrl + N
// go to previous choice with arrow up // go to previous choice with arrow up
// go to next choice with arrow down // go to next choice with arrow down
console.log('$event', $event);
if ($event.key == 'ArrowUp' && choice_number > 0) { if ($event.key == 'ArrowUp' && choice_number > 0) {
this.focusOnChoice(choice_number - 1); this.focusOnChoice(choice_number - 1);

15
src/app/features/administration/form/form.component.html
View File

@ -5,22 +5,9 @@
</h2> </h2>
<app-stepper [step_current]="pollService.step_current" [step_max]="pollService.step_max"></app-stepper> <app-stepper [step_current]="pollService.step_current" [step_max]="pollService.step_max"></app-stepper>
</header> </header>
<section class="step-container"> <section class="step-container min-height">
<router-outlet> <router-outlet>
<app-step-one [form]="form"></app-step-one> <app-step-one [form]="form"></app-step-one>
</router-outlet> </router-outlet>
</section> </section>
<footer>
<div class="columns">
<div class="column"></div>
<div class="column">
<!-- [disabled]="form.invalid"-->
<button class="button is-primary is-fullwidth" [routerLink]="['administration/step/2']">
suivant
</button>
</div>
</div>
</footer>
<hr />
</div> </div>

2
src/app/features/administration/form/step-five/step-five.component.html
View File

@ -1,4 +1,4 @@
<app-stepper [step_current]="5" [step_max]="step_max"></app-stepper> <app-stepper [step_current]="5" [step_max]="5"></app-stepper>
<div class="columns"> <div class="columns">
<div class="column"></div> <div class="column"></div>
<div class="column"> <div class="column">

2
src/app/features/administration/form/step-four/step-four.component.html
View File

@ -1,4 +1,4 @@
<app-stepper [step_current]="4" [step_max]="step_max"></app-stepper> <app-stepper [step_current]="4" [step_max]="5"></app-stepper>
<div class="creator-infos"> <div class="creator-infos">
<label class="" for="creatorEmail"> <label class="" for="creatorEmail">

13
src/app/features/administration/form/step-one/step-one.component.html
View File

@ -1,5 +1,6 @@
<div class="step"> <div class="step">
<form [formGroup]="pollService.form"> <form class="min-height" [formGroup]="pollService.form">
<app-stepper [step_current]="1" [step_max]="5"></app-stepper>
<section class="poll-title"> <section class="poll-title">
<h2 class="title is-2"> <h2 class="title is-2">
{{ 'creation.choose_title' | translate }} {{ 'creation.choose_title' | translate }}
@ -62,7 +63,7 @@
300 caractères maximum 300 caractères maximum
</div> </div>
</div> </div>
<div class="column"> <div class="column is-narrow">
<button <button
mat-button mat-button
*ngIf="description.value" *ngIf="description.value"
@ -79,14 +80,10 @@
slug: {{ pollService.form.value.custom_url }} slug: {{ pollService.form.value.custom_url }}
</form> </form>
<div class="columns"> <div class="columns">
<div class="column"> <div class="column"></div>
<button class="button is-secondary is-fullwidth" [routerLink]="['/administration/step/1']">
précédent
</button>
</div>
<div class="column"> <div class="column">
<!-- [disabled]="form.invalid"--> <!-- [disabled]="form.invalid"-->
<button class="button is-primary is-fullwidth" [routerLink]="['/administration/step/3']"> <button class="button is-primary is-fullwidth" [routerLink]="['/administration/step/2']">
suivant suivant
</button> </button>
</div> </div>

28
src/app/features/administration/form/step-three/step-three.component.html
View File

@ -1,7 +1,8 @@
<app-stepper [step_current]="3" [step_max]="5"></app-stepper> <div class="min-height">
<app-stepper [step_current]="3" [step_max]="5"></app-stepper>
<!-- choix spécialement pour les dates--> <!-- choix spécialement pour les dates-->
<div class="dates-list"> <div class="dates-list">
<div class="title"> <div class="title">
<span class="count-dates"> <span class="count-dates">
{{ pollService.timeList.length }} {{ pollService.timeList.length }}
@ -47,7 +48,12 @@
<label for="timeChoices_{{ id }}"> <label for="timeChoices_{{ id }}">
<i class="fa fa-clock-o" aria-hidden="true"></i> <i class="fa fa-clock-o" aria-hidden="true"></i>
</label> </label>
<input [(ngModel)]="time.literal" name="timeChoices_{{ id }}" type="text" id="timeChoices_{{ id }}" /> <input
[(ngModel)]="time.literal"
name="timeChoices_{{ id }}"
type="text"
id="timeChoices_{{ id }}"
/>
<button (click)="time.timeList.splice(id, 1)" class="btn btn-warning"> <button (click)="time.timeList.splice(id, 1)" class="btn btn-warning">
<i class="fa fa-times" aria-hidden="true"></i> <i class="fa fa-times" aria-hidden="true"></i>
</button> </button>
@ -96,18 +102,18 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<button <button
(click)="pollService.showDateInterval = !pollService.showDateInterval" (click)="pollService.showDateInterval = !pollService.showDateInterval"
[ngClass]="{ active: pollService.showDateInterval }" [ngClass]="{ active: pollService.showDateInterval }"
class="btn btn--primary" class="btn btn--primary"
id="toggle_interval_button" id="toggle_interval_button"
> >
<i class="fa fa-clock-o" aria-hidden="true"></i> <i class="fa fa-clock-o" aria-hidden="true"></i>
{{ 'dates.add_interval' | translate }} {{ 'dates.add_interval' | translate }}
</button> </button>
<section *ngIf="pollService.showDateInterval" class="date-interval form-row"> <section *ngIf="pollService.showDateInterval" class="date-interval form-row">
<h2>{{ 'dates.add_interval' | translate }}</h2> <h2>{{ 'dates.add_interval' | translate }}</h2>
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
@ -138,8 +144,8 @@
{{ pollService.intervalDays }} {{ pollService.intervalDays }}
{{ 'dates.interval_button_dates' | translate }} {{ 'dates.interval_button_dates' | translate }}
</button> </button>
</section> </section>
</div>
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
<button class="button is-secondary is-fullwidth" [routerLink]="['/administration/step/2']"> <button class="button is-secondary is-fullwidth" [routerLink]="['/administration/step/2']">

5
src/app/features/administration/form/step-three/step-three.component.ts
View File

@ -1,5 +1,6 @@
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core';
import { PollService } from '../../../../core/services/poll.service'; import { PollService } from '../../../../core/services/poll.service';
import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
@Component({ @Component({
selector: 'app-step-three', selector: 'app-step-three',
@ -15,4 +16,8 @@ export class StepThreeComponent implements OnInit {
constructor(public pollService: PollService) {} constructor(public pollService: PollService) {}
ngOnInit(): void {} ngOnInit(): void {}
drop(event: CdkDragDrop<string[]>) {
// moveItemInArray(this.pollService.choices, event.previousIndex, event.currentIndex);
}
} }

4
src/app/features/administration/form/step-two/step-two.component.html
View File

@ -1,5 +1,6 @@
<app-stepper [step_current]="2" [step_max]="5"></app-stepper>
<div class="form-field poll-kind"> <div class="form-field poll-kind">
<div class="min-height">
<app-stepper [step_current]="2" [step_max]="5"></app-stepper>
<h2 class="title is-2"> <h2 class="title is-2">
{{ 'creation.want' | translate }} {{ 'creation.want' | translate }}
</h2> </h2>
@ -25,6 +26,7 @@
</button> </button>
</div> </div>
</div> </div>
</div>
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
<button class="button is-secondary is-fullwidth" [routerLink]="['/administration/step/1']"> <button class="button is-secondary is-fullwidth" [routerLink]="['/administration/step/1']">

4
src/app/features/administration/form/step-two/step-two.component.ts
View File

@ -53,10 +53,6 @@ export class StepTwoComponent implements OnInit {
resetTimes() {} resetTimes() {}
drop(event: CdkDragDrop<string[]>) {
// moveItemInArray(this.choices, event.previousIndex, event.currentIndex);
}
addChoice() {} addChoice() {}
addTimeToDate(choice: any, id: number) {} addTimeToDate(choice: any, id: number) {}

4
src/styles/partials/global.scss
View File

@ -4,3 +4,7 @@ html {
font-size: 1rem; /* 16px */ font-size: 1rem; /* 16px */
color: $font_color; color: $font_color;
} }
.min-height {
min-height: 50vh;
}