From 62bc82f15851c7ff4a211e716f8b3029b8bb072c Mon Sep 17 00:00:00 2001 From: chatenium Date: Sat, 11 Apr 2026 17:23:19 +0200 Subject: [PATCH] 3.0 Beta 4 --- ngsw-config.json | 30 +++ package-lock.json | 26 +- package.json | 2 +- public/i18n/en.json | 10 +- public/icons/icon-128x128.png | Bin 0 -> 635 bytes public/icons/icon-144x144.png | Bin 0 -> 658 bytes public/icons/icon-152x152.png | Bin 0 -> 769 bytes public/icons/icon-192x192.png | Bin 0 -> 836 bytes public/icons/icon-384x384.png | Bin 0 -> 1295 bytes public/icons/icon-512x512.png | Bin 0 -> 7612 bytes public/icons/icon-72x72.png | Bin 0 -> 1880 bytes public/icons/icon-96x96.png | Bin 0 -> 487 bytes public/manifest.webmanifest | 57 +++++ src/app/app.config.ts | 17 +- src/app/app.routes.ts | 7 + src/app/chat/chat.html | 43 +++- src/app/chat/chat.scss | 1 - src/app/chat/chat.ts | 10 +- src/app/chat/dm/dm.html | 2 +- src/app/chat/dm/dm.scss | 3 +- src/app/chat/dm/dm.ts | 3 +- .../elements/message-box/message-box.html | 4 +- .../chat/elements/message-box/message-box.ts | 1 + src/app/chat/elements/messages/messages.html | 5 +- src/app/chat/elements/messages/messages.scss | 1 + src/app/chat/elements/navbar/navbar.html | 7 +- src/app/chat/elements/navbar/navbar.scss | 21 +- src/app/chat/elements/navbar/navbar.ts | 2 + src/app/chat/network-list/network-list.html | 14 ++ src/app/chat/network-list/network-list.scss | 28 +++ .../chat/network-list/network-list.spec.ts | 22 ++ src/app/chat/network-list/network-list.ts | 41 +++ src/app/chat/network/channel/text/text.html | 34 +++ src/app/chat/network/channel/text/text.scss | 43 ++++ .../chat/network/channel/text/text.spec.ts | 22 ++ src/app/chat/network/channel/text/text.ts | 235 ++++++++++++++++++ src/app/chat/network/network.html | 44 ++++ src/app/chat/network/network.scss | 45 ++++ src/app/chat/network/network.spec.ts | 22 ++ src/app/chat/network/network.ts | 76 ++++++ src/app/service-manager.ts | 26 ++ src/app/storage/indexed-db.ts | 3 +- src/environments/environment.development.ts | 2 +- src/environments/environment.ts | 2 +- 44 files changed, 860 insertions(+), 51 deletions(-) create mode 100644 ngsw-config.json create mode 100644 public/icons/icon-128x128.png create mode 100644 public/icons/icon-144x144.png create mode 100644 public/icons/icon-152x152.png create mode 100644 public/icons/icon-192x192.png create mode 100644 public/icons/icon-384x384.png create mode 100644 public/icons/icon-512x512.png create mode 100644 public/icons/icon-72x72.png create mode 100644 public/icons/icon-96x96.png create mode 100644 public/manifest.webmanifest create mode 100644 src/app/chat/network-list/network-list.html create mode 100644 src/app/chat/network-list/network-list.scss create mode 100644 src/app/chat/network-list/network-list.spec.ts create mode 100644 src/app/chat/network-list/network-list.ts create mode 100644 src/app/chat/network/channel/text/text.html create mode 100644 src/app/chat/network/channel/text/text.scss create mode 100644 src/app/chat/network/channel/text/text.spec.ts create mode 100644 src/app/chat/network/channel/text/text.ts create mode 100644 src/app/chat/network/network.html create mode 100644 src/app/chat/network/network.scss create mode 100644 src/app/chat/network/network.spec.ts create mode 100644 src/app/chat/network/network.ts diff --git a/ngsw-config.json b/ngsw-config.json new file mode 100644 index 0000000..69edd28 --- /dev/null +++ b/ngsw-config.json @@ -0,0 +1,30 @@ +{ + "$schema": "./node_modules/@angular/service-worker/config/schema.json", + "index": "/index.html", + "assetGroups": [ + { + "name": "app", + "installMode": "prefetch", + "resources": { + "files": [ + "/favicon.ico", + "/index.csr.html", + "/index.html", + "/manifest.webmanifest", + "/*.css", + "/*.js" + ] + } + }, + { + "name": "assets", + "installMode": "lazy", + "updateMode": "prefetch", + "resources": { + "files": [ + "/**/*.(svg|cur|jpg|jpeg|png|apng|webp|avif|gif|otf|ttf|woff|woff2)" + ] + } + } + ] +} diff --git a/package-lock.json b/package-lock.json index 9084b46..b50f60b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@angular/platform-browser": "^21.2.0", "@angular/router": "^21.2.0", "@angular/service-worker": "^21.2.0", - "@chatenium/chatenium-sdk": "^1.1.5", + "@chatenium/chatenium-sdk": "^1.1.7", "@fortawesome/angular-fontawesome": "^4.0.0", "@fortawesome/free-brands-svg-icons": "^7.1.0", "@fortawesome/free-solid-svg-icons": "^7.1.0", @@ -1011,9 +1011,9 @@ } }, "node_modules/@chatenium/chatenium-sdk": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@chatenium/chatenium-sdk/-/chatenium-sdk-1.1.5.tgz", - "integrity": "sha512-seEsxlRk96WHsE4h6oPPa5nGZioePIZpB5qk0Xs3CaKNbVJKH02/Q5HW2PIi6DHw+djAENWu5zVXIic+9DrqZw==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/@chatenium/chatenium-sdk/-/chatenium-sdk-1.1.7.tgz", + "integrity": "sha512-8stVVjKwwWZvUfVeWzSK1WGIiSt95Yxr80nfltZSDmqMKQaEA1sL9/2V6pobM4mCs9nzjUQQiniEPVQ0uxPXAg==", "dependencies": { "@faker-js/faker": "^10.4.0", "axios": "^1.14.0", @@ -4969,9 +4969,9 @@ "optional": true }, "node_modules/baseline-browser-mapping": { - "version": "2.10.17", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.17.tgz", - "integrity": "sha512-HdrkN8eVG2CXxeifv/VdJ4A4RSra1DTW8dc/hdxzhGHN8QePs6gKaWM9pHPcpCoxYZJuOZ8drHmbdpLHjCYjLA==", + "version": "2.10.18", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.18.tgz", + "integrity": "sha512-VSnGQAOLtP5mib/DPyg2/t+Tlv65NTBz83BJBJvmLVHHuKJVaDOBvJJykiT5TR++em5nfAySPccDZDa4oSrn8A==", "dev": true, "license": "Apache-2.0", "bin": { @@ -5045,9 +5045,9 @@ "license": "ISC" }, "node_modules/brace-expansion": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz", - "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz", + "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==", "license": "MIT", "optional": true, "dependencies": { @@ -7854,9 +7854,9 @@ } }, "node_modules/multimatch/node_modules/brace-expansion": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz", - "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", + "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", "license": "MIT", "optional": true, "dependencies": { diff --git a/package.json b/package.json index a2e181b..932c96c 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@angular/platform-browser": "^21.2.0", "@angular/router": "^21.2.0", "@angular/service-worker": "^21.2.0", - "@chatenium/chatenium-sdk": "^1.1.5", + "@chatenium/chatenium-sdk": "^1.1.7", "@fortawesome/angular-fontawesome": "^4.0.0", "@fortawesome/free-brands-svg-icons": "^7.1.0", "@fortawesome/free-solid-svg-icons": "^7.1.0", diff --git a/public/i18n/en.json b/public/i18n/en.json index cd5f227..7c20186 100644 --- a/public/i18n/en.json +++ b/public/i18n/en.json @@ -1,5 +1,5 @@ { - "version": "3.0 Beta 3 (April 11, 2026)", + "version": "3.0 Beta 4 (April 11, 2026)", "ok": "Ok", "back": "Back", "aChatProgram": "A messaging platform that you can trust.", @@ -104,9 +104,8 @@ "changeLogDialog": { "label": "Chatenium has been updated", "changeLog": { - "1": "Fixed WebSocket connection issues", - "2": "The web is now mobile-friendly", - "3": "The web is now a PWA. You can now install it on your home screen" + "1": "Added support for text channels inside networks", + "2": "Bug fixes in message box" } }, "chatnav": { @@ -117,6 +116,9 @@ "you": "You: " } } + }, + "networkList": { + "newNetwork": "Start new network" } }, "elements": { diff --git a/public/icons/icon-128x128.png b/public/icons/icon-128x128.png new file mode 100644 index 0000000000000000000000000000000000000000..655e6d508e90df0f65ca1eafe93ac2c11c954719 GIT binary patch literal 635 zcmV->0)+jEP)H();}WgqYx~xar{J_hEb2Saa3S*7Cv1?{kUU@A3PXsN}=?=ZOFS0t`t+K~!ko z?Uubu!$1_kk5Fi_)8lMGsStwVP#i+7AUM@kA~?O@(lq3Ld3X2n?lDFX1VIo4K@h~hq3NtDuzuAI z!@!K!*FUa~1jmJO&AxM+FH{hM+XYYzoo~nhh9SAqdi zIDvQ;p7iFwGQc5HV87F$2cYN(tXb)Sg6O=QwL`ZFFG`@Vi*>!*2+V>ybhxrM{w;V| z7CSq1vKk~XA>oQMy}x*13rcmF9(*rAAY$%v31Zc%%7a;znyHaMLBIaP)^HPeCL?mh zTGTKCfWh~ho5@{(L`XrZVdds_Jt!l76{x$@kQoUlIJK`H0p7wbqI&NZ@R?8oCq3H$ z0tM}EK{F3lS{HPAGw~89h@O?~uuFttOLCpI(_xKA+pn!P`%9cz3jKEjY zM&PgHREOvd**jvZ@==PmoKBiok!c^y^3gvyV3J9Boq!D~Njz*K7qX zFzoWF4(A3#3)~IHz#Q{67%d6DTbw)9;*^>#P9&et{jJF|aQzlR5ClOG1VIp?`2sy0 Vn#BBcgq8pR002ovPDHLkV1n~iBN+ey literal 0 HcmV?d00001 diff --git a/public/icons/icon-144x144.png b/public/icons/icon-144x144.png new file mode 100644 index 0000000000000000000000000000000000000000..8a76df6d1113017d6ef3d80f024abaeb466ceb04 GIT binary patch literal 658 zcmV;D0&V??P)AchBMD0YhjB!})orR7EX17?_MDT=1*tOzfviO{1vp{_~D zZ8+cOx{@eeCSxlD+xfP4?@7E=O-VFCJc%WG6pdMD!TKs9v_eLXbSB_}lIWELY6X7i zVSJ}6h$cH2R|6%6_Ap-eMM%5=y{Y(IV0`L{jChf-EmVJV7*F@P#rH($C~H|(qcT8Z zqGXK`Syq*bVjWsFBZ1k?lXKHzDz8{9(OvUvCs7j$@l- zZ-t%mQxKtXl?JO{Si~I2*wfRH6$vL|56MOF8j(m8D%!9JiHewO1RW|S;x9J#hLlJY zx@vplQPPR{%YT-LUsQIDdydf5FYlU=hmno^=rqjk-9Y@&&@Hq-i@)HKCJY%^LZ>6&VypZ0j|>T8=GsrXNOjE+rnB-gMX sG=r^2^B@0000000000000002bH;}liCQxv@hyVZp07*qoM6N<$g8msTNdN!< literal 0 HcmV?d00001 diff --git a/public/icons/icon-152x152.png b/public/icons/icon-152x152.png new file mode 100644 index 0000000000000000000000000000000000000000..12b4a8a4796d17206c6a1ab2ec69570952658328 GIT binary patch literal 769 zcmV+c1OEJpP)g+ud0000dP)t-sQf|}# z|Nl^J({zg4yvOeK_x)LP)nt9w>+brhw&~vE_R!b!j-cYphfnSR00NasL_t(&-tCvo zYZE~fz=u&r0r$cN=4|QWT_RrR9&m07m(1f?H44uZvzn zK_NMn(iV+}wh9{mDrd6U-OTO^voF1f?|0hWWPiMwee>oGAqavX2!bF8f*=Tj{6A15 zfFFg*YnZiVv(~87NH^hmAlGF7tKTZyE!*$jJZB6ae(3cM0j^`$Sj^p@L2UFQW3The zCaw6q3JJS}g7r&Tw&-3or`a5#g zT&V1X9N1;okQpJewz4H|523O(IW9N6ZE0n4;C>Bt|k?>06d{{kyAIP0k9LvYx4soeX6Uc7ini=4#1K zi@%l>+0#yEb0~ZNE?gDcTA>{m8CzAJ%s1-JFg4yrOKhg3DVwP#DkTrsW-DH>dt6hN zIU!OeqV8JO4Ot1Mbt7~BDl5Jbzj@Evskwm2wvFJMBtJPsRxHJty)v$BI-GTJy*sWf zT4x80edc4zc1PCh3l2#Q8tm&*b}4+8L#BT9ifJw;ierw*)D)sme19`p&opJ}g|5`I zT#?aq30lgiw3?C0;;5t$JqTWeM3ySs#zv4+kjPRS%KTOkD&%XXwz?@6NFb3>brUAW zuZ$gCH?l!{z~c7caWkve(3K4umqOUM{Ag!&LE4cKrKK8NuM%ivWGdP0%~lCGGMa2d z_c%Ns11ej2NS>dtrSsqjlGpiRN7%Ds0;>``wQZdHPU6FZ6m>b!GCnvn((h zj*)%b@jNF-14)kR9EKnWf*=TjAP9mW$Un^=P=?ND3o*Cc00000NkvXXu0mjfqy=rx literal 0 HcmV?d00001 diff --git a/public/icons/icon-192x192.png b/public/icons/icon-192x192.png new file mode 100644 index 0000000000000000000000000000000000000000..ca8446e33c366f14a10792775387035931da9e4c GIT binary patch literal 836 zcmV-K1H1f*P)6g*P)s~E*;HFElOd%CE~IKC@rWAm=m(0PRQ!m&5V6$A1w)j2Y@iozO$wEAX(5>K z-?_7`yR*Bqt-JebV)A=#J5Aqb-<_FvJ{SW40000000000000000093PQbTC%Jn)<} zeCEl|HzTUGdFlN!U9Z>I)5pKHc93%^E}e7tryF*|V%iks%Ke;=!fu69z;8Em0g7J* zpdYSFV&tOlC9|S#LA@7RVg2f2}_1^o9Mq}B@ z#Hz#>ut@^zt*YfWH=WKtr56-mOX2Luo~oxEdO@D+rLiT*1v_rYRkwyv3bbmTHBS7r zf~)>2m?!T8?VFU^J|B_bP!lv02_{Umy|e;Dsj#QjylGdFOb{N}WxFu!3JQTVm+QHx zH939;YQeek7X{3`WX{rMU|#gIZeFP~Fm7A;Le$19zQDNga&~qtnos0x9Ye!t5ViS@ zpMi1ntHO-ZN-bcf?fZhaGNu*`4j5l|F;O5z1b9r!Jz;XbA-2L*Vx@r_2O` zh+}NTIXQtK;vk-9WCCftN_Zv61gvDZ3~~3+6avF_jp;+&Y578g20v9@i*-x zMk8SSk1qw)(I?@xrf}~!*_dlhf?H0>0000000000000000002MKjIh2>-6OUmdqmn O0000W|HM=i6YAEKj?GLJ@=f?`P_TYxj%fa(F18n;~mBT z03dyRychrg5qty;y1ik}m1k~~1wA0xn{igA*Xy4REmt+og(VElySGBmYkXMly~YTPI!FM$E>YVEjbV%QA*RsTi5t?a-vAfNqk zYb!`GfT*vFnDRhFw#2)}2{sXlwMTs<>S72!7y##V(r2gYBHbpUTjfA`fR}> zDJ-*JdH><;5<5n-#mC^tYJKR46BqZ|L6O-i7jRC#!8EuQrsfF*vKIp@?nISmVwa#K z-f8)&CK`?yDIOZ>hvS#*-NUJ*i0%kxD)4gn?|5C$z$A#PD?_+5ZG<^L=4*%)YI2FV z;Lt{{wGg);XYL9w;5|tsP=v*Mqh+`7LNR@J#h2usqO}~n(9%Ab7*3Cus3@j;9QLae zvhQ+@MtZaQcN+HEv*ZL7x3X;58~$qrF5D@F_dQvnrin=)w35$Bu4h%n>41CqW;Tou zGX0SymFBM26iH3U{5c0l)l=QR=CD!QDB_7aRaDaB4CA%4;_1q>ZS%DPAj3Q5Ut6es zUYNMt{oZqEuerF{VWVDV0Bg^~B_L?lK_QTu4kbq^oPO|+POxA4n`71xZvUR&jmQe1 z=FtQ}&&kKD3SvC2@tqIiqSqmuLV6m|VM=SA3fXN{DzhV?A;=7exw&;aG-U9= zj`2-71MGDXEy#c9G9vTIo$uY!vH>YA=NKha)Ckn2OOH_$WsSg{CoAPcx3|62O$Ob4 z7I9!4{_y$RtqQbR_GUJjT_^HmP&*^W2xFVUr66`DZJBT^oKA~H-0f1#yU(H?2&5sIS??A8np5d4N2NIV~ga7~l literal 0 HcmV?d00001 diff --git a/public/icons/icon-512x512.png b/public/icons/icon-512x512.png new file mode 100644 index 0000000000000000000000000000000000000000..a68e88358a0aff3c86d32d7a3b3e43cb8431de70 GIT binary patch literal 7612 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 GkN+110^?x- literal 0 HcmV?d00001 diff --git a/public/icons/icon-72x72.png b/public/icons/icon-72x72.png new file mode 100644 index 0000000000000000000000000000000000000000..f974ddceb678a89e138d7d51010283e46e9239e1 GIT binary patch literal 1880 zcmai#S5OlO7ll(GKq3(mq^pQ*5HN!DBAq}W1VTrYjvz>h$s%C^C7|?@WhpVzSu`r_ z(xtm}At)^SfZ^$s1##fy3d7 zU?V}ho4K;-%B%fTOU?djME8ZAmau`AZ_@`63;E;9!Lft0pB^6vloAAuOGZkH zfP-a3b8&G6_#6J~MXIV42H20{R(}p{!ee4|Ybw%~>93*o0kKN)78cJjqx*AYdO(L` zS$DM`12$~iPrpls2!fIZ%PEbiTK@ zs+i<<&T&AoTZOzmuQkQohpLn@Cm;^Wf_YE>P}!KMQl8R3&-2bTFDd4_j`B$PE72Q# z8U4S)w#X}V`}~;k5z~?Y8?m(pw1i_7>V#&XBR6L6PNp!*<9dEn^qub^qm(N#Ge;?M z4=F@nxNSzi4?h&N^KN?CnEV{}6>r5>a}#I`4!B+1F-v_XGWcbS^e7xBywlaul?`y52HRuw zvr8^>i8^x@aF8QrS4GS61s+rimI};z#sMGV|5?@W%|NR8BbQ}ZV-@8mfizSu<(BS7u`-(Qg?1|llf36ouo4JAQ>CE`vsEE8h&wm0 zDOzizFSXX$s%m+;nqe)@wgq1F(b`@}>ADE&9J<{0*scFX1`;p&hkwUujT>HF-tz>y zcS)%>Gv}NL(>Pd=Z2(lfd|gvCt-vpGR*!*nTKF_(D$F)zmA@D`=@K5xkhjmsz1i(h zYVL7sa{IMb;6a(#`buE;t}FWc8df&<(phw<%iW#f&u{u3bOjQB+p(P2CCKil%d(1R zdJZHD-=rUnr``|(>Q9j&?mq^p;CP)^@wMKpG*sERtu?R>M~hD6Qq~R^Ne=N}3D?SBJO6rtnCeEBxt*a*%*EuQpu`Z#p0NDx`!xYXOG$9IsOYs&|-$oQ_ zTd4B14@r>h1GVSbA-~f-K$IZq-43ZjKx8KWa{7xwM?;%9b?G#9q#T|y`&9Z0$4Brn z-iqgCREzbGe!^H!MZpNmDDOurp|mnb4AdF>84WH7=an-@-Jh^N*Is0c(u*?+3pYog zXhakqQ*@2c2`d+Ewe5)hE%$C8eY$2Fq{()}Jyen<4Z+8a5`DF_>>*tqk~Q~6sAiKr z#J4J32|V4n6$)OFVtb|c;DU|!f+)X?3c456=M-Fz%4!;J*9i%TXUN}7jbAG8G;nj- zb{}@6{s0?Wlt}t)c5u^4QQ}pL)!j@VmDLSABee3trm`hoovKf@WYAKQc(%+#AR%^? z9F9|z;-S#*asI8wYmTQ$$v}RJm#oBo1(|cTeo9qk3wgr-eM>kc)LiWCaCWr*9as5V z3KkW2&E>N7TzKC{*dTWr4nIuAy*L9tvsv(79MV~`AnEh1O}&{Do}A6RtomS1;hJS| z9Y4l<^#lJeF!zPjN-8=zM<)I=ysvQPsGjeovTifUGJ%S@g3{I2Ph zrl-QNXU}XZ*L-NiankVZyr}qzp;PBbwYlVyfLpP3J@$N7%5B z&LW37AN@TgObMN*1oY!)L=OZ-_Rh=hW$9Ufjrf+Q&b-_m&zdAo653f=%S&I4M~7JT zXX83UuZ}$fH!63Nr+{6WX`CPxKI}$-%)bF}j0+%jpHwN;rt0m4GXUNBFADr0NLoq9 woi{zc(@s=cxOdD$4u^kH(CK)A{A3^)Ai1dbMjf;J=r{qGW2{X6GV+M|A8SrqmjD0& literal 0 HcmV?d00001 diff --git a/public/icons/icon-96x96.png b/public/icons/icon-96x96.png new file mode 100644 index 0000000000000000000000000000000000000000..d24b3a380694581222c311b9993f7da9ebaf0c95 GIT binary patch literal 487 zcmVH)1R*AU3b>^`2C8V;oRc(#Le(_jNEB~+3W85ue|ER@l6o`00DbRL_t(o!((6= z1*2dTjDk@x3TOb7zyQK#QX;6FiDhLP5M((hfOwuW9SCXQJib*B2tq4TfI65=LyZWi zS2-;R1rdvY8Vm&qX;>i$2UQA0Xkcj+6x?yx*x05$P*8#x8`uH`V-_$01BoSFP;?Rz z8r%g%6Trd4pj8M|OHc#TR6!XS(@?MhtN~=70!|Hvg1Z#pdLbG(lZ}nDa9VK?s0ylK zb|_ebRW~reqEF$nqfzhxjOjUZ0Z2nTIEck3;nV>4B$E<29s)(TmjmOzg|G&wpF}&C zxU6gx3{xOhgA5ap@_+{(VGUIvqtyb%9f;Kc4mGWfL}*}fae&7(7ak3VV1`dGKR|>A zq=-v|#x!0H$VmfP15Q66B|fn02s;Upyww6llL*@YR0hjH)`H^1gc2f)3JQuT5Mcu_ z5x~I#1|n==V1XAin;nSK04vC%YbG!u3No(Ja0k+g%9*q9lmrS`3S%WDhEXsIM!_f; d1*3q<002Z8Y6RR3wXFaE002ovPDHLkV1mlJv&{ei literal 0 HcmV?d00001 diff --git a/public/manifest.webmanifest b/public/manifest.webmanifest new file mode 100644 index 0000000..8853bab --- /dev/null +++ b/public/manifest.webmanifest @@ -0,0 +1,57 @@ +{ + "name": "Chatenium", + "short_name": "Chtn", + "display": "standalone", + "scope": "./", + "start_url": "./", + "icons": [ + { + "src": "icons/icon-72x72.png", + "sizes": "72x72", + "type": "image/png", + "purpose": "maskable any" + }, + { + "src": "icons/icon-96x96.png", + "sizes": "96x96", + "type": "image/png", + "purpose": "maskable any" + }, + { + "src": "icons/icon-128x128.png", + "sizes": "128x128", + "type": "image/png", + "purpose": "maskable any" + }, + { + "src": "icons/icon-144x144.png", + "sizes": "144x144", + "type": "image/png", + "purpose": "maskable any" + }, + { + "src": "icons/icon-152x152.png", + "sizes": "152x152", + "type": "image/png", + "purpose": "maskable any" + }, + { + "src": "icons/icon-192x192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable any" + }, + { + "src": "icons/icon-384x384.png", + "sizes": "384x384", + "type": "image/png", + "purpose": "maskable any" + }, + { + "src": "icons/icon-512x512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable any" + } + ] +} diff --git a/src/app/app.config.ts b/src/app/app.config.ts index 993171b..90601d0 100644 --- a/src/app/app.config.ts +++ b/src/app/app.config.ts @@ -1,16 +1,18 @@ import {provideTaiga} from '@taiga-ui/core'; import {ApplicationConfig, provideBrowserGlobalErrorListeners, isDevMode} from '@angular/core'; -import {provideRouter} from '@angular/router'; +import {provideRouter, withRouterConfig} from '@angular/router'; import {routes} from './app.routes'; import {provideTranslateService} from '@ngx-translate/core'; import {provideTranslateHttpLoader} from '@ngx-translate/http-loader'; -import { provideServiceWorker } from '@angular/service-worker'; +import {provideServiceWorker} from '@angular/service-worker'; export const appConfig: ApplicationConfig = { providers: [ provideBrowserGlobalErrorListeners(), - provideRouter(routes), + provideRouter(routes, withRouterConfig({ + paramsInheritanceStrategy: "always" + })), provideTaiga(), provideTranslateService({ fallbackLang: "en", @@ -19,9 +21,10 @@ export const appConfig: ApplicationConfig = { prefix: "/i18n/", suffix: ".json" }) - }), provideServiceWorker('ngsw-worker.js', { - enabled: !isDevMode(), - registrationStrategy: 'registerWhenStable:30000' - }) + }), + provideServiceWorker('ngsw-worker.js', { + enabled: !isDevMode(), + registrationStrategy: 'registerWhenStable:30000' + }) ], }; diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index f439905..4a9813b 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -7,6 +7,8 @@ import {authNeededGuard} from './guards/auth-needed-guard'; import {Homepage} from './homepage/homepage'; import {Privacy} from './privacy/privacy'; import {TOS} from './tos/tos'; +import {Network} from './chat/network/network'; +import {Text} from './chat/network/channel/text/text'; export const routes: Routes = [ {path: '', component: Homepage}, @@ -16,6 +18,11 @@ export const routes: Routes = [ { path: 'chat', component: Chat, canActivate: [authNeededGuard], children: [ {path: 'dm/:chatid', component: Dm}, + { + path: 'network/:networkId', component: Network, children: [ + {path: ":categoryId/:channelId", component: Text} + ] + }, ] }, ]; diff --git a/src/app/chat/chat.html b/src/app/chat/chat.html index 7a375f0..29065ee 100644 --- a/src/app/chat/chat.html +++ b/src/app/chat/chat.html @@ -4,7 +4,6 @@
  • {{ "chat.changeLogDialog.changeLog.1"|translate }}
  • {{ "chat.changeLogDialog.changeLog.2"|translate }}
    • -
  • {{ "chat.changeLogDialog.changeLog.3"|translate }}
-
- + {{ "chat.elements.messageBox.placeholder"|translate }}
-
diff --git a/src/app/chat/elements/message-box/message-box.ts b/src/app/chat/elements/message-box/message-box.ts index ec3cf33..3715264 100644 --- a/src/app/chat/elements/message-box/message-box.ts +++ b/src/app/chat/elements/message-box/message-box.ts @@ -101,6 +101,7 @@ export class MessageBox { sendMessageWithCaption() { this.viewModel().onMessageSend(this.viewModel().message(), this.viewModel().files()) + this.viewModel().message.set("") this.viewModel().files.set([]) this.viewModel().dialogOpen.set(false) } diff --git a/src/app/chat/elements/messages/messages.html b/src/app/chat/elements/messages/messages.html index c4c8d8e..31c5867 100644 --- a/src/app/chat/elements/messages/messages.html +++ b/src/app/chat/elements/messages/messages.html @@ -2,7 +2,10 @@ @for (message of messages(); track message.msgid; let i = $index) {
- @if (breakpoint() == "mobile") { + diff --git a/src/app/chat/elements/navbar/navbar.scss b/src/app/chat/elements/navbar/navbar.scss index 82a78b4..89cae16 100644 --- a/src/app/chat/elements/navbar/navbar.scss +++ b/src/app/chat/elements/navbar/navbar.scss @@ -2,18 +2,31 @@ nav { display: grid; grid-template-columns: 1fr 1fr; - &.mobile { - zoom: 0.85; + &.includeBackButton { grid-template-columns: 1fr 1fr 1fr; - ::ng-deep .items-left { + ::ng-deep .data { display: flex; justify-content: center; align-items: center; } } - ::ng-deep .items-right, ::ng-deep .items-left { + &.mobile { + zoom: 0.85; + } + + &.alignCenter { + grid-template-columns: 1fr 1fr 1fr; + + ::ng-deep .data { + display: flex; + justify-content: center; + align-items: center; + } + } + + ::ng-deep .items-right, ::ng-deep .data { display: flex; gap: 10px; align-items: center; diff --git a/src/app/chat/elements/navbar/navbar.ts b/src/app/chat/elements/navbar/navbar.ts index e536427..6cb52f3 100644 --- a/src/app/chat/elements/navbar/navbar.ts +++ b/src/app/chat/elements/navbar/navbar.ts @@ -22,4 +22,6 @@ export class Navbar { breakpoint = inject(TUI_BREAKPOINT) router = inject(Router) backButtonDest = input.required() + showBackButtonAt = input<"desktopSmall"|"mobile">("mobile") + dataAlignment = input<"left"|"center">("left") } diff --git a/src/app/chat/network-list/network-list.html b/src/app/chat/network-list/network-list.html new file mode 100644 index 0000000..9ba0f74 --- /dev/null +++ b/src/app/chat/network-list/network-list.html @@ -0,0 +1,14 @@ + + +@for (network of serviceManager.networks(); track network.networkId) { + +} diff --git a/src/app/chat/network-list/network-list.scss b/src/app/chat/network-list/network-list.scss new file mode 100644 index 0000000..22667f0 --- /dev/null +++ b/src/app/chat/network-list/network-list.scss @@ -0,0 +1,28 @@ +:host { + display: flex; + flex-direction: column; + gap: 5px; + + button { + width: 100%; + display: flex; + justify-content: start; + font-weight: 600; + + &.enlarge { + height: 75px; + } + + .info { + display: flex; + flex-direction: column; + text-align: start; + + .latest_message { + margin-top: -5px; + font-size: 12px; + opacity: 50%; + } + } + } +} diff --git a/src/app/chat/network-list/network-list.spec.ts b/src/app/chat/network-list/network-list.spec.ts new file mode 100644 index 0000000..84178ac --- /dev/null +++ b/src/app/chat/network-list/network-list.spec.ts @@ -0,0 +1,22 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NetworkList } from './network-list'; + +describe('NetworkList', () => { + let component: NetworkList; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [NetworkList], + }).compileComponents(); + + fixture = TestBed.createComponent(NetworkList); + component = fixture.componentInstance; + await fixture.whenStable(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/chat/network-list/network-list.ts b/src/app/chat/network-list/network-list.ts new file mode 100644 index 0000000..9c4073b --- /dev/null +++ b/src/app/chat/network-list/network-list.ts @@ -0,0 +1,41 @@ +import {Component, inject, input, OnInit} from '@angular/core'; +import {IndexedDB} from '../../storage/indexed-db'; +import {Router, RouterLink} from '@angular/router'; +import {LoadStatus, ServiceManager} from '../../service-manager'; +import {TUI_BREAKPOINT, TuiButton} from '@taiga-ui/core'; +import {ChatService} from '@chatenium/chatenium-sdk/services/chatService'; +import {NetworkService} from '@chatenium/chatenium-sdk/services/networkService'; +import {Oimg} from '../elements/oimg/oimg'; +import {TranslatePipe} from '@ngx-translate/core'; + +@Component({ + selector: 'network-list', + imports: [ + Oimg, + TranslatePipe, + TuiButton, + RouterLink + ], + templateUrl: './network-list.html', + styleUrl: './network-list.scss', +}) +export class NetworkList implements OnInit { + userid = input("") + token = input("") + + indexedDb = inject(IndexedDB) + router = inject(Router) + serviceManager = inject(ServiceManager) + breakpoint = inject(TUI_BREAKPOINT) + + async ngOnInit() { + this.serviceManager.networkService = new NetworkService(this.userid(), this.token(), "", this.indexedDb.getApi(), () => {}) + try { + this.serviceManager.networks.set(await this.serviceManager.networkService.get()) + this.serviceManager.networksStatus.set(LoadStatus.loaded) + } catch (e) { + console.error(e) + this.serviceManager.networksStatus.set(LoadStatus.error) + } + } +} diff --git a/src/app/chat/network/channel/text/text.html b/src/app/chat/network/channel/text/text.html new file mode 100644 index 0000000..c14871f --- /dev/null +++ b/src/app/chat/network/channel/text/text.html @@ -0,0 +1,34 @@ +
+ @defer (when store) { + +
+
+ @switch (store!.channelData().type) { + @case ("message") { + + } + @case ("broadcast") { + + } + @case ("voice") { + + } + } + {{ store!.channelData().name }} +
+
+ +
+ +
+ + + + + + } + +
diff --git a/src/app/chat/network/channel/text/text.scss b/src/app/chat/network/channel/text/text.scss new file mode 100644 index 0000000..2965716 --- /dev/null +++ b/src/app/chat/network/channel/text/text.scss @@ -0,0 +1,43 @@ +main { + height: 98svh; + display: grid; + grid-template-rows: 70px minmax(0, 1fr) auto; + padding: 15px; + + &.mobile { + height: 100svh; + padding: 15px; + } + + .mobile { + height: 5px; + } + + navbar { + .chat-data { + display: flex; + justify-content: center; + gap: 5px; + + .main-name { + font-size: 18px; + font-weight: bold; + } + + .alt-name { + margin-top: -5px; + color: gray; + font-size: 12px; + } + } + + .items-right { + margin-top: -10px; + + button { + width: 35px; + height: 35px; + } + } + } +} diff --git a/src/app/chat/network/channel/text/text.spec.ts b/src/app/chat/network/channel/text/text.spec.ts new file mode 100644 index 0000000..540ea23 --- /dev/null +++ b/src/app/chat/network/channel/text/text.spec.ts @@ -0,0 +1,22 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { Text } from './text'; + +describe('Text', () => { + let component: Text; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [Text], + }).compileComponents(); + + fixture = TestBed.createComponent(Text); + component = fixture.componentInstance; + await fixture.whenStable(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/chat/network/channel/text/text.ts b/src/app/chat/network/channel/text/text.ts new file mode 100644 index 0000000..3122b38 --- /dev/null +++ b/src/app/chat/network/channel/text/text.ts @@ -0,0 +1,235 @@ +import {Component, inject, signal} from '@angular/core'; +import {DmStorage, ServiceManager, TextChannelStorage} from '../../../../service-manager'; +import {ActivatedRoute} from '@angular/router'; +import {IndexedDB} from '../../../../storage/indexed-db'; +import {TUI_BREAKPOINT, TuiButton, TuiIcon} from '@taiga-ui/core'; +import {FileDataWithPreview, MessageBox} from '../../../elements/message-box/message-box'; +import {Attachment} from '@chatenium/chatenium-sdk/domain/common.schema'; +import {FileUploadProgressListener} from '@chatenium/chatenium-sdk/domain/fileUploadService.schema'; +import {MessageBoxViewModel} from '../../../elements/message-box/message-box-viewmodel'; +import {TextChannelServiceService} from '@chatenium/chatenium-sdk/services/textChannelService'; +import {Message} from '@chatenium/chatenium-sdk/domain/textChannelService.schema'; +import {Messages} from '../../../elements/messages/messages'; +import {Navbar} from '../../../elements/navbar/navbar'; +import {Oimg} from '../../../elements/oimg/oimg'; + +@Component({ + selector: 'app-text', + imports: [ + MessageBox, + Messages, + Navbar, + Oimg, + TuiButton, + TuiIcon + ], + templateUrl: './text.html', + styleUrl: './text.scss', +}) +export class Text { + serviceManager = inject(ServiceManager) + route = inject(ActivatedRoute) + indexedDb = inject(IndexedDB) + breakpoint = inject(TUI_BREAKPOINT) + + networkId = "" + channelId = "" + categoryId = "" + + get store(): TextChannelStorage | null { + if (!this.serviceManager.networkServices()[this.networkId]) { + return null + } + return this.serviceManager.networkServices()[this.networkId].textChannels()[this.channelId] + } + + async sendMessage(message: string, files: FileDataWithPreview[] | null) { + if (!this.store) return + if (!files && message.trim() == "") return + + const session = this.serviceManager.currentSession(); + if (session != null) { + const editedMessage = this.store.messageBox.editingMessage() + if (editedMessage) { + const storedMsg = this.store.messages().find(m => m.msgid == editedMessage.messageId) + const originalMessage: Message = JSON.parse(JSON.stringify(storedMsg)) + if (storedMsg) { + storedMsg.message = message + } + + try { + await this.store.service.editMessage(editedMessage.messageId, message) + } catch (e) { + if (storedMsg) { + storedMsg.message = originalMessage.message + } + } + + this.store.messageBox.editingMessage.set(null) + this.store.messageBox.message.set("") + return + } + + let attachments: Attachment[] = [] + files?.forEach(file => { + const extraMetaData: Record = {} + extraMetaData["thumbnailMetaData"] = file.videoThumbnail ?? "" + + attachments.push({ + fileName: file.name, + fileId: file.fileId, + type: file.type, + format: file.extension, + path: file.blob, + height: file.height, + width: file.width, + extraMetaData: extraMetaData + }) + }) + + this.store.messages.update(value => [...value, { + author: { + userid: session.userData.userid, + pfp: session.userData.pfp, + username: session.userData.username, + displayName: session.userData.displayName + }, + msgid: "", + message: message, + sent_at: { + T: 0, + I: 0 + }, + isEdited: false, + channelId: "", + networkId: "", + categoryId: "", + files: [], + seen: false, + replyTo: "", + replyToId: "", + forwardedFrom: "", + forwardedFromName: "" + }]) + + this.scrollToBottom("smooth") + + await this.store.service.sendMessage("", message, null, null, files, { + fileProgressUpdate: (tempMsgId, fileId, allChunks, chunksDone) => { + this.uploadProgressUpdate(tempMsgId, fileId, allChunks, chunksDone) + } + }) + } + + this.store.messageBox.message.set("") + } + + async deleteMessage(messageId: string) { + if (!this.store) return + const i = this.store.messages().findIndex(m => m.msgid == messageId) + if (i != -1) { + const originalMessage: Message = JSON.parse(JSON.stringify(this.store.messages()[i])) + this.store.messages().splice(i, 1) + try { + await this.store.service.deleteMessages([messageId]) + } catch (e) { + this.store.messages().splice(i, 0, originalMessage) + } + } + } + + scrollToBottom(anim: 'instant' | 'smooth'): void { + setTimeout(() => { + const scrollContainer = document.querySelector("#scrollContainer") + scrollContainer.scroll({ + top: scrollContainer.scrollHeight, + left: 0, + behavior: anim + }); + }, 0) + } + + uploadProgressUpdate(tempMsgId: string, fileId: string, allChunks: number, chunksDone: number) { + console.log(fileId, allChunks, chunksDone) + } + + // The chatid parameter ensures isolation + onWsListen(action: string, message: string, networkId: string, channelId: string) { + const data = JSON.parse(message); + if (data.channelId === channelId) { + const targetStore = this.serviceManager.networkServices()[networkId].textChannels()[channelId]; + if (targetStore) { + switch (action) { + case "newMessage": + targetStore.messages.update(messages => [...messages, data]); + this.scrollToBottom("smooth") + break; + } + } + } + } + + ngOnInit() { + this.route.params.subscribe(async params => { + const networkId = params['networkId']; + const categoryId = params['categoryId']; + const channelId = params['channelId']; + this.networkId = networkId; + this.categoryId = categoryId; + this.channelId = channelId; + + const session = this.serviceManager.currentSession(); + const networkData = this.serviceManager.networks().find(c => c.networkId === networkId); + + if (!session || !networkData) { + console.warn("No network data") + return + } + + const categoryData = networkData.categories.find(c => c.categoryId === categoryId); + if (!categoryData) { + console.warn("No category data") + return + } + const channelData = categoryData.channels.find(c => c.channelId === channelId); + if (!channelData) { + console.warn("No channel data") + return + } + if (!this.serviceManager.networkServices()[networkId]) { + console.warn("No networkService") + return + } + console.log(this.serviceManager.networkServices()) + console.log(this.serviceManager.networkServices()[networkId]) + if (!this.serviceManager.networkServices()[networkId].textChannels()[channelId]) { + const newStore = { + categoryData: signal(categoryData), + channelData: signal(channelData), + messages: signal([]), + messageBox: new MessageBoxViewModel((msg, files) => this.sendMessage(msg, files)), + wsListener: (action, data) => this.onWsListen(action, data, networkId, categoryId), + } as TextChannelStorage; + + newStore.service = new TextChannelServiceService( + session.userData.userid, + session.token, + networkId, + categoryId, + channelId, + this.indexedDb.getApi(), + (action, data) => newStore.wsListener(action, data) + ); + + this.serviceManager.networkServices()[networkId].textChannels()[channelId] = newStore; + + const currentStore = this.serviceManager.networkServices()[networkId].textChannels()[channelId] + const history = await currentStore.service.get(); + currentStore.messages.set(history); + this.scrollToBottom("instant") + + await currentStore.service.joinWebSocketRoom(); + } + }); + } +} diff --git a/src/app/chat/network/network.html b/src/app/chat/network/network.html new file mode 100644 index 0000000..a914bb4 --- /dev/null +++ b/src/app/chat/network/network.html @@ -0,0 +1,44 @@ +@defer(when store) { +
+
+ +
+
+ +
+ +

{{store.networkData().name}}

+
+ +
+ + +
+ @for (category of store.networkData().categories; track category) { +
+

{{category.name}}

+ +
+ @for (channel of category.channels; track channel) { + + } +
+
+ } +
+
+
+} diff --git a/src/app/chat/network/network.scss b/src/app/chat/network/network.scss new file mode 100644 index 0000000..bbbe07f --- /dev/null +++ b/src/app/chat/network/network.scss @@ -0,0 +1,45 @@ +#layout { + overflow-y: scroll; + width: 100%; + height: 100%; + display: grid; + grid-template-columns: 0 100%; + overflow-x: hidden; + padding: 15px; + transition: 0.2s; + + &.routerOutletActive { + overflow-y: hidden; + padding: 0; + grid-template-columns: 1fr 300px; + + #router { + background: var(--tui-background-neutral-1-pressed); + } + + main { + padding: 15px; + } + } + + &.hideNetworkNav { + grid-template-columns: 1fr; + + #network-data { + &.hidden { + display: none; + } + } + } + + .category { + background: var(--tui-background-base-alt); + width: 100%; + padding: 15px; + + .channel { + display: flex; + justify-content: start; + } + } +} diff --git a/src/app/chat/network/network.spec.ts b/src/app/chat/network/network.spec.ts new file mode 100644 index 0000000..deeda44 --- /dev/null +++ b/src/app/chat/network/network.spec.ts @@ -0,0 +1,22 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { Network } from './network'; + +describe('Network', () => { + let component: Network; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [Network], + }).compileComponents(); + + fixture = TestBed.createComponent(Network); + component = fixture.componentInstance; + await fixture.whenStable(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/chat/network/network.ts b/src/app/chat/network/network.ts new file mode 100644 index 0000000..ffcfc50 --- /dev/null +++ b/src/app/chat/network/network.ts @@ -0,0 +1,76 @@ +import {Component, inject, OnInit, signal} from '@angular/core'; +import {ActivatedRoute, RouterLink, RouterOutlet} from '@angular/router'; +import {Chat} from '@chatenium/chatenium-sdk/domain/chatService.schema'; +import {Message} from '@chatenium/chatenium-sdk/domain/dmService.schema'; +import {MessageBoxViewModel} from '../elements/message-box/message-box-viewmodel'; +import {DmStorage, NetworkStorage, ServiceManager} from '../../service-manager'; +import {DMService} from '@chatenium/chatenium-sdk/services/dmService'; +import {Network as NetworkData} from "@chatenium/chatenium-sdk/domain/networkService.schema" +import {NetworkService} from '@chatenium/chatenium-sdk/services/networkService'; +import {IndexedDB} from '../../storage/indexed-db'; +import {Navbar} from '../elements/navbar/navbar'; +import {Oimg} from '../elements/oimg/oimg'; +import {TUI_BREAKPOINT, TuiButton, TuiGroup, TuiIcon} from '@taiga-ui/core'; + +@Component({ + selector: 'app-network', + imports: [ + RouterOutlet, + Navbar, + Oimg, + TuiGroup, + TuiButton, + TuiIcon, + RouterLink + ], + templateUrl: './network.html', + styleUrl: './network.scss', +}) +export class Network implements OnInit { + serviceManager = inject(ServiceManager) + route = inject(ActivatedRoute) + indexedDb = inject(IndexedDB) + breakpoint = inject(TUI_BREAKPOINT) + + routerOutletActive = signal(false) + + networkId = "" + get store() { + return this.serviceManager.networkServices()[this.networkId] + } + + ngOnInit() { + this.route.params.subscribe(async params => { + console.log("Loading network...") + const networkId = params['networkId']; + this.networkId = networkId; + + const session = this.serviceManager.currentSession(); + const networkData = this.serviceManager.networks().find(c => c.networkId === networkId); + + if (!session || !networkData) { + console.warn(`Initialization deferred for ${networkId}: Session or NetworkData missing.`); + return; + } + + if (!this.serviceManager.networkServices()[networkId]) { + const newStore = { + networkData: signal(networkData), + textChannels: signal({}), + wsListener: (action, data) => { + }, + } as NetworkStorage; + + newStore.service = new NetworkService( + session.userData.userid, + session.token, + networkId, + this.indexedDb.getApi(), + (action, data) => newStore.wsListener(action, data) + ); + + this.serviceManager.networkServices()[networkId] = newStore; + } + }); + } +} diff --git a/src/app/service-manager.ts b/src/app/service-manager.ts index b7d769f..95bb32b 100644 --- a/src/app/service-manager.ts +++ b/src/app/service-manager.ts @@ -9,6 +9,10 @@ import {Chat} from '@chatenium/chatenium-sdk/domain/chatService.schema'; import {DMService} from '@chatenium/chatenium-sdk/services/dmService'; import {Message} from '@chatenium/chatenium-sdk/domain/dmService.schema'; import {MessageBoxViewModel} from './chat/elements/message-box/message-box-viewmodel'; +import {NetworkService} from '@chatenium/chatenium-sdk/services/networkService'; +import {Network, NetworkCategory, NetworkChannel} from '@chatenium/chatenium-sdk/domain/networkService.schema'; +import {TextChannelServiceService} from '@chatenium/chatenium-sdk/services/textChannelService'; +import {Message as NetworkMessage} from '@chatenium/chatenium-sdk/domain/textChannelService.schema'; @Injectable({ providedIn: 'root', @@ -25,6 +29,12 @@ export class ServiceManager { chatsStatus = signal(LoadStatus.loading) chats = signal([]) + networkService: NetworkService | null = null // Initialized in network-list.ts + networksStatus = signal(LoadStatus.loading) + networks = signal([]) + // Services for individual networks + networkServices = signal>({}) + dmServices = signal>({}) } @@ -42,3 +52,19 @@ export interface DmStorage { messageBox: MessageBoxViewModel wsListener: (action: string, message: string) => void } + +export interface NetworkStorage { + service: NetworkService + networkData: WritableSignal + wsListener: (action: string, message: string) => void + textChannels: WritableSignal> +} + +export interface TextChannelStorage { + service: TextChannelServiceService + messages: WritableSignal + channelData: WritableSignal + categoryData: WritableSignal + messageBox: MessageBoxViewModel + wsListener: (action: string, message: string) => void +} diff --git a/src/app/storage/indexed-db.ts b/src/app/storage/indexed-db.ts index 294843a..adc0e55 100644 --- a/src/app/storage/indexed-db.ts +++ b/src/app/storage/indexed-db.ts @@ -6,7 +6,7 @@ import {DatabaseAPI} from '@chatenium/chatenium-sdk/storage/database'; providedIn: 'root' }) export class IndexedDB { - private dbVersion = 1 + private dbVersion = 2 private db: IDBDatabase | null = null getApi(): DatabaseAPI { @@ -35,6 +35,7 @@ export class IndexedDB { db.createObjectStore('networks', { keyPath: 'id' }) db.createObjectStore('files', { keyPath: 'id' }) db.createObjectStore('messages', { keyPath: 'id' }) + db.createObjectStore('networkmessages', { keyPath: 'id' }) } request.onsuccess = (event: Event) => { diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts index 9d99f2c..cd19820 100644 --- a/src/environments/environment.development.ts +++ b/src/environments/environment.development.ts @@ -1,5 +1,5 @@ export const environment = { - version: "3.0-beta3", + version: "3.0-beta4", api_url: "http://localhost:3000", cdn_url: "http://localhost:4000", ws_url: "ws://localhost:3000", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index abb5171..00ce2f0 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,5 +1,5 @@ export const environment = { - version: "3.0-beta3", + version: "3.0-beta4", api_url: "https://api.chatenium.hu", cdn_url: "https://cdn.chatenium.hu", ws_url: "wss://api.chatenium.hu",