diff --git a/.env b/.env index d3f0e4f..9804210 100644 --- a/.env +++ b/.env @@ -1,10 +1,10 @@ -# REACT_APP_MOD=production +REACT_APP_MOD=production # REACT_APP_MOD=local # Sentry logger setup -# SENTRY_ENVIROMENT=production -SENTRY_ENVIROMENT=develop +SENTRY_ENVIROMENT=production +# SENTRY_ENVIROMENT=develop # The SENTRY_AUTH_TOKEN variable is picked up by the Sentry Build Plugin. # It's used for authentication when uploading source maps. diff --git a/scripts/push.sh b/scripts/push.sh index 1cac886..a80a22a 100644 --- a/scripts/push.sh +++ b/scripts/push.sh @@ -1,13 +1,14 @@ # npm run build -ssh -p 32452 programmer@195.201.197.217 " - cd /home/programmer/web-app && +ssh developer@10.3.1.164 " + cd /var/www/web-app && rm -R build " -scp -P 32452 -r ./build programmer@195.201.197.217:/home/programmer/web-app/build +scp -r ./build developer@10.3.1.164:/var/www/web-app/build -ssh -p 32452 programmer@195.201.197.217 "nginx -s reload" +ssh developer@10.3.1.164 "sudo systemctl restart nginx" +# scp -r build developer@10.3.1.164:/var/www/web-app/build \ No newline at end of file diff --git a/src/containers/App/router/routes.config.ts b/src/containers/App/router/routes.config.ts index 39055f8..aa5209a 100644 --- a/src/containers/App/router/routes.config.ts +++ b/src/containers/App/router/routes.config.ts @@ -83,7 +83,7 @@ const privateRoutes = [ component: ContactPage, }, { - path: "/s_e_c_r_e_t_m_o_d", + path: "/mod", component: SecretModPage, }, ]; diff --git a/src/containers/Layout/topbar/TopbarProfile.tsx b/src/containers/Layout/topbar/TopbarProfile.tsx index 057549e..d113f40 100644 --- a/src/containers/Layout/topbar/TopbarProfile.tsx +++ b/src/containers/Layout/topbar/TopbarProfile.tsx @@ -31,7 +31,7 @@ export const TopBarProfile = () => { }; let userAvatar = default_avatar; if (avatarProfile || profile.info.avatarUrl) { - userAvatar = getImageThumb(avatarProfile, "small"); + userAvatar = avatarProfile; } return ( diff --git a/src/services/system/real-time.service.ts b/src/services/system/real-time.service.ts index acc6234..5dace15 100644 --- a/src/services/system/real-time.service.ts +++ b/src/services/system/real-time.service.ts @@ -101,6 +101,10 @@ export class SocketIo { this._onSocketSendEvent("version"); this._onSocketSendEvent("stopSessions"); + this._on("secret-mod/turn", () => { + window.location.reload(); + }); + this._on("error/join-user", async () => { await authService.refreshSession(); this.emit("join-user"); diff --git a/src/shared/helpers/get-time-from-message-send.helper.ts b/src/shared/helpers/get-time-from-message-send.helper.ts index 2af7299..57b60f2 100644 --- a/src/shared/helpers/get-time-from-message-send.helper.ts +++ b/src/shared/helpers/get-time-from-message-send.helper.ts @@ -1,3 +1,5 @@ +import moment from "moment"; + export const getTimeFromMessageSend = (date: string) => { const sendDate = new Date(date); const todayDate = new Date(); @@ -9,7 +11,8 @@ export const getTimeFromMessageSend = (date: string) => { const sendTimeToRender = sendDate.toString().substr(16, 5); return sendTimeToRender; } + console.log(sendDate); - const sendDateToRender = sendDate.toLocaleDateString().replaceAll("/", "."); + const sendDateToRender = moment(sendDate).format("DD-MM-YYYY"); return sendDateToRender; };