diff --git a/apollo-frontend/src/app/animations.ts b/apollo-frontend/src/app/animations.ts new file mode 100644 index 0000000..865afd9 --- /dev/null +++ b/apollo-frontend/src/app/animations.ts @@ -0,0 +1,24 @@ +import { animate, animateChild, group, query, style, transition, trigger } from "@angular/animations"; + +export const slideInAnimation = + trigger('routeAnimations', [ + transition('* <=> *', [ + style({ position: 'relative' }), + query(':enter', [ + style({ opacity: 0, position: 'absolute', top: 0, left: 0, width: '100%' }) + ], { optional: true }), + query(':leave', [ + style({ opacity: 1 }) + ], { optional: true }), + query(':leave', animateChild(), { optional: true }), + group([ + query(':leave', [ + animate('300ms ease-out', style({ opacity: 0 })) + ], { optional: true }), + query(':enter', [ + animate('300ms ease-out', style({ opacity: 1 })) + ], { optional: true }) + ]), + query(':enter', animateChild(), { optional: true }), + ]), + ]); diff --git a/apollo-frontend/src/app/app-routing.module.ts b/apollo-frontend/src/app/app-routing.module.ts index 32842c3..4368d18 100644 --- a/apollo-frontend/src/app/app-routing.module.ts +++ b/apollo-frontend/src/app/app-routing.module.ts @@ -4,8 +4,9 @@ import { DashboardComponent } from './dashboard/dashboard.component'; import { MinigameConveyorRecyclingComponent } from './minigame-conveyor-recycling/minigame-conveyor-recycling.component'; const routes: Routes = [ - { path: 'minigames/conveyor-belt', component: MinigameConveyorRecyclingComponent }, - { path: '', component: DashboardComponent }, + { path: 'minigames/conveyor-belt', component: MinigameConveyorRecyclingComponent, data: { animation: 'conveyor-belt-mg' } }, + { path: 'minigames/biotrivia', component: MinigameConveyorRecyclingComponent, data: { animation: 'biotrinia-mg' } }, + { path: '', component: DashboardComponent, data: { animation: 'home' } }, ]; @NgModule({ diff --git a/apollo-frontend/src/app/app.component.html b/apollo-frontend/src/app/app.component.html index 90c6b64..776bbe4 100644 --- a/apollo-frontend/src/app/app.component.html +++ b/apollo-frontend/src/app/app.component.html @@ -1 +1,3 @@ - \ No newline at end of file +
+ +
\ No newline at end of file diff --git a/apollo-frontend/src/app/app.component.ts b/apollo-frontend/src/app/app.component.ts index 9e95adc..c24bd9f 100644 --- a/apollo-frontend/src/app/app.component.ts +++ b/apollo-frontend/src/app/app.component.ts @@ -1,10 +1,15 @@ import { Component, OnInit } from '@angular/core'; +import { RouterOutlet } from '@angular/router'; import { IgxIconService } from 'igniteui-angular'; +import { slideInAnimation } from './animations'; @Component({ selector: 'app-root', templateUrl: './app.component.html', - styleUrls: ['./app.component.scss'] + styleUrls: ['./app.component.scss'], + animations: [ + slideInAnimation, + ] }) export class AppComponent implements OnInit { title = 'apollo-frontend'; @@ -16,5 +21,8 @@ export class AppComponent implements OnInit { ngOnInit(): void { this.icons.addSvgIcon('danger', '/assets/icons/risk-skull.svg'); } + prepareRoute(outlet: RouterOutlet): void { + return outlet && outlet.activatedRouteData && outlet.activatedRouteData.animation; + } } diff --git a/apollo-frontend/src/app/app.module.ts b/apollo-frontend/src/app/app.module.ts index fdff8c8..df1cda9 100644 --- a/apollo-frontend/src/app/app.module.ts +++ b/apollo-frontend/src/app/app.module.ts @@ -16,6 +16,7 @@ import { DashboardComponent } from './dashboard/dashboard.component'; import { DashboardMinigamesComponent } from './dashboard-minigames/dashboard-minigames.component'; import { MinigameCardComponent } from './minigame-card/minigame-card.component'; import { MinigameConveyorRecyclingComponent } from './minigame-conveyor-recycling/minigame-conveyor-recycling.component'; +import { MinigameBiotriviaComponent } from './minigame-biotrivia/minigame-biotrivia.component'; @NgModule({ declarations: [ @@ -26,6 +27,7 @@ import { MinigameConveyorRecyclingComponent } from './minigame-conveyor-recyclin DashboardMinigamesComponent, MinigameCardComponent, MinigameConveyorRecyclingComponent, + MinigameBiotriviaComponent, ], imports: [ BrowserModule, diff --git a/apollo-frontend/src/app/card/card.component.html b/apollo-frontend/src/app/card/card.component.html index 2f839a8..836f3fc 100644 --- a/apollo-frontend/src/app/card/card.component.html +++ b/apollo-frontend/src/app/card/card.component.html @@ -4,17 +4,17 @@
-
-
+
+
{{card.name}}
-
-
-
{{paragraph.heading}}
-

{{paragraph.content}}

-
+
+
+
+
{{paragraph.heading}}
+

{{paragraph.content}}

diff --git a/apollo-frontend/src/app/card/card.component.scss b/apollo-frontend/src/app/card/card.component.scss index 87b0ba0..ae6f026 100644 --- a/apollo-frontend/src/app/card/card.component.scss +++ b/apollo-frontend/src/app/card/card.component.scss @@ -3,30 +3,14 @@ display: flex; flex-direction: column; box-sizing: border-box; - flex: 1 0 auto; + flex: 1 1 auto; + align-items: flex-start; &>* { flex: 1 0 auto; } h6 { margin: 0; text-align: center; - &.small { - margin-top: .5em; - } - } - p { - margin: 0; - &.small::before { - content: ''; - width: 2em; - height: 3px; - display: inline-block; - } - } - .small { - font-size: .75em; - line-height: 1em; - text-align: start; } .img-fitter{ margin-top: .5em; @@ -35,6 +19,8 @@ flex: 1 0 auto; background: center no-repeat; background-size: cover; + box-shadow: transparent 3px 3px 5px; + position: relative; } margin-top: .5em; @@ -60,6 +46,32 @@ } } } + .info { + overflow: auto; + flex: 1 1 auto; + p { + margin: 0; + &.small::before { + content: ''; + width: 2em; + height: 3px; + display: inline-block; + } + } + h6 { + margin: 0; + text-align: center; + &.small { + margin-bottom: .25em; + margin-top: .5em; + } + } + .small { + font-size: .75em; + line-height: 1.25em; + text-align: start; + } + } display: flex; flex-direction: column; @@ -72,7 +84,8 @@ box-shadow: #0004 3px 3px 5px; - background-color: #f8f8f8; + background-color: #f8f8f855; + backdrop-filter: blur(10px); button { margin: 0 auto; diff --git a/apollo-frontend/src/app/dashboard-cards/dashboard-cards.component.html b/apollo-frontend/src/app/dashboard-cards/dashboard-cards.component.html index 4579719..fe4f69a 100644 --- a/apollo-frontend/src/app/dashboard-cards/dashboard-cards.component.html +++ b/apollo-frontend/src/app/dashboard-cards/dashboard-cards.component.html @@ -1,5 +1,8 @@

Вашите карти:

- - +
+
+ +
+
\ No newline at end of file diff --git a/apollo-frontend/src/app/dashboard-cards/dashboard-cards.component.scss b/apollo-frontend/src/app/dashboard-cards/dashboard-cards.component.scss index aeedd5a..70e9982 100644 --- a/apollo-frontend/src/app/dashboard-cards/dashboard-cards.component.scss +++ b/apollo-frontend/src/app/dashboard-cards/dashboard-cards.component.scss @@ -1,4 +1,18 @@ .cards { + width: 100%; + height: 332px; + overflow-y: auto; + overflow-x: hidden; + scroll-snap-type: y mandatory; +} +.cards-inner { display: flex; + flex-wrap: wrap; + width: 100%; gap: 2em; + padding: 1em 0; + box-sizing: border-box; +} +.card { + scroll-snap-align: start; } \ No newline at end of file diff --git a/apollo-frontend/src/app/dashboard-cards/dashboard-cards.component.ts b/apollo-frontend/src/app/dashboard-cards/dashboard-cards.component.ts index 859cb0a..c297bd5 100644 --- a/apollo-frontend/src/app/dashboard-cards/dashboard-cards.component.ts +++ b/apollo-frontend/src/app/dashboard-cards/dashboard-cards.component.ts @@ -1,4 +1,6 @@ import { Component, OnInit } from '@angular/core'; +import { Card, DbService } from '../db.service'; +import { UserdataService } from '../userdata.service'; @Component({ selector: 'app-dashboard-cards', @@ -7,9 +9,15 @@ import { Component, OnInit } from '@angular/core'; }) export class DashboardCardsComponent implements OnInit { - constructor() { } + constructor( + private db: DbService, + ) { } ngOnInit(): void { } + getCards(): Card[] { + return this.db.getAllCards().map(v => v.el); + } + } diff --git a/apollo-frontend/src/app/dashboard-minigames/dashboard-minigames.component.html b/apollo-frontend/src/app/dashboard-minigames/dashboard-minigames.component.html index f695aab..28d3e26 100644 --- a/apollo-frontend/src/app/dashboard-minigames/dashboard-minigames.component.html +++ b/apollo-frontend/src/app/dashboard-minigames/dashboard-minigames.component.html @@ -1,5 +1,7 @@ -

Миниигри:

+

Миниигри:

- +
+ +
\ No newline at end of file diff --git a/apollo-frontend/src/app/dashboard-minigames/dashboard-minigames.component.scss b/apollo-frontend/src/app/dashboard-minigames/dashboard-minigames.component.scss index aeedd5a..7d0d528 100644 --- a/apollo-frontend/src/app/dashboard-minigames/dashboard-minigames.component.scss +++ b/apollo-frontend/src/app/dashboard-minigames/dashboard-minigames.component.scss @@ -1,4 +1,18 @@ .cards { + width: 100%; + height: 232px; + overflow-y: auto; + overflow-x: hidden; +} +.cards-inner { display: flex; + flex-wrap: wrap; + width: 100%; gap: 2em; + padding: 1em 0; + scroll-snap-type: y mandatory; + box-sizing: border-box; +} +.card { + scroll-snap-align: start; } \ No newline at end of file diff --git a/apollo-frontend/src/app/dashboard/dashboard.component.html b/apollo-frontend/src/app/dashboard/dashboard.component.html index 825fcf2..16ea52d 100644 --- a/apollo-frontend/src/app/dashboard/dashboard.component.html +++ b/apollo-frontend/src/app/dashboard/dashboard.component.html @@ -1,2 +1,4 @@ - - \ No newline at end of file +
+ + +
\ No newline at end of file diff --git a/apollo-frontend/src/app/dashboard/dashboard.component.scss b/apollo-frontend/src/app/dashboard/dashboard.component.scss index e69de29..2d2fa34 100644 --- a/apollo-frontend/src/app/dashboard/dashboard.component.scss +++ b/apollo-frontend/src/app/dashboard/dashboard.component.scss @@ -0,0 +1,4 @@ +.a { + display: flex; + flex-direction: column; +} \ No newline at end of file diff --git a/apollo-frontend/src/app/db.service.ts b/apollo-frontend/src/app/db.service.ts index ff59505..c6a4398 100644 --- a/apollo-frontend/src/app/db.service.ts +++ b/apollo-frontend/src/app/db.service.ts @@ -3,6 +3,7 @@ import { Injectable } from '@angular/core'; export interface Minigame { name: string; url: string; + comingSoon?: boolean; } export interface CardParagraph { @@ -28,12 +29,274 @@ export class DbService { { id: '0', el: { - name: 'Convayer Recycling', + name: 'Рециклиране', url: '/minigames/conveyor-belt', } + }, + { + id: '0', + el: { + name: 'BioTrivia', + url: '/minigames/biotrivia', + } } ]; - private mock_card_types: Saved[]; + private mock_card_types: Saved[] = [ + { + id: '0', + el: { + name: 'Пингвин', + types: ['normal'], + imageUrl: '/assets/images/cards/pingvin.jpg', + info: [ + { + content: 'Тъй като нямат естествен враг на сушата, пингвините не показват страх, а любопитство когато към тях се приближи човек.', + heading: 'Интересно' + } + ] + } + }, + { + id: '1', + el: { + name: 'Пингвин', + types: ['normal'], + imageUrl: '/assets/images/cards/pingvin2.jpg', + info: [ + { + content: 'Пингвините мътят яйцата си на смени. Когато мъжкият отиде да яде, той не може да намери пътя обратно към гнездото и започва да крещи шумно. Женските разпознават гласовете на партньорите си сред хиляди други и крещят в отговор, така че те да знаят къде да се върнат.', + heading: 'Интересно' + } + ] + } + }, + { + id: '2', + el: { + name: 'Делфин', + types: ['normal'], + imageUrl: '/assets/images/cards/delfin.jpg', + info: [ + { + content: 'Делфините общуват по между си с помощта на звуци, като всеки звук може да изразява различно настроение.', + heading: 'Интересно' + } + ] + } + }, + { + id: '3', + el: { + name: 'Делфин', + types: ['normal'], + imageUrl: '/assets/images/cards/delfin2.jpg', + info: [ + { + content: 'Делфините никога не заспиват напълно. Докато си почиват, едната половина на мозъка им продължава да бъде активна. Ето защо дори и по време на сън едното им око остава отворено.', + heading: 'Интересно' + } + ] + }, + }, + { + id: '4', + el: { + name: 'Син кит', + types: ['normal'], + imageUrl: '/assets/images/cards/sinkit.jpg', + info: [ + { + content: 'Освен най-едрото, синият кит е и най-шумното животно – звукът, който издава е от порядъка на 188 децибела и може да бъде чут на разстояние до 800 км. За сравнение, звукът на пътнически самолет е „едва” 120 децибела.', + heading: 'Интересно' + } + ] + } + }, + { + id: '5', + el: { + name: 'Син кит', + types: ['normal'], + imageUrl: '/assets/images/cards/sinkit2.jpg', + info: [ + { + content: 'Езикът на кита тежи около 4,7 тона. (почти колкото митко и майка му)', + heading: 'Интересно' + } + ] + } + }, + { + id: '6', + el: { + name: 'Пор', + types: ['endangered'], + imageUrl: '/assets/images/cards/por.jpg', + info: [ + { + heading: 'Морфология на "пор"', + content: 'Думата "пор" произлиза от латински и означава "крадец".', + }, + { + heading: 'Застрашен вид', + content: 'Загубата на местообитания и бракониерството, са причина днес те или техните следи да се наблюдават изключително рядко.', + }, + ], + }, + }, + { + id: '7', + el: { + name: 'Кафява мечка', + types: ['endangered'], + imageUrl: '/assets/images/cards/kafqva-mechka.jpg', + info: [ + { + heading: 'Сладки сънища', + content: 'Учените вярват, че мечките могат да сънуват.', + }, + { + heading: 'Fast as f', + content: 'Макар да изглеждат тромави,мечките могат да тичат с до 60 км/ч.', + }, + { + heading: 'Застрашен вид', + content: 'За съжаление хората им нанасят непоправими щети, като разкъсват с пътища и огради ареала им, унищожават горите и ги избиват.', + }, + ], + }, + }, + { + id: '8', + el: { + name: 'Балканска дива коза', + types: ['endangered'], + imageUrl: '/assets/images/cards/koza.jpg', + info: [ + { + heading: 'Властелина на пръстените', + content: 'Знаехте ли, че всяка година се прибавя по още един пръстен върху рогата на дивата коза, като така може да се определи възрастта на даденото животно.', + }, + { + heading: 'И ся почваме да бегами', + content: 'На света няма друго животно, което да притежава по-голяма ловкост и бързина на придвижване по хлъзгави и стръмни терени.', + }, + ], + }, + }, + { + id: '9', + el: { + name: 'Прилеп', + types: ['endangered'], + imageUrl: '/assets/images/cards/prilep.jpg', + info: [ + { + heading: 'Напаст пещерна', + content: 'най-голямата колония от прилепи в света наброява над 20 милиона броя от тези летящи създания.', + }, + { + heading: 'Ехо .... (ехо)', + content: 'Прилепите използват ехолокация, за да се заобиколят в тъмното.', + }, + { + heading: 'Защитен вид', + content: 'Според българското законодателство, прилепите са защитени видове.', + }, + ], + }, + }, + { + id: '10', + el: { + name: 'Лалугер', + types: ['endangered'], + imageUrl: '/assets/images/cards/laluger.jpg', + info: [ + { + heading: 'Втори братовчед на ленивеца', + content: 'Когато е студено, той заспива зимен сън и се събужда едва през пролетта.', + }, + { + heading: 'Мали ша са напикая', + content: 'Когато е изплашен, той застава на задните си лапи.', + }, + { + heading: 'Защитен вид', + content: 'Интензивно селско стопанство и използване на пестициди причиняват бързото изчезване на този вид.', + }, + ], + }, + }, + { + id: '11', + el: { + name: 'Етруската земеровка', + types: ['endangered'], + imageUrl: '/assets/images/cards/zemerovka.jpg', + info: [ + { + heading: 'Размер', + content: 'Един от най-дребните бозайници на планетата с размери едва 3,6 до 5,2 см и тегло от 1,25 до 2,34 грама!', + }, + { + heading: 'Лакомници', + content: 'Етруската земеровка трява да яде непрекъснато за да може да живее.', + }, + ], + }, + }, + { + id: '12', + el: { + name: 'Тюленът монах', + types: ['endangered'], + imageUrl: '/assets/images/cards/tuleni.jpg', + info: [ + { + heading: 'Техния живот', + content: 'Те се крият в подводни пещери, където си почиват и раждат своите малки.', + }, + ], + }, + }, + { + id: '13', + el: { + name: 'Видра', + types: ['endangered'], + imageUrl: '/assets/images/cards/vidra.jpg', + info: [ + { + heading: 'Мали колко сладко', + content: 'Морските видри се държат за ръце докато спят, за да не бъдат разделени от теченията докато се носят по водната повърхност.', + }, + { + heading: 'NO MERCY', + content: 'В момент на опасност видрите показват бебетата си на хищниците, за да предизвикат съчувствие и по този начин да избегнат атаката.', + }, + ], + }, + }, + { + id: '14', + el: { + name: 'Ловен сокол', + types: ['endangered'], + imageUrl: '/assets/images/cards/sokol.jpg', + info: [ + { + heading: 'Ловни навици', + content: 'Те не ловуват близо до гнездата си, а се опитват да летят доколкото е възможно.', + }, + { + heading: 'Застрашен вид', + content: 'Има опасност от изчезване. Основната причина, поради която населението на ловния сокол намалява, е човешката дейност.', + }, + ], + }, + }, + ]; private getRandomEl(array: T[]): T { const index = Math.floor(Math.random() * array.length); diff --git a/apollo-frontend/src/app/minigame-biotrivia/minigame-biotrivia.component.html b/apollo-frontend/src/app/minigame-biotrivia/minigame-biotrivia.component.html new file mode 100644 index 0000000..7fe0c07 --- /dev/null +++ b/apollo-frontend/src/app/minigame-biotrivia/minigame-biotrivia.component.html @@ -0,0 +1 @@ +

minigame-biotrivia works!

diff --git a/apollo-frontend/src/app/minigame-biotrivia/minigame-biotrivia.component.scss b/apollo-frontend/src/app/minigame-biotrivia/minigame-biotrivia.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/apollo-frontend/src/app/minigame-biotrivia/minigame-biotrivia.component.spec.ts b/apollo-frontend/src/app/minigame-biotrivia/minigame-biotrivia.component.spec.ts new file mode 100644 index 0000000..4f2989f --- /dev/null +++ b/apollo-frontend/src/app/minigame-biotrivia/minigame-biotrivia.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MinigameBiotriviaComponent } from './minigame-biotrivia.component'; + +describe('MinigameBiotriviaComponent', () => { + let component: MinigameBiotriviaComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ MinigameBiotriviaComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(MinigameBiotriviaComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apollo-frontend/src/app/minigame-biotrivia/minigame-biotrivia.component.ts b/apollo-frontend/src/app/minigame-biotrivia/minigame-biotrivia.component.ts new file mode 100644 index 0000000..8cdd6da --- /dev/null +++ b/apollo-frontend/src/app/minigame-biotrivia/minigame-biotrivia.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-minigame-biotrivia', + templateUrl: './minigame-biotrivia.component.html', + styleUrls: ['./minigame-biotrivia.component.scss'] +}) +export class MinigameBiotriviaComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/apollo-frontend/src/app/minigame-card/minigame-card.component.scss b/apollo-frontend/src/app/minigame-card/minigame-card.component.scss index 089294e..ce74c4f 100644 --- a/apollo-frontend/src/app/minigame-card/minigame-card.component.scss +++ b/apollo-frontend/src/app/minigame-card/minigame-card.component.scss @@ -51,7 +51,8 @@ box-shadow: #0004 3px 3px 5px; - background-color: #f8f8f8; + background-color: #f8f8f855; + backdrop-filter: blur(10px); button { margin: 0 auto; diff --git a/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.html b/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.html index c7c9032..e69de29 100644 --- a/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.html +++ b/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.html @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/apollo-frontend/src/app/userdata.service.ts b/apollo-frontend/src/app/userdata.service.ts index ac30c45..d0a82c7 100644 --- a/apollo-frontend/src/app/userdata.service.ts +++ b/apollo-frontend/src/app/userdata.service.ts @@ -54,7 +54,9 @@ export class UserdataService { } } getOwnedCards(): Card[] { - return this.getOwnedCardIds().map(v => this.db.getCard(v)); + return this.getOwnedCardIds().map(v => { + return this.db.getCard(v); + }); } saveMinigameUserdata(id: string, userdata: MinigameUserdata): void { diff --git a/apollo-frontend/src/assets/images/cards/delfin.jpg b/apollo-frontend/src/assets/images/cards/delfin.jpg new file mode 100644 index 0000000..0142c6d Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/delfin.jpg differ diff --git a/apollo-frontend/src/assets/images/cards/delfin2.jpg b/apollo-frontend/src/assets/images/cards/delfin2.jpg new file mode 100644 index 0000000..34c4d28 Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/delfin2.jpg differ diff --git a/apollo-frontend/src/assets/images/cards/kafqva-mechka.jpg b/apollo-frontend/src/assets/images/cards/kafqva-mechka.jpg new file mode 100644 index 0000000..e15cabc Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/kafqva-mechka.jpg differ diff --git a/apollo-frontend/src/assets/images/cards/koza.jpg b/apollo-frontend/src/assets/images/cards/koza.jpg new file mode 100644 index 0000000..56a0500 Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/koza.jpg differ diff --git a/apollo-frontend/src/assets/images/cards/laluger.jpg b/apollo-frontend/src/assets/images/cards/laluger.jpg new file mode 100644 index 0000000..7e7cb11 Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/laluger.jpg differ diff --git a/apollo-frontend/src/assets/images/cards/pingvin.jpg b/apollo-frontend/src/assets/images/cards/pingvin.jpg new file mode 100644 index 0000000..87e3b5c Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/pingvin.jpg differ diff --git a/apollo-frontend/src/assets/images/cards/pingvin2.jpg b/apollo-frontend/src/assets/images/cards/pingvin2.jpg new file mode 100644 index 0000000..ae60586 Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/pingvin2.jpg differ diff --git a/apollo-frontend/src/assets/images/cards/por.jpg b/apollo-frontend/src/assets/images/cards/por.jpg new file mode 100644 index 0000000..9840bd3 Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/por.jpg differ diff --git a/apollo-frontend/src/assets/images/cards/prilep.jpg b/apollo-frontend/src/assets/images/cards/prilep.jpg new file mode 100644 index 0000000..86bfa02 Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/prilep.jpg differ diff --git a/apollo-frontend/src/assets/images/cards/sinkit.jpg b/apollo-frontend/src/assets/images/cards/sinkit.jpg new file mode 100644 index 0000000..752f417 Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/sinkit.jpg differ diff --git a/apollo-frontend/src/assets/images/cards/sinkit2.jpg b/apollo-frontend/src/assets/images/cards/sinkit2.jpg new file mode 100644 index 0000000..01170b4 Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/sinkit2.jpg differ diff --git a/apollo-frontend/src/assets/images/cards/sokol.jpg b/apollo-frontend/src/assets/images/cards/sokol.jpg new file mode 100644 index 0000000..9bf6b8b Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/sokol.jpg differ diff --git a/apollo-frontend/src/assets/images/cards/sokol.png b/apollo-frontend/src/assets/images/cards/sokol.png new file mode 100644 index 0000000..9bf6b8b Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/sokol.png differ diff --git a/apollo-frontend/src/assets/images/cards/tuleni.jpg b/apollo-frontend/src/assets/images/cards/tuleni.jpg new file mode 100644 index 0000000..d97d4d4 Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/tuleni.jpg differ diff --git a/apollo-frontend/src/assets/images/cards/vidra.jpg b/apollo-frontend/src/assets/images/cards/vidra.jpg new file mode 100644 index 0000000..5c490d0 Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/vidra.jpg differ diff --git a/apollo-frontend/src/assets/images/cards/zemerovka.jpg b/apollo-frontend/src/assets/images/cards/zemerovka.jpg new file mode 100644 index 0000000..2f5aebf Binary files /dev/null and b/apollo-frontend/src/assets/images/cards/zemerovka.jpg differ diff --git a/apollo-frontend/src/styles.scss b/apollo-frontend/src/styles.scss index 0b8bcaa..40c01d0 100644 --- a/apollo-frontend/src/styles.scss +++ b/apollo-frontend/src/styles.scss @@ -1,11 +1,15 @@ /* You can add global styles to this file, and also import other style files */ -body, html { +body, +html { padding: 0; margin: 0; width: 100%; height: 100%; font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; + background-image: url('/assets/images/Forest BG.png'); + background-size: cover } + // Uncomment the following lines if you want to add a custom palette: // $primary: #731963 !default; // $secondary: #ce5712 !default; @@ -18,13 +22,11 @@ body, html { $company-color: rgb(139, 39, 39); // Some green shade I like $secondary-color: rgb(139, 39, 39); // Watermelon pink -$my-color-palette: igx-palette( - $primary: $company-color, - $secondary: $secondary-color -); +$my-color-palette: igx-palette($primary: $company-color, + $secondary: $secondary-color); @include igx-core(); @include igx-theme($my-color-palette); .contents { - display: contents; -} \ No newline at end of file + display: contents; +}