From 59fdb51857829f96128b53b2e452cef58465e2ca Mon Sep 17 00:00:00 2001 From: Dslak Date: Tue, 1 Dec 2020 20:06:42 +0100 Subject: [PATCH 01/38] add header --- src/app/app-layout/app-layout.component.html | 52 ++++++++ src/app/header/header.component.html | 17 ++- src/app/header/header.component.scss | 128 ++++++++++++++++++- src/app/header/header.component.ts | 27 +++- src/assets/images/logo.svg | 109 ++++++++++++++++ src/assets/scss/fonts.scss | 10 ++ src/assets/scss/global.scss | 8 +- src/assets/scss/main.scss | 1 + src/assets/scss/variables.scss | 17 +-- 9 files changed, 351 insertions(+), 18 deletions(-) create mode 100644 src/assets/images/logo.svg create mode 100644 src/assets/scss/fonts.scss diff --git a/src/app/app-layout/app-layout.component.html b/src/app/app-layout/app-layout.component.html index 04d51c8..4b338cb 100644 --- a/src/app/app-layout/app-layout.component.html +++ b/src/app/app-layout/app-layout.component.html @@ -1,2 +1,54 @@

app-layout works!

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index 3c43e57..44f716b 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -1,3 +1,18 @@ -
+
+
+ + +
+ +
+ +
diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss index 7281308..fd99b8d 100644 --- a/src/app/header/header.component.scss +++ b/src/app/header/header.component.scss @@ -1,9 +1,131 @@ +@import "../../assets/scss/variables"; .component-header { position: fixed; + display: flex; top: 0; left: 0; - height: 5px; - width: 100%; - background: black; + height: 100vh; + width: 100vw; + background: $yellow; + transition: height .5s; + + .logo-container { + height: 200px; + width: 200px; + max-height: 50vh; + max-width: 90vw; + position: relative; + margin: auto; + padding-top: 20px; + transition: height .6s, width .6s; + z-index: 101; + + .logo { + display: flex; + height: 100%; + width: 100%; + margin: auto; + cursor: pointer; + object-fit: contain; + } + + .circles { + &:before, + &:after { + content: ' '; + position: absolute; + top: -12%; + left: -12%; + display: block; + height: 125%; + width: 125%; + background: $white-alpha; + border-radius: 5px; + z-index: -1; + opacity: .3; + transition: background .6s; + } + + &:after { + border-radius: 20px; + animation: circle2 13s linear infinite; + opacity: .4; + } + &:before { + border-radius: 20px; + animation: circle1 10s linear infinite; + } + } + } + + &.sticky { + height: 0px; + + .logo-container { + height: 80px; + width: 80px; + + .circles { + &:before, + &:after { + background: $yellow; + } + } + + &.menu-open { + height: 120px; + width: 120px; + .circles { + &:before, + &:after { + background: $white-alpha; + } + } + } + } + } + + .menu { + position: fixed; + top: 0; + left: 0; + height: 100%; + width: 100%; + background: $yellow; + border-radius: 100px; + transform: scale(0) skew(20deg, 20deg); + transition: transform .5s, border-radius .4s; + z-index: -1; + + .nav { + display: block; + text-align: center; + padding-top: 150px; + height: 100vh; + overflow: auto; + border: 1px solid red; + } + + &.open { + border-radius: 0; + transform: scale(1) skew(0deg, 0deg); + z-index: 100; + } + } + +} + + +@keyframes circle1 { + 0% { transform: translate(-5%, 8%) rotate(10deg) scale(1) skew(20deg, 20deg); } + 75% { transform: translate(10%, -5%) rotate(20deg) scale(1.1) skew(-10deg, -20deg); } + 50% { transform: translate(5%, 0%) rotate(-16deg) scale(.6) skew(-40deg, -10deg); } + 100% { transform: translate(-5%, 8%) rotate(10deg) scale(1) skew(20deg, 20deg); } +} +@keyframes circle2 { + 0% { transform: translate(10%, 5%) rotate(-30deg) scale(1) skew(20deg, 20deg); } + 50% { transform: translate(-5%, 8%) rotate(-17deg) scale(.7) skew(-10deg, -20deg); } + 75% { transform: translate(0%, -10%) rotate(10deg) scale(1.2) skew(-10deg, -50deg); } + 100% { transform: translate(10%, 5%) rotate(-30deg) scale(1) skew(20deg, 20deg); } } diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 7ab4cf7..33cc14c 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -1,4 +1,5 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, HostListener, Inject } from '@angular/core' +import { DOCUMENT } from '@angular/common' @Component({ selector: 'app-header', @@ -7,9 +8,31 @@ import { Component, OnInit } from '@angular/core'; }) export class HeaderComponent implements OnInit { - constructor() { } + public isSticky: boolean = false + public isMenuOpen: boolean = false + + constructor(@Inject(DOCUMENT) private document: Document) { } ngOnInit(): void { } + @HostListener('window:scroll', ['$event']) + onScroll(event) { + const verticalOffset = window.pageYOffset + || document.documentElement.scrollTop + || document.body.scrollTop || 0 + + this.isSticky = this.isMenuOpen || verticalOffset > 10 + } + + toggleMenu(): void { + this.isMenuOpen = !this.isMenuOpen + if(this.isMenuOpen) { + this.isSticky = true + this.document.body.classList.add('no-scroll') + } else { + this.document.body.classList.remove('no-scroll') + } + } + } diff --git a/src/assets/images/logo.svg b/src/assets/images/logo.svg new file mode 100644 index 0000000..c1073ec --- /dev/null +++ b/src/assets/images/logo.svg @@ -0,0 +1,109 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/scss/fonts.scss b/src/assets/scss/fonts.scss new file mode 100644 index 0000000..aba175e --- /dev/null +++ b/src/assets/scss/fonts.scss @@ -0,0 +1,10 @@ +@import url('https://fonts.googleapis.com/css2?family=Abel&display=swap'); + +.font-primary { font-family: $font-primary; } +.font-secondary { font-family: $font-secondary; } +.font-bold { font-weight: bold !important; } +.font-light { font-weight: ight !important; } + +@each $size in 8, 10, 12, 13, 14, 15, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 46, 48, 50, 52, 54, 60, 72 { + .font-#{$size} {font-size: #{$size/16}rem !important;} +} diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 5b51c54..cf6408b 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -1,6 +1,12 @@ - body { padding: 0; margin: 0; + height: 100%; + font-family: $font-primary; + font-size: $font-20; + + &.no-scroll { + overflow: hidden; + } } diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss index 369a37a..a43e426 100644 --- a/src/assets/scss/main.scss +++ b/src/assets/scss/main.scss @@ -1,2 +1,3 @@ @import "./variables"; +@import "./fonts"; @import "./global"; diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index 7479928..fa4843e 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -23,23 +23,18 @@ $breadcrumb-height: 60px; // Colors $white: #fff; $black: #000; -$gray: #e8e8e8; -$gray2: #666; +$gray: #666; $light-gray: #f5f5f5; -$light-gray2: #c3c3c3; $dark-gray: #47464e; -$dark-gray2: #2c2c2c; -$gold: #f1c060; -$red: #ea2d31; -$green: #55aa2a; -$blue: #3785ff; + +$yellow: #a2dc02; $white-alpha: rgba(255, 255, 255, 0.9); -$white-alpha-light: rgba(255, 255, 255, 0.2); +$black-alpha: rgba(0, 0, 0, 0.9); // Fonts -$font-primary: 'Akzidenz'; -$font-secondary: 'Akzidenz'; +$font-primary: 'Abel'; +$font-secondary: 'Abel'; $font-icon: 'icomoon'; // Font-size variables From 6a7e506202901e550674559039c4a2a142420f74 Mon Sep 17 00:00:00 2001 From: Dslak Date: Wed, 2 Dec 2020 10:33:36 +0100 Subject: [PATCH 02/38] add styles and routing --- src/app/about/about.component.html | 1 + src/app/about/about.component.scss | 0 src/app/about/about.component.spec.ts | 25 +++++++++++++++ src/app/about/about.component.ts | 15 +++++++++ src/app/app-layout/app-layout.component.html | 2 +- src/app/app-routing.module.ts | 18 ++++++++++- src/app/app.module.ts | 16 +++++++++- .../entertainment.component.html | 1 + .../entertainment.component.scss | 0 .../entertainment.component.spec.ts | 25 +++++++++++++++ .../entertainment/entertainment.component.ts | 15 +++++++++ .../exhibitions/exhibitions.component.html | 1 + .../exhibitions/exhibitions.component.scss | 0 .../exhibitions/exhibitions.component.spec.ts | 25 +++++++++++++++ src/app/exhibitions/exhibitions.component.ts | 15 +++++++++ src/app/header/header.component.html | 11 ++++--- src/app/header/header.component.scss | 32 ++++++++++++++++--- src/app/header/header.component.ts | 9 +++++- .../installations.component.html | 1 + .../installations.component.scss | 0 .../installations.component.spec.ts | 25 +++++++++++++++ .../installations/installations.component.ts | 15 +++++++++ .../performances/performances.component.html | 1 + .../performances/performances.component.scss | 0 .../performances.component.spec.ts | 25 +++++++++++++++ .../performances/performances.component.ts | 15 +++++++++ src/app/portfolio/portfolio.component.html | 1 + src/app/portfolio/portfolio.component.scss | 0 src/app/portfolio/portfolio.component.spec.ts | 25 +++++++++++++++ src/app/portfolio/portfolio.component.ts | 15 +++++++++ src/app/workshops/workshops.component.html | 1 + src/app/workshops/workshops.component.scss | 0 src/app/workshops/workshops.component.spec.ts | 25 +++++++++++++++ src/app/workshops/workshops.component.ts | 15 +++++++++ src/assets/scss/global.scss | 1 + src/assets/scss/variables.scss | 8 ++--- 36 files changed, 368 insertions(+), 16 deletions(-) create mode 100644 src/app/about/about.component.html create mode 100644 src/app/about/about.component.scss create mode 100644 src/app/about/about.component.spec.ts create mode 100644 src/app/about/about.component.ts create mode 100644 src/app/entertainment/entertainment.component.html create mode 100644 src/app/entertainment/entertainment.component.scss create mode 100644 src/app/entertainment/entertainment.component.spec.ts create mode 100644 src/app/entertainment/entertainment.component.ts create mode 100644 src/app/exhibitions/exhibitions.component.html create mode 100644 src/app/exhibitions/exhibitions.component.scss create mode 100644 src/app/exhibitions/exhibitions.component.spec.ts create mode 100644 src/app/exhibitions/exhibitions.component.ts create mode 100644 src/app/installations/installations.component.html create mode 100644 src/app/installations/installations.component.scss create mode 100644 src/app/installations/installations.component.spec.ts create mode 100644 src/app/installations/installations.component.ts create mode 100644 src/app/performances/performances.component.html create mode 100644 src/app/performances/performances.component.scss create mode 100644 src/app/performances/performances.component.spec.ts create mode 100644 src/app/performances/performances.component.ts create mode 100644 src/app/portfolio/portfolio.component.html create mode 100644 src/app/portfolio/portfolio.component.scss create mode 100644 src/app/portfolio/portfolio.component.spec.ts create mode 100644 src/app/portfolio/portfolio.component.ts create mode 100644 src/app/workshops/workshops.component.html create mode 100644 src/app/workshops/workshops.component.scss create mode 100644 src/app/workshops/workshops.component.spec.ts create mode 100644 src/app/workshops/workshops.component.ts diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html new file mode 100644 index 0000000..6094aa9 --- /dev/null +++ b/src/app/about/about.component.html @@ -0,0 +1 @@ +

about works!

diff --git a/src/app/about/about.component.scss b/src/app/about/about.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/about/about.component.spec.ts b/src/app/about/about.component.spec.ts new file mode 100644 index 0000000..6b77344 --- /dev/null +++ b/src/app/about/about.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AboutComponent } from './about.component'; + +describe('AboutComponent', () => { + let component: AboutComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AboutComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AboutComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/about/about.component.ts b/src/app/about/about.component.ts new file mode 100644 index 0000000..9898f7a --- /dev/null +++ b/src/app/about/about.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-about', + templateUrl: './about.component.html', + styleUrls: ['./about.component.scss'] +}) +export class AboutComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/app-layout/app-layout.component.html b/src/app/app-layout/app-layout.component.html index 4b338cb..a8b3c97 100644 --- a/src/app/app-layout/app-layout.component.html +++ b/src/app/app-layout/app-layout.component.html @@ -1,5 +1,5 @@ -

app-layout works!

+


diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 9f96b1f..c438ec1 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,13 +1,29 @@ import { NgModule } from '@angular/core' import { Routes, RouterModule } from '@angular/router' import { AppLayoutComponent } from './app-layout/app-layout.component' +import { AboutComponent } from './about/about.component' +import { PortfolioComponent } from './portfolio/portfolio.component' +import { ExhibitionsComponent } from './exhibitions/exhibitions.component' +import { InstallationsComponent } from './installations/installations.component' +import { EntertainmentComponent } from './entertainment/entertainment.component' +import { PerformancesComponent } from './performances/performances.component' +import { WorkshopsComponent } from './workshops/workshops.component' const routes: Routes = [ { path: '', component: AppLayoutComponent, - children: [] + children: [ + { path: '', redirectTo: '/portfolio', pathMatch: 'full' }, + { path: 'portfolio', component: PortfolioComponent }, + { path: 'about', component: AboutComponent }, + { path: 'exhibitions', component: ExhibitionsComponent }, + { path: 'installations', component: InstallationsComponent }, + { path: 'entertainment', component: EntertainmentComponent }, + { path: 'performances', component: PerformancesComponent }, + { path: 'workshops', component: WorkshopsComponent } + ] } ] diff --git a/src/app/app.module.ts b/src/app/app.module.ts index a10ec68..37e4b7f 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -5,12 +5,26 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { HeaderComponent } from './header/header.component'; import { AppLayoutComponent } from './app-layout/app-layout.component'; +import { AboutComponent } from './about/about.component'; +import { PortfolioComponent } from './portfolio/portfolio.component'; +import { ExhibitionsComponent } from './exhibitions/exhibitions.component'; +import { InstallationsComponent } from './installations/installations.component'; +import { EntertainmentComponent } from './entertainment/entertainment.component'; +import { PerformancesComponent } from './performances/performances.component'; +import { WorkshopsComponent } from './workshops/workshops.component'; @NgModule({ declarations: [ AppComponent, HeaderComponent, - AppLayoutComponent + AppLayoutComponent, + AboutComponent, + PortfolioComponent, + ExhibitionsComponent, + InstallationsComponent, + EntertainmentComponent, + PerformancesComponent, + WorkshopsComponent ], imports: [ BrowserModule, diff --git a/src/app/entertainment/entertainment.component.html b/src/app/entertainment/entertainment.component.html new file mode 100644 index 0000000..64e075f --- /dev/null +++ b/src/app/entertainment/entertainment.component.html @@ -0,0 +1 @@ +

entertainment works!

diff --git a/src/app/entertainment/entertainment.component.scss b/src/app/entertainment/entertainment.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/entertainment/entertainment.component.spec.ts b/src/app/entertainment/entertainment.component.spec.ts new file mode 100644 index 0000000..416bfd2 --- /dev/null +++ b/src/app/entertainment/entertainment.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EntertainmentComponent } from './entertainment.component'; + +describe('EntertainmentComponent', () => { + let component: EntertainmentComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EntertainmentComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EntertainmentComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/entertainment/entertainment.component.ts b/src/app/entertainment/entertainment.component.ts new file mode 100644 index 0000000..c6b6381 --- /dev/null +++ b/src/app/entertainment/entertainment.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-entertainment', + templateUrl: './entertainment.component.html', + styleUrls: ['./entertainment.component.scss'] +}) +export class EntertainmentComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/exhibitions/exhibitions.component.html b/src/app/exhibitions/exhibitions.component.html new file mode 100644 index 0000000..85a0021 --- /dev/null +++ b/src/app/exhibitions/exhibitions.component.html @@ -0,0 +1 @@ +

exhibitions works!

diff --git a/src/app/exhibitions/exhibitions.component.scss b/src/app/exhibitions/exhibitions.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/exhibitions/exhibitions.component.spec.ts b/src/app/exhibitions/exhibitions.component.spec.ts new file mode 100644 index 0000000..c655d74 --- /dev/null +++ b/src/app/exhibitions/exhibitions.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ExhibitionsComponent } from './exhibitions.component'; + +describe('ExhibitionsComponent', () => { + let component: ExhibitionsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ExhibitionsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ExhibitionsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/exhibitions/exhibitions.component.ts b/src/app/exhibitions/exhibitions.component.ts new file mode 100644 index 0000000..c2c1747 --- /dev/null +++ b/src/app/exhibitions/exhibitions.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-exhibitions', + templateUrl: './exhibitions.component.html', + styleUrls: ['./exhibitions.component.scss'] +}) +export class ExhibitionsComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index 44f716b..dbba668 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -7,10 +7,13 @@
diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss index fd99b8d..0c448c9 100644 --- a/src/app/header/header.component.scss +++ b/src/app/header/header.component.scss @@ -101,10 +101,34 @@ .nav { display: block; text-align: center; - padding-top: 150px; - height: 100vh; - overflow: auto; - border: 1px solid red; + padding-top: 180px; + height: calc(100vh - 180px); + overflow: hidden; + overflow-y: auto; + + .items { + list-style: none; + padding: 0; + margin: 0; + + .item { + padding: 0; + margin: 10px 0; + font-weight: bold; + font-size: $font-30; + color: $black; + cursor: pointer; + transition: transform .4s; + + &:hover { + transform: scale(1.4); + } + + &.active { + text-decoration: underline; + } + } + } } &.open { diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 33cc14c..5776f44 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit, HostListener, Inject } from '@angular/core' +import { Router, NavigationEnd } from '@angular/router' import { DOCUMENT } from '@angular/common' @Component({ @@ -11,7 +12,13 @@ export class HeaderComponent implements OnInit { public isSticky: boolean = false public isMenuOpen: boolean = false - constructor(@Inject(DOCUMENT) private document: Document) { } + constructor(@Inject(DOCUMENT) private document: Document, private router: Router) { + router.events.subscribe((val) => { + this.isMenuOpen = false + this.isSticky = true + this.document.body.classList.remove('no-scroll') + }) + } ngOnInit(): void { } diff --git a/src/app/installations/installations.component.html b/src/app/installations/installations.component.html new file mode 100644 index 0000000..c142693 --- /dev/null +++ b/src/app/installations/installations.component.html @@ -0,0 +1 @@ +

installations works!

diff --git a/src/app/installations/installations.component.scss b/src/app/installations/installations.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/installations/installations.component.spec.ts b/src/app/installations/installations.component.spec.ts new file mode 100644 index 0000000..c50ae75 --- /dev/null +++ b/src/app/installations/installations.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { InstallationsComponent } from './installations.component'; + +describe('InstallationsComponent', () => { + let component: InstallationsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ InstallationsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(InstallationsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/installations/installations.component.ts b/src/app/installations/installations.component.ts new file mode 100644 index 0000000..61102ea --- /dev/null +++ b/src/app/installations/installations.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-installations', + templateUrl: './installations.component.html', + styleUrls: ['./installations.component.scss'] +}) +export class InstallationsComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/performances/performances.component.html b/src/app/performances/performances.component.html new file mode 100644 index 0000000..7b9658d --- /dev/null +++ b/src/app/performances/performances.component.html @@ -0,0 +1 @@ +

performances works!

diff --git a/src/app/performances/performances.component.scss b/src/app/performances/performances.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/performances/performances.component.spec.ts b/src/app/performances/performances.component.spec.ts new file mode 100644 index 0000000..0ee44e3 --- /dev/null +++ b/src/app/performances/performances.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PerformancesComponent } from './performances.component'; + +describe('PerformancesComponent', () => { + let component: PerformancesComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ PerformancesComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PerformancesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/performances/performances.component.ts b/src/app/performances/performances.component.ts new file mode 100644 index 0000000..97bbb04 --- /dev/null +++ b/src/app/performances/performances.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-performances', + templateUrl: './performances.component.html', + styleUrls: ['./performances.component.scss'] +}) +export class PerformancesComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/portfolio/portfolio.component.html b/src/app/portfolio/portfolio.component.html new file mode 100644 index 0000000..6944f6f --- /dev/null +++ b/src/app/portfolio/portfolio.component.html @@ -0,0 +1 @@ +

portfolio works!

diff --git a/src/app/portfolio/portfolio.component.scss b/src/app/portfolio/portfolio.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/portfolio/portfolio.component.spec.ts b/src/app/portfolio/portfolio.component.spec.ts new file mode 100644 index 0000000..d16d6bc --- /dev/null +++ b/src/app/portfolio/portfolio.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PortfolioComponent } from './portfolio.component'; + +describe('PortfolioComponent', () => { + let component: PortfolioComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ PortfolioComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PortfolioComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/portfolio/portfolio.component.ts b/src/app/portfolio/portfolio.component.ts new file mode 100644 index 0000000..f11071c --- /dev/null +++ b/src/app/portfolio/portfolio.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-portfolio', + templateUrl: './portfolio.component.html', + styleUrls: ['./portfolio.component.scss'] +}) +export class PortfolioComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/workshops/workshops.component.html b/src/app/workshops/workshops.component.html new file mode 100644 index 0000000..d0e6442 --- /dev/null +++ b/src/app/workshops/workshops.component.html @@ -0,0 +1 @@ +

workshops works!

diff --git a/src/app/workshops/workshops.component.scss b/src/app/workshops/workshops.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/workshops/workshops.component.spec.ts b/src/app/workshops/workshops.component.spec.ts new file mode 100644 index 0000000..46e2e57 --- /dev/null +++ b/src/app/workshops/workshops.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WorkshopsComponent } from './workshops.component'; + +describe('WorkshopsComponent', () => { + let component: WorkshopsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ WorkshopsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(WorkshopsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/workshops/workshops.component.ts b/src/app/workshops/workshops.component.ts new file mode 100644 index 0000000..af08b35 --- /dev/null +++ b/src/app/workshops/workshops.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-workshops', + templateUrl: './workshops.component.html', + styleUrls: ['./workshops.component.scss'] +}) +export class WorkshopsComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index cf6408b..a8e6487 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -5,6 +5,7 @@ body { height: 100%; font-family: $font-primary; font-size: $font-20; + color: $black; &.no-scroll { overflow: hidden; diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index fa4843e..3eab155 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -22,10 +22,10 @@ $breadcrumb-height: 60px; // Colors $white: #fff; -$black: #000; -$gray: #666; -$light-gray: #f5f5f5; -$dark-gray: #47464e; +$black: #111; +$gray: #ccc; +$light-gray: #eee; +$dark-gray: #666; $yellow: #a2dc02; From b3e0026cb2c9fc64fd6f5717facd6c772f34af1b Mon Sep 17 00:00:00 2001 From: Dslak Date: Wed, 2 Dec 2020 12:09:47 +0100 Subject: [PATCH 03/38] add about add bootstrap --- package.json | 1 + src/app/about/about.component.html | 41 ++++++++++- src/app/about/about.component.scss | 48 +++++++++++++ src/app/app-layout/app-layout.component.html | 52 -------------- src/app/app-routing.module.ts | 3 +- src/app/header/header.component.scss | 9 ++- src/app/header/header.component.ts | 4 +- src/app/portfolio/portfolio.component.html | 42 +++++++++++ src/assets/fonts/icomoon.eot | Bin 0 -> 5464 bytes src/assets/fonts/icomoon.svg | 24 +++++++ src/assets/fonts/icomoon.ttf | Bin 0 -> 5300 bytes src/assets/fonts/icomoon.woff | Bin 0 -> 5376 bytes src/assets/fonts/selection.json | 1 + src/assets/scss/icons.scss | 72 +++++++++++++++++++ src/assets/scss/main.scss | 4 ++ src/assets/scss/variables.scss | 2 +- 16 files changed, 244 insertions(+), 59 deletions(-) create mode 100644 src/assets/fonts/icomoon.eot create mode 100644 src/assets/fonts/icomoon.svg create mode 100644 src/assets/fonts/icomoon.ttf create mode 100644 src/assets/fonts/icomoon.woff create mode 100644 src/assets/fonts/selection.json create mode 100644 src/assets/scss/icons.scss diff --git a/package.json b/package.json index 5c909c1..48394a0 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "@angular/platform-browser": "~9.1.7", "@angular/platform-browser-dynamic": "~9.1.7", "@angular/router": "~9.1.7", + "bootstrap": "^4.5.3", "rxjs": "~6.5.4", "tslib": "^1.10.0", "zone.js": "~0.10.2" diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html index 6094aa9..cded0fb 100644 --- a/src/app/about/about.component.html +++ b/src/app/about/about.component.html @@ -1 +1,40 @@ -

about works!

+
+
+
+

DSLAK è un progetto che nasce nel 2010 da un'idea di Carmine De Rosa, sviluppatore ed amministratore di sistema in ambiente Unix/Linux, dopo aver completato gli studi in ambito elettronico approfondisce le proprie conoscenze informatiche presso l'Università di Salerno dove insieme ad un gruppo di appassionati di haking fonda HCSSLUG (Linux Users Group dell'Università di Salerno) e ed il relativo HackLab con il quale realizza numerosi progetti in ambito OpenSource, basati sulla ricerca e sulla sperimentazione in ambito tecnologico.

+ +

Nel 2006 si avvicina alle arti digitali e nel 2009, incuriosito dapprima dall'aspetto tecnico ma senza tralasciare quello scenico e concettuale, inizia ad approfondire le propie conoscenze nell'ambito della new-media art e delle installazioni interattive, studiando le soluzioni adottate da artisti affermati e sviluppando varie soluzioni alternative che utilizzano però un approccio più sostenibile, efficiente e soprattutto open.

+ +

Nel 2011 realizza le sue prime installazioni interattive e ad oggi è alla continua ricerca di soluzioni creative.

+ +

DSLAK ha ad oggi all'attivo numerosi progetti, come workshops sull'utilizzo di sensori e microcontrollori nel campo dell'interattività e delle arti digitali, installazioni interattive e performances live frutto della sperimentazione e della ricerca continua, oltre alle collaborazioni con diversi artisti nazionali ed internazionali.

+ + +
+ + +
dslakMediaArts
+ + + +
dslak
+ + + +
dslak
+ + + +
dslak_
+ + + +
+39 339 1805849
+ + + +
dslaknma@gmail.com
+ +
+
+
diff --git a/src/app/about/about.component.scss b/src/app/about/about.component.scss index e69de29..198b00f 100644 --- a/src/app/about/about.component.scss +++ b/src/app/about/about.component.scss @@ -0,0 +1,48 @@ +@import "../../assets/scss/variables"; + +.component-about { + padding-top: 160px; + font-size: $font-18; + z-index: 0; + + .about-links { + color: $black; + + .link { + display: flex; + text-decoration: none; + margin: 0; + padding: 0; + line-height: 35px; + width: 200px; + transition: transform .3s; + + + .icon { + display: inline-block; + font-size: 15px; + padding: 5px; + margin: 5px; + background: $dark-gray; + border-radius: 2px; + color: $white; + height: 25px; + width: 25px; + text-align: center; + } + + .label { + display: inline-block; + color: $dark-gray; + font-size: $font-16; + padding-left: 5px; + + } + + &:hover { + transform: scale(1.1); + } + } + } + +} diff --git a/src/app/app-layout/app-layout.component.html b/src/app/app-layout/app-layout.component.html index a8b3c97..1e15754 100644 --- a/src/app/app-layout/app-layout.component.html +++ b/src/app/app-layout/app-layout.component.html @@ -1,54 +1,2 @@ -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index c438ec1..880d671 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -15,7 +15,8 @@ const routes: Routes = [ path: '', component: AppLayoutComponent, children: [ - { path: '', redirectTo: '/portfolio', pathMatch: 'full' }, + //{ path: '', redirectTo: '/portfolio', pathMatch: 'full' }, + { path: '', component: PortfolioComponent }, { path: 'portfolio', component: PortfolioComponent }, { path: 'about', component: AboutComponent }, { path: 'exhibitions', component: ExhibitionsComponent }, diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss index 0c448c9..b4ea69a 100644 --- a/src/app/header/header.component.scss +++ b/src/app/header/header.component.scss @@ -8,7 +8,8 @@ height: 100vh; width: 100vw; background: $yellow; - transition: height .5s; + transition: height .5s, background .4s; + z-index: 100; .logo-container { height: 200px; @@ -60,7 +61,9 @@ } &.sticky { - height: 0px; + height: 100px; + background: linear-gradient(0deg, rgba(255, 255, 255, 0) 0%, + rgba(255, 255, 255, 0.8) 20%, $white 70%, $white 100%); .logo-container { height: 80px; @@ -102,7 +105,7 @@ display: block; text-align: center; padding-top: 180px; - height: calc(100vh - 180px); + height: 100vh; overflow: hidden; overflow-y: auto; diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 5776f44..6c4796e 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -11,6 +11,7 @@ export class HeaderComponent implements OnInit { public isSticky: boolean = false public isMenuOpen: boolean = false + public isFirstScroll: boolean = true constructor(@Inject(DOCUMENT) private document: Document, private router: Router) { router.events.subscribe((val) => { @@ -29,7 +30,8 @@ export class HeaderComponent implements OnInit { || document.documentElement.scrollTop || document.body.scrollTop || 0 - this.isSticky = this.isMenuOpen || verticalOffset > 10 + this.isFirstScroll = this.router.url == '/' + this.isSticky = this.isFirstScroll ? this.isMenuOpen || verticalOffset > 10 : true } toggleMenu(): void { diff --git a/src/app/portfolio/portfolio.component.html b/src/app/portfolio/portfolio.component.html index 6944f6f..616f657 100644 --- a/src/app/portfolio/portfolio.component.html +++ b/src/app/portfolio/portfolio.component.html @@ -1 +1,43 @@

portfolio works!

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/assets/fonts/icomoon.eot b/src/assets/fonts/icomoon.eot new file mode 100644 index 0000000000000000000000000000000000000000..5824380a35eafe9d20ddccab6fe2bdb7af243f82 GIT binary patch literal 5464 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 literal 0 HcmV?d00001 diff --git a/src/assets/fonts/icomoon.svg b/src/assets/fonts/icomoon.svg new file mode 100644 index 0000000..72eb491 --- /dev/null +++ b/src/assets/fonts/icomoon.svg @@ -0,0 +1,24 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/fonts/icomoon.ttf b/src/assets/fonts/icomoon.ttf new file mode 100644 index 0000000000000000000000000000000000000000..1492972c54ff9c9c8dfdaaa8b572a256ed2c6f1a GIT binary patch literal 5300 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 Yoj^~*bH+DdZ(snd5e|Oyk$kxQf6!GLjsO4v literal 0 HcmV?d00001 diff --git a/src/assets/fonts/icomoon.woff b/src/assets/fonts/icomoon.woff new file mode 100644 index 0000000000000000000000000000000000000000..6deaa896ab58dbcb0073ddbf316b033602a6f22e GIT binary patch literal 5376 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 literal 0 HcmV?d00001 diff --git a/src/assets/fonts/selection.json b/src/assets/fonts/selection.json new file mode 100644 index 0000000..2365dd4 --- /dev/null +++ b/src/assets/fonts/selection.json @@ -0,0 +1 @@ +{"IcoMoonType":"selection","icons":[{"icon":{"paths":["M950.857 859.429v-438.857c-12 13.714-25.143 26.286-39.429 37.714-81.714 62.857-164 126.857-243.429 193.143-42.857 36-96 80-155.429 80h-1.143c-59.429 0-112.571-44-155.429-80-79.429-66.286-161.714-130.286-243.429-193.143-14.286-11.429-27.429-24-39.429-37.714v438.857c0 9.714 8.571 18.286 18.286 18.286h841.143c9.714 0 18.286-8.571 18.286-18.286zM950.857 258.857c0-14.286 3.429-39.429-18.286-39.429h-841.143c-9.714 0-18.286 8.571-18.286 18.286 0 65.143 32.571 121.714 84 162.286 76.571 60 153.143 120.571 229.143 181.143 30.286 24.571 85.143 77.143 125.143 77.143h1.143c40 0 94.857-52.571 125.143-77.143 76-60.571 152.571-121.143 229.143-181.143 37.143-29.143 84-92.571 84-141.143zM1024 237.714v621.714c0 50.286-41.143 91.429-91.429 91.429h-841.143c-50.286 0-91.429-41.143-91.429-91.429v-621.714c0-50.286 41.143-91.429 91.429-91.429h841.143c50.286 0 91.429 41.143 91.429 91.429z"],"width":1024,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["envelope-o"],"defaultCode":61443,"grid":14},"attrs":[],"properties":{"name":"envelope-o","id":0,"order":47,"prevSize":28,"code":61443},"setIdx":0,"setId":0,"iconIdx":0},{"icon":{"paths":["M731.429 348.571c-21.714 9.714-44.571 16-69.143 19.429 25.143-14.857 44-38.857 53.143-66.857-23.429 13.714-49.143 24-76.571 29.143-21.714-23.429-53.143-37.714-87.429-37.714-66.286 0-120 53.714-120 120 0 9.143 0.571 18.857 2.857 27.429-100-5.143-188.571-52.571-248-125.714-10.286 17.714-16.571 38.857-16.571 60.571 0 41.714 19.429 78.286 52 100-20-0.571-38.857-6.286-57.143-14.857v1.143c0 58.286 44 106.857 98.857 117.714-10.286 2.857-18.286 4.571-29.143 4.571-7.429 0-14.857-1.143-22.286-2.286 15.429 47.429 59.429 82.286 112 83.429-41.143 32-92.571 51.429-149.143 51.429-9.714 0-19.429-0.571-28.571-1.714 53.143 33.714 116 53.714 184 53.714 220.571 0 341.714-182.857 341.714-341.714 0-5.143 0-10.286-0.571-15.429 23.429-16.571 44-37.714 60-62.286zM877.714 237.714v548.571c0 90.857-73.714 164.571-164.571 164.571h-548.571c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571c90.857 0 164.571 73.714 164.571 164.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["twitter-square"],"defaultCode":61569,"grid":14},"attrs":[],"properties":{"name":"twitter-square","id":1,"order":31,"prevSize":28,"code":61569},"setIdx":0,"setId":0,"iconIdx":1},{"icon":{"paths":["M713.143 73.143c90.857 0 164.571 73.714 164.571 164.571v548.571c0 90.857-73.714 164.571-164.571 164.571h-107.429v-340h113.714l17.143-132.571h-130.857v-84.571c0-38.286 10.286-64 65.714-64l69.714-0.571v-118.286c-12-1.714-53.714-5.143-101.714-5.143-101.143 0-170.857 61.714-170.857 174.857v97.714h-114.286v132.571h114.286v340h-304c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["facebook-square"],"defaultCode":61570,"grid":14},"attrs":[],"properties":{"name":"facebook-square","id":2,"order":30,"prevSize":28,"code":61570},"setIdx":0,"setId":0,"iconIdx":2},{"icon":{"paths":["M804.571 708.571c0 20.571-9.143 60.571-17.714 79.429-12 28-44 46.286-69.714 60.571-33.714 18.286-68 29.143-106.286 29.143-53.143 0-101.143-21.714-149.714-39.429-34.857-12.571-68.571-28-100-47.429-97.143-60-214.286-177.143-274.286-274.286-19.429-31.429-34.857-65.143-47.429-100-17.714-48.571-39.429-96.571-39.429-149.714 0-38.286 10.857-72.571 29.143-106.286 14.286-25.714 32.571-57.714 60.571-69.714 18.857-8.571 58.857-17.714 79.429-17.714 4 0 8 0 12 1.714 12 4 24.571 32 30.286 43.429 18.286 32.571 36 65.714 54.857 97.714 9.143 14.857 26.286 33.143 26.286 50.857 0 34.857-103.429 85.714-103.429 116.571 0 15.429 14.286 35.429 22.286 49.143 57.714 104 129.714 176 233.714 233.714 13.714 8 33.714 22.286 49.143 22.286 30.857 0 81.714-103.429 116.571-103.429 17.714 0 36 17.143 50.857 26.286 32 18.857 65.143 36.571 97.714 54.857 11.429 5.714 39.429 18.286 43.429 30.286 1.714 4 1.714 8 1.714 12z"],"width":804.5714285714286,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["phone"],"defaultCode":61589,"grid":14},"attrs":[],"properties":{"name":"phone","id":3,"order":43,"prevSize":28,"code":61589},"setIdx":0,"setId":0,"iconIdx":3},{"icon":{"paths":["M731.429 681.714c0-2.857 0-6.286-1.143-9.143-3.429-10.286-86.857-52.571-102.857-61.714-10.857-6.286-24-18.857-37.143-18.857-25.143 0-62.286 74.857-84.571 74.857-11.429 0-25.714-10.286-36-16-75.429-42.286-127.429-94.286-169.714-169.714-5.714-10.286-16-24.571-16-36 0-22.286 74.857-59.429 74.857-84.571 0-13.143-12.571-26.286-18.857-37.143-9.143-16-51.429-99.429-61.714-102.857-2.857-1.143-6.286-1.143-9.143-1.143-14.857 0-44 6.857-57.714 12.571-37.714 17.143-65.143 89.143-65.143 128.571 0 38.286 15.429 73.143 28.571 108.571 45.714 125.143 181.714 261.143 306.857 306.857 35.429 13.143 70.286 28.571 108.571 28.571 39.429 0 111.429-27.429 128.571-65.143 5.714-13.714 12.571-42.857 12.571-57.714zM877.714 237.714v548.571c0 90.857-73.714 164.571-164.571 164.571h-548.571c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571c90.857 0 164.571 73.714 164.571 164.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["phone-square"],"defaultCode":61592,"grid":14},"attrs":[],"properties":{"name":"phone-square","id":4,"order":35,"prevSize":28,"code":61592},"setIdx":0,"setId":0,"iconIdx":4},{"icon":{"paths":["M925.714 233.143c-25.143 36.571-56.571 69.143-92.571 95.429 0.571 8 0.571 16 0.571 24 0 244-185.714 525.143-525.143 525.143-104.571 0-201.714-30.286-283.429-82.857 14.857 1.714 29.143 2.286 44.571 2.286 86.286 0 165.714-29.143 229.143-78.857-81.143-1.714-149.143-54.857-172.571-128 11.429 1.714 22.857 2.857 34.857 2.857 16.571 0 33.143-2.286 48.571-6.286-84.571-17.143-148-91.429-148-181.143v-2.286c24.571 13.714 53.143 22.286 83.429 23.429-49.714-33.143-82.286-89.714-82.286-153.714 0-34.286 9.143-65.714 25.143-93.143 90.857 112 227.429 185.143 380.571 193.143-2.857-13.714-4.571-28-4.571-42.286 0-101.714 82.286-184.571 184.571-184.571 53.143 0 101.143 22.286 134.857 58.286 41.714-8 81.714-23.429 117.143-44.571-13.714 42.857-42.857 78.857-81.143 101.714 37.143-4 73.143-14.286 106.286-28.571z"],"width":950.8571428571428,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["twitter"],"defaultCode":61593,"grid":14},"attrs":[],"properties":{"name":"twitter","id":5,"order":45,"prevSize":28,"code":61593},"setIdx":0,"setId":0,"iconIdx":5},{"icon":{"paths":["M548 6.857v150.857h-89.714c-70.286 0-83.429 33.714-83.429 82.286v108h167.429l-22.286 169.143h-145.143v433.714h-174.857v-433.714h-145.714v-169.143h145.714v-124.571c0-144.571 88.571-223.429 217.714-223.429 61.714 0 114.857 4.571 130.286 6.857z"],"width":602.2582857142856,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["facebook","facebook-f"],"defaultCode":61594,"grid":14},"attrs":[],"properties":{"name":"facebook, facebook-f","id":6,"order":44,"prevSize":28,"code":61594},"setIdx":0,"setId":0,"iconIdx":6},{"icon":{"paths":["M1024 405.714v453.714c0 50.286-41.143 91.429-91.429 91.429h-841.143c-50.286 0-91.429-41.143-91.429-91.429v-453.714c17.143 18.857 36.571 35.429 57.714 49.714 94.857 64.571 190.857 129.143 284 197.143 48 35.429 107.429 78.857 169.714 78.857h1.143c62.286 0 121.714-43.429 169.714-78.857 93.143-67.429 189.143-132.571 284.571-197.143 20.571-14.286 40-30.857 57.143-49.714zM1024 237.714c0 64-47.429 121.714-97.714 156.571-89.143 61.714-178.857 123.429-267.429 185.714-37.143 25.714-100 78.286-146.286 78.286h-1.143c-46.286 0-109.143-52.571-146.286-78.286-88.571-62.286-178.286-124-266.857-185.714-40.571-27.429-98.286-92-98.286-144 0-56 30.286-104 91.429-104h841.143c49.714 0 91.429 41.143 91.429 91.429z"],"width":1024,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["envelope"],"defaultCode":61664,"grid":14},"attrs":[],"properties":{"name":"envelope","id":7,"order":36,"prevSize":28,"code":61664},"setIdx":0,"setId":0,"iconIdx":7},{"icon":{"paths":["M525.143 744.571v-89.714c0-18.857-5.714-28.571-16.571-28.571-6.286 0-12.571 2.857-18.857 9.143v128c6.286 6.286 12.571 9.143 18.857 9.143 10.857 0 16.571-9.143 16.571-28zM630.286 674.857h37.714v-19.429c0-19.429-6.286-29.143-18.857-29.143s-18.857 9.714-18.857 29.143v19.429zM304 522.857v40h-45.714v241.714h-42.286v-241.714h-44.571v-40h132.571zM418.857 594.857v209.714h-38.286v-22.857c-14.857 17.143-29.143 25.714-43.429 25.714-12 0-20.571-5.143-24-16-2.286-6.286-3.429-16-3.429-30.857v-165.714h37.714v154.286c0 8.571 0 13.714 0.571 14.857 0.571 5.714 3.429 8.571 8.571 8.571 8 0 15.429-5.714 24-17.714v-160h38.286zM562.857 658.286v83.429c0 18.857-1.143 33.143-4 41.714-4.571 16-14.857 24-30.286 24-13.143 0-26.286-8-38.857-23.429v20.571h-38.286v-281.714h38.286v92c12-14.857 25.143-22.857 38.857-22.857 15.429 0 25.714 8 30.286 24 2.857 8.571 4 22.286 4 42.286zM706.286 732v5.143c0 12.571-0.571 20.571-1.143 24.571-1.143 8.571-4 16-8.571 22.857-10.286 15.429-26.286 22.857-45.714 22.857-20 0-35.429-7.429-46.286-21.714-8-10.286-12-26.857-12-49.143v-73.714c0-22.286 3.429-38.286 11.429-49.143 10.857-14.286 26.286-21.714 45.714-21.714 18.857 0 34.286 7.429 44.571 21.714 8 10.857 12 26.857 12 49.143v43.429h-76v37.143c0 19.429 6.286 29.143 19.429 29.143 9.143 0 14.857-5.143 17.143-14.857 0-2.286 0.571-10.857 0.571-25.714h38.857zM448.571 261.143v89.143c0 19.429-6.286 29.143-18.286 29.143-12.571 0-18.286-9.714-18.286-29.143v-89.143c0-19.429 5.714-29.714 18.286-29.714 12 0 18.286 10.286 18.286 29.714zM753.143 668.571v0c0-49.143 0-101.143-10.857-148.571-8-33.714-35.429-58.286-68-61.714-77.714-8.571-156.571-8.571-235.429-8.571-78.286 0-157.143 0-234.857 8.571-33.143 3.429-60.571 28-68 61.714-10.857 47.429-11.429 99.429-11.429 148.571v0c0 48.571 0 100.571 11.429 148.571 7.429 33.143 34.857 57.714 67.429 61.714 78.286 8.571 157.143 8.571 235.429 8.571s157.143 0 235.429-8.571c32.571-4 60-28.571 67.429-61.714 11.429-48 11.429-100 11.429-148.571zM321.714 296.571l51.429-169.143h-42.857l-29.143 111.429-30.286-111.429h-44.571c8.571 26.286 18.286 52.571 26.857 78.857 13.714 40 22.286 69.714 26.286 90.286v114.857h42.286v-114.857zM486.857 342.857v-74.286c0-22.286-4-38.857-12-49.714-10.857-14.286-25.714-21.714-44.571-21.714-19.429 0-34.286 7.429-44.571 21.714-8 10.857-12 27.429-12 49.714v74.286c0 22.286 4 38.857 12 49.714 10.286 14.286 25.143 21.714 44.571 21.714 18.857 0 33.714-7.429 44.571-21.714 8-10.286 12-27.429 12-49.714zM590.286 411.429h38.286v-211.429h-38.286v161.714c-8.571 12-16.571 17.714-24 17.714-5.143 0-8.571-2.857-9.143-9.143-0.571-1.143-0.571-5.714-0.571-14.857v-155.429h-38.286v167.429c0 14.857 1.143 24.571 3.429 31.429 4 10.286 12.571 15.429 24.571 15.429 14.286 0 28.571-8.571 44-25.714v22.857zM877.714 237.714v548.571c0 90.857-73.714 164.571-164.571 164.571h-548.571c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571c90.857 0 164.571 73.714 164.571 164.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["youtube-square"],"defaultCode":61798,"grid":14},"attrs":[],"properties":{"name":"youtube-square","id":8,"order":37,"prevSize":28,"code":61798},"setIdx":0,"setId":0,"iconIdx":8},{"icon":{"paths":["M554.857 710.857v120.571c0 25.714-7.429 38.286-22.286 38.286-8.571 0-17.143-4-25.714-12.571v-172c8.571-8.571 17.143-12.571 25.714-12.571 14.857 0 22.286 13.143 22.286 38.286zM748 711.429v26.286h-51.429v-26.286c0-25.714 8.571-38.857 25.714-38.857s25.714 13.143 25.714 38.857zM196 586.857h61.143v-53.714h-178.286v53.714h60v325.143h57.143v-325.143zM360.571 912h50.857v-282.286h-50.857v216c-11.429 16-22.286 24-32.571 24-6.857 0-10.857-4-12-12-0.571-1.714-0.571-8-0.571-20v-208h-50.857v223.429c0 20 1.714 33.143 4.571 41.714 4.571 14.286 16.571 21.143 33.143 21.143 18.286 0 37.714-11.429 58.286-34.857v30.857zM605.714 827.429v-112.571c0-26.286-1.143-45.143-5.143-56.571-6.286-21.143-20.571-32-40.571-32-18.857 0-36.571 10.286-53.143 30.857v-124h-50.857v378.857h50.857v-27.429c17.143 21.143 34.857 31.429 53.143 31.429 20 0 34.286-10.857 40.571-31.429 4-12 5.143-30.857 5.143-57.143zM798.857 821.714v-7.429h-52c0 20.571-0.571 32-1.143 34.857-2.857 13.714-10.286 20.571-22.857 20.571-17.714 0-26.286-13.143-26.286-39.429v-49.714h102.286v-58.857c0-30.286-5.143-52-15.429-66.286-14.857-19.429-34.857-29.143-60.571-29.143-26.286 0-46.286 9.714-61.143 29.143-10.857 14.286-16 36-16 66.286v98.857c0 30.286 5.714 52.571 16.571 66.286 14.857 19.429 34.857 29.143 61.714 29.143s48-10.286 61.714-30.286c6.286-9.143 10.857-19.429 12-30.857 1.143-5.143 1.143-16.571 1.143-33.143zM451.429 300v-120c0-26.286-7.429-39.429-24.571-39.429-16.571 0-24.571 13.143-24.571 39.429v120c0 26.286 8 40 24.571 40 17.143 0 24.571-13.714 24.571-40zM862.286 729.143c0 65.714-0.571 136-14.857 200-10.857 45.143-47.429 78.286-91.429 82.857-105.143 12-211.429 12-317.143 12s-212 0-317.143-12c-44-4.571-81.143-37.714-91.429-82.857-14.857-64-14.857-134.286-14.857-200v0c0-66.286 0.571-136 14.857-200 10.857-45.143 47.429-78.286 92-83.429 104.571-11.429 210.857-11.429 316.571-11.429s212 0 317.143 11.429c44 5.143 81.143 38.286 91.429 83.429 14.857 64 14.857 133.714 14.857 200zM292 0h58.286l-69.143 228v154.857h-57.143v-154.857c-5.143-28-16.571-68-34.857-121.143-12.571-35.429-25.143-71.429-37.143-106.857h60.571l40.571 150.286zM503.429 190.286v100c0 30.286-5.143 53.143-16 67.429-14.286 19.429-34.286 29.143-60.571 29.143-25.714 0-45.714-9.714-60-29.143-10.857-14.857-16-37.143-16-67.429v-100c0-30.286 5.143-52.571 16-66.857 14.286-19.429 34.286-29.143 60-29.143 26.286 0 46.286 9.714 60.571 29.143 10.857 14.286 16 36.571 16 66.857zM694.857 97.714v285.143h-52v-31.429c-20.571 24-40 35.429-58.857 35.429-16.571 0-28.571-6.857-33.714-21.143-2.857-8.571-4.571-22.286-4.571-42.857v-225.143h52v209.714c0 12 0 18.857 0.571 20 1.143 8 5.143 12.571 12 12.571 10.286 0 21.143-8 32.571-24.571v-217.714h52z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["youtube"],"defaultCode":61799,"grid":14},"attrs":[],"properties":{"name":"youtube","id":9,"order":42,"prevSize":28,"code":61799},"setIdx":0,"setId":0,"iconIdx":9},{"icon":{"paths":["M738.286 364.571c4-82.857-26.857-124.571-92-126.857-88-2.857-147.429 46.857-178.286 149.143 16-6.857 31.429-10.857 46.857-10.857 32 0 46.286 18.286 42.286 54.857-1.714 21.714-16 53.714-42.286 95.429-26.857 42.286-46.857 62.857-60 62.857-17.143 0-32-32-46.857-96.571-4.571-19.429-13.143-67.429-25.714-145.714-11.429-72-41.714-105.714-91.429-101.143-20.571 2.286-52.571 20.571-93.714 57.143-30.857 26.857-61.143 54.857-92.571 82.286l29.714 38.286c28.571-19.429 45.143-29.714 49.714-29.714 21.714 0 42.286 34.286 61.143 102.286 17.143 62.857 34.286 125.143 51.429 188 25.714 68 56.571 102.286 93.714 102.286 59.429 0 132.571-56 218.857-168 83.429-107.429 126.857-192 129.143-253.714zM877.714 237.714v548.571c0 90.857-73.714 164.571-164.571 164.571h-548.571c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571c90.857 0 164.571 73.714 164.571 164.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["vimeo-square"],"defaultCode":61844,"grid":14},"attrs":[],"properties":{"name":"vimeo-square","id":10,"order":38,"prevSize":28,"code":61844},"setIdx":0,"setId":0,"iconIdx":10},{"icon":{"paths":["M332.571 747.429c0 30.857-28 37.714-53.143 37.714-24.571 0-61.143-4-61.143-36 0-31.429 30.857-36.571 56-36.571 24 0 58.286 4 58.286 34.857zM312 481.143c0 28.571-11.429 48.571-42.286 48.571-31.429 0-44-18.286-44-48s11.429-51.429 44-51.429c29.143 0 42.286 24 42.286 50.857zM406.857 438.286v-71.429c-24.571 9.143-50.857 16.571-77.143 16.571-18.857-10.857-40.571-16.571-62.857-16.571-65.143 0-116.571 48-116.571 114.286 0 35.429 23.429 84.571 58.857 96.571v1.714c-18.286 8-21.714 30.286-21.714 48.571 0 18.857 6.857 34.286 23.429 44v1.714c-38.857 12.571-64.571 37.143-64.571 79.429 0 72.571 69.143 93.143 129.714 93.143 73.143 0 128-26.857 128-107.429 0-57.143-52-74.286-99.429-82.857-16-2.857-43.429-14.286-43.429-34.286 0-18.857 10.286-26.857 28-29.714 58.286-11.429 95.429-56.571 95.429-116.571 0-10.286-2.286-20-5.714-29.714 9.143-2.286 18.857-4.571 28-7.429zM440.571 677.714h78.286c-1.143-15.429-1.143-31.429-1.143-46.857v-221.143c0-13.143 0-26.286 1.143-39.429h-78.286c1.714 13.143 1.714 27.429 1.714 40.571v224c0 14.286 0 28.571-1.714 42.857zM731.429 668.571v-69.143c-11.429 8-25.143 12-38.857 12-25.714 0-30.286-25.714-30.286-46.857v-128.571h29.714c10.286 0 20 1.143 30.286 1.143v-66.857h-60c0-19.429-1.143-38.857 1.714-58.286h-80c1.714 10.286 2.286 20.571 2.286 31.429v26.857h-34.286v66.857c6.857-0.571 13.714-1.714 21.143-1.714 4 0 8.571 0.571 13.143 0.571v1.143h-1.143v124c0 61.714 9.143 121.143 84.571 121.143 21.143 0 42.857-3.429 61.714-13.714zM528 265.143c0-26.857-20-52-48-52s-48.571 24.571-48.571 52c0 26.857 21.143 50.857 48.571 50.857s48-24.571 48-50.857zM877.714 237.714v548.571c0 90.857-73.714 164.571-164.571 164.571h-548.571c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571c90.857 0 164.571 73.714 164.571 164.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["git-square"],"defaultCode":61906,"grid":14},"attrs":[],"properties":{"name":"git-square","id":11,"order":39,"prevSize":28,"code":61906},"setIdx":0,"setId":0,"iconIdx":11},{"icon":{"paths":["M340 865.143c0-50.286-55.429-57.143-94.286-57.143-40.571 0-90.286 8.571-90.286 59.429 0 51.429 58.857 57.714 98.286 57.714 41.714 0 86.286-10.286 86.286-60zM306.286 433.714c0-42.857-20.571-81.714-68-81.714-52.571 0-70.857 34.857-70.857 82.857 0 47.429 20.571 77.143 70.857 77.143 49.714 0 68-32 68-78.286zM460 248.571v115.429c-14.857 5.143-29.714 9.143-45.143 12.571 5.714 15.429 9.143 31.429 9.143 48 0 96.571-59.429 170.286-154.286 188-28.571 5.714-45.143 17.714-45.143 48.571 0 87.429 230.857 28 230.857 189.143 0 130.857-88.571 173.714-207.429 173.714-97.714 0-209.143-32.571-209.143-150.286 0-68.571 41.714-108 104-128.571v-2.286c-26.286-16-38.286-41.143-38.286-72 0-29.143 6.286-65.143 36-78.286v-2.286c-57.714-19.429-95.429-98.857-95.429-156.571 0-106.857 82.857-185.143 188.571-185.143 35.429 0 70.857 9.143 101.714 26.857 42.857 0 85.143-11.429 124.571-26.857zM641.714 752h-126.857c2.286-25.714 2.286-50.857 2.286-76.571v-348c0-24.571 0.571-49.143-2.286-73.143h126.857c-2.857 23.429-2.286 47.429-2.286 70.857v350.286c0 25.714 0 50.857 2.286 76.571zM985.143 625.143v112c-30.286 16.571-65.143 22.286-99.429 22.286-122.286 0-136.571-96.571-136.571-196v-200.571h1.143v-2.286c-7.429 0-14.286-1.143-21.143-1.143-11.429 0-22.857 1.714-33.714 3.429v-108.571h54.857v-43.429c0-17.143-0.571-34.286-3.429-50.857h129.714c-4.571 31.429-3.429 62.857-3.429 94.286h97.714v108.571c-16.571 0-33.143-2.286-49.143-2.286h-48.571v208.571c0 33.714 7.429 74.857 49.714 74.857 22.286 0 44-6.286 62.286-18.857zM656 84c0 42.857-33.143 82.857-77.143 82.857-45.143 0-78.857-39.429-78.857-82.857 0-44 33.143-84 78.857-84 45.143 0 77.143 41.143 77.143 84z"],"width":1024,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["git"],"defaultCode":61907,"grid":14},"attrs":[],"properties":{"name":"git","id":12,"order":40,"prevSize":28,"code":61907},"setIdx":0,"setId":0,"iconIdx":12},{"icon":{"paths":["M976.571 296c-4 90.286-67.429 214.286-189.714 372-126.857 164-233.143 246.286-321.143 246.286-54.286 0-100-50.286-137.143-150.286-25.143-91.429-50.286-183.429-75.429-275.429-27.429-100-57.714-149.714-89.714-149.714-6.857 0-30.857 14.286-72.571 43.429l-44-56c45.714-40.571 90.857-81.714 136-121.143 60.571-53.714 106.857-80.571 137.714-83.429 72.571-6.857 116.571 42.286 133.714 148 17.714 114.286 30.857 185.714 37.714 213.143 21.143 94.857 43.429 142.286 68.571 142.286 19.429 0 48.571-30.286 88-92 38.857-61.714 59.429-108.571 62.286-140.571 5.143-53.143-15.429-79.429-62.286-79.429-22.286 0-45.143 5.143-69.143 14.857 45.714-149.714 133.143-222.286 262.286-218.286 95.429 2.857 140.571 65.143 134.857 186.286z"],"width":1029.12,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["vimeo"],"defaultCode":62077,"grid":14},"attrs":[],"properties":{"name":"vimeo","id":13,"order":46,"prevSize":28,"code":62077},"setIdx":0,"setId":0,"iconIdx":13}],"height":1024,"metadata":{"name":"icomoon"},"preferences":{"showGlyphs":true,"showQuickUse":true,"showQuickUse2":true,"showSVGs":true,"fontPref":{"prefix":"icon-","metadata":{"fontFamily":"icomoon"},"metrics":{"emSize":1024,"baseline":6.25,"whitespace":50},"embed":false},"imagePref":{"prefix":"icon-","png":true,"useClassSelector":true,"color":0,"bgColor":16777215,"classSelector":".icon"},"historySize":50,"showCodes":true,"gridSize":16}} \ No newline at end of file diff --git a/src/assets/scss/icons.scss b/src/assets/scss/icons.scss new file mode 100644 index 0000000..7483006 --- /dev/null +++ b/src/assets/scss/icons.scss @@ -0,0 +1,72 @@ +@font-face { + font-family: 'icomoon'; + src: url('../fonts/icomoon.eot?9ti7zb'); + src: url('../fonts/icomoon.eot?9ti7zb#iefix') format('embedded-opentype'), + url('../fonts/icomoon.ttf?9ti7zb') format('truetype'), + url('../fonts/icomoon.woff?9ti7zb') format('woff'), + url('../fonts/icomoon.svg?9ti7zb#icomoon') format('svg'); + font-weight: normal; + font-style: normal; + font-display: block; +} + +[class^="icon-"], [class*=" icon-"] { + /* use !important to prevent issues with browser extensions that change fonts */ + font-family: 'icomoon' !important; + speak: never; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-envelope-o:before { + content: "\f003"; +} +.icon-twitter-square:before { + content: "\f081"; +} +.icon-facebook-square:before { + content: "\f082"; +} +.icon-phone:before { + content: "\f095"; +} +.icon-phone-square:before { + content: "\f098"; +} +.icon-twitter:before { + content: "\f099"; +} +.icon-facebook:before { + content: "\f09a"; +} +.icon-facebook-f:before { + content: "\f09a"; +} +.icon-envelope:before { + content: "\f0e0"; +} +.icon-youtube-square:before { + content: "\f166"; +} +.icon-youtube:before { + content: "\f167"; +} +.icon-vimeo-square:before { + content: "\f194"; +} +.icon-git-square:before { + content: "\f1d2"; +} +.icon-git:before { + content: "\f1d3"; +} +.icon-vimeo:before { + content: "\f27d"; +} diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss index a43e426..faf70d3 100644 --- a/src/assets/scss/main.scss +++ b/src/assets/scss/main.scss @@ -1,3 +1,7 @@ @import "./variables"; @import "./fonts"; +@import "./icons"; @import "./global"; + + +@import "node_modules/bootstrap/scss/bootstrap-grid"; diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index 3eab155..d4114e6 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -25,7 +25,7 @@ $white: #fff; $black: #111; $gray: #ccc; $light-gray: #eee; -$dark-gray: #666; +$dark-gray: #333; $yellow: #a2dc02; From b211b61a4988ca01d18bc103d89f25f3753011e1 Mon Sep 17 00:00:00 2001 From: Dslak Date: Wed, 2 Dec 2020 13:46:40 +0100 Subject: [PATCH 04/38] add particles --- package.json | 1 + src/app/about/about.component.html | 2 +- src/app/about/about.component.scss | 82 ++++++++++-------- src/app/app-layout/app-layout.component.html | 2 + src/app/app-layout/app-layout.component.ts | 87 +++++++++++++++++++- src/app/app.module.ts | 4 +- src/app/header/header.component.scss | 11 ++- src/app/header/header.component.ts | 3 +- src/assets/scss/global.scss | 12 +++ src/assets/scss/variables.scss | 7 +- 10 files changed, 165 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index 48394a0..05dfa36 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "@angular/platform-browser-dynamic": "~9.1.7", "@angular/router": "~9.1.7", "bootstrap": "^4.5.3", + "ng-particles": "^2.1.11", "rxjs": "~6.5.4", "tslib": "^1.10.0", "zone.js": "~0.10.2" diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html index cded0fb..16f8f6c 100644 --- a/src/app/about/about.component.html +++ b/src/app/about/about.component.html @@ -1,6 +1,6 @@
-
+

DSLAK è un progetto che nasce nel 2010 da un'idea di Carmine De Rosa, sviluppatore ed amministratore di sistema in ambiente Unix/Linux, dopo aver completato gli studi in ambito elettronico approfondisce le proprie conoscenze informatiche presso l'Università di Salerno dove insieme ad un gruppo di appassionati di haking fonda HCSSLUG (Linux Users Group dell'Università di Salerno) e ed il relativo HackLab con il quale realizza numerosi progetti in ambito OpenSource, basati sulla ricerca e sulla sperimentazione in ambito tecnologico.

Nel 2006 si avvicina alle arti digitali e nel 2009, incuriosito dapprima dall'aspetto tecnico ma senza tralasciare quello scenico e concettuale, inizia ad approfondire le propie conoscenze nell'ambito della new-media art e delle installazioni interattive, studiando le soluzioni adottate da artisti affermati e sviluppando varie soluzioni alternative che utilizzano però un approccio più sostenibile, efficiente e soprattutto open.

diff --git a/src/app/about/about.component.scss b/src/app/about/about.component.scss index 198b00f..de85f7e 100644 --- a/src/app/about/about.component.scss +++ b/src/app/about/about.component.scss @@ -1,48 +1,64 @@ @import "../../assets/scss/variables"; .component-about { - padding-top: 160px; - font-size: $font-18; z-index: 0; - .about-links { + .content { + margin: 150px auto 80px auto; + padding: 40px 50px; + font-size: $font-18; + text-align: justify; + background: $white-alpha; color: $black; + box-shadow: 0px 0px 25px $white-alpha; + border-radius: 10px; - .link { - display: flex; - text-decoration: none; - margin: 0; - padding: 0; - line-height: 35px; - width: 200px; - transition: transform .3s; - - - .icon { - display: inline-block; - font-size: 15px; - padding: 5px; - margin: 5px; - background: $dark-gray; - border-radius: 2px; - color: $white; - height: 25px; - width: 25px; - text-align: center; - } + .about-links { + color: $black; - .label { - display: inline-block; - color: $dark-gray; - font-size: $font-16; - padding-left: 5px; + .link { + display: flex; + text-decoration: none; + margin: 0; + padding: 0; + line-height: 35px; + width: 200px; + transition: transform .3s; - } - &:hover { - transform: scale(1.1); + .icon { + display: inline-block; + font-size: 15px; + padding: 5px; + margin: 5px; + background: $dark-gray; + border-radius: 2px; + color: $white; + height: 25px; + width: 25px; + text-align: center; + } + + .label { + display: inline-block; + color: $dark-gray; + font-size: $font-16; + padding-left: 5px; + + } + + &:hover { + transform: scale(1.1); + } } } } +} +@media (min-width: map-get($grid-breakpoints, 'md')) { + .component-about { + .content { + transform: rotate(2deg) skew(0deg, -6deg); + } + } } diff --git a/src/app/app-layout/app-layout.component.html b/src/app/app-layout/app-layout.component.html index 1e15754..d132564 100644 --- a/src/app/app-layout/app-layout.component.html +++ b/src/app/app-layout/app-layout.component.html @@ -1,2 +1,4 @@ + + diff --git a/src/app/app-layout/app-layout.component.ts b/src/app/app-layout/app-layout.component.ts index ec8cf2b..8fea4ac 100644 --- a/src/app/app-layout/app-layout.component.ts +++ b/src/app/app-layout/app-layout.component.ts @@ -1,4 +1,5 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core' +import type { Container } from 'tsparticles' @Component({ selector: 'app-app-layout', @@ -7,9 +8,93 @@ import { Component, OnInit } from '@angular/core'; }) export class AppLayoutComponent implements OnInit { + id="tsparticles" + particlesOptions = { + background: { + color: { + value: "transparent" + } + }, + fpsLimit: 60, + interactivity: { + detectsOn: "canvas", + events: { + onClick: { + enable: true, + mode: "push" + }, + onHover: { + enable: true, + mode: "repulse" + }, + resize: true + }, + modes: { + bubble: { + distance: 200, + duration: 2, + opacity: 0.8, + size: 40 + }, + push: { + quantity: 6 + }, + repulse: { + distance: 100, + duration: 0.4 + } + } + }, + particles: { + color: { + value: "#fff" + }, + links: { + color: "#fff", + distance: 150, + enable: true, + opacity: 0.7, + width: 1 + }, + collisions: { + enable: true + }, + move: { + direction: "none", + enable: true, + outMode: "bounce", + random: false, + speed: 2, + straight: false + }, + number: { + density: { + enable: true, + value_area: 600 + }, + value: 90 + }, + opacity: { + value: 0.5 + }, + shape: { + type: "circle" + }, + size: { + random: true, + value: 5 + } + }, + detectRetina: true + } + constructor() { } ngOnInit(): void { } + + particlesLoaded(container: Container): void { + console.log('particlesLoaded', container) + } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 37e4b7f..b84bd67 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,5 +1,6 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; +import { NgParticlesModule } from "ng-particles"; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; @@ -28,7 +29,8 @@ import { WorkshopsComponent } from './workshops/workshops.component'; ], imports: [ BrowserModule, - AppRoutingModule + AppRoutingModule, + NgParticlesModule ], providers: [], bootstrap: [AppComponent] diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss index b4ea69a..72629da 100644 --- a/src/app/header/header.component.scss +++ b/src/app/header/header.component.scss @@ -7,7 +7,7 @@ left: 0; height: 100vh; width: 100vw; - background: $yellow; + background: transparent; transition: height .5s, background .4s; z-index: 100; @@ -61,9 +61,8 @@ } &.sticky { - height: 100px; - background: linear-gradient(0deg, rgba(255, 255, 255, 0) 0%, - rgba(255, 255, 255, 0.8) 20%, $white 70%, $white 100%); + height: 0; + background: transparent; .logo-container { height: 80px; @@ -72,7 +71,7 @@ .circles { &:before, &:after { - background: $yellow; + //background: $yellow; } } @@ -95,7 +94,7 @@ left: 0; height: 100%; width: 100%; - background: $yellow; + background: $yellow-alpha; border-radius: 100px; transform: scale(0) skew(20deg, 20deg); transition: transform .5s, border-radius .4s; diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 6c4796e..e4c7522 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -16,12 +16,13 @@ export class HeaderComponent implements OnInit { constructor(@Inject(DOCUMENT) private document: Document, private router: Router) { router.events.subscribe((val) => { this.isMenuOpen = false - this.isSticky = true + //this.isSticky = true this.document.body.classList.remove('no-scroll') }) } ngOnInit(): void { + this.isSticky = this.router.url != '/' } @HostListener('window:scroll', ['$event']) diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index a8e6487..e028bef 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -11,3 +11,15 @@ body { overflow: hidden; } } + + +.particles { + position: fixed; + top: 0; + left: 0; + height: 100vh; + width: 100vw; + background: radial-gradient(circle, $white 0%, $white 80%, rgba(160, 220,0,0.1) 90%, rgba(160, 220,0,0.2) 100%); + background: $yellow; + z-index: -1; +} diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index d4114e6..a6189e7 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -22,15 +22,16 @@ $breadcrumb-height: 60px; // Colors $white: #fff; -$black: #111; +$black: #000; $gray: #ccc; $light-gray: #eee; $dark-gray: #333; $yellow: #a2dc02; -$white-alpha: rgba(255, 255, 255, 0.9); -$black-alpha: rgba(0, 0, 0, 0.9); +$white-alpha: rgba(255, 255, 255, 0.8); +$black-alpha: rgba(0, 0, 0, 0.8); +$yellow-alpha: rgba(160, 220, 0, 0.8); // Fonts $font-primary: 'Abel'; From ec2f5957e8f1ee3b88490bb0cf182248abbe8115 Mon Sep 17 00:00:00 2001 From: Dslak Date: Wed, 2 Dec 2020 13:56:29 +0100 Subject: [PATCH 05/38] enable/disable particles --- src/app/app-layout/app-layout.component.html | 2 +- src/app/app-layout/app-layout.component.ts | 6 ++++-- src/assets/scss/global.scss | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app/app-layout/app-layout.component.html b/src/app/app-layout/app-layout.component.html index d132564..10a7dc1 100644 --- a/src/app/app-layout/app-layout.component.html +++ b/src/app/app-layout/app-layout.component.html @@ -1,4 +1,4 @@ - + diff --git a/src/app/app-layout/app-layout.component.ts b/src/app/app-layout/app-layout.component.ts index 8fea4ac..d041db1 100644 --- a/src/app/app-layout/app-layout.component.ts +++ b/src/app/app-layout/app-layout.component.ts @@ -8,8 +8,10 @@ import type { Container } from 'tsparticles' }) export class AppLayoutComponent implements OnInit { - id="tsparticles" - particlesOptions = { + public particlesEnabled: boolean = false + public id: string = 'tsparticles' + + public particlesOptions: any = { background: { color: { value: "transparent" diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index e028bef..581badd 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -6,6 +6,7 @@ body { font-family: $font-primary; font-size: $font-20; color: $black; + background: $yellow; &.no-scroll { overflow: hidden; @@ -19,7 +20,6 @@ body { left: 0; height: 100vh; width: 100vw; - background: radial-gradient(circle, $white 0%, $white 80%, rgba(160, 220,0,0.1) 90%, rgba(160, 220,0,0.2) 100%); - background: $yellow; + background: radial-gradient(circle, transparent 0%, transparent 85%, rgba(255,255,255,0.2) 95%, rgba(255,255,255,0.3) 100%); z-index: -1; } From aea1dc71dbe85b2bbce4df8c3806354dc35600a3 Mon Sep 17 00:00:00 2001 From: Dslak Date: Wed, 2 Dec 2020 14:55:20 +0100 Subject: [PATCH 06/38] portfolio setup and add apis service --- src/app/app.module.ts | 4 +- src/app/portfolio/portfolio.component.html | 52 ++++------------------ src/app/portfolio/portfolio.component.scss | 7 +++ src/app/portfolio/portfolio.component.ts | 15 ++++++- src/app/services/apis.service.spec.ts | 16 +++++++ src/app/services/apis.service.ts | 26 +++++++++++ src/app/services/base-service.ts | 16 +++++++ src/app/services/parse-xml.ts | 13 ++++++ src/environments/environment.prod.ts | 6 ++- src/environments/environment.ts | 17 ++----- 10 files changed, 110 insertions(+), 62 deletions(-) create mode 100644 src/app/services/apis.service.spec.ts create mode 100644 src/app/services/apis.service.ts create mode 100644 src/app/services/base-service.ts create mode 100644 src/app/services/parse-xml.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index b84bd67..9ac77c7 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,5 +1,6 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; +import { HttpClientModule } from '@angular/common/http'; import { NgParticlesModule } from "ng-particles"; import { AppRoutingModule } from './app-routing.module'; @@ -30,7 +31,8 @@ import { WorkshopsComponent } from './workshops/workshops.component'; imports: [ BrowserModule, AppRoutingModule, - NgParticlesModule + NgParticlesModule, + HttpClientModule ], providers: [], bootstrap: [AppComponent] diff --git a/src/app/portfolio/portfolio.component.html b/src/app/portfolio/portfolio.component.html index 616f657..24db7e7 100644 --- a/src/app/portfolio/portfolio.component.html +++ b/src/app/portfolio/portfolio.component.html @@ -1,43 +1,9 @@ -

portfolio works!

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{portfolioItems.title}} +
+
+
+
diff --git a/src/app/portfolio/portfolio.component.scss b/src/app/portfolio/portfolio.component.scss index e69de29..5ae1eae 100644 --- a/src/app/portfolio/portfolio.component.scss +++ b/src/app/portfolio/portfolio.component.scss @@ -0,0 +1,7 @@ +@import "../../assets/scss/variables"; + +.component-portfolio { + .box { + + } +} diff --git a/src/app/portfolio/portfolio.component.ts b/src/app/portfolio/portfolio.component.ts index f11071c..95cbf2b 100644 --- a/src/app/portfolio/portfolio.component.ts +++ b/src/app/portfolio/portfolio.component.ts @@ -1,4 +1,5 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core' +import { ApisService } from '../services/apis.service' @Component({ selector: 'app-portfolio', @@ -7,9 +8,19 @@ import { Component, OnInit } from '@angular/core'; }) export class PortfolioComponent implements OnInit { - constructor() { } + public portfolioItems: any = [] + + constructor(private apisService: ApisService) { } ngOnInit(): void { + this.apisService.getPortfolio('portfolio').toPromise().then((response) => { + this.portfolioItems = response.items + },(error) => { + console.error('getPortfolio ERROR', error) + }).catch((e) => { + console.error('getPortfolio CATCH', e) + }) } + } diff --git a/src/app/services/apis.service.spec.ts b/src/app/services/apis.service.spec.ts new file mode 100644 index 0000000..a952a5c --- /dev/null +++ b/src/app/services/apis.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ApisService } from './apis.service'; + +describe('ApisService', () => { + let service: ApisService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ApisService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/apis.service.ts b/src/app/services/apis.service.ts new file mode 100644 index 0000000..48124b9 --- /dev/null +++ b/src/app/services/apis.service.ts @@ -0,0 +1,26 @@ +import { Injectable } from '@angular/core' +import { HttpClient, HttpHeaders, HttpParams, HttpRequest } from '@angular/common/http' +import { Observable, Subject, throwError } from 'rxjs' +import { catchError } from 'rxjs/operators' +import { BaseService } from './base-service' +import { environment } from '../../environments/environment' + +@Injectable({ + providedIn: 'root' +}) +export class ApisService extends BaseService { + + private restApi = `${environment.API_URL}` + + constructor(private http: HttpClient) { + super() + } + + getPortfolio(section): Observable { + let urlApi = `${this.restApi}?query=${section}` + return this.http.get(urlApi).pipe( + catchError(this.handleError) + ) + } + +} diff --git a/src/app/services/base-service.ts b/src/app/services/base-service.ts new file mode 100644 index 0000000..50813ce --- /dev/null +++ b/src/app/services/base-service.ts @@ -0,0 +1,16 @@ +import { HttpErrorResponse } from "@angular/common/http" +import { throwError } from "rxjs" +import { ParseXML } from "./parse-xml" + +export class BaseService { + + constructor() { } + + protected handleError(error: HttpErrorResponse) { + if(error.error instanceof ErrorEvent) { + console.error('An error occurred:', error.error.message) + } + + return throwError( ParseXML.getXMLResponseMessage(error.error) ) + } +} diff --git a/src/app/services/parse-xml.ts b/src/app/services/parse-xml.ts new file mode 100644 index 0000000..781bd33 --- /dev/null +++ b/src/app/services/parse-xml.ts @@ -0,0 +1,13 @@ +export class ParseXML { + constructor() {} + + public sanitize(str: string): string { + let sanitizeString = encodeURIComponent(str).replace(/%0A/g, '') + return decodeURIComponent(sanitizeString) + } + + public static getXMLResponseMessage(responseBody: string): string { + let parseXMLClass = new ParseXML() + return parseXMLClass.sanitize(responseBody).match(/(.*?)<\/Message>/g)[0].replace(/<[^>]+>/g, '') + } +} diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 3612073..a646658 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,3 +1,5 @@ export const environment = { - production: true -}; + production: true, + + API_URL: `https://apis.dslak.it/` +} diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 7b4f817..2128c6d 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,16 +1,5 @@ -// This file can be replaced during build by using the `fileReplacements` array. -// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`. -// The list of file replacements can be found in `angular.json`. - export const environment = { - production: false -}; + production: false, -/* - * For easier debugging in development mode, you can import the following file - * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`. - * - * This import should be commented out in production mode because it will have a negative impact - * on performance if an error is thrown. - */ -// import 'zone.js/dist/zone-error'; // Included with Angular CLI. + API_URL: `http://localhost/dslak_website/apis/` +} From 13bc26e587c6f0b1da87ef0fa5abe3316268775e Mon Sep 17 00:00:00 2001 From: Dslak Date: Wed, 2 Dec 2020 15:43:22 +0100 Subject: [PATCH 07/38] add items style --- .gitignore | 2 + src/app/portfolio/portfolio.component.html | 9 ++- src/app/portfolio/portfolio.component.scss | 69 ++++++++++++++++++++++ 3 files changed, 78 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 27fa5eb..915068b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ node_modules/ package-lock\.json + +src/assets/images/contents/ diff --git a/src/app/portfolio/portfolio.component.html b/src/app/portfolio/portfolio.component.html index 24db7e7..8efcc9d 100644 --- a/src/app/portfolio/portfolio.component.html +++ b/src/app/portfolio/portfolio.component.html @@ -1,8 +1,13 @@
-
- {{portfolioItems.title}} +
+ +
+ {{item.title}} + {{item.type}} + {{item.tags}} +
diff --git a/src/app/portfolio/portfolio.component.scss b/src/app/portfolio/portfolio.component.scss index 5ae1eae..df199b0 100644 --- a/src/app/portfolio/portfolio.component.scss +++ b/src/app/portfolio/portfolio.component.scss @@ -1,7 +1,76 @@ @import "../../assets/scss/variables"; .component-portfolio { + padding-top: 100px; + .box { + position: relative; + display: flex; + background: $black; + border-radius: 10px; + overflow: hidden; + margin: 40px; + padding: 20px; + cursor: pointer; + transition: transform .4s; + + .image { + position: absolute; + top: 50%; + left: 50%; + height: 100%; + width: 100%; + object-fit: cover; + transform: translate(-50%, -50%); + transition: transform .4s; + opacity: .5; + z-index: 0; + } + + .text { + display: block; + margin: auto; + text-align: center; + transform: translate(0%, 0%); + z-index: 1; + + .title { + display: block; + color: $white; + font-size: $font-24; + text-transform: uppercase; + font-weight: bold; + } + + .type { + display: block; + color: $white; + font-size: $font-18; + font-weight: bold; + } + + .tags { + display: block; + color: $white; + font-size: $font-14; + text-transform: uppercase; + font-weight: bold; + padding-top: 20px; + } + } + + @each $angle in 0,1,2,3,4,5,6 { + &.skew-#{$angle} {transform: skew(#{$angle - 3}deg, #{$angle - 3}deg) ;} + } + &:hover { + //transform: scale(1.4) skew(2deg, 2deg) rotate(2deg); + @each $angle in 0,1,2,3,4,5,6 { + &.skew-#{$angle} {transform: scale(1.4) rotate(2deg) skew(#{3 - $angle}deg, #{3 - $angle}deg) ;} + } + .image { + transform: translate(-50%, -50%) scale(1.4); + } + } } } From a8ca76ae17e3d3e3677d8c9c358560ea2943c6e5 Mon Sep 17 00:00:00 2001 From: Dslak Date: Wed, 2 Dec 2020 17:25:37 +0100 Subject: [PATCH 08/38] add details --- src/app/about/about.component.html | 2 + src/app/about/about.component.scss | 24 ++++++- src/app/about/about.component.ts | 10 ++- src/app/app-layout/app-layout.component.ts | 2 +- src/app/app-routing.module.ts | 25 +++---- src/app/app.module.ts | 12 +--- src/app/detail/detail.component.html | 9 +++ src/app/detail/detail.component.scss | 63 ++++++++++++++++++ .../detail.component.spec.ts} | 12 ++-- src/app/detail/detail.component.ts | 38 +++++++++++ .../entertainment.component.html | 1 - .../entertainment.component.scss | 0 .../entertainment.component.spec.ts | 25 ------- .../entertainment/entertainment.component.ts | 15 ----- .../exhibitions/exhibitions.component.html | 1 - .../exhibitions/exhibitions.component.scss | 0 src/app/exhibitions/exhibitions.component.ts | 15 ----- src/app/header/header.component.scss | 8 +-- .../installations.component.html | 1 - .../installations.component.scss | 0 .../installations.component.spec.ts | 25 ------- .../installations/installations.component.ts | 15 ----- .../performances/performances.component.html | 1 - .../performances/performances.component.scss | 0 .../performances.component.spec.ts | 25 ------- .../performances/performances.component.ts | 15 ----- src/app/portfolio/portfolio.component.html | 14 ++-- src/app/portfolio/portfolio.component.scss | 8 ++- src/app/portfolio/portfolio.component.ts | 11 ++- src/app/services/apis.service.ts | 7 ++ src/assets/fonts/icomoon.eot | Bin 5464 -> 5512 bytes src/assets/fonts/icomoon.svg | 1 + src/assets/fonts/icomoon.ttf | Bin 5300 -> 5348 bytes src/assets/fonts/icomoon.woff | Bin 5376 -> 5424 bytes src/assets/fonts/selection.json | 2 +- src/assets/scss/global.scss | 1 + src/assets/scss/icons.scss | 3 + 37 files changed, 204 insertions(+), 187 deletions(-) create mode 100644 src/app/detail/detail.component.html create mode 100644 src/app/detail/detail.component.scss rename src/app/{exhibitions/exhibitions.component.spec.ts => detail/detail.component.spec.ts} (53%) create mode 100644 src/app/detail/detail.component.ts delete mode 100644 src/app/entertainment/entertainment.component.html delete mode 100644 src/app/entertainment/entertainment.component.scss delete mode 100644 src/app/entertainment/entertainment.component.spec.ts delete mode 100644 src/app/entertainment/entertainment.component.ts delete mode 100644 src/app/exhibitions/exhibitions.component.html delete mode 100644 src/app/exhibitions/exhibitions.component.scss delete mode 100644 src/app/exhibitions/exhibitions.component.ts delete mode 100644 src/app/installations/installations.component.html delete mode 100644 src/app/installations/installations.component.scss delete mode 100644 src/app/installations/installations.component.spec.ts delete mode 100644 src/app/installations/installations.component.ts delete mode 100644 src/app/performances/performances.component.html delete mode 100644 src/app/performances/performances.component.scss delete mode 100644 src/app/performances/performances.component.spec.ts delete mode 100644 src/app/performances/performances.component.ts diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html index 16f8f6c..980843a 100644 --- a/src/app/about/about.component.html +++ b/src/app/about/about.component.html @@ -1,6 +1,8 @@
+ +

DSLAK è un progetto che nasce nel 2010 da un'idea di Carmine De Rosa, sviluppatore ed amministratore di sistema in ambiente Unix/Linux, dopo aver completato gli studi in ambito elettronico approfondisce le proprie conoscenze informatiche presso l'Università di Salerno dove insieme ad un gruppo di appassionati di haking fonda HCSSLUG (Linux Users Group dell'Università di Salerno) e ed il relativo HackLab con il quale realizza numerosi progetti in ambito OpenSource, basati sulla ricerca e sulla sperimentazione in ambito tecnologico.

Nel 2006 si avvicina alle arti digitali e nel 2009, incuriosito dapprima dall'aspetto tecnico ma senza tralasciare quello scenico e concettuale, inizia ad approfondire le propie conoscenze nell'ambito della new-media art e delle installazioni interattive, studiando le soluzioni adottate da artisti affermati e sviluppando varie soluzioni alternative che utilizzano però un approccio più sostenibile, efficiente e soprattutto open.

diff --git a/src/app/about/about.component.scss b/src/app/about/about.component.scss index de85f7e..24c9086 100644 --- a/src/app/about/about.component.scss +++ b/src/app/about/about.component.scss @@ -4,6 +4,7 @@ z-index: 0; .content { + position: relative; margin: 150px auto 80px auto; padding: 40px 50px; font-size: $font-18; @@ -24,7 +25,7 @@ line-height: 35px; width: 200px; transition: transform .3s; - + -webkit-backface-visibility: hidden; .icon { display: inline-block; @@ -52,6 +53,27 @@ } } } + + .back { + position: absolute; + top: -40px; + left: 0px; + height: 40px; + width: 60px; + appearance: none; + border: none; + padding: 0; + font-size: $font-40; + color: $white-alpha; + background: transparent; + cursor: pointer; + transition: transform .3s; + -webkit-backface-visibility: hidden; + + &:hover { + transform: scale(1.1) translateX(-10px); + } + } } } diff --git a/src/app/about/about.component.ts b/src/app/about/about.component.ts index 9898f7a..204648a 100644 --- a/src/app/about/about.component.ts +++ b/src/app/about/about.component.ts @@ -1,4 +1,5 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core' +import { Location } from '@angular/common' @Component({ selector: 'app-about', @@ -7,9 +8,14 @@ import { Component, OnInit } from '@angular/core'; }) export class AboutComponent implements OnInit { - constructor() { } + constructor( + private location: Location + ) { } ngOnInit(): void { } + back() { + this.location.back() + } } diff --git a/src/app/app-layout/app-layout.component.ts b/src/app/app-layout/app-layout.component.ts index d041db1..83ed410 100644 --- a/src/app/app-layout/app-layout.component.ts +++ b/src/app/app-layout/app-layout.component.ts @@ -8,7 +8,7 @@ import type { Container } from 'tsparticles' }) export class AppLayoutComponent implements OnInit { - public particlesEnabled: boolean = false + public particlesEnabled: boolean = true public id: string = 'tsparticles' public particlesOptions: any = { diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 880d671..1b2066f 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -3,12 +3,7 @@ import { Routes, RouterModule } from '@angular/router' import { AppLayoutComponent } from './app-layout/app-layout.component' import { AboutComponent } from './about/about.component' import { PortfolioComponent } from './portfolio/portfolio.component' -import { ExhibitionsComponent } from './exhibitions/exhibitions.component' -import { InstallationsComponent } from './installations/installations.component' -import { EntertainmentComponent } from './entertainment/entertainment.component' -import { PerformancesComponent } from './performances/performances.component' -import { WorkshopsComponent } from './workshops/workshops.component' - +import { DetailComponent } from './detail/detail.component' const routes: Routes = [ { @@ -17,13 +12,19 @@ const routes: Routes = [ children: [ //{ path: '', redirectTo: '/portfolio', pathMatch: 'full' }, { path: '', component: PortfolioComponent }, - { path: 'portfolio', component: PortfolioComponent }, { path: 'about', component: AboutComponent }, - { path: 'exhibitions', component: ExhibitionsComponent }, - { path: 'installations', component: InstallationsComponent }, - { path: 'entertainment', component: EntertainmentComponent }, - { path: 'performances', component: PerformancesComponent }, - { path: 'workshops', component: WorkshopsComponent } + { path: 'portfolio', component: PortfolioComponent }, + { path: 'exhibitions', component: PortfolioComponent }, + { path: 'installations', component: PortfolioComponent }, + { path: 'entertainment', component: PortfolioComponent }, + { path: 'performances', component: PortfolioComponent }, + { path: 'workshops', component: PortfolioComponent }, + { path: 'detail', component: DetailComponent, + children: [ + { path: '**', component: DetailComponent } + ] + } + ] } ] diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 9ac77c7..cb94103 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -9,11 +9,7 @@ import { HeaderComponent } from './header/header.component'; import { AppLayoutComponent } from './app-layout/app-layout.component'; import { AboutComponent } from './about/about.component'; import { PortfolioComponent } from './portfolio/portfolio.component'; -import { ExhibitionsComponent } from './exhibitions/exhibitions.component'; -import { InstallationsComponent } from './installations/installations.component'; -import { EntertainmentComponent } from './entertainment/entertainment.component'; -import { PerformancesComponent } from './performances/performances.component'; -import { WorkshopsComponent } from './workshops/workshops.component'; +import { DetailComponent } from './detail/detail.component'; @NgModule({ declarations: [ @@ -22,11 +18,7 @@ import { WorkshopsComponent } from './workshops/workshops.component'; AppLayoutComponent, AboutComponent, PortfolioComponent, - ExhibitionsComponent, - InstallationsComponent, - EntertainmentComponent, - PerformancesComponent, - WorkshopsComponent + DetailComponent ], imports: [ BrowserModule, diff --git a/src/app/detail/detail.component.html b/src/app/detail/detail.component.html new file mode 100644 index 0000000..408cb39 --- /dev/null +++ b/src/app/detail/detail.component.html @@ -0,0 +1,9 @@ +
+
+
+ +

{{details.title}}

+
+ Tags: {{details.tags}} +
+
diff --git a/src/app/detail/detail.component.scss b/src/app/detail/detail.component.scss new file mode 100644 index 0000000..0df604d --- /dev/null +++ b/src/app/detail/detail.component.scss @@ -0,0 +1,63 @@ +@import "../../assets/scss/variables"; + +.component-detail { + z-index: 0; + + .content { + position: relative; + margin: 150px auto 80px auto; + padding: 40px 50px; + background: $white-alpha; + color: $black; + box-shadow: 0px 0px 25px $white-alpha; + border-radius: 10px; + + .title { + margin-top: 0; + font-size: $font-34; + font-weight: bold; + text-transform: uppercase; + } + + .text { + font-size: $font-18; + text-align: justify; + } + + .tags { + display: block; + font-size: $font-12; + text-transform: uppercase; + padding-top: 40px; + } + + .back { + position: absolute; + top: -40px; + left: 0px; + height: 40px; + width: 60px; + appearance: none; + border: none; + padding: 0; + font-size: $font-40; + color: $white-alpha; + background: transparent; + cursor: pointer; + transition: transform .3s; + -webkit-backface-visibility: hidden; + + &:hover { + transform: scale(1.1) translateX(-10px); + } + } + } +} + +@media (min-width: map-get($grid-breakpoints, 'md')) { + .component-detail { + .content { + transform: rotate(2deg) skew(0deg, -6deg); + } + } +} diff --git a/src/app/exhibitions/exhibitions.component.spec.ts b/src/app/detail/detail.component.spec.ts similarity index 53% rename from src/app/exhibitions/exhibitions.component.spec.ts rename to src/app/detail/detail.component.spec.ts index c655d74..149b9be 100644 --- a/src/app/exhibitions/exhibitions.component.spec.ts +++ b/src/app/detail/detail.component.spec.ts @@ -1,20 +1,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ExhibitionsComponent } from './exhibitions.component'; +import { DetailComponent } from './detail.component'; -describe('ExhibitionsComponent', () => { - let component: ExhibitionsComponent; - let fixture: ComponentFixture; +describe('DetailComponent', () => { + let component: DetailComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ ExhibitionsComponent ] + declarations: [ DetailComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(ExhibitionsComponent); + fixture = TestBed.createComponent(DetailComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/detail/detail.component.ts b/src/app/detail/detail.component.ts new file mode 100644 index 0000000..760367f --- /dev/null +++ b/src/app/detail/detail.component.ts @@ -0,0 +1,38 @@ +import { Component, OnInit } from '@angular/core' +import { Router, NavigationEnd } from '@angular/router' +import { Location } from '@angular/common' +import { ApisService } from '../services/apis.service' + +@Component({ + selector: 'app-detail', + templateUrl: './detail.component.html', + styleUrls: ['./detail.component.scss'] +}) +export class DetailComponent implements OnInit { + + public details: any = {} + + constructor( + private apisService: ApisService, + private router: Router, + private location: Location + ){ } + + ngOnInit(): void { + this.showDetails(this.router.url.split('/')[2]) + } + + showDetails(id): void { + this.apisService.getDetails(id).toPromise().then((response) => { + this.details = response.item + },(error) => { + console.error('getPortfolio ERROR', error) + }).catch((e) => { + console.error('getPortfolio CATCH', e) + }) + } + + back() { + this.location.back() + } +} diff --git a/src/app/entertainment/entertainment.component.html b/src/app/entertainment/entertainment.component.html deleted file mode 100644 index 64e075f..0000000 --- a/src/app/entertainment/entertainment.component.html +++ /dev/null @@ -1 +0,0 @@ -

entertainment works!

diff --git a/src/app/entertainment/entertainment.component.scss b/src/app/entertainment/entertainment.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/entertainment/entertainment.component.spec.ts b/src/app/entertainment/entertainment.component.spec.ts deleted file mode 100644 index 416bfd2..0000000 --- a/src/app/entertainment/entertainment.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { EntertainmentComponent } from './entertainment.component'; - -describe('EntertainmentComponent', () => { - let component: EntertainmentComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ EntertainmentComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(EntertainmentComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/entertainment/entertainment.component.ts b/src/app/entertainment/entertainment.component.ts deleted file mode 100644 index c6b6381..0000000 --- a/src/app/entertainment/entertainment.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-entertainment', - templateUrl: './entertainment.component.html', - styleUrls: ['./entertainment.component.scss'] -}) -export class EntertainmentComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/exhibitions/exhibitions.component.html b/src/app/exhibitions/exhibitions.component.html deleted file mode 100644 index 85a0021..0000000 --- a/src/app/exhibitions/exhibitions.component.html +++ /dev/null @@ -1 +0,0 @@ -

exhibitions works!

diff --git a/src/app/exhibitions/exhibitions.component.scss b/src/app/exhibitions/exhibitions.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/exhibitions/exhibitions.component.ts b/src/app/exhibitions/exhibitions.component.ts deleted file mode 100644 index c2c1747..0000000 --- a/src/app/exhibitions/exhibitions.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-exhibitions', - templateUrl: './exhibitions.component.html', - styleUrls: ['./exhibitions.component.scss'] -}) -export class ExhibitionsComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss index 72629da..83a90d6 100644 --- a/src/app/header/header.component.scss +++ b/src/app/header/header.component.scss @@ -65,8 +65,8 @@ background: transparent; .logo-container { - height: 80px; - width: 80px; + height: 100px; + width: 100px; .circles { &:before, @@ -76,8 +76,8 @@ } &.menu-open { - height: 120px; - width: 120px; + height: 140px; + width: 140px; .circles { &:before, &:after { diff --git a/src/app/installations/installations.component.html b/src/app/installations/installations.component.html deleted file mode 100644 index c142693..0000000 --- a/src/app/installations/installations.component.html +++ /dev/null @@ -1 +0,0 @@ -

installations works!

diff --git a/src/app/installations/installations.component.scss b/src/app/installations/installations.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/installations/installations.component.spec.ts b/src/app/installations/installations.component.spec.ts deleted file mode 100644 index c50ae75..0000000 --- a/src/app/installations/installations.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { InstallationsComponent } from './installations.component'; - -describe('InstallationsComponent', () => { - let component: InstallationsComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ InstallationsComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(InstallationsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/installations/installations.component.ts b/src/app/installations/installations.component.ts deleted file mode 100644 index 61102ea..0000000 --- a/src/app/installations/installations.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-installations', - templateUrl: './installations.component.html', - styleUrls: ['./installations.component.scss'] -}) -export class InstallationsComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/performances/performances.component.html b/src/app/performances/performances.component.html deleted file mode 100644 index 7b9658d..0000000 --- a/src/app/performances/performances.component.html +++ /dev/null @@ -1 +0,0 @@ -

performances works!

diff --git a/src/app/performances/performances.component.scss b/src/app/performances/performances.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/performances/performances.component.spec.ts b/src/app/performances/performances.component.spec.ts deleted file mode 100644 index 0ee44e3..0000000 --- a/src/app/performances/performances.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PerformancesComponent } from './performances.component'; - -describe('PerformancesComponent', () => { - let component: PerformancesComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ PerformancesComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(PerformancesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/performances/performances.component.ts b/src/app/performances/performances.component.ts deleted file mode 100644 index 97bbb04..0000000 --- a/src/app/performances/performances.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-performances', - templateUrl: './performances.component.html', - styleUrls: ['./performances.component.scss'] -}) -export class PerformancesComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/portfolio/portfolio.component.html b/src/app/portfolio/portfolio.component.html index 8efcc9d..546cba5 100644 --- a/src/app/portfolio/portfolio.component.html +++ b/src/app/portfolio/portfolio.component.html @@ -1,12 +1,14 @@
-
- -
- {{item.title}} - {{item.type}} - {{item.tags}} +
+
+ +
+ {{item.title}} + {{item.type}} + {{item.tags}} +
diff --git a/src/app/portfolio/portfolio.component.scss b/src/app/portfolio/portfolio.component.scss index df199b0..554c6d3 100644 --- a/src/app/portfolio/portfolio.component.scss +++ b/src/app/portfolio/portfolio.component.scss @@ -1,7 +1,7 @@ @import "../../assets/scss/variables"; .component-portfolio { - padding-top: 100px; + padding-top: 140px; .box { position: relative; @@ -9,7 +9,7 @@ background: $black; border-radius: 10px; overflow: hidden; - margin: 40px; + margin: 20px 0; padding: 20px; cursor: pointer; transition: transform .4s; @@ -64,10 +64,12 @@ } &:hover { - //transform: scale(1.4) skew(2deg, 2deg) rotate(2deg); + z-index: 50; + @each $angle in 0,1,2,3,4,5,6 { &.skew-#{$angle} {transform: scale(1.4) rotate(2deg) skew(#{3 - $angle}deg, #{3 - $angle}deg) ;} } + .image { transform: translate(-50%, -50%) scale(1.4); } diff --git a/src/app/portfolio/portfolio.component.ts b/src/app/portfolio/portfolio.component.ts index 95cbf2b..ecdf1e1 100644 --- a/src/app/portfolio/portfolio.component.ts +++ b/src/app/portfolio/portfolio.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core' +import { Router, NavigationEnd } from '@angular/router' import { ApisService } from '../services/apis.service' @Component({ @@ -10,10 +11,13 @@ export class PortfolioComponent implements OnInit { public portfolioItems: any = [] - constructor(private apisService: ApisService) { } + constructor( + private apisService: ApisService, + private router: Router) + { } ngOnInit(): void { - this.apisService.getPortfolio('portfolio').toPromise().then((response) => { + this.apisService.getPortfolio(this.router.url.split('/')[1]).toPromise().then((response) => { this.portfolioItems = response.items },(error) => { console.error('getPortfolio ERROR', error) @@ -22,5 +26,8 @@ export class PortfolioComponent implements OnInit { }) } + showDetails(id): void { + this.router.navigate([`/detail/${id}`]) + } } diff --git a/src/app/services/apis.service.ts b/src/app/services/apis.service.ts index 48124b9..3df86b3 100644 --- a/src/app/services/apis.service.ts +++ b/src/app/services/apis.service.ts @@ -23,4 +23,11 @@ export class ApisService extends BaseService { ) } + getDetails(id): Observable { + let urlApi = `${this.restApi}?query=single&id=${id}` + return this.http.get(urlApi).pipe( + catchError(this.handleError) + ) + } + } diff --git a/src/assets/fonts/icomoon.eot b/src/assets/fonts/icomoon.eot index 5824380a35eafe9d20ddccab6fe2bdb7af243f82..80e12dbd43409d270b9fdf8364ea878bce2e3512 100644 GIT binary patch delta 424 zcmcbi)uGMWA;0MY_L{th6`k)BhTcBP=|Gmw7(DBP2gnwTQ>Qz)H*LC6OvZMc&ODe2w8EymlD}a2Toc!cO$t`knK>imXUn4iMqJTj`kCB&wK^SDALSABS>P#=r z-$1?%(2}--{NfS@W}pm%$Pth{12c2UqirSwgOCDH-V7wbeu()7kRJi$ zt7PPsRG8Z`Yyt9XfP9af{NzO07D*)_{|Jz;mYY~nz#y;3$O{yB0~AomOUzB3>Bae* zfkBuDXh~Z^esKu{Gf;*>WC}>0ftfjLatdQLe+7^y1#}oQ0~Z4$gTmwwj53q?n54u6 z82MZHi}(xpwfUCuRq@&KP5~-mob1RXJvo-iW%E%cV*#0an{SxL^V@u7;AR1t%y9dy zqBxA6EFx?!C + diff --git a/src/assets/fonts/icomoon.ttf b/src/assets/fonts/icomoon.ttf index 1492972c54ff9c9c8dfdaaa8b572a256ed2c6f1a..ccc99c46565654ac321127d864d74a3c753b1f3c 100644 GIT binary patch delta 446 zcmdm@`9!mxfsuiMft#U$ftkU;KUm+0Ux;5CD6$8L6OwZi3$}5t>tkSGlmYVRq$d^^ z0BHdre+Q7}NYANEyHZf~8OT2X6z<7LO-zycDU{B@Amjs-H_HGDupeT+3FNl``6?N? zB^B1T47Y*&6+pgEPJXguqU07iIiSE7pnyhhVnqRi0wXU2gD}WKg}lVv)R|tKzkz%k zpe1bu`NbtbhXR4f5s*9sGjqwr1J!~JK#mO1UCazTK>sMbWSH#5C}Z-H;RExB#t&0J z%=qx&W7@|lA1{5X{r~s>e+I_?kHuL8nD|@yi}?%rb@-O^RrA^LP6cXboV-v(c=84j z7BF7V=%&QTpw1}6e3L1Vft7)QlTp!B(VTJRzdGhkf3p`e1^zpo(!BXIqp5(*i&rbI z#`D{JW#DE3I);Ja_S>|7FnY3!kh!QZL>w&1zyzd#eD%paLe9Dd46_)87`+(xG3hW( nW7@~8!!n8W5t|RY0{a6FH*ow2Gjaoc1_DeV2X5vUUdjjnyYF)I delta 371 zcmaE&xka;{fsuiMft#U$ftkU;KUm+0Ux;52D6$8L6OwZi3oh?nevpBIQ3lALlAc&x z0Hg(g{0%^wBR!`w&4#o3JdnQwD4daznwTQ>qirSwgOCDH-V7wbeu()7kRJi$t7PPs zRG8Z`Yyt9XfP9af{A9;O*%nD9puiEJfLd;1MFE36BQKEu2FO>)OUzB3>Bae*fkBuD zXh~Z^esKxVp+F!q1tibF%$zmxKsA2_kRt_j7c&DF&_4>3eHdjXXE92N2{7`v@E7qH z@N4re*$qr~KGjP9EinT!Qw?rpwd8qaU@m4TZDWH7_+w~FF0dUAn~ zxu6h494yJe1f(YK5pve;U}RvlU|ho_#ni&IhFOZGf%O8L6+0jMISvz`5>TKDF>*5i RT@3_GKpTZO+Y2vc1OUNNOp*Wq diff --git a/src/assets/fonts/icomoon.woff b/src/assets/fonts/icomoon.woff index 6deaa896ab58dbcb0073ddbf316b033602a6f22e..84f93b7b502e87e66daa3f32db8568f4c52a6563 100644 GIT binary patch delta 481 zcmZqB+Mp#;?(gQtz{mguq6Q4yAX?EztR0tN=g44}vy5Z=bQt}i{Y7%0ZX z0_1Z*u|RrGWg1Y7hk-$$2ZXN_RDI4!O-x~65Sjs0V+O)fKZVjWfPz4=3qZaK2(uqz zzL}9*QUMhE0_6LEu(d72?VS8%pgKQc2cUok2up5}lgmx409q^za*P5PD=_lrCFZ6A z#X5kFYy;t$UYx%R@{3D=J`sScV+OLAnM)?~FjmJl0NFAO0u0OyJU|~Sykz*m{GsW? z)DN>hJouRYamvTbpKAaA{r?}R3TO*hwh<^h11OsYl)VI%W&HnGoJD|%zm>n3zmQ*t zZ#iEzpB?Yi$@duLC;w)2Q(|OLXOv;S$rQ-I%D}+MsA#Ha&babl9rLEY*^8M1|D8^0 z-fYigDj@UX)rza}{5D@1xIw|mz;OF*+CLaQd4iC+s4zqvEXlwGq=0<&$v1?Yl?@nX nF$ytyG45m1VVcIYk6DLh66+&2A9e-y2ON;d6y9tne25VMtRR6g delta 427 zcmdm>)u1I(?(gQtz{mguq6`e&AX;S0Il~hCg&y=FfcG?041h?@a4VB z52hy;gT(#-`5aIzke*YS#=yYD!oVN^R4b5S!&!YkBQ-IFfk7w-sKyM0rGB){%m4}k z#g+j1Dj>{$i1|iFZb=1D>;#bS0mA0C3|n&YlY#2|gav>CY9K7zBB_*{SOK(H*aFB` z0AqPZ-n_)zRG?S{&_Qh=JkyKwcR_w}3D6@C;OdxxEN14c$vlkJ{6MQ1q!IZ$ z9#@z=gHgud1M`Q*4^uzP`0(Ik+Q%s$FMX>0|M&lY2FCx71sM5T_>1@p__g_#@m2BJ z@=gJ2WQ2qe>ttpox6Qds#sV_;Hs3If=ePOFzzqxmAh`WjQ5;53-Xml#C Date: Wed, 2 Dec 2020 19:04:40 +0100 Subject: [PATCH 09/38] new portfolio grid style add favicon --- angular.json | 2 +- src/app/about/about.component.scss | 2 +- src/app/app-layout/app-layout.component.ts | 2 +- src/app/detail/detail.component.scss | 2 +- src/app/portfolio/portfolio.component.html | 2 +- src/app/portfolio/portfolio.component.scss | 56 +++++++++++++++------ src/assets/images/favicon.png | Bin 0 -> 1488 bytes src/assets/scss/variables.scss | 4 +- src/favicon.ico | Bin 948 -> 0 bytes src/favicon.png | Bin 0 -> 1488 bytes src/index.html | 2 +- 11 files changed, 48 insertions(+), 24 deletions(-) create mode 100644 src/assets/images/favicon.png delete mode 100644 src/favicon.ico create mode 100644 src/favicon.png diff --git a/angular.json b/angular.json index 52df64f..48a4209 100644 --- a/angular.json +++ b/angular.json @@ -24,7 +24,7 @@ "tsConfig": "tsconfig.app.json", "aot": true, "assets": [ - "src/favicon.ico", + "src/assets/images/favicon.png", "src/assets" ], "styles": [ diff --git a/src/app/about/about.component.scss b/src/app/about/about.component.scss index 24c9086..a0eb681 100644 --- a/src/app/about/about.component.scss +++ b/src/app/about/about.component.scss @@ -64,7 +64,7 @@ border: none; padding: 0; font-size: $font-40; - color: $white-alpha; + color: $black-alpha; background: transparent; cursor: pointer; transition: transform .3s; diff --git a/src/app/app-layout/app-layout.component.ts b/src/app/app-layout/app-layout.component.ts index 83ed410..7174112 100644 --- a/src/app/app-layout/app-layout.component.ts +++ b/src/app/app-layout/app-layout.component.ts @@ -97,6 +97,6 @@ export class AppLayoutComponent implements OnInit { particlesLoaded(container: Container): void { - console.log('particlesLoaded', container) + //console.log('particlesLoaded', container) } } diff --git a/src/app/detail/detail.component.scss b/src/app/detail/detail.component.scss index 0df604d..6900e99 100644 --- a/src/app/detail/detail.component.scss +++ b/src/app/detail/detail.component.scss @@ -41,7 +41,7 @@ border: none; padding: 0; font-size: $font-40; - color: $white-alpha; + color: $black-alpha; background: transparent; cursor: pointer; transition: transform .3s; diff --git a/src/app/portfolio/portfolio.component.html b/src/app/portfolio/portfolio.component.html index 546cba5..3f9d61a 100644 --- a/src/app/portfolio/portfolio.component.html +++ b/src/app/portfolio/portfolio.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/src/app/portfolio/portfolio.component.scss b/src/app/portfolio/portfolio.component.scss index 554c6d3..a0965c4 100644 --- a/src/app/portfolio/portfolio.component.scss +++ b/src/app/portfolio/portfolio.component.scss @@ -6,13 +6,15 @@ .box { position: relative; display: flex; - background: $black; + //background: $black-alpha; border-radius: 10px; overflow: hidden; - margin: 20px 0; - padding: 20px; + margin: 10px 0; + padding: 40px 20px; + min-height: 250px; cursor: pointer; - transition: transform .4s; + transition: transform .4s, background .4s; + -webkit-backface-visibility: hidden; .image { position: absolute; @@ -21,9 +23,11 @@ height: 100%; width: 100%; object-fit: cover; - transform: translate(-50%, -50%); - transition: transform .4s; + transform: translate(-50%, -50%) scale(1.2); opacity: .5; + filter: grayscale(100%) invert(100%); + transition: transform .4s, opacity .4s, filter .4s; + -webkit-backface-visibility: hidden; z-index: 0; } @@ -32,47 +36,67 @@ margin: auto; text-align: center; transform: translate(0%, 0%); + color: $black; + transition: color .4s; + -webkit-backface-visibility: hidden; z-index: 1; .title { display: block; - color: $white; - font-size: $font-24; + font-size: $font-20; text-transform: uppercase; font-weight: bold; } .type { display: block; - color: $white; - font-size: $font-18; + font-size: $font-16; font-weight: bold; } .tags { display: block; - color: $white; - font-size: $font-14; + font-size: $font-12; text-transform: uppercase; font-weight: bold; - padding-top: 20px; + padding-top: 10px; } } @each $angle in 0,1,2,3,4,5,6 { - &.skew-#{$angle} {transform: skew(#{$angle - 3}deg, #{$angle - 3}deg) ;} + &.skew-#{$angle} { + transform: skew(#{$angle - 3}deg, #{$angle - 3}deg); + /*animation: zoom#{$angle} #{$angle + 3}s ease-in infinite forwards; + @keyframes zoom#{$angle} { + 0% { transform: scale(1) skew(#{$angle - 3}deg, #{$angle - 3}deg); } + 50% { transform: scale(1.1) skew(#{$angle - 3}deg, #{$angle - 3}deg); } + 75% { transform: scale(.9) skew(#{$angle - 3}deg, #{$angle - 3}deg); } + 100% { transform: scale(1) skew(#{$angle - 3}deg, #{$angle - 3}deg); } + }*/ + } } &:hover { + background: $black; z-index: 50; + //animation-play-state: paused; + @each $angle in 0,1,2,3,4,5,6 { - &.skew-#{$angle} {transform: scale(1.4) rotate(2deg) skew(#{3 - $angle}deg, #{3 - $angle}deg) ;} + &.skew-#{$angle} { + transform: scale(1.4) rotate(2deg) skew(#{3 - $angle}deg, #{3 - $angle}deg); } + } .image { - transform: translate(-50%, -50%) scale(1.4); + filter: grayscale(100%) invert(0%) brightness(.5); + opacity: .9; + transform: translate(-50%, -50%) scale(1.6); + } + .text { + color: $yellow; } } } } + diff --git a/src/assets/images/favicon.png b/src/assets/images/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..0d75435d056e6a1e937f63e0e7c67ceab3879cfd GIT binary patch literal 1488 zcmV;>1uy!EP)C5J*HI zDphKwN`0tQQC^CGhZczkKtb&b?Ms1Hg0v~BL=+MbNu0Ea6DPHuIN5dlk+t`8W=2Wou6vHe}KECxk;0d6;=MsXF#q@+j zcHANRABX92m+ZL1jf{#?ugIW=Si+! zaGASiqfzG{ZiJr>0oZY0fuK?)R4Ivx*_9^@u)m%2$l)G7d}9;ET&#Nr4S4dU2|#$` zz#VmV+tGUraQkYGClB@T{;ONojmR?o{??|Jb~hO<7$6U9Xk5%q+x+#ned|Wz{_oH6 zoo6#dq41micM+7OY0u{ErE}I2p(Y%Ee*4Xm$X)NK0<^`$&tKz9-&g?P>Uozx z{9@axd$;Z?60?kF6v+$q5{@4AZ}v5IX$!?R@r^GywVe=D1l#%vSn#mQYd8pi-yM*(2Sn zGca7>@n2p+mV^ld;mscpt{IPgJBq|?MHSzul9v_Ap8qu2HKBM)Nu=sy#YwE)WBP|n z0EpmONG;2Xixv~76I~N()!(FpQr5q_u(TP^k`;C6!f~H4=)M?6EfT4d=HI`&s*oz4 z5h1@kGK?PW?z)n_0m;pLQ)_*M0eRe@DpsPNXXRuhzj8(_dm1vxeb(IeY@Q-(D6?qw% zi)&Z=4Vx?Y>7e!v)H9Jv{#=XRHTkbNm8CHuiePrq;rBn^hBSm(ZrYIET;aP1vZ%s) zuk~+PG%2Kb=J=n}d)La6Pu}fi^k|Z)^DaBT(lD(E%ud-HetXroLQ5o4Ap>_e zC?xo1Va6F;%X#ul;%1Q>+*5x@{mj!j_U@a-iZx~qi>4ef_P-o-{Jo8wJXD*vqb_>i z&adYA`VVHC>?$0Rp`oG8$)4DiQo&lkm*6UJ{g4M9o#VmBXPVW4&ozu55rBP94gBQX zvE<9$K6^wUo(eUQiUQXU!nm)+L@F#Ll40KQqJ>0Hm{0drt`2=|@v?C>Cqho4Y$5YN zG172!aFSyWJw#3KhkrQm&H1eJaxUxa4g+zF6D=4=bH>)0n5}cRtut6;Vs>~v7L!Sh qG3CU$I&nfSj*MK)0=LjWYWOc$;1V8B_ltG_0000CBYU7IjCFmI-B}4sMJt3^s9NVg!P0 z6hDQy(L`XWMkB@zOLgN$4KYz;j0zZxq9KKdpZE#5@k0crP^5f9KO};h)ZDQ%ybhht z%t9#h|nu0K(bJ ztIkhEr!*UyrZWQ1k2+YkGqDi8Z<|mIN&$kzpKl{cNP=OQzXHz>vn+c)F)zO|Bou>E z2|-d_=qY#Y+yOu1a}XI?cU}%04)zz%anD(XZC{#~WreV!a$7k2Ug`?&CUEc0EtrkZ zL49MB)h!_K{H(*l_93D5tO0;BUnvYlo+;yss%n^&qjt6fZOa+}+FDO(~2>G z2dx@=JZ?DHP^;b7*Y1as5^uphBsh*s*z&MBd?e@I>-9kU>63PjP&^#5YTOb&x^6Cf z?674rmSHB5Fk!{Gv7rv!?qX#ei_L(XtwVqLX3L}$MI|kJ*w(rhx~tc&L&xP#?cQow zX_|gx$wMr3pRZIIr_;;O|8fAjd;1`nOeu5K(pCu7>^3E&D2OBBq?sYa(%S?GwG&_0-s%_v$L@R!5H_fc)lOb9ZoOO#p`Nn`KU z3LTTBtjwo`7(HA6 z7gmO$yTR!5L>Bsg!X8616{JUngg_@&85%>W=mChTR;x4`P=?PJ~oPuy5 zU-L`C@_!34D21{fD~Y8NVnR3t;aqZI3fIhmgmx}$oc-dKDC6Ap$Gy>a!`A*x2L1v0 WcZ@i?LyX}700001uy!EP)C5J*HI zDphKwN`0tQQC^CGhZczkKtb&b?Ms1Hg0v~BL=+MbNu0Ea6DPHuIN5dlk+t`8W=2Wou6vHe}KECxk;0d6;=MsXF#q@+j zcHANRABX92m+ZL1jf{#?ugIW=Si+! zaGASiqfzG{ZiJr>0oZY0fuK?)R4Ivx*_9^@u)m%2$l)G7d}9;ET&#Nr4S4dU2|#$` zz#VmV+tGUraQkYGClB@T{;ONojmR?o{??|Jb~hO<7$6U9Xk5%q+x+#ned|Wz{_oH6 zoo6#dq41micM+7OY0u{ErE}I2p(Y%Ee*4Xm$X)NK0<^`$&tKz9-&g?P>Uozx z{9@axd$;Z?60?kF6v+$q5{@4AZ}v5IX$!?R@r^GywVe=D1l#%vSn#mQYd8pi-yM*(2Sn zGca7>@n2p+mV^ld;mscpt{IPgJBq|?MHSzul9v_Ap8qu2HKBM)Nu=sy#YwE)WBP|n z0EpmONG;2Xixv~76I~N()!(FpQr5q_u(TP^k`;C6!f~H4=)M?6EfT4d=HI`&s*oz4 z5h1@kGK?PW?z)n_0m;pLQ)_*M0eRe@DpsPNXXRuhzj8(_dm1vxeb(IeY@Q-(D6?qw% zi)&Z=4Vx?Y>7e!v)H9Jv{#=XRHTkbNm8CHuiePrq;rBn^hBSm(ZrYIET;aP1vZ%s) zuk~+PG%2Kb=J=n}d)La6Pu}fi^k|Z)^DaBT(lD(E%ud-HetXroLQ5o4Ap>_e zC?xo1Va6F;%X#ul;%1Q>+*5x@{mj!j_U@a-iZx~qi>4ef_P-o-{Jo8wJXD*vqb_>i z&adYA`VVHC>?$0Rp`oG8$)4DiQo&lkm*6UJ{g4M9o#VmBXPVW4&ozu55rBP94gBQX zvE<9$K6^wUo(eUQiUQXU!nm)+L@F#Ll40KQqJ>0Hm{0drt`2=|@v?C>Cqho4Y$5YN zG172!aFSyWJw#3KhkrQm&H1eJaxUxa4g+zF6D=4=bH>)0n5}cRtut6;Vs>~v7L!Sh qG3CU$I&nfSj*MK)0=LjWYWOc$;1V8B_ltG_0000DslakWebsite - + From 0201c1b10f13824bbfe13bc1cd5f02609ff2316a Mon Sep 17 00:00:00 2001 From: Dslak Date: Thu, 3 Dec 2020 12:08:26 +0100 Subject: [PATCH 10/38] add apis and fix back navigation --- .gitignore | 2 + angular.json | 3 +- src/apis/conn.conn | 16 ++++ src/apis/index.php | 93 ++++++++++++++++++++++ src/app/app-layout/app-layout.component.ts | 2 +- src/app/app-routing.module.ts | 6 +- src/app/detail/detail.component.html | 16 +++- src/app/detail/detail.component.scss | 14 +++- src/app/detail/detail.component.ts | 28 +++++-- src/app/portfolio/portfolio.component.ts | 3 +- src/app/services/apis.service.ts | 4 +- src/environments/environment.ts | 2 +- 12 files changed, 170 insertions(+), 19 deletions(-) create mode 100755 src/apis/conn.conn create mode 100644 src/apis/index.php diff --git a/.gitignore b/.gitignore index 915068b..cd1b3c8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ node_modules/ package-lock\.json src/assets/images/contents/ + +dist/ diff --git a/angular.json b/angular.json index 48a4209..be23e47 100644 --- a/angular.json +++ b/angular.json @@ -25,7 +25,8 @@ "aot": true, "assets": [ "src/assets/images/favicon.png", - "src/assets" + "src/assets", + "src/apis" ], "styles": [ "src/assets/scss/main.scss" diff --git a/src/apis/conn.conn b/src/apis/conn.conn new file mode 100755 index 0000000..877d806 --- /dev/null +++ b/src/apis/conn.conn @@ -0,0 +1,16 @@ + diff --git a/src/apis/index.php b/src/apis/index.php new file mode 100644 index 0000000..8adaa9a --- /dev/null +++ b/src/apis/index.php @@ -0,0 +1,93 @@ +items = array(); + +$filter = array("portfolio", "installations", "entertainment", "performances", "workshops"); + +switch($_GET['query']) { + case "portfolio": + case "installations": + case "entertainment": + case "performances": + case "workshops": + if($_GET['query'] == 'portfolio') {$filter = '';} else {$filter = "WHERE type='".$_GET['query']."'";} + $qe = mysqli_query($conn,"SELECT * FROM `works` $filter ORDER BY id DESC"); + if(mysqli_num_rows($qe) > 0) { + $content = null; + $content->items = array(); + while($re = mysqli_fetch_array($qe)) { + $item = null; + $item->id = $re['id']; + $item->title = $re['title']; + $item->type = $re['type']; + $item->tags = $re['tags']; + $item->image = $re['image']; + array_push($content->items, $item); + } + } + break; + case "exhibitions": + $qe = mysqli_query($conn,"SELECT * FROM `exhibitions` ORDER BY date_from DESC"); + if(mysqli_num_rows($qe) > 0) { + $content = null; + $content->items = array(); + while($re = mysqli_fetch_array($qe)) { + $item = null; + $item->id = $re['id']; + $item->title = $re['title']; + $item->date_from = $re['date_from']; + $item->date_to = $re['date_to']; + $item->tags = $re['tags']; + $item->image = $re['image']; + array_push($content->items, $item); + } + } + break; + case "detail": + $qe = mysqli_query($conn,"SELECT * FROM `".$_GET['type']."` WHERE id=".$_GET['id']); + if(mysqli_num_rows($qe)>0) { + $content = null; + $re = mysqli_fetch_array($qe); + $item = null; + $item->id = $re['id']; + $item->title = $re['title']; + $item->content = $re['content']; + $item->tags = $re['tags']; + $item->image = $re['image']; + if($_GET['type'] == 'exhibitions') { + $item->date_from = $re['date_from']; + $item->date_to = $re['date_to']; + $item->works = array(); + $qx = mysqli_query($conn,"SELECT id,title FROM `works` WHERE id IN (".$re['works'].")"); + while($re = mysqli_fetch_array($qx)) { + $ex = null; + $ex->id = $re['id']; + $ex->title = $re['title']; + array_push($item->works, $ex); + } + } else if($_GET['type'] == 'works') { + $item->type = $re['type']; + $item->exhibitions = array(); + $qx = mysqli_query($conn,"SELECT id,title FROM `exhibitions` WHERE id IN (".$re['exhibitions'].")"); + while($re = mysqli_fetch_array($qx)) { + $ex = null; + $ex->id = $re['id']; + $ex->title = $re['title']; + array_push($item->exhibitions, $ex); + } + } + $content->item = $item; + } + break; +} + + +header('Access-Control-Allow-Origin: *'); +header('Content-Type: application/json'); +echo json_encode($content); + +?> diff --git a/src/app/app-layout/app-layout.component.ts b/src/app/app-layout/app-layout.component.ts index 7174112..0b874c6 100644 --- a/src/app/app-layout/app-layout.component.ts +++ b/src/app/app-layout/app-layout.component.ts @@ -8,7 +8,7 @@ import type { Container } from 'tsparticles' }) export class AppLayoutComponent implements OnInit { - public particlesEnabled: boolean = true + public particlesEnabled: boolean = false public id: string = 'tsparticles' public particlesOptions: any = { diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 1b2066f..83b3dbc 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -21,7 +21,11 @@ const routes: Routes = [ { path: 'workshops', component: PortfolioComponent }, { path: 'detail', component: DetailComponent, children: [ - { path: '**', component: DetailComponent } + { path: '**', component: DetailComponent, + children: [ + { path: '**', component: DetailComponent } + ] + } ] } diff --git a/src/app/detail/detail.component.html b/src/app/detail/detail.component.html index 408cb39..f5aa256 100644 --- a/src/app/detail/detail.component.html +++ b/src/app/detail/detail.component.html @@ -3,7 +3,19 @@

{{details.title}}

-
- Tags: {{details.tags}} +
+ Tags: {{details.tags}} + + Exhibitions: + {{exhibition.title}} + + + Works: + {{work.title}} +
diff --git a/src/app/detail/detail.component.scss b/src/app/detail/detail.component.scss index 6900e99..aeeb2d8 100644 --- a/src/app/detail/detail.component.scss +++ b/src/app/detail/detail.component.scss @@ -22,13 +22,23 @@ .text { font-size: $font-18; text-align: justify; + padding-bottom: 40px; } - .tags { + .tags, + .links { display: block; font-size: $font-12; text-transform: uppercase; - padding-top: 40px; + padding: 5px 0; + + .link { + display: inline-block; + font-size: $font-12; + text-transform: uppercase; + padding: 0 5px; + cursor: pointer; + } } .back { diff --git a/src/app/detail/detail.component.ts b/src/app/detail/detail.component.ts index 760367f..9b5cf81 100644 --- a/src/app/detail/detail.component.ts +++ b/src/app/detail/detail.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core' -import { Router, NavigationEnd } from '@angular/router' +import { Router, NavigationEnd, NavigationStart, ActivatedRoute } from '@angular/router' import { Location } from '@angular/common' import { ApisService } from '../services/apis.service' @@ -11,19 +11,24 @@ import { ApisService } from '../services/apis.service' export class DetailComponent implements OnInit { public details: any = {} + private history: string[] = [] constructor( private apisService: ApisService, private router: Router, - private location: Location - ){ } + private location: Location, + private activeRoute: ActivatedRoute + ) { } ngOnInit(): void { - this.showDetails(this.router.url.split('/')[2]) + this.showDetails(this.router.url.split('/')[2], this.router.url.split('/')[3]) } - showDetails(id): void { - this.apisService.getDetails(id).toPromise().then((response) => { + showDetails(section, id): void { + this.apisService.getDetails(section, id).toPromise().then((response) => { + if(this.history[this.history.length - 1] != `/detail/${section}/${id}`) { + this.history.push(`/detail/${section}/${id}`) + } this.details = response.item },(error) => { console.error('getPortfolio ERROR', error) @@ -32,7 +37,14 @@ export class DetailComponent implements OnInit { }) } - back() { - this.location.back() + back(): void { + 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.location.back() + } else { + this.location.back() + } } } diff --git a/src/app/portfolio/portfolio.component.ts b/src/app/portfolio/portfolio.component.ts index ecdf1e1..6bf8d0f 100644 --- a/src/app/portfolio/portfolio.component.ts +++ b/src/app/portfolio/portfolio.component.ts @@ -27,7 +27,8 @@ export class PortfolioComponent implements OnInit { } showDetails(id): void { - this.router.navigate([`/detail/${id}`]) + const section = this.router.url.split('/')[1] == 'exhibitions' ? 'exhibitions' : 'works' + this.router.navigate([`/detail/${section}/${id}`]) } } diff --git a/src/app/services/apis.service.ts b/src/app/services/apis.service.ts index 3df86b3..ce4e16d 100644 --- a/src/app/services/apis.service.ts +++ b/src/app/services/apis.service.ts @@ -23,8 +23,8 @@ export class ApisService extends BaseService { ) } - getDetails(id): Observable { - let urlApi = `${this.restApi}?query=single&id=${id}` + getDetails(section, id): Observable { + let urlApi = `${this.restApi}?query=detail&type=${section}&id=${id}` return this.http.get(urlApi).pipe( catchError(this.handleError) ) diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 2128c6d..4e9ecb9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,5 +1,5 @@ export const environment = { production: false, - API_URL: `http://localhost/dslak_website/apis/` + API_URL: `http://dslakng.local/apis/` } From dd15765127d763bda76e865c35c057269e2c386b Mon Sep 17 00:00:00 2001 From: Dslak Date: Thu, 3 Dec 2020 13:37:49 +0100 Subject: [PATCH 11/38] add linked exhibitions and dates --- src/app/detail/detail.component.html | 8 +++++++ src/app/detail/detail.component.scss | 22 ++++++++++++++++-- src/app/detail/detail.component.ts | 10 +++++++-- src/app/portfolio/portfolio.component.html | 14 +++++++++++- src/app/portfolio/portfolio.component.scss | 26 ++++++++++++++++++++++ src/app/portfolio/portfolio.component.ts | 7 ++++-- src/assets/scss/global.scss | 14 ++++++++++++ 7 files changed, 94 insertions(+), 7 deletions(-) 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; From 6f3926de17b5122364abb7d357c788cb7837f1de Mon Sep 17 00:00:00 2001 From: Dslak Date: Thu, 3 Dec 2020 14:40:43 +0100 Subject: [PATCH 12/38] add video --- src/apis/index.php | 1 + src/app/detail/detail.component.html | 17 +++++++++++++++++ src/app/detail/detail.component.scss | 21 +++++++++++++++++++++ src/app/detail/detail.component.ts | 15 +++++++++++++-- 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/src/apis/index.php b/src/apis/index.php index 8adaa9a..2505490 100644 --- a/src/apis/index.php +++ b/src/apis/index.php @@ -71,6 +71,7 @@ switch($_GET['query']) { } } else if($_GET['type'] == 'works') { $item->type = $re['type']; + $item->videos = $re['videos']; $item->exhibitions = array(); $qx = mysqli_query($conn,"SELECT id,title FROM `exhibitions` WHERE id IN (".$re['exhibitions'].")"); while($re = mysqli_fetch_array($qx)) { diff --git a/src/app/detail/detail.component.html b/src/app/detail/detail.component.html index d9eed73..3840c58 100644 --- a/src/app/detail/detail.component.html +++ b/src/app/detail/detail.component.html @@ -12,6 +12,23 @@
+ +
+
+ {{video.title}} +
+ {{video.code}} + +
+
+
+ + Tags: {{details.tags}} Exhibitions: diff --git a/src/app/detail/detail.component.scss b/src/app/detail/detail.component.scss index 6d7c7c9..e7516ba 100644 --- a/src/app/detail/detail.component.scss +++ b/src/app/detail/detail.component.scss @@ -43,6 +43,27 @@ } } + .videos { + .video-title { + font-size: $font-18; + font-weight: bold; + padding-bottom: 5px; + } + + .youtube { + position: relative; + padding-bottom: 56.25%; + + .iframe{ + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + } + } + } + .tags, .links { display: block; diff --git a/src/app/detail/detail.component.ts b/src/app/detail/detail.component.ts index 1b0c36a..724e402 100644 --- a/src/app/detail/detail.component.ts +++ b/src/app/detail/detail.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core' import { Router, NavigationEnd, NavigationStart, ActivatedRoute } from '@angular/router' +import { DomSanitizer } from '@angular/platform-browser' import { Location } from '@angular/common' import { ApisService } from '../services/apis.service' @@ -19,7 +20,8 @@ export class DetailComponent implements OnInit { private apisService: ApisService, private router: Router, private location: Location, - private activeRoute: ActivatedRoute + private activeRoute: ActivatedRoute, + private sanitizer: DomSanitizer ) { } ngOnInit(): void { @@ -33,7 +35,16 @@ export class DetailComponent implements OnInit { if(this.history[this.history.length - 1] != `/detail/${section}/${id}`) { this.history.push(`/detail/${section}/${id}`) } - this.details = response.item + + const detail = response.item + detail.videos = detail.videos ? JSON.parse(detail.videos) : [] + detail.videos.forEach((e) => { + e.code = e.url.split('/').pop() + e.embed = this.sanitizer.bypassSecurityTrustResourceUrl(`https://www.youtube.com/embed/${e.code}`) + }) + this.details = detail + console.log(response.item) + },(error) => { console.error('getPortfolio ERROR', error) }).catch((e) => { From 2634aa53101a9cd55215b992a1aa312845cb9212 Mon Sep 17 00:00:00 2001 From: Dslak Date: Thu, 3 Dec 2020 15:09:02 +0100 Subject: [PATCH 13/38] add gallery --- src/apis/index.php | 1 + src/app/detail/detail.component.html | 13 +++++++++++++ src/app/detail/detail.component.scss | 25 +++++++++++++++++++++++++ src/app/detail/detail.component.ts | 1 + 4 files changed, 40 insertions(+) diff --git a/src/apis/index.php b/src/apis/index.php index 2505490..830ff2e 100644 --- a/src/apis/index.php +++ b/src/apis/index.php @@ -72,6 +72,7 @@ switch($_GET['query']) { } else if($_GET['type'] == 'works') { $item->type = $re['type']; $item->videos = $re['videos']; + $item->gallery = $re['gallery']; $item->exhibitions = array(); $qx = mysqli_query($conn,"SELECT id,title FROM `exhibitions` WHERE id IN (".$re['exhibitions'].")"); while($re = mysqli_fetch_array($qx)) { diff --git a/src/app/detail/detail.component.html b/src/app/detail/detail.component.html index 3840c58..02f93e2 100644 --- a/src/app/detail/detail.component.html +++ b/src/app/detail/detail.component.html @@ -4,6 +4,19 @@

{{details.title}}

+ +
+
+
+ {{image.title}} + +
+
+
+
from on diff --git a/src/app/detail/detail.component.scss b/src/app/detail/detail.component.scss index e7516ba..6fa4c52 100644 --- a/src/app/detail/detail.component.scss +++ b/src/app/detail/detail.component.scss @@ -43,6 +43,31 @@ } } + .gallery { + padding-top: 40px; + + .gallery-title { + font-size: $font-18; + font-weight: bold; + padding-bottom: 5px; + } + + .gallery-container { + position: relative; + //padding-bottom: 56.25%; + height: 180px; + + .image{ + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + object-fit: cover; + } + } + } + .videos { .video-title { font-size: $font-18; diff --git a/src/app/detail/detail.component.ts b/src/app/detail/detail.component.ts index 724e402..f620e03 100644 --- a/src/app/detail/detail.component.ts +++ b/src/app/detail/detail.component.ts @@ -42,6 +42,7 @@ export class DetailComponent implements OnInit { e.code = e.url.split('/').pop() e.embed = this.sanitizer.bypassSecurityTrustResourceUrl(`https://www.youtube.com/embed/${e.code}`) }) + detail.gallery = detail.gallery ? JSON.parse(detail.gallery) : [] this.details = detail console.log(response.item) From 87ee5e08d22330f6de0aa206e4943eece7ff0d82 Mon Sep 17 00:00:00 2001 From: Dslak Date: Thu, 3 Dec 2020 15:33:33 +0100 Subject: [PATCH 14/38] add image gallery zoom component --- package.json | 1 + src/app/app.module.ts | 2 + src/app/detail/detail.component.html | 19 ++++- src/app/detail/detail.component.scss | 7 ++ src/app/detail/detail.component.ts | 88 +++++++++++++++++++++- src/app/portfolio/portfolio.component.scss | 7 -- 6 files changed, 112 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 05dfa36..948d16c 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "@angular/router": "~9.1.7", "bootstrap": "^4.5.3", "ng-particles": "^2.1.11", + "ngx-image-gallery": "^2.0.5", "rxjs": "~6.5.4", "tslib": "^1.10.0", "zone.js": "~0.10.2" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index cb94103..ec33f1b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -2,6 +2,7 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { HttpClientModule } from '@angular/common/http'; import { NgParticlesModule } from "ng-particles"; +import { NgxImageGalleryModule } from 'ngx-image-gallery'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; @@ -24,6 +25,7 @@ import { DetailComponent } from './detail/detail.component'; BrowserModule, AppRoutingModule, NgParticlesModule, + NgxImageGalleryModule, HttpClientModule ], providers: [], diff --git a/src/app/detail/detail.component.html b/src/app/detail/detail.component.html index 02f93e2..15c2be3 100644 --- a/src/app/detail/detail.component.html +++ b/src/app/detail/detail.component.html @@ -6,13 +6,13 @@
-
+ 'col-md-3': details.gallery.length >= 3}">
{{image.title}} - +
@@ -57,3 +57,14 @@
+ + + diff --git a/src/app/detail/detail.component.scss b/src/app/detail/detail.component.scss index 6fa4c52..5e764b1 100644 --- a/src/app/detail/detail.component.scss +++ b/src/app/detail/detail.component.scss @@ -64,6 +64,13 @@ width: 100%; height: 100%; object-fit: cover; + cursor: pointer; + transition: transform .4s; + + &:hover { + transform: scale(1.2) rotate(1deg); + z-index: 10; + } } } } diff --git a/src/app/detail/detail.component.ts b/src/app/detail/detail.component.ts index f620e03..4e4fba0 100644 --- a/src/app/detail/detail.component.ts +++ b/src/app/detail/detail.component.ts @@ -1,7 +1,8 @@ -import { Component, OnInit } from '@angular/core' +import { Component, OnInit, ViewChild } from '@angular/core' import { Router, NavigationEnd, NavigationStart, ActivatedRoute } from '@angular/router' import { DomSanitizer } from '@angular/platform-browser' import { Location } from '@angular/common' +import { NgxImageGalleryComponent, GALLERY_IMAGE, GALLERY_CONF } from "ngx-image-gallery" import { ApisService } from '../services/apis.service' @Component({ @@ -11,11 +12,21 @@ import { ApisService } from '../services/apis.service' }) export class DetailComponent implements OnInit { + @ViewChild(NgxImageGalleryComponent) ngxImageGallery: NgxImageGalleryComponent + public details: any = {} public section: string = '' public id: number = 0 private history: string[] = [] + public conf: GALLERY_CONF = { + imageOffset: '0px', + showDeleteControl: false, + showImageTitle: false, + } + + public galleryImages: GALLERY_IMAGE[] = [] + constructor( private apisService: ApisService, private router: Router, @@ -43,6 +54,15 @@ export class DetailComponent implements OnInit { e.embed = this.sanitizer.bypassSecurityTrustResourceUrl(`https://www.youtube.com/embed/${e.code}`) }) detail.gallery = detail.gallery ? JSON.parse(detail.gallery) : [] + + detail.gallery.forEach((e) => { + this.galleryImages.push({ + url: e.url, + altText: e.title, + title: e.title, + thumbnailUrl: e.url + }) + }) this.details = detail console.log(response.item) @@ -65,4 +85,70 @@ export class DetailComponent implements OnInit { this.location.back() } } + + + + + + + + + + + + + + + + openGallery(index: number = 0) { + this.ngxImageGallery.open(index); + } + + // close gallery + closeGallery() { + this.ngxImageGallery.close(); + } + + // set new active(visible) image in gallery + newImage(index: number = 0) { + this.ngxImageGallery.setActiveImage(index); + } + + // next image in gallery + nextImage(index: number = 0) { + this.ngxImageGallery.next(); + } + + // prev image in gallery + prevImage(index: number = 0) { + this.ngxImageGallery.prev(); + } + + /**************************************************/ + + // EVENTS + // callback on gallery opened + galleryOpened(index) { + console.info('Gallery opened at index ', index); + } + + // callback on gallery closed + galleryClosed() { + console.info('Gallery closed.'); + } + + // callback on gallery image clicked + galleryImageClicked(index) { + console.info('Gallery image clicked with index ', index); + } + + // callback on gallery image changed + galleryImageChanged(index) { + console.info('Gallery image changed to index ', index); + } + + // callback on user clicked delete button + deleteImage(index) { + console.info('Delete image at index ', index); + } } diff --git a/src/app/portfolio/portfolio.component.scss b/src/app/portfolio/portfolio.component.scss index 4bf8974..d799a61 100644 --- a/src/app/portfolio/portfolio.component.scss +++ b/src/app/portfolio/portfolio.component.scss @@ -92,13 +92,6 @@ @each $angle in 0,1,2,3,4,5,6 { &.skew-#{$angle} { transform: skew(#{$angle - 3}deg, #{$angle - 3}deg); - /*animation: zoom#{$angle} #{$angle + 3}s ease-in infinite forwards; - @keyframes zoom#{$angle} { - 0% { transform: scale(1) skew(#{$angle - 3}deg, #{$angle - 3}deg); } - 50% { transform: scale(1.1) skew(#{$angle - 3}deg, #{$angle - 3}deg); } - 75% { transform: scale(.9) skew(#{$angle - 3}deg, #{$angle - 3}deg); } - 100% { transform: scale(1) skew(#{$angle - 3}deg, #{$angle - 3}deg); } - }*/ } } From 023840f0b5dc968275e6f6a9e9b31becc5fffc2d Mon Sep 17 00:00:00 2001 From: Dslak Date: Thu, 3 Dec 2020 15:40:20 +0100 Subject: [PATCH 15/38] remove log --- src/app/detail/detail.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/detail/detail.component.ts b/src/app/detail/detail.component.ts index 4e4fba0..8a0eb7f 100644 --- a/src/app/detail/detail.component.ts +++ b/src/app/detail/detail.component.ts @@ -64,7 +64,6 @@ export class DetailComponent implements OnInit { }) }) this.details = detail - console.log(response.item) },(error) => { console.error('getPortfolio ERROR', error) From 053b24b9776add9d3d0086ee22694a112842a569 Mon Sep 17 00:00:00 2001 From: Dslak Date: Thu, 3 Dec 2020 17:56:52 +0100 Subject: [PATCH 16/38] add autehntication --- src/apis/auth.php | 29 ++++++++++ src/app/admin/admin.component.html | 28 ++++++++++ src/app/admin/admin.component.scss | 58 ++++++++++++++++++++ src/app/admin/admin.component.spec.ts | 25 +++++++++ src/app/admin/admin.component.ts | 49 +++++++++++++++++ src/app/app-layout/app-layout.component.html | 5 +- src/app/app-layout/app-layout.component.ts | 5 +- src/app/app-routing.module.ts | 5 +- src/app/app.module.ts | 4 +- src/app/services/apis.service.ts | 1 + src/app/services/auth.service.spec.ts | 16 ++++++ src/app/services/auth.service.spec.ts_ | 16 ++++++ src/app/services/auth.service.ts | 33 +++++++++++ src/app/services/auth.service.ts_ | 27 +++++++++ 14 files changed, 295 insertions(+), 6 deletions(-) create mode 100755 src/apis/auth.php create mode 100644 src/app/admin/admin.component.html create mode 100644 src/app/admin/admin.component.scss create mode 100644 src/app/admin/admin.component.spec.ts create mode 100644 src/app/admin/admin.component.ts create mode 100644 src/app/services/auth.service.spec.ts create mode 100644 src/app/services/auth.service.spec.ts_ create mode 100644 src/app/services/auth.service.ts create mode 100644 src/app/services/auth.service.ts_ diff --git a/src/apis/auth.php b/src/apis/auth.php new file mode 100755 index 0000000..581c326 --- /dev/null +++ b/src/apis/auth.php @@ -0,0 +1,29 @@ +status = 404; + +if(isset($_POST['act']) && $_POST['act'] == 'auth') { + if($_POST['usr'] == 'admin' && $_POST['pwd'] == 'JohnHolmes') { + $content->status = 200; + $content->authToken = md5(date("Y-m-d")); + } else { + $content->status = 403; + } +} else if(isset($_POST['act']) && $_POST['act'] == 'check') { + if($_POST['token'] == md5(date("Y-m-d"))) { + $content->status = 200; + $content->authToken = md5(date("Y-m-d")); + } else { + $content->status = 403; + } +} + +header('Access-Control-Allow-Origin: *'); +header('Content-Type: application/json'); +echo json_encode($content); + +?> diff --git a/src/app/admin/admin.component.html b/src/app/admin/admin.component.html new file mode 100644 index 0000000..717bddf --- /dev/null +++ b/src/app/admin/admin.component.html @@ -0,0 +1,28 @@ +
+
+
+ +
+
+ +
+
+ Works + + + +
+
+
diff --git a/src/app/admin/admin.component.scss b/src/app/admin/admin.component.scss new file mode 100644 index 0000000..08ad394 --- /dev/null +++ b/src/app/admin/admin.component.scss @@ -0,0 +1,58 @@ +@import "../../assets/scss/variables"; + +.component-admin { + + .login-form-container { + text-align: center; + padding: 40px; + color: $white; + + .input { + width: 100%; + } + + .button { + background: $black; + } + } + + .menu { + background: $dark-gray; + + .section-title { + display: block; + width: 100%; + padding: 50px 10px 10px; + font-size: $font-22; + font-weight: bolder; + text-transform: uppercase; + color: $white; + text-align: center; + border-bottom: 1px dotted $white-alpha; + } + + .action { + display: block; + appearance: none; + border: none; + width: 100%; + padding: 10px; + font-size: $font-14; + text-transform: uppercase; + color: $white; + background: $dark-gray; + cursor: pointer; + border-bottom: 1px dotted $white-alpha; + } + } +} + +@media (min-width: map-get($grid-breakpoints, 'md')) { + .component-admin { + .menu { + height: 100vh; + background: $dark-gray; + } + } + +} diff --git a/src/app/admin/admin.component.spec.ts b/src/app/admin/admin.component.spec.ts new file mode 100644 index 0000000..72e742f --- /dev/null +++ b/src/app/admin/admin.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AdminComponent } from './admin.component'; + +describe('AdminComponent', () => { + let component: AdminComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AdminComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AdminComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts new file mode 100644 index 0000000..18082e0 --- /dev/null +++ b/src/app/admin/admin.component.ts @@ -0,0 +1,49 @@ +import { Component, OnInit } from '@angular/core' +import { AuthService } from '../services/auth.service' + +@Component({ + selector: 'app-admin', + templateUrl: './admin.component.html', + styleUrls: ['./admin.component.scss'] +}) +export class AdminComponent implements OnInit { + + public authCheck: boolean = false + + constructor(private authService: AuthService) { } + + ngOnInit(): void { + + const body = { + token: window.sessionStorage.getItem('authToken') + } + + this.authService.authCheck(body).toPromise().then((response) => { + this.authCheck = response.status == 200 + },(error) => { + console.error('Auth ERROR', error) + }).catch((e) => { + console.error('Auth CATCH', e) + }) + } + + + login(): void { + + const body = { + usr: 'admin', + pwd: 'JohnHolmes' + } + this.authService.login(body).toPromise().then((response) => { + this.authCheck = response.status == 200 + if(this.authCheck) { + window.sessionStorage.setItem('authToken', response.authToken) + } + },(error) => { + console.error('Auth ERROR', error) + }).catch((e) => { + console.error('Auth CATCH', e) + }) + + } +} diff --git a/src/app/app-layout/app-layout.component.html b/src/app/app-layout/app-layout.component.html index 10a7dc1..89a86da 100644 --- a/src/app/app-layout/app-layout.component.html +++ b/src/app/app-layout/app-layout.component.html @@ -1,4 +1,5 @@ - + - + diff --git a/src/app/app-layout/app-layout.component.ts b/src/app/app-layout/app-layout.component.ts index 0b874c6..956d7d3 100644 --- a/src/app/app-layout/app-layout.component.ts +++ b/src/app/app-layout/app-layout.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core' +import { Router } from '@angular/router' import type { Container } from 'tsparticles' @Component({ @@ -8,6 +9,7 @@ import type { Container } from 'tsparticles' }) export class AppLayoutComponent implements OnInit { + public page: string = '/' public particlesEnabled: boolean = false public id: string = 'tsparticles' @@ -90,9 +92,10 @@ export class AppLayoutComponent implements OnInit { detectRetina: true } - constructor() { } + constructor(private router: Router) { } ngOnInit(): void { + this.page = this.router.url } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 83b3dbc..453d579 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -4,6 +4,7 @@ import { AppLayoutComponent } from './app-layout/app-layout.component' import { AboutComponent } from './about/about.component' import { PortfolioComponent } from './portfolio/portfolio.component' import { DetailComponent } from './detail/detail.component' +import { AdminComponent } from './admin/admin.component' const routes: Routes = [ { @@ -27,8 +28,8 @@ const routes: Routes = [ ] } ] - } - + }, + { path: 'admin', component: AdminComponent } ] } ] diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ec33f1b..4962f37 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -11,6 +11,7 @@ import { AppLayoutComponent } from './app-layout/app-layout.component'; import { AboutComponent } from './about/about.component'; import { PortfolioComponent } from './portfolio/portfolio.component'; import { DetailComponent } from './detail/detail.component'; +import { AdminComponent } from './admin/admin.component'; @NgModule({ declarations: [ @@ -19,7 +20,8 @@ import { DetailComponent } from './detail/detail.component'; AppLayoutComponent, AboutComponent, PortfolioComponent, - DetailComponent + DetailComponent, + AdminComponent ], imports: [ BrowserModule, diff --git a/src/app/services/apis.service.ts b/src/app/services/apis.service.ts index ce4e16d..3e02ae0 100644 --- a/src/app/services/apis.service.ts +++ b/src/app/services/apis.service.ts @@ -30,4 +30,5 @@ export class ApisService extends BaseService { ) } + } diff --git a/src/app/services/auth.service.spec.ts b/src/app/services/auth.service.spec.ts new file mode 100644 index 0000000..f1251ca --- /dev/null +++ b/src/app/services/auth.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { AuthService } from './auth.service'; + +describe('AuthService', () => { + let service: AuthService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(AuthService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/auth.service.spec.ts_ b/src/app/services/auth.service.spec.ts_ new file mode 100644 index 0000000..f1251ca --- /dev/null +++ b/src/app/services/auth.service.spec.ts_ @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { AuthService } from './auth.service'; + +describe('AuthService', () => { + let service: AuthService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(AuthService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts new file mode 100644 index 0000000..3ee8d3c --- /dev/null +++ b/src/app/services/auth.service.ts @@ -0,0 +1,33 @@ +import { Injectable } from '@angular/core' +import { HttpClient, HttpHeaders, HttpParams, HttpRequest } from '@angular/common/http' +import { Observable, Subject, throwError } from 'rxjs' +import { catchError } from 'rxjs/operators' +import { BaseService } from './base-service' +import { environment } from '../../environments/environment' + +@Injectable({ + providedIn: 'root' +}) +export class AuthService extends BaseService { + + private restApi = `${environment.API_URL}` + + constructor(private http: HttpClient) { + super() + } + + login(body): Observable { + let urlApi = `${this.restApi}auth.php?act=login` + return this.http.post(urlApi, JSON.stringify(body)).pipe( + catchError(this.handleError) + ) + } + + authCheck(body): Observable { + let urlApi = `${this.restApi}auth.php?act=check` + return this.http.post(urlApi, JSON.stringify(body)).pipe( + catchError(this.handleError) + ) + } + +} diff --git a/src/app/services/auth.service.ts_ b/src/app/services/auth.service.ts_ new file mode 100644 index 0000000..dd4e29d --- /dev/null +++ b/src/app/services/auth.service.ts_ @@ -0,0 +1,27 @@ +import { Injectable } from '@angular/core' +import { HttpClient, HttpHeaders, HttpParams, HttpRequest } from '@angular/common/http' +import { Observable, Subject, throwError } from 'rxjs' +import { catchError } from 'rxjs/operators' +import { BaseService } from './base-service' +import { environment } from '../../environments/environment' + +@Injectable({ + providedIn: 'root' +}) +export class AuthService extends BaseService { + + private restApi = `${environment.API_URL}` + + constructor(private http: HttpClient) { + super() + } + + login(body): Observable { + let urlApi = `${this.restApi}auth.php` + return this.http.post(urlApi, body).pipe( + catchError(this.handleError) + ) + } + + +} From 4d67f36c578475cf05ecbe406fb8b486e2c89586 Mon Sep 17 00:00:00 2001 From: Dslak Date: Thu, 3 Dec 2020 18:15:33 +0100 Subject: [PATCH 17/38] add autentication --- src/apis/auth.php | 21 ++-- src/apis/index.php | 170 ++++++++++++++++------------- src/app/admin/admin.component.html | 12 +- src/app/admin/admin.component.scss | 6 +- src/app/admin/admin.component.ts | 6 +- src/app/app.module.ts | 2 + src/assets/scss/forms.scss | 76 +++++++++++++ src/assets/scss/main.scss | 1 + 8 files changed, 198 insertions(+), 96 deletions(-) create mode 100644 src/assets/scss/forms.scss diff --git a/src/apis/auth.php b/src/apis/auth.php index 581c326..1e206e5 100755 --- a/src/apis/auth.php +++ b/src/apis/auth.php @@ -4,26 +4,29 @@ $GLOBALS['conn']; $conn=@mysqli_connect($DATAhst,$DATAusr,$DATApwd,$DATAdtb)or die("CONNECTION ERROR"); $content = null; -$content->status = 404; +$content->status = array(); +$data = json_decode(file_get_contents("php://input")); -if(isset($_POST['act']) && $_POST['act'] == 'auth') { - if($_POST['usr'] == 'admin' && $_POST['pwd'] == 'JohnHolmes') { +if(isset($_GET['act']) && $_GET['act'] == 'login') { + if($data->usr == 'admin' && $data->pwd == 'JohnHolmes') { $content->status = 200; - $content->authToken = md5(date("Y-m-d")); + $content->authToken = base64_encode(date("Y-m-d")); } else { $content->status = 403; } -} else if(isset($_POST['act']) && $_POST['act'] == 'check') { - if($_POST['token'] == md5(date("Y-m-d"))) { +} else if(isset($_GET['act']) && $_GET['act'] == 'check') { + if($data->token == base64_encode(date("Y-m-d"))) { $content->status = 200; - $content->authToken = md5(date("Y-m-d")); + $content->authToken = base64_encode(date("Y-m-d")); } else { $content->status = 403; } } +header("Access-Control-Allow-Origin: *"); +header("Content-Type: application/json; charset=UTF-8"); +header("Access-Control-Allow-Methods: POST"); +header("Access-Control-Max-Age: 3600"); -header('Access-Control-Allow-Origin: *'); -header('Content-Type: application/json'); echo json_encode($content); ?> diff --git a/src/apis/index.php b/src/apis/index.php index 830ff2e..e8e2b18 100644 --- a/src/apis/index.php +++ b/src/apis/index.php @@ -4,92 +4,114 @@ $GLOBALS['conn']; $conn=@mysqli_connect($DATAhst,$DATAusr,$DATApwd,$DATAdtb)or die("CONNECTION ERROR"); $content = null; -$content->items = array(); -$filter = array("portfolio", "installations", "entertainment", "performances", "workshops"); +if(isset($_GET['query'])) { -switch($_GET['query']) { - case "portfolio": - case "installations": - case "entertainment": - case "performances": - case "workshops": - if($_GET['query'] == 'portfolio') {$filter = '';} else {$filter = "WHERE type='".$_GET['query']."'";} - $qe = mysqli_query($conn,"SELECT * FROM `works` $filter ORDER BY id DESC"); - if(mysqli_num_rows($qe) > 0) { - $content = null; - $content->items = array(); - while($re = mysqli_fetch_array($qe)) { - $item = null; - $item->id = $re['id']; - $item->title = $re['title']; - $item->type = $re['type']; - $item->tags = $re['tags']; - $item->image = $re['image']; - array_push($content->items, $item); + $content->items = array(); + switch($_GET['query']) { + case "portfolio": + case "installations": + case "entertainment": + case "performances": + case "workshops": + if($_GET['query'] == 'portfolio') {$filter = '';} else {$filter = "WHERE type='".$_GET['query']."'";} + $qe = mysqli_query($conn,"SELECT * FROM `works` $filter ORDER BY id DESC"); + if(mysqli_num_rows($qe) > 0) { + $content = null; + $content->items = array(); + while($re = mysqli_fetch_array($qe)) { + $item = null; + $item->id = $re['id']; + $item->title = $re['title']; + $item->type = $re['type']; + $item->tags = $re['tags']; + $item->image = $re['image']; + array_push($content->items, $item); + } + } + break; + case "exhibitions": + $qe = mysqli_query($conn,"SELECT * FROM `exhibitions` ORDER BY date_from DESC"); + if(mysqli_num_rows($qe) > 0) { + $content = null; + $content->items = array(); + while($re = mysqli_fetch_array($qe)) { + $item = null; + $item->id = $re['id']; + $item->title = $re['title']; + $item->date_from = $re['date_from']; + $item->date_to = $re['date_to']; + $item->tags = $re['tags']; + $item->image = $re['image']; + array_push($content->items, $item); + } } - } - break; - case "exhibitions": - $qe = mysqli_query($conn,"SELECT * FROM `exhibitions` ORDER BY date_from DESC"); - if(mysqli_num_rows($qe) > 0) { - $content = null; - $content->items = array(); - while($re = mysqli_fetch_array($qe)) { + break; + case "detail": + $qe = mysqli_query($conn,"SELECT * FROM `".$_GET['type']."` WHERE id=".$_GET['id']); + if(mysqli_num_rows($qe)>0) { + $content = null; + $re = mysqli_fetch_array($qe); $item = null; $item->id = $re['id']; $item->title = $re['title']; - $item->date_from = $re['date_from']; - $item->date_to = $re['date_to']; + $item->content = $re['content']; $item->tags = $re['tags']; $item->image = $re['image']; - array_push($content->items, $item); - } - } - break; - case "detail": - $qe = mysqli_query($conn,"SELECT * FROM `".$_GET['type']."` WHERE id=".$_GET['id']); - if(mysqli_num_rows($qe)>0) { - $content = null; - $re = mysqli_fetch_array($qe); - $item = null; - $item->id = $re['id']; - $item->title = $re['title']; - $item->content = $re['content']; - $item->tags = $re['tags']; - $item->image = $re['image']; - if($_GET['type'] == 'exhibitions') { - $item->date_from = $re['date_from']; - $item->date_to = $re['date_to']; - $item->works = array(); - $qx = mysqli_query($conn,"SELECT id,title FROM `works` WHERE id IN (".$re['works'].")"); - while($re = mysqli_fetch_array($qx)) { - $ex = null; - $ex->id = $re['id']; - $ex->title = $re['title']; - array_push($item->works, $ex); - } - } else if($_GET['type'] == 'works') { - $item->type = $re['type']; - $item->videos = $re['videos']; - $item->gallery = $re['gallery']; - $item->exhibitions = array(); - $qx = mysqli_query($conn,"SELECT id,title FROM `exhibitions` WHERE id IN (".$re['exhibitions'].")"); - while($re = mysqli_fetch_array($qx)) { - $ex = null; - $ex->id = $re['id']; - $ex->title = $re['title']; - array_push($item->exhibitions, $ex); + if($_GET['type'] == 'exhibitions') { + $item->date_from = $re['date_from']; + $item->date_to = $re['date_to']; + $item->works = array(); + $qx = mysqli_query($conn,"SELECT id,title FROM `works` WHERE id IN (".$re['works'].")"); + while($re = mysqli_fetch_array($qx)) { + $ex = null; + $ex->id = $re['id']; + $ex->title = $re['title']; + array_push($item->works, $ex); + } + } else if($_GET['type'] == 'works') { + $item->type = $re['type']; + $item->videos = $re['videos']; + $item->gallery = $re['gallery']; + $item->exhibitions = array(); + $qx = mysqli_query($conn,"SELECT id,title FROM `exhibitions` WHERE id IN (".$re['exhibitions'].")"); + while($re = mysqli_fetch_array($qx)) { + $ex = null; + $ex->id = $re['id']; + $ex->title = $re['title']; + array_push($item->exhibitions, $ex); + } } + $content->item = $item; } - $content->item = $item; - } - break; -} + break; + } +} else if(isset($_GET['auth'])) { + switch($_GET['auth']) { + case 'auth': + if($_POST['usr'] == 'admin' && $_POST['pwd'] == 'JohnHolmes') { + $content->status = 200; + $content->authToken = md5(date("Y-m-d")); + } else { + $content->status = 403; + } + break; + case 'check': + if($_POST['token'] == md5(date("Y-m-d"))) { + $content->status = 200; + $content->authToken = md5(date("Y-m-d")); + } else { + $content->status = 403; + } + break; + } +} -header('Access-Control-Allow-Origin: *'); -header('Content-Type: application/json'); +header("Access-Control-Allow-Origin: *"); +header("Content-Type: application/json; charset=UTF-8"); +header("Access-Control-Allow-Methods: GET"); +header("Access-Control-Max-Age: 3600"); echo json_encode($content); ?> diff --git a/src/app/admin/admin.component.html b/src/app/admin/admin.component.html index 717bddf..618f8eb 100644 --- a/src/app/admin/admin.component.html +++ b/src/app/admin/admin.component.html @@ -1,19 +1,19 @@
-
diff --git a/src/app/admin/admin.component.scss b/src/app/admin/admin.component.scss index 08ad394..af3b1e3 100644 --- a/src/app/admin/admin.component.scss +++ b/src/app/admin/admin.component.scss @@ -7,12 +7,8 @@ padding: 40px; color: $white; - .input { - width: 100%; - } - .button { - background: $black; + width: 300px; } } diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts index 18082e0..d8aa620 100644 --- a/src/app/admin/admin.component.ts +++ b/src/app/admin/admin.component.ts @@ -9,6 +9,8 @@ import { AuthService } from '../services/auth.service' export class AdminComponent implements OnInit { public authCheck: boolean = false + public userName: string = '' + public password: string = '' constructor(private authService: AuthService) { } @@ -31,8 +33,8 @@ export class AdminComponent implements OnInit { login(): void { const body = { - usr: 'admin', - pwd: 'JohnHolmes' + usr: this.userName, + pwd: this.password } this.authService.login(body).toPromise().then((response) => { this.authCheck = response.status == 200 diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 4962f37..ac157ca 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,7 @@ import { NgModule } from '@angular/core'; import { HttpClientModule } from '@angular/common/http'; import { NgParticlesModule } from "ng-particles"; import { NgxImageGalleryModule } from 'ngx-image-gallery'; +import { FormsModule } from '@angular/forms' import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; @@ -28,6 +29,7 @@ import { AdminComponent } from './admin/admin.component'; AppRoutingModule, NgParticlesModule, NgxImageGalleryModule, + FormsModule, HttpClientModule ], providers: [], diff --git a/src/assets/scss/forms.scss b/src/assets/scss/forms.scss new file mode 100644 index 0000000..28abac5 --- /dev/null +++ b/src/assets/scss/forms.scss @@ -0,0 +1,76 @@ + + +input, +button, +textarea { + border: none; + border-radius: 4px; + background: $white; + appearance: none; + font-family: $font-primary; + font-size: $font-20; + resize: none; + &::-ms-clear { + display: none; + } + &:focus {outline:none;} + &::-moz-focus-inner {border:0;} +} + +input[type=text], +input[type=password]{ + color: $gray; + padding: 10px 20px; + width: 100%; + text-align: left; + box-sizing: border-box; + &:focus::placeholder { + color: transparent; + } +} + +.input-text { + padding: 10px 20px; +} + +.input-textarea { + padding: 10px; + width: 100%; +} + +.button { + position: relative; + appearance: none; + color: $white; + border: none; + background: $black; + display: inline-block; + padding: 8px 20px 10px 20px; + text-align: center; + font-family: $font-20; + text-transform: uppercase; + font-weight: 500; + transition: opacity .3s; + white-space: nowrap; + outline: none; + cursor: pointer; + + &:disabled { + opacity: 0.5; + } + + &.button-white { + background: $white; + color: $black !important; + &:before { + content: ''; + height: 100%; + width: 100%; + position: absolute; + left: 0; + top: 0; + z-index: 1; + border: 1px solid $light-gray; + } + } +} diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss index faf70d3..05094d3 100644 --- a/src/assets/scss/main.scss +++ b/src/assets/scss/main.scss @@ -1,6 +1,7 @@ @import "./variables"; @import "./fonts"; @import "./icons"; +@import "./forms"; @import "./global"; From ed78021d92428eb26d297b8268ad8663fecd97d3 Mon Sep 17 00:00:00 2001 From: Dslak Date: Thu, 3 Dec 2020 19:11:44 +0100 Subject: [PATCH 18/38] wip add form --- src/app/admin/admin.component.html | 59 +++++++++++++++++++++++++++--- src/app/admin/admin.component.scss | 40 +++++++++++++++++++- src/app/admin/admin.component.ts | 44 ++++++++++++++++------ src/assets/scss/forms.scss | 19 ++++++++-- 4 files changed, 141 insertions(+), 21 deletions(-) diff --git a/src/app/admin/admin.component.html b/src/app/admin/admin.component.html index 618f8eb..4701d01 100644 --- a/src/app/admin/admin.component.html +++ b/src/app/admin/admin.component.html @@ -18,11 +18,60 @@
-
- Works - - - +
+
+ Works + + + +
+
+
+
+ Add work +
+
+ Title + +
+
+ Type + +
+
+ Content + +
+
+ Tags + +
+
+ Main image + +
+
+ Exhibitions + +
+
+ Selected exhibitions + + {{se.title}} + +
+
+
diff --git a/src/app/admin/admin.component.scss b/src/app/admin/admin.component.scss index af3b1e3..d3d1aa7 100644 --- a/src/app/admin/admin.component.scss +++ b/src/app/admin/admin.component.scss @@ -12,6 +12,36 @@ } } + .edit-container { + .title { + display: block; + font-size: $font-30; + font-weight: bolder; + text-transform: uppercase; + padding: 20px 0; + } + .form { + .label { + display: block; + font-size: $font-20; + text-transform: uppercase; + padding: 20px 0 5px 0; + } + + .selected-exhibition { + display: block; + font-size: $font-16; + font-weight: bolder; + border-radius: 4px; + border: 2px solid $white; + background: $white-alpha; + cursor: pointer; + padding: 8px 20px; + margin-bottom: 5px; + } + } + } + .menu { background: $dark-gray; @@ -46,9 +76,17 @@ @media (min-width: map-get($grid-breakpoints, 'md')) { .component-admin { .menu { + position: fixed; height: 100vh; - background: $dark-gray; + width: 25%; } } +} +@media (min-width: map-get($grid-breakpoints, 'lg')) { + .component-admin { + .menu { + width: 16.66%; + } + } } diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts index d8aa620..686c8a2 100644 --- a/src/app/admin/admin.component.ts +++ b/src/app/admin/admin.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core' +import { ApisService } from '../services/apis.service' import { AuthService } from '../services/auth.service' @Component({ @@ -11,17 +12,28 @@ export class AdminComponent implements OnInit { public authCheck: boolean = false public userName: string = '' public password: string = '' + public activeEditor: string = '' + public exhibitions: any = [] - constructor(private authService: AuthService) { } + public selectedExhibitions: any = [] - ngOnInit(): void { - - const body = { - token: window.sessionStorage.getItem('authToken') - } + constructor( + private authService: AuthService, + private apisService: ApisService + ) { } + ngOnInit(): void { + const body = { token: window.sessionStorage.getItem('authToken') } this.authService.authCheck(body).toPromise().then((response) => { this.authCheck = response.status == 200 + + this.apisService.getPortfolio('exhibitions').toPromise().then((response) => { + this.exhibitions = response.items + },(error) => { + console.error('getPortfolio ERROR', error) + }).catch((e) => { + console.error('getPortfolio CATCH', e) + }) },(error) => { console.error('Auth ERROR', error) }).catch((e) => { @@ -31,11 +43,7 @@ export class AdminComponent implements OnInit { login(): void { - - const body = { - usr: this.userName, - pwd: this.password - } + const body = { usr: this.userName, pwd: this.password } this.authService.login(body).toPromise().then((response) => { this.authCheck = response.status == 200 if(this.authCheck) { @@ -46,6 +54,20 @@ export class AdminComponent implements OnInit { }).catch((e) => { console.error('Auth CATCH', e) }) + } + + showEditor(section): void { + this.activeEditor = section + } + + exhibitionAdd(e, id): void { + //e.originalTarget.value = '' + this.selectedExhibitions.push( + this.exhibitions.filter(item => item.id == id)[0] + ) + } + exhibitionRemove(id): void { + this.selectedExhibitions = this.selectedExhibitions.filter(item => item.id != id) } } diff --git a/src/assets/scss/forms.scss b/src/assets/scss/forms.scss index 28abac5..12f4a41 100644 --- a/src/assets/scss/forms.scss +++ b/src/assets/scss/forms.scss @@ -1,6 +1,7 @@ input, +select, button, textarea { border: none; @@ -18,8 +19,10 @@ textarea { } input[type=text], -input[type=password]{ - color: $gray; +input[type=password], +input[type=file], +select { + color: $black; padding: 10px 20px; width: 100%; text-align: left; @@ -30,7 +33,11 @@ input[type=password]{ } .input-text { - padding: 10px 20px; + padding: 10px 20px !important; +} + +.input-file { + padding: 6px 20px !important; } .input-textarea { @@ -38,6 +45,10 @@ input[type=password]{ width: 100%; } +.input-select { + padding: 9px 20px !important; +} + .button { position: relative; appearance: none; @@ -45,7 +56,7 @@ input[type=password]{ border: none; background: $black; display: inline-block; - padding: 8px 20px 10px 20px; + padding: 8px 20px 10px 20px !important; text-align: center; font-family: $font-20; text-transform: uppercase; From 1a4ab2f2cefd9b71d4615a18f00c0098fa525daa Mon Sep 17 00:00:00 2001 From: Dslak Date: Fri, 4 Dec 2020 10:30:00 +0100 Subject: [PATCH 19/38] add exhibitions and videos wip --- src/app/admin/admin.component.html | 34 +++++++++++++++++++++++------ src/app/admin/admin.component.scss | 27 +++++++++++++++++++---- src/app/admin/admin.component.ts | 21 +++++++++++++++++- src/assets/fonts/icomoon.eot | Bin 5512 -> 5964 bytes src/assets/fonts/icomoon.svg | 3 +++ src/assets/fonts/icomoon.ttf | Bin 5348 -> 5800 bytes src/assets/fonts/icomoon.woff | Bin 5424 -> 5876 bytes src/assets/fonts/selection.json | 2 +- src/assets/scss/forms.scss | 2 +- src/assets/scss/global.scss | 5 ++--- src/assets/scss/icons.scss | 10 +++++++++ src/assets/scss/variables.scss | 2 +- 12 files changed, 88 insertions(+), 18 deletions(-) diff --git a/src/app/admin/admin.component.html b/src/app/admin/admin.component.html index 4701d01..6909bdf 100644 --- a/src/app/admin/admin.component.html +++ b/src/app/admin/admin.component.html @@ -21,9 +21,9 @@
Works - - - + + +
@@ -58,16 +58,36 @@
Exhibitions + + Selected exhibitions + + {{se.date_from | date}} | {{se.title}} +
+
- Selected exhibitions - - {{se.title}} + Video +
+ +
+
+ +
+
+ +
+ + Selected Videos + + {{sv.type | date}} | {{sv.title}}
diff --git a/src/app/admin/admin.component.scss b/src/app/admin/admin.component.scss index d3d1aa7..724a4e3 100644 --- a/src/app/admin/admin.component.scss +++ b/src/app/admin/admin.component.scss @@ -28,16 +28,28 @@ padding: 20px 0 5px 0; } - .selected-exhibition { + .selected-exhibition, + .selected-video { display: block; + position: relative; font-size: $font-16; font-weight: bolder; border-radius: 4px; border: 2px solid $white; background: $white-alpha; cursor: pointer; - padding: 8px 20px; + padding: 8px 50px 8px 15px; margin-bottom: 5px; + + &:before { + content: '\e903'; + position: absolute; + top: 8px; + right: 10px; + font-family: $font-icon; + font-size: $font-20; + color: $gray; + } } } } @@ -54,13 +66,14 @@ text-transform: uppercase; color: $white; text-align: center; - border-bottom: 1px dotted $white-alpha; + border-bottom: 1px solid $black-alpha; } .action { display: block; appearance: none; border: none; + border-radius: 0px; width: 100%; padding: 10px; font-size: $font-14; @@ -68,7 +81,13 @@ color: $white; background: $dark-gray; cursor: pointer; - border-bottom: 1px dotted $white-alpha; + border-bottom: 1px solid $black-alpha; + + &.active { + background: $yellow; + color: $black; + border: none; + } } } } diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts index 686c8a2..ccb397c 100644 --- a/src/app/admin/admin.component.ts +++ b/src/app/admin/admin.component.ts @@ -14,8 +14,10 @@ export class AdminComponent implements OnInit { public password: string = '' public activeEditor: string = '' public exhibitions: any = [] + public videos: any = [] public selectedExhibitions: any = [] + public selectedVideos: any = [] constructor( private authService: AuthService, @@ -61,13 +63,30 @@ export class AdminComponent implements OnInit { } exhibitionAdd(e, id): void { - //e.originalTarget.value = '' this.selectedExhibitions.push( this.exhibitions.filter(item => item.id == id)[0] ) + this.exhibitions = this.exhibitions.filter(item => item.id != id) } exhibitionRemove(id): void { + this.exhibitions.push( + this.selectedExhibitions.filter(item => item.id == id)[0] + ) this.selectedExhibitions = this.selectedExhibitions.filter(item => item.id != id) } + + videoAdd(e, id): void { + this.selectedVideos.push( + this.videos.filter(item => item.id == id)[0] + ) + this.videos = this.videos.filter(item => item.id != id) + } + + videoRemove(id): void { + this.videos.push( + this.selectedVideos.filter(item => item.id == id)[0] + ) + this.selectedVideos = this.selectedVideos.filter(item => item.id != id) + } } diff --git a/src/assets/fonts/icomoon.eot b/src/assets/fonts/icomoon.eot index 80e12dbd43409d270b9fdf8364ea878bce2e3512..3a37fe3bf3fc924eb97c400db854f09cba16008d 100644 GIT binary patch delta 788 zcmY*XPiWI{6n^iQ^p}R_Pt&9coujPFy21i2>$>jXRCZ8Nc2pT6xON*h;SzW2SCta`7Ce9{59 zZ?EyHSlTLU?boKYc4EdD27sqz(=*N5;-mC~duuOyTbrqm4*~EQKx(`(SDWqGy}bco z{-U~Sg96fX;T?cgAw1A%F0ULtz?KM45uUoRFjLE)?mI%5IH1_9tt^6zD&hBp`{rxS zxm(BOp8#oscy)1MX&D511$#BjgCO9w_AFjUq5TE-r(^o6eo0@}OWLM(S({LAQZcqC zSa16bJJ&+!KwUV=zCsQlU&xiKqm@B7H&(3_2Kyz{P|`4M*$&#}FvhYz?iiVj5g5Lz zDg#Q;6=KMcbMy$Q>RmsRGBUpEs!EuXL@_SPIuE*0HR%N(RUylcfk_9!7SUofOUG~^ zw;UgVm=K}{-;Y?C`kOE%LRyL`s;khh0wll_LGU069!wH@*>(6p9gmk%L5Xt@&ZZT(M)aD|j}N#b0WcRvL`kTYkuD;qp` zlStr@l$4p*Q!-MPl`={_LA_p&G}r5q=Km4va?X?S0OVwh6nQvwDlP?`VWm$AHYLe2 zQpJ4?h|Nd`KDD}Z%UX^2T$T93waJBRZ@*xp$zH9zRXVGWe}jY=etCGi)4B84w=Hul zXYa+MBrtM>3uGNKpDfXyHV=<9;0DI=B7SE5Y+VqAd0|}?W9Ru3X+ZiOe=KLI5y@;! QKzMKfMt_dE{lVP8KUyxA{Qv*} delta 316 zcmX@3*P+eUANAwU|`q-#0kl{i3Qs@*Y!<2Aya>)pz1RN z1LFY(27#W8)Wj62pF-&j3_?CYb!Hhr0ro@8H-Y>XAYUaTx1_?_mf<##zXHhj$;nSn zl-wdG2jqVN@-=c3D+(AC7+mh-tLC%goeEUUIN6a&W^xQu=H^lsV*!~L zuU1@*=ePOFz|8_OhvD|yw0|&q@(~epQDKNUSdxJWNCElklVwC*6=yLDF?uoXW71)o g# + + + diff --git a/src/assets/fonts/icomoon.ttf b/src/assets/fonts/icomoon.ttf index ccc99c46565654ac321127d864d74a3c753b1f3c..98fc19ccdf2745419e471fd1d403f33dc7b97fa7 100644 GIT binary patch delta 812 zcmY*Y&ubG=5T1E&^EOL%v)N6uF}1{|+cwx>W7D)fSS>xMC z07PI3I2=B6wouefy`LgmWS1tZPVH6lD`C;VvInXi$L5#A&po}RgJWzF1PC;S$` z9H~q>m)mw9t^&k=QGTdG0r?&O2#_cd?y6K57Ec~!^Moe|Pt43sjyc^II!;i4NT9Fk zEY`qAjqoSJ9kWh#>cMH{CqR-Q-m1;bFOX1rtYtqBoZr6p_73vKI37uc^kx0JzMvPP zYtft0G3`Db#l|z-*I36;<26?52u&#SbL=Z*0lIV9;?Q8J$IcE9m2y3uGDcC3VlrW+ z&?@>dmT_^%NT&_Ya5YWsQoR-rAwwZBPe{|AxM|Z!yPB=3eomI8u%zh1YXzrCF}SGl z3_AsJ+6mT)7K2_o`VB=QQ+x##Zjae4OhUussAbAOQc-L zvJkqm``P<}f~9s_iXpuBkqGw6F@@#Z3Wk|Tm`0(^E0@cG=5jgE{6AtXAw(?fff5Um zqCEDV56fP&U+qx6HCav=X5W4W#AYNtmr8BgrQ;Bvtr4F;HaUOnjRR~j)*dasC|uM> zzClFt?;bwvG#~%1pI{qF#3Ap8>8`6`~&J5nO^_^ delta 358 zcmZ3X`$V&zfsuiMft#U$ftkU;KUm+0Ux;5CD6$8L6OwZi3$}5t>tkSGlmYVRq$d^^ z0BHdre+Q7}NYANEyHZf~8OT2X6z<7LO-zycDU{B@Amjs-H_HGDupeT+3FNl``6?N? zB^B1T47Y*&6+pgEPJXguqU07iIiSE7pnyhhVnqRi0wXU2gD}WKg}lVv)R|tKzkz%k zpe1bu`NbtbhXR4f5s*9sGjqwr1Ko@alYJPiMVa_p`HT4r`E~e~^HuZN@lFLQWt_Z_ zQDX82M%KwY88bFtWHuI%dGTt+)p&lJuMFHQAd?twzfJoGqbDnfn2QQS#KDpbOh5|A zSD#!V;;KE1QHartaUYWo(=?`i%sMQSSRb+Zuq&`X;BW(nqc9^k0}ogq6VP7a&CH@p F83FMkP`UsB diff --git a/src/assets/fonts/icomoon.woff b/src/assets/fonts/icomoon.woff index 84f93b7b502e87e66daa3f32db8568f4c52a6563..97305ed3ccbec219660dd91c31a5164c3696781f 100644 GIT binary patch delta 845 zcmY*XO>5L(5T1FHeUq@sW|Pfk*(yu7X}j31UAp$;U{yR=KM*}B;zhExcF}HIY|(mg zdlFF)bfHxIz=MKxQ3?eS@zmeodeKwxqL(665Vg^HQ!N;HGMQ)Qoq3)lD?J;#ovSBD zM*)E@cLU;4eBStq&OIjI?M>DD$7=oz09L8;P~cVi<&z12mN+I;uKq=GV)EJr;&cFe zL}1zev{D`S&jUC|sAou^ZS%piDv`u3P~It^tVtiMwYhoXo>G2B;P5^+J2^c@eJ7k> zMDz)Cooyej`SY|m-Aj3U1P_fVzcxR5-SFrukexUb zWsr)Hgd&L7Q+6{sOj`~o*&6Z~I@O?avJxWqz#kP`VJC1FY+QLeu5^1hfBF+D2 zti?G`sv&5}7%3`Z&uLW&oBevb9xf}2W7&N>7|=8;9R_sNqj%~1G|w|=p0G_p*j~NF z29rAzm%U|?X(07}dO;ccAj z`qC4NfnrQ7Kt2Z)3#8{%rUAux7#IY4K=?{Q)#r@V#1sYwp&39mW*{u}Qz$(HCtOMxCHV~fa#reA+zqkbGApy8LW+021xnwdAV>cti`V$mPxFS*nHR(*dK5}f?Sx9 Tn*kVLK)?jFS$MO*=u$=i*27fr diff --git a/src/assets/fonts/selection.json b/src/assets/fonts/selection.json index 167f908..e3b41d3 100644 --- a/src/assets/fonts/selection.json +++ b/src/assets/fonts/selection.json @@ -1 +1 @@ -{"IcoMoonType":"selection","icons":[{"icon":{"paths":["M950.857 859.429v-438.857c-12 13.714-25.143 26.286-39.429 37.714-81.714 62.857-164 126.857-243.429 193.143-42.857 36-96 80-155.429 80h-1.143c-59.429 0-112.571-44-155.429-80-79.429-66.286-161.714-130.286-243.429-193.143-14.286-11.429-27.429-24-39.429-37.714v438.857c0 9.714 8.571 18.286 18.286 18.286h841.143c9.714 0 18.286-8.571 18.286-18.286zM950.857 258.857c0-14.286 3.429-39.429-18.286-39.429h-841.143c-9.714 0-18.286 8.571-18.286 18.286 0 65.143 32.571 121.714 84 162.286 76.571 60 153.143 120.571 229.143 181.143 30.286 24.571 85.143 77.143 125.143 77.143h1.143c40 0 94.857-52.571 125.143-77.143 76-60.571 152.571-121.143 229.143-181.143 37.143-29.143 84-92.571 84-141.143zM1024 237.714v621.714c0 50.286-41.143 91.429-91.429 91.429h-841.143c-50.286 0-91.429-41.143-91.429-91.429v-621.714c0-50.286 41.143-91.429 91.429-91.429h841.143c50.286 0 91.429 41.143 91.429 91.429z"],"width":1024,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["envelope-o"],"defaultCode":61443,"grid":14},"attrs":[],"properties":{"name":"envelope-o","id":0,"order":47,"prevSize":28,"code":61443},"setIdx":0,"setId":0,"iconIdx":0},{"icon":{"paths":["M731.429 348.571c-21.714 9.714-44.571 16-69.143 19.429 25.143-14.857 44-38.857 53.143-66.857-23.429 13.714-49.143 24-76.571 29.143-21.714-23.429-53.143-37.714-87.429-37.714-66.286 0-120 53.714-120 120 0 9.143 0.571 18.857 2.857 27.429-100-5.143-188.571-52.571-248-125.714-10.286 17.714-16.571 38.857-16.571 60.571 0 41.714 19.429 78.286 52 100-20-0.571-38.857-6.286-57.143-14.857v1.143c0 58.286 44 106.857 98.857 117.714-10.286 2.857-18.286 4.571-29.143 4.571-7.429 0-14.857-1.143-22.286-2.286 15.429 47.429 59.429 82.286 112 83.429-41.143 32-92.571 51.429-149.143 51.429-9.714 0-19.429-0.571-28.571-1.714 53.143 33.714 116 53.714 184 53.714 220.571 0 341.714-182.857 341.714-341.714 0-5.143 0-10.286-0.571-15.429 23.429-16.571 44-37.714 60-62.286zM877.714 237.714v548.571c0 90.857-73.714 164.571-164.571 164.571h-548.571c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571c90.857 0 164.571 73.714 164.571 164.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["twitter-square"],"defaultCode":61569,"grid":14},"attrs":[],"properties":{"name":"twitter-square","id":1,"order":31,"prevSize":28,"code":61569},"setIdx":0,"setId":0,"iconIdx":1},{"icon":{"paths":["M713.143 73.143c90.857 0 164.571 73.714 164.571 164.571v548.571c0 90.857-73.714 164.571-164.571 164.571h-107.429v-340h113.714l17.143-132.571h-130.857v-84.571c0-38.286 10.286-64 65.714-64l69.714-0.571v-118.286c-12-1.714-53.714-5.143-101.714-5.143-101.143 0-170.857 61.714-170.857 174.857v97.714h-114.286v132.571h114.286v340h-304c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["facebook-square"],"defaultCode":61570,"grid":14},"attrs":[],"properties":{"name":"facebook-square","id":2,"order":30,"prevSize":28,"code":61570},"setIdx":0,"setId":0,"iconIdx":2},{"icon":{"paths":["M804.571 708.571c0 20.571-9.143 60.571-17.714 79.429-12 28-44 46.286-69.714 60.571-33.714 18.286-68 29.143-106.286 29.143-53.143 0-101.143-21.714-149.714-39.429-34.857-12.571-68.571-28-100-47.429-97.143-60-214.286-177.143-274.286-274.286-19.429-31.429-34.857-65.143-47.429-100-17.714-48.571-39.429-96.571-39.429-149.714 0-38.286 10.857-72.571 29.143-106.286 14.286-25.714 32.571-57.714 60.571-69.714 18.857-8.571 58.857-17.714 79.429-17.714 4 0 8 0 12 1.714 12 4 24.571 32 30.286 43.429 18.286 32.571 36 65.714 54.857 97.714 9.143 14.857 26.286 33.143 26.286 50.857 0 34.857-103.429 85.714-103.429 116.571 0 15.429 14.286 35.429 22.286 49.143 57.714 104 129.714 176 233.714 233.714 13.714 8 33.714 22.286 49.143 22.286 30.857 0 81.714-103.429 116.571-103.429 17.714 0 36 17.143 50.857 26.286 32 18.857 65.143 36.571 97.714 54.857 11.429 5.714 39.429 18.286 43.429 30.286 1.714 4 1.714 8 1.714 12z"],"width":804.5714285714286,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["phone"],"defaultCode":61589,"grid":14},"attrs":[],"properties":{"name":"phone","id":3,"order":43,"prevSize":28,"code":61589},"setIdx":0,"setId":0,"iconIdx":3},{"icon":{"paths":["M731.429 681.714c0-2.857 0-6.286-1.143-9.143-3.429-10.286-86.857-52.571-102.857-61.714-10.857-6.286-24-18.857-37.143-18.857-25.143 0-62.286 74.857-84.571 74.857-11.429 0-25.714-10.286-36-16-75.429-42.286-127.429-94.286-169.714-169.714-5.714-10.286-16-24.571-16-36 0-22.286 74.857-59.429 74.857-84.571 0-13.143-12.571-26.286-18.857-37.143-9.143-16-51.429-99.429-61.714-102.857-2.857-1.143-6.286-1.143-9.143-1.143-14.857 0-44 6.857-57.714 12.571-37.714 17.143-65.143 89.143-65.143 128.571 0 38.286 15.429 73.143 28.571 108.571 45.714 125.143 181.714 261.143 306.857 306.857 35.429 13.143 70.286 28.571 108.571 28.571 39.429 0 111.429-27.429 128.571-65.143 5.714-13.714 12.571-42.857 12.571-57.714zM877.714 237.714v548.571c0 90.857-73.714 164.571-164.571 164.571h-548.571c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571c90.857 0 164.571 73.714 164.571 164.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["phone-square"],"defaultCode":61592,"grid":14},"attrs":[],"properties":{"name":"phone-square","id":4,"order":35,"prevSize":28,"code":61592},"setIdx":0,"setId":0,"iconIdx":4},{"icon":{"paths":["M925.714 233.143c-25.143 36.571-56.571 69.143-92.571 95.429 0.571 8 0.571 16 0.571 24 0 244-185.714 525.143-525.143 525.143-104.571 0-201.714-30.286-283.429-82.857 14.857 1.714 29.143 2.286 44.571 2.286 86.286 0 165.714-29.143 229.143-78.857-81.143-1.714-149.143-54.857-172.571-128 11.429 1.714 22.857 2.857 34.857 2.857 16.571 0 33.143-2.286 48.571-6.286-84.571-17.143-148-91.429-148-181.143v-2.286c24.571 13.714 53.143 22.286 83.429 23.429-49.714-33.143-82.286-89.714-82.286-153.714 0-34.286 9.143-65.714 25.143-93.143 90.857 112 227.429 185.143 380.571 193.143-2.857-13.714-4.571-28-4.571-42.286 0-101.714 82.286-184.571 184.571-184.571 53.143 0 101.143 22.286 134.857 58.286 41.714-8 81.714-23.429 117.143-44.571-13.714 42.857-42.857 78.857-81.143 101.714 37.143-4 73.143-14.286 106.286-28.571z"],"width":950.8571428571428,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["twitter"],"defaultCode":61593,"grid":14},"attrs":[],"properties":{"name":"twitter","id":5,"order":45,"prevSize":28,"code":61593},"setIdx":0,"setId":0,"iconIdx":5},{"icon":{"paths":["M548 6.857v150.857h-89.714c-70.286 0-83.429 33.714-83.429 82.286v108h167.429l-22.286 169.143h-145.143v433.714h-174.857v-433.714h-145.714v-169.143h145.714v-124.571c0-144.571 88.571-223.429 217.714-223.429 61.714 0 114.857 4.571 130.286 6.857z"],"width":602.2582857142856,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["facebook","facebook-f"],"defaultCode":61594,"grid":14},"attrs":[],"properties":{"name":"facebook, facebook-f","id":6,"order":44,"prevSize":28,"code":61594},"setIdx":0,"setId":0,"iconIdx":6},{"icon":{"paths":["M1024 405.714v453.714c0 50.286-41.143 91.429-91.429 91.429h-841.143c-50.286 0-91.429-41.143-91.429-91.429v-453.714c17.143 18.857 36.571 35.429 57.714 49.714 94.857 64.571 190.857 129.143 284 197.143 48 35.429 107.429 78.857 169.714 78.857h1.143c62.286 0 121.714-43.429 169.714-78.857 93.143-67.429 189.143-132.571 284.571-197.143 20.571-14.286 40-30.857 57.143-49.714zM1024 237.714c0 64-47.429 121.714-97.714 156.571-89.143 61.714-178.857 123.429-267.429 185.714-37.143 25.714-100 78.286-146.286 78.286h-1.143c-46.286 0-109.143-52.571-146.286-78.286-88.571-62.286-178.286-124-266.857-185.714-40.571-27.429-98.286-92-98.286-144 0-56 30.286-104 91.429-104h841.143c49.714 0 91.429 41.143 91.429 91.429z"],"width":1024,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["envelope"],"defaultCode":61664,"grid":14},"attrs":[],"properties":{"name":"envelope","id":7,"order":36,"prevSize":28,"code":61664},"setIdx":0,"setId":0,"iconIdx":7},{"icon":{"paths":["M525.143 744.571v-89.714c0-18.857-5.714-28.571-16.571-28.571-6.286 0-12.571 2.857-18.857 9.143v128c6.286 6.286 12.571 9.143 18.857 9.143 10.857 0 16.571-9.143 16.571-28zM630.286 674.857h37.714v-19.429c0-19.429-6.286-29.143-18.857-29.143s-18.857 9.714-18.857 29.143v19.429zM304 522.857v40h-45.714v241.714h-42.286v-241.714h-44.571v-40h132.571zM418.857 594.857v209.714h-38.286v-22.857c-14.857 17.143-29.143 25.714-43.429 25.714-12 0-20.571-5.143-24-16-2.286-6.286-3.429-16-3.429-30.857v-165.714h37.714v154.286c0 8.571 0 13.714 0.571 14.857 0.571 5.714 3.429 8.571 8.571 8.571 8 0 15.429-5.714 24-17.714v-160h38.286zM562.857 658.286v83.429c0 18.857-1.143 33.143-4 41.714-4.571 16-14.857 24-30.286 24-13.143 0-26.286-8-38.857-23.429v20.571h-38.286v-281.714h38.286v92c12-14.857 25.143-22.857 38.857-22.857 15.429 0 25.714 8 30.286 24 2.857 8.571 4 22.286 4 42.286zM706.286 732v5.143c0 12.571-0.571 20.571-1.143 24.571-1.143 8.571-4 16-8.571 22.857-10.286 15.429-26.286 22.857-45.714 22.857-20 0-35.429-7.429-46.286-21.714-8-10.286-12-26.857-12-49.143v-73.714c0-22.286 3.429-38.286 11.429-49.143 10.857-14.286 26.286-21.714 45.714-21.714 18.857 0 34.286 7.429 44.571 21.714 8 10.857 12 26.857 12 49.143v43.429h-76v37.143c0 19.429 6.286 29.143 19.429 29.143 9.143 0 14.857-5.143 17.143-14.857 0-2.286 0.571-10.857 0.571-25.714h38.857zM448.571 261.143v89.143c0 19.429-6.286 29.143-18.286 29.143-12.571 0-18.286-9.714-18.286-29.143v-89.143c0-19.429 5.714-29.714 18.286-29.714 12 0 18.286 10.286 18.286 29.714zM753.143 668.571v0c0-49.143 0-101.143-10.857-148.571-8-33.714-35.429-58.286-68-61.714-77.714-8.571-156.571-8.571-235.429-8.571-78.286 0-157.143 0-234.857 8.571-33.143 3.429-60.571 28-68 61.714-10.857 47.429-11.429 99.429-11.429 148.571v0c0 48.571 0 100.571 11.429 148.571 7.429 33.143 34.857 57.714 67.429 61.714 78.286 8.571 157.143 8.571 235.429 8.571s157.143 0 235.429-8.571c32.571-4 60-28.571 67.429-61.714 11.429-48 11.429-100 11.429-148.571zM321.714 296.571l51.429-169.143h-42.857l-29.143 111.429-30.286-111.429h-44.571c8.571 26.286 18.286 52.571 26.857 78.857 13.714 40 22.286 69.714 26.286 90.286v114.857h42.286v-114.857zM486.857 342.857v-74.286c0-22.286-4-38.857-12-49.714-10.857-14.286-25.714-21.714-44.571-21.714-19.429 0-34.286 7.429-44.571 21.714-8 10.857-12 27.429-12 49.714v74.286c0 22.286 4 38.857 12 49.714 10.286 14.286 25.143 21.714 44.571 21.714 18.857 0 33.714-7.429 44.571-21.714 8-10.286 12-27.429 12-49.714zM590.286 411.429h38.286v-211.429h-38.286v161.714c-8.571 12-16.571 17.714-24 17.714-5.143 0-8.571-2.857-9.143-9.143-0.571-1.143-0.571-5.714-0.571-14.857v-155.429h-38.286v167.429c0 14.857 1.143 24.571 3.429 31.429 4 10.286 12.571 15.429 24.571 15.429 14.286 0 28.571-8.571 44-25.714v22.857zM877.714 237.714v548.571c0 90.857-73.714 164.571-164.571 164.571h-548.571c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571c90.857 0 164.571 73.714 164.571 164.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["youtube-square"],"defaultCode":61798,"grid":14},"attrs":[],"properties":{"name":"youtube-square","id":8,"order":37,"prevSize":28,"code":61798},"setIdx":0,"setId":0,"iconIdx":8},{"icon":{"paths":["M554.857 710.857v120.571c0 25.714-7.429 38.286-22.286 38.286-8.571 0-17.143-4-25.714-12.571v-172c8.571-8.571 17.143-12.571 25.714-12.571 14.857 0 22.286 13.143 22.286 38.286zM748 711.429v26.286h-51.429v-26.286c0-25.714 8.571-38.857 25.714-38.857s25.714 13.143 25.714 38.857zM196 586.857h61.143v-53.714h-178.286v53.714h60v325.143h57.143v-325.143zM360.571 912h50.857v-282.286h-50.857v216c-11.429 16-22.286 24-32.571 24-6.857 0-10.857-4-12-12-0.571-1.714-0.571-8-0.571-20v-208h-50.857v223.429c0 20 1.714 33.143 4.571 41.714 4.571 14.286 16.571 21.143 33.143 21.143 18.286 0 37.714-11.429 58.286-34.857v30.857zM605.714 827.429v-112.571c0-26.286-1.143-45.143-5.143-56.571-6.286-21.143-20.571-32-40.571-32-18.857 0-36.571 10.286-53.143 30.857v-124h-50.857v378.857h50.857v-27.429c17.143 21.143 34.857 31.429 53.143 31.429 20 0 34.286-10.857 40.571-31.429 4-12 5.143-30.857 5.143-57.143zM798.857 821.714v-7.429h-52c0 20.571-0.571 32-1.143 34.857-2.857 13.714-10.286 20.571-22.857 20.571-17.714 0-26.286-13.143-26.286-39.429v-49.714h102.286v-58.857c0-30.286-5.143-52-15.429-66.286-14.857-19.429-34.857-29.143-60.571-29.143-26.286 0-46.286 9.714-61.143 29.143-10.857 14.286-16 36-16 66.286v98.857c0 30.286 5.714 52.571 16.571 66.286 14.857 19.429 34.857 29.143 61.714 29.143s48-10.286 61.714-30.286c6.286-9.143 10.857-19.429 12-30.857 1.143-5.143 1.143-16.571 1.143-33.143zM451.429 300v-120c0-26.286-7.429-39.429-24.571-39.429-16.571 0-24.571 13.143-24.571 39.429v120c0 26.286 8 40 24.571 40 17.143 0 24.571-13.714 24.571-40zM862.286 729.143c0 65.714-0.571 136-14.857 200-10.857 45.143-47.429 78.286-91.429 82.857-105.143 12-211.429 12-317.143 12s-212 0-317.143-12c-44-4.571-81.143-37.714-91.429-82.857-14.857-64-14.857-134.286-14.857-200v0c0-66.286 0.571-136 14.857-200 10.857-45.143 47.429-78.286 92-83.429 104.571-11.429 210.857-11.429 316.571-11.429s212 0 317.143 11.429c44 5.143 81.143 38.286 91.429 83.429 14.857 64 14.857 133.714 14.857 200zM292 0h58.286l-69.143 228v154.857h-57.143v-154.857c-5.143-28-16.571-68-34.857-121.143-12.571-35.429-25.143-71.429-37.143-106.857h60.571l40.571 150.286zM503.429 190.286v100c0 30.286-5.143 53.143-16 67.429-14.286 19.429-34.286 29.143-60.571 29.143-25.714 0-45.714-9.714-60-29.143-10.857-14.857-16-37.143-16-67.429v-100c0-30.286 5.143-52.571 16-66.857 14.286-19.429 34.286-29.143 60-29.143 26.286 0 46.286 9.714 60.571 29.143 10.857 14.286 16 36.571 16 66.857zM694.857 97.714v285.143h-52v-31.429c-20.571 24-40 35.429-58.857 35.429-16.571 0-28.571-6.857-33.714-21.143-2.857-8.571-4.571-22.286-4.571-42.857v-225.143h52v209.714c0 12 0 18.857 0.571 20 1.143 8 5.143 12.571 12 12.571 10.286 0 21.143-8 32.571-24.571v-217.714h52z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["youtube"],"defaultCode":61799,"grid":14},"attrs":[],"properties":{"name":"youtube","id":9,"order":42,"prevSize":28,"code":61799},"setIdx":0,"setId":0,"iconIdx":9},{"icon":{"paths":["M738.286 364.571c4-82.857-26.857-124.571-92-126.857-88-2.857-147.429 46.857-178.286 149.143 16-6.857 31.429-10.857 46.857-10.857 32 0 46.286 18.286 42.286 54.857-1.714 21.714-16 53.714-42.286 95.429-26.857 42.286-46.857 62.857-60 62.857-17.143 0-32-32-46.857-96.571-4.571-19.429-13.143-67.429-25.714-145.714-11.429-72-41.714-105.714-91.429-101.143-20.571 2.286-52.571 20.571-93.714 57.143-30.857 26.857-61.143 54.857-92.571 82.286l29.714 38.286c28.571-19.429 45.143-29.714 49.714-29.714 21.714 0 42.286 34.286 61.143 102.286 17.143 62.857 34.286 125.143 51.429 188 25.714 68 56.571 102.286 93.714 102.286 59.429 0 132.571-56 218.857-168 83.429-107.429 126.857-192 129.143-253.714zM877.714 237.714v548.571c0 90.857-73.714 164.571-164.571 164.571h-548.571c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571c90.857 0 164.571 73.714 164.571 164.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["vimeo-square"],"defaultCode":61844,"grid":14},"attrs":[],"properties":{"name":"vimeo-square","id":10,"order":38,"prevSize":28,"code":61844},"setIdx":0,"setId":0,"iconIdx":10},{"icon":{"paths":["M332.571 747.429c0 30.857-28 37.714-53.143 37.714-24.571 0-61.143-4-61.143-36 0-31.429 30.857-36.571 56-36.571 24 0 58.286 4 58.286 34.857zM312 481.143c0 28.571-11.429 48.571-42.286 48.571-31.429 0-44-18.286-44-48s11.429-51.429 44-51.429c29.143 0 42.286 24 42.286 50.857zM406.857 438.286v-71.429c-24.571 9.143-50.857 16.571-77.143 16.571-18.857-10.857-40.571-16.571-62.857-16.571-65.143 0-116.571 48-116.571 114.286 0 35.429 23.429 84.571 58.857 96.571v1.714c-18.286 8-21.714 30.286-21.714 48.571 0 18.857 6.857 34.286 23.429 44v1.714c-38.857 12.571-64.571 37.143-64.571 79.429 0 72.571 69.143 93.143 129.714 93.143 73.143 0 128-26.857 128-107.429 0-57.143-52-74.286-99.429-82.857-16-2.857-43.429-14.286-43.429-34.286 0-18.857 10.286-26.857 28-29.714 58.286-11.429 95.429-56.571 95.429-116.571 0-10.286-2.286-20-5.714-29.714 9.143-2.286 18.857-4.571 28-7.429zM440.571 677.714h78.286c-1.143-15.429-1.143-31.429-1.143-46.857v-221.143c0-13.143 0-26.286 1.143-39.429h-78.286c1.714 13.143 1.714 27.429 1.714 40.571v224c0 14.286 0 28.571-1.714 42.857zM731.429 668.571v-69.143c-11.429 8-25.143 12-38.857 12-25.714 0-30.286-25.714-30.286-46.857v-128.571h29.714c10.286 0 20 1.143 30.286 1.143v-66.857h-60c0-19.429-1.143-38.857 1.714-58.286h-80c1.714 10.286 2.286 20.571 2.286 31.429v26.857h-34.286v66.857c6.857-0.571 13.714-1.714 21.143-1.714 4 0 8.571 0.571 13.143 0.571v1.143h-1.143v124c0 61.714 9.143 121.143 84.571 121.143 21.143 0 42.857-3.429 61.714-13.714zM528 265.143c0-26.857-20-52-48-52s-48.571 24.571-48.571 52c0 26.857 21.143 50.857 48.571 50.857s48-24.571 48-50.857zM877.714 237.714v548.571c0 90.857-73.714 164.571-164.571 164.571h-548.571c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571c90.857 0 164.571 73.714 164.571 164.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["git-square"],"defaultCode":61906,"grid":14},"attrs":[],"properties":{"name":"git-square","id":11,"order":39,"prevSize":28,"code":61906},"setIdx":0,"setId":0,"iconIdx":11},{"icon":{"paths":["M340 865.143c0-50.286-55.429-57.143-94.286-57.143-40.571 0-90.286 8.571-90.286 59.429 0 51.429 58.857 57.714 98.286 57.714 41.714 0 86.286-10.286 86.286-60zM306.286 433.714c0-42.857-20.571-81.714-68-81.714-52.571 0-70.857 34.857-70.857 82.857 0 47.429 20.571 77.143 70.857 77.143 49.714 0 68-32 68-78.286zM460 248.571v115.429c-14.857 5.143-29.714 9.143-45.143 12.571 5.714 15.429 9.143 31.429 9.143 48 0 96.571-59.429 170.286-154.286 188-28.571 5.714-45.143 17.714-45.143 48.571 0 87.429 230.857 28 230.857 189.143 0 130.857-88.571 173.714-207.429 173.714-97.714 0-209.143-32.571-209.143-150.286 0-68.571 41.714-108 104-128.571v-2.286c-26.286-16-38.286-41.143-38.286-72 0-29.143 6.286-65.143 36-78.286v-2.286c-57.714-19.429-95.429-98.857-95.429-156.571 0-106.857 82.857-185.143 188.571-185.143 35.429 0 70.857 9.143 101.714 26.857 42.857 0 85.143-11.429 124.571-26.857zM641.714 752h-126.857c2.286-25.714 2.286-50.857 2.286-76.571v-348c0-24.571 0.571-49.143-2.286-73.143h126.857c-2.857 23.429-2.286 47.429-2.286 70.857v350.286c0 25.714 0 50.857 2.286 76.571zM985.143 625.143v112c-30.286 16.571-65.143 22.286-99.429 22.286-122.286 0-136.571-96.571-136.571-196v-200.571h1.143v-2.286c-7.429 0-14.286-1.143-21.143-1.143-11.429 0-22.857 1.714-33.714 3.429v-108.571h54.857v-43.429c0-17.143-0.571-34.286-3.429-50.857h129.714c-4.571 31.429-3.429 62.857-3.429 94.286h97.714v108.571c-16.571 0-33.143-2.286-49.143-2.286h-48.571v208.571c0 33.714 7.429 74.857 49.714 74.857 22.286 0 44-6.286 62.286-18.857zM656 84c0 42.857-33.143 82.857-77.143 82.857-45.143 0-78.857-39.429-78.857-82.857 0-44 33.143-84 78.857-84 45.143 0 77.143 41.143 77.143 84z"],"width":1024,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["git"],"defaultCode":61907,"grid":14},"attrs":[],"properties":{"name":"git","id":12,"order":40,"prevSize":28,"code":61907},"setIdx":0,"setId":0,"iconIdx":12},{"icon":{"paths":["M976.571 296c-4 90.286-67.429 214.286-189.714 372-126.857 164-233.143 246.286-321.143 246.286-54.286 0-100-50.286-137.143-150.286-25.143-91.429-50.286-183.429-75.429-275.429-27.429-100-57.714-149.714-89.714-149.714-6.857 0-30.857 14.286-72.571 43.429l-44-56c45.714-40.571 90.857-81.714 136-121.143 60.571-53.714 106.857-80.571 137.714-83.429 72.571-6.857 116.571 42.286 133.714 148 17.714 114.286 30.857 185.714 37.714 213.143 21.143 94.857 43.429 142.286 68.571 142.286 19.429 0 48.571-30.286 88-92 38.857-61.714 59.429-108.571 62.286-140.571 5.143-53.143-15.429-79.429-62.286-79.429-22.286 0-45.143 5.143-69.143 14.857 45.714-149.714 133.143-222.286 262.286-218.286 95.429 2.857 140.571 65.143 134.857 186.286z"],"width":1029.12,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["vimeo"],"defaultCode":62077,"grid":14},"attrs":[],"properties":{"name":"vimeo","id":13,"order":46,"prevSize":28,"code":62077},"setIdx":0,"setId":0,"iconIdx":13},{"icon":{"paths":["M424.633 357.564l-386.090 308.871h946.914v-100h-661.836l163.48-130.785z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["back"]},"attrs":[{}],"properties":{"order":49,"id":14,"name":"back","prevSize":28,"code":59648},"setIdx":0,"setId":0,"iconIdx":14}],"height":1024,"metadata":{"name":"icomoon"},"preferences":{"showGlyphs":true,"showQuickUse":true,"showQuickUse2":true,"showSVGs":true,"fontPref":{"prefix":"icon-","metadata":{"fontFamily":"icomoon"},"metrics":{"emSize":1024,"baseline":6.25,"whitespace":50},"embed":false},"imagePref":{"prefix":"icon-","png":true,"useClassSelector":true,"color":0,"bgColor":16777215,"classSelector":".icon"},"historySize":50,"showCodes":true,"gridSize":16}} \ No newline at end of file +{"IcoMoonType":"selection","icons":[{"icon":{"paths":["M542.165 780.501l-225.835-225.835h494.336c23.552 0 42.667-19.115 42.667-42.667s-19.115-42.667-42.667-42.667h-494.336l225.835-225.835c16.683-16.683 16.683-43.691 0-60.331s-43.691-16.683-60.331 0l-298.667 298.667c-4.096 4.096-7.168 8.789-9.259 13.824-2.176 5.205-3.243 10.795-3.243 16.341 0 10.923 4.181 21.845 12.501 30.165l298.667 298.667c16.683 16.683 43.691 16.683 60.331 0s16.683-43.691 0-60.331z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["arrow-left"],"grid":24},"attrs":[],"properties":{"id":17,"order":52,"prevSize":24,"code":59649,"name":"arrow-left"},"setIdx":0,"setId":1,"iconIdx":16},{"icon":{"paths":["M225.835 414.165l256 256c16.683 16.683 43.691 16.683 60.331 0l256-256c16.683-16.683 16.683-43.691 0-60.331s-43.691-16.683-60.331 0l-225.835 225.835-225.835-225.835c-16.683-16.683-43.691-16.683-60.331 0s-16.683 43.691 0 60.331z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["chevron-down"],"grid":24},"attrs":[],"properties":{"id":47,"order":56,"prevSize":24,"code":59650,"name":"chevron-down"},"setIdx":0,"setId":1,"iconIdx":46},{"icon":{"paths":["M896 213.333c11.776 0 22.4 4.736 30.165 12.501s12.501 18.389 12.501 30.165v512c0 11.776-4.736 22.4-12.501 30.165s-18.389 12.501-30.165 12.501h-535.296l-261.333-298.667 261.333-298.667zM896 128h-554.667c-12.8 0-24.235 5.632-32.128 14.549l-298.667 341.333c-14.208 16.213-13.909 40.192 0 56.192l298.667 341.333c8.448 9.643 20.224 14.549 32.128 14.592h554.667c35.328 0 67.413-14.379 90.496-37.504s37.504-55.168 37.504-90.496v-512c0-35.328-14.379-67.413-37.504-90.496s-55.168-37.504-90.496-37.504zM481.835 414.165l97.835 97.835-97.835 97.835c-16.683 16.683-16.683 43.691 0 60.331s43.691 16.683 60.331 0l97.835-97.835 97.835 97.835c16.683 16.683 43.691 16.683 60.331 0s16.683-43.691 0-60.331l-97.835-97.835 97.835-97.835c16.683-16.683 16.683-43.691 0-60.331s-43.691-16.683-60.331 0l-97.835 97.835-97.835-97.835c-16.683-16.683-43.691-16.683-60.331 0s-16.683 43.691 0 60.331z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["delete"],"grid":24},"attrs":[],"properties":{"id":86,"order":54,"prevSize":24,"code":59651,"name":"delete"},"setIdx":0,"setId":1,"iconIdx":85},{"icon":{"paths":["M950.857 859.429v-438.857c-12 13.714-25.143 26.286-39.429 37.714-81.714 62.857-164 126.857-243.429 193.143-42.857 36-96 80-155.429 80h-1.143c-59.429 0-112.571-44-155.429-80-79.429-66.286-161.714-130.286-243.429-193.143-14.286-11.429-27.429-24-39.429-37.714v438.857c0 9.714 8.571 18.286 18.286 18.286h841.143c9.714 0 18.286-8.571 18.286-18.286zM950.857 258.857c0-14.286 3.429-39.429-18.286-39.429h-841.143c-9.714 0-18.286 8.571-18.286 18.286 0 65.143 32.571 121.714 84 162.286 76.571 60 153.143 120.571 229.143 181.143 30.286 24.571 85.143 77.143 125.143 77.143h1.143c40 0 94.857-52.571 125.143-77.143 76-60.571 152.571-121.143 229.143-181.143 37.143-29.143 84-92.571 84-141.143zM1024 237.714v621.714c0 50.286-41.143 91.429-91.429 91.429h-841.143c-50.286 0-91.429-41.143-91.429-91.429v-621.714c0-50.286 41.143-91.429 91.429-91.429h841.143c50.286 0 91.429 41.143 91.429 91.429z"],"width":1024,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["envelope-o"],"defaultCode":61443,"grid":14},"attrs":[],"properties":{"name":"envelope-o","id":0,"order":47,"prevSize":28,"code":61443},"setIdx":1,"setId":0,"iconIdx":0},{"icon":{"paths":["M731.429 348.571c-21.714 9.714-44.571 16-69.143 19.429 25.143-14.857 44-38.857 53.143-66.857-23.429 13.714-49.143 24-76.571 29.143-21.714-23.429-53.143-37.714-87.429-37.714-66.286 0-120 53.714-120 120 0 9.143 0.571 18.857 2.857 27.429-100-5.143-188.571-52.571-248-125.714-10.286 17.714-16.571 38.857-16.571 60.571 0 41.714 19.429 78.286 52 100-20-0.571-38.857-6.286-57.143-14.857v1.143c0 58.286 44 106.857 98.857 117.714-10.286 2.857-18.286 4.571-29.143 4.571-7.429 0-14.857-1.143-22.286-2.286 15.429 47.429 59.429 82.286 112 83.429-41.143 32-92.571 51.429-149.143 51.429-9.714 0-19.429-0.571-28.571-1.714 53.143 33.714 116 53.714 184 53.714 220.571 0 341.714-182.857 341.714-341.714 0-5.143 0-10.286-0.571-15.429 23.429-16.571 44-37.714 60-62.286zM877.714 237.714v548.571c0 90.857-73.714 164.571-164.571 164.571h-548.571c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571c90.857 0 164.571 73.714 164.571 164.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["twitter-square"],"defaultCode":61569,"grid":14},"attrs":[],"properties":{"name":"twitter-square","id":1,"order":31,"prevSize":28,"code":61569},"setIdx":1,"setId":0,"iconIdx":1},{"icon":{"paths":["M713.143 73.143c90.857 0 164.571 73.714 164.571 164.571v548.571c0 90.857-73.714 164.571-164.571 164.571h-107.429v-340h113.714l17.143-132.571h-130.857v-84.571c0-38.286 10.286-64 65.714-64l69.714-0.571v-118.286c-12-1.714-53.714-5.143-101.714-5.143-101.143 0-170.857 61.714-170.857 174.857v97.714h-114.286v132.571h114.286v340h-304c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["facebook-square"],"defaultCode":61570,"grid":14},"attrs":[],"properties":{"name":"facebook-square","id":2,"order":30,"prevSize":28,"code":61570},"setIdx":1,"setId":0,"iconIdx":2},{"icon":{"paths":["M804.571 708.571c0 20.571-9.143 60.571-17.714 79.429-12 28-44 46.286-69.714 60.571-33.714 18.286-68 29.143-106.286 29.143-53.143 0-101.143-21.714-149.714-39.429-34.857-12.571-68.571-28-100-47.429-97.143-60-214.286-177.143-274.286-274.286-19.429-31.429-34.857-65.143-47.429-100-17.714-48.571-39.429-96.571-39.429-149.714 0-38.286 10.857-72.571 29.143-106.286 14.286-25.714 32.571-57.714 60.571-69.714 18.857-8.571 58.857-17.714 79.429-17.714 4 0 8 0 12 1.714 12 4 24.571 32 30.286 43.429 18.286 32.571 36 65.714 54.857 97.714 9.143 14.857 26.286 33.143 26.286 50.857 0 34.857-103.429 85.714-103.429 116.571 0 15.429 14.286 35.429 22.286 49.143 57.714 104 129.714 176 233.714 233.714 13.714 8 33.714 22.286 49.143 22.286 30.857 0 81.714-103.429 116.571-103.429 17.714 0 36 17.143 50.857 26.286 32 18.857 65.143 36.571 97.714 54.857 11.429 5.714 39.429 18.286 43.429 30.286 1.714 4 1.714 8 1.714 12z"],"width":804.5714285714286,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["phone"],"defaultCode":61589,"grid":14},"attrs":[],"properties":{"name":"phone","id":3,"order":43,"prevSize":28,"code":61589},"setIdx":1,"setId":0,"iconIdx":3},{"icon":{"paths":["M731.429 681.714c0-2.857 0-6.286-1.143-9.143-3.429-10.286-86.857-52.571-102.857-61.714-10.857-6.286-24-18.857-37.143-18.857-25.143 0-62.286 74.857-84.571 74.857-11.429 0-25.714-10.286-36-16-75.429-42.286-127.429-94.286-169.714-169.714-5.714-10.286-16-24.571-16-36 0-22.286 74.857-59.429 74.857-84.571 0-13.143-12.571-26.286-18.857-37.143-9.143-16-51.429-99.429-61.714-102.857-2.857-1.143-6.286-1.143-9.143-1.143-14.857 0-44 6.857-57.714 12.571-37.714 17.143-65.143 89.143-65.143 128.571 0 38.286 15.429 73.143 28.571 108.571 45.714 125.143 181.714 261.143 306.857 306.857 35.429 13.143 70.286 28.571 108.571 28.571 39.429 0 111.429-27.429 128.571-65.143 5.714-13.714 12.571-42.857 12.571-57.714zM877.714 237.714v548.571c0 90.857-73.714 164.571-164.571 164.571h-548.571c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571c90.857 0 164.571 73.714 164.571 164.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["phone-square"],"defaultCode":61592,"grid":14},"attrs":[],"properties":{"name":"phone-square","id":4,"order":35,"prevSize":28,"code":61592},"setIdx":1,"setId":0,"iconIdx":4},{"icon":{"paths":["M925.714 233.143c-25.143 36.571-56.571 69.143-92.571 95.429 0.571 8 0.571 16 0.571 24 0 244-185.714 525.143-525.143 525.143-104.571 0-201.714-30.286-283.429-82.857 14.857 1.714 29.143 2.286 44.571 2.286 86.286 0 165.714-29.143 229.143-78.857-81.143-1.714-149.143-54.857-172.571-128 11.429 1.714 22.857 2.857 34.857 2.857 16.571 0 33.143-2.286 48.571-6.286-84.571-17.143-148-91.429-148-181.143v-2.286c24.571 13.714 53.143 22.286 83.429 23.429-49.714-33.143-82.286-89.714-82.286-153.714 0-34.286 9.143-65.714 25.143-93.143 90.857 112 227.429 185.143 380.571 193.143-2.857-13.714-4.571-28-4.571-42.286 0-101.714 82.286-184.571 184.571-184.571 53.143 0 101.143 22.286 134.857 58.286 41.714-8 81.714-23.429 117.143-44.571-13.714 42.857-42.857 78.857-81.143 101.714 37.143-4 73.143-14.286 106.286-28.571z"],"width":950.8571428571428,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["twitter"],"defaultCode":61593,"grid":14},"attrs":[],"properties":{"name":"twitter","id":5,"order":45,"prevSize":28,"code":61593},"setIdx":1,"setId":0,"iconIdx":5},{"icon":{"paths":["M548 6.857v150.857h-89.714c-70.286 0-83.429 33.714-83.429 82.286v108h167.429l-22.286 169.143h-145.143v433.714h-174.857v-433.714h-145.714v-169.143h145.714v-124.571c0-144.571 88.571-223.429 217.714-223.429 61.714 0 114.857 4.571 130.286 6.857z"],"width":602.2582857142856,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["facebook","facebook-f"],"defaultCode":61594,"grid":14},"attrs":[],"properties":{"name":"facebook, facebook-f","id":6,"order":44,"prevSize":28,"code":61594},"setIdx":1,"setId":0,"iconIdx":6},{"icon":{"paths":["M1024 405.714v453.714c0 50.286-41.143 91.429-91.429 91.429h-841.143c-50.286 0-91.429-41.143-91.429-91.429v-453.714c17.143 18.857 36.571 35.429 57.714 49.714 94.857 64.571 190.857 129.143 284 197.143 48 35.429 107.429 78.857 169.714 78.857h1.143c62.286 0 121.714-43.429 169.714-78.857 93.143-67.429 189.143-132.571 284.571-197.143 20.571-14.286 40-30.857 57.143-49.714zM1024 237.714c0 64-47.429 121.714-97.714 156.571-89.143 61.714-178.857 123.429-267.429 185.714-37.143 25.714-100 78.286-146.286 78.286h-1.143c-46.286 0-109.143-52.571-146.286-78.286-88.571-62.286-178.286-124-266.857-185.714-40.571-27.429-98.286-92-98.286-144 0-56 30.286-104 91.429-104h841.143c49.714 0 91.429 41.143 91.429 91.429z"],"width":1024,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["envelope"],"defaultCode":61664,"grid":14},"attrs":[],"properties":{"name":"envelope","id":7,"order":36,"prevSize":28,"code":61664},"setIdx":1,"setId":0,"iconIdx":7},{"icon":{"paths":["M525.143 744.571v-89.714c0-18.857-5.714-28.571-16.571-28.571-6.286 0-12.571 2.857-18.857 9.143v128c6.286 6.286 12.571 9.143 18.857 9.143 10.857 0 16.571-9.143 16.571-28zM630.286 674.857h37.714v-19.429c0-19.429-6.286-29.143-18.857-29.143s-18.857 9.714-18.857 29.143v19.429zM304 522.857v40h-45.714v241.714h-42.286v-241.714h-44.571v-40h132.571zM418.857 594.857v209.714h-38.286v-22.857c-14.857 17.143-29.143 25.714-43.429 25.714-12 0-20.571-5.143-24-16-2.286-6.286-3.429-16-3.429-30.857v-165.714h37.714v154.286c0 8.571 0 13.714 0.571 14.857 0.571 5.714 3.429 8.571 8.571 8.571 8 0 15.429-5.714 24-17.714v-160h38.286zM562.857 658.286v83.429c0 18.857-1.143 33.143-4 41.714-4.571 16-14.857 24-30.286 24-13.143 0-26.286-8-38.857-23.429v20.571h-38.286v-281.714h38.286v92c12-14.857 25.143-22.857 38.857-22.857 15.429 0 25.714 8 30.286 24 2.857 8.571 4 22.286 4 42.286zM706.286 732v5.143c0 12.571-0.571 20.571-1.143 24.571-1.143 8.571-4 16-8.571 22.857-10.286 15.429-26.286 22.857-45.714 22.857-20 0-35.429-7.429-46.286-21.714-8-10.286-12-26.857-12-49.143v-73.714c0-22.286 3.429-38.286 11.429-49.143 10.857-14.286 26.286-21.714 45.714-21.714 18.857 0 34.286 7.429 44.571 21.714 8 10.857 12 26.857 12 49.143v43.429h-76v37.143c0 19.429 6.286 29.143 19.429 29.143 9.143 0 14.857-5.143 17.143-14.857 0-2.286 0.571-10.857 0.571-25.714h38.857zM448.571 261.143v89.143c0 19.429-6.286 29.143-18.286 29.143-12.571 0-18.286-9.714-18.286-29.143v-89.143c0-19.429 5.714-29.714 18.286-29.714 12 0 18.286 10.286 18.286 29.714zM753.143 668.571v0c0-49.143 0-101.143-10.857-148.571-8-33.714-35.429-58.286-68-61.714-77.714-8.571-156.571-8.571-235.429-8.571-78.286 0-157.143 0-234.857 8.571-33.143 3.429-60.571 28-68 61.714-10.857 47.429-11.429 99.429-11.429 148.571v0c0 48.571 0 100.571 11.429 148.571 7.429 33.143 34.857 57.714 67.429 61.714 78.286 8.571 157.143 8.571 235.429 8.571s157.143 0 235.429-8.571c32.571-4 60-28.571 67.429-61.714 11.429-48 11.429-100 11.429-148.571zM321.714 296.571l51.429-169.143h-42.857l-29.143 111.429-30.286-111.429h-44.571c8.571 26.286 18.286 52.571 26.857 78.857 13.714 40 22.286 69.714 26.286 90.286v114.857h42.286v-114.857zM486.857 342.857v-74.286c0-22.286-4-38.857-12-49.714-10.857-14.286-25.714-21.714-44.571-21.714-19.429 0-34.286 7.429-44.571 21.714-8 10.857-12 27.429-12 49.714v74.286c0 22.286 4 38.857 12 49.714 10.286 14.286 25.143 21.714 44.571 21.714 18.857 0 33.714-7.429 44.571-21.714 8-10.286 12-27.429 12-49.714zM590.286 411.429h38.286v-211.429h-38.286v161.714c-8.571 12-16.571 17.714-24 17.714-5.143 0-8.571-2.857-9.143-9.143-0.571-1.143-0.571-5.714-0.571-14.857v-155.429h-38.286v167.429c0 14.857 1.143 24.571 3.429 31.429 4 10.286 12.571 15.429 24.571 15.429 14.286 0 28.571-8.571 44-25.714v22.857zM877.714 237.714v548.571c0 90.857-73.714 164.571-164.571 164.571h-548.571c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571c90.857 0 164.571 73.714 164.571 164.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["youtube-square"],"defaultCode":61798,"grid":14},"attrs":[],"properties":{"name":"youtube-square","id":8,"order":37,"prevSize":28,"code":61798},"setIdx":1,"setId":0,"iconIdx":8},{"icon":{"paths":["M554.857 710.857v120.571c0 25.714-7.429 38.286-22.286 38.286-8.571 0-17.143-4-25.714-12.571v-172c8.571-8.571 17.143-12.571 25.714-12.571 14.857 0 22.286 13.143 22.286 38.286zM748 711.429v26.286h-51.429v-26.286c0-25.714 8.571-38.857 25.714-38.857s25.714 13.143 25.714 38.857zM196 586.857h61.143v-53.714h-178.286v53.714h60v325.143h57.143v-325.143zM360.571 912h50.857v-282.286h-50.857v216c-11.429 16-22.286 24-32.571 24-6.857 0-10.857-4-12-12-0.571-1.714-0.571-8-0.571-20v-208h-50.857v223.429c0 20 1.714 33.143 4.571 41.714 4.571 14.286 16.571 21.143 33.143 21.143 18.286 0 37.714-11.429 58.286-34.857v30.857zM605.714 827.429v-112.571c0-26.286-1.143-45.143-5.143-56.571-6.286-21.143-20.571-32-40.571-32-18.857 0-36.571 10.286-53.143 30.857v-124h-50.857v378.857h50.857v-27.429c17.143 21.143 34.857 31.429 53.143 31.429 20 0 34.286-10.857 40.571-31.429 4-12 5.143-30.857 5.143-57.143zM798.857 821.714v-7.429h-52c0 20.571-0.571 32-1.143 34.857-2.857 13.714-10.286 20.571-22.857 20.571-17.714 0-26.286-13.143-26.286-39.429v-49.714h102.286v-58.857c0-30.286-5.143-52-15.429-66.286-14.857-19.429-34.857-29.143-60.571-29.143-26.286 0-46.286 9.714-61.143 29.143-10.857 14.286-16 36-16 66.286v98.857c0 30.286 5.714 52.571 16.571 66.286 14.857 19.429 34.857 29.143 61.714 29.143s48-10.286 61.714-30.286c6.286-9.143 10.857-19.429 12-30.857 1.143-5.143 1.143-16.571 1.143-33.143zM451.429 300v-120c0-26.286-7.429-39.429-24.571-39.429-16.571 0-24.571 13.143-24.571 39.429v120c0 26.286 8 40 24.571 40 17.143 0 24.571-13.714 24.571-40zM862.286 729.143c0 65.714-0.571 136-14.857 200-10.857 45.143-47.429 78.286-91.429 82.857-105.143 12-211.429 12-317.143 12s-212 0-317.143-12c-44-4.571-81.143-37.714-91.429-82.857-14.857-64-14.857-134.286-14.857-200v0c0-66.286 0.571-136 14.857-200 10.857-45.143 47.429-78.286 92-83.429 104.571-11.429 210.857-11.429 316.571-11.429s212 0 317.143 11.429c44 5.143 81.143 38.286 91.429 83.429 14.857 64 14.857 133.714 14.857 200zM292 0h58.286l-69.143 228v154.857h-57.143v-154.857c-5.143-28-16.571-68-34.857-121.143-12.571-35.429-25.143-71.429-37.143-106.857h60.571l40.571 150.286zM503.429 190.286v100c0 30.286-5.143 53.143-16 67.429-14.286 19.429-34.286 29.143-60.571 29.143-25.714 0-45.714-9.714-60-29.143-10.857-14.857-16-37.143-16-67.429v-100c0-30.286 5.143-52.571 16-66.857 14.286-19.429 34.286-29.143 60-29.143 26.286 0 46.286 9.714 60.571 29.143 10.857 14.286 16 36.571 16 66.857zM694.857 97.714v285.143h-52v-31.429c-20.571 24-40 35.429-58.857 35.429-16.571 0-28.571-6.857-33.714-21.143-2.857-8.571-4.571-22.286-4.571-42.857v-225.143h52v209.714c0 12 0 18.857 0.571 20 1.143 8 5.143 12.571 12 12.571 10.286 0 21.143-8 32.571-24.571v-217.714h52z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["youtube"],"defaultCode":61799,"grid":14},"attrs":[],"properties":{"name":"youtube","id":9,"order":42,"prevSize":28,"code":61799},"setIdx":1,"setId":0,"iconIdx":9},{"icon":{"paths":["M738.286 364.571c4-82.857-26.857-124.571-92-126.857-88-2.857-147.429 46.857-178.286 149.143 16-6.857 31.429-10.857 46.857-10.857 32 0 46.286 18.286 42.286 54.857-1.714 21.714-16 53.714-42.286 95.429-26.857 42.286-46.857 62.857-60 62.857-17.143 0-32-32-46.857-96.571-4.571-19.429-13.143-67.429-25.714-145.714-11.429-72-41.714-105.714-91.429-101.143-20.571 2.286-52.571 20.571-93.714 57.143-30.857 26.857-61.143 54.857-92.571 82.286l29.714 38.286c28.571-19.429 45.143-29.714 49.714-29.714 21.714 0 42.286 34.286 61.143 102.286 17.143 62.857 34.286 125.143 51.429 188 25.714 68 56.571 102.286 93.714 102.286 59.429 0 132.571-56 218.857-168 83.429-107.429 126.857-192 129.143-253.714zM877.714 237.714v548.571c0 90.857-73.714 164.571-164.571 164.571h-548.571c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571c90.857 0 164.571 73.714 164.571 164.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["vimeo-square"],"defaultCode":61844,"grid":14},"attrs":[],"properties":{"name":"vimeo-square","id":10,"order":38,"prevSize":28,"code":61844},"setIdx":1,"setId":0,"iconIdx":10},{"icon":{"paths":["M332.571 747.429c0 30.857-28 37.714-53.143 37.714-24.571 0-61.143-4-61.143-36 0-31.429 30.857-36.571 56-36.571 24 0 58.286 4 58.286 34.857zM312 481.143c0 28.571-11.429 48.571-42.286 48.571-31.429 0-44-18.286-44-48s11.429-51.429 44-51.429c29.143 0 42.286 24 42.286 50.857zM406.857 438.286v-71.429c-24.571 9.143-50.857 16.571-77.143 16.571-18.857-10.857-40.571-16.571-62.857-16.571-65.143 0-116.571 48-116.571 114.286 0 35.429 23.429 84.571 58.857 96.571v1.714c-18.286 8-21.714 30.286-21.714 48.571 0 18.857 6.857 34.286 23.429 44v1.714c-38.857 12.571-64.571 37.143-64.571 79.429 0 72.571 69.143 93.143 129.714 93.143 73.143 0 128-26.857 128-107.429 0-57.143-52-74.286-99.429-82.857-16-2.857-43.429-14.286-43.429-34.286 0-18.857 10.286-26.857 28-29.714 58.286-11.429 95.429-56.571 95.429-116.571 0-10.286-2.286-20-5.714-29.714 9.143-2.286 18.857-4.571 28-7.429zM440.571 677.714h78.286c-1.143-15.429-1.143-31.429-1.143-46.857v-221.143c0-13.143 0-26.286 1.143-39.429h-78.286c1.714 13.143 1.714 27.429 1.714 40.571v224c0 14.286 0 28.571-1.714 42.857zM731.429 668.571v-69.143c-11.429 8-25.143 12-38.857 12-25.714 0-30.286-25.714-30.286-46.857v-128.571h29.714c10.286 0 20 1.143 30.286 1.143v-66.857h-60c0-19.429-1.143-38.857 1.714-58.286h-80c1.714 10.286 2.286 20.571 2.286 31.429v26.857h-34.286v66.857c6.857-0.571 13.714-1.714 21.143-1.714 4 0 8.571 0.571 13.143 0.571v1.143h-1.143v124c0 61.714 9.143 121.143 84.571 121.143 21.143 0 42.857-3.429 61.714-13.714zM528 265.143c0-26.857-20-52-48-52s-48.571 24.571-48.571 52c0 26.857 21.143 50.857 48.571 50.857s48-24.571 48-50.857zM877.714 237.714v548.571c0 90.857-73.714 164.571-164.571 164.571h-548.571c-90.857 0-164.571-73.714-164.571-164.571v-548.571c0-90.857 73.714-164.571 164.571-164.571h548.571c90.857 0 164.571 73.714 164.571 164.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["git-square"],"defaultCode":61906,"grid":14},"attrs":[],"properties":{"name":"git-square","id":11,"order":39,"prevSize":28,"code":61906},"setIdx":1,"setId":0,"iconIdx":11},{"icon":{"paths":["M340 865.143c0-50.286-55.429-57.143-94.286-57.143-40.571 0-90.286 8.571-90.286 59.429 0 51.429 58.857 57.714 98.286 57.714 41.714 0 86.286-10.286 86.286-60zM306.286 433.714c0-42.857-20.571-81.714-68-81.714-52.571 0-70.857 34.857-70.857 82.857 0 47.429 20.571 77.143 70.857 77.143 49.714 0 68-32 68-78.286zM460 248.571v115.429c-14.857 5.143-29.714 9.143-45.143 12.571 5.714 15.429 9.143 31.429 9.143 48 0 96.571-59.429 170.286-154.286 188-28.571 5.714-45.143 17.714-45.143 48.571 0 87.429 230.857 28 230.857 189.143 0 130.857-88.571 173.714-207.429 173.714-97.714 0-209.143-32.571-209.143-150.286 0-68.571 41.714-108 104-128.571v-2.286c-26.286-16-38.286-41.143-38.286-72 0-29.143 6.286-65.143 36-78.286v-2.286c-57.714-19.429-95.429-98.857-95.429-156.571 0-106.857 82.857-185.143 188.571-185.143 35.429 0 70.857 9.143 101.714 26.857 42.857 0 85.143-11.429 124.571-26.857zM641.714 752h-126.857c2.286-25.714 2.286-50.857 2.286-76.571v-348c0-24.571 0.571-49.143-2.286-73.143h126.857c-2.857 23.429-2.286 47.429-2.286 70.857v350.286c0 25.714 0 50.857 2.286 76.571zM985.143 625.143v112c-30.286 16.571-65.143 22.286-99.429 22.286-122.286 0-136.571-96.571-136.571-196v-200.571h1.143v-2.286c-7.429 0-14.286-1.143-21.143-1.143-11.429 0-22.857 1.714-33.714 3.429v-108.571h54.857v-43.429c0-17.143-0.571-34.286-3.429-50.857h129.714c-4.571 31.429-3.429 62.857-3.429 94.286h97.714v108.571c-16.571 0-33.143-2.286-49.143-2.286h-48.571v208.571c0 33.714 7.429 74.857 49.714 74.857 22.286 0 44-6.286 62.286-18.857zM656 84c0 42.857-33.143 82.857-77.143 82.857-45.143 0-78.857-39.429-78.857-82.857 0-44 33.143-84 78.857-84 45.143 0 77.143 41.143 77.143 84z"],"width":1024,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["git"],"defaultCode":61907,"grid":14},"attrs":[],"properties":{"name":"git","id":12,"order":40,"prevSize":28,"code":61907},"setIdx":1,"setId":0,"iconIdx":12},{"icon":{"paths":["M976.571 296c-4 90.286-67.429 214.286-189.714 372-126.857 164-233.143 246.286-321.143 246.286-54.286 0-100-50.286-137.143-150.286-25.143-91.429-50.286-183.429-75.429-275.429-27.429-100-57.714-149.714-89.714-149.714-6.857 0-30.857 14.286-72.571 43.429l-44-56c45.714-40.571 90.857-81.714 136-121.143 60.571-53.714 106.857-80.571 137.714-83.429 72.571-6.857 116.571 42.286 133.714 148 17.714 114.286 30.857 185.714 37.714 213.143 21.143 94.857 43.429 142.286 68.571 142.286 19.429 0 48.571-30.286 88-92 38.857-61.714 59.429-108.571 62.286-140.571 5.143-53.143-15.429-79.429-62.286-79.429-22.286 0-45.143 5.143-69.143 14.857 45.714-149.714 133.143-222.286 262.286-218.286 95.429 2.857 140.571 65.143 134.857 186.286z"],"width":1029.12,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["vimeo"],"defaultCode":62077,"grid":14},"attrs":[],"properties":{"name":"vimeo","id":13,"order":46,"prevSize":28,"code":62077},"setIdx":1,"setId":0,"iconIdx":13},{"icon":{"paths":["M424.633 357.564l-386.090 308.871h946.914v-100h-661.836l163.48-130.785z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["back"]},"attrs":[{}],"properties":{"order":49,"id":14,"name":"back","prevSize":28,"code":59648},"setIdx":1,"setId":0,"iconIdx":14}],"height":1024,"metadata":{"name":"icomoon"},"preferences":{"showGlyphs":true,"showQuickUse":true,"showQuickUse2":true,"showSVGs":true,"fontPref":{"prefix":"icon-","metadata":{"fontFamily":"icomoon"},"metrics":{"emSize":1024,"baseline":6.25,"whitespace":50},"embed":false},"imagePref":{"prefix":"icon-","png":true,"useClassSelector":true,"color":0,"bgColor":16777215,"classSelector":".icon"},"historySize":50,"showCodes":true,"gridSize":16}} \ No newline at end of file diff --git a/src/assets/scss/forms.scss b/src/assets/scss/forms.scss index 12f4a41..ebd4f0a 100644 --- a/src/assets/scss/forms.scss +++ b/src/assets/scss/forms.scss @@ -56,7 +56,7 @@ select { border: none; background: $black; display: inline-block; - padding: 8px 20px 10px 20px !important; + padding: 10px 20px 10px 20px !important; text-align: center; font-family: $font-20; text-transform: uppercase; diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index c575f20..03331ed 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -24,11 +24,10 @@ button { } } -.w-100 { - width: 100%; +@each $size in 10,20,30,40,50,60,70,80,90,100 { + .w-#{$size} {width: percentage($size/100) !important;} } - .particles { position: fixed; top: 0; diff --git a/src/assets/scss/icons.scss b/src/assets/scss/icons.scss index dba71be..0dd8488 100644 --- a/src/assets/scss/icons.scss +++ b/src/assets/scss/icons.scss @@ -25,6 +25,16 @@ -moz-osx-font-smoothing: grayscale; } +.icon-arrow-left:before { + content: "\e901"; +} +.icon-chevron-down:before { + content: "\e902"; +} +.icon-delete:before { + content: "\e903"; +} + .icon-envelope-o:before { content: "\f003"; } diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index 12602c7..2ec5306 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -23,7 +23,7 @@ $breadcrumb-height: 60px; // Colors $white: #fff; $black: #000; -$gray: #ccc; +$gray: #999; $light-gray: #eee; $dark-gray: #333; From 4cd71c37c5a05ec93b99ac84ce5fd5e68933866a Mon Sep 17 00:00:00 2001 From: Dslak Date: Fri, 4 Dec 2020 11:42:07 +0100 Subject: [PATCH 20/38] add videos --- src/app/admin/admin.component.html | 20 +++++++++---------- src/app/admin/admin.component.scss | 6 ++++++ src/app/admin/admin.component.ts | 25 ++++++++++++----------- src/assets/fonts/icomoon.eot | Bin 5964 -> 8396 bytes src/assets/fonts/icomoon.svg | 10 ++++++++++ src/assets/fonts/icomoon.ttf | Bin 5800 -> 8232 bytes src/assets/fonts/icomoon.woff | Bin 5876 -> 8308 bytes src/assets/fonts/selection.json | 2 +- src/assets/scss/forms.scss | 15 +++++--------- src/assets/scss/icons.scss | 31 ++++++++++++++++++++++++++++- src/assets/scss/variables.scss | 1 + 11 files changed, 76 insertions(+), 34 deletions(-) diff --git a/src/app/admin/admin.component.html b/src/app/admin/admin.component.html index 6909bdf..5901b5b 100644 --- a/src/app/admin/admin.component.html +++ b/src/app/admin/admin.component.html @@ -3,11 +3,11 @@
-
- Add work -
+
+ {{sectionTitle}} + +
+ Select work + +
+ +
Title @@ -37,10 +48,7 @@
Type
@@ -61,8 +69,8 @@
- - + +
diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts index e441e1e..9f015cc 100644 --- a/src/app/admin/admin.component.ts +++ b/src/app/admin/admin.component.ts @@ -19,8 +19,12 @@ export class AdminComponent implements OnInit { public userName: string = '' public password: string = '' public activeEditor: string = '' - public exhibitions: any = [] + public sectionTitle: string = '' + public activeModify: boolean = false + public modifyId: number = null + public exhibitions: any = [] + public works: any = [] public selectedExhibitions: any = [] public selectedVideos: any = [] public selectedGallery: any = [] @@ -34,7 +38,13 @@ export class AdminComponent implements OnInit { public videoType: string = '' public videoURL: string = '' - editorConfig: AngularEditorConfig = editorConfig + public editorConfig: AngularEditorConfig = editorConfig + public workSections: any = [ + {title: 'Entertainment', section: 'entertainment'}, + {title: 'Installations', section: 'installations'}, + {title: 'Performances', section: 'performances'}, + {title: 'Workshops', section: 'workshops'} + ] constructor( private authService: AuthService, @@ -54,6 +64,14 @@ export class AdminComponent implements OnInit { }).catch((e) => { console.error('getPortfolio CATCH', e) }) + + this.apisService.getPortfolio('portfolio').toPromise().then((response) => { + this.works = response.items + },(error) => { + console.error('getPortfolio ERROR', error) + }).catch((e) => { + console.error('getPortfolio CATCH', e) + }) },(error) => { console.error('Auth ERROR', error) }).catch((e) => { @@ -76,7 +94,20 @@ export class AdminComponent implements OnInit { } showEditor(section): void { + switch(section) { + case 'works-add': + this.sectionTitle = 'Add work' + break; + case 'works-modify': + this.sectionTitle = 'Modify work' + break; + case 'works-delete': + this.sectionTitle = 'Delete work' + break; + } + this.activeModify = false this.activeEditor = section + this.resetFields() } exhibitionAdd(id): void { @@ -147,6 +178,36 @@ export class AdminComponent implements OnInit { }) } + selectWork(id): void { + + this.activeModify = true + this.modifyId = id + this.apisService.getDetails('works', id).toPromise().then((response) => { + const detail = response.item + this.apisService.getPortfolio('exhibitions').toPromise().then((response) => { + this.exhibitions = response.items + this.title = detail.title + this.content = detail.content + this.type = detail.type + this.tags = detail.tags + this.selectedExhibitions = detail.exhibitions.length ? + this.exhibitions.filter(item => detail.exhibitions.map(a => a.id).indexOf(item.id) > -1) : [] + this.selectedGallery = detail.gallery ? JSON.parse(detail.gallery) : [] + this.selectedVideos = detail.videos ? JSON.parse(detail.videos) : [] + + console.log(detail.exhibitions, this.selectedExhibitions) + },(error) => { + console.error(error) + }).catch((e) => { + console.error(e) + }) + },(error) => { + console.error(error) + }).catch((e) => { + console.error(e) + }) + } + saveWork(): void { let error = false @@ -167,9 +228,10 @@ export class AdminComponent implements OnInit { } if(error) { - console.log('ERORS:',errorMessages) + console.log('ERRORS:',errorMessages) } else { const body = { + id: this.activeModify ? this.modifyId : null, token: window.sessionStorage.getItem('authToken'), title: this.title, content: this.content, @@ -182,14 +244,9 @@ export class AdminComponent implements OnInit { } this.apisService.saveWork(body).toPromise().then((response) => { - console.log(response) - this.title = '' - this.content = '' - this.type = '' - this.tags = '' - this.selectedExhibitions = [] - this.selectedGallery = [] - this.selectedVideos = [] + this.resetFields() + + this.works = response.items },(error) => { console.error(error) }).catch((e) => { @@ -197,4 +254,14 @@ export class AdminComponent implements OnInit { }) } } + + resetFields(): void { + this.title = '' + this.content = '' + this.type = '' + this.tags = '' + this.selectedExhibitions = [] + this.selectedGallery = [] + this.selectedVideos = [] + } } From f090ed8aff38c987f2f7ba0e81b02c5450bc2bc8 Mon Sep 17 00:00:00 2001 From: Dslak Date: Fri, 4 Dec 2020 19:19:17 +0100 Subject: [PATCH 25/38] delete work --- src/apis/auth.php | 10 +++-- src/apis/index.php | 23 +----------- src/apis/remove.php | 18 ++++++--- src/apis/upload.php | 27 ++++++++++++-- src/apis/work.php | 59 ++++++++++++++++++++++++++++++ src/app/admin/admin.component.html | 35 +++++++++++++++--- src/app/admin/admin.component.scss | 9 ++++- src/app/admin/admin.component.ts | 21 ++++++++++- src/app/services/apis.service.ts | 7 ++++ src/assets/images/angle-down.svg | 7 ++++ src/assets/scss/forms.scss | 4 ++ 11 files changed, 179 insertions(+), 41 deletions(-) create mode 100644 src/apis/work.php create mode 100644 src/assets/images/angle-down.svg diff --git a/src/apis/auth.php b/src/apis/auth.php index 9626b05..483eb4e 100755 --- a/src/apis/auth.php +++ b/src/apis/auth.php @@ -1,7 +1,7 @@ status = array(); @@ -9,17 +9,21 @@ $data = json_decode(file_get_contents("php://input")); if(isset($_GET['act']) && $_GET['act'] == 'login') { if($data->usr == 'admin' && $data->pwd == 'JohnHolmes') { + http_response_code(200); $content->status = 200; $content->authToken = base64_encode('admin:JohnHolmes'.date("Y-m-d")); } else { - $content->status = 403; + http_response_code(401); + $content->status = 401; } } else if(isset($_GET['act']) && $_GET['act'] == 'check') { if($data->token == base64_encode('admin:JohnHolmes'.date("Y-m-d"))) { + http_response_code(200); $content->status = 200; $content->authToken = base64_encode('admin:JohnHolmes'.date("Y-m-d")); } else { - $content->status = 403; + http_response_code(401); + $content->status = 401; } } header("Access-Control-Allow-Origin: *"); diff --git a/src/apis/index.php b/src/apis/index.php index e8e2b18..10fd756 100644 --- a/src/apis/index.php +++ b/src/apis/index.php @@ -1,7 +1,7 @@ status = 200; - $content->authToken = md5(date("Y-m-d")); - } else { - $content->status = 403; - } - break; - case 'check': - if($_POST['token'] == md5(date("Y-m-d"))) { - $content->status = 200; - $content->authToken = md5(date("Y-m-d")); - } else { - $content->status = 403; - } - break; - } } +http_response_code(200); header("Access-Control-Allow-Origin: *"); header("Content-Type: application/json; charset=UTF-8"); diff --git a/src/apis/remove.php b/src/apis/remove.php index 6051c5a..8f3b4a0 100644 --- a/src/apis/remove.php +++ b/src/apis/remove.php @@ -1,14 +1,22 @@ imageUrl = 'http://unsplash.it/800/600'; +$data = json_decode(file_get_contents("php://input")); + +if(isset($data->token) && $data->token == base64_encode('admin:JohnHolmes'.date("Y-m-d"))) { + + @unlink('..'.$data->url); + http_response_code(200); + $content->status = 200; + +} else { + http_response_code(401); + $content->status = 401; +} header("Access-Control-Allow-Origin: *"); header("Content-Type: application/json; charset=UTF-8"); -header("Access-Control-Allow-Methods: GET"); +header("Access-Control-Allow-Methods: POST"); header("Access-Control-Max-Age: 3600"); echo json_encode($content); diff --git a/src/apis/upload.php b/src/apis/upload.php index fcdbcc6..39e84a7 100644 --- a/src/apis/upload.php +++ b/src/apis/upload.php @@ -1,10 +1,29 @@ imageUrl = 'http://unsplash.it/800/600'; + +if(isset($_POST['token']) && $_POST['token'] == base64_encode('admin:JohnHolmes'.date("Y-m-d"))) { + + if(is_uploaded_file($_FILES['file']['tmp_name'])) { + $file = $_FILES['file']['tmp_name']; + $filename = date("YmdHis").".".end((explode(".", $_FILES["file"]["name"]))); + + $path = isset($_POST['path']) ? "/uploads/".$_POST['path'] : "/uploads/"; + @move_uploaded_file($file, "..".$path."/".$filename); + + http_response_code(200); + $content->status = 200; + $content->imageUrl = $path."/".$filename; + + } else { + http_response_code(401); + $content->status = 401; + $content->megssage = 'No file uploaded'; + } +} else { + http_response_code(401); + $content->status = 401; +} header("Access-Control-Allow-Origin: *"); header("Content-Type: application/json; charset=UTF-8"); diff --git a/src/apis/work.php b/src/apis/work.php new file mode 100644 index 0000000..4736285 --- /dev/null +++ b/src/apis/work.php @@ -0,0 +1,59 @@ +token) && $data->token == base64_encode('admin:JohnHolmes'.date("Y-m-d"))) { + + if(isset($_GET['act']) && $_GET['act'] == 'save') { + + if(isset($data->id)) { + $q = mysqli_query($conn,"UPDATE `works` SET title = '".addslashes($data->title)."', content = '".addslashes($data->content)."', + type = '".$data->type."', tags = '".$data->tags."', image = '".$data->image."', + exhibitions = '".$data->exhibitions."', gallery = '".$data->gallery."', videos = '".$data->videos."' + WHERE id = ".$data->id.""); + } else { + $q = mysqli_query($conn,"INSERT INTO `works` (`id`, `title`, `content`, `type`, `tags`, `image`, `exhibitions`, `gallery`, `videos`) + VALUES (NULL, '".addslashes($data->title)."', '".addslashes($data->content)."', '".$data->type."', + '".$data->tags."', '".$data->image."', '".$data->exhibitions."', '".$data->gallery."', + '".$data->videos."')"); + } + + $qe = mysqli_query($conn,"SELECT * FROM `works` ORDER BY id DESC"); + if(mysqli_num_rows($qe) > 0) { + $content->items = array(); + while($re = mysqli_fetch_array($qe)) { + $item = null; + $item->id = $re['id']; + $item->title = $re['title']; + $item->type = $re['type']; + $item->tags = $re['tags']; + $item->image = $re['image']; + array_push($content->items, $item); + } + } + + if($q) { + http_response_code(201); + $content->status = 201; + } else { + http_response_code(403); + $content->status = 403; + } + } + +} else { + http_response_code(401); + $content->status = 401; +} +header("Access-Control-Allow-Origin: *"); +header("Content-Type: application/json; charset=UTF-8"); +header("Access-Control-Allow-Methods: POST"); +header("Access-Control-Max-Age: 3600"); + +echo json_encode($content); + +?> diff --git a/src/app/admin/admin.component.html b/src/app/admin/admin.component.html index ca38265..711c236 100644 --- a/src/app/admin/admin.component.html +++ b/src/app/admin/admin.component.html @@ -29,18 +29,17 @@
{{sectionTitle}} - +
- Select work
-
+
Title @@ -113,6 +112,32 @@
+ + +
+
+ Title +
{{title}} | {{type}}
+
+
+ Content +
+
+ +
+ Gallery +
+
+ + +
+
+
+ +
+ +
+
diff --git a/src/app/admin/admin.component.scss b/src/app/admin/admin.component.scss index 01f960e..729fed7 100644 --- a/src/app/admin/admin.component.scss +++ b/src/app/admin/admin.component.scss @@ -34,13 +34,13 @@ padding: 20px 0 5px 0; } - .gallery-container { display: flex; background: $white; border-radius: 4px; width: 100%; padding: 5px; + min-height: 100px; .image-add { appearance: none; @@ -142,6 +142,13 @@ color: $gray; } } + + .preview-box { + border-radius: 4px; + background: $white-alpha2; + padding: 10px; + width: 100%; + } } } diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts index 9f015cc..efe953f 100644 --- a/src/app/admin/admin.component.ts +++ b/src/app/admin/admin.component.ts @@ -107,6 +107,7 @@ export class AdminComponent implements OnInit { } this.activeModify = false this.activeEditor = section + this.modifyId = null this.resetFields() } @@ -209,7 +210,6 @@ export class AdminComponent implements OnInit { } saveWork(): void { - let error = false let errorMessages = [] const mainImage = this.selectedGallery.filter(item => item.main) @@ -245,7 +245,6 @@ export class AdminComponent implements OnInit { this.apisService.saveWork(body).toPromise().then((response) => { this.resetFields() - this.works = response.items },(error) => { console.error(error) @@ -255,6 +254,23 @@ export class AdminComponent implements OnInit { } } + deleteWork(id): void { + + const body = { + id: id, + token: window.sessionStorage.getItem('authToken') + } + + this.apisService.deleteWork(body).toPromise().then((response) => { + this.resetFields() + this.works = response.items + },(error) => { + console.error(error) + }).catch((e) => { + console.error(e) + }) + } + resetFields(): void { this.title = '' this.content = '' @@ -263,5 +279,6 @@ export class AdminComponent implements OnInit { this.selectedExhibitions = [] this.selectedGallery = [] this.selectedVideos = [] + this.modifyId = null } } diff --git a/src/app/services/apis.service.ts b/src/app/services/apis.service.ts index 4f730e1..0ffcf69 100644 --- a/src/app/services/apis.service.ts +++ b/src/app/services/apis.service.ts @@ -52,5 +52,12 @@ export class ApisService extends BaseService { ) } + deleteWork(body): Observable { + let urlApi = `${this.restApi}work.php?act=delete` + return this.http.post(urlApi, JSON.stringify(body)).pipe( + catchError(this.handleError) + ) + } + } diff --git a/src/assets/images/angle-down.svg b/src/assets/images/angle-down.svg new file mode 100644 index 0000000..1008067 --- /dev/null +++ b/src/assets/images/angle-down.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/scss/forms.scss b/src/assets/scss/forms.scss index d60b308..60e4caa 100644 --- a/src/assets/scss/forms.scss +++ b/src/assets/scss/forms.scss @@ -50,6 +50,10 @@ select { .input-select { padding: 9px 20px !important; + background-image: url('/assets/images/angle-down.svg'); + background-size: 28px; + background-position: right 10px top 10px; + background-repeat: no-repeat; } .button { From d78fc019ee1216cb1e2916d3f803ab868c6cbab3 Mon Sep 17 00:00:00 2001 From: Dslak Date: Sat, 5 Dec 2020 17:42:16 +0100 Subject: [PATCH 26/38] admin exhibitions --- src/apis/exhibition.php | 61 ++++++++++ src/app/admin/admin.component.html | 61 ++++++++-- src/app/admin/admin.component.scss | 3 +- src/app/admin/admin.component.ts | 180 ++++++++++++++++++++++++++--- src/app/services/apis.service.ts | 14 +++ 5 files changed, 294 insertions(+), 25 deletions(-) create mode 100644 src/apis/exhibition.php diff --git a/src/apis/exhibition.php b/src/apis/exhibition.php new file mode 100644 index 0000000..2c30b34 --- /dev/null +++ b/src/apis/exhibition.php @@ -0,0 +1,61 @@ +token) && $data->token == base64_encode('admin:JohnHolmes'.date("Y-m-d"))) { + + if(isset($_GET['act']) && $_GET['act'] == 'save') { + + if(isset($data->id)) { + $q = mysqli_query($conn,"UPDATE `exhibitions` SET title = '".addslashes($data->title)."', content = '".addslashes($data->content)."', + tags = '".$data->tags."', date_from = '".$data->date_from."', date_to = '".$data->date_to."', + image = '".$data->image."', exhibitions = '".$data->exhibitions."', gallery = '".$data->gallery."', + videos = '".$data->videos."' WHERE id = ".$data->id.""); + } else { + $q = mysqli_query($conn,"INSERT INTO `exhibitions` + (`id`, `title`, `content`, `tags`, `date_from`, `date_to`, `image`, `works`, `gallery`, `videos`) + VALUES (NULL, '".addslashes($data->title)."', '".addslashes($data->content)."', '".$data->tags."', + '".$data->date_from."', '".$data->date_to."', '".$data->image."', '".$data->exhibitions."', + '".$data->gallery."', '".$data->videos."')"); + } + + $qe = mysqli_query($conn,"SELECT * FROM `exhibitions` ORDER BY id DESC"); + if(mysqli_num_rows($qe) > 0) { + $content->items = array(); + while($re = mysqli_fetch_array($qe)) { + $item = null; + $item->id = $re['id']; + $item->title = $re['title']; + $item->date_from = $re['date_from']; + $item->date_to = $re['date_to']; + $item->tags = $re['tags']; + $item->image = $re['image']; + array_push($content->items, $item); + } + } + + if($q) { + http_response_code(201); + $content->status = 201; + } else { + http_response_code(403); + $content->status = 403; + } + } + +} else { + http_response_code(401); + $content->status = 401; +} +header("Access-Control-Allow-Origin: *"); +header("Content-Type: application/json; charset=UTF-8"); +header("Access-Control-Allow-Methods: POST"); +header("Access-Control-Max-Age: 3600"); + +echo json_encode($content); + +?> diff --git a/src/app/admin/admin.component.html b/src/app/admin/admin.component.html index 711c236..e5615a0 100644 --- a/src/app/admin/admin.component.html +++ b/src/app/admin/admin.component.html @@ -24,12 +24,17 @@ + + Exhibitions + + +
-
+
{{sectionTitle}} -
+
-
-
+ +
+ +
+ +
+
Title
-
+
Type
+
+ Date from + +
+
+ Date to + +
Content @@ -73,7 +99,8 @@
-
+ +
Exhibitions + + + + + Selected works + + {{sw.type}} | {{sw.title}} + + +
+
Video
@@ -114,10 +157,12 @@ -
+
Title -
{{title}} | {{type}}
+
{{type}} | {{title}}
+
{{dateFrom}} | {{title}}
Content diff --git a/src/app/admin/admin.component.scss b/src/app/admin/admin.component.scss index 729fed7..be80feb 100644 --- a/src/app/admin/admin.component.scss +++ b/src/app/admin/admin.component.scss @@ -4,7 +4,7 @@ .login-form-container { text-align: center; - padding: 40px; + padding: 30px 40px; color: $white; .login-label { @@ -120,6 +120,7 @@ } .selected-exhibition, + .selected-work, .selected-video { display: block; position: relative; diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts index efe953f..54e129b 100644 --- a/src/app/admin/admin.component.ts +++ b/src/app/admin/admin.component.ts @@ -26,6 +26,7 @@ export class AdminComponent implements OnInit { public exhibitions: any = [] public works: any = [] public selectedExhibitions: any = [] + public selectedWorks: any = [] public selectedVideos: any = [] public selectedGallery: any = [] @@ -34,6 +35,8 @@ export class AdminComponent implements OnInit { public type: string = '' public content: string = '' public tags: string = '' + public dateFrom: string = '' + public dateTo: string = '' public mainImage: string = '' public videoType: string = '' public videoURL: string = '' @@ -55,26 +58,30 @@ export class AdminComponent implements OnInit { const body = { token: window.sessionStorage.getItem('authToken') } this.authService.authCheck(body).toPromise().then((response) => { - this.authCheck = response.status == 200 + this.authCheck = response.status && response.status == 200 - this.apisService.getPortfolio('exhibitions').toPromise().then((response) => { - this.exhibitions = response.items - },(error) => { - console.error('getPortfolio ERROR', error) - }).catch((e) => { - console.error('getPortfolio CATCH', e) - }) + if(this.authCheck) { + this.apisService.getPortfolio('exhibitions').toPromise().then((response) => { + this.exhibitions = response.items + },(error) => { + console.error('getPortfolio ERROR', error) + }).catch((e) => { + console.error('getPortfolio CATCH', e) + }) - this.apisService.getPortfolio('portfolio').toPromise().then((response) => { - this.works = response.items - },(error) => { - console.error('getPortfolio ERROR', error) - }).catch((e) => { - console.error('getPortfolio CATCH', e) - }) + this.apisService.getPortfolio('portfolio').toPromise().then((response) => { + this.works = response.items + },(error) => { + console.error('getPortfolio ERROR', error) + }).catch((e) => { + console.error('getPortfolio CATCH', e) + }) + } },(error) => { + this.authCheck = false console.error('Auth ERROR', error) }).catch((e) => { + this.authCheck = false console.error('Auth CATCH', e) }) } @@ -104,6 +111,15 @@ export class AdminComponent implements OnInit { case 'works-delete': this.sectionTitle = 'Delete work' break; + case 'exhibitions-add': + this.sectionTitle = 'Add exhibition' + break; + case 'exhibitions-modify': + this.sectionTitle = 'Modify exhibition' + break; + case 'exhibitions-delete': + this.sectionTitle = 'Delete exhibition' + break; } this.activeModify = false this.activeEditor = section @@ -125,6 +141,20 @@ export class AdminComponent implements OnInit { this.selectedExhibitions = this.selectedExhibitions.filter(item => item.id != id) } + workAdd(id): void { + this.selectedWorks.push( + this.works.filter(item => item.id == id)[0] + ) + this.works = this.works.filter(item => item.id != id) + } + + workRemove(id): void { + this.works.push( + this.selectedWorks.filter(item => item.id == id)[0] + ) + this.selectedWorks = this.selectedWorks.filter(item => item.id != id) + } + videoAdd(): void { this.selectedVideos.push({ type: this.videoType, @@ -196,7 +226,6 @@ export class AdminComponent implements OnInit { this.selectedGallery = detail.gallery ? JSON.parse(detail.gallery) : [] this.selectedVideos = detail.videos ? JSON.parse(detail.videos) : [] - console.log(detail.exhibitions, this.selectedExhibitions) },(error) => { console.error(error) }).catch((e) => { @@ -209,6 +238,45 @@ export class AdminComponent implements OnInit { }) } + selectExhibition(id): void { + + this.activeModify = true + this.modifyId = id + this.apisService.getDetails('exhibitions', id).toPromise().then((response) => { + const detail = response.item + this.apisService.getPortfolio('portfolio').toPromise().then((response) => { + this.works = response.items + this.title = detail.title + this.content = detail.content + this.tags = detail.tags + this.dateFrom = detail.date_from + this.dateTo = detail.date_to + this.selectedWorks = detail.works.length ? + this.works.filter(item => detail.works.map(a => a.id).indexOf(item.id) > -1) : [] + this.selectedGallery = detail.gallery ? JSON.parse(detail.gallery) : [] + this.selectedVideos = detail.videos ? JSON.parse(detail.videos) : [] + + },(error) => { + console.error(error) + }).catch((e) => { + console.error(e) + }) + },(error) => { + console.error(error) + }).catch((e) => { + console.error(e) + }) + } + + saveData(): void { + if(this.activeEditor == 'works-add' || this.activeEditor == 'works-modify') { + this.saveWork() + } + if(this.activeEditor == 'exhibitions-add' || this.activeEditor == 'exhibitions-modify') { + this.saveExhibition() + } + } + saveWork(): void { let error = false let errorMessages = [] @@ -222,6 +290,7 @@ export class AdminComponent implements OnInit { error = true errorMessages.push('No type selected') } + if(this.selectedGallery.length == 0 || mainImage.length == 0){ error = true errorMessages.push('No main image selected') @@ -254,6 +323,65 @@ export class AdminComponent implements OnInit { } } + saveExhibition(): void { + let error = false + let errorMessages = [] + const mainImage = this.selectedGallery.filter(item => item.main) + + if(!this.title){ + error = true + errorMessages.push('No title') + } + if(!this.dateFrom){ + error = true + errorMessages.push('No date from selected') + } + if(!this.dateTo){ + error = true + errorMessages.push('No date to selected') + } + if(this.selectedGallery.length == 0 || mainImage.length == 0){ + error = true + errorMessages.push('No main image selected') + } + + if(error) { + console.log('ERRORS:',errorMessages) + } else { + const body = { + id: this.activeModify ? this.modifyId : null, + token: window.sessionStorage.getItem('authToken'), + title: this.title, + content: this.content, + date_from: this.dateFrom, + date_to: this.dateTo, + tags: this.tags, + image: mainImage[0].url, + works: this.selectedWorks.map(a => a.id).join(','), + gallery: JSON.stringify(this.selectedGallery), + videos: JSON.stringify(this.selectedVideos) + } + + this.apisService.saveExhibition(body).toPromise().then((response) => { + this.resetFields() + this.exhibitions = response.items + },(error) => { + console.error(error) + }).catch((e) => { + console.error(e) + }) + } + } + + deleteData(id): void { + if(this.activeEditor == 'works-delete') { + this.deleteWork(id) + } + if(this.activeEditor == 'exhibitions-delete') { + this.deleteExhibition(id) + } + } + deleteWork(id): void { const body = { @@ -271,12 +399,32 @@ export class AdminComponent implements OnInit { }) } + deleteExhibition(id): void { + + const body = { + id: id, + token: window.sessionStorage.getItem('authToken') + } + + this.apisService.deleteExhibition(body).toPromise().then((response) => { + this.resetFields() + this.exhibitions = response.items + },(error) => { + console.error(error) + }).catch((e) => { + console.error(e) + }) + } + resetFields(): void { this.title = '' this.content = '' this.type = '' this.tags = '' + this.dateFrom = '' + this.dateTo = '' this.selectedExhibitions = [] + this.selectedWorks = [] this.selectedGallery = [] this.selectedVideos = [] this.modifyId = null diff --git a/src/app/services/apis.service.ts b/src/app/services/apis.service.ts index 0ffcf69..31e6ab1 100644 --- a/src/app/services/apis.service.ts +++ b/src/app/services/apis.service.ts @@ -59,5 +59,19 @@ export class ApisService extends BaseService { ) } + saveExhibition(body): Observable { + let urlApi = `${this.restApi}exhibition.php?act=save` + return this.http.post(urlApi, JSON.stringify(body)).pipe( + catchError(this.handleError) + ) + } + + deleteExhibition(body): Observable { + let urlApi = `${this.restApi}exhibition.php?act=delete` + return this.http.post(urlApi, JSON.stringify(body)).pipe( + catchError(this.handleError) + ) + } + } From 87444cc39ef66b9dda1ef6b848abc5e61d5d8b3a Mon Sep 17 00:00:00 2001 From: Dslak Date: Sat, 5 Dec 2020 20:46:21 +0100 Subject: [PATCH 27/38] chrome fixes --- src/app/admin/admin.component.html | 22 +++++----- src/app/admin/admin.component.ts | 43 +++++++++++-------- src/app/app-layout/app-layout.component.ts | 1 + src/app/detail/detail.component.html | 2 +- src/app/detail/detail.component.ts | 3 ++ src/app/portfolio/portfolio.component.scss | 26 ++++++----- src/app/workshops/workshops.component.html | 1 - src/app/workshops/workshops.component.scss | 0 src/app/workshops/workshops.component.spec.ts | 25 ----------- src/app/workshops/workshops.component.ts | 15 ------- 10 files changed, 53 insertions(+), 85 deletions(-) delete mode 100644 src/app/workshops/workshops.component.html delete mode 100644 src/app/workshops/workshops.component.scss delete mode 100644 src/app/workshops/workshops.component.spec.ts delete mode 100644 src/app/workshops/workshops.component.ts diff --git a/src/app/admin/admin.component.html b/src/app/admin/admin.component.html index e5615a0..694eb5d 100644 --- a/src/app/admin/admin.component.html +++ b/src/app/admin/admin.component.html @@ -36,9 +36,9 @@ {{sectionTitle}}
- - @@ -46,9 +46,9 @@
- - @@ -58,7 +58,7 @@ *ngIf="activeEditor == 'works-add' || (activeEditor == 'works-modify' && activeModify) || activeEditor == 'exhibitions-add' || (activeEditor == 'exhibitions-modify' && activeModify)">
+ 'col-6': activeEditor == 'exhibitions-add' || activeEditor == 'exhibitions-modify'}"> Title
@@ -68,11 +68,11 @@
-
+
Date from
-
+
Date to
@@ -102,9 +102,9 @@
Exhibitions - - @@ -117,9 +117,9 @@
Works - - diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts index 54e129b..1e1fc0b 100644 --- a/src/app/admin/admin.component.ts +++ b/src/app/admin/admin.component.ts @@ -61,37 +61,25 @@ export class AdminComponent implements OnInit { this.authCheck = response.status && response.status == 200 if(this.authCheck) { - this.apisService.getPortfolio('exhibitions').toPromise().then((response) => { - this.exhibitions = response.items - },(error) => { - console.error('getPortfolio ERROR', error) - }).catch((e) => { - console.error('getPortfolio CATCH', e) - }) - - this.apisService.getPortfolio('portfolio').toPromise().then((response) => { - this.works = response.items - },(error) => { - console.error('getPortfolio ERROR', error) - }).catch((e) => { - console.error('getPortfolio CATCH', e) - }) + this.loadData() } + },(error) => { this.authCheck = false - console.error('Auth ERROR', error) + console.error('Auth ERROR INIT', error) }).catch((e) => { this.authCheck = false - console.error('Auth CATCH', e) + console.error('Auth CATCH INIT', e) }) } login(): void { const body = { usr: this.userName, pwd: this.password } this.authService.login(body).toPromise().then((response) => { - this.authCheck = response.status == 200 + this.authCheck = response.status && response.status == 200 if(this.authCheck) { window.sessionStorage.setItem('authToken', response.authToken) + this.loadData() } },(error) => { console.error('Auth ERROR', error) @@ -100,6 +88,24 @@ export class AdminComponent implements OnInit { }) } + loadData(): void { + this.apisService.getPortfolio('exhibitions').toPromise().then((response) => { + this.exhibitions = response.items + },(error) => { + console.error('getPortfolio ERROR', error) + }).catch((e) => { + console.error('getPortfolio CATCH', e) + }) + + this.apisService.getPortfolio('portfolio').toPromise().then((response) => { + this.works = response.items + },(error) => { + console.error('getPortfolio ERROR', error) + }).catch((e) => { + console.error('getPortfolio CATCH', e) + }) + } + showEditor(section): void { switch(section) { case 'works-add': @@ -210,6 +216,7 @@ export class AdminComponent implements OnInit { } selectWork(id): void { + console.log('selectWork') this.activeModify = true this.modifyId = id diff --git a/src/app/app-layout/app-layout.component.ts b/src/app/app-layout/app-layout.component.ts index 956d7d3..26318ab 100644 --- a/src/app/app-layout/app-layout.component.ts +++ b/src/app/app-layout/app-layout.component.ts @@ -96,6 +96,7 @@ export class AppLayoutComponent implements OnInit { ngOnInit(): void { this.page = this.router.url + this.particlesEnabled = this.page != '/admin' } diff --git a/src/app/detail/detail.component.html b/src/app/detail/detail.component.html index 15c2be3..79c0db1 100644 --- a/src/app/detail/detail.component.html +++ b/src/app/detail/detail.component.html @@ -12,7 +12,7 @@ 'col-md-3': details.gallery.length >= 3}">
{{image.title}} - +
diff --git a/src/app/detail/detail.component.ts b/src/app/detail/detail.component.ts index 34e5412..1d191d6 100644 --- a/src/app/detail/detail.component.ts +++ b/src/app/detail/detail.component.ts @@ -4,6 +4,7 @@ import { DomSanitizer } from '@angular/platform-browser' import { Location } from '@angular/common' import { NgxImageGalleryComponent, GALLERY_IMAGE, GALLERY_CONF } from "ngx-image-gallery" import { ApisService } from '../services/apis.service' +import { environment } from '../../environments/environment' @Component({ selector: 'app-detail', @@ -12,6 +13,8 @@ import { ApisService } from '../services/apis.service' }) export class DetailComponent implements OnInit { + public basePath = `${environment.BASE_PATH}` + @ViewChild(NgxImageGalleryComponent) ngxImageGallery: NgxImageGalleryComponent public details: any = {} diff --git a/src/app/portfolio/portfolio.component.scss b/src/app/portfolio/portfolio.component.scss index d799a61..6a6f4ac 100644 --- a/src/app/portfolio/portfolio.component.scss +++ b/src/app/portfolio/portfolio.component.scss @@ -6,7 +6,7 @@ .box { position: relative; display: flex; - //background: $black-alpha; + background: $black-alpha; border-radius: 10px; overflow: hidden; margin: 10px 0; @@ -23,10 +23,10 @@ height: 100%; width: 100%; object-fit: cover; - transform: translate(-50%, -50%) scale(1.2); - opacity: .5; - filter: grayscale(100%) invert(100%); - transition: transform .4s, opacity .4s, filter .4s; + transform: translate(-50%, -50%); + opacity: .9; + filter: grayscale(100%) brightness(.4); + transition: opacity .4s, filter .4s; -webkit-backface-visibility: hidden; z-index: 0; } @@ -36,8 +36,8 @@ margin: auto; text-align: center; transform: translate(0%, 0%); - color: $black; - transition: color .4s; + color: $yellow; + //transition: color .4s; -webkit-backface-visibility: hidden; z-index: 1; @@ -99,21 +99,19 @@ background: $black; z-index: 50; - //animation-play-state: paused; - @each $angle in 0,1,2,3,4,5,6 { &.skew-#{$angle} { - transform: scale(1.4) rotate(2deg) skew(#{3 - $angle}deg, #{3 - $angle}deg); + //transform: scale(1.4) rotate(2deg) skew(#{3 - $angle}deg, #{3 - $angle}deg); + transform: scale(1.4) rotate(0deg) skew(0deg, 0deg); } } .image { - filter: grayscale(100%) invert(0%) brightness(.5); - opacity: .9; - transform: translate(-50%, -50%) scale(1.6); + filter: grayscale(0%) brightness(1); + opacity: .5; } .text { - color: $yellow; + //color: $yellow; } } } diff --git a/src/app/workshops/workshops.component.html b/src/app/workshops/workshops.component.html deleted file mode 100644 index d0e6442..0000000 --- a/src/app/workshops/workshops.component.html +++ /dev/null @@ -1 +0,0 @@ -

workshops works!

diff --git a/src/app/workshops/workshops.component.scss b/src/app/workshops/workshops.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/workshops/workshops.component.spec.ts b/src/app/workshops/workshops.component.spec.ts deleted file mode 100644 index 46e2e57..0000000 --- a/src/app/workshops/workshops.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { WorkshopsComponent } from './workshops.component'; - -describe('WorkshopsComponent', () => { - let component: WorkshopsComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ WorkshopsComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(WorkshopsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/workshops/workshops.component.ts b/src/app/workshops/workshops.component.ts deleted file mode 100644 index af08b35..0000000 --- a/src/app/workshops/workshops.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-workshops', - templateUrl: './workshops.component.html', - styleUrls: ['./workshops.component.scss'] -}) -export class WorkshopsComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} From 5b1e69a8e66c6c5edbbd5f1cddb9c10751c0b353 Mon Sep 17 00:00:00 2001 From: Dslak Date: Sun, 6 Dec 2020 12:07:59 +0100 Subject: [PATCH 28/38] fix galleri path and add embed video --- src/app/admin/admin.component.html | 1 + src/app/admin/admin.component.ts | 2 +- src/app/detail/detail.component.html | 17 +++++++---- src/app/detail/detail.component.scss | 7 +++-- src/app/detail/detail.component.ts | 33 ++++++++++++++++------ src/app/portfolio/portfolio.component.html | 2 +- src/app/portfolio/portfolio.component.ts | 3 ++ 7 files changed, 46 insertions(+), 19 deletions(-) diff --git a/src/app/admin/admin.component.html b/src/app/admin/admin.component.html index 694eb5d..7cc2eb5 100644 --- a/src/app/admin/admin.component.html +++ b/src/app/admin/admin.component.html @@ -137,6 +137,7 @@
diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts index 1e1fc0b..f0b46f7 100644 --- a/src/app/admin/admin.component.ts +++ b/src/app/admin/admin.component.ts @@ -164,7 +164,7 @@ export class AdminComponent implements OnInit { videoAdd(): void { this.selectedVideos.push({ type: this.videoType, - url: this.videoURL + url: this.videoURL.replace(/\"/g, "\\\"") }) this.videoURL = '' } diff --git a/src/app/detail/detail.component.html b/src/app/detail/detail.component.html index 79c0db1..7d9e587 100644 --- a/src/app/detail/detail.component.html +++ b/src/app/detail/detail.component.html @@ -5,11 +5,11 @@

{{details.title}}

-
-
+
+
{{image.title}} @@ -33,11 +33,16 @@ 'col-md-4': details.videos.length >= 3}"> {{video.title}}
- {{video.code}}
+
+ +
+
+
diff --git a/src/app/detail/detail.component.scss b/src/app/detail/detail.component.scss index 5e764b1..a356f88 100644 --- a/src/app/detail/detail.component.scss +++ b/src/app/detail/detail.component.scss @@ -82,11 +82,14 @@ padding-bottom: 5px; } - .youtube { + .youtube, + .vimeo, + .embed { position: relative; padding-bottom: 56.25%; - .iframe{ + iframe, + .iframe { position: absolute; top: 0; left: 0; diff --git a/src/app/detail/detail.component.ts b/src/app/detail/detail.component.ts index 1d191d6..78ea622 100644 --- a/src/app/detail/detail.component.ts +++ b/src/app/detail/detail.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core' +import { Component, OnInit, ViewChild, ViewEncapsulation} from '@angular/core' import { Router, NavigationEnd, NavigationStart, ActivatedRoute } from '@angular/router' import { DomSanitizer } from '@angular/platform-browser' import { Location } from '@angular/common' @@ -9,7 +9,8 @@ import { environment } from '../../environments/environment' @Component({ selector: 'app-detail', templateUrl: './detail.component.html', - styleUrls: ['./detail.component.scss'] + styleUrls: ['./detail.component.scss'], + encapsulation: ViewEncapsulation.None, }) export class DetailComponent implements OnInit { @@ -45,6 +46,7 @@ export class DetailComponent implements OnInit { } showDetails(section, id): void { + this.galleryImages = [] this.apisService.getDetails(section, id).toPromise().then((response) => { if(this.history[this.history.length - 1] != `/detail/${section}/${id}`) { this.history.push(`/detail/${section}/${id}`) @@ -54,17 +56,30 @@ export class DetailComponent implements OnInit { detail.videos = detail.videos ? JSON.parse(detail.videos) : [] detail.videos.forEach((e) => { e.code = e.url.split('/').pop() - e.embed = this.sanitizer.bypassSecurityTrustResourceUrl(`https://www.youtube.com/embed/${e.code}`) + switch(e.type) { + case 'youtube': + e.embed = this.sanitizer.bypassSecurityTrustResourceUrl(`https://www.youtube.com/embed/${e.code}`) + break + case 'vimeo': + e.embed = this.sanitizer.bypassSecurityTrustResourceUrl(`https://player.vimeo.com/video/${e.code}`) + break + case 'embed': + e.embed = this.sanitizer.bypassSecurityTrustHtml(e.url) + break + } }) + detail.gallery = detail.gallery ? JSON.parse(detail.gallery) : [] detail.gallery.forEach((e) => { - this.galleryImages.push({ - url: e.url, - altText: e.title, - title: e.title, - thumbnailUrl: e.url - }) + if(!e.main) { + this.galleryImages.push({ + url: `${e.url}`, + altText: e.title, + title: e.title, + thumbnailUrl: `${this.basePath}${e.url}` + }) + } }) this.details = detail diff --git a/src/app/portfolio/portfolio.component.html b/src/app/portfolio/portfolio.component.html index 094f09d..d53692f 100644 --- a/src/app/portfolio/portfolio.component.html +++ b/src/app/portfolio/portfolio.component.html @@ -3,7 +3,7 @@
- +
{{item.title}} {{item.type}} diff --git a/src/app/portfolio/portfolio.component.ts b/src/app/portfolio/portfolio.component.ts index 1902028..f41877c 100644 --- a/src/app/portfolio/portfolio.component.ts +++ b/src/app/portfolio/portfolio.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core' import { Router, NavigationEnd } from '@angular/router' import { ApisService } from '../services/apis.service' +import { environment } from '../../environments/environment' @Component({ selector: 'app-portfolio', @@ -9,6 +10,8 @@ import { ApisService } from '../services/apis.service' }) export class PortfolioComponent implements OnInit { + public basePath = `${environment.BASE_PATH}` + public portfolioItems: any = [] public section: string = '' From 2b5b2e81c9c2c60aa803cb9c3fcc8f7e39d5ee83 Mon Sep 17 00:00:00 2001 From: Dslak Date: Sun, 6 Dec 2020 21:36:37 +0100 Subject: [PATCH 29/38] fine tuning --- src/app/admin/admin.component.html | 2 +- src/app/admin/admin.component.ts | 2 -- src/app/detail/detail.component.scss | 2 ++ src/app/portfolio/portfolio.component.html | 2 +- src/app/portfolio/portfolio.component.ts | 37 ++++++++++++++++++++++ src/assets/scss/variables.scss | 4 +-- 6 files changed, 43 insertions(+), 6 deletions(-) diff --git a/src/app/admin/admin.component.html b/src/app/admin/admin.component.html index 7cc2eb5..4bcd7dc 100644 --- a/src/app/admin/admin.component.html +++ b/src/app/admin/admin.component.html @@ -70,7 +70,7 @@
Date from - +
Date to diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts index f0b46f7..03443d9 100644 --- a/src/app/admin/admin.component.ts +++ b/src/app/admin/admin.component.ts @@ -216,8 +216,6 @@ export class AdminComponent implements OnInit { } selectWork(id): void { - console.log('selectWork') - this.activeModify = true this.modifyId = id this.apisService.getDetails('works', id).toPromise().then((response) => { diff --git a/src/app/detail/detail.component.scss b/src/app/detail/detail.component.scss index a356f88..0527ae3 100644 --- a/src/app/detail/detail.component.scss +++ b/src/app/detail/detail.component.scss @@ -76,6 +76,8 @@ } .videos { + padding-bottom: 40px; + .video-title { font-size: $font-18; font-weight: bold; diff --git a/src/app/portfolio/portfolio.component.html b/src/app/portfolio/portfolio.component.html index d53692f..1491280 100644 --- a/src/app/portfolio/portfolio.component.html +++ b/src/app/portfolio/portfolio.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/src/app/portfolio/portfolio.component.ts b/src/app/portfolio/portfolio.component.ts index f41877c..ec793ec 100644 --- a/src/app/portfolio/portfolio.component.ts +++ b/src/app/portfolio/portfolio.component.ts @@ -25,6 +25,43 @@ export class PortfolioComponent implements OnInit { this.apisService.getPortfolio(this.section).toPromise().then((response) => { this.portfolioItems = response.items + + let cnt = 0 + let width = 0 + let tot = 0 + + this.portfolioItems.forEach((e) => { + switch (cnt) { + case 0: + width = Math.floor(Math.random()*3)+3 + tot = width + cnt++ + break; + case 1: + width = Math.floor(Math.random()*3)+3 + cnt++ + + if(tot + width > 9) { + width = 12 - tot + tot = 0 + cnt = 0 + } else { + tot = tot + width + } + + break; + case 2: + width = 12 - tot + tot = 0 + cnt = 0 + break; + } + + e.width = width + + //((e.id % 5)+3) + //Math.floor((Math.random()*3)+1)+2 + }) },(error) => { console.error('getPortfolio ERROR', error) }).catch((e) => { diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index d4bcaab..dd99a70 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -3,14 +3,14 @@ $grid-breakpoints: ( xs: 0, sm: 576px, md: 768px, - lg: 992px, + lg: 1024px, xl: 1440px ); $container-max-widths: ( sm: 540px, md: 720px, - lg: 960px, + lg: 990px, xl: 1418px ); From e66e69b9aa5eeb84bc2679fe7c655d80ab0781c7 Mon Sep 17 00:00:00 2001 From: Dslak Date: Mon, 7 Dec 2020 15:25:20 +0100 Subject: [PATCH 30/38] add deploy and prod scripts update apis add authentication add images loader --- auth/identity.pem | 27 +++++++ deploy.sh | 5 ++ package.json | 1 + src/apis/auth.php | 13 ++-- src/apis/exhibition.php | 79 +++++++++++++-------- src/apis/index.php | 4 +- src/apis/work.php | 72 +++++++++++-------- src/app/detail/detail.component.html | 3 +- src/app/detail/detail.component.scss | 9 ++- src/app/detail/detail.component.ts | 8 ++- src/app/portfolio/portfolio.component.html | 3 +- src/app/portfolio/portfolio.component.ts | 6 ++ src/assets/images/loader.webp | Bin 0 -> 80494 bytes src/environments/environment.prod.ts | 4 +- 14 files changed, 161 insertions(+), 73 deletions(-) create mode 100644 auth/identity.pem create mode 100644 deploy.sh create mode 100644 src/assets/images/loader.webp diff --git a/auth/identity.pem b/auth/identity.pem new file mode 100644 index 0000000..0fff9d4 --- /dev/null +++ b/auth/identity.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEApNcN8cn0872DhGSdPobrIR9kBfd+qSL/Sqrgk3mywEuuzhN3 +MOYbaejwdIJacC0OjCMVgm3f2TziefYd2ssvAUjT+M9FCESUSSDHgPVxt22UDZxz +ZraasA+jdVW0QQtBv8AjyDCXAmMZxcGT1x1htKsKfG2JDxxc1DXub1BaBSkrqcZ1 +1u50UK0DBbRcUhd85z9Oivju3IktDaVow09fpwUR/tK1xO8PPsaAUQMKdN1ArGA/ +O+FFXAirQ7OD8tT4gCmJYrU2h4mAlcjKwpvmXbtHGmZ2tn4nJsaYUxL0vMPHWoTl +ymOkFbKujBDkTSdKgUdTBy7Bda9ZzAcEBJoGgQIDAQABAoIBAEGVmuO3obEUlu4n +BfUpwwVzst044nkzBnXT1PR4OCmQMyWk0whulTunRXxlnMwC8UXKc7VoN+b79XPm ++2vg6XvOWSAmf2XRu1n5I8doYG1FuOFNfRDB2HvyTOvTRJuYeflr3hC5XGvDuC5Z +XZP6CbTTVKG7BwwvEbQRHSPGyXpBiqd+OOfTpeoobrkGJJAKxvXHO0G7zgB5h/H+ +0fjSWvo4QxzOAF74f0qUmWBbvLjWL3yZhVE8mxNcVoV1HlIdXV5anMe9FURci5D4 +U8ehGky3sbHjcc7wro5IPWJYTrDAmvhI8wMMx7gbHe2HOzyWRX++ifjfP77kw2e3 +IYnwMAECgYEA05Ehmsipk4rmJeCgmDJomQVsJgMW1zjOJwIljSZ9o55+LHpma6r0 +O6sdQYgiNwQT0f//iJZkatpDAyC3U6EU9RY7Yoc0R3XK86vryKQlB/Nh1boLldt6 +9TGdL5eCzaraiYuLjGvXMGTS8LjB0ftFCGQswl2kcuOFx1YjE4WPoUECgYEAx3Wo +yenPXHCdD4kIrQ9SxPha2aobh33MjdwSYSiDliaEoBg/voWJExFmMJuvhR46xqmy +i8E0RuzzBrG4Zhbdo4kcpdF2GtAuxNw8uYvG+SQub8zAmBT7YpXzTmpGQ2TR3i8S +XzD57s7C1mSkBIwWuVJYcx3Kgm1mQNIOELU31UECgYEAhNc14HhqcaffRp06eRX9 +s0dCVsPNzalvV/LzHSOz886KrubT9HrNC8Ivhnwx75Vx1IQHMP4tYyJUvVwHgE0+ +WX1yIDWAz/XYTxP94meekNVy8r30lE3RcK+MYNujV/wVaBPktXDpFwvXnyqDGJPL +Dq/HouslXLYbw8QEFjfgrYECgYB+oSU6ozThpCEihsY6ULskj+PlwohdubEO8wO8 +KSN5RRT4Ksz1YQPIVkiBXaXOJoX8MCpJbayJxs73lgbS0Xt+4oKMh3GqzjaTBpuK +1MHK1Hyiv+QZ6WA7k6V3SCM5kB1pKItKYeabBStPP2+d725R04SR+PzjVx8O0gzZ +8KL0wQKBgC7LRztq8PMDGTHGXVxWXwZ08ZAf2MAsBvYyAU5xudS+pRqlNGDgyxiv +YQEe9n2DVu7GVsoNnKIapmXV1qx0vTU/CpKV0cpXi6m3XVnbtjBsaYtkYNNZfHVl +E++gP4qgvALKugnzaGn5oby0PPcFFhnNqRwFb5c3diihwMQhkudG +-----END RSA PRIVATE KEY----- diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..0d0a48f --- /dev/null +++ b/deploy.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +yarn prod +rsync -avz --delete --exclude '/apis/conn.conn' --exclude '.well-known' --exclude '/uploads' -e "ssh -i ./auth/identity.pem -p2222" ./dist/dslak-website/* cdr@2.238.194.8:/www/dslak.it/ + diff --git a/package.json b/package.json index c8ae448..b5d828b 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "start": "ng serve", "dev": "ng serve", "build": "ng build", + "prod": "ng build --prod --configuration production", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e" diff --git a/src/apis/auth.php b/src/apis/auth.php index 483eb4e..1cd0185 100755 --- a/src/apis/auth.php +++ b/src/apis/auth.php @@ -4,28 +4,33 @@ $GLOBALS['conn']; $conn = @mysqli_connect($DATAhst,$DATAusr,$DATApwd,$DATAdtb)or die("CONNECTION ERROR"); $content = null; -$content->status = array(); +$content->status = 200; + $data = json_decode(file_get_contents("php://input")); if(isset($_GET['act']) && $_GET['act'] == 'login') { - if($data->usr == 'admin' && $data->pwd == 'JohnHolmes') { + if(isset($data->usr) && $data->usr == 'admin' && isset($data->pwd) && $data->pwd == 'JohnHolmes') { http_response_code(200); $content->status = 200; $content->authToken = base64_encode('admin:JohnHolmes'.date("Y-m-d")); } else { http_response_code(401); $content->status = 401; + $content->action = 'login'; } } else if(isset($_GET['act']) && $_GET['act'] == 'check') { - if($data->token == base64_encode('admin:JohnHolmes'.date("Y-m-d"))) { + if(isset($data->token) && $data->token == base64_encode('admin:JohnHolmes'.date("Y-m-d"))) { http_response_code(200); $content->status = 200; $content->authToken = base64_encode('admin:JohnHolmes'.date("Y-m-d")); } else { - http_response_code(401); + http_response_code(200); $content->status = 401; + $content->action = 'check'; + $content->token = $data->token; } } + header("Access-Control-Allow-Origin: *"); header("Content-Type: application/json; charset=UTF-8"); header("Access-Control-Allow-Methods: POST"); diff --git a/src/apis/exhibition.php b/src/apis/exhibition.php index 2c30b34..e008311 100644 --- a/src/apis/exhibition.php +++ b/src/apis/exhibition.php @@ -8,42 +8,61 @@ $data = json_decode(file_get_contents("php://input")); if(isset($data->token) && $data->token == base64_encode('admin:JohnHolmes'.date("Y-m-d"))) { - if(isset($_GET['act']) && $_GET['act'] == 'save') { - - if(isset($data->id)) { - $q = mysqli_query($conn,"UPDATE `exhibitions` SET title = '".addslashes($data->title)."', content = '".addslashes($data->content)."', - tags = '".$data->tags."', date_from = '".$data->date_from."', date_to = '".$data->date_to."', - image = '".$data->image."', exhibitions = '".$data->exhibitions."', gallery = '".$data->gallery."', - videos = '".$data->videos."' WHERE id = ".$data->id.""); - } else { - $q = mysqli_query($conn,"INSERT INTO `exhibitions` - (`id`, `title`, `content`, `tags`, `date_from`, `date_to`, `image`, `works`, `gallery`, `videos`) - VALUES (NULL, '".addslashes($data->title)."', '".addslashes($data->content)."', '".$data->tags."', - '".$data->date_from."', '".$data->date_to."', '".$data->image."', '".$data->exhibitions."', - '".$data->gallery."', '".$data->videos."')"); + if(isset($_GET['act'])) { + if($_GET['act'] == 'save') { + if(isset($data->id)) { + $q = mysqli_query($conn,"UPDATE `exhibitions` SET title = '".addslashes($data->title)."', content = '".addslashes($data->content)."', + tags = '".$data->tags."', date_from = '".$data->date_from."', date_to = '".$data->date_to."', + image = '".$data->image."', works = '".$data->works."', gallery = '".$data->gallery."', + videos = '".$data->videos."' WHERE id = ".$data->id.""); + } else { + $q = mysqli_query($conn,"INSERT INTO `exhibitions` + (`id`, `title`, `content`, `tags`, `date_from`, `date_to`, `image`, `works`, `gallery`, `videos`) + VALUES (NULL, '".addslashes($data->title)."', '".addslashes($data->content)."', '".$data->tags."', + '".$data->date_from."', '".$data->date_to."', '".$data->image."', '".$data->works."', + '".$data->gallery."', '".$data->videos."')"); + } + + if($q) { + http_response_code(201); + $content->status = 201; + } else { + http_response_code(403); + $content->status = "UPDATE `exhibitions` SET title = '".addslashes($data->title)."', content = '".addslashes($data->content)."', + tags = '".$data->tags."', date_from = '".$data->date_from."', date_to = '".$data->date_to."', + image = '".$data->image."', works = '".$data->works."', gallery = '".$data->gallery."', + videos = '".$data->videos."' WHERE id = ".$data->id.""; + } } - $qe = mysqli_query($conn,"SELECT * FROM `exhibitions` ORDER BY id DESC"); - if(mysqli_num_rows($qe) > 0) { - $content->items = array(); - while($re = mysqli_fetch_array($qe)) { - $item = null; - $item->id = $re['id']; - $item->title = $re['title']; - $item->date_from = $re['date_from']; - $item->date_to = $re['date_to']; - $item->tags = $re['tags']; - $item->image = $re['image']; - array_push($content->items, $item); + if($_GET['act'] == 'delete') { + if(isset($data->id)) { + $q = mysqli_query($conn,"DELETE FROM `exhibitions` WHERE id = ".$data->id.""); + if($q) { + http_response_code(201); + $content->status = 201; + } else { + http_response_code(403); + $content->status = 403; + } } } if($q) { - http_response_code(201); - $content->status = 201; - } else { - http_response_code(403); - $content->status = 403; + $qe = mysqli_query($conn,"SELECT * FROM `exhibitions` ORDER BY id DESC"); + if(mysqli_num_rows($qe) > 0) { + $content->items = array(); + while($re = mysqli_fetch_array($qe)) { + $item = null; + $item->id = $re['id']; + $item->title = $re['title']; + $item->date_from = $re['date_from']; + $item->date_to = $re['date_to']; + $item->tags = $re['tags']; + $item->image = $re['image']; + array_push($content->items, $item); + } + } } } diff --git a/src/apis/index.php b/src/apis/index.php index 10fd756..ad3015e 100644 --- a/src/apis/index.php +++ b/src/apis/index.php @@ -58,6 +58,8 @@ if(isset($_GET['query'])) { $item->content = $re['content']; $item->tags = $re['tags']; $item->image = $re['image']; + $item->videos = $re['videos']; + $item->gallery = $re['gallery']; if($_GET['type'] == 'exhibitions') { $item->date_from = $re['date_from']; $item->date_to = $re['date_to']; @@ -71,8 +73,6 @@ if(isset($_GET['query'])) { } } else if($_GET['type'] == 'works') { $item->type = $re['type']; - $item->videos = $re['videos']; - $item->gallery = $re['gallery']; $item->exhibitions = array(); $qx = mysqli_query($conn,"SELECT id,title FROM `exhibitions` WHERE id IN (".$re['exhibitions'].")"); while($re = mysqli_fetch_array($qx)) { diff --git a/src/apis/work.php b/src/apis/work.php index 4736285..9ec5edf 100644 --- a/src/apis/work.php +++ b/src/apis/work.php @@ -8,40 +8,56 @@ $data = json_decode(file_get_contents("php://input")); if(isset($data->token) && $data->token == base64_encode('admin:JohnHolmes'.date("Y-m-d"))) { - if(isset($_GET['act']) && $_GET['act'] == 'save') { - - if(isset($data->id)) { - $q = mysqli_query($conn,"UPDATE `works` SET title = '".addslashes($data->title)."', content = '".addslashes($data->content)."', - type = '".$data->type."', tags = '".$data->tags."', image = '".$data->image."', - exhibitions = '".$data->exhibitions."', gallery = '".$data->gallery."', videos = '".$data->videos."' - WHERE id = ".$data->id.""); - } else { - $q = mysqli_query($conn,"INSERT INTO `works` (`id`, `title`, `content`, `type`, `tags`, `image`, `exhibitions`, `gallery`, `videos`) - VALUES (NULL, '".addslashes($data->title)."', '".addslashes($data->content)."', '".$data->type."', - '".$data->tags."', '".$data->image."', '".$data->exhibitions."', '".$data->gallery."', - '".$data->videos."')"); + if(isset($_GET['act'])) { + if($_GET['act'] == 'save') { + if(isset($data->id)) { + $q = mysqli_query($conn,"UPDATE `works` SET title = '".addslashes($data->title)."', content = '".addslashes($data->content)."', + type = '".$data->type."', tags = '".$data->tags."', image = '".$data->image."', + exhibitions = '".$data->exhibitions."', gallery = '".$data->gallery."', videos = '".$data->videos."' + WHERE id = ".$data->id.""); + } else { + $q = mysqli_query($conn,"INSERT INTO `works` (`id`, `title`, `content`, `type`, `tags`, `image`, `exhibitions`, `gallery`, `videos`) + VALUES (NULL, '".addslashes($data->title)."', '".addslashes($data->content)."', '".$data->type."', + '".$data->tags."', '".$data->image."', '".$data->exhibitions."', '".$data->gallery."', + '".$data->videos."')"); + } + + if($q) { + http_response_code(201); + $content->status = 201; + } else { + http_response_code(403); + $content->status = 403; + } } - $qe = mysqli_query($conn,"SELECT * FROM `works` ORDER BY id DESC"); - if(mysqli_num_rows($qe) > 0) { - $content->items = array(); - while($re = mysqli_fetch_array($qe)) { - $item = null; - $item->id = $re['id']; - $item->title = $re['title']; - $item->type = $re['type']; - $item->tags = $re['tags']; - $item->image = $re['image']; - array_push($content->items, $item); + if($_GET['act'] == 'delete') { + if(isset($data->id)) { + $q = mysqli_query($conn,"DELETE FROM `works` WHERE id = ".$data->id.""); + if($q) { + http_response_code(201); + $content->status = 201; + } else { + http_response_code(403); + $content->status = 403; + } } } if($q) { - http_response_code(201); - $content->status = 201; - } else { - http_response_code(403); - $content->status = 403; + $qe = mysqli_query($conn,"SELECT * FROM `works` ORDER BY id DESC"); + if(mysqli_num_rows($qe) > 0) { + $content->items = array(); + while($re = mysqli_fetch_array($qe)) { + $item = null; + $item->id = $re['id']; + $item->title = $re['title']; + $item->type = $re['type']; + $item->tags = $re['tags']; + $item->image = $re['image']; + array_push($content->items, $item); + } + } } } diff --git a/src/app/detail/detail.component.html b/src/app/detail/detail.component.html index 7d9e587..53457f7 100644 --- a/src/app/detail/detail.component.html +++ b/src/app/detail/detail.component.html @@ -12,7 +12,8 @@ 'col-md-3': galleryImages.length >= 3}">
{{image.title}} - + loading +
diff --git a/src/app/detail/detail.component.scss b/src/app/detail/detail.component.scss index 0527ae3..246b883 100644 --- a/src/app/detail/detail.component.scss +++ b/src/app/detail/detail.component.scss @@ -27,9 +27,6 @@ .date-container { display: inline-flex; - position: absolute; - top: 40px; - right: 40px; .date { display: inline-flex; @@ -144,6 +141,12 @@ .component-detail { .content { transform: rotate(2deg) skew(0deg, -6deg); + + .date-container { + position: absolute; + top: 40px; + right: 40px; + } } } } diff --git a/src/app/detail/detail.component.ts b/src/app/detail/detail.component.ts index 78ea622..f2d3553 100644 --- a/src/app/detail/detail.component.ts +++ b/src/app/detail/detail.component.ts @@ -30,6 +30,7 @@ export class DetailComponent implements OnInit { } public galleryImages: GALLERY_IMAGE[] = [] + public loadedImages: boolean[] = [] constructor( private apisService: ApisService, @@ -74,11 +75,12 @@ export class DetailComponent implements OnInit { detail.gallery.forEach((e) => { if(!e.main) { this.galleryImages.push({ - url: `${e.url}`, + url: `${this.basePath}${e.url}`, altText: e.title, title: e.title, thumbnailUrl: `${this.basePath}${e.url}` }) + this.loadedImages.push(true) } }) this.details = detail @@ -104,7 +106,9 @@ export class DetailComponent implements OnInit { } - + onLoad(index): void { + this.loadedImages[index] = false + } diff --git a/src/app/portfolio/portfolio.component.html b/src/app/portfolio/portfolio.component.html index 1491280..f384422 100644 --- a/src/app/portfolio/portfolio.component.html +++ b/src/app/portfolio/portfolio.component.html @@ -3,7 +3,8 @@
- + loading +
{{item.title}} {{item.type}} diff --git a/src/app/portfolio/portfolio.component.ts b/src/app/portfolio/portfolio.component.ts index ec793ec..cf63720 100644 --- a/src/app/portfolio/portfolio.component.ts +++ b/src/app/portfolio/portfolio.component.ts @@ -31,6 +31,8 @@ export class PortfolioComponent implements OnInit { let tot = 0 this.portfolioItems.forEach((e) => { + e.loading = true + switch (cnt) { case 0: width = Math.floor(Math.random()*3)+3 @@ -74,4 +76,8 @@ export class PortfolioComponent implements OnInit { this.router.navigate([`/detail/${section}/${id}`]) } + onLoad(id): void { + this.portfolioItems.filter(item => item.id == id)[0].loading = false + } + } diff --git a/src/assets/images/loader.webp b/src/assets/images/loader.webp new file mode 100644 index 0000000000000000000000000000000000000000..528d6b54b87d3479c0d11bfeda4062dca403a38c GIT binary patch literal 80494 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

q&<%Zgw@#~dx&H8uaxr99SIuaWf-Mok}8 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 literal 0 HcmV?d00001 diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index bf9c1f7..a63fed1 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,5 +1,5 @@ export const environment = { production: true, - API_URL: `https://apis.dslak.it/`, - BASE_PATH: `https://apis.dslak.it/` + API_URL: `https://www.dslak.it/apis/`, + BASE_PATH: `https://www.dslak.it` } From 9e6fe92230a60697724e8a58bc711b89ef719c16 Mon Sep 17 00:00:00 2001 From: Dslak Date: Mon, 7 Dec 2020 18:39:51 +0100 Subject: [PATCH 31/38] add home template add random param in portfolio api new portfolio graphic --- package.json | 1 + src/apis/index.php | 3 +- src/app/app-routing.module.ts | 3 +- src/app/app.module.ts | 4 +- src/app/header/header.component.ts | 6 +- src/app/home/home.component.html | 28 +++ src/app/home/home.component.scss | 139 +++++++++++++++ src/app/home/home.component.spec.ts | 25 +++ src/app/home/home.component.ts | 53 ++++++ src/app/portfolio/portfolio.component.html | 38 ++-- src/app/portfolio/portfolio.component.scss | 196 +++++++++++---------- src/app/portfolio/portfolio.component.ts | 6 - src/app/services/apis.service.ts | 4 +- src/assets/scss/variables.scss | 1 + src/main.ts | 2 + 15 files changed, 384 insertions(+), 125 deletions(-) create mode 100644 src/app/home/home.component.html create mode 100644 src/app/home/home.component.scss create mode 100644 src/app/home/home.component.spec.ts create mode 100644 src/app/home/home.component.ts diff --git a/package.json b/package.json index b5d828b..521d259 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "@angular/router": "~9.1.7", "@kolkov/angular-editor": "^1.1.4", "bootstrap": "^4.5.3", + "hammerjs": "^2.0.8", "ng-particles": "^2.1.11", "ngx-image-gallery": "^2.0.5", "rxjs": "~6.5.4", diff --git a/src/apis/index.php b/src/apis/index.php index ad3015e..113f289 100644 --- a/src/apis/index.php +++ b/src/apis/index.php @@ -15,7 +15,8 @@ if(isset($_GET['query'])) { case "performances": case "workshops": if($_GET['query'] == 'portfolio') {$filter = '';} else {$filter = "WHERE type='".$_GET['query']."'";} - $qe = mysqli_query($conn,"SELECT * FROM `works` $filter ORDER BY id DESC"); + if($_GET['random']) {$order .= 'ORDER BY id RAND()';} else {$order = "ORDER BY id DESC";} + $qe = mysqli_query($conn,"SELECT * FROM `works` $filter $order"); if(mysqli_num_rows($qe) > 0) { $content = null; $content->items = array(); diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 453d579..d21da2f 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -4,6 +4,7 @@ import { AppLayoutComponent } from './app-layout/app-layout.component' import { AboutComponent } from './about/about.component' import { PortfolioComponent } from './portfolio/portfolio.component' import { DetailComponent } from './detail/detail.component' +import { HomeComponent } from './home/home.component' import { AdminComponent } from './admin/admin.component' const routes: Routes = [ @@ -12,7 +13,7 @@ const routes: Routes = [ component: AppLayoutComponent, children: [ //{ path: '', redirectTo: '/portfolio', pathMatch: 'full' }, - { path: '', component: PortfolioComponent }, + { path: '', component: HomeComponent }, { path: 'about', component: AboutComponent }, { path: 'portfolio', component: PortfolioComponent }, { path: 'exhibitions', component: PortfolioComponent }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ae96ec7..000c61e 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -14,6 +14,7 @@ import { AboutComponent } from './about/about.component'; import { PortfolioComponent } from './portfolio/portfolio.component'; import { DetailComponent } from './detail/detail.component'; import { AdminComponent } from './admin/admin.component'; +import { HomeComponent } from './home/home.component'; @NgModule({ declarations: [ @@ -23,7 +24,8 @@ import { AdminComponent } from './admin/admin.component'; AboutComponent, PortfolioComponent, DetailComponent, - AdminComponent + AdminComponent, + HomeComponent ], imports: [ BrowserModule, diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index e4c7522..c4638d6 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -9,7 +9,7 @@ import { DOCUMENT } from '@angular/common' }) export class HeaderComponent implements OnInit { - public isSticky: boolean = false + public isSticky: boolean = true public isMenuOpen: boolean = false public isFirstScroll: boolean = true @@ -22,7 +22,7 @@ export class HeaderComponent implements OnInit { } ngOnInit(): void { - this.isSticky = this.router.url != '/' + //this.isSticky = this.router.url != '/' } @HostListener('window:scroll', ['$event']) @@ -32,7 +32,7 @@ export class HeaderComponent implements OnInit { || document.body.scrollTop || 0 this.isFirstScroll = this.router.url == '/' - this.isSticky = this.isFirstScroll ? this.isMenuOpen || verticalOffset > 10 : true + //this.isSticky = this.isFirstScroll ? this.isMenuOpen || verticalOffset > 10 : true } toggleMenu(): void { diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html new file mode 100644 index 0000000..d258c89 --- /dev/null +++ b/src/app/home/home.component.html @@ -0,0 +1,28 @@ +

+
+
+
+ loading + +
+ {{item.title}} + {{item.type}} + +
+
+ from + on + {{item.date_from | date}} +
+
+ to {{item.date_to | date}} +
+
+ + {{item.tags}} +
+
+
+
+ +
diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss new file mode 100644 index 0000000..26941c3 --- /dev/null +++ b/src/app/home/home.component.scss @@ -0,0 +1,139 @@ +@import "../../assets/scss/variables"; + +.component-home { + display: flex; + padding-top: 100px; + height: 100vh; + + .content { + display: inline-flex; + margin: auto; + animation: slide 120s ease-in-out infinite; + + @each $width in 1,2,3,4,5,6 { + .slide-#{$width} { + width: #{($width+2)*100}px; + } + } + + .box { + position: relative; + display: flex; + background: $black-alpha2; + border-radius: 0; + overflow: hidden; + margin: auto 0; + padding: 40px 20px; + height: calc(80vh - 90px); + min-height: 300px; + max-height: 700px; + cursor: pointer; + transition: transform .4s, background .4s; + -webkit-backface-visibility: hidden; + + .image { + position: absolute; + top: 50%; + left: 50%; + height: 100%; + width: 100%; + object-fit: cover; + transform: translate(-50%, -50%); + opacity: .5; + filter: grayscale(100%) contrast(3); + transition: opacity .4s, filter .4s; + -webkit-backface-visibility: hidden; + z-index: 0; + } + + .text { + display: block; + margin: auto; + text-align: center; + transform: translate(0%, 0%); + color: $yellow; + -webkit-backface-visibility: hidden; + z-index: 1; + + .title { + display: block; + font-size: $font-20; + text-transform: uppercase; + font-weight: bold; + } + + .type { + display: block; + font-size: $font-16; + font-weight: bold; + } + + .tags { + display: block; + font-size: $font-12; + text-transform: uppercase; + 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 { + &.skew-#{$angle} { + //transform: skew(#{$angle - 3}deg, #{$angle - 3}deg) scale(1.2); + transform: skew(-6deg, -6deg) rotate(6deg); + } + } + + &:hover { + background: $black; + z-index: 50; + + @each $angle in 0,1,2,3,4,5,6 { + &.skew-#{$angle} { + transform: scale(1.4) rotate(0deg) skew(0deg, 0deg); + } + } + .image { + filter: grayscale(0%); + opacity: .5; + } + } + } + + &:hover { + animation-play-state: paused; + } + } +} + + +@keyframes slide { + 0% {transform: translateX(-100%) translateX(100vw);} + 50% {transform: translateX(0%);} + 100% {transform: translateX(-100%) translateX(100vw);} +} diff --git a/src/app/home/home.component.spec.ts b/src/app/home/home.component.spec.ts new file mode 100644 index 0000000..490e81b --- /dev/null +++ b/src/app/home/home.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomeComponent } from './home.component'; + +describe('HomeComponent', () => { + let component: HomeComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ HomeComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(HomeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts new file mode 100644 index 0000000..54a5b0b --- /dev/null +++ b/src/app/home/home.component.ts @@ -0,0 +1,53 @@ +import { Component, OnInit } from '@angular/core' +import { Router, NavigationEnd } from '@angular/router' +import { ApisService } from '../services/apis.service' +import { environment } from '../../environments/environment' + +@Component({ + selector: 'app-home', + templateUrl: './home.component.html', + styleUrls: ['./home.component.scss'] +}) +export class HomeComponent implements OnInit { + + public basePath = `${environment.BASE_PATH}` + + public homeItems: any = [] + public section: string = 'portfolio' + + constructor( + private apisService: ApisService, + private router: Router) + { } + + ngOnInit(): void { + this.apisService.getPortfolio(this.section, true).toPromise().then((response) => { + this.homeItems = response.items + + let cnt = 0 + let width = 0 + let tot = 0 + + this.homeItems.forEach((e) => { + e.loading = true + e.width = Math.floor(Math.random()*4)+1 + cnt++ + }) + + },(error) => { + console.error('getPortfolio ERROR', error) + }).catch((e) => { + console.error('getPortfolio CATCH', e) + }) + } + + showDetails(id): void { + const section = this.section == 'exhibitions' ? 'exhibitions' : 'works' + this.router.navigate([`/detail/${section}/${id}`]) + } + + onLoad(id): void { + this.homeItems.filter(item => item.id == id)[0].loading = false + } + +} diff --git a/src/app/portfolio/portfolio.component.html b/src/app/portfolio/portfolio.component.html index f384422..c2f1076 100644 --- a/src/app/portfolio/portfolio.component.html +++ b/src/app/portfolio/portfolio.component.html @@ -1,27 +1,25 @@
-
-
-
-
- loading - -
- {{item.title}} - {{item.type}} +
+
+
+ loading + +
+ {{item.title}} + {{item.type}} -
-
- from - on - {{item.date_from | date}} -
-
- to {{item.date_to | date}} -
+
+
+ from + on + {{item.date_from | date}} +
+
+ to {{item.date_to | date}}
- - {{item.tags}}
+ + {{item.tags}}
diff --git a/src/app/portfolio/portfolio.component.scss b/src/app/portfolio/portfolio.component.scss index 6a6f4ac..12a0f96 100644 --- a/src/app/portfolio/portfolio.component.scss +++ b/src/app/portfolio/portfolio.component.scss @@ -1,119 +1,133 @@ @import "../../assets/scss/variables"; .component-portfolio { - padding-top: 140px; - - .box { - position: relative; - display: flex; - background: $black-alpha; - border-radius: 10px; - overflow: hidden; - margin: 10px 0; - padding: 40px 20px; - min-height: 250px; - cursor: pointer; - transition: transform .4s, background .4s; - -webkit-backface-visibility: hidden; - - .image { - position: absolute; - top: 50%; - left: 50%; - height: 100%; - width: 100%; - object-fit: cover; - transform: translate(-50%, -50%); - opacity: .9; - filter: grayscale(100%) brightness(.4); - transition: opacity .4s, filter .4s; + padding-top: 160px; + + .row-container { + transform: skew(-2deg, -2deg) rotate(-2deg); + width: calc(100% - 50px); + max-width: 1400px; + margin: auto; + + .box { + position: relative; + display: flex; + border-radius: 4px; + overflow: hidden; + background: $black-alpha; + margin: 6px; + padding: 40px 20px; + min-height: 250px; + cursor: pointer; + transform: skew(6deg, -6deg) rotate(6deg); + transition: transform .4s, background .4s, box-shadow .4s; -webkit-backface-visibility: hidden; - z-index: 0; - } - - .text { - display: block; - margin: auto; - text-align: center; - transform: translate(0%, 0%); - color: $yellow; - //transition: color .4s; - -webkit-backface-visibility: hidden; - z-index: 1; - .title { - display: block; - font-size: $font-20; - text-transform: uppercase; - font-weight: bold; + .image { + position: absolute; + top: 50%; + left: 50%; + height: 100%; + width: 100%; + object-fit: cover; + transform: translate(-50%, -50%); + opacity: .9; + filter: grayscale(100%) brightness(.4); + transition: opacity .4s, filter .4s; + -webkit-backface-visibility: hidden; + z-index: 0; } - .type { - display: block; - font-size: $font-16; - font-weight: bold; + .loader { + position: absolute; + top: 50%; + left: 50%; + height: 100%; + width: 100%; + object-fit: cover; + filter: invert(100%); + transform: translate(-50%, -50%); + z-index: 0; } - .tags { + .text { display: block; - font-size: $font-12; - text-transform: uppercase; - font-weight: bold; - padding-top: 10px; - } + margin: auto; + text-align: center; + transform: translate(0%, 0%); + color: $yellow; + //transition: color .4s; + -webkit-backface-visibility: hidden; + z-index: 1; + + .title { + display: block; + font-size: $font-20; + text-transform: uppercase; + font-weight: bold; + } - .date-container { - display: inline-flex; - flex-wrap: wrap; + .type { + display: block; + font-size: $font-16; + font-weight: bold; + } - .date-row { + .tags { display: block; - width: 100%; + font-size: $font-12; + text-transform: uppercase; + font-weight: bold; + padding-top: 10px; + } - .date { - display: inline-flex; - margin: auto; - font-size: $font-20; - } + .date-container { + display: inline-flex; + flex-wrap: wrap; - .date-indication { - margin: 2px 5px auto 5px; - font-size: $font-12; - } + .date-row { + display: block; + width: 100%; - &:nth-of-type(2) { - margin-top: -12px; + .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 { - &.skew-#{$angle} { - transform: skew(#{$angle - 3}deg, #{$angle - 3}deg); } - } - &:hover { - background: $black; - z-index: 50; + &:hover { + box-shadow: 0 0 20px $white-alpha2; + background: $black; + z-index: 50; - @each $angle in 0,1,2,3,4,5,6 { - &.skew-#{$angle} { - //transform: scale(1.4) rotate(2deg) skew(#{3 - $angle}deg, #{3 - $angle}deg); - transform: scale(1.4) rotate(0deg) skew(0deg, 0deg); - } - } + transform: scale(1.4) rotate(4deg) skew(3deg); - .image { - filter: grayscale(0%) brightness(1); - opacity: .5; - } - .text { - //color: $yellow; + .image { + filter: grayscale(0%) brightness(1); + opacity: .7; + } } } } } +@media (min-width: map-get($grid-breakpoints, 'md')) { + .component-portfolio { + .row-container { + width: calc(100% - 100px); + } + } +} diff --git a/src/app/portfolio/portfolio.component.ts b/src/app/portfolio/portfolio.component.ts index cf63720..459219e 100644 --- a/src/app/portfolio/portfolio.component.ts +++ b/src/app/portfolio/portfolio.component.ts @@ -42,7 +42,6 @@ export class PortfolioComponent implements OnInit { case 1: width = Math.floor(Math.random()*3)+3 cnt++ - if(tot + width > 9) { width = 12 - tot tot = 0 @@ -50,7 +49,6 @@ export class PortfolioComponent implements OnInit { } else { tot = tot + width } - break; case 2: width = 12 - tot @@ -58,11 +56,7 @@ export class PortfolioComponent implements OnInit { cnt = 0 break; } - e.width = width - - //((e.id % 5)+3) - //Math.floor((Math.random()*3)+1)+2 }) },(error) => { console.error('getPortfolio ERROR', error) diff --git a/src/app/services/apis.service.ts b/src/app/services/apis.service.ts index 31e6ab1..47887ba 100644 --- a/src/app/services/apis.service.ts +++ b/src/app/services/apis.service.ts @@ -16,8 +16,8 @@ export class ApisService extends BaseService { super() } - getPortfolio(section): Observable { - let urlApi = `${this.restApi}?query=${section}` + getPortfolio(section, randon = false): Observable { + let urlApi = `${this.restApi}?query=${section}&random=${randon}` return this.http.get(urlApi).pipe( catchError(this.handleError) ) diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index dd99a70..743424d 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -34,6 +34,7 @@ $yellow: #a2dc02; $white-alpha: rgba(255, 255, 255, 0.8); $white-alpha2: rgba(255, 255, 255, 0.4); $black-alpha: rgba(0, 0, 0, 0.8); +$black-alpha2: rgba(0, 0, 0, 0.4); $yellow-alpha: rgba(160, 220, 0, 0.8); // Fonts diff --git a/src/main.ts b/src/main.ts index c7b673c..5f26277 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,6 +4,8 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { AppModule } from './app/app.module'; import { environment } from './environments/environment'; +import 'hammerjs'; + if (environment.production) { enableProdMode(); } From 36d86ad840b4da94dec0f0daea05fdf4b5339667 Mon Sep 17 00:00:00 2001 From: Dslak Date: Mon, 7 Dec 2020 18:40:54 +0100 Subject: [PATCH 32/38] yarn deploy --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 521d259..a68d2bd 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "dev": "ng serve", "build": "ng build", "prod": "ng build --prod --configuration production", + "deploy": "sh ./deploy.sh", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e" From 43b6c9c096e7b2a51b60bd82549bc30ea4e21e63 Mon Sep 17 00:00:00 2001 From: Dslak Date: Mon, 7 Dec 2020 19:22:06 +0100 Subject: [PATCH 33/38] oblique home --- src/apis/index.php | 2 +- src/app/app-layout/app-layout.component.html | 10 +++++---- src/app/app-layout/app-layout.component.scss | 3 +++ src/app/home/home.component.scss | 23 ++++++-------------- src/index.html | 2 +- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/apis/index.php b/src/apis/index.php index 113f289..b91173e 100644 --- a/src/apis/index.php +++ b/src/apis/index.php @@ -15,7 +15,7 @@ if(isset($_GET['query'])) { case "performances": case "workshops": if($_GET['query'] == 'portfolio') {$filter = '';} else {$filter = "WHERE type='".$_GET['query']."'";} - if($_GET['random']) {$order .= 'ORDER BY id RAND()';} else {$order = "ORDER BY id DESC";} + if($_GET['random']) {$order = 'ORDER BY RAND()';} else {$order = "ORDER BY id DESC";} $qe = mysqli_query($conn,"SELECT * FROM `works` $filter $order"); if(mysqli_num_rows($qe) > 0) { $content = null; diff --git a/src/app/app-layout/app-layout.component.html b/src/app/app-layout/app-layout.component.html index 89a86da..e46bcfe 100644 --- a/src/app/app-layout/app-layout.component.html +++ b/src/app/app-layout/app-layout.component.html @@ -1,5 +1,7 @@ - - +
+ + - + +
diff --git a/src/app/app-layout/app-layout.component.scss b/src/app/app-layout/app-layout.component.scss index e69de29..0d2866d 100644 --- a/src/app/app-layout/app-layout.component.scss +++ b/src/app/app-layout/app-layout.component.scss @@ -0,0 +1,3 @@ +main { + overflow: hidden; +} diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss index 26941c3..90dbac7 100644 --- a/src/app/home/home.component.scss +++ b/src/app/home/home.component.scss @@ -4,11 +4,12 @@ display: flex; padding-top: 100px; height: 100vh; + transform: skew(-15deg) rotate(-15deg); .content { display: inline-flex; margin: auto; - animation: slide 120s ease-in-out infinite; + animation: slide 200s ease-in-out infinite; @each $width in 1,2,3,4,5,6 { .slide-#{$width} { @@ -28,7 +29,8 @@ min-height: 300px; max-height: 700px; cursor: pointer; - transition: transform .4s, background .4s; + transform: skew(-6deg, -6deg) rotate(6deg); + transition: transform .4s, background .4s, opacity .4s; -webkit-backface-visibility: hidden; .image { @@ -39,7 +41,7 @@ width: 100%; object-fit: cover; transform: translate(-50%, -50%); - opacity: .5; + opacity: .8; filter: grayscale(100%) contrast(3); transition: opacity .4s, filter .4s; -webkit-backface-visibility: hidden; @@ -102,22 +104,11 @@ } } - @each $angle in 0,1,2,3,4,5,6 { - &.skew-#{$angle} { - //transform: skew(#{$angle - 3}deg, #{$angle - 3}deg) scale(1.2); - transform: skew(-6deg, -6deg) rotate(6deg); - } - } - &:hover { background: $black; + transform: scale(1.4) rotate(14deg) skew(14deg, 0deg); z-index: 50; - @each $angle in 0,1,2,3,4,5,6 { - &.skew-#{$angle} { - transform: scale(1.4) rotate(0deg) skew(0deg, 0deg); - } - } .image { filter: grayscale(0%); opacity: .5; @@ -134,6 +125,6 @@ @keyframes slide { 0% {transform: translateX(-100%) translateX(100vw);} - 50% {transform: translateX(0%);} + 50% {transform: translateX(0%) translateX(-100vw);} 100% {transform: translateX(-100%) translateX(100vw);} } diff --git a/src/index.html b/src/index.html index b5d7d53..229698c 100644 --- a/src/index.html +++ b/src/index.html @@ -4,7 +4,7 @@ DslakWebsite - + From 6fc768e30a9a1e0c2a7eb52ac8d26b5c6ac9a942 Mon Sep 17 00:00:00 2001 From: Dslak Date: Mon, 7 Dec 2020 20:49:46 +0100 Subject: [PATCH 34/38] home auto slider --- src/app/home/home.component.html | 6 ++-- src/app/home/home.component.scss | 51 +++++++++++++++++++++++++++--- src/app/home/home.component.ts | 54 ++++++++++++++++++++++++++++++-- 3 files changed, 101 insertions(+), 10 deletions(-) diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index d258c89..94b15a7 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -1,7 +1,9 @@
-
+ + +
-
+
loading
diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss index 90dbac7..011a8ff 100644 --- a/src/app/home/home.component.scss +++ b/src/app/home/home.component.scss @@ -6,10 +6,49 @@ height: 100vh; transform: skew(-15deg) rotate(-15deg); + .goto-prev, + .goto-next { + position: absolute; + height: 40px; + width: 60px; + border: none; + background: none; + color: $black; + font-size: $font-40; + appearance: none; + margin: 0; + padding: 5px; + cursor: pointer; + + .icon { + &:before { + transform: translate(-50%, -50%); + position: absolute; + top: 50%; + left: 50%; + } + } + } + .goto-prev { + top: 70px; + left: 50px; + } + .goto-next { + bottom: -30px; + right: 50px; + .icon { + &:before { + transform: translate(-50%, -50%) rotate(180deg); + } + } + } + .content { display: inline-flex; margin: auto; - animation: slide 200s ease-in-out infinite; + margin-left: -50px; + //animation: slide 150s linear infinite; + transition: margin-left .5s; @each $width in 1,2,3,4,5,6 { .slide-#{$width} { @@ -116,7 +155,9 @@ } } - &:hover { + &:hover, + &.paused { + //animation: none; animation-play-state: paused; } } @@ -124,7 +165,7 @@ @keyframes slide { - 0% {transform: translateX(-100%) translateX(100vw);} - 50% {transform: translateX(0%) translateX(-100vw);} - 100% {transform: translateX(-100%) translateX(100vw);} + 0% {margin-left: 0;} + 50% {margin-left: -100%;} + 100% {margin-left: 0;} } diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 54a5b0b..158e891 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core' +import { Component, OnInit, ViewChild, ElementRef, Renderer2 } from '@angular/core' import { Router, NavigationEnd } from '@angular/router' import { ApisService } from '../services/apis.service' import { environment } from '../../environments/environment' @@ -10,17 +10,23 @@ import { environment } from '../../environments/environment' }) export class HomeComponent implements OnInit { + @ViewChild('scrollContent') scrollContent: ElementRef + public basePath = `${environment.BASE_PATH}` public homeItems: any = [] public section: string = 'portfolio' + public paused: boolean = false + private scrollPos: number = 0 constructor( private apisService: ApisService, - private router: Router) - { } + private router: Router, + private renderer: Renderer2 + ) { } ngOnInit(): void { + this.apisService.getPortfolio(this.section, true).toPromise().then((response) => { this.homeItems = response.items @@ -41,6 +47,27 @@ export class HomeComponent implements OnInit { }) } + ngAfterViewInit() { + setInterval( () => { + if(!this.paused) { + const scrollWidth = 300 + const scrollPos = parseInt(this.scrollContent.nativeElement.style.marginLeft) || 0 + /* + switch(dir) { + case 'prev': + this.scrollPos = scrollPos + scrollWidth >= 0 ? 0 : scrollPos + scrollWidth + break; + case 'next':*/ + this.scrollPos = scrollPos - scrollWidth <= -(this.scrollContent.nativeElement.offsetWidth - document.body.clientWidth) ? + -(this.scrollContent.nativeElement.offsetWidth - document.body.clientWidth) : scrollPos - scrollWidth + /* + break; + }*/ + this.scrollContent.nativeElement.style.marginLeft = this.scrollPos + 'px' + } + },2000) + } + showDetails(id): void { const section = this.section == 'exhibitions' ? 'exhibitions' : 'works' this.router.navigate([`/detail/${section}/${id}`]) @@ -50,4 +77,25 @@ export class HomeComponent implements OnInit { this.homeItems.filter(item => item.id == id)[0].loading = false } + scroll(dir): void { + const scrollWidth = document.body.clientWidth / 3 + const scrollPos = parseInt(this.scrollContent.nativeElement.style.marginLeft) || 0 + this.paused = true + + switch(dir) { + case 'prev': + this.scrollPos = scrollPos + scrollWidth >= 0 ? 0 : scrollPos + scrollWidth + break; + case 'next': + this.scrollPos = scrollPos - scrollWidth <= -(this.scrollContent.nativeElement.offsetWidth - document.body.clientWidth) ? + -(this.scrollContent.nativeElement.offsetWidth - document.body.clientWidth) : scrollPos - scrollWidth + break; + } + this.scrollContent.nativeElement.style.marginLeft = this.scrollPos + 'px' + + setTimeout ( () => { + this.paused = false + }, 2000) + } + } From 65833345529a2a29f66e135fefa0ecdda36910f0 Mon Sep 17 00:00:00 2001 From: Dslak Date: Tue, 8 Dec 2020 10:23:28 +0100 Subject: [PATCH 35/38] fine tuning --- src/app/about/about.component.scss | 4 ++-- src/app/detail/detail.component.html | 15 +++++++-------- src/app/detail/detail.component.scss | 2 +- src/app/home/home.component.html | 2 +- src/app/home/home.component.scss | 14 ++++++++------ src/app/home/home.component.ts | 5 +---- src/app/portfolio/portfolio.component.html | 2 +- src/app/portfolio/portfolio.component.scss | 5 +++-- src/assets/images/loader.svg | 11 +++++++++++ src/assets/scss/global.scss | 2 +- 10 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 src/assets/images/loader.svg diff --git a/src/app/about/about.component.scss b/src/app/about/about.component.scss index a0eb681..22ceada 100644 --- a/src/app/about/about.component.scss +++ b/src/app/about/about.component.scss @@ -1,8 +1,6 @@ @import "../../assets/scss/variables"; .component-about { - z-index: 0; - .content { position: relative; margin: 150px auto 80px auto; @@ -13,6 +11,8 @@ color: $black; box-shadow: 0px 0px 25px $white-alpha; border-radius: 10px; + z-index: 1; + .about-links { color: $black; diff --git a/src/app/detail/detail.component.html b/src/app/detail/detail.component.html index 53457f7..929e85d 100644 --- a/src/app/detail/detail.component.html +++ b/src/app/detail/detail.component.html @@ -4,6 +4,12 @@

{{details.title}}

+
+ from + on + {{details.date_from | date}} + to {{details.date_to | date}} +
= 3}">
{{image.title}} - loading + loading
-
- from - on - {{details.date_from | date}} - to {{details.date_to | date}} -
-
diff --git a/src/app/detail/detail.component.scss b/src/app/detail/detail.component.scss index 246b883..86015ae 100644 --- a/src/app/detail/detail.component.scss +++ b/src/app/detail/detail.component.scss @@ -1,7 +1,6 @@ @import "../../assets/scss/variables"; .component-detail { - z-index: 0; .content { position: relative; @@ -11,6 +10,7 @@ color: $black; box-shadow: 0px 0px 25px $white-alpha; border-radius: 10px; + z-index: 1; .title { margin: 0; diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 94b15a7..65d7521 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -3,7 +3,7 @@
-
+
loading
diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss index 011a8ff..718015a 100644 --- a/src/app/home/home.component.scss +++ b/src/app/home/home.component.scss @@ -5,6 +5,7 @@ padding-top: 100px; height: 100vh; transform: skew(-15deg) rotate(-15deg); + z-index: 1; .goto-prev, .goto-next { @@ -19,6 +20,7 @@ margin: 0; padding: 5px; cursor: pointer; + z-index: 2; .icon { &:before { @@ -30,11 +32,11 @@ } } .goto-prev { - top: 70px; + top: 60px; left: 50px; } .goto-next { - bottom: -30px; + top: calc(80vh + 10px); right: 50px; .icon { &:before { @@ -45,7 +47,7 @@ .content { display: inline-flex; - margin: auto; + margin: 0; margin-left: -50px; //animation: slide 150s linear infinite; transition: margin-left .5s; @@ -60,13 +62,13 @@ position: relative; display: flex; background: $black-alpha2; - border-radius: 0; + border-radius: 5px; overflow: hidden; margin: auto 0; padding: 40px 20px; height: calc(80vh - 90px); - min-height: 300px; - max-height: 700px; + min-height: 250px; + //max-height: 700px; cursor: pointer; transform: skew(-6deg, -6deg) rotate(6deg); transition: transform .4s, background .4s, opacity .4s; diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 158e891..6e95bbf 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -49,6 +49,7 @@ export class HomeComponent implements OnInit { ngAfterViewInit() { setInterval( () => { + console.log(this.paused) if(!this.paused) { const scrollWidth = 300 const scrollPos = parseInt(this.scrollContent.nativeElement.style.marginLeft) || 0 @@ -92,10 +93,6 @@ export class HomeComponent implements OnInit { break; } this.scrollContent.nativeElement.style.marginLeft = this.scrollPos + 'px' - - setTimeout ( () => { - this.paused = false - }, 2000) } } diff --git a/src/app/portfolio/portfolio.component.html b/src/app/portfolio/portfolio.component.html index c2f1076..a8f57e1 100644 --- a/src/app/portfolio/portfolio.component.html +++ b/src/app/portfolio/portfolio.component.html @@ -2,7 +2,7 @@
- loading + loading
{{item.title}} diff --git a/src/app/portfolio/portfolio.component.scss b/src/app/portfolio/portfolio.component.scss index 12a0f96..ab9be70 100644 --- a/src/app/portfolio/portfolio.component.scss +++ b/src/app/portfolio/portfolio.component.scss @@ -1,13 +1,15 @@ @import "../../assets/scss/variables"; .component-portfolio { - padding-top: 160px; + padding: 160px 0 80px 0; .row-container { + position: relative; transform: skew(-2deg, -2deg) rotate(-2deg); width: calc(100% - 50px); max-width: 1400px; margin: auto; + z-index: 1; .box { position: relative; @@ -45,7 +47,6 @@ height: 100%; width: 100%; object-fit: cover; - filter: invert(100%); transform: translate(-50%, -50%); z-index: 0; } diff --git a/src/assets/images/loader.svg b/src/assets/images/loader.svg new file mode 100644 index 0000000..a656b7e --- /dev/null +++ b/src/assets/images/loader.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index b39e98f..cc49963 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -39,5 +39,5 @@ button { height: 100vh; width: 100vw; background: radial-gradient(circle, transparent 0%, transparent 85%, rgba(255,255,255,0.2) 95%, rgba(255,255,255,0.3) 100%); - z-index: -1; + z-index: 0; } From a731461e0dc5992bfd086b345d4452c63922c4e8 Mon Sep 17 00:00:00 2001 From: Dslak Date: Tue, 8 Dec 2020 11:01:58 +0100 Subject: [PATCH 36/38] add swipe and url title --- src/app/detail/detail.component.html | 4 +-- src/app/detail/detail.component.ts | 4 +-- src/app/home/home.component.html | 2 +- src/app/home/home.component.scss | 16 +++++++-- src/app/home/home.component.ts | 39 ++++++++++++++++++++-- src/app/portfolio/portfolio.component.html | 2 +- src/app/portfolio/portfolio.component.ts | 4 +-- src/assets/scss/global.scss | 2 +- 8 files changed, 60 insertions(+), 13 deletions(-) diff --git a/src/app/detail/detail.component.html b/src/app/detail/detail.component.html index 929e85d..d15145a 100644 --- a/src/app/detail/detail.component.html +++ b/src/app/detail/detail.component.html @@ -51,13 +51,13 @@ Exhibitions: {{exhibition.title}} Works: {{work.title}}
diff --git a/src/app/detail/detail.component.ts b/src/app/detail/detail.component.ts index f2d3553..23c6ba7 100644 --- a/src/app/detail/detail.component.ts +++ b/src/app/detail/detail.component.ts @@ -46,11 +46,11 @@ export class DetailComponent implements OnInit { this.showDetails(this.section, this.id) } - showDetails(section, id): void { + showDetails(section, id, title = ''): void { this.galleryImages = [] this.apisService.getDetails(section, id).toPromise().then((response) => { if(this.history[this.history.length - 1] != `/detail/${section}/${id}`) { - this.history.push(`/detail/${section}/${id}`) + this.history.push(`/detail/${section}/${id}/${title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '_')}`) } const detail = response.item diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 65d7521..7ee6a34 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -1,7 +1,7 @@
-
+
loading diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss index 718015a..8c0ef20 100644 --- a/src/app/home/home.component.scss +++ b/src/app/home/home.component.scss @@ -33,11 +33,11 @@ } .goto-prev { top: 60px; - left: 50px; + left: 20px; } .goto-next { top: calc(80vh + 10px); - right: 50px; + right: 20px; .icon { &:before { transform: translate(-50%, -50%) rotate(180deg); @@ -166,6 +166,18 @@ } +@media (min-width: map-get($grid-breakpoints, 'md')) { + .component-home { + .goto-prev { + left: 50px; + } + .goto-next { + right: 50px; + } + } +} + + @keyframes slide { 0% {margin-left: 0;} 50% {margin-left: -100%;} diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 6e95bbf..66c8994 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -19,6 +19,9 @@ export class HomeComponent implements OnInit { public paused: boolean = false private scrollPos: number = 0 + private swipeCoord?: [number, number] + private swipeTime?: number + constructor( private apisService: ApisService, private router: Router, @@ -69,9 +72,9 @@ export class HomeComponent implements OnInit { },2000) } - showDetails(id): void { + showDetails(id, title = ''): void { const section = this.section == 'exhibitions' ? 'exhibitions' : 'works' - this.router.navigate([`/detail/${section}/${id}`]) + this.router.navigate([`/detail/${section}/${id}/${title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '_')}`]) } onLoad(id): void { @@ -95,4 +98,36 @@ export class HomeComponent implements OnInit { this.scrollContent.nativeElement.style.marginLeft = this.scrollPos + 'px' } + swipe(e: TouchEvent, when: string): void { + const coord: [number, number] = [e.changedTouches[0].clientX, e.changedTouches[0].clientY] + const time = new Date().getTime() + const scrollWidth = document.body.clientWidth + const scrollPos = parseInt(this.scrollContent.nativeElement.style.marginLeft) || 0 + + this.paused = true + + if (when === 'start') { + this.swipeCoord = coord + this.swipeTime = time + } else if (when === 'end') { + const direction = [coord[0] - this.swipeCoord[0], coord[1] - this.swipeCoord[1]] + const duration = time - this.swipeTime + + if (duration < 1000 + && Math.abs(direction[0]) > 30 + && Math.abs(direction[0]) > Math.abs(direction[1] * 3)) { + const swipe = direction[0] < 0 ? 'next' : 'prev' + switch(swipe) { + case 'prev': + this.scrollPos = scrollPos + scrollWidth >= 0 ? 0 : scrollPos + scrollWidth + break; + case 'next': + this.scrollPos = scrollPos - scrollWidth <= -(this.scrollContent.nativeElement.offsetWidth - document.body.clientWidth) ? + -(this.scrollContent.nativeElement.offsetWidth - document.body.clientWidth) : scrollPos - scrollWidth + break; + } + this.scrollContent.nativeElement.style.marginLeft = this.scrollPos + 'px' + } + } + } } diff --git a/src/app/portfolio/portfolio.component.html b/src/app/portfolio/portfolio.component.html index a8f57e1..c84d12b 100644 --- a/src/app/portfolio/portfolio.component.html +++ b/src/app/portfolio/portfolio.component.html @@ -1,7 +1,7 @@
-
+
loading
diff --git a/src/app/portfolio/portfolio.component.ts b/src/app/portfolio/portfolio.component.ts index 459219e..34dbbbf 100644 --- a/src/app/portfolio/portfolio.component.ts +++ b/src/app/portfolio/portfolio.component.ts @@ -65,9 +65,9 @@ export class PortfolioComponent implements OnInit { }) } - showDetails(id): void { + showDetails(id, title = ''): void { const section = this.section == 'exhibitions' ? 'exhibitions' : 'works' - this.router.navigate([`/detail/${section}/${id}`]) + this.router.navigate([`/detail/${section}/${id}/${title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '_')}`]) } onLoad(id): void { diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index cc49963..b39e98f 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -39,5 +39,5 @@ button { height: 100vh; width: 100vw; background: radial-gradient(circle, transparent 0%, transparent 85%, rgba(255,255,255,0.2) 95%, rgba(255,255,255,0.3) 100%); - z-index: 0; + z-index: -1; } From 7aa6a529d64fbcfb6e403391a3124ff25a2d3bf6 Mon Sep 17 00:00:00 2001 From: Dslak Date: Tue, 8 Dec 2020 12:40:40 +0100 Subject: [PATCH 37/38] add loading spinner --- src/app/app.module.ts | 4 +- src/app/detail/detail.component.html | 3 +- src/app/detail/detail.component.ts | 9 ++++ src/app/home/home.component.html | 7 +-- src/app/home/home.component.ts | 22 ++++------ src/app/portfolio/portfolio.component.html | 2 + src/app/portfolio/portfolio.component.ts | 7 +++ src/app/spinner/spinner.component.html | 2 + src/app/spinner/spinner.component.scss | 19 ++++++++ src/app/spinner/spinner.component.ts | 50 ++++++++++++++++++++++ 10 files changed, 107 insertions(+), 18 deletions(-) create mode 100644 src/app/spinner/spinner.component.html create mode 100644 src/app/spinner/spinner.component.scss create mode 100644 src/app/spinner/spinner.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 000c61e..cf7935c 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -15,6 +15,7 @@ import { PortfolioComponent } from './portfolio/portfolio.component'; import { DetailComponent } from './detail/detail.component'; import { AdminComponent } from './admin/admin.component'; import { HomeComponent } from './home/home.component'; +import { SpinnerComponent } from './spinner/spinner.component'; @NgModule({ declarations: [ @@ -25,7 +26,8 @@ import { HomeComponent } from './home/home.component'; PortfolioComponent, DetailComponent, AdminComponent, - HomeComponent + HomeComponent, + SpinnerComponent ], imports: [ BrowserModule, diff --git a/src/app/detail/detail.component.html b/src/app/detail/detail.component.html index d15145a..488b0f3 100644 --- a/src/app/detail/detail.component.html +++ b/src/app/detail/detail.component.html @@ -63,7 +63,6 @@
- + + diff --git a/src/app/detail/detail.component.ts b/src/app/detail/detail.component.ts index 23c6ba7..00d9403 100644 --- a/src/app/detail/detail.component.ts +++ b/src/app/detail/detail.component.ts @@ -15,6 +15,8 @@ import { environment } from '../../environments/environment' export class DetailComponent implements OnInit { public basePath = `${environment.BASE_PATH}` + public loaded = false + public init = false @ViewChild(NgxImageGalleryComponent) ngxImageGallery: NgxImageGalleryComponent @@ -46,6 +48,10 @@ export class DetailComponent implements OnInit { this.showDetails(this.section, this.id) } + ngAfterContentInit() { + this.init = true + } + showDetails(section, id, title = ''): void { this.galleryImages = [] this.apisService.getDetails(section, id).toPromise().then((response) => { @@ -83,6 +89,8 @@ export class DetailComponent implements OnInit { this.loadedImages.push(true) } }) + + this.loaded = !this.loadedImages.length this.details = detail },(error) => { @@ -108,6 +116,7 @@ export class DetailComponent implements OnInit { onLoad(index): void { this.loadedImages[index] = false + this.loaded = this.init && this.loadedImages.every( (val) => !val) } diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 7ee6a34..2a92674 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -3,8 +3,8 @@
-
- loading +
+ loading
{{item.title}} @@ -26,5 +26,6 @@
-
+ + diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 66c8994..131f80e 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -13,6 +13,8 @@ export class HomeComponent implements OnInit { @ViewChild('scrollContent') scrollContent: ElementRef public basePath = `${environment.BASE_PATH}` + public loaded = false + public init = false public homeItems: any = [] public section: string = 'portfolio' @@ -50,23 +52,16 @@ export class HomeComponent implements OnInit { }) } - ngAfterViewInit() { + ngAfterContentInit() { + + this.init = true + setInterval( () => { - console.log(this.paused) if(!this.paused) { const scrollWidth = 300 const scrollPos = parseInt(this.scrollContent.nativeElement.style.marginLeft) || 0 - /* - switch(dir) { - case 'prev': - this.scrollPos = scrollPos + scrollWidth >= 0 ? 0 : scrollPos + scrollWidth - break; - case 'next':*/ - this.scrollPos = scrollPos - scrollWidth <= -(this.scrollContent.nativeElement.offsetWidth - document.body.clientWidth) ? - -(this.scrollContent.nativeElement.offsetWidth - document.body.clientWidth) : scrollPos - scrollWidth - /* - break; - }*/ + this.scrollPos = scrollPos - scrollWidth <= -(this.scrollContent.nativeElement.offsetWidth - document.body.clientWidth) ? + -(this.scrollContent.nativeElement.offsetWidth - document.body.clientWidth) : scrollPos - scrollWidth this.scrollContent.nativeElement.style.marginLeft = this.scrollPos + 'px' } },2000) @@ -79,6 +74,7 @@ export class HomeComponent implements OnInit { onLoad(id): void { this.homeItems.filter(item => item.id == id)[0].loading = false + this.loaded = this.init && this.homeItems.every( (val) => !val.loading) } scroll(dir): void { diff --git a/src/app/portfolio/portfolio.component.html b/src/app/portfolio/portfolio.component.html index c84d12b..dc8c0fd 100644 --- a/src/app/portfolio/portfolio.component.html +++ b/src/app/portfolio/portfolio.component.html @@ -25,3 +25,5 @@
+ + diff --git a/src/app/portfolio/portfolio.component.ts b/src/app/portfolio/portfolio.component.ts index 34dbbbf..f7f2c66 100644 --- a/src/app/portfolio/portfolio.component.ts +++ b/src/app/portfolio/portfolio.component.ts @@ -11,6 +11,8 @@ import { environment } from '../../environments/environment' export class PortfolioComponent implements OnInit { public basePath = `${environment.BASE_PATH}` + public loaded = false + public init = false public portfolioItems: any = [] public section: string = '' @@ -65,6 +67,10 @@ export class PortfolioComponent implements OnInit { }) } + ngAfterContentInit() { + this.init = true + } + showDetails(id, title = ''): void { const section = this.section == 'exhibitions' ? 'exhibitions' : 'works' this.router.navigate([`/detail/${section}/${id}/${title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '_')}`]) @@ -72,6 +78,7 @@ export class PortfolioComponent implements OnInit { onLoad(id): void { this.portfolioItems.filter(item => item.id == id)[0].loading = false + this.loaded = this.init && this.portfolioItems.every( (val) => !val.loading) } } diff --git a/src/app/spinner/spinner.component.html b/src/app/spinner/spinner.component.html new file mode 100644 index 0000000..9edd48e --- /dev/null +++ b/src/app/spinner/spinner.component.html @@ -0,0 +1,2 @@ + + diff --git a/src/app/spinner/spinner.component.scss b/src/app/spinner/spinner.component.scss new file mode 100644 index 0000000..4557eef --- /dev/null +++ b/src/app/spinner/spinner.component.scss @@ -0,0 +1,19 @@ +@import "../../assets/scss/variables"; + +.spinner { + position: fixed; + top: 0; + left: 0; + height: 100vh; + width: 100vw; + background: $black-alpha; + background-image: url('/assets/images/loader.svg'); + background-size: 200px 200px; + background-repeat: no-repeat; + background-position: center center; + z-index: 100; + + &.active { + display: block; + } +} diff --git a/src/app/spinner/spinner.component.ts b/src/app/spinner/spinner.component.ts new file mode 100644 index 0000000..536f259 --- /dev/null +++ b/src/app/spinner/spinner.component.ts @@ -0,0 +1,50 @@ +import { Component, OnInit, Input, ViewChild, ElementRef } from '@angular/core' + +@Component({ + selector: 'app-spinner', + templateUrl: './spinner.component.html', + styleUrls: ['./spinner.component.scss'] +}) + +export class SpinnerComponent implements OnInit { + + @ViewChild('spinner') spinner: ElementRef + @Input() show: boolean = false + + ngOnInit(): void { + } +/* + loader(action) { + let op = 0 + let timer = null + + switch(action) { + case 'show': + op = 1 + timer = setInterval(() => { + if(op <= 0.1){ + clearInterval(timer) + this.spinner.nativeElement.style.display = 'none' + } + this.spinner.nativeElement.style.opacity = op + this.spinner.nativeElement.style.filter = 'alpha(opacity=' + op * 100 + ")" + op -= op * 0.1 + }, 50) + + break + case 'hide': + op = 0.1 + this.spinner.nativeElement.style.display = 'block' + timer = setInterval(() => { + if(op >= 1){ + clearInterval(timer) + } + this.spinner.nativeElement.style.opacity = op + this.spinner.nativeElement.style.filter = 'alpha(opacity=' + op * 100 + ")" + op += op * 0.1 + }, 50) + + break + } + }*/ +} From 46f5eb5e2c7436c5977ed5f6c7328b6708f0b787 Mon Sep 17 00:00:00 2001 From: Dslak Date: Tue, 8 Dec 2020 12:58:33 +0100 Subject: [PATCH 38/38] add fade --- src/app/spinner/spinner.component.html | 2 +- src/app/spinner/spinner.component.scss | 6 +----- src/app/spinner/spinner.component.ts | 16 +++++++++++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/app/spinner/spinner.component.html b/src/app/spinner/spinner.component.html index 9edd48e..91af365 100644 --- a/src/app/spinner/spinner.component.html +++ b/src/app/spinner/spinner.component.html @@ -1,2 +1,2 @@ - + diff --git a/src/app/spinner/spinner.component.scss b/src/app/spinner/spinner.component.scss index 4557eef..ded7d41 100644 --- a/src/app/spinner/spinner.component.scss +++ b/src/app/spinner/spinner.component.scss @@ -6,14 +6,10 @@ left: 0; height: 100vh; width: 100vw; - background: $black-alpha; + background: $yellow-alpha; background-image: url('/assets/images/loader.svg'); background-size: 200px 200px; background-repeat: no-repeat; background-position: center center; z-index: 100; - - &.active { - display: block; - } } diff --git a/src/app/spinner/spinner.component.ts b/src/app/spinner/spinner.component.ts index 536f259..2def854 100644 --- a/src/app/spinner/spinner.component.ts +++ b/src/app/spinner/spinner.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ViewChild, ElementRef } from '@angular/core' +import { Component, OnInit, Input, ViewChild, ElementRef, SimpleChanges } from '@angular/core' @Component({ selector: 'app-spinner', @@ -13,7 +13,13 @@ export class SpinnerComponent implements OnInit { ngOnInit(): void { } -/* + + ngOnChanges(changes: SimpleChanges) { + if(changes.show && changes.show.firstChange) { + this.loader(changes.show.currentValue ? 'show' : 'hide') + } + } + loader(action) { let op = 0 let timer = null @@ -29,7 +35,7 @@ export class SpinnerComponent implements OnInit { this.spinner.nativeElement.style.opacity = op this.spinner.nativeElement.style.filter = 'alpha(opacity=' + op * 100 + ")" op -= op * 0.1 - }, 50) + }, 20) break case 'hide': @@ -42,9 +48,9 @@ export class SpinnerComponent implements OnInit { this.spinner.nativeElement.style.opacity = op this.spinner.nativeElement.style.filter = 'alpha(opacity=' + op * 100 + ")" op += op * 0.1 - }, 50) + }, 20) break } - }*/ + } }