From 7a5014e2edb5ce0491ebcbd6ecb427f4e28d9cd3 Mon Sep 17 00:00:00 2001 From: madegryc pc Date: Sat, 10 Aug 2024 17:19:05 +0200 Subject: [PATCH] Site : - Add style home page --- site/interface/package-lock.json | 18 ++++++++ site/interface/package.json | 5 +++ site/interface/site/index.html | 7 ++- site/interface/site/login/createConnectDiv.js | 9 ++-- site/interface/site/login/createThreeDiv.js | 5 ++- site/interface/site/style/home.css | 42 ++++++++++++++---- site/interface/site/style/liveChat.css | 5 +-- site/interface/site/style/loginPage.css | 18 ++++++-- .../Class/__pycache__/User.cpython-310.pyc | Bin 0 -> 3508 bytes .../__pycache__/createAccount.cpython-310.pyc | Bin 0 -> 2165 bytes .../getPrivateListMessage.cpython-310.pyc | Bin 0 -> 1067 bytes .../getPrivateListUser.cpython-310.pyc | Bin 0 -> 1111 bytes .../__pycache__/login.cpython-310.pyc | Bin 0 -> 2423 bytes .../sendPrivateMessage.cpython-310.pyc | Bin 0 -> 726 bytes .../__pycache__/login42.cpython-310.pyc | Bin 0 -> 1077 bytes 15 files changed, 89 insertions(+), 20 deletions(-) create mode 100644 site/interface/package-lock.json create mode 100644 site/interface/package.json create mode 100644 websocket-server/Class/__pycache__/User.cpython-310.pyc create mode 100644 websocket-server/typeRequets/__pycache__/createAccount.cpython-310.pyc create mode 100644 websocket-server/typeRequets/__pycache__/getPrivateListMessage.cpython-310.pyc create mode 100644 websocket-server/typeRequets/__pycache__/getPrivateListUser.cpython-310.pyc create mode 100644 websocket-server/typeRequets/__pycache__/login.cpython-310.pyc create mode 100644 websocket-server/typeRequets/__pycache__/sendPrivateMessage.cpython-310.pyc create mode 100644 websocket-server/typeRequets/login42/__pycache__/login42.cpython-310.pyc diff --git a/site/interface/package-lock.json b/site/interface/package-lock.json new file mode 100644 index 0000000..0e071f2 --- /dev/null +++ b/site/interface/package-lock.json @@ -0,0 +1,18 @@ +{ + "name": "interface", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "dependencies": { + "three": "^0.167.1" + } + }, + "node_modules/three": { + "version": "0.167.1", + "resolved": "https://registry.npmjs.org/three/-/three-0.167.1.tgz", + "integrity": "sha512-gYTLJA/UQip6J/tJvl91YYqlZF47+D/kxiWrbTon35ZHlXEN0VOo+Qke2walF1/x92v55H6enomymg4Dak52kw==", + "license": "MIT" + } + } +} diff --git a/site/interface/package.json b/site/interface/package.json new file mode 100644 index 0000000..c914782 --- /dev/null +++ b/site/interface/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "three": "^0.167.1" + } +} diff --git a/site/interface/site/index.html b/site/interface/site/index.html index 648c058..6253879 100644 --- a/site/interface/site/index.html +++ b/site/interface/site/index.html @@ -19,8 +19,13 @@

PTME

+
+

HOME

+

PROJECT

+

NEWS

+
-

Login

+

LOGIN

diff --git a/site/interface/site/login/createConnectDiv.js b/site/interface/site/login/createConnectDiv.js index a1ae41f..bcdf462 100644 --- a/site/interface/site/login/createConnectDiv.js +++ b/site/interface/site/login/createConnectDiv.js @@ -6,7 +6,7 @@ /* By: marvin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/07 18:14:53 by edbernar #+# #+# */ -/* Updated: 2024/08/10 01:10:03 by marvin ### ########.fr */ +/* Updated: 2024/08/10 17:00:39 by marvin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -42,9 +42,10 @@ function createConnectDiv(divLogin) const createAccText = document.createElement("p"); const newAccDiv = document.createElement("div"); const divCenter = document.createElement("div"); + const orText = document.createElement("p"); addGlobalBg(); - MainText.innerText = "Acces to a new WORLD"; + MainText.innerText = "Access to a new WORLD"; MainText.setAttribute("id", "mainText"); mailText.innerText = "Email"; passText.innerText = "Password"; @@ -53,7 +54,6 @@ function createConnectDiv(divLogin) createAccText.innerText = "Create an account"; createAccText.setAttribute("id", "createAccText") createAccText.addEventListener("mousedown", () => { - console.log("YO LES BG"); createButtonNewAcc(divConnect, divLogin); }); newAccDiv.setAttribute("id", "newAccDiv"); @@ -68,6 +68,8 @@ function createConnectDiv(divLogin) inputPass.setAttribute("placeholder", "password"); buttonLogin.innerHTML = "Login"; buttonLogin.setAttribute("id", "styleButton"); + orText.innerText = "▬▬▬▬▬▬▬▬▬▬ ㅤ Or ㅤ ▬▬▬▬▬▬▬▬▬▬"; + orText.setAttribute("id", "orText"); buttonConnect42.innerHTML = "Log with 42"; buttonConnect42.setAttribute("id", "styleButton42") divConnect.appendChild(MainText); @@ -79,6 +81,7 @@ function createConnectDiv(divLogin) newAccDiv.appendChild(newPlayerText); newAccDiv.appendChild(createAccText); form.appendChild(newAccDiv); + form.appendChild(orText); form.appendChild(buttonConnect42); divCenter.appendChild(form); divCenter.setAttribute("id", "divCenter"); diff --git a/site/interface/site/login/createThreeDiv.js b/site/interface/site/login/createThreeDiv.js index 00c2d3f..2efc8eb 100644 --- a/site/interface/site/login/createThreeDiv.js +++ b/site/interface/site/login/createThreeDiv.js @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* createThreeDiv.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: edbernar +#+ +:+ +#+ */ +/* By: marvin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/07 18:09:36 by edbernar #+# #+# */ -/* Updated: 2024/08/07 18:11:19 by edbernar ### ########.fr */ +/* Updated: 2024/08/10 17:13:41 by marvin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,6 +15,7 @@ function createThreeDiv() const divThree = document.createElement("div"); divThree.setAttribute("id", "threeDiv"); + return (divThree); } diff --git a/site/interface/site/style/home.css b/site/interface/site/style/home.css index 3ed97bf..574acc3 100644 --- a/site/interface/site/style/home.css +++ b/site/interface/site/style/home.css @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* home.css :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: edbernar +#+ +:+ +#+ */ +/* By: marvin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/07 12:00:55 by edbernar #+# #+# */ -/* Updated: 2024/08/07 17:31:35 by edbernar ### ########.fr */ +/* Updated: 2024/08/10 16:56:50 by marvin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,40 +20,66 @@ body { padding: 0; width: 100%; height: 100%; - background-color: #616161; + background-color: #020202; user-select: none; } + #topBar { margin: 10px; + margin-top: 25px; padding: 0; display: flex; flex-direction: row; justify-content: space-between; - background-color: black; + background-color: #020202; +} + +#topButton{ + margin: 0; + padding: 0; + color: white; + display: flex; + font-size: 25px; + padding-right: 45%; + padding-top: 12px; + font-family: "Poppins", sans-serif; + font-weight: 500; + font-style: normal; + gap: 25%; } #topBar h1 { margin: 0; padding: 0; - font-size: 40px; + padding-top: 4px; + font-size: 35px; + margin-left: 50px; + margin-right: 15px; color: white; font-family: 'Poppins'; + font-style: italic; + font-weight: bold; } #topBar #loginButton { font-size: 20px; background-color: white; height: 40px; - width: 100px; + width: 130px; color: black; - font-family: 'Poppins'; + font-family: "Poppins", sans-serif; + font-weight: 500; + font-style: normal; text-align: center; line-height: 40px; margin: 10px 10px; + margin-right: 50px; + transition: background-color 0.3s ease; } #topBar #loginButton:hover { - background-color: #f0f0f0; + background-color: #020202; + color: white; cursor: pointer; } diff --git a/site/interface/site/style/liveChat.css b/site/interface/site/style/liveChat.css index 6ada490..71b0fce 100644 --- a/site/interface/site/style/liveChat.css +++ b/site/interface/site/style/liveChat.css @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* liveChat.css :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: edbernar +#+ +:+ +#+ */ +/* By: marvin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/07/30 13:53:39 by edbernar #+# #+# */ -/* Updated: 2024/08/07 18:20:44 by edbernar ### ########.fr */ +/* Updated: 2024/08/10 16:47:10 by marvin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -179,7 +179,6 @@ color: white; display: flex; flex-direction: row; - border: 1px solid #000000; } #inputMessageDiv p { diff --git a/site/interface/site/style/loginPage.css b/site/interface/site/style/loginPage.css index 6f1df40..954e629 100644 --- a/site/interface/site/style/loginPage.css +++ b/site/interface/site/style/loginPage.css @@ -6,7 +6,7 @@ /* By: marvin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/07 17:15:28 by edbernar #+# #+# */ -/* Updated: 2024/08/10 01:18:47 by marvin ### ########.fr */ +/* Updated: 2024/08/10 14:12:44 by marvin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -103,8 +103,20 @@ #createAccText{ margin-left: 10px; cursor: pointer; - /* text-decoration: underline 2px; */ border-bottom: white 1px solid; + transition: color 0.3s ease; + +} + +#createAccText:hover{ + color: rgb(165, 165, 165); +} + +#orText{ + align-content: center; + text-align: center; + margin-top: 15px; + margin-bottom: 15px; } #newAccDiv{ @@ -124,7 +136,7 @@ top: 50%; left: 50%; transform: translate(-50%, -50%); - animation: anim1 0.2s; + animation: anim1 0.4s; font-family: "Poppins", sans-serif; font-weight: 500; font-style: normal; diff --git a/websocket-server/Class/__pycache__/User.cpython-310.pyc b/websocket-server/Class/__pycache__/User.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..1471fe9826467f57d956afa5c491c536e4d3037b GIT binary patch literal 3508 zcmbVOO^@728LleZ-R|$nWRlIt0tUoK3r%`X}eps>4%wDf@uJ4y%1>T!8yJ=1N^ zmOTm6>Z}$fM{Y=a;xKc}jT3)>f8hfXutLfo;1CJI^H$kC?p_WEx4Ozz^;XsE=Y8s_ zH|cbm4A1Ddf7ftD7FJI#cM8yw!Cs*#_pMDF) zf*mqd&$#4goU;XAFkfWWxxHW)XiJ6##b~~L`|;hkXNzt9c%$&CcY-avdr2IJK^98S zj4WMSUGTb{k_<173+&NZJoaK$D;a-{qM`4y<3CekXFpa`EOY_>~_&AJZ zU*vWgPWM$EuDxKYh3eH$2cIOfa4?(5@IajggS&4J_A@_IlQ<19XA%eDV7d4<{CX0q z!M*7uO$P+To#WHo_5CQ0GT*;N-|eEPahKP4m(M%erW_AA#>$7@mtYYWG+5V4uuu#1 zh%><%-YvX?2L?0^oNa)6X9*l_<;f^ret&`6b^+Y0p0@DHXZWi3K$Z=vhkaW)a75Km zRY*;ogRmI9SCJ0Ms5e7&`VX*Y57Q*h9eFZ4PA}o?I~u^eJ`2-yauBLFu&dfa zk=JR$#}l;mPMo!gmnURwark8GfgHk%^UCiItY)mD2Xc(w9FB>PIf$8iVLbRi`VnUGGZ&iA{s7F#m8tMST_M5!gXY&ZF-Xwv>ONo zv_V=Iq5`~4AWG*WeHwHyh5CMG$=X-WLw%%(7xT`8_{n4%NiR!|!Z_-Go3ZyFt^s`s zGE^_xKYd812I~UozMVUI0rd?mT0u(~w1~QEQ01-4Vn4!oO2>d8+v1y=*h_M6Xs9aY zD>_1&LWtd?HU0*k%>O|ssr%3oLh3$gsHUCK&r(aFFGfo-?%>@fU7c^DRm&V4hx$!+ z#tYqbi#9BFS!^4%dBo-|ST``%gsmQ{s?j5g1!%3k`2yaw;LR79(Js8{V5Ics|Mj4O z^}1CLF1?dDrcZeKJK3aK{T`M*+Szzj@$E10Z3Djj6&6?iSEOLOdAToISJB!sI4ms5 zjx6;hdao_?eTBE{3+u3USU+^-8^#KKH*{aaU}q#?y);6lOy&PBP?0CzGj1 z_l38gsM#b_H!indUS8&+DiyM5>8d!i>YFsHkVv`%X_KM8lFHuW)9e%MLZAJ9G%b+P zW|Z#iqs#Z_y$_?fI<%%9r3bi0FR#j#sPvncilLA!Go|(73cYE$?)a371>xQ#IP(46 z&G!6#ML9`h-#?fpdy^@|8l6)(5+}%C=(@}61q1RHMfDek4*IfPlOlZ)e1IuB4G~ak zN?+(FAVnlb0>A58zss@eh_TqvH*r^#bGv$-Cgg03xBpqI*KA~hI{CVDiNjZN!KL;S z1knB#smD3LU=@{zrj!aqr{x77^@YhjoM4(DU!x>p{Tu04%IF&j8SN)udW^YZ5kx7Mt=O}Eo*wzst%a{uNs8Bg>2Bt4CTC@~i}CEnWVzipGd VKQ!O-W0DUIh1+%!Zd+`M{{R&1>Y)Gt literal 0 HcmV?d00001 diff --git a/websocket-server/typeRequets/__pycache__/createAccount.cpython-310.pyc b/websocket-server/typeRequets/__pycache__/createAccount.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..1d5cb8597cd345cd349e481fc3fae0fb63d4194b GIT binary patch literal 2165 zcmaJ@&2tn*6z}et{R+GJzz_)p93?@PnB4#YLWz;^B`8EB!N_Wilj%+}?(EE_r#H#2 ziGuMiC(DC}YmabW0y7)~LJ`FtD&YdgiYFc^5dAd@1~m#MHEHYzREW_yO~5x!$u!C) z8=#4@SSBkW<9FOpOx1?IJoWy2xznH9Bel6~#7>SBcG)jx=jXDy;Xy|^-yH@pD%3w< zhU>8N7(c3;jtzHQ!|qA>;~E<6oRai+i;9q2%}l} zPAlDn)=g@p!6!5_MLYH)g%M%5Fg;L2{JzGeY36@$okf!`YFroX-izDk`J1Nao>w5v zI-&=Qg#V~5dgYQwlIIHvHkSOUTlQf z#!=z4;y?_#t`Fsk)v z-&uNkgVc=|$cNAso8(()@#!YFhSyMbcuJZj+x2$vmBup|66b2^+y1KUxzth{Ztes^ zQM>zgiS1ykW<7x3R|~6D35Dec!g2y%*sgDdW!qt)n+KhSYVz7}J9dFtwy->AgWfsI zS+=?D2*yLp3;ZQ_RH^m8Qmqt#*4fd0YG**rJqP4wE!XaDH>|+-s^C>1TGwR6SdpA&i8MvE%w$5H zodKfv2Im29?psYgcLZEyyJbu#Lz;`OPh~1(KGkSxc+8gxH?%#dk2Dv8z>|bC87tYs zS(b^itt#kqb(PA@67v~{sAg2eGR`4&K}jam*Y$;r+mKtZZz}sTbz|LOW#I;X){rTc zr)wURnfEADnEi%0gobwR<(GpJ%a?4*mUz|4kDbjgig^JxLkG;*zQgisY#|JsA`>HE zWtH)~I{AIJQeh&@M+s@BCs(e@Oq-++oP=KiA&*SljR)~T9EYiBcMIJw>D9Y^nx%x`;OMN@@ecBN(5O6ZV2b+2Yc&`*qPP`9XPwhoZ8&wqC7G zUcGkx#?23I-Tv^SJ9no(zW2%f>6r(g&VKf=FnZ?fxv}#XE{p0(T-KB^ zNb(Zn1F+)96gi~ihBQ5RWqAe`61%!e5gAmNqd>014ApCDViR|g<3P1Mn~*&%rOA20 xk{k6-G|4N1KEd*$haF z;isr{Y7B8uUC(tyxa%q2XoXTW+FVL6;2Q1EE|+hWR~J{7-SWCyDOai`OVg%^+dA*Z zk>Zikl)=5sac#mewNxjsW|m2x646xkJ6z--3EyOLyev>0*c-6r8UVus;9-CjFmZtI zq35#$lHdd>JS2=ND?taCa*+nOWu~xcr(}zU+%QpQQYYYsd~G6 zuloCo%axVt>e~8^o5BPf&jAQ*Gy^57bHa;&2O9)4H5(a1%~p#?h6#V$6WW$agi)Yz z_z8(KaPh}8cROx#x9u?=h`#SuD{fOY6x^0RkC+$v+}-0_GWK`4x+b~U<-#>YJmK9Q zSJDl*dYm=nA@t)>){g6)zMcg9o@$k2j`vqr${JYu;WA}%pIu~@!_B0Is%SwPuI(F3F5 z8tN7jG|VMrgdf1v-bWY^*e}%6&WZvA8=LgTCZCky@b!m}NSKr~30cY3(`NFHDg|QW zPG3wL=b`~qi>4B|gQgUEz}QC1lQMl>pEk}DJn8(={HD#w;H-Jz{6A^E4Zq|p0D0q( zBA&xjz@U-h3K&Z?OXC9QX&R|@;$_otkv{L#+A-_3_#HDmvIgK3i3J}fnEoX8f6DLn JFK4Of{03us`@aAH literal 0 HcmV?d00001 diff --git a/websocket-server/typeRequets/__pycache__/getPrivateListUser.cpython-310.pyc b/websocket-server/typeRequets/__pycache__/getPrivateListUser.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..e228c12cf00c85aee339695a5624fef446e381ad GIT binary patch literal 1111 zcmb7C&2G~`5VjpRNlOc*&;k{A6d`AwG;I@vP%CJm6^i&#F1b|Oops{Y_L|*ILn01< zc!^3qz>yc=1$YK7dqbR1-vBr;b_qg4LSn6%{boEn-^^&l+}w?6$jhZaZBE94LSbQ&2o{p#)`^hM63nL;ozy<@h}MFTi|`FCt!m zOF6!bcoCK|+$(kqa1E}&)i-w61^cO0S^kQ=R@4v`}Gy#uM#FiqS90klqq0i$mO^*$&7rV>T?M7_#gc= zh`(~y55+Qg-WBjzB%X@sh)eImy`1Ot*v)wq9Yi`j;^Vs$p0HL`2{1UD8kKq|%c)C-zOz{zw5g(1o=%b~mC*$$6xBZ^_Geee00Eh&hQV@SYqo(x{U_ z?`cUB#qc>z7$-x%uW&+Kdzj*gOOi1?;m-zKE7Ifo(OESQv6v1k9rFOSh@>A(*rM-H00Z7;9lpRhjit7qwD)>oF=4Idoc==erk@8AY=qt|LJT2MBfjh;{)D&ktDR5TlQ z!!>NfD3_~F$#hJ^suqjoN=2_!YZa?nD%mCUreT*1w5~Zdy#y7@uIh&C6ulp3rkRlM z2OTlB9C)kUW@F8UXszrR`kJ$Wzs07#wBolq5S7h}P=SiKC)>=C(Ai;8a6kchhArAf z@tDVKjy;^+k~Ssar`RSZ*^mn6_OnOQ zKtp@f#!eY>I z3mpsGX4rKKrcr3bkK)ksBL@$)e8(-UyLJ>fEjPZ5C#<<)fn532U0HSGsF1imv)mQg zWOSo@pVI9ro*kV;A#H2YI6ue7k~+>)TzZjBpXT9*xcGYbf5O!P{MY{h{~W?DA%L7D z(qRr{oFPahP!pL#_|r%SZ9s<%>V3$G4y2J?pAMv<{hR1O6c|2-I|t~JkYKESAbC&Y zy$_)io}sx(5(Ij99z}0*2>I}t$^~I=_%?Y3WI&ihJA5K8(4PHwg4h(|G7H}$K^XSM z2RIT(1{mB!)bHX%G=TykkaMp>uszAc%eeFk05VR{@z1a&yC3sjI>s=6gI|pYNoFW4 z=G}{&ZAqNflU*-p+b-vE>a=kY`blNlqR4<|@c{!w4 zKxA%hIPP-nA%`=>=UbE;m`Rs#vCm-c9`-jg@YgiHpi7UTkhUe6$aaBi+tOd5fm5&d z@)ul1FR%7r7LbrkC(vW^S=#rAJQ-NXXfYl0H&`fWQI4g5wP3q4ePQ&5LG9jTR zS(z{+30zpfv%?t@MG~*FEhMr#*diKW+|?|f;KO!OdWiuo=SReu1JA}xav{?g_I(Oy zgWE*mG;R@65cTO#Z^eOIB}uk_mt>UCU%S!?V72Xj%yC0>4@EYsajMdY#D`URA!S~U T|CF@<9xKnaOWLS*G^_m$y&Wq_ literal 0 HcmV?d00001 diff --git a/websocket-server/typeRequets/__pycache__/sendPrivateMessage.cpython-310.pyc b/websocket-server/typeRequets/__pycache__/sendPrivateMessage.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..e41df37fbdecb549eacef770ca614c9cb5567f4b GIT binary patch literal 726 zcmZWl-D(p-6h1SVB%7F4w5`~?pzOs8?V@;9Lc`XYG)qL7L|mN6c^uxo z6ApA=%P3VbmW$F@gfsC%W$`Pa_ps(v$k1AUEM8B9R-tYBXg!PL^(gkob943o^kr

s@_~$GA`THkK-NeI6xbwawZ25nbS0j|o;Ka> zgp6#26t4ROZ~%!5FTlg}mD9cg(y~v5Z6=LP-yqS%Jt~ zeG3}0c1kIM<|&~>##pwUOo@pdWL6zQS>60U(or`Xfg{!J=R*(%QUf-%14yAfDzqv`P}=lJ=t8_4f=RJ% zDoTkgUplA0o#hJAdc`*IHJ=fxJCa&rsbn958MUZ{_B{?n3PLgL#zhc~fjJ>Gou%%3-n6?S5FbFAph`WN)RZ)F2Df^3AH@9UF1TkB?fs1)jDaww%JbI6Y2rBV4I*jt!? z1UmCVZuyq2$>u|0*3zzyPh9iNxHqwgSwUc&F-94U{%wZ|ZP1wU|Jp%9W7@_irdMhF zmi^G4-)ZS{X!Jz{$CPokpP3JM27dL&@!gS< clOf#m*WFx4h?5x0CoG|ya_sUvi)n=MPYtCZivR!s literal 0 HcmV?d00001