Dev (#51)

* Updated dockerfile to match new standard * added cd for dev branch (#22) Co-authored-by: Mike de Geofroy <[email protected]> * fixed formatting * Moved api url to env Cleaned up useless console log * Added .env info log * fix(env): pushed env lol * Added gitignore * Added .env values * Updated cd pipelines. Added envs into build * added copy .env * Removed copy dev :) * Update cd-dev.yaml * feat(settings): Updated Settings Page (#32) * Added avatars to settings page * Updated settings page * Remove envs * Comment sandwitch * remove secret * blank * fix(lint): Fixed bad lint problem * feat(cards): Updated the card design (#34) * Added basic card components. * adding opacity on like & dislikes * Added likes and dislikes to cards * fix(android): Updated Cards * feat(end-screen): Added an end screen. (#42) * Updated result interface and added basic markup for result page. * Added card bottom icons. * Added time to cards * fix(lint): fixed lint errors * fixed settings error * Removed unused assets * feat(error): Added error pages and websocket error parsing (#45) * Updated dockerfile to match new standard * added cd for dev branch (#22) * fixed formatting * Moved api url to env Cleaned up useless console log * Added .env info log * fix(env): pushed env lol * Added gitignore * Added .env values * Updated cd pipelines. Added envs into build * added copy .env * Removed copy dev :) * Update cd-dev.yaml * feat(settings): Updated Settings Page (#32) * Added avatars to settings page * Updated settings page * Remove envs * Comment sandwitch * remove secret * blank * fix(lint): Fixed bad lint problem * feat(cards): Updated the card design (#34) * Added basic card components. * adding opacity on like & dislikes * Added likes and dislikes to cards * fix(android): Updated Cards * feat(end-screen): Added an end screen. (#42) * Updated result interface and added basic markup for result page. * Added card bottom icons. * Added time to cards * fix(lint): fixed lint errors * fixed settings error * Removed unused assets --------- Co-authored-by: Alex Dyakonov <[email protected]> Co-authored-by: Alex Dyakonov <[email protected]> Co-authored-by: vaniog <[email protected]> * feat(map): Added map to home screen. (#46) * Added a map on home screen. * Cleaned up comments and logs * fixed lint * fixed errors uncaught by lint * moved share to settings * updated share link * feat(lobby-preview): Added a lobby preview page (#50) * feat(end-screen): Updated end screen. (#43) * Updated dockerfile to match new standard * added cd for dev branch (#22) Co-authored-by: Mike de Geofroy <[email protected]> * fixed formatting * Moved api url to env Cleaned up useless console log * Added .env info log * fix(env): pushed env lol * Added gitignore * Added .env values * Updated cd pipelines. Added envs into build * added copy .env * Removed copy dev :) * Update cd-dev.yaml * feat(settings): Updated Settings Page (#32) * Added avatars to settings page * Updated settings page * Remove envs * Comment sandwitch * remove secret * blank * fix(lint): Fixed bad lint problem * feat(cards): Updated the card design (#34) * Added basic card components. * adding opacity on like & dislikes * Added likes and dislikes to cards * fix(android): Updated Cards * feat(end-screen): Added an end screen. (#42) * Updated result interface and added basic markup for result page. * Added card bottom icons. * Added time to cards * fix(lint): fixed lint errors * fixed settings error * Removed unused assets --------- Co-authored-by: Alex Dyakonov <[email protected]> Co-authored-by: Alex Dyakonov <[email protected]> Co-authored-by: vaniog <[email protected]> * feat(map): Added map to home screen. (#47) * Updated dockerfile to match new standard * added cd for dev branch (#22) Co-authored-by: Mike de Geofroy <[email protected]> * fixed formatting * Moved api url to env Cleaned up useless console log * Added .env info log * fix(env): pushed env lol * Added gitignore * Added .env values * Updated cd pipelines. Added envs into build * added copy .env * Removed copy dev :) * Update cd-dev.yaml * feat(settings): Updated Settings Page (#32) * Added avatars to settings page * Updated settings page * Remove envs * Comment sandwitch * remove secret * blank * fix(lint): Fixed bad lint problem * feat(cards): Updated the card design (#34) * Added basic card components. * adding opacity on like & dislikes * Added likes and dislikes to cards * fix(android): Updated Cards * feat(end-screen): Added an end screen. (#42) * Updated result interface and added basic markup for result page. * Added card bottom icons. * Added time to cards * fix(lint): fixed lint errors * fixed settings error * Removed unused assets * feat(error): Added error pages and websocket error parsing (#45) * Updated dockerfile to match new standard * added cd for dev branch (#22) * fixed formatting * Moved api url to env Cleaned up useless console log * Added .env info log * fix(env): pushed env lol * Added gitignore * Added .env values * Updated cd pipelines. Added envs into build * added copy .env * Removed copy dev :) * Update cd-dev.yaml * feat(settings): Updated Settings Page (#32) * Added avatars to settings page * Updated settings page * Remove envs * Comment sandwitch * remove secret * blank * fix(lint): Fixed bad lint problem * feat(cards): Updated the card design (#34) * Added basic card components. * adding opacity on like & dislikes * Added likes and dislikes to cards * fix(android): Updated Cards * feat(end-screen): Added an end screen. (#42) * Updated result interface and added basic markup for result page. * Added card bottom icons. * Added time to cards * fix(lint): fixed lint errors * fixed settings error * Removed unused assets --------- Co-authored-by: Alex Dyakonov <[email protected]> Co-authored-by: Alex Dyakonov <[email protected]> Co-authored-by: vaniog <[email protected]> * feat(map): Added map to home screen. (#46) * Added a map on home screen. * Cleaned up comments and logs * fixed lint * fixed errors uncaught by lint --------- Co-authored-by: Alex Dyakonov <[email protected]> Co-authored-by: Alex Dyakonov <[email protected]> Co-authored-by: vaniog <[email protected]> * Updated ci/cd pipelines (#48) * Updated tests * Updated cd for prod * fixed ci-tests.yaml error (#49) --------- Co-authored-by: Alex Dyakonov <[email protected]> Co-authored-by: Alex Dyakonov <[email protected]> Co-authored-by: vaniog <[email protected]> * Trigger Build * bad merge --------- Co-authored-by: Alex Dyakonov <[email protected]> Co-authored-by: Alex Dyakonov <[email protected]> Co-authored-by: vaniog <[email protected]>
shampsdev · Nov 7, 2024 · 5e282cb · 5e282cb
1 parent 9bbda46
commit 5e282cb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/cd-production.yaml b/.github/workflows/cd-production.yaml
@@ -1,5 +1,6 @@
 name: cd-prod
 
+
 on:
   workflow_dispatch:
     inputs:

diff --git a/src/modules/settings/users.tsx b/src/modules/settings/users.tsx
@@ -1,11 +1,17 @@
 import { Avatar } from "@/components/ui/avatar";
 import { useLobbyStore } from "@/shared/stores/lobby.store";
+import { useWebApp } from "@vkruglikov/react-telegram-web-app";
 
 export const Users = () => {
-    const { users } = useLobbyStore()
+    const { users, lobbyId } = useLobbyStore();
+
+    const { openTelegramLink } = useWebApp();
+    const onShareClick = () => {
+        openTelegramLink(`https://t.me/share/url?url=https://t.me/${'dishdashdev_bot'}/app?startapp=${lobbyId}`);
+    }
 
     return (
-        <div className="relative h-full w-full">
+        <div onClick={onShareClick} className="relative h-full w-full">
             {users.slice(0, 3).map((user, index) => {
                 return (
                     <Avatar
@@ -20,7 +26,7 @@ export const Users = () => {
                     />
                 );
             })}
-            { users.length > 3 && <div className="text-sm absolute -right-3 top-[14px] bg-primary rounded-[20px] px-2">+{users.length - 3}</div>}
+            {users.length > 3 && <div className="text-sm absolute -right-3 top-[14px] bg-primary rounded-[20px] px-2">+{users.length - 3}</div>}
         </div>
     )
 }
diff --git a/src/pages/home.page.tsx b/src/pages/home.page.tsx
@@ -9,14 +9,12 @@ import { Avatar } from "@/components/ui/avatar";
 export const HomePage = () => {
     const [position, setPosition] = useState({ lat: 59.9311, lon: 30.3609 });
     const webApp = useWebApp();
-    const { openTelegramLink, MainButton, enableVerticalSwipes, disableVerticalSwipes } = webApp;
+    const { MainButton, enableVerticalSwipes, disableVerticalSwipes } = webApp;
     const navigate = useNavigate();
     const [initDataUnsafe] = useInitData();
 
     const handleClick = async () => {
         const lobby = await postLobby(position);
-        openTelegramLink(`https://t.me/share/url?url=https://t.me/dishdashtunnel_bot/app?startapp=${lobby?.id}`);
-
         navigate(`/${lobby?.id}`);
     };
 

diff --git a/src/pages/lobby-settings.page.tsx b/src/pages/lobby-settings.page.tsx
@@ -15,6 +15,7 @@ const LobbySettingsPage = () => {
     const { settings } = useLobbyStore();
     const { priceMin, priceMax, maxDistance } = settings;
 
+
     // causes lag wihout callback
     const handleSettingsChange = useCallback((newSettings: Settings) => {
         settingsUpdateEvent.update(newSettings);
@@ -30,7 +31,6 @@ const LobbySettingsPage = () => {
         });
     };
 
-
     const pageVariants = {
         initial: { opacity: 0 },
         animate: {
@@ -59,11 +59,11 @@ const LobbySettingsPage = () => {
                             <h3 className="text-2xl font-medium my-4 w-full text-left">
                                 Настройки
                             </h3>
-                            <Users /> 
+                            <Users />
                         </div>
 
                         <div className="space-y-4 mb-8 w-full">
-                            <Tags/>
+                            <Tags />
                         </div>
                     </div>