nicolas-arnaud
/
Transcendence
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://github.com/walidmoovin/transcendance

master
vvandenb 2 years ago
parent
e19fbbd66a b4c8a49dab
commit
c592a5c8fc
4 changed files with 201 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      back/volume/src/users/entity/user.entity.ts
  2. 13
      front/volume/src/App.svelte
  3. 45
      front/volume/src/components/Channels.svelte
  4. 167
      front/volume/src/components/Chat.svelte

2
back/volume/src/users/entity/user.entity.ts
View File

@ -34,7 +34,7 @@ export class User {
@Column({ default: false, nullable: true })
isVerified: boolean
@Column({ unique: true })
@Column('uuid',{ unique: true })
socketKey: string
@Column({ unique: true })

13
front/volume/src/App.svelte
View File

@ -86,17 +86,7 @@
function clickChannels() {
setAppState(APPSTATE.CHANNELS);
}
let channels: Array<ChannelsType> = [
{ id: "1", name: "General", messages: [], privacy: "public", password: "" },
{
id: "2",
name: "Lobby",
messages: [],
privacy: "private",
password: "test",
},
{ id: "3", name: "Game", messages: [], privacy: "private", password: "" },
];
let channels: Array<ChannelsType> = [];
let selectedChannel: ChannelsType;
const handleSelectChannel = (channel: ChannelsType) => {
selectedChannel = channel;
@ -151,7 +141,6 @@
on:keydown={() => setAppState(APPSTATE.CHANNELS)}
>
<Chat
chatMessages={selectedChannel.messages}
on:view-profile={openIdProfile}
on:add-friend={addFriend}
on:invite-to-game={pong.inviteToGame}

45
front/volume/src/components/Channels.svelte
View File

@ -5,16 +5,29 @@
name: string;
privacy: string;
password: string;
messages: Array<chatMessagesType>;
owner: string;
}
import { onMount } from "svelte";
import { API_URL, store } from "../Auth";
import { dataset_dev } from "svelte/internal";
</script>
<script lang="ts">
//--------------------------------------------------------------------------------/
export let channels: Array<ChannelsType> = [];
// onMount(async () => {
// const res = await fetch(API_URL + "/channels" + $store.ftId, {
// method: "GET",
// mode: "cors",
// });
// const data = await res.json();
// channels = data;
// });
//--------------------------------------------------------------------------------/
export let onSelectChannel: (channel: ChannelsType) => void;
const selectChat = (id: string) => {
const channel = channels.find((c) => c.id === id);
@ -25,7 +38,7 @@
//--------------------------------------------------------------------------------/
const createChannel = () => {
const createChannel = async () => {
const name = prompt("Enter a name for the new channel:");
if (name) {
const privacy = prompt(
@ -45,21 +58,41 @@
const newChannel: ChannelsType = {
id: Math.random().toString(),
name,
privacy,
owner: $store.username,
password,
messages: [],
privacy,
};
// const response = await fetch(API_URL + "/channels" + $store.ftId , {
// method: "POST",
// mode: "cors",
// body: JSON.stringify(newChannel),
// });
// const data = await response.json();
// if (data.ok) {
// channels = [newChannel, ...channels];
// } else {
// alert("Error creating channel");
// }
channels = [newChannel, ...channels];
}
}
// TODO: save to database
};
//--------------------------------------------------------------------------------/
const removeChannel = (id: string) => {
const removeChannel = async (id: string) => {
let string = prompt("type 'delete' to delete this channel");
if (string === "delete") {
// const response = await fetch(API_URL + "/channels" + $store.ftId + "/" + id, {
// method: "DELETE",
// mode: "cors",
// });
// const data = await response.json();
// if (data.ok) {
// channels = channels.filter((c) => c.id !== id);
// } else {
// alert("Error deleting channel");
// }
channels = channels.filter((c) => c.id !== id);
}
// TODO: save to database

167
front/volume/src/components/Chat.svelte
View File

@ -45,6 +45,8 @@
function openProfile(username: string) {
showProfileMenu = true;
selectedUser = username;
showChatMembers = false;
showChannelSettings = false;
}
function closeProfileMenu() {
showProfileMenu = false;
@ -57,6 +59,7 @@
let showChatMembers = false;
function toggleChatMembers() {
showChatMembers = !showChatMembers;
showChannelSettings = false;
}
let chatMembers: Array<User> = [
{ username: "user1" },
@ -79,6 +82,123 @@
// }
//--------------------------------------------------------------------------------/
let showChannelSettings = false;
function toggleChannelSettings() {
showChannelSettings = !showChannelSettings;
showChatMembers = false;
}
//--------------------------------------------------------------------------------/
const blockUser = async (username : string) => {
};
//--------------------------------------------------------------------------------/
const banUser = async (username : string) => {
// const prompt = window.prompt("Enter ban duration in seconds");
// const res1 = await fetch(API_URL + "/user/" + username, {
// mode: "cors",
// });
// const data1 = await res1.json();
// const res2 = await fetch(API_URL + "/chat/channels/" + data1.ftId + "/ban", {
// method: "POST",
// mode: "cors",
// });
// const data2 = await res2.json();
// if (res2.ok) {
// alert("User banned");
// } else {
// alert("Failed to ban user");
// }
};
//--------------------------------------------------------------------------------/
const kickUser = async (username : string) => {
// set-up channel joining and kicking
// const res1 = await fetch(API_URL + "/user/" + username, {
// mode: "cors",
// });
// const data1 = await res1.json();
// const res2 = await fetch(API_URL + "/chat/channels/" + data1.ftId + "/kick", {
// method: "POST",
// mode: "cors",
// });
// const data2 = await res2.json();
// if (res2.ok) {
// alert("User kicked");
// } else {
// alert("Failed to kick user");
// }
};
//--------------------------------------------------------------------------------/
const muteUser = async (username : string) => {
// use minutes prompt to determine mute duration
// const prompt = window.prompt("Enter mute duration in seconds");
// const res1 = await fetch(API_URL + "/user/" + username, {
// mode: "cors",
// });
// const data1 = await res1.json();
// const res2 = await fetch(API_URL + "/chat/channels/" + data1.ftId + "/mute", {
// method: "POST",
// mode: "cors",
// });
// const data2 = await res2.json();
// if (res2.ok) {
// alert("User muted");
// } else {
// alert("Failed to mute user");
// }
};
//--------------------------------------------------------------------------------/
const adminUser = async (username : string) => {
// const res1 = await fetch(API_URL + "/user/" + username, {
// mode: "cors",
// });
// const data1 = await res1.json();
// const res2 = await fetch(API_URL + "/chat/channels/" + data1.ftId + "/admin", {
// method: "POST",
// mode: "cors",
// });
// const data2 = await res2.json();
// if (res2.ok) {
// alert("User admined");
// } else {
// alert("Failed to admin user");
// }
};
//--------------------------------------------------------------------------------/
const removeAdminUser = async (username : string) => {
// const res1 = await fetch(API_URL + "/user/" + username, {
// mode: "cors",
// });
// const data1 = await res1.json();
// const res2 = await fetch(API_URL + "/chat/channels/" + data1.ftId + "/admin", {
// method: "DELETE",
// mode: "cors",
// });
// const data2 = await res2.json();
// if (res2.ok) {
// alert("User admin removed");
// } else {
// alert("Failed to remove admin user");
// }
};
//--------------------------------------------------------------------------------/
</script>
<div class="overlay">
@ -125,7 +245,8 @@
>
</li>
<li>
<button on:click={() => dispatch("block-user", selectedUser)}
<!-- block only if not blocked -->
<button on:click={() => blockUser(selectedUser)}
>Block User</button
>
</li>
@ -155,17 +276,35 @@
<li>
<p>
{member.username}
<button>ban</button>
<button>kick</button>
<button>mute</button>
<button>admin</button>
</p>
<button on:click={() => banUser(member.username)}>ban</button>
<button on:click={() => kickUser(member.username)}>kick</button>
<button on:click={() => muteUser(member.username)}>mute</button>
<button on:click={() => adminUser(member.username)}>promote</button>
<button on:click={() => removeAdminUser(member.username)}>demote</button>
<p> ----------------------------------------------------------------------------------- </p>
</li>
{/each}
</ul>
</div>
</div>
{/if}
<button
on:click|stopPropagation={toggleChannelSettings}
on:keydown|stopPropagation>Channel Settings</button
>
{#if showChannelSettings}
<div
class="channelSettings"
on:click|stopPropagation
on:keydown|stopPropagation
>
<div>
<button>Change Password</button>
<button>Set Password</button>
<button>Remove Password</button>
</div>
</div>
{/if}
</div>
</div>
@ -212,6 +351,20 @@
}
.chatMembers button {
width: 3.5rem;
width: 6rem;
}
.channelSettings {
position: absolute;
background-color: #fff;
border: 1px solid #ccc;
border-radius: 5px;
padding: 1rem;
max-height: 100px;
overflow-y: scroll;
}
.channelSettings button {
width: 5rem;
}
</style>

Write Preview
Loading…
Cancel
Save