-
-
+Hello, {{ title }}
-Congratulations! Your app is running. 🎉
-account works!
diff --git a/frontend/indiestream/src/app/components/account/account.component.scss b/frontend/indiestream/src/app/components/account/account.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/frontend/indiestream/src/app/components/account/account.component.spec.ts b/frontend/indiestream/src/app/components/account/account.component.spec.ts new file mode 100644 index 0000000..07d869b --- /dev/null +++ b/frontend/indiestream/src/app/components/account/account.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AccountComponent } from './account.component'; + +describe('AccountComponent', () => { + let component: AccountComponent; + let fixture: ComponentFixture
-
-
+
+
+ {{ game.title }}
+ Game ID: {{ game.id }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/indiestream/src/app/components/games-overview/games-overview.component.scss b/frontend/indiestream/src/app/components/games-overview/games-overview.component.scss
index 68a3ccf..880607a 100644
--- a/frontend/indiestream/src/app/components/games-overview/games-overview.component.scss
+++ b/frontend/indiestream/src/app/components/games-overview/games-overview.component.scss
@@ -1,4 +1,8 @@
.games-table {
white-space: pre;
- width: 80%;
+ width: 100%;
+}
+
+.no-games-warning {
+ padding-bottom: 4rem;
}
diff --git a/frontend/indiestream/src/app/components/games-overview/games-overview.component.ts b/frontend/indiestream/src/app/components/games-overview/games-overview.component.ts
index 522d248..45469e0 100644
--- a/frontend/indiestream/src/app/components/games-overview/games-overview.component.ts
+++ b/frontend/indiestream/src/app/components/games-overview/games-overview.component.ts
@@ -1,6 +1,6 @@
import {Component, OnInit} from '@angular/core';
-import {MatButton} from "@angular/material/button";
-import {NgForOf} from "@angular/common";
+import {MatButton, MatFabButton} from "@angular/material/button";
+import {NgForOf, NgIf} from "@angular/common";
import {GamesService} from "../../services/games.service";
import {Game} from "../../modules/games";
import {
@@ -14,34 +14,55 @@ import {
MatTable
} from "@angular/material/table";
import {HttpClientModule} from "@angular/common/http";
+import {AuthService} from "../../services/auth.service";
+import {MatIcon} from "@angular/material/icon";
+import {RouterLink} from "@angular/router";
+import {
+ MatCard,
+ MatCardActions,
+ MatCardContent,
+ MatCardHeader,
+ MatCardSubtitle,
+ MatCardTitle
+} from "@angular/material/card";
+import {OAuthService} from "angular-oauth2-oidc";
@Component({
selector: 'app-games-overview',
standalone: true,
- imports: [
- MatButton,
- NgForOf,
- MatTable,
- MatColumnDef,
- MatHeaderCell,
- MatCell,
- MatHeaderRow,
- MatRow,
- MatRowDef,
- MatHeaderRowDef,
- MatCellDef,
- MatHeaderCellDef,
- HttpClientModule,
- ],
+ imports: [
+ MatButton,
+ NgForOf,
+ MatTable,
+ MatColumnDef,
+ MatHeaderCell,
+ MatCell,
+ MatHeaderRow,
+ MatRow,
+ MatRowDef,
+ MatHeaderRowDef,
+ MatCellDef,
+ MatHeaderCellDef,
+ HttpClientModule,
+ NgIf,
+ MatIcon,
+ RouterLink,
+ MatCard,
+ MatCardTitle,
+ MatCardSubtitle,
+ MatCardHeader,
+ MatCardContent,
+ MatCardActions,
+ MatFabButton,
+ ],
templateUrl: './games-overview.component.html',
styleUrl: './games-overview.component.scss'
})
export class GamesOverviewComponent implements OnInit
{
- columnsToDisplay = ['ID', 'title', 'status', 'url', 'refresh', 'delete'];
- public games: any;
+ public games: Game[] = [];
- constructor(private gamesService: GamesService) {
+ constructor(private gamesService: GamesService, public authService: AuthService, private oAuthService: OAuthService) {
}
@@ -65,10 +86,15 @@ export class GamesOverviewComponent implements OnInit
)
}
+ refreshAllGames() {
+ for (let game of this.games) {
+ this.refreshGame(game.id);
+ }
+ }
+
deleteGame(id: string) {
this.gamesService.deleteGame(id);
//TODO refresh?
//getGames():
}
-
}
diff --git a/frontend/indiestream/src/app/components/landing-page/landing-page.component.html b/frontend/indiestream/src/app/components/landing-page/landing-page.component.html
new file mode 100644
index 0000000..8d1873e
--- /dev/null
+++ b/frontend/indiestream/src/app/components/landing-page/landing-page.component.html
@@ -0,0 +1 @@
+;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ imports: [LandingPageComponent]
+ })
+ .compileComponents();
+
+ fixture = TestBed.createComponent(LandingPageComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/frontend/indiestream/src/app/components/landing-page/landing-page.component.ts b/frontend/indiestream/src/app/components/landing-page/landing-page.component.ts
new file mode 100644
index 0000000..1d65bdb
--- /dev/null
+++ b/frontend/indiestream/src/app/components/landing-page/landing-page.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'app-landing-page',
+ standalone: true,
+ imports: [],
+ templateUrl: './landing-page.component.html',
+ styleUrl: './landing-page.component.scss'
+})
+export class LandingPageComponent {
+
+}
diff --git a/frontend/indiestream/src/app/guards/auth.guard.ts b/frontend/indiestream/src/app/guards/auth.guard.ts
new file mode 100644
index 0000000..79bc747
--- /dev/null
+++ b/frontend/indiestream/src/app/guards/auth.guard.ts
@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import {
+ ActivatedRouteSnapshot,
+ CanActivate,
+ RouterStateSnapshot,
+} from '@angular/router';
+import {AuthService} from "../services/auth.service";
+
+@Injectable()
+export class AuthGuard implements CanActivate {
+ constructor(private authService: AuthService) {}
+
+ canActivate(
+ route: ActivatedRouteSnapshot,
+ state: RouterStateSnapshot,
+ ): boolean {
+ if (!this.authService.isAuthenticated()) {
+ this.authService.login();
+ }
+ return this.authService.isAuthenticated();
+ }
+}
diff --git a/frontend/indiestream/src/app/modules/games.ts b/frontend/indiestream/src/app/modules/games.ts
index c44e0ab..d10d2af 100644
--- a/frontend/indiestream/src/app/modules/games.ts
+++ b/frontend/indiestream/src/app/modules/games.ts
@@ -1,9 +1,3 @@
-export interface Games {
- Message: string,
- Status: string,
- Games: Game[];
-}
-
export interface Game {
id: string,
title: string,
diff --git a/frontend/indiestream/src/app/services/auth.initializer.ts b/frontend/indiestream/src/app/services/auth.initializer.ts
index b14f683..1d4c9d3 100644
--- a/frontend/indiestream/src/app/services/auth.initializer.ts
+++ b/frontend/indiestream/src/app/services/auth.initializer.ts
@@ -28,7 +28,7 @@ export class AuthInitializer {
};
this.oauthService.configure(authConfig);
this.oauthService.setupAutomaticSilentRefresh();
- this.oauthService.loadDiscoveryDocumentAndLogin().then(() => {
+ this.oauthService.loadDiscoveryDocumentAndTryLogin().then(() => {
/*
if (this.oauthService.hasValidIdToken() && this.oauthService.hasValidAccessToken()) {
const url = decodeURIComponent(this.oauthService.state);
diff --git a/frontend/indiestream/src/app/services/auth.service.ts b/frontend/indiestream/src/app/services/auth.service.ts
index 2737eed..11ba02c 100644
--- a/frontend/indiestream/src/app/services/auth.service.ts
+++ b/frontend/indiestream/src/app/services/auth.service.ts
@@ -20,6 +20,9 @@ export class AuthService {
getPictureUrl(): string {
const claims = this.oAuthService.getIdentityClaims();
+ if (claims === null) {
+ return '';
+ }
return claims['picture'];
}
@@ -39,6 +42,6 @@ export class AuthService {
}
logout() {
- this.oAuthService.logOut();
+ this.oAuthService.revokeTokenAndLogout();
}
}
diff --git a/frontend/indiestream/src/app/services/games.service.ts b/frontend/indiestream/src/app/services/games.service.ts
index d343090..4938b12 100644
--- a/frontend/indiestream/src/app/services/games.service.ts
+++ b/frontend/indiestream/src/app/services/games.service.ts
@@ -1,48 +1,49 @@
-import { Injectable } from "@angular/core";
-import { HttpClient, HttpEvent, HttpHeaders} from '@angular/common/http';
-import { Games, Game } from '../modules/games';
-import { Observable } from "rxjs";
-import { AppConfigService } from "./app-config.service";
-import { AuthService} from "./auth.service";
-import {FormGroup} from "@angular/forms";
-
-@Injectable({
- providedIn: 'root'
-})
-export class GamesService {
- private apiUrl = this.configService.getConfig().apiUrl;
- constructor(private http: HttpClient, private configService: AppConfigService) {
- console.log(this.configService.getConfig())
- }
-
- getGames(): Observable {
- const httpOptions = {
- headers: new HttpHeaders({
- 'Content-Type': 'application/json',
- }),
- };
- return this.http.get(this.apiUrl + "/games");
- }
-
- getGame(id: string): Observable {
- return this.http.get(this.apiUrl + "/games/" + id)
- }
-
- deleteGame(id: string): void {
- this.http.delete(this.apiUrl + "/games/" + id)
- }
-
- uploadGame(gameForm: FormGroup): Observable> {
- const formData = new FormData();
- formData.append('title', gameForm.get('title')?.value);
- const files: FileList = gameForm.get('file')?.value;
- if (files && files.length > 0) {
- formData.append('file', files[0]);
- }
- return this.http.post(this.apiUrl + "/games", formData, {
- reportProgress: true,
- observe: 'events'
- });
- }
-}
-
+import { Injectable } from "@angular/core";
+import { HttpClient, HttpEvent, HttpHeaders} from '@angular/common/http';
+import { Game } from '../modules/games';
+import {map, Observable, tap} from "rxjs";
+import { AppConfigService } from "./app-config.service";
+import { AuthService} from "./auth.service";
+import {FormGroup} from "@angular/forms";
+
+@Injectable({
+ providedIn: 'root'
+})
+export class GamesService {
+ private apiUrl = this.configService.getConfig().apiUrl;
+ constructor(private http: HttpClient, private configService: AppConfigService) {
+ console.log(this.configService.getConfig())
+ }
+
+ getGames(): Observable {
+ const httpOptions = {
+ headers: new HttpHeaders({
+ 'Content-Type': 'application/json',
+ }),
+ };
+ return this.http.get(this.apiUrl + "/games");
+ }
+
+ // returns undefined when game not found
+ getGame(id: string): Observable {
+ return this.http.get(this.apiUrl + "/games/" + id);
+ }
+
+ deleteGame(id: string): void {
+ this.http.delete(this.apiUrl + "/games/" + id)
+ }
+
+ uploadGame(gameForm: FormGroup): Observable> {
+ const formData = new FormData();
+ formData.append('title', gameForm.get('title')?.value);
+ const files: FileList = gameForm.get('file')?.value;
+ if (files && files.length > 0) {
+ formData.append('file', files[0]);
+ }
+ return this.http.post(this.apiUrl + "/games", formData, {
+ reportProgress: true,
+ observe: 'events'
+ });
+ }
+}
+
diff --git a/frontend/indiestream/src/index.html b/frontend/indiestream/src/index.html
index fb3dde5..f6a4754 100644
--- a/frontend/indiestream/src/index.html
+++ b/frontend/indiestream/src/index.html
@@ -2,7 +2,7 @@
- Indiestream
+ IndieGameStream
| ID | -{{game.id}} | -Title | -{{game.title}} | -Status | -{{game.status}} | -URL | -{{game.url}} | -Refresh | -- | Delete | -- |
|---|
+
+
+
+Status: {{ game.status }}
+ URL: {{ game.url }} +landing-page works!
diff --git a/frontend/indiestream/src/app/components/landing-page/landing-page.component.scss b/frontend/indiestream/src/app/components/landing-page/landing-page.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/frontend/indiestream/src/app/components/landing-page/landing-page.component.spec.ts b/frontend/indiestream/src/app/components/landing-page/landing-page.component.spec.ts new file mode 100644 index 0000000..70960d7 --- /dev/null +++ b/frontend/indiestream/src/app/components/landing-page/landing-page.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { LandingPageComponent } from './landing-page.component'; + +describe('LandingPageComponent', () => { + let component: LandingPageComponent; + let fixture: ComponentFixture