_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show or not the Powered by image (#2163)

Browse Source 
* Show or not the Powered by image

* Fix prettier issues

* Fix prettier issues messages
This commit is contained in:
César Cardinale 2022-05-04 14:22:20 +02:00 committed by GitHub
parent a662096e1d
commit ad229460ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
back/src/Model/GameRoom.ts
View File

@ -561,6 +561,7 @@ export class GameRoom {
mapUrl,
authenticationMandatory: null,
group: null,
showPoweredBy: true,
};
}

2
front/src/Components/Login/LoginScene.svelte
View File

@ -63,7 +63,7 @@
<section class="action">
<button type="submit" class="nes-btn is-primary loginSceneFormSubmit">{$LL.login.continue()}</button>
</section>
{#if logo !== logoImg}
{#if logo !== logoImg && gameManager.currentStartedRoom.showPoweredBy !== false}
<section class="text-center powered-by">
<img src={poweredByWorkAdventureImg} alt="Powered by WorkAdventure" />
</section>

6
front/src/Connexion/Room.ts
View File

@ -25,6 +25,7 @@ export class Room {
private _canReport: boolean = false;
private _loadingLogo: string | undefined;
private _loginSceneLogo: string | undefined;
private _showPoweredBy: boolean | undefined = true;
private constructor(private roomUrl: URL) {
this.id = roomUrl.pathname;
@ -120,6 +121,7 @@ export class Room {
this._canReport = data.canReport ?? false;
this._loadingLogo = data.loadingLogo ?? undefined;
this._loginSceneLogo = data.loginSceneLogo ?? undefined;
this._showPoweredBy = data.showPoweredBy ?? true;
return new MapDetail(data.mapUrl);
} else {
console.log(data);
@ -213,4 +215,8 @@ export class Room {
get loginSceneLogo(): string | undefined {
return this._loginSceneLogo;
}
get showPoweredBy(): boolean | undefined {
return this._showPoweredBy;
}
}

2
front/src/Phaser/Components/Loader.ts
View File

@ -54,7 +54,7 @@ export class Loader {
.catch((e) => console.warn("Could not load logo: ", logoResource, e));
let poweredByLogoPromise: CancelablePromise<Texture> | undefined;
if (gameManager.currentStartedRoom.loadingLogo) {
if (gameManager.currentStartedRoom.loadingLogo && gameManager.currentStartedRoom.showPoweredBy !== false) {
poweredByLogoPromise = this.superLoad.image(
"poweredByLogo",
"static/images/Powered_By_WorkAdventure_Small.png"

1
messages/JsonMessages/MapDetailsData.ts
View File

@ -20,6 +20,7 @@ export const isMapDetailsData = z.object({
loadingLogo: z.optional(z.nullable(z.string())),
// The URL of the logo image on "LoginScene"
loginSceneLogo: z.optional(z.nullable(z.string())),
showPoweredBy: z.boolean(),
});
export type MapDetailsData = z.infer<typeof isMapDetailsData>;

1
pusher/src/Services/LocalAdmin.ts
View File

@ -49,6 +49,7 @@ class LocalAdmin implements AdminInterface {
iframeAuthentication: null,
loadingLogo: null,
loginSceneLogo: null,
showPoweredBy: true,
});
}