From 56fa2e49f6e13ad9555e2ad1c2b0cbb10c6e4621 Mon Sep 17 00:00:00 2001 From: GRL Date: Mon, 9 Aug 2021 14:49:17 +0200 Subject: [PATCH] New menu svelte --- front/src/Components/App.svelte | 16 +- .../ConsoleGlobalMessageManager.svelte | 150 ---------------- .../Components/Menu/AboutRoomSubMenu.svelte | 123 +++++++++++++ .../AudioGlobalMessage.svelte} | 20 +-- .../src/Components/Menu/ContactSubMenu.svelte | 83 +++++++++ .../Components/Menu/CreateMapSubMenu.svelte | 51 ++++++ .../Components/Menu/GameQualityMenu.svelte | 121 ------------- .../Menu/GlobalMessagesSubMenu.svelte | 105 +++++++++++ front/src/Components/Menu/Menu.svelte | 167 ++++++++++-------- front/src/Components/Menu/MenuIcon.svelte | 42 ++--- ...ofileMenu.svelte => ProfileSubMenu.svelte} | 78 ++++---- .../Components/Menu/SettingsSubMenu.svelte | 127 +++++++++++++ .../TextGlobalMessage.svelte} | 29 +-- front/src/Components/images/discord_64x64.png | Bin 0 -> 666 bytes .../src/Components/images/facebook_64x64.png | Bin 0 -> 507 bytes .../src/Components/images/instagram_64x64.png | Bin 0 -> 754 bytes .../src/Components/images/linkedin_64x64.png | Bin 0 -> 506 bytes front/src/Components/images/twitter_64x64.png | Bin 0 -> 484 bytes front/src/Components/images/youtube_64x64.png | Bin 0 -> 463 bytes front/src/Connexion/LocalUserStore.ts | 9 + front/src/Phaser/Game/GameManager.ts | 4 +- front/src/Phaser/Menu/MenuScene.ts | 6 +- front/src/Stores/MenuStore.ts | 5 +- front/src/Stores/UserInputStore.ts | 8 +- front/src/WebRtc/MediaManager.ts | 7 +- ...css => TextGlobalMessageSvelte-Style.scss} | 8 +- front/style/index.scss | 2 +- front/style/style.scss | 1 - 28 files changed, 685 insertions(+), 477 deletions(-) delete mode 100644 front/src/Components/ConsoleGlobalMessageManager/ConsoleGlobalMessageManager.svelte create mode 100644 front/src/Components/Menu/AboutRoomSubMenu.svelte rename front/src/Components/{ConsoleGlobalMessageManager/UploadAudioGlobalMessage.svelte => Menu/AudioGlobalMessage.svelte} (85%) create mode 100644 front/src/Components/Menu/ContactSubMenu.svelte create mode 100644 front/src/Components/Menu/CreateMapSubMenu.svelte delete mode 100644 front/src/Components/Menu/GameQualityMenu.svelte create mode 100644 front/src/Components/Menu/GlobalMessagesSubMenu.svelte rename front/src/Components/Menu/{EditProfileMenu.svelte => ProfileSubMenu.svelte} (54%) create mode 100644 front/src/Components/Menu/SettingsSubMenu.svelte rename front/src/Components/{ConsoleGlobalMessageManager/InputTextGlobalMessage.svelte => Menu/TextGlobalMessage.svelte} (75%) create mode 100644 front/src/Components/images/discord_64x64.png create mode 100644 front/src/Components/images/facebook_64x64.png create mode 100644 front/src/Components/images/instagram_64x64.png create mode 100644 front/src/Components/images/linkedin_64x64.png create mode 100644 front/src/Components/images/twitter_64x64.png create mode 100644 front/src/Components/images/youtube_64x64.png rename front/style/{inputTextGlobalMessageSvelte-Style.scss => TextGlobalMessageSvelte-Style.scss} (76%) diff --git a/front/src/Components/App.svelte b/front/src/Components/App.svelte index 64a3d083..be7afc3c 100644 --- a/front/src/Components/App.svelte +++ b/front/src/Components/App.svelte @@ -1,6 +1,6 @@ - - - -
- -
-
-

Global Message

- -
-
- {#if inputSendTextActive} - - {/if} - {#if uploadMusicActive} - - {/if} -
- -
-
- - - - diff --git a/front/src/Components/Menu/AboutRoomSubMenu.svelte b/front/src/Components/Menu/AboutRoomSubMenu.svelte new file mode 100644 index 00000000..bd9ed80f --- /dev/null +++ b/front/src/Components/Menu/AboutRoomSubMenu.svelte @@ -0,0 +1,123 @@ + + +
+ +
+

This room use this map :

+

{mapName}

+

{mapDescription}

+
+ +
+ + + \ No newline at end of file diff --git a/front/src/Components/ConsoleGlobalMessageManager/UploadAudioGlobalMessage.svelte b/front/src/Components/Menu/AudioGlobalMessage.svelte similarity index 85% rename from front/src/Components/ConsoleGlobalMessageManager/UploadAudioGlobalMessage.svelte rename to front/src/Components/Menu/AudioGlobalMessage.svelte index 4718d246..1704e732 100644 --- a/front/src/Components/ConsoleGlobalMessageManager/UploadAudioGlobalMessage.svelte +++ b/front/src/Components/Menu/AudioGlobalMessage.svelte @@ -1,17 +1,14 @@ @@ -103,24 +94,17 @@ img { flex: 1 1 auto; - max-height: 80%; margin-bottom: 20px; } - p { - flex: 1 1 auto; - margin-bottom: 5px; - color: whitesmoke; font-size: 1rem; - &.err { color: #ce372b; } } - input { display: none; } diff --git a/front/src/Components/Menu/ContactSubMenu.svelte b/front/src/Components/Menu/ContactSubMenu.svelte new file mode 100644 index 00000000..bf16e42d --- /dev/null +++ b/front/src/Components/Menu/ContactSubMenu.svelte @@ -0,0 +1,83 @@ + + +
+
+

+ The WorkAdventure team is always available to help you. + If you have any questions, problems, new features or improvements ideas, or if you just want to give us your feedback, + do not hesitate to contact us. +

+
+
+

Our Office

+

+ The WorkAdventure team has its own offices in ... WorkAdventure! + Do not hesitate to come see and talk to us. +

+ Visit us +
+
+

Our Mail

+

Although we offer a solution to reduce their use, we have an email address that allows us to receive all your requests.

+ hello@workadventu.re +
+
+

Our web site

+

If you want to know more about us, follow the link to our web site.

+ About us +
+
+

Our social media

+ + {'Discord'} + + + {'Facebook'} + + + {'Instagram'} + + + {'LinkedIn'} + + + {'Twitter'} + + + {'Youtube'} + +
+
+ + + \ No newline at end of file diff --git a/front/src/Components/Menu/CreateMapSubMenu.svelte b/front/src/Components/Menu/CreateMapSubMenu.svelte new file mode 100644 index 00000000..65e2e346 --- /dev/null +++ b/front/src/Components/Menu/CreateMapSubMenu.svelte @@ -0,0 +1,51 @@ + + +
+
+

Create your map

+

+ WorkAdventure allows you to create an online space to communicate spontaneously with others. + And it all starts with creating your own space. Choose from a large selection of prefabricated maps by our team. + Or create your own map from scratch. +

+ +
+
+

Use the scripting API

+

Make your map more interactive, more alive and totally unique with the scripting API.

+

(Programming skills are required to use the scripting API).

+ +
+
+ + \ No newline at end of file diff --git a/front/src/Components/Menu/GameQualityMenu.svelte b/front/src/Components/Menu/GameQualityMenu.svelte deleted file mode 100644 index e57d1336..00000000 --- a/front/src/Components/Menu/GameQualityMenu.svelte +++ /dev/null @@ -1,121 +0,0 @@ - - -
-
-
Game quality
-

(Editing these settings will restart the game)

- -
-
-
Video quality
- -
-
- -
-
- -
-
- - \ No newline at end of file diff --git a/front/src/Components/Menu/GlobalMessagesSubMenu.svelte b/front/src/Components/Menu/GlobalMessagesSubMenu.svelte new file mode 100644 index 00000000..19bed4e0 --- /dev/null +++ b/front/src/Components/Menu/GlobalMessagesSubMenu.svelte @@ -0,0 +1,105 @@ + + +
+
+
+ +
+
+ +
+
+
+ {#if inputSendTextActive} + + {/if} + {#if uploadAudioActive} + + {/if} +
+ +
+ + + + + \ No newline at end of file diff --git a/front/src/Components/Menu/Menu.svelte b/front/src/Components/Menu/Menu.svelte index 20568621..3ac1f781 100644 --- a/front/src/Components/Menu/Menu.svelte +++ b/front/src/Components/Menu/Menu.svelte @@ -1,80 +1,103 @@ - - - - - \ No newline at end of file diff --git a/front/src/Components/Menu/MenuIcon.svelte b/front/src/Components/Menu/MenuIcon.svelte index 831a2700..738e20a5 100644 --- a/front/src/Components/Menu/MenuIcon.svelte +++ b/front/src/Components/Menu/MenuIcon.svelte @@ -1,39 +1,29 @@
-
- -
+ open menu
diff --git a/front/src/Components/Menu/EditProfileMenu.svelte b/front/src/Components/Menu/ProfileSubMenu.svelte similarity index 54% rename from front/src/Components/Menu/EditProfileMenu.svelte rename to front/src/Components/Menu/ProfileSubMenu.svelte index 94dd4308..1f28bb8b 100644 --- a/front/src/Components/Menu/EditProfileMenu.svelte +++ b/front/src/Components/Menu/ProfileSubMenu.svelte @@ -1,27 +1,20 @@ - -
-
-
Edit your profile
-
-
- -
-
- -
-
- -
-
- - \ No newline at end of file diff --git a/front/src/Components/Menu/SettingsSubMenu.svelte b/front/src/Components/Menu/SettingsSubMenu.svelte new file mode 100644 index 00000000..820dc24b --- /dev/null +++ b/front/src/Components/Menu/SettingsSubMenu.svelte @@ -0,0 +1,127 @@ + + +
+
+

Game quality

+ +
+
+

Video quality

+ +
+
+

(Saving these settings will restart the game)

+ +
+
+ + +
+
+ + \ No newline at end of file diff --git a/front/src/Components/ConsoleGlobalMessageManager/InputTextGlobalMessage.svelte b/front/src/Components/Menu/TextGlobalMessage.svelte similarity index 75% rename from front/src/Components/ConsoleGlobalMessageManager/InputTextGlobalMessage.svelte rename to front/src/Components/Menu/TextGlobalMessage.svelte index a9817a98..6661b51c 100644 --- a/front/src/Components/ConsoleGlobalMessageManager/InputTextGlobalMessage.svelte +++ b/front/src/Components/Menu/TextGlobalMessage.svelte @@ -1,7 +1,7 @@
-
+
diff --git a/front/src/Components/images/discord_64x64.png b/front/src/Components/images/discord_64x64.png new file mode 100644 index 0000000000000000000000000000000000000000..89c7de1bcd5090bb7a3517b8c070d698e75b3920 GIT binary patch literal 666 zcmV;L0%iS)P)Px%R7pfZRCt{2o6k!EK@`WoBkCeT;w>l;BKrsWC%Sa=-l?--P=7-~Lg!B2yLIW- zrK{&4MGy+QiGhd-+93zqhr6>sW_McWeNMYOJF{=!`_7vms{$UhJ41Q6^tvY_2molE z)ixI9QZ?ltBIH5q`ps2PF8%tZS}9~&0i*F;0KjCra9wX-9RXkkAiv?-5?Fg|GM%Mq zPZCfCi@ztKN`;g0F&t=(|uk=xs($CP^}aIumX_Bs*gyIY(by*g^p_0D}Wtf z+5pqA156uWnoTpoNZel5eajooE&!mmx8r-?@Z$>r@NjqRd*8)PFNAg8Sg!!l?hIYy z;`?W~d4MYN6jkJOw@2CEbzJAHfT#+fk&=B}MbI3eg64>zN?-*LVvhn|**$DuRzV{y zpQ{=zRImc#HV`)gLD8)!iS-I#2bea%G@)}qQhhNl(yp*GL+cg54lr$iX%crpquC9- zPS8;=EY>R^@MruQ$16~ahwCxE}=;~0l4-mIrR9FE?HB4t_L32pd zdQo8oB>jM>5lm~%VZ8#_0j3QwO>76GHD^!ixz;Nn^p_#8>`bGfd$%}f`>GuwUJDSk zeH)bMR)Vg`OIQJf#C{*3dt`_kc?m0k5L*FRgB3u?Kfk=XF4PYX44IM+^nI;Y06W06 z0j9}g^&c9?DFOg`{ef##$a+rb^#`tV$0-T`n9aTcumaZqpgKK&l80NZ0Ic5m@%{t= zD`4ZUuy0Pt8nn+-tXF{WD)7n)8N}7+Db_3C2i~LAOr>!eMgRZ+07*qoM6N<$f=G=a A9smFU literal 0 HcmV?d00001 diff --git a/front/src/Components/images/facebook_64x64.png b/front/src/Components/images/facebook_64x64.png new file mode 100644 index 0000000000000000000000000000000000000000..915801491a0e4ccc6107648da94b8b383605c4e9 GIT binary patch literal 507 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ea{HEjtmSN`)Ym%PG(?W+~n!v z7*a9k?QBE8!v+$q^MluiBz6Q?A99=_Xx_k?*LbAkh;BlYv_cx2L{+=dwpB(ZS>X$K z);7*qGI8pu_3QrUcfH+GRav_~+r86?ce%O#vx2~KKLrhjid}Z=WPJ8`-E^8_X<@Tl zn|Dd3IKze4>5l3NHm5`xM2@bx^8a52r-Kkf?8WU2b+Vi1atl}=e3h^Ki$%lucE7tN z!vc*o$Llr1nYThg`WRFgFGO7JC`@6`s?+_pKk5so0P_u|8zF0%SMbQ|Mb-X$@#o&l zKQDw8*fy|kSa_Z>H+!G%MRfvpXBI=jP;F^M6XLE5lEx1m?! zfY^a!x2+O_fB#$deqwb~Uk76jW6lwVZ474UisBaJ^}gHXKB2lv+6~p@7YAQQuT0MW z-=K1o|Jzr$`3zvAkG+zewPf=hu`|mjU;6xI;d#!_FPB{Lvx;IoaQ*r5O>g5bl`Z`I zT${n6tjK%XBlgdyXTP4t67ps3T;UrxOz*bDe*S;#wl~-8`7ASL8N4|)C*k@Y-!Gg$ Z*gijvUf5P(ejgZ{44$rjF6*2UngDvP+bjS8 literal 0 HcmV?d00001 diff --git a/front/src/Components/images/instagram_64x64.png b/front/src/Components/images/instagram_64x64.png new file mode 100644 index 0000000000000000000000000000000000000000..fe968f3385fed0b1549522c5a3457ab39b812ca2 GIT binary patch literal 754 zcmVPx%tVu*cRCt{2n?Gn2K@`Tn(IuxbNKR2OM=VlEOoHMWD+>!n5NxzCHYo!lrqMQ? zrC<>R3+>W~g(-prlvGxN9x7%JB&b0WC2-`5{PB{ISj551^KR!hv+MIR@7LVU&YPLX z+wZ;I*}GGy!O-xWKHR8fQx9FQf4B^{(zzPiOcVg*pI)!pxhr9R8V;ooF5f5`9S2)8 z0D$(kmWEcq;>^4PfXe)masEPh2Y@I5L6vhG08lDdu=TSRV-Gu{R~S6BEywC*qWh)I zgeq8VZHNMNwf{D|0Kk658=XwH830hY_5^?^00DmINPAlg0Qa1~clJdr2lC~QM!V43 z6WM=$@^)lw0we(34setDUVzpF8y_C!>_!RVy#gcv+zxOP zy9NYT&HH-X9Jg^|!2DjqRul5$51iKXUI7vSZU?wg;YhFXJHcbePeu;defn`^f6_I9 zLTeDkws)AC{%W+nSAYb7+W~G=IMNFM$n4n*0I2+2PP8VZP28N%G&ODhi)>{DfG7Y# zSO4Z)VXcInj=u7J#peJ-0af<`3iwkKJ{8|b|8ul>#>s)nw~J2W*QYxo`)SToL;?Ch k*8sR=aaDc&pK7o`Kb4YB)v=l}o!07*qoM6N<$f_Su7MgRZ+ literal 0 HcmV?d00001 diff --git a/front/src/Components/images/linkedin_64x64.png b/front/src/Components/images/linkedin_64x64.png new file mode 100644 index 0000000000000000000000000000000000000000..5fd3b1af8cd105b845a91c9c8994535b776e58c4 GIT binary patch literal 506 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ea{HEjtmSN`)Ym%PG(?W-011z z7*a9k?QC1W!ww=X=@WyObYF6{V{~oV!8pBR!SW@IR;H#VQ(ij8D492$VC7vadeP;j zhKAF|oGGz4?qIb;YSN%30RC zYPXfQG1s1PFH~O;^C~-L?c1-%wHYQcq=;t!k~Z(#dG2WY?1Zh>o_35`x8I&#YParM z;q^WJ4;|DM z^7q98mH7;Y4Z01z5(mT%Ec+U(Fir2h@=uly#vI0+CRwn268Y&Z|O&i%o0~gdhI@R`B-B4|JxIO5w;)B#{nag!PC{xWt~$(699R;XDqb?6%35wUG=xC8!j?wp~0u zVdiZ6y1gCNjJHpn*|_GY><&xj1)L7oE?sB1-#7K^jG}+6_6Pk$Ciyqq$lAZw$34>f zN_JgG>OBsIHR8`KezK%ktPy;Dg5_F`{=Z1wpDZgFa~N}Otz-V@vf1jb?DXT#6Ia?f z{r|Gw!;UeFA(}zjv_ZF_SL%S+0XNTu@4bxVD1zFZJ2JNvr?tGqSqbJn5gUbr$^X=cE z<|*0v_nf55qJJi3;BSN-uVb?CG>l?3-YHMu#>0+_KyAk1Y|~_*pfqmfQD| zWBmR-buNmIQ9q*BUV66l?VL^l7ngnCelKs9Z}yT@483(i|MSlZ5y6SUvHUBaKdm`d z`Q$VA$GbI5lLWu>`PQDzZh75Z!KAWen}2rdHIw|g4WE+)UGnax*)dK%Vme=DrYY~r zx%9I*B~3{ebcU%Y3on|Au#$M^H*=i4#nG3Yk1y=N%xmFIKaf4_za zq{R0l--7Eq+7K4}QNR8@Zm-ER;Rhf`95So6OYqf{?1F>6Tvv+KCP33Xl^(ph-yax5-R@RAGPqOWf*DyuZpSoLmXo;{wVc+a&j-NSy ZurFC)6<^-ra}gLr44$rjF6*2UngAe6#<&0g literal 0 HcmV?d00001 diff --git a/front/src/Connexion/LocalUserStore.ts b/front/src/Connexion/LocalUserStore.ts index 07c2487e..ac7d159a 100644 --- a/front/src/Connexion/LocalUserStore.ts +++ b/front/src/Connexion/LocalUserStore.ts @@ -16,6 +16,7 @@ const lastRoomUrl = "lastRoomUrl"; const authToken = "authToken"; const state = "state"; const nonce = "nonce"; +const notification = "notificationPermission"; class LocalUserStore { saveUser(localUser: LocalUser) { @@ -128,6 +129,14 @@ class LocalUserStore { return localStorage.getItem(authToken); } + setNotification(value: string): void { + localStorage.setItem(notification, value); + } + + getNotification(): string | null { + return localStorage.getItem(notification); + } + generateState(): string { const newState = uuidv4(); localStorage.setItem(state, newState); diff --git a/front/src/Phaser/Game/GameManager.ts b/front/src/Phaser/Game/GameManager.ts index 153877e1..c0a63193 100644 --- a/front/src/Phaser/Game/GameManager.ts +++ b/front/src/Phaser/Game/GameManager.ts @@ -9,7 +9,7 @@ import { localUserStore } from "../../Connexion/LocalUserStore"; import { get } from "svelte/store"; import { requestedCameraState, requestedMicrophoneState } from "../../Stores/MediaStore"; import { helpCameraSettingsVisibleStore } from "../../Stores/HelpCameraSettingsStore"; -import { menuIconVisible } from "../../Stores/MenuStore"; +import { menuIconVisiblilityStore } from "../../Stores/MenuStore"; /** * This class should be responsible for any scene starting/stopping @@ -100,7 +100,7 @@ export class GameManager { this.currentGameSceneName = scene.scene.key; const menuScene: MenuScene = scene.scene.get(MenuSceneName) as MenuScene; menuScene.revealMenuIcon(); - menuIconVisible.set(true); + menuIconVisiblilityStore.set(true); } /** diff --git a/front/src/Phaser/Menu/MenuScene.ts b/front/src/Phaser/Menu/MenuScene.ts index 640b5ff5..e0c31068 100644 --- a/front/src/Phaser/Menu/MenuScene.ts +++ b/front/src/Phaser/Menu/MenuScene.ts @@ -6,7 +6,7 @@ import { localUserStore } from "../../Connexion/LocalUserStore"; import { gameReportKey, gameReportRessource, ReportMenu } from "./ReportMenu"; import { connectionManager } from "../../Connexion/ConnectionManager"; import { GameConnexionTypes } from "../../Url/UrlManager"; -import { menuIconVisible, menuVisible } from "../../Stores/MenuStore"; +import { menuIconVisiblilityStore, menuVisiblilityStore } from "../../Stores/MenuStore"; import { videoConstraintStore } from "../../Stores/MediaStore"; import { showReportScreenStore } from "../../Stores/ShowReportScreenStore"; import { HtmlUtils } from "../../WebRtc/HtmlUtils"; @@ -163,7 +163,7 @@ export class MenuScene extends Phaser.Scene { } openSideMenu() { - menuVisible.set(true); + menuVisiblilityStore.set(true); if (this.sideMenuOpened) return; /*this.closeAll(); @@ -188,7 +188,7 @@ export class MenuScene extends Phaser.Scene { } private closeSideMenu(): void { - menuVisible.set(false); + menuVisiblilityStore.set(false); /* if (!this.sideMenuOpened) return; this.sideMenuOpened = false; this.closeAll(); diff --git a/front/src/Stores/MenuStore.ts b/front/src/Stores/MenuStore.ts index 3ed4c1b9..34de65b9 100644 --- a/front/src/Stores/MenuStore.ts +++ b/front/src/Stores/MenuStore.ts @@ -1,8 +1,9 @@ import { writable } from "svelte/store"; import Timeout = NodeJS.Timeout; -export const menuIconVisible = writable(false); -export const menuVisible = writable(false); +export const menuIconVisiblilityStore = writable(false); +export const menuVisiblilityStore = writable(false); +export const menuInputFocusStore = writable(false); let warningContainerTimeout: Timeout | null = null; function createWarningContainerStore() { diff --git a/front/src/Stores/UserInputStore.ts b/front/src/Stores/UserInputStore.ts index 993d8795..e24b3afe 100644 --- a/front/src/Stores/UserInputStore.ts +++ b/front/src/Stores/UserInputStore.ts @@ -1,11 +1,11 @@ import { derived } from "svelte/store"; -import { consoleGlobalMessageManagerFocusStore } from "./ConsoleGlobalMessageManagerStore"; +import { menuInputFocusStore } from "./MenuStore"; import { chatInputFocusStore } from "./ChatStore"; //derived from the focus on Menu, ConsoleGlobal, Chat and ... export const enableUserInputsStore = derived( - [consoleGlobalMessageManagerFocusStore, chatInputFocusStore], - ([$consoleGlobalMessageManagerFocusStore, $chatInputFocusStore]) => { - return !$consoleGlobalMessageManagerFocusStore && !$chatInputFocusStore; + [menuInputFocusStore, chatInputFocusStore], + ([$menuInputFocusStore, $chatInputFocusStore]) => { + return !$menuInputFocusStore && !$chatInputFocusStore; } ); diff --git a/front/src/WebRtc/MediaManager.ts b/front/src/WebRtc/MediaManager.ts index 2f8c637a..6cb699b6 100644 --- a/front/src/WebRtc/MediaManager.ts +++ b/front/src/WebRtc/MediaManager.ts @@ -11,6 +11,7 @@ import { cowebsiteCloseButtonId } from "./CoWebsiteManager"; import { gameOverlayVisibilityStore } from "../Stores/GameOverlayStoreVisibility"; import { layoutManagerActionStore, layoutManagerVisibilityStore } from "../Stores/LayoutManagerStore"; import { get } from "svelte/store"; +import { localUserStore } from "../Connexion/LocalUserStore"; export class MediaManager { startScreenSharingCallBacks: Set = new Set(); @@ -181,7 +182,11 @@ export class MediaManager { } public hasNotification(): boolean { - return Notification.permission === "granted"; + if (Notification.permission === "granted") { + return localUserStore.getNotification() === "granted"; + } else { + return false; + } } public requestNotification() { diff --git a/front/style/inputTextGlobalMessageSvelte-Style.scss b/front/style/TextGlobalMessageSvelte-Style.scss similarity index 76% rename from front/style/inputTextGlobalMessageSvelte-Style.scss rename to front/style/TextGlobalMessageSvelte-Style.scss index 46b54e2c..d09c94ad 100644 --- a/front/style/inputTextGlobalMessageSvelte-Style.scss +++ b/front/style/TextGlobalMessageSvelte-Style.scss @@ -1,15 +1,15 @@ -//InputTextGlobalMessage +//TextGlobalMessage section.section-input-send-text { + --height-toolbar: 15%; height: 100%; .ql-toolbar{ - max-height: 100px; - + height: var(--height-toolbar); background: whitesmoke; } div.input-send-text{ - height: calc(100% - 100px); + height: calc(100% - var(--height-toolbar)); overflow: auto; color: whitesmoke; diff --git a/front/style/index.scss b/front/style/index.scss index e69517fb..7fea8696 100644 --- a/front/style/index.scss +++ b/front/style/index.scss @@ -3,4 +3,4 @@ @import "style"; @import "mobile-style.scss"; @import "fonts.scss"; -@import "inputTextGlobalMessageSvelte-Style.scss"; +@import "TextGlobalMessageSvelte-Style"; diff --git a/front/style/style.scss b/front/style/style.scss index 24da5a96..765379aa 100644 --- a/front/style/style.scss +++ b/front/style/style.scss @@ -1,5 +1,4 @@ *{ - font-family: Lato; cursor: url('./images/cursor_normal.png'), auto; } * a, button, select{