Skip to content

Commit

Permalink
add (t), update UserContainer (wip)
Browse files Browse the repository at this point in the history
  • Loading branch information
@VanyaMate
VanyaMate committed Aug 10, 2024
1 parent 9a67ed3 commit fa5f4fd
Show file tree
Hide file tree
Showing 18 changed files with 293 additions and 102 deletions.
91 changes: 48 additions & 43 deletions .firebase/hosting.ZGlzdA.cache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,61 +13,66 @@ images/theme/moon.png,1711731929843,ecc5564241b756257cb0347fd5031911a05db78f3362
images/theme/sun.png,1711731877111,90764b30e4f78f1885649635408e42189e9017024ced3c14e365639cad53ae93
locales/en/buttons.json,1722640676672,6457953be047bb5cdab61a4989011c6d696a32bc222dfcd1a0da75436b70d4e9
locales/en/contacts.json,1713436022191,c08a7dc3c15d4ed3d6724eb97b48a565316f83bdcfa8e58214a37fdf393d1f80
locales/en/dialogue.json,1723271857959,a8b0ccff67232fe7edd7f5e2b7e69e8ba7cf6319d6d07960be17b2c333abcac5
locales/en/files-page.json,1722640676672,5b6eec4c9a5bc485274ad0588cbcb6d63eae86185a49d867798eb747dbc34586
locales/en/friends-page.json,1722640676673,f6e8fc0a406969cc9ee7350905c73b7e342429ce8a8f14dd841556c13f2ce73a
locales/en/languages.json,1722640676673,86f84a724527c9fa36225e5c406f7789d96eafb5d53a6d7a46c0a3f8fb5565c4
locales/en/notification-links.json,1717197728718,c6ca4396072894e20ab3a2404c6eb1218fadae438479fd45f4d3f56504f89e3e
locales/en/notification-messages.json,1718810762287,b2b11c9917926814ccb9e72747fc19199790603893e77aa42bb260639ab53cdf
locales/en/translation.json,1720138557248,8ddf872227656476e67570fd01feb00d0128809bc7dc8ebffb21d0271ab99bee
locales/en/notifications.json,1723272171971,42e709b093572646004a0e252aab519277e5927a55d775fcbdd9a28d7659ce30
locales/en/posts.json,1723272960332,69efb3469ba98afe0267d2fe1b9f3c7b1768f6f15543e6a608a1b6904dd97baa
locales/en/site-app.json,1723307801890,cd572faa4db9fbc9bd2e609a5db08b70de6a7e4a7519dd2bee1eed1d73775723
locales/en/translation.json,1723305731732,063cf30b854647394e7386ac747ee56b8decc609721fe8bf42ff0c97af294911
locales/en/user-settings.json,1723307458275,16cb0425943f0462d1aa2d6a71d8cf028ab303fbac23a419b32954b3491ba456
locales/en/validation-messages.json,1720138557248,e70e227061941c09f3c6fc8edaac0c8901e2d6996b920b474bf1cb2bf99bbb92
locales/ru/buttons.json,1722640676675,274cb5c783325a23cb4c37ae06e52ececf5cbee00677089492b700527cea54ac
locales/ru/contacts.json,1713436000285,56e35639e20fc9a0f9dec41e88fc657bf93bcfda30f8b21445f67eeabbe05e83
locales/ru/dialogue.json,1723271849045,c87801b64b6ca0e3c06d4b028e72d366daa7d342c897aacee3f9c635216fa332
locales/ru/files-page.json,1722640676676,aefe193abbf8afe1eb6dc18e8f2be7ef96b3e25798c39ae4202f5785027dd258
locales/ru/friends-page.json,1722640676676,5f00b9e6df4fe71468c55213d5ee844826ec69324a6778a04364f1b50af50ff7
locales/ru/languages.json,1722640676676,bcc1511f9f2182d8b4284036d49a9a55f40233df1305194b039f711b998291ab
locales/ru/notification-links.json,1717197714996,93debed3efca65418ebc093881b7abd6b5cd5022adc5bb4bb5e50caf35585019
locales/ru/notification-messages.json,1718810747453,21a636c8a6a295a8c5b379b28c1ba804a5edbddf0c31f18f2855f463204d5068
locales/ru/translation.json,1720138557249,a90362966bbafb6169e327c9a26519fa9a44710e65903d4d02b975385a9ef2e1
locales/ru/validation-messages.json,1720138557249,8fd4439f5798da6dc8874d810348e60b0831a68dfbe9202ceb9bd5109e3b7aa3
index.html,1723285967376,f4ad2c165a49cccaff0a8422a0be869a8ef2657547d46fb5de7c70d74b30e853
assets/AboutPage-DkLAFBIK.js,1723285967375,7138924b8183dc13d2a03f2d1257f7c73ce02ab9f9d8dd9e693634cc37cc1e1b
assets/CancelFriendRequestButton-DceLneRl.js,1723285967373,93c20ad8924f1687b82f24c38f0bc25f027d086e13efbd86c076da629b6d10b8
assets/ButtonWithLoading-B4iPPAN8.css,1723285967373,da55a6b67d4b85652b3a58aa04fb20c6f2b428338c45a3e52a39e5cdb5db45dd
assets/ButtonWithLoading-xzTclFjq.js,1723285967375,efea44cf81e85375ca9aaf045eb2138740f74f4b68bda9a8e1e7b7f2268af0a4
assets/DetailsBody-MDcPhNp8.js,1723285967373,f8f7f8678eadb059ccdd9ac2528f3d5bb3ab3bc60d630b519e030e1f9760abfb
assets/DetailsBody-CZ11f3x2.css,1723285967372,48d353f49e4bad4369ee63e7bd030dbd37954ce921257b6df3d172aab1d7a7fd
assets/DomainSearchItem-BW7wU-Zd.js,1723285967373,8540ab2adab51d6242105bbea1d4298fc89f1676278c7b70de2c038a954819a4
assets/DialoguesPage-BLhK9S9x.css,1723285967372,23786c6fda602557fc5205a65a7fa5921a4bbf75642791d3c7a04f6de7748c48
assets/FriendsPage-BYenYjnr.js,1723285967375,fc8d8cb33b1c3b346a241db131603d34844c82893bc033b29aa3c2f850039b5b
assets/DialoguesPage-5xxOpVzb.js,1723285967376,6fc968ee1abc72b8fb6e43ef7680a4b5b829591d8541cbce6066ccdf0b452028
assets/GlobalNotifications-BWu17GVE.css,1723285967372,6580dc9993ccfe82727bfae4b5bf3296702809dfb50b1164c0f87ff8e2e2210c
assets/GoToPrivateDialogue-D1h0wYIM.css,1723285967372,fac0d4187bd0cbdc14992af3b23d46938f4006b14c1e62c5fbdb67745f5db8d7
assets/FilesPage-D2VR_xEf.js,1723285967376,733ff565946d3eeb57b2e9704d5e4010d37ebb7189474c3a0bb6acc31bb33e8b
assets/FilesPage-DsLhs2H8.css,1723285967372,7f03f9b8dfc3e946325275ce306771723e4f8b4969c30c705ec91118d680e7db
assets/HomePage-BKFWWiUf.js,1723285967372,5be24fa88f8704b3d2dc9198e057630146478e7e8f28a3f9c14dd788042f9c4d
assets/GoToPrivateDialogue-jUH7iBfJ.js,1723285967375,f52c2726a3cc60e7379548b3ceb9aa08e3cb51c282c15e517203eec37bc09871
assets/LanguagesPage-BIZLUTmp.css,1723285967372,4636f99ec7ed41d9f8c6acf2ef4a2b3b0afe15e00588b895736f7e2a75394d78
assets/length.validator-CVQ0WEiF.js,1723285967373,f7843883210f7b9e8115dc77313cd388e5a4e4f116dca90f291716ade72b594d
assets/GlobalNotifications-CiMlI6Pk.js,1723285967375,07998d86bea6a9a0e29cef4449db9f32d8ae47c26344f505ea0071d55fdd3eaf
assets/index-D6t8S9A8.css,1723285967371,f872d6c2ddf8c81b4ea7a45a5dc45e3563bdafe9405ab1cbd9515c1bcbb075c1
assets/LanguagesPage-BnoMgeNo.js,1723285967376,88b7b823190f93b3144234198298680bebabac6289c87f28e9048590d0b7e27a
assets/private-dialogues.model-CBKjfzpE.js,1723285967373,a6daa8c7ab7c509b00260aafd6682f988829698d592ba9b6961f56830ee5e7fe
assets/ProfilePage-sR7na8RM.js,1723285967373,0f67bb3aab317bca8e530b03d0eb646fdc7404e120a0f0141eaaa00ee6fd452c
assets/private-messages.model-0jbUQF7H.js,1723285967373,f257a0d026bd692b70d2fdd5a0642887ae06024a9d363c5ec800b6996fecf3c6
assets/SearchPage-BILr4DUX.js,1723285967376,90e3294592cde29b692d50ecc23c9dd16da6c2ee028991158fa9e2fea408943a
assets/SearchPage-CB9DbVNb.css,1723285967372,692f6d19fe571f2d0e86f525ac3e6ca8769716fffdc4fb214fcaf19def5d87a9
assets/UserContainer-DrzwvyPw.css,1723285967372,3d3575922d07d3c2099672570203fad23fed843b98ea053b69cae0fca6b99edd
assets/UserPreviewItem-zAugQ05Z.css,1723285967372,388b460157f95c19e002e8399ec60cef9c766985c755950d8ff5e9e56cf48423
assets/UserContainer-BlAAMb2B.js,1723285967375,2f929383e1b328606fe5f530ab5bf03f42b5f6c6f8434e1d833ff8ab4ba61902
assets/UserPreviewItem-DugrCG3f.js,1723285967376,a85c344af5e9edb660ef7ae242ca1ca7322545a08860510d43869933e8260d9f
assets/Virtual-BgcJ6Uwh.css,1723285967372,15cc5277293cc94b2419cbd0590ae49573a2634eb63f51072906ecda8997fd22
locales/en/dialogue.json,1723271857959,a8b0ccff67232fe7edd7f5e2b7e69e8ba7cf6319d6d07960be17b2c333abcac5
locales/en/notifications.json,1723272171971,42e709b093572646004a0e252aab519277e5927a55d775fcbdd9a28d7659ce30
assets/Virtual-Dxci-_TT.js,1723285967375,56bfbc51664bdcab305eb586c7138eae5009a17c8a0cfd4d87ace320ac26d21d
locales/en/site-app.json,1723280937491,dc1728ac1cff377564e5b80a87a49ff0daaacd8fe574fd8cab0e7e92c83836ae
locales/en/posts.json,1723272960332,69efb3469ba98afe0267d2fe1b9f3c7b1768f6f15543e6a608a1b6904dd97baa
locales/ru/notifications.json,1723272174474,a5df04a96c73c3435606c00c756a13facbd2217ece57c8f9d33516109f6683d4
locales/ru/dialogue.json,1723271849045,c87801b64b6ca0e3c06d4b028e72d366daa7d342c897aacee3f9c635216fa332
locales/ru/posts.json,1723272947645,895b6604f1acf4d15d02b13ba3a72832ee2dd575402846e0de06c6895718553c
locales/ru/site-app.json,1723280917884,3b3e2f38e3536ac130962ddd6889221b761dcf63c4b5e7ef639bb8f7f6d6c242
assets/index-CnM0dBaz.js,1723285967376,3d51d6428fceb8b86c6b31b4cfb5d20470e76796d29b6ec1285e1ff4c34b59a8
locales/ru/site-app.json,1723307812760,8f272f39e4a664f7c53c47858cbb41e277e6c66bef09b446f02bdfa9e9c8048f
locales/ru/translation.json,1723305721894,c563649909958f9bf9a7ff12264efa00e1ba6b92f96300c3f74d6c820ec3d8d7
locales/ru/user-settings.json,1723307473402,a747f6e8dc6fd66beec59875a6c83e59d0317a96c7222e84745c29e4cebe9e31
locales/ru/validation-messages.json,1720138557249,8fd4439f5798da6dc8874d810348e60b0831a68dfbe9202ceb9bd5109e3b7aa3
index.html,1723308051585,b56273824722ea4285771e33398b666bbbb4a65fef0b51bf392c0e49c8b99c58
assets/AboutPage-C6YkANHA.js,1723308051582,22cb904685e3d66df5308f768e22c3fda5075303e02b0d509d5226c49b330050
assets/ButtonWithLoading-DiTRisO3.css,1723308051582,80410dc31e388ee95a426e26d4ed666ad5af8e0bc8fbf517e3ae9cfcb3d86153
assets/CancelFriendRequestButton-AzMnO4jp.js,1723308051583,0e54d3800460645b73959f4f60a318b22297dfcb47dbe58ca964b5b684bf8e61
assets/ButtonWithLoading-vhLWdy2a.js,1723308051585,cfc8ea604490101cd45a20e2e16c7ec9993b312bfe8409b12b81cdf56de93054
assets/DetailsBody-CZ7AI4QT.js,1723308051585,08dac66d10044b6cceb49d5b0872a27c91e569a780e9e7aa16f7bc02906fed77
assets/DetailsBody-CZ11f3x2.css,1723308051582,48d353f49e4bad4369ee63e7bd030dbd37954ce921257b6df3d172aab1d7a7fd
assets/DialoguesPage-2AG0v87n.css,1723308051582,fb041ed053ed382a5446d3f732774d8f1bdf72e1d38b11fb03345ea8029feec1
assets/DomainSearchItem-BRX5Aeaa.js,1723308051583,2594e0dd004e5c1e5763d07bb3be8c5d25f880c9ff77d9420ad5c05ebe853397
assets/FilesPage-DsLhs2H8.css,1723308051582,7f03f9b8dfc3e946325275ce306771723e4f8b4969c30c705ec91118d680e7db
assets/GlobalNotifications-BWu17GVE.css,1723308051582,6580dc9993ccfe82727bfae4b5bf3296702809dfb50b1164c0f87ff8e2e2210c
assets/DialoguesPage-BDtZ4pX4.js,1723308051585,e4c7704b6ce57d857a3dc120feabd16e755197a46aaa97042334e861d98e56ec
assets/FilesPage-C3chukyH.js,1723308051585,2d604d7d273195ec5653ce693f02f9c40ddc6fdb99953476bd02fc48e84a4e91
assets/FriendsPage-CZWzrQMk.js,1723308051585,ac0f9717218e77d9e2d164b97638ba64ecb48ffebab6a80f07c706fcbfef9386
assets/GoToPrivateDialogue-D1h0wYIM.css,1723308051582,fac0d4187bd0cbdc14992af3b23d46938f4006b14c1e62c5fbdb67745f5db8d7
assets/GoToPrivateDialogue-Cto63C86.js,1723308051585,6a8dbefd25253e926f6f7ae8f5ef69080c8ac0466cee452c0e0df23e3f96e93e
assets/HomePage-DHBDRPF5.js,1723308051583,3cfb945a3bf44c7db5075e70b9ce020048dde615bb8dc6da0cf05e2778eddd48
assets/LanguagesPage-BIZLUTmp.css,1723308051582,4636f99ec7ed41d9f8c6acf2ef4a2b3b0afe15e00588b895736f7e2a75394d78
assets/length.validator-CVQ0WEiF.js,1723308051583,f7843883210f7b9e8115dc77313cd388e5a4e4f116dca90f291716ade72b594d
assets/index-BA-7LWjk.css,1723308051581,56255185d016b59bed26f7e087fc1e122dfd3c9d8a96e936f1079f4a9b2e851d
assets/private-dialogues.model-Bs6Cqid1.js,1723308051584,6caf8599ef1f77733b36989adb3c4dfd778fb5c2a77458a625aa1f2f07a0dd29
assets/GlobalNotifications-CUv3O-m8.js,1723308051585,d2051b1c1fdaf3f54e411a2ea209521b31ea23015b0d12d3748982de119800f8
assets/LanguagesPage-BxDkQpSS.js,1723308051585,74bfa471183b8d28a6c82a189262237b144a4c66873c7e0853fd3670a144ffce
assets/ProfilePage-BQJ83kDY.js,1723308051582,843699dcecfa5b5ae49adda7ea4d060a15f89b6350c5a6b0fe0ccd7db4c20350
assets/private-messages.model-qjl8shKQ.js,1723308051585,d410f4a8398e6d741d770dd92e2f84e16282bb3956c9ce366a164c3219c08e4f
assets/SearchPage-CB9DbVNb.css,1723308051582,692f6d19fe571f2d0e86f525ac3e6ca8769716fffdc4fb214fcaf19def5d87a9
assets/SearchPage-B0KInCVL.js,1723308051585,0d77963ed1f313252684771cfa4a9389e471d8404016229d65f331729b91915f
assets/UserContainer-D_Odfcbr.css,1723308051582,4428afc672897b7df4def8f6b10f3232034b6e067bfe125c7e1ba3b4d71260e5
assets/UserContainer-DnLfh0Ov.js,1723308051585,aa004023df1f2712fa878b041177ed4ddb9183da344ed81817818967a58cff79
assets/UserPreviewItem-Dyi_o4RN.js,1723308051585,b551c5fdbad6a6a4002e5636bc8cbde13fe8a28511b4ff3ff7c6cfc3971e9c51
assets/UserSettingsPage-AnzjBUGN.js,1723308051583,b123b5197fbc8a999b46f12d09c2be55392827890ae35e61870b219614f3a196
assets/UserPreviewItem-zAugQ05Z.css,1723308051582,388b460157f95c19e002e8399ec60cef9c766985c755950d8ff5e9e56cf48423
assets/Virtual-BgcJ6Uwh.css,1723308051582,15cc5277293cc94b2419cbd0590ae49573a2634eb63f51072906ecda8997fd22
assets/WorkInProgress-BzJPYl_y.js,1723308051585,ab8f373055cc4914ac8882b02318877f0c9b3916dfb6344e7cff3762ba89db5b
assets/WorkInProgress-Dzif40K2.css,1723308051582,18ad63720265f7ef87c6b160f86c1364753a8c6af490490e33a509282f6d82b2
assets/Virtual-jbg6dkCp.js,1723308051585,612b0ee312a143595be6eb2e35f44bf1cb7ce077e9f58a5d8ebd6f0100aca9e8
assets/index-4_DSiAKQ.js,1723308051585,5b116bee656bffb8afc9a200a5dcc8c38402d02a04f4fa7c30cc56d3f610bf1d
4 changes: 4 additions & 0 deletions public/locales/en/site-app.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
"dialogues_page": "Dialogues",
"files_page": "Files",
"languages_page": "Languages",
"music_page": "Music",
"posts_page": "Posts",
"photos_page": "Photos",
"settings_page": "Profile settings",
"open_navigation_menu": "Open menu",
"close_navigation_menu": "Close menu",
"open_user_menu": "Open user menu",
Expand Down
3 changes: 2 additions & 1 deletion public/locales/en/translation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@
"auth_success_title": "Welcome back",
"logout_button": "LogOut",
"go_to_user_page_of": "Go to the {{login}} user page",
"request_error": "Request error"
"request_error": "Request error",
"work_in_progress": "Work in progress"
}
3 changes: 3 additions & 0 deletions public/locales/en/user-settings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"profile_settings": "Profile settings"
}
4 changes: 4 additions & 0 deletions public/locales/ru/site-app.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
"dialogues_page": "Диалоги",
"files_page": "Файлы",
"languages_page": "Языки",
"music_page": "Музыка",
"posts_page": "Посты",
"photos_page": "Фото",
"settings_page": "Настройки профиля",
"open_navigation_menu": "Открыть меню",
"close_navigation_menu": "Закрыть меню",
"open_user_menu": "Открыть меню пользователя",
Expand Down
3 changes: 2 additions & 1 deletion public/locales/ru/translation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@
"auth_success_title": "Добро пожаловать",
"logout_button": "Выйти",
"go_to_user_page_of": "Перейти на страницу пользователя {{login}}",
"request_error": "Ошибка запроса"
"request_error": "Ошибка запроса",
"work_in_progress": "В разработке"
}
3 changes: 3 additions & 0 deletions public/locales/ru/user-settings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"profile_settings": "Настройки профиля"
}
88 changes: 52 additions & 36 deletions src/app/routes/main-site/config/routes.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,82 +12,98 @@ import { FilesPageAsync } from '@/pages/FilesPage/ui/FilesPage.async.tsx';
import {
LanguagesPageAsync,
} from '@/pages/LanguagesPage/ui/LanguagesPage.async.tsx';
import {
UserSettingsPageAsync,
} from '@/pages/UserSettingsPage/ui/UserSettingsPage.async.tsx';


export const SITE_ROUTE_DIALOGUE_ID = 'dialogueId';
export const SITE_ROUTE_USER_LOGIN = 'login';
export const SITE_ROUTE_FILE_ID = 'fileId';
export const SITE_ROUTE_DIALOGUE_ID = 'dialogueId';
export const SITE_ROUTE_USER_LOGIN = 'login';
export const SITE_ROUTE_FILE_ID = 'fileId';
export const SITE_ROUTE_SETTINGS_TYPE = 'type';

export enum SiteAppRoute {
HOME = 'home',
ABOUT = 'about',
USER = 'user',
SEARCH = 'search',
FRIENDS = 'friends',
DIALOGUE = 'dialogue',
DIALOGUES = 'dialogues',
FILE = 'file',
FILES = 'files',
LANGUAGES = 'languages',
NOT_FOUND = 'not_found',
HOME = 'home',
ABOUT = 'about',
USER = 'user',
SETTINGS = 'settings',
SETTINGS_TYPE = 'settings-type',
SEARCH = 'search',
FRIENDS = 'friends',
DIALOGUE = 'dialogue',
DIALOGUES = 'dialogues',
FILE = 'file',
FILES = 'files',
LANGUAGES = 'languages',
NOT_FOUND = 'not_found',
}

export const SiteAppRoutePath: Record<SiteAppRoute, string> = {
[SiteAppRoute.HOME] : '/',
[SiteAppRoute.FRIENDS] : '/friends',
[SiteAppRoute.SEARCH] : '/search',
[SiteAppRoute.DIALOGUE] : `/dialogue/:${ SITE_ROUTE_DIALOGUE_ID }`,
[SiteAppRoute.DIALOGUES]: '/dialogues',
[SiteAppRoute.ABOUT] : '/about',
[SiteAppRoute.USER] : `/user/:${ SITE_ROUTE_USER_LOGIN }`,
[SiteAppRoute.FILE] : `/file/:${ SITE_ROUTE_FILE_ID }`,
[SiteAppRoute.FILES] : `/files`,
[SiteAppRoute.LANGUAGES]: `/languages`,
[SiteAppRoute.NOT_FOUND]: '*',
[SiteAppRoute.HOME] : '/',
[SiteAppRoute.FRIENDS] : '/friends',
[SiteAppRoute.SEARCH] : '/search',
[SiteAppRoute.DIALOGUES] : '/dialogues',
[SiteAppRoute.DIALOGUE] : `/dialogues/:${ SITE_ROUTE_DIALOGUE_ID }`,
[SiteAppRoute.ABOUT] : '/about',
[SiteAppRoute.USER] : `/user/:${ SITE_ROUTE_USER_LOGIN }`,
[SiteAppRoute.SETTINGS] : `/settings`,
[SiteAppRoute.SETTINGS_TYPE]: `/settings/:${ SITE_ROUTE_SETTINGS_TYPE }`,
[SiteAppRoute.FILE] : `/file/:${ SITE_ROUTE_FILE_ID }`,
[SiteAppRoute.FILES] : `/files`,
[SiteAppRoute.LANGUAGES] : `/languages`,
[SiteAppRoute.NOT_FOUND] : '*',
};

export const SiteAppRouteConfig: Record<SiteAppRoute, RouteProps> = {
[SiteAppRoute.HOME] : {
[SiteAppRoute.HOME] : {
path : SiteAppRoutePath[SiteAppRoute.HOME],
element: <HomePageAsync/>,
},
[SiteAppRoute.ABOUT] : {
[SiteAppRoute.ABOUT] : {
path : SiteAppRoutePath[SiteAppRoute.ABOUT],
element: <AboutPageAsync/>,
},
[SiteAppRoute.USER] : {
[SiteAppRoute.USER] : {
path : SiteAppRoutePath[SiteAppRoute.USER],
element: <ProfilePageAsync/>,
},
[SiteAppRoute.DIALOGUES]: {
[SiteAppRoute.SETTINGS] : {
path : SiteAppRoutePath[SiteAppRoute.SETTINGS],
element: <UserSettingsPageAsync/>,
},
[SiteAppRoute.SETTINGS_TYPE]: {
path : SiteAppRoutePath[SiteAppRoute.SETTINGS_TYPE],
element: <UserSettingsPageAsync/>,
},
[SiteAppRoute.DIALOGUES] : {
path : SiteAppRoutePath[SiteAppRoute.DIALOGUES],
element: <DialoguesPageAsync/>,
},
[SiteAppRoute.DIALOGUE] : {
[SiteAppRoute.DIALOGUE] : {
path : SiteAppRoutePath[SiteAppRoute.DIALOGUE],
element: <DialoguesPageAsync/>,
},
[SiteAppRoute.FRIENDS] : {
[SiteAppRoute.FRIENDS] : {
path : SiteAppRoutePath[SiteAppRoute.FRIENDS],
element: <FriendsPageAsync/>,
},
[SiteAppRoute.SEARCH] : {
[SiteAppRoute.SEARCH] : {
path : SiteAppRoutePath[SiteAppRoute.SEARCH],
element: <SearchPageAsync/>,
},
[SiteAppRoute.FILE] : {
[SiteAppRoute.FILE] : {
path : SiteAppRoutePath[SiteAppRoute.FILE],
element: <FilesPageAsync/>,
},
[SiteAppRoute.FILES] : {
[SiteAppRoute.FILES] : {
path : SiteAppRoutePath[SiteAppRoute.FILES],
element: <FilesPageAsync/>,
},
[SiteAppRoute.LANGUAGES]: {
[SiteAppRoute.LANGUAGES] : {
path : SiteAppRoutePath[SiteAppRoute.LANGUAGES],
element: <LanguagesPageAsync/>,
},
[SiteAppRoute.NOT_FOUND]: {
[SiteAppRoute.NOT_FOUND] : {
path : SiteAppRoutePath[SiteAppRoute.NOT_FOUND],
element: <NotFoundPage/>,
},
Expand Down
11 changes: 10 additions & 1 deletion src/entities/private-dialogues/item/PrivateDialogue/ui/PrivateDialogue.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ import {
} from '@/entities/private-dialogues/item/PrivateDialogueMessagePreview/ui/PrivateDialogueMessagePreview.tsx';
import { Link } from '@/shared/ui-kit/links/Link/ui/Link.tsx';
import { DomainMessage } from 'product-types/dist/message/DomainMessage';
import { getRouteUrl } from '@/app/routes/lib/getRouteUrl.ts';
import {
SITE_ROUTE_DIALOGUE_ID,
SiteAppRoute,
SiteAppRoutePath,
} from '@/app/routes/main-site/config/routes.tsx';


export type PrivateDialogueProps =
Expand All @@ -43,7 +49,10 @@ export const PrivateDialogue: FC<PrivateDialogueProps> = memo(function PrivateDi
{ ...other }
className={ classNames(css.container, { [css.selected]: selected }, [ className ]) }
>
<Link className={ css.link } to={ `/dialogue/${ dialogue.id }` }>
<Link className={ css.link }
to={ getRouteUrl(SiteAppRoutePath[SiteAppRoute.DIALOGUE], {
[SITE_ROUTE_DIALOGUE_ID]: dialogue.id,
}) }>
<PrivateDialogueIcon
className={ css.image }
dialogueAvatar={ dialogue.avatar }
Expand Down
Loading

0 comments on commit fa5f4fd

Please sign in to comment.