diff --git a/src/app/detail/detail.component.html b/src/app/detail/detail.component.html
index f5aa256..d9eed73 100644
--- a/src/app/detail/detail.component.html
+++ b/src/app/detail/detail.component.html
@@ -3,6 +3,14 @@
{{details.title}}
+
+
+ from
+ on
+ {{details.date_from | date}}
+ to {{details.date_to | date}}
+
+
Tags: {{details.tags}}
diff --git a/src/app/detail/detail.component.scss b/src/app/detail/detail.component.scss
index aeeb2d8..6d7c7c9 100644
--- a/src/app/detail/detail.component.scss
+++ b/src/app/detail/detail.component.scss
@@ -13,7 +13,7 @@
border-radius: 10px;
.title {
- margin-top: 0;
+ margin: 0;
font-size: $font-34;
font-weight: bold;
text-transform: uppercase;
@@ -22,7 +22,25 @@
.text {
font-size: $font-18;
text-align: justify;
- padding-bottom: 40px;
+ padding: 40px 0;
+ }
+
+ .date-container {
+ display: inline-flex;
+ position: absolute;
+ top: 40px;
+ right: 40px;
+
+ .date {
+ display: inline-flex;
+ margin: auto;
+ font-size: $font-20;
+ }
+
+ .date-indication {
+ margin: 2px 5px auto 5px;
+ font-size: $font-12;
+ }
}
.tags,
diff --git a/src/app/detail/detail.component.ts b/src/app/detail/detail.component.ts
index 9b5cf81..1b0c36a 100644
--- a/src/app/detail/detail.component.ts
+++ b/src/app/detail/detail.component.ts
@@ -11,6 +11,8 @@ import { ApisService } from '../services/apis.service'
export class DetailComponent implements OnInit {
public details: any = {}
+ public section: string = ''
+ public id: number = 0
private history: string[] = []
constructor(
@@ -21,7 +23,9 @@ export class DetailComponent implements OnInit {
) { }
ngOnInit(): void {
- this.showDetails(this.router.url.split('/')[2], this.router.url.split('/')[3])
+ this.section = this.router.url.split('/')[2]
+ this.id = parseInt(this.router.url.split('/')[3])
+ this.showDetails(this.section, this.id)
}
showDetails(section, id): void {
@@ -41,7 +45,9 @@ export class DetailComponent implements OnInit {
this.history.pop()
if(this.history.length > 0) {
const last = this.history[this.history.length - 1]
- this.showDetails(last.split('/')[2], last.split('/')[3])
+ this.section = last.split('/')[2]
+ this.id = parseInt(last.split('/')[3])
+ this.showDetails(this.section, this.id)
this.location.back()
} else {
this.location.back()
diff --git a/src/app/portfolio/portfolio.component.html b/src/app/portfolio/portfolio.component.html
index 3f9d61a..094f09d 100644
--- a/src/app/portfolio/portfolio.component.html
+++ b/src/app/portfolio/portfolio.component.html
@@ -6,7 +6,19 @@
{{item.title}}
-
{{item.type}}
+
{{item.type}}
+
+
+
+ from
+ on
+ {{item.date_from | date}}
+
+
+ to {{item.date_to | date}}
+
+
+
{{item.tags}}
diff --git a/src/app/portfolio/portfolio.component.scss b/src/app/portfolio/portfolio.component.scss
index a0965c4..4bf8974 100644
--- a/src/app/portfolio/portfolio.component.scss
+++ b/src/app/portfolio/portfolio.component.scss
@@ -61,6 +61,32 @@
font-weight: bold;
padding-top: 10px;
}
+
+ .date-container {
+ display: inline-flex;
+ flex-wrap: wrap;
+
+ .date-row {
+ display: block;
+ width: 100%;
+
+ .date {
+ display: inline-flex;
+ margin: auto;
+ font-size: $font-20;
+ }
+
+ .date-indication {
+ margin: 2px 5px auto 5px;
+ font-size: $font-12;
+ }
+
+ &:nth-of-type(2) {
+ margin-top: -12px;
+ }
+ }
+ }
+
}
@each $angle in 0,1,2,3,4,5,6 {
diff --git a/src/app/portfolio/portfolio.component.ts b/src/app/portfolio/portfolio.component.ts
index 6bf8d0f..1902028 100644
--- a/src/app/portfolio/portfolio.component.ts
+++ b/src/app/portfolio/portfolio.component.ts
@@ -10,6 +10,7 @@ import { ApisService } from '../services/apis.service'
export class PortfolioComponent implements OnInit {
public portfolioItems: any = []
+ public section: string = ''
constructor(
private apisService: ApisService,
@@ -17,7 +18,9 @@ export class PortfolioComponent implements OnInit {
{ }
ngOnInit(): void {
- this.apisService.getPortfolio(this.router.url.split('/')[1]).toPromise().then((response) => {
+ this.section = this.router.url.split('/')[1]
+
+ this.apisService.getPortfolio(this.section).toPromise().then((response) => {
this.portfolioItems = response.items
},(error) => {
console.error('getPortfolio ERROR', error)
@@ -27,7 +30,7 @@ export class PortfolioComponent implements OnInit {
}
showDetails(id): void {
- const section = this.router.url.split('/')[1] == 'exhibitions' ? 'exhibitions' : 'works'
+ const section = this.section == 'exhibitions' ? 'exhibitions' : 'works'
this.router.navigate([`/detail/${section}/${id}`])
}
diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index 97bdc40..c575f20 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -14,6 +14,20 @@ body {
}
}
+a,
+li,
+button {
+ outline: none !important;
+ &:active,
+ &:focus {
+ outline: none !important;
+ }
+}
+
+.w-100 {
+ width: 100%;
+}
+
.particles {
position: fixed;