diff --git a/apollo-frontend/src/app/app.module.ts b/apollo-frontend/src/app/app.module.ts index ef597b2..ce6ae31 100644 --- a/apollo-frontend/src/app/app.module.ts +++ b/apollo-frontend/src/app/app.module.ts @@ -6,6 +6,8 @@ import { AppComponent } from './app.component'; import { IgxButtonModule, + IgxDialogComponent, + IgxDialogModule, IgxIconModule, IgxProgressBarModule, IgxRadioModule, @@ -43,6 +45,7 @@ import { FormsModule } from '@angular/forms'; IgxIconModule, IgxRadioModule, IgxProgressBarModule, + IgxDialogModule, ], providers: [], bootstrap: [AppComponent] 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 9894496..7c3dfa2 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,12 +1,43 @@
-
- - + +
Точки: {{points}}
+
+ + + + + +
-
- - +
+ +
-
\ No newline at end of file +
+ +
+

ConveyorBin

+

+ В тази миниигра, вие трябва да сортирате боклуците по съответните кофи: + хартия - синя, стъкло - зелена, пластмаса и метал - жълта и битови отпадъци - червена. + За всеки боклук, чиято кофа уцелите печелите точка, а за всеки боклук, чиято кофа не уцелите - губите точка. + Имате около една минута да сортирате всички боклуци, но ако точките ви паднат под -10, губите. +

+ + +
+ + +
+

Завършихте минииграта

+
Събрани точки: {{points}}
+
+

Вие спечелихте тази карта:

+ +
+ + +
+ diff --git a/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.scss b/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.scss index 2620af4..8f608a1 100644 --- a/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.scss +++ b/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.scss @@ -1,5 +1,38 @@ img { image-rendering: crisp-edges; + pointer-events: none; + user-select: none; +} +.dialog-local { + overflow: hidden; + width: 600px; + padding: 2em; + box-sizing: border-box; + border-radius: .5em; + button { + margin: 0 auto; + display: block; + } + h4 { + text-align: center; + margin: 0 1em; + } + h6 { + text-align: center; + margin: 0 2em; + margin-bottom: .5em; + } + .separator { + height: .5em; + width: 100%; + } + p { + text-align: center; + } + igx-radio { + display: block; + margin: .25em; + } } .container { position: absolute; @@ -10,6 +43,7 @@ img { .bins { position: relative; display: flex; + gap: 1em; .image { max-height: unset; } @@ -18,6 +52,29 @@ img { .conveyor { display: flex; width: max-content; + position: relative; + .conveyor-hitbox { + width: 100%; + height: 24px; + position: absolute; + bottom: 0; + left: 0; + } + } + .points { + position: fixed; + top: 0; + right: 0; + padding: 1em; + font-weight: 600; + z-index: 100; + } + .timeline { + position: fixed; + top: 0; + left: 0; + width: 100%; + z-index: 100; } } diff --git a/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.ts b/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.ts index 6fa8747..10baa43 100644 --- a/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.ts +++ b/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.ts @@ -1,7 +1,7 @@ import { AfterViewInit, Component, ElementRef, EventEmitter, Input, NgZone, OnInit, ViewChild, ViewChildren } from '@angular/core'; import { NavigationStart, Router } from '@angular/router'; import { filter } from 'rxjs/operators'; -import { Saved } from '../db.service'; +import { Card, Saved } from '../db.service'; class Rect { public top: number; @@ -115,8 +115,8 @@ class Trash { this.rect.right += offsetX; this.rect.bottom += offsetY; - this.element.style.top = y + 'px'; - this.element.style.left = x + 'px'; + this.element.style.top = Math.floor(y / 2) * 2 + 'px'; + this.element.style.left = Math.floor(x / 2) * 2 + 'px'; return { x, y, bin }; } @@ -127,37 +127,74 @@ class Trash { templateUrl: './minigame-conveyor-recycling.component.html', styleUrls: ['./minigame-conveyor-recycling.component.scss'] }) -export class MinigameConveyorRecyclingComponent implements AfterViewInit { +export class MinigameConveyorRecyclingComponent implements AfterViewInit, OnInit { conveyorFrame = 1; frameCounterID: number; - trashTrowerID: number; - trashSpeed = 1000; - trashTypes: string[] = ['plastic', 'metal', 'glass', 'paper', 'other']; + mainLoopID: number; + timeCounterID: number; + trashTypes: string[] = ['metal-plastic', 'glass', 'paper', 'other']; nextId = 0; + + ended = false; + + wonCard: Card; + + throwOutSounds: HTMLAudioElement[] = []; + backgroundMusic: HTMLAudioElement; + + trashSpeed = 1000; simulationSpeed = 10; + friction = 5; + gravitation = 9; + + suspended = true; trashOffset = 0; - @ViewChildren('conveyor') conveyorElement; - @ViewChildren('bin') binElements; - bins: Bin[]; - conveyor: Conveyor; - trashes: Saved[] = []; - - binWidth = 146; - + binWidth = 110; milliseconds = 0; - keydownListener = (e) => { - const code = e.keyCode as number; - if (code === 65) this.trashOffset--; - if (code === 68) this.trashOffset++; + won = false; - if (this.trashOffset < 0) this.trashOffset = this.bins.length - 1; - if (this.trashOffset >= this.bins.length) this.trashOffset = 0; + timeMax = 1; + time = 0; + + points = 0; + + binsAcceptedTypes: string[][] = [ + [ 'paper' ], + [ 'glass' ], + [ 'metal-plastic' ], + [ 'other' ], + ]; + + @ViewChildren('conveyor') conveyorElement; + @ViewChildren('bin') binElements; + @ViewChild('endDialog') endDialog; + + initSound(url: string): HTMLAudioElement { + const el = document.createElement('audio'); + el.src = url; + + return el; + } + clearSound(sound: HTMLAudioElement): void { + document.body.append(sound); + sound.remove(); + } + + keydownListener = (e) => { + if (!this.suspended) { + const code = e.keyCode as number; + if (code === 65) this.trashOffset--; + if (code === 68) this.trashOffset++; + + if (this.trashOffset < 0) this.trashOffset = 0; + if (this.trashOffset >= this.bins.length) this.trashOffset = this.bins.length - 1; + } } constructor( @@ -166,6 +203,116 @@ export class MinigameConveyorRecyclingComponent implements AfterViewInit { private element: ElementRef, ) { } + showPoint(points: number, x: number, y: number): void { + const el = document.createElement('span'); + el.style.fontWeight = '600'; + el.style.fontSize = '1.5em'; + el.style.position = 'fixed'; + el.style.top = y + 'px'; + el.style.left = x + 'px'; + if (points < 0) el.style.color = 'red'; + if (points > 0) el.style.color = 'green'; + + if (points > 0) el.innerText = '+'; + el.innerText += points.toString(); + + this.element.nativeElement.append(el); + + el.animate([ + { + transform: 'translateY(0)', + opacity: 1, + }, + { + transform: 'translateY(-100px)', + opacity: 0 + } + ], { + duration: 500, + }).onfinish = () => { + el.remove(); + }; + } + + getTimerText(): string { + const time = this.timeMax - this.time; + const minutes = Math.floor(time / 60).toString(); + let seconds = Math.floor(time % 60).toString(); + + if (seconds.length === 1) seconds = "0" + seconds; + + return `Остават: ${minutes}:${seconds}`; + } + + spawnTrash(): void { + const trash = new Trash(); + const element = document.createElement('img'); + element.style.position = 'absolute'; + element.style.pointerEvents = 'none'; + element.style.userSelect = 'none'; + + trash.velX = 0; + trash.velY = 0; + + trash.type = this.getRandomType(); + trash.imageUrl = `/assets/images/conveyor-belt/${trash.type}-${Math.floor(Math.random() * 3) + 1}.png`; + + element.src = trash.imageUrl; + + element.decode().then(() => { + trash.element = element; + + this.element.nativeElement.append(element); + trash.rect = new Rect(0, 0, element.width, element.height); + + this.trashes.push({ id: (this.nextId++).toString(), el: trash }); + }); + } + updateTrash(trash: Saved, i: number): void { + const newPos = trash.el.update( + this.gravitation / (1000 / this.simulationSpeed), + this.friction / (1000 / this.simulationSpeed), + this.conveyor, ...this.bins + ); + if (newPos.y > document.body.getBoundingClientRect().bottom) { + trash.el.element.remove(); + this.trashes.splice(i, 1); + } + + if (newPos.bin) { + trash.el.element.remove(); + this.trashes.splice(i, 1); + + this.throwOutSounds[Math.floor(Math.random() * 3)].play(); + + const pointX = (trash.el.rect.left + trash.el.rect.right) / 2; + const pointY = trash.el.rect.bottom; + + if (newPos.bin.acceptedTypes.includes(trash.el.type)) { + this.points++; + this.showPoint(1, pointX, pointY); + } + else { + this.points--; + this.showPoint(-1, pointX, pointY); + } + } + } + ngOnInit(): void { + this.throwOutSounds = [ + this.initSound('/assets/sound/conveyor-bin/throw-out-1.mp3'), + this.initSound('/assets/sound/conveyor-bin/throw-out-2.mp3'), + this.initSound('/assets/sound/conveyor-bin/throw-out-3.mp3'), + ]; + + this.backgroundMusic = document.createElement('audio'); + this.backgroundMusic.src = '/assets/sound/music/conveyorbin.wav'; + + this.backgroundMusic.onloadedmetadata = () => { + // this.timeMax = this.backgroundMusic.duration; + }; + } + ngAfterViewInit(): void { this.router.events.pipe( filter((e: any) => e instanceof NavigationStart), @@ -174,22 +321,19 @@ export class MinigameConveyorRecyclingComponent implements AfterViewInit { this.end(); }); - this.start(); + this.init(); } - end(): void { - clearInterval(this.frameCounterID); - document.body.removeEventListener('keydown', this.keydownListener); - } + init(): void { + this.backgroundMusic.loop = true; - start(): void { document.body.addEventListener('keydown', this.keydownListener); - this.bins = this.binElements._results.map((v: ElementRef) => { + this.bins = this.binElements._results.map((v: ElementRef, i: number) => { const el = v.nativeElement; const bin = new Bin(); bin.element = el; - bin.acceptedTypes = ['paper']; + bin.acceptedTypes = this.binsAcceptedTypes[i]; return bin; }); @@ -198,55 +342,63 @@ export class MinigameConveyorRecyclingComponent implements AfterViewInit { this.conveyor.element = this.conveyorElement.first.nativeElement; this.conveyor.speed = 2; this.frameCounterID = setInterval(() => { - this.zone.run(() => { - this.conveyorFrame = (++this.conveyorFrame % 3); - }); - }, 1000) as any as number; - this.frameCounterID = setInterval(() => { - if (this.milliseconds % (1000 / (this.simulationSpeed)) === 0) { - const trash = new Trash(); - const element = document.createElement('img'); - element.style.position = 'absolute'; - - trash.velX = 0; - trash.velY = 0; - - trash.type = this.getRandomType(); - trash.imageUrl = `/assets/images/conveyor-belt/${trash.type}-${Math.floor(Math.random() * 3) + 1}.png`; - - element.src = trash.imageUrl; - - element.decode().then(() => { - trash.element = element; - - this.element.nativeElement.prepend(element); - trash.rect = new Rect(0, 0, element.width, element.height); - - this.trashes.push({ id: (this.nextId++).toString(), el: trash }); + if (!this.suspended) { + this.zone.run(() => { + this.conveyorFrame = (++this.conveyorFrame % 3); }); } - - this.trashes.forEach((trash, i) => { - const newPos = trash.el.update( - 9 / (1000 / this.simulationSpeed), - 10 / (1000 / this.simulationSpeed), - this.conveyor, ...this.bins - ); - if (newPos.y > document.body.getBoundingClientRect().bottom) { - trash.el.element.remove(); - this.trashes.splice(i, 1); + }, 1000) as any as number; + this.mainLoopID = setInterval(() => { + if (!this.suspended) { + if (this.milliseconds % (this.simulationSpeed * 100) === 0) { + this.spawnTrash(); } - if (newPos.bin) { - trash.el.element.remove(); - this.trashes.splice(i, 1); - } - }); + this.trashes.forEach((trash, i) => { + this.updateTrash(trash, i); + }); - this.milliseconds++; + this.milliseconds += this.simulationSpeed; + } }, this.simulationSpeed) as any as number; + this.timeCounterID = setInterval(() => { + if (!this.suspended) { + this.time += 0.25; + if (this.time > this.timeMax) { + this.stop(); + this.ended = true; + } + } + }, 250) as any as number; + } + end(): void { + this.stop(); + this.ended = true; + } + finalise(): void { + clearInterval(this.frameCounterID); + clearInterval(this.timeCounterID); + clearInterval(this.mainLoopID); + document.body.removeEventListener('keydown', this.keydownListener); + this.throwOutSounds.forEach(v => this.clearSound(v)); + this.clearSound(this.backgroundMusic); + } + stop(): void { + this.suspended = true; + this.backgroundMusic.pause(); + this.backgroundMusic.currentTime = 0; + } + start(): void { + this.backgroundMusic.play(); + this.suspended = false; + // tslint:disable-next-line: no-conditional-assignment + } + + restart(): void { + this.points = 0; + this.start(); } getRandomType(): string { diff --git a/apollo-frontend/src/assets/images/conveyor-belt/bin-glass.png b/apollo-frontend/src/assets/images/conveyor-belt/bin-glass.png index a5531c5..0953a33 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/bin-glass.png and b/apollo-frontend/src/assets/images/conveyor-belt/bin-glass.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/bin-other.png b/apollo-frontend/src/assets/images/conveyor-belt/bin-other.png index 8dd99f8..bc223ea 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/bin-other.png and b/apollo-frontend/src/assets/images/conveyor-belt/bin-other.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/bin-paper.png b/apollo-frontend/src/assets/images/conveyor-belt/bin-paper.png index dd8f474..ad66983 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/bin-paper.png and b/apollo-frontend/src/assets/images/conveyor-belt/bin-paper.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/bin-plastic.png b/apollo-frontend/src/assets/images/conveyor-belt/bin-plastic.png index 64554fd..da791c2 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/bin-plastic.png and b/apollo-frontend/src/assets/images/conveyor-belt/bin-plastic.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-1.png b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-1.png index 15913d7..04b2ed7 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-1.png and b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-1.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-2.png b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-2.png index 0b52e0b..7e9753b 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-2.png and b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-2.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-3.png b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-3.png index cf65b58..72e7c57 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-3.png and b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-3.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-4.png b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-4.png new file mode 100644 index 0000000..04b2ed7 Binary files /dev/null and b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-4.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end-1.png b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end-1.png index 1341fb4..53694d2 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end-1.png and b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end-1.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end-2.png b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end-2.png index d111d60..5f86e31 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end-2.png and b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end-2.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end-3.png b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end-3.png index 9fba9ec..d04906f 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end-3.png and b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end-3.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end-4.png b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end-4.png new file mode 100644 index 0000000..53694d2 Binary files /dev/null and b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end-4.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end.gif b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end.gif new file mode 100644 index 0000000..b104e3e Binary files /dev/null and b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-end.gif differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-start-1.png b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-start-1.png deleted file mode 100644 index f5d4e24..0000000 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-start-1.png and /dev/null differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-start-2.png b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-start-2.png deleted file mode 100644 index 3a88c70..0000000 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-start-2.png and /dev/null differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-start-3.png b/apollo-frontend/src/assets/images/conveyor-belt/conveyor-start-3.png deleted file mode 100644 index 68026d2..0000000 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/conveyor-start-3.png and /dev/null differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/conveyor.gif b/apollo-frontend/src/assets/images/conveyor-belt/conveyor.gif new file mode 100644 index 0000000..7b3ea4d Binary files /dev/null and b/apollo-frontend/src/assets/images/conveyor-belt/conveyor.gif differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/glass-1.png b/apollo-frontend/src/assets/images/conveyor-belt/glass-1.png index b081c4d..d453304 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/glass-1.png and b/apollo-frontend/src/assets/images/conveyor-belt/glass-1.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/glass-2.png b/apollo-frontend/src/assets/images/conveyor-belt/glass-2.png index 249db09..393f20a 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/glass-2.png and b/apollo-frontend/src/assets/images/conveyor-belt/glass-2.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/glass-3.png b/apollo-frontend/src/assets/images/conveyor-belt/glass-3.png index f9e1cb1..73d849c 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/glass-3.png and b/apollo-frontend/src/assets/images/conveyor-belt/glass-3.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/metal-1.png b/apollo-frontend/src/assets/images/conveyor-belt/metal-1.png deleted file mode 100644 index f06d375..0000000 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/metal-1.png and /dev/null differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/metal-2.png b/apollo-frontend/src/assets/images/conveyor-belt/metal-2.png deleted file mode 100644 index b4a7e61..0000000 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/metal-2.png and /dev/null differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/metal-3.png b/apollo-frontend/src/assets/images/conveyor-belt/metal-3.png deleted file mode 100644 index a30268a..0000000 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/metal-3.png and /dev/null differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/metal-plastic-1.png b/apollo-frontend/src/assets/images/conveyor-belt/metal-plastic-1.png new file mode 100644 index 0000000..65c58bb Binary files /dev/null and b/apollo-frontend/src/assets/images/conveyor-belt/metal-plastic-1.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/metal-plastic-2.png b/apollo-frontend/src/assets/images/conveyor-belt/metal-plastic-2.png new file mode 100644 index 0000000..1b9f3f6 Binary files /dev/null and b/apollo-frontend/src/assets/images/conveyor-belt/metal-plastic-2.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/metal-plastic-3.png b/apollo-frontend/src/assets/images/conveyor-belt/metal-plastic-3.png new file mode 100644 index 0000000..f277c94 Binary files /dev/null and b/apollo-frontend/src/assets/images/conveyor-belt/metal-plastic-3.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/other-1.png b/apollo-frontend/src/assets/images/conveyor-belt/other-1.png index 5e77426..61029d7 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/other-1.png and b/apollo-frontend/src/assets/images/conveyor-belt/other-1.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/other-2.png b/apollo-frontend/src/assets/images/conveyor-belt/other-2.png index 565df2e..a0e53d7 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/other-2.png and b/apollo-frontend/src/assets/images/conveyor-belt/other-2.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/other-3.png b/apollo-frontend/src/assets/images/conveyor-belt/other-3.png index 69fafd6..fc3b903 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/other-3.png and b/apollo-frontend/src/assets/images/conveyor-belt/other-3.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/paper-1.png b/apollo-frontend/src/assets/images/conveyor-belt/paper-1.png index 5fde08a..27e73f8 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/paper-1.png and b/apollo-frontend/src/assets/images/conveyor-belt/paper-1.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/paper-2.png b/apollo-frontend/src/assets/images/conveyor-belt/paper-2.png index d70b26b..877fe45 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/paper-2.png and b/apollo-frontend/src/assets/images/conveyor-belt/paper-2.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/paper-3.png b/apollo-frontend/src/assets/images/conveyor-belt/paper-3.png index cbd5339..83dd6d9 100644 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/paper-3.png and b/apollo-frontend/src/assets/images/conveyor-belt/paper-3.png differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/plastic-1.png b/apollo-frontend/src/assets/images/conveyor-belt/plastic-1.png deleted file mode 100644 index b87e01e..0000000 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/plastic-1.png and /dev/null differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/plastic-2.png b/apollo-frontend/src/assets/images/conveyor-belt/plastic-2.png deleted file mode 100644 index 42c64cb..0000000 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/plastic-2.png and /dev/null differ diff --git a/apollo-frontend/src/assets/images/conveyor-belt/plastic-3.png b/apollo-frontend/src/assets/images/conveyor-belt/plastic-3.png deleted file mode 100644 index 9aecb73..0000000 Binary files a/apollo-frontend/src/assets/images/conveyor-belt/plastic-3.png and /dev/null differ diff --git a/apollo-frontend/src/assets/sound/conveyor-bin/throw-out-1.mp3 b/apollo-frontend/src/assets/sound/conveyor-bin/throw-out-1.mp3 new file mode 100644 index 0000000..39350c2 Binary files /dev/null and b/apollo-frontend/src/assets/sound/conveyor-bin/throw-out-1.mp3 differ diff --git a/apollo-frontend/src/assets/sound/conveyor-bin/throw-out-2.mp3 b/apollo-frontend/src/assets/sound/conveyor-bin/throw-out-2.mp3 new file mode 100644 index 0000000..ba78609 Binary files /dev/null and b/apollo-frontend/src/assets/sound/conveyor-bin/throw-out-2.mp3 differ diff --git a/apollo-frontend/src/assets/sound/conveyor-bin/throw-out-3.mp3 b/apollo-frontend/src/assets/sound/conveyor-bin/throw-out-3.mp3 new file mode 100644 index 0000000..e67d157 Binary files /dev/null and b/apollo-frontend/src/assets/sound/conveyor-bin/throw-out-3.mp3 differ diff --git a/apollo-frontend/src/styles.scss b/apollo-frontend/src/styles.scss index 677cf0a..185cb5d 100644 --- a/apollo-frontend/src/styles.scss +++ b/apollo-frontend/src/styles.scss @@ -37,9 +37,8 @@ $my-color-palette: igx-palette($primary: $company-color, * { box-sizing: border-box; } -.dialog { +.dialog, .igx-dialog__window { background-color: #f8f8f855; backdrop-filter: blur(10px); box-shadow: #0004 3px 3px 5px; - } \ No newline at end of file