Fix electron, v0.0.96

Author: yayvery

.github/workflows/build.yml

@@ -114,6 +114,7 @@ jobs:
           mac_certs: ${{ secrets.mac_certs }}
           mac_certs_password: ${{ secrets.mac_certs_password }}
         env:
+          VITE_API_DOMAIN: ${{ secrets.API_DOMAIN }}
           # macOS notarization API key
           API_KEY_ID: ${{ secrets.api_key_id }}
           API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}

electron/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron",
   "description": "All-in-one chat and forums for communities.",
-  "version": "0.0.95",
+  "version": "0.0.96",
   "private": true,
   "repository": "github:joincomet/comet",
   "homepage": "https://joincomet.app",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "comet",
-	"version": "0.0.95",
+	"version": "0.0.96",
 	"private": true,
 	"license": "MPL-2.0",
 	"author": {

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "0.0.95",
+  "version": "0.0.96",
   "private": true,
   "engines": {
     "node": "16.x.x"

web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "web",
   "description": "All-in-one chat and forums for communities.",
-  "version": "0.0.95",
+  "version": "0.0.96",
   "private": true,
   "repository": "github:joincomet/comet",
   "homepage": "https://joincomet.app",
@@ -24,6 +24,7 @@
     "@headlessui/react": "^1.3.0",
     "@n1ru4l/graphql-live-query": "^0.7.1",
     "@n1ru4l/graphql-live-query-patch": "^0.3.2",
+    "@n1ru4l/graphql-live-query-patch-json-patch": "^0.3.2",
     "@n1ru4l/push-pull-async-iterable-iterator": "^2.1.4",
     "@netlify/classnames-template-literals": "^1.0.0",
     "@popperjs/core": "^2.9.2",

web/src/App.jsx

@@ -4,7 +4,7 @@ import Routes from '@/pages/Routes'
 import { ApolloProvider } from '@apollo/client/react'
 import ResponsiveToaster from '@/components/ui/ResponsiveToaster'
 import CustomDragLayer from '@/components/ui/CustomDragLayer'
-import { BrowserRouter as Router } from 'react-router-dom'
+import { BrowserRouter, HashRouter } from 'react-router-dom'
 import { Helmet, HelmetProvider } from 'react-helmet-async'
 import TitleBar from '@/components/ui/electron/titlebar/TitleBar'
 import { getOS } from '@/utils/getOS'
@@ -16,6 +16,7 @@ import UserProvider from '@/providers/UserProvider'
 
 export default function App() {
   const isMac = getOS() === 'Mac OS'
+  const Router = window.electron ? HashRouter : BrowserRouter
 
   return (
     <ApolloProvider client={apolloClient}>

web/src/components/BottomBar.jsx

@@ -14,7 +14,7 @@ import { OnlineStatus, useChangeOnlineStatusMutation } from '@/graphql/hooks'
 import { Link } from 'react-router-dom'
 import { getDownloadLink } from '@/hooks/getDownloadLink'
 import { useLoginDialog } from '@/hooks/useLoginDialog'
-import {getOS} from "@/utils/getOS";
+import { getOS } from '@/utils/getOS'
 
 export default function BottomBar() {
   const [currentUser] = useCurrentUser()
@@ -90,13 +90,18 @@ export default function BottomBar() {
         )}
 
         <div className="ml-auto flex items-center space-x-4 text-primary">
-          {/*{os === 'Windows' && !window.electron && (
+          {os === 'Windows' && !window.electron && (
             <Tippy content="Download Comet for Desktop">
-              <a className="block" target="_blank" rel="noopener noreferrer" href={downloadLink}>
+              <a
+                className="block"
+                target="_blank"
+                rel="noopener noreferrer"
+                href={downloadLink}
+              >
                 <IconDownload className="w-4.5 h-4.5 text-tertiary cursor-pointer" />
               </a>
             </Tippy>
-          )}*/}
+          )}
 
           <Tippy
             content={`${

web/src/components/ui/EndReached.jsx

@@ -1,4 +1,5 @@
 import { memo } from 'react'
+import astronaut from './astronaut.png'
 
 export default memo(function EndReached({
   children = 'No more posts loaded!',
@@ -8,7 +9,7 @@ export default memo(function EndReached({
     <div className="flex flex-col items-center justify-center text-primary py-6">
       <img
         alt="astronaut"
-        src="/astronaut.png"
+        src={astronaut}
         className={`object-contain opacity-50 animate-float select-none pointer-events-none ${className}`}
       />
       <div className="text-tertiary pt-3 text-lg font-semibold">{children}</div>