Merge branch 'ReportMenuSvelte' of github.com:thecodingmachine/workadventure into menuInSvelte

This commit is contained in:
GRL 2021-08-11 15:04:47 +02:00
commit f4ce5f9a3b
6 changed files with 205 additions and 2 deletions

View File

@ -2,7 +2,6 @@ import type { MenuItemClickedEvent } from "../../Events/ui/MenuItemClickedEvent"
import { iframeListener } from "../../IframeListener"; import { iframeListener } from "../../IframeListener";
export function sendMenuClickedEvent(menuItem: string) { export function sendMenuClickedEvent(menuItem: string) {
console.log("Menu " + menuItem);
iframeListener.postMessage({ iframeListener.postMessage({
type: "menuItemClicked", type: "menuItemClicked",
data: { data: {

View File

@ -51,7 +51,6 @@ export class WorkAdventureUiCommands extends IframeApiContribution<WorkAdventure
type: "menuItemClicked", type: "menuItemClicked",
typeChecker: isMenuItemClickedEvent, typeChecker: isMenuItemClickedEvent,
callback: (event) => { callback: (event) => {
console.log("BOUM : " + event.menuItem);
const callback = menuCallbacks.get(event.menuItem); const callback = menuCallbacks.get(event.menuItem);
if (callback) { if (callback) {
callback(event.menuItem); callback(event.menuItem);

View File

@ -38,6 +38,8 @@
import LayoutManager from "./LayoutManager/LayoutManager.svelte"; import LayoutManager from "./LayoutManager/LayoutManager.svelte";
import {audioManagerVisibilityStore} from "../Stores/AudioManagerStore"; import {audioManagerVisibilityStore} from "../Stores/AudioManagerStore";
import AudioManager from "./AudioManager/AudioManager.svelte" import AudioManager from "./AudioManager/AudioManager.svelte"
import { showReportScreenStore } from "../Stores/ShowReportScreenStore";
import ReportMenu from "./ReportMenu/ReportMenu.svelte";
export let game: Game; export let game: Game;
@ -94,6 +96,11 @@
<LayoutManager></LayoutManager> <LayoutManager></LayoutManager>
</div> </div>
{/if} {/if}
{#if $showReportScreenStore}
<div>
<ReportMenu></ReportMenu>
</div>
{/if}
{#if $menuIconVisiblilityStore} {#if $menuIconVisiblilityStore}
<div> <div>
<MenuIcon></MenuIcon> <MenuIcon></MenuIcon>

View File

@ -0,0 +1,42 @@
<script lang="ts">
import {blackListManager} from "../../WebRtc/BlackListManager";
import {showReportScreenStore} from "../../Stores/ShowReportScreenStore";
import {onMount} from "svelte";
export let userUUID: string | undefined;
let userIsBlocked = false;
onMount(() => {
if (userUUID === undefined) {
userIsBlocked = false;
throw new Error("There is no user to block");
} else {
userIsBlocked = blackListManager.isBlackListed(userUUID);
}
})
function blockUser(): void {
if (userUUID === undefined) {
throw new Error("There is no user to block");
}
blackListManager.isBlackListed(userUUID)
? blackListManager.cancelBlackList(userUUID)
: blackListManager.blackList(userUUID);
showReportScreenStore.set(null); //close the report menu
}
</script>
<div class="block-container">
<h3>Block</h3>
<p>Block any communication from and to this user. This can be reverted.</p>
<button type="button" class="nes-btn is-error" on:click|preventDefault={blockUser}>
{userIsBlocked ? 'Unblock this user' : 'Block this user'}
</button>
</div>
<style lang="scss">
div.block-container {
text-align: center;
}
</style>

View File

@ -0,0 +1,112 @@
<script lang="ts">
import { showReportScreenStore } from "../../Stores/ShowReportScreenStore";
import BlockSubMenu from "./BlockSubMenu.svelte";
import ReportSubMenu from "./ReportSubMenu.svelte";
import {onDestroy, onMount} from "svelte";
import type {Unsubscriber} from "svelte/store";
import {playersStore} from "../../Stores/PlayersStore";
let blockActive = true;
let reportActive = !blockActive;
let userUUID: string | undefined;
let userName = "No name";
let unsubscriber: Unsubscriber
onMount(() => {
unsubscriber = showReportScreenStore.subscribe((reportSreenStore) => {
if (reportSreenStore != null) {
userName = reportSreenStore.userName;
userUUID = playersStore.getPlayerById(reportSreenStore.userId)?.userUuid;
if (userUUID === undefined) {
throw new Error("Could not find UUID for user with ID " + reportSreenStore.userId);
}
}
})
})
onDestroy(() => {
if (unsubscriber) {
unsubscriber();
}
})
function close() {
showReportScreenStore.set(null);
}
function activateBlock() {
blockActive = true;
reportActive = false;
}
function activateReport() {
blockActive = false;
reportActive = true;
}
</script>
<div class="report-menu-main nes-container is-rounded">
<section class="report-menu-title">
<h2>Moderate {userName}</h2>
<section class="justify-center">
<button type="button" class="nes-btn" on:click|preventDefault={close}>X</button>
</section>
</section>
<section class="report-menu-action">
<section class="justify-center">
<button type="button" class="nes-btn {blockActive ? 'is-disabled' : ''}" on:click|preventDefault={activateBlock}>Block</button>
</section>
<section class="justify-center">
<button type="button" class="nes-btn {reportActive ? 'is-disabled' : ''}" on:click|preventDefault={activateReport}>Report</button>
</section>
</section>
<section class="report-menu-content">
{#if blockActive}
<BlockSubMenu userUUID="{userUUID}"/>
{:else if reportActive}
<ReportSubMenu/>
{:else }
<p>ERROR : There is no action selected.</p>
{/if}
</section>
</div>
<style lang="scss">
.nes-container {
padding: 5px;
}
section.justify-center {
display: flex;
justify-content: center;
align-items: center;
}
div.report-menu-main {
font-family: "Press Start 2P";
pointer-events: auto;
background-color: #333333;
color: whitesmoke;
position: relative;
height: 70vh;
width: 50vw;
top: 10vh;
margin: auto;
display: grid;
grid-template-rows: 10% 15% 75%;
section.report-menu-title {
display: grid;
grid-template-columns: 90% 10%;
text-align: center;
}
section.report-menu-action {
display: grid;
grid-template-columns: 50% 50%;
}
}
</style>

View File

@ -0,0 +1,44 @@
<script lang="ts">
import {showReportScreenStore} from "../../Stores/ShowReportScreenStore";
//export let userUUID: string;
let reportMessage: string;
let hiddenError = true;
function submitReport() {
if (reportMessage === '') {
hiddenError = true;
} else {
hiddenError = false;
//gameManager.getCurrentGameScene().connection?.emitReportPlayerMessage(userUUID, reportMessage); //TODO: Use when merge with MenuSvelte
showReportScreenStore.set(null) //close the report menu
}
}
</script>
<div class="report-container-main">
<h3>Report</h3>
<p>Send a report message to the administrators of this room. They may later ban this user.</p>
<form>
<section>
<label>
<span>Your message: </span>
<textarea type="text" class="nes-textarea" bind:value={reportMessage}></textarea>
</label>
<p hidden="{hiddenError}">Report message cannot to be empty.</p>
</section>
<section>
<button type="submit" class="nes-btn is-error" on:click={submitReport}>Report this user</button>
</section>
</form>
</div>
<style lang="scss">
div.report-container-main {
text-align: center;
textarea {
height: 200px;
}
}
</style>