Skip to content
This repository has been archived by the owner on Sep 6, 2023. It is now read-only.

Navody detail fix #32

Merged
merged 2 commits into from
Feb 1, 2023
Merged

Navody detail fix #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fae54ca
navody detail fix
idk1010s Jan 30, 2023
fe70511
funkcní navody - detail
idk1010s Jan 31, 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
8 changes: 0 additions & 8 deletions src/app/pages/home/home.page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,21 +71,13 @@ h2 {
}
}



@media screen and (max-width: 767px) {

/* start of medium tablet styles */
.obrazek {
max-width: 200px;
}


}

@media screen and (max-width: 479px) {
/* start of phone styles */

.obrazek {
max-width: 140px;
padding: 8px;
Expand Down
12 changes: 8 additions & 4 deletions src/app/pages/navody/vnitrek/detail/detail.page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,26 @@
<div id="container">
<div class="card">
<div class="column">
<div><strong>Použijeme tyto styly:</strong></div>
<div *ngIf="popis.zkratkyCasti != null"><strong>Použijeme tyto styly:</strong></div>
{{popis.zkratkyCasti}}
</div>
<img class="obraz" src="assets/icon/{{popis.nazevCasti}}.jpg">
</div>
<div class="line"></div>
<br>
<button (click)="time()">
{{ minutes }}:{{ seconds }}
</button>
<div class="popis" innerHTML="{{popis.popis}}">
</div>

<ion-toolbar>
<div class="footer-buttons">
<ion-button start class="footer-button" (click)="skrtnuti()" shape="round">
<ion-button start class="footer-button" shape="round">
<ion-icon size="small" name="arrow-back-outline"></ion-icon>
</ion-button>
<ion-button (click)="hotovo()">Hotovo</ion-button>
<ion-button end class="footer-button" (click)="odpreskrtnuti()" shape="round">
<ion-button>Hotovo</ion-button>
<ion-button end class="footer-button" shape="round">
<ion-icon size="small" name="arrow-forward-outline"></ion-icon>
</ion-button>
</div>
Expand Down
25 changes: 19 additions & 6 deletions src/app/pages/navody/vnitrek/detail/detail.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Router } from '@angular/router';
import { NavodyService } from 'src/app/services';
import { PopisNavodu } from 'src/app/types/navod';
import { PopisNavodu } from 'src/app/types';

@Component({
selector: 'app-detail',
Expand All @@ -11,21 +11,34 @@ import { PopisNavodu } from 'src/app/types/navod';
export class DetailPage implements OnInit {
popis: PopisNavodu;
popisy: Array<PopisNavodu>;
intervalId: any;
timer: any = 0;

constructor(private router: Router, private navodyService: NavodyService, private activatedRoute: ActivatedRoute) {
constructor(private router: Router, private navodyService: NavodyService) {
this.popis = this.router.getCurrentNavigation().extras.state.popis;
this.popisy = this.navodyService.getVsechnyPopisy();
}

ngOnInit() {
this.popis = this.router.getCurrentNavigation().extras.state.popis;
this.popisy = this.navodyService.getVsechnyPopisy();
}

skrtnuti() {
get minutes() {
return Math.floor(this.timer / 60) % 60;
}

odpreskrtnuti() {
get seconds() {
return ("00" + this.timer % 60).slice(-2);
}

hotovo() {
public time() {
if (this.intervalId) {
clearInterval(this.intervalId);
this.intervalId = 0;
}
else if (!this.intervalId) {
this.intervalId = setInterval(() => this.timer++, 1000);
}
}
}
2 changes: 1 addition & 1 deletion src/app/pages/navody/vnitrek/vnitrek.page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</div>
<div class="line"></div>
<div style="height: 20px;"></div>
<p *ngFor="let popis of popisy">
<p *ngFor="let popis of navod.popisy">
<button (click)='goDetail(popis)'>
{{popis.titulekCasti}}
</button>
Expand Down
3 changes: 1 addition & 2 deletions src/app/pages/navody/vnitrek/vnitrek.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@ import { Router } from '@angular/router';
})
export class VnitrekPage implements OnInit {
navod: Navod;
popisy: Array<PopisNavodu>;
name: string;

constructor(private router: Router, private navodyService: NavodyService, private activatedRoute: ActivatedRoute) {
}

ngOnInit() {
const name: string = this.activatedRoute.snapshot.paramMap.get('nazevNavodu');
this.navod = this.navodyService.getNavodByName(name);
this.popisy = this.navodyService.getPopisyByName(name);
}

goDetail(popis: PopisNavodu) {
Expand Down
1 change: 0 additions & 1 deletion src/app/pages/pomucky/pomucky.page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ h2 {
.video {
position: relative;
padding-bottom: 56.25%;
/* 16:9 */
height: 0;
}

Expand Down
1 change: 0 additions & 1 deletion src/app/pages/slovnik/slovnik.page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
--background: #ffffff;
border-radius: 15px;
box-shadow: 0 3px 8px rgba(0, 0, 0, .2);

}

#container {
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/vyukovy-mod/detail/detail-routing.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ const routes: Routes = [
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class DetailPageRoutingModule {}
export class DetailPageRoutingModule {}
19 changes: 13 additions & 6 deletions src/app/pages/vyukovy-mod/detail/detail.page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,18 @@
<ion-card class="karta-popisu">
<ion-card-content>
<div class="text">
<b>Krok:</b> {{krok.cislo}}<br>
<b>Styl:</b> {{krok.styl}}<br>
<b>Pomůcky:</b> {{krok.pouzijeme}}<br>
<b>Krok:</b>
{{krok.cislo}}
<br>
<div *ngIf="krok.styl != null">
<b>Styl:</b>
{{krok.styl}}
<br>
</div>
<b>Pomůcky:</b> {{krok.pouzijeme}}
<br>
<b>Popis:</b>
<p class="popisek" innerHTML="{{krok.popis}}"></p>
<p class="popisek" [innerHtml]="krok.popis"></p>
</div>
</ion-card-content>
</ion-card>
Expand All @@ -41,10 +48,10 @@
<ion-toolbar>
<div class="footer-buttons">
<ion-button start class="footer-button" (click)="goToPreviousSlide()" shape="round">
<ion-icon size="small"></ion-icon>
<ion-icon size="small" name="arrow-back-outline"></ion-icon>
</ion-button>
<ion-button end class="footer-button" (click)="goToNextSlide()" shape="round">
<ion-icon size="small"></ion-icon>
<ion-icon size="small" name="arrow-forward-outline"></ion-icon>
</ion-button>
</div>
</ion-toolbar>
1 change: 1 addition & 0 deletions src/app/pages/vyukovy-mod/detail/detail.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { SwiperComponent } from 'swiper/angular';
export class DetailPage implements OnInit {
@ViewChild('swiper') swiper: SwiperComponent;
config: SwiperOptions = {
loop: true
};

vyrobek: Vyrobek;
Expand Down
77 changes: 41 additions & 36 deletions src/app/services/navody.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import { Navod, Obtiznost, PopisNavodu } from '../types/navod';
import { Navod, Obtiznost, PopisNavodu } from '../types';

const poleNavodu = [
{
Expand All @@ -13,50 +13,50 @@ const poleNavodu = [
{
obrazek: true,
zkratkyCasti: "Mk, V, Ks, A, Po",
nazevCasti: 'hlava-dinosaura',
titulekCasti: 'Hlava',
popis: 'Mk (6)<br> V<br> ks, V<br> 2ks, V<br> 3ks, V<br> 4ks, V <br>5ks, V <br>ks (6 řad)<br> 5ks, A<br> 4ks, A<br> 3ks, A<br> 2ks, A<br> ks, A<br> A<br> Po'
nazevCasti: "hlava-dinosaura",
titulekCasti: "Hlava",
popis: "Mk (6)<br> V<br> ks, V<br> 2ks, V<br> 3ks, V<br> 4ks, V <br>5ks, V <br>ks (6 řad)<br> 5ks, A<br> 4ks, A<br> 3ks, A<br> 2ks, A<br> ks, A<br> A<br> Po"
},
{
obrazek: true,
zkratkyCasti: "Mk, V, Ks, A, Po",
nazevCasti: 'nos-dinosaura',
titulekCasti: 'Nos',
nazevCasti: "nos-dinosaura",
titulekCasti: "Nos",
popis: "Mk (6)<br> V<br> ks, V<br> 2ks, V<br> 3ks, V<br> ks (3 řady)<br> 3ks, A<br> Po"
},
{
obrazek: true,
zkratkyCasti: "Mk, V, Ks, A, Po",
nazevCasti: 'telo-dinosaura',
titulekCasti: 'Tělo',
nazevCasti: "telo-dinosaura",
titulekCasti: "Tělo",
popis: "Mk (6)<br V<br> ks, V<br> 2ks, V<br> 3ks, V<br> 4ks, V<br> 5ks, V<br> 6ks, V<br> ks (3 řady)<br> 6ks, A<br> 5ks, A<br> 4ks, A<br> ks (3 řady)<br> 3ks, A<br> ks (1 řada)<br> 2ks, A<br> ks (1 řada)<br> Po"
},
{
obrazek: true,
zkratkyCasti: "Mk, V, Ks, Po",
nazevCasti: 'predni-noha-dinosaura',
titulekCasti: 'Přední noha (2x)',
nazevCasti: "predni-noha-dinosaura",
titulekCasti: "Přední noha (2x)",
popis: "Mk (6)<br> V<br> ks (7 řad)<br> Po"
},
{
obrazek: true,
zkratkyCasti: "Mk, V, Ks, A, Po",
nazevCasti: 'zadni-noha-dinosaura',
titulekCasti: 'Zadní noha (2x)',
nazevCasti: "zadni-noha-dinosaura",
titulekCasti: "Zadní noha (2x)",
popis: "Mk (6)<br> V<br> ks, V<br> 2ks, V<br> ks (2 řady)<br> 2ks, A<br> 4A, 10ks<br> 2A, 10ks<br> ks (8 řad)<br> A<br> Po"
},
{
obrazek: true,
zkratkyCasti: "Mk, V, Ks, Po",
nazevCasti: 'ocas-dinosaura',
titulekCasti: 'Ocas',
nazevCasti: "ocas-dinosaura",
titulekCasti: "Ocas",
popis: "Mk (6)<br> V<br> 11ks, V<br> 12ks, V<br> 13ks, V<br> 14ks, V<br> 15ks, V<br> 16ks, V<br> 17ks, V<br> 18ks, V<br> 19ks, V<br> 20ks, V<br> 21ks, V<br> 22ks, V<br> 23ks, V<br> Po<br>"
},
{
obrazek: true,
zkratkyCasti: "Mk, V, Ks, Po",
nazevCasti: 'osten-dinosaura',
titulekCasti: 'Osten (6x)',
nazevCasti: "osten-dinosaura",
titulekCasti: "Osten (6x)",
popis: "Mk (6)<br> 2ks, V<br> 3ks, V<br> 4ks, V<br> 5ks, V<br> 6ks, V<br> Po"
}
]
Expand All @@ -72,36 +72,36 @@ const poleNavodu = [
{
obrazek: true,
zkratkyCasti: "Mk, V, Ks, A, Po",
nazevCasti: 'hlava-harold',
titulekCasti: 'Hlava',
popis: 'Mk (8) <br> V<br> ks, V<br> 2 ks, V<br> 3 ks, V<br> 4 ks, V<br> ks (6 řad)<br> 4 ks, A<br> 3 ks, A<br> 2 ks, A<br> ks, A<br> Po'
nazevCasti: "hlava-harold",
titulekCasti: "Hlava",
popis: "Mk (8) <br> V<br> ks, V<br> 2 ks, V<br> 3 ks, V<br> 4 ks, V<br> ks (6 řad)<br> 4 ks, A<br> 3 ks, A<br> 2 ks, A<br> ks, A<br> Po"
},
{
obrazek: true,
zkratkyCasti: "Řo, V, Po",
nazevCasti: 'chapadla-harold',
titulekCasti: 'Chapadla',
nazevCasti: "chapadla-harold",
titulekCasti: "Chapadla",
popis: "6*(25řo, otočím směr háčkování a střídám 2V, W, Po do dalšího oka opět za vnější přízi) "
},
{
obrazek: true,
zkratkyCasti: " ",
nazevCasti: 'vyplneni-harold',
titulekCasti: 'Vyplnění',
zkratkyCasti: null,
nazevCasti: "vyplneni-harold",
titulekCasti: "Vyplnění",
popis: "Nezapomeňte v tomto bodě vyplnit."
},
{
obrazek: true,
zkratkyCasti: "A, Po",
nazevCasti: 'uzavreni-harold',
titulekCasti: 'Uzavření',
nazevCasti: "uzavreni-harold",
titulekCasti: "Uzavření",
popis: "A<br>Po na zakončení, necháme si delší kus příze na zapošití."
},
{
obrazek: true,
zkratkyCasti: " ",
nazevCasti: 'doplnky-harold',
titulekCasti: 'Doplňky',
zkratkyCasti: null,
nazevCasti: "doplnky-harold",
titulekCasti: "Doplňky",
popis: "Obočí a pusinku našijeme černou přízí."
}
]
Expand All @@ -117,42 +117,42 @@ const poleNavodu = [
{
obrazek: true,
zkratkyCasti: "Mk, V, Ks, A, Po",
nazevCasti: 'hlava-zelva',
nazevCasti: "hlava-zelva",
titulekCasti: "Hlava",
popis: "Mk (8) <br> V<br> ks, V<br> 2 ks, V<br> 3 ks, V<br> 4 ks, V<br> ks (4 řad)<br> 4 ks, A<br> 3 ks, A<br> 2 ks, A<br> ks, A<br> Po"
},
{
obrazek: true,
zkratkyCasti: "Mk, V, Ks, A, Po",
nazevCasti: 'horni-cast-krunyre-zelva',
nazevCasti: "horni-cast-krunyre-zelva",
titulekCasti: "Horní část krunýře",
popis: "Mk (8) <br> V<br> ks, V<br> 2 ks, V<br> 3 ks, V<br> 4 ks, V<br> 5 ks, V<br> 6ks, V<br> ks (3 řady)<br> Po"
},
{
obrazek: true,
zkratkyCasti: "Mk, V, Ks, Po",
nazevCasti: 'spodni-cast-krunyre-zelva',
nazevCasti: "spodni-cast-krunyre-zelva",
titulekCasti: "Spodní část krunýře",
popis: "Mk (8) <br> V<br> ks, V<br> 2 ks, V<br> 3 ks, V<br> 4 ks, V<br> 5 ks, V<br> 6ks, V<br> Po"
},
{
obrazek: true,
zkratkyCasti: "Mk, V, Ks, Po",
nazevCasti: 'zadni-ploutev-zelva',
nazevCasti: "zadni-ploutev-zelva",
titulekCasti: "Zadní ploutev (2x)",
popis: "Mk (8) <br> V<br> ks, V<br> 2 ks, V<br> 3 ks, V<br> 4 ks, V<br> Po<br> Po dokončení kolečko ohneme napůl a sešijeme k sobě."
},
{
obrazek: true,
zkratkyCasti: "Mk, V, Ks, Po",
nazevCasti: 'predni-ploutev-zelva',
nazevCasti: "predni-ploutev-zelva",
titulekCasti: "Přední ploutev (2x)",
popis: "Mk (8) <br> V<br> ks, V<br> 2 ks, V<br> 3 ks, V<br> 4 ks, V<br> 5 ks, V<br> 6ks, V<br> Po<br> Po dokončení kolečko ohneme napůl a sešijeme k sobě."
},
{
obrazek: false,
zkratkyCasti: "Mk, Ks, Po",
nazevCasti: 'ocasek-zelva',
nazevCasti: "ocasek-zelva",
titulekCasti: "Ocásek",
popis: "Mk (4)<br> ks (2 řady)<br> Po"
},
Expand Down Expand Up @@ -184,7 +184,7 @@ export class NavodyService {
}

public getPopisyByName(name: string): Array<PopisNavodu> {
return this.getNavodByName(name).popisy;
return this.polePopisu;
}

public getVsechnyNavody(): Array<Navod> {
Expand All @@ -194,4 +194,9 @@ export class NavodyService {
public getVsechnyPopisy(): Array<PopisNavodu> {
return this.polePopisu;
}

public getPopisy(title: string): Array<PopisNavodu> {
let index = poleNavodu.findIndex(x => x.titulek == title);
return poleNavodu[index].popisy;
}
}
Loading