Merge pull request #933 from The-Commit-Company/develop

Release v1.6.0
The-Commit-Company · Jun 11, 2024 · 4b12de2 · 4b12de2
2 parents 2495f4c + 8fdf9a4
commit 4b12de2
Show file tree

Hide file tree

Showing 192 changed files with 4,553 additions and 2,235 deletions.
diff --git a/mobile/package.json b/mobile/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mobile",
   "private": true,
-  "version": "1.5.5",
+  "version": "1.6.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/mobile/src/components/features/polls/ViewPollVotes.tsx b/mobile/src/components/features/polls/ViewPollVotes.tsx
@@ -96,7 +96,6 @@ const UserVote = ({ user_id }: { user_id: string }) => {
         <IonLabel>
             <div className='flex flex-col -gap-0.5 text-ellipsis justify-center'>
                 <Text as='span' className='block' weight='medium' size='3'>{user?.full_name}</Text>
-                <Text as='span' size='2' color='gray'>{user?.name}</Text>
             </div>
         </IonLabel>
     </IonItem>

diff --git a/mobile/src/pages/profile/Profile.tsx b/mobile/src/pages/profile/Profile.tsx
@@ -62,7 +62,7 @@ export const Profile = () => {
                     </IonItem>
                 </IonList>
                 <div className="ion-text-center mt-16">
-                    <Text as='span'><Text as='span' size='6' className='cal-sans'>raven</Text> <Text as='span' color='gray'>v1.5.5</Text></Text>
+                    <Text as='span'><Text as='span' size='6' className='cal-sans'>raven</Text> <Text as='span' color='gray'>v1.6.0</Text></Text>
                     <br />
                     <Text as='span' color='gray'>Made by The Commit Company</Text>
                 </div>

diff --git a/mobile/src/utils/channel/ChannelListProvider.tsx b/mobile/src/utils/channel/ChannelListProvider.tsx
@@ -6,12 +6,6 @@ import { RavenChannel } from '../../../../types/RavenChannelManagement/RavenChan
 import { UserContext } from '../auth/UserProvider'
 import { useSWRConfig } from 'frappe-react-sdk'
 
-export type ExtraUsersData = {
-    name: string,
-    full_name: string,
-    user_image: string,
-}
-
 export type UnreadChannelCountItem = { name: string, user_id?: string, unread_count: number, is_direct_message: 0 | 1 }
 
 export type UnreadCountData = {
@@ -28,8 +22,7 @@ export interface DMChannelListItem extends ChannelListItem {
 }
 interface ChannelList {
     channels: ChannelListItem[],
-    dm_channels: DMChannelListItem[],
-    extra_users: ExtraUsersData[]
+    dm_channels: DMChannelListItem[]
 }
 
 export interface ChannelListContextType extends ChannelList {
@@ -115,7 +108,6 @@ const useFetchChannelList = (): ChannelListContextType => {
     return {
         channels: sortedChannels,
         dm_channels: sortedDMChannels,
-        extra_users: data?.message.extra_users ?? [],
         mutate,
         ...rest
     }
@@ -180,7 +172,6 @@ export const useUpdateLastMessageInChannelList = () => {
                                 message: {
                                     channels: newChannels,
                                     dm_channels: newDMChannels,
-                                    extra_users: channelList.message.extra_users
                                 }
                             }
                         }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "raven",
-  "version": "1.5.5",
+  "version": "1.6.0",
   "description": "Messaging Application",
   "main": "index.js",
   "scripts": {

diff --git a/raven-app/index.html b/raven-app/index.html
@@ -3,19 +3,131 @@
 
 <head>
   <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta name="viewport"
+    content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
   <title>{{ app_name }}</title>
-  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-  <link rel="manifest" href="/site.webmanifest">
-  <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#000000">
+  <meta name="description" content="Simple, work messaging tool.">
+  <link rel="apple-touch-icon" sizes="180x180" href="/assets/raven/manifest/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/assets/raven/manifest/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/assets/raven/manifest/favicon-16x16.png">
   <meta name="msapplication-TileColor" content="#000000">
-  <meta name="theme-color" content="#ffffff">
+  <meta name="theme-color" content="#191919">
+  <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#000000">
+
+  <meta name="apple-mobile-web-app-capable" content="yes" />
+  <meta name="apple-mobile-web-app-title" content="{{ app_name }} | Raven" />
+  <meta name="apple-touch-fullscreen" content="yes" />
+  <meta name="apple-mobile-web-app-status-bar-style" content="default">
+  <meta name="screen-orientation" content="portrait">
+  <meta name="mobile-web-app-capable" content="yes">
+
+
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 430px) and (device-height: 932px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)"
+    href="/splash_screens/iPhone_14_Pro_Max_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 393px) and (device-height: 852px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)"
+    href="/splash_screens/iPhone_14_Pro_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)"
+    href="/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)"
+    href="/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)"
+    href="/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)"
+    href="/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
+    href="/splash_screens/iPhone_11__iPhone_XR_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)"
+    href="/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
+    href="/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
+    href="/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
+    href="/splash_screens/12.9__iPad_Pro_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
+    href="/splash_screens/11__iPad_Pro__10.5__iPad_Pro_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 820px) and (device-height: 1180px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
+    href="/splash_screens/10.9__iPad_Air_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
+    href="/splash_screens/10.5__iPad_Air_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
+    href="/splash_screens/10.2__iPad_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
+    href="/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 744px) and (device-height: 1133px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)"
+    href="/splash_screens/8.3__iPad_Mini_landscape.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 430px) and (device-height: 932px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)"
+    href="/splash_screens/iPhone_14_Pro_Max_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 393px) and (device-height: 852px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)"
+    href="/splash_screens/iPhone_14_Pro_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)"
+    href="/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)"
+    href="/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)"
+    href="/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)"
+    href="/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
+    href="/splash_screens/iPhone_11__iPhone_XR_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)"
+    href="/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
+    href="/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
+    href="/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
+    href="/splash_screens/12.9__iPad_Pro_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
+    href="/splash_screens/11__iPad_Pro__10.5__iPad_Pro_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 820px) and (device-height: 1180px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
+    href="/splash_screens/10.9__iPad_Air_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
+    href="/splash_screens/10.5__iPad_Air_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
+    href="/splash_screens/10.2__iPad_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
+    href="/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_portrait.png">
+  <link rel="apple-touch-startup-image"
+    media="screen and (device-width: 744px) and (device-height: 1133px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
+    href="/splash_screens/8.3__iPad_Mini_portrait.png">
 </head>
 
 <body>
-  <div id="root"></div>
+  <div id="root" vaul-drawer-wrapper="true"></div>
   <script>window.csrf_token = '{{ csrf_token }}';
     if (!window.frappe) window.frappe = {};
 

diff --git a/raven-app/package.json b/raven-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "raven-app",
   "private": true,
-  "version": "1.5.5",
+  "version": "1.6.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -32,6 +32,7 @@
     "dayjs": "^1.11.10",
     "downshift": "^8.3.1",
     "emoji-picker-element": "^1.21.0",
+    "firebase": "^10.9.0",
     "frappe-react-sdk": "^1.7.0",
     "highlight.js": "^11.9.0",
     "html-react-parser": "^5.1.8",
@@ -42,17 +43,20 @@
     "react-dom": "^18.2.0",
     "react-dropzone": "^14.2.3",
     "react-hook-form": "^7.50.1",
-    "react-icons": "^5.0.1",
+    "react-icons": "^5.2.1",
     "react-idle-timer": "^5.7.2",
     "react-intersection-observer": "^9.8.1",
     "react-router-dom": "^6.22.0",
+    "react-zoom-pan-pinch": "^3.4.4",
     "sonner": "^1.4.41",
     "tailwindcss": "^3.4.1",
     "tailwindcss-animate": "^1.0.7",
     "tippy.js": "^6.3.7",
     "turndown": "^7.1.2",
+    "use-double-tap": "^1.3.6",
+    "vaul": "^0.9.1",
     "vite": "^4.5.2",
-    "vite-plugin-pwa": "^0.17.5",
+    "vite-plugin-pwa": "^0.20.0",
     "vite-plugin-svgr": "^4.2.0"
   },
   "devDependencies": {

diff --git a/raven-app/public/android-chrome-192x192.png b/raven-app/public/android-chrome-192x192.png
diff --git a/raven-app/public/android-chrome-384x384.png b/raven-app/public/android-chrome-384x384.png
diff --git a/raven-app/public/apple-touch-icon.png b/raven-app/public/apple-touch-icon.png
diff --git a/raven-app/public/favicon-16x16.png b/raven-app/public/favicon-16x16.png
diff --git a/raven-app/public/favicon-32x32.png b/raven-app/public/favicon-32x32.png
diff --git a/raven-app/public/favicon.ico b/raven-app/public/favicon.ico