Compare commits

..

No commits in common. "minecraft-release" and "main" have entirely different histories.

10 changed files with 12 additions and 27 deletions

View File

@ -7,5 +7,6 @@
</div>
<skirda-text>description</skirda-text>
</div>
<skirda-icon *ngIf="!collapsed" name="play" size="24" (click)="run(game)" color="var(--sk-primary-accent)"></skirda-icon>
</div>
</a>

View File

@ -1,12 +1,12 @@
<menu>
<!-- <div class="menu-search-panel">
<div class="menu-search-panel">
<skirda-input *ngIf="!collapsed" [formControl]="search" size="l" placeholder="Quick search">
<skirda-icon name="search" size="18" role="left"></skirda-icon>
</skirda-input>
<button (click)="toggle()">
<skirda-icon name="menu-panel" color="var(--sk-primary-accent)"></skirda-icon>
</button>
</div> -->
</div>
<div class="menu-content" skirdaIsScrolling>
<!-- <div class="menu-sections">
<skirda-section [routerLink]="['servers']" routerLinkActive="active">

View File

@ -1,5 +1,5 @@
<skirda-section-label *ngIf="!collapsed">
Games <div class="count">{{games.length}}</div>
Pinned games <div class="count">{{games.length}}</div>
</skirda-section-label>
<skirda-icon name="library" size="20" *ngIf="collapsed"></skirda-icon>
<div class="games">

View File

@ -34,7 +34,7 @@ export class MenuGamesComponent implements OnInit {
}
else{
GoGetGames().then((value) => {
// console.log(value);
console.log(value);
this.games = value;
});
}

View File

@ -4,9 +4,9 @@
<skirda-heading size="6">{{profile.username}}</skirda-heading>
<skirda-text>online</skirda-text>
</div>
<!-- <a [routerLink]="['settings']" *ngIf="!collapsed">
<a [routerLink]="['settings']" *ngIf="!collapsed">
<skirda-icon name="settings" color="var(--sk-primary-accent)"></skirda-icon>
</a> -->
</a>
</a>
<div class="theme-toggle" *ngIf="!collapsed" (click)="toggleTheme()" [ngClass]="{'active': theme === 'light'}">
<skirda-icon name="sun" color="var(--sk-primary-accent)"></skirda-icon>

View File

@ -10,7 +10,6 @@ import { GoGetSessions } from 'src/app/services/go';
export class MenuSessionsComponent implements OnInit {
fakeSessions: Session[] = [
{
skirdaSessionId: 'a',
gameId: 'minecraft-001',
icon: '/assets/games/minecraft/icon.png',
title: 'Minecraft',
@ -19,7 +18,6 @@ export class MenuSessionsComponent implements OnInit {
expires: new Date('2022-10-30'),
},
{
skirdaSessionId: 'b',
gameId: 'minecraft-002',
icon: '/assets/games/garrysmod/icon.png',
title: 'Minecraft 2',
@ -27,7 +25,6 @@ export class MenuSessionsComponent implements OnInit {
expires: new Date('2022-10-27T20:00:00'),
},
{
skirdaSessionId: 'c',
gameId: 'minecraft-003',
icon: '/assets/games/minecraft/icon.png',
title: 'Minecraft 3',

View File

@ -47,7 +47,7 @@
<!-- 6. Вызываем в нужном месте (в html компонента) открытие попап окна и передаем в метод из ts шаблон
(название переменной popupContent должно совпадать с аттрибутом
у описанного шаблона из пункта 2 (<ng-template #popupContent>)) -->
<skirda-button size="large" appearance="primary" (click)="run(game)">
<skirda-button size="large" appearance="primary" (click)="openPopup(popupContent)">
<skirda-icon name="play" size="32"></skirda-icon>
<skirda-heading size="1">Play</skirda-heading>
</skirda-button>

View File

@ -5,7 +5,6 @@ import { PopupService } from 'projects/ui/src/lib/popup/popup.service'
import { Subscription } from 'rxjs'
import { Game } from 'src/app/interfaces/game.interface'
import { UiService } from 'src/app/services/ui.service'
import { LauncherService } from 'src/app/services/launcher.service';
@Component({
selector: 'app-game-page',
@ -20,7 +19,7 @@ export class GamePageComponent implements OnInit, OnDestroy {
uiService = inject(UiService)
subs: Map<string, Subscription> = new Map();
game: Game = {
gameId: '20929f6b-983e-4dd1-8d59-5e680fd0a10d',
gameId: 'minecraft',
title: 'Minecraft',
image: '/assets/games/minecraft/icon.png',
description: 'Minecraft description',
@ -44,17 +43,10 @@ export class GamePageComponent implements OnInit, OnDestroy {
constructor(
private router: Router,
private launcher: LauncherService,
// 4. Импортировать сервис для попап окон
private popup: PopupService
) {}
run(game: Game) {
//console.log('Game to run ' + game.title)
this.launcher.RunGame(game)
}
ngOnInit(): void {
this.observeNavigation()
}

View File

@ -1,5 +1,4 @@
export interface Session {
skirdaSessionId: string;
gameId: string;
icon: string;
title: string;

View File

@ -1,7 +1,6 @@
import { Injectable } from '@angular/core';
import { Game } from '../interfaces/game.interface';
import { Session } from '../interfaces/session.interface';
import { GoRunGame, GoRunSession } from './go';
import { GoRunGame } from './go';
@Injectable({
providedIn: 'root'
})
@ -21,7 +20,4 @@ export class LauncherService {
// console.log(game.title)
// console.log(game.gameId)
}
public RunSession(session: Session){
GoRunSession(session.skirdaSessionId)
}
}