merge: branch 'refactor/client-cleanup'

concord-client/package.json

@@ -4,7 +4,8 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "bunx --bun vite --open",
+    "dev:web": "VITE_APP_MODE=web bunx --bun vite",
+    "dev:electron": "bunx --bun vite --open",
     "build": "tsc && bunx --bun vite build && electron-builder",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "bunx --bun vite preview"

concord-client/src/App.tsx

@@ -65,7 +65,7 @@ function App(props: { socket: Socket }) {
   return (
     <ErrorBoundary>
       <QueryClientProvider client={queryClient}>
-        <ThemeProvider defaultTheme="system" storageKey="discord-theme">
+        <ThemeProvider defaultTheme="system" storageKey="concord-theme">
           <Router>
             <div className="h-screen w-screen overflow-hidden bg-background text-foreground">
               <Routes>

concord-client/src/pages/ChatPage.tsx

@@ -558,9 +558,8 @@ const ChatPage: React.FC = () => {
       </div>
     );
   } else if (!channelId || !currentChannel) {
-    const existingChannelId = categories
+    const existingChannelId = categories?.flatMap((cat) => cat.channels)?.[0]
-      ?.flatMap((cat) => cat.channels)
+      ?.id; // Get the first channel from the flattened list
-      ?.find((channel) => channel.position === 0)?.id;
 
     if (existingChannelId) {
       navigate(`/channels/${instanceId}/${existingChannelId}`);

concord-client/vite.config.ts

@@ -5,9 +5,15 @@ import react from "@vitejs/plugin-react";
 import tailwindcss from "@tailwindcss/vite";
 
 // https://vitejs.dev/config/
-export default defineConfig({
+export default defineConfig(({ mode }) => {
+  // Check if VITE_APP_MODE is set to 'web'
+  const isWebApp = process.env.VITE_APP_MODE === "web";
+
+  return {
     plugins: [
       react(),
+      // Only include the electron plugin if not in 'web' app mode
+      !isWebApp &&
         electron({
           main: {
             // Shortcut of `build.lib.entry`.
@@ -28,10 +34,11 @@ export default defineConfig({
               : {},
         }),
       tailwindcss(),
-  ],
+    ].filter(Boolean), // Filter out 'false' values if electron plugin is not included
     resolve: {
       alias: {
         "@": path.resolve(__dirname, "./src"),
       },
     },
+  };
 });