+
diff --git a/src/app/app.ts b/src/app/app.ts
index 1dd31ff..472ee69 100644
--- a/src/app/app.ts
+++ b/src/app/app.ts
@@ -1,6 +1,7 @@
-import { Component, signal } from '@angular/core';
-import { RouterOutlet } from '@angular/router';
+import {Component, computed, HostListener, OnInit, signal} from '@angular/core';
+import {RouterOutlet} from '@angular/router';
import {DotBackground} from './components/dot-background/dot-background';
+import {DeviceDetectionService} from './service/device-detection-service';
@Component({
selector: 'app-root',
@@ -8,6 +9,20 @@ import {DotBackground} from './components/dot-background/dot-background';
templateUrl: './app.html',
styleUrl: './app.scss'
})
-export class App {
+export class App implements OnInit {
protected readonly title = signal('Portfolio');
+ protected readonly isMobile = signal(false);
+ protected readonly isDesktop = computed(() => !this.isMobile());
+
+ constructor(private deviceDetectionService: DeviceDetectionService) {
+ }
+
+ ngOnInit(): void {
+ this.isMobile.set(this.deviceDetectionService.mobileCheck());
+ }
+
+ @HostListener('window:resize')
+ onResize() {
+ this.isMobile.set(this.deviceDetectionService.mobileCheck());
+ }
}
diff --git a/src/app/components/dot-background/dot-background.ts b/src/app/components/dot-background/dot-background.ts
index af3dfc8..a798ebb 100644
--- a/src/app/components/dot-background/dot-background.ts
+++ b/src/app/components/dot-background/dot-background.ts
@@ -1,5 +1,6 @@
import {afterNextRender, Component, ElementRef, NgZone, OnDestroy, ViewChild} from '@angular/core';
import {Dot} from '../../models/dot';
+import {DeviceDetectionService} from '../../service/device-detection-service';
@Component({
selector: 'app-dot-background',
@@ -18,13 +19,14 @@ export class DotBackground implements OnDestroy {
private readonly INIT_DOT_COUNT = 12;
private readonly MAX_DOT_COUNT = 100;
+ private readonly MAX_DOT_COUNT_MOBILE = 40;
private readonly COLORS = ['#6366f1', '#8b5cf6', '#a855f7', '#3b82f6'];
private readonly MOUSE_RADIUS = 150;
private ballSpawnId = 0;
private ballSpawnNextColor = 0;
- constructor(private ngZone: NgZone) {
+ constructor(private ngZone: NgZone, private mobileService: DeviceDetectionService) {
afterNextRender(() => {
this.init();
});
@@ -60,7 +62,7 @@ export class DotBackground implements OnDestroy {
const dx = Math.abs(width - canvas.width) / width;
const dy = Math.abs(height - canvas.height) / height;
- if (!this.mobileCheck() || dy > 0.2 || dx > 0.05) {
+ if (!this.mobileService.mobileCheck() || dy > 0.2 || dx > 0.05) {
//sync canvas size to screen size
canvas.width = width;
canvas.height = height;
@@ -72,14 +74,7 @@ export class DotBackground implements OnDestroy {
}
};
- private mobileCheck() {
- let check = false;
- (function (a) {
- if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4)))
- check = true
- })(navigator.userAgent || navigator.vendor || (window as any).opera);
- return check;
- };
+
private onMouseMove = (e: MouseEvent) => {
const canvas = this.canvasRef.nativeElement;
@@ -96,8 +91,9 @@ export class DotBackground implements OnDestroy {
private spawnDot(): Dot {
const dotId = this.ballSpawnId++;
+ const max_count = this.mobileService.mobileCheck() ? this.MAX_DOT_COUNT_MOBILE : this.MAX_DOT_COUNT;
let dot;
- if (dotId < this.MAX_DOT_COUNT) {
+ if (dotId < max_count) {
dot = {
x: 0,
y: 0,
@@ -109,7 +105,7 @@ export class DotBackground implements OnDestroy {
this.dots.push(dot);
} else {
- dot = this.dots[dotId % this.MAX_DOT_COUNT];
+ dot = this.dots[dotId % this.dots.length];
}
this.populateDot(dot);
diff --git a/src/app/components/pages/skills/skill-card/skill-card.scss b/src/app/components/pages/skills/skill-card/skill-card.scss
index e2d0637..40eae4f 100644
--- a/src/app/components/pages/skills/skill-card/skill-card.scss
+++ b/src/app/components/pages/skills/skill-card/skill-card.scss
@@ -18,11 +18,10 @@
inset 0 1px 0 rgba(255, 255, 255, 0.1);
transition: transform 0.3s ease, box-shadow 0.3s ease, border-color 0.3s ease;
- &:hover {
+ :host-context(.desktop) &:hover {
transform: translateY(-4px);
- box-shadow:
- 0 8px 32px rgba(99, 102, 241, 0.2),
- inset 0 1px 0 rgba(255, 255, 255, 0.15);
+ box-shadow: 0 8px 32px rgba(99, 102, 241, 0.2),
+ inset 0 1px 0 rgba(255, 255, 255, 0.15);
border-color: rgba(255, 255, 255, 0.25);
}
@@ -54,7 +53,7 @@
transition: filter 0.2s ease, transform 0.2s ease;
}
- &:hover img {
+ :host-context(.desktop) &:hover img {
filter: none;
transform: scale(1.1);
}
diff --git a/src/app/service/device-detection-service.spec.ts b/src/app/service/device-detection-service.spec.ts
new file mode 100644
index 0000000..d62e504
--- /dev/null
+++ b/src/app/service/device-detection-service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { DeviceDetectionService } from './device-detection-service';
+
+describe('DeviceDetectionService', () => {
+ let service: DeviceDetectionService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(DeviceDetectionService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/app/service/device-detection-service.ts b/src/app/service/device-detection-service.ts
new file mode 100644
index 0000000..62c3fe9
--- /dev/null
+++ b/src/app/service/device-detection-service.ts
@@ -0,0 +1,15 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class DeviceDetectionService {
+ public mobileCheck() {
+ let check = false;
+ (function (a) {
+ if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4)))
+ check = true
+ })(navigator.userAgent || navigator.vendor || (window as any).opera);
+ return check;
+ };
+}