Merge branch 'branch'
# Conflicts: # src/app/interfaces/game.interface.ts
This commit is contained in:
commit
3766cd14da
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -1 +1,2 @@
|
|||||||
*.png filter=lfs diff=lfs merge=lfs -text
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.jpg filter=lfs diff=lfs merge=lfs -text
|
||||||
|
@ -18,8 +18,4 @@ export class AppComponent {
|
|||||||
});
|
});
|
||||||
//GetVersion();
|
//GetVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
RunGame() {
|
|
||||||
//RunGame();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,20 +1,13 @@
|
|||||||
<h1>{{game.title}}</h1>
|
<h1>{{game.title}}</h1>
|
||||||
<p>{{game.description}}</p>
|
<p>{{game.description}}</p>
|
||||||
<ng-template #icon>
|
|
||||||
<tui-avatar
|
|
||||||
size="xs"
|
|
||||||
[rounded]="true"
|
|
||||||
[avatarUrl]="'http://jpg.jpg'"
|
|
||||||
></tui-avatar>
|
|
||||||
</ng-template>
|
|
||||||
|
|
||||||
<button
|
<button
|
||||||
tuiButton
|
tuiButton
|
||||||
type="button"
|
type="button"
|
||||||
appearance="primary"
|
appearance="primary"
|
||||||
[icon]="icon"
|
|
||||||
class="tui-space_right-3 tui-space_bottom-3"
|
class="tui-space_right-3 tui-space_bottom-3"
|
||||||
(click)= "runGame()"
|
(click)= "runGame()"
|
||||||
>
|
>
|
||||||
|
Launch
|
||||||
<ng-content></ng-content>
|
<ng-content></ng-content>
|
||||||
</button>
|
</button>
|
||||||
|
@ -1,3 +1,22 @@
|
|||||||
<div class="game" [ngClass]="{'active': active}">
|
<!-- <div class="game" [ngClass]="{'active': active}">
|
||||||
<div class="game-title">{{game.title}}</div>
|
<div class="game-title">{{game.title}}</div>
|
||||||
</div>
|
</div> -->
|
||||||
|
<ng-template #icon>
|
||||||
|
<tui-avatar
|
||||||
|
size="xs"
|
||||||
|
[rounded]="true"
|
||||||
|
[avatarUrl]="'./assets/games-icons/' + game.image"
|
||||||
|
></tui-avatar>
|
||||||
|
</ng-template>
|
||||||
|
|
||||||
|
<button
|
||||||
|
tuiButton
|
||||||
|
type="button"
|
||||||
|
appearance="primary"
|
||||||
|
[icon]="icon"
|
||||||
|
class="tui-space_right-3 tui-space_bottom-3"
|
||||||
|
class="game"
|
||||||
|
[ngClass]="{'active': active}"
|
||||||
|
>
|
||||||
|
{{game.title}}
|
||||||
|
<ng-content></ng-content>
|
@ -15,6 +15,9 @@ export class LauncherService {
|
|||||||
|
|
||||||
public RunGame(game: Game){
|
public RunGame(game: Game){
|
||||||
//console.log(game)
|
//console.log(game)
|
||||||
GoRunGame(game.id)
|
GoRunGame(game.gameId)
|
||||||
|
// console.log(game)
|
||||||
|
// console.log(game.title)
|
||||||
|
// console.log(game.gameId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
BIN
src/assets/games-icons/gmod.png
Normal file
BIN
src/assets/games-icons/gmod.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 90 KiB |
BIN
src/assets/games-icons/openarena.jpg
Normal file
BIN
src/assets/games-icons/openarena.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.3 KiB |
Loading…
Reference in New Issue
Block a user