Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@
"scripts": {
"dev": "vite",
"dev:app": "vite --port 5173 --strictPort",
"build": "tsc -b && vite build && npm run auth:build",
"auth:build": "vite build --config vite.auth.config.ts",
"auth:dev": "vite --config vite.auth.config.ts --port 5175 --strictPort",
"prebuild:all": "npm run auth:build && node scripts/ensure-playwright-runner.js && node scripts/ensure-personal-server.js",
"build": "tsc -b && vite build",
"prebuild:all": "node scripts/ensure-playwright-runner.js && node scripts/ensure-personal-server.js",
"pretauri:dev": "npm run prebuild:all",
"pretauri:build": "npm run auth:build",
"lint": "eslint .",
"format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,css,scss,md}\"",
"format:check": "prettier --check \"**/*.{ts,tsx,js,jsx,json,css,scss,md}\"",
Expand All @@ -33,8 +30,6 @@
},
"dependencies": {
"@base-ui/react": "^1.1.0",
"@privy-io/js-sdk-core": "^0.58.7",
"@privy-io/react-auth": "^2.4.0",
"@reduxjs/toolkit": "^2.11.2",
"@tabler/icons-react": "^3.36.1",
"@tauri-apps/api": "~2.10.1",
Expand All @@ -54,6 +49,7 @@
"shadcn": "^3.7.0",
"tailwind-merge": "^3.4.0",
"tw-animate-css": "^1.4.0",
"viem": "^2.45.1",
"zod": "^3.25.76"
},
"devDependencies": {
Expand Down
500 changes: 0 additions & 500 deletions src-tauri/src/commands/auth.rs

This file was deleted.

2 changes: 0 additions & 2 deletions src-tauri/src/commands/mod.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
pub mod auth;
pub mod connector;
pub mod download;
pub mod file_ops;
pub mod server;
pub mod updates;

pub use auth::*;
pub use connector::*;
pub use download::*;
pub use file_ops::*;
Expand Down
6 changes: 2 additions & 4 deletions src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ mod commands;
mod processors;

use commands::{
cancel_browser_auth, check_browser_available, check_connected_platforms, check_connector_updates,
check_browser_available, check_connected_platforms, check_connector_updates,
cleanup_personal_server, clear_browser_session, debug_connector_paths, download_browser,
download_chromium_rust, download_connector, get_app_config, get_installed_connectors,
get_personal_server_status, get_platforms, get_registry_url, get_run_files, get_user_data_path,
handle_download, list_browser_sessions, load_latest_source_export_full,
load_latest_source_export_preview, load_run_export_data, load_runs, mark_export_synced,
open_folder, open_platform_export_folder, set_app_config, start_browser_auth,
open_folder, open_platform_export_folder, set_app_config,
start_personal_server, start_connector_run, stop_connector_run, stop_personal_server,
test_nodejs, write_export_data,
};
Expand Down Expand Up @@ -79,8 +79,6 @@ pub fn run() {
get_installed_connectors,
get_app_config,
set_app_config,
start_browser_auth,
cancel_browser_auth,
start_personal_server,
stop_personal_server,
get_personal_server_status,
Expand Down
7 changes: 2 additions & 5 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"build": {
"frontendDist": "../dist",
"devUrl": "http://localhost:5173",
"beforeDevCommand": "npm run auth:build && npm run dev",
"beforeDevCommand": "npm run dev",
"beforeBuildCommand": "npm run build"
},
"app": {
Expand Down Expand Up @@ -62,10 +62,7 @@
"../connectors/openai/**/*": "connectors/openai/",
"../connectors/spotify/**/*": "connectors/spotify/",
"../playwright-runner/dist/*": "playwright-runner/dist/",
"../personal-server/dist/personal-server*": "personal-server/dist/",
"auth-page/*": "auth-page/",
"auth-page/assets/*": "auth-page/assets/",
"auth-page/fonts/*": "auth-page/fonts/"
"../personal-server/dist/personal-server*": "personal-server/dist/"
},
"windows": {
"nsis": {
Expand Down
67 changes: 24 additions & 43 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import { lazy, Suspense } from "react"
import { BrowserRouter, Routes, Route, useLocation } from "react-router-dom"
import { BrowserRouter, Routes, Route } from "react-router-dom"
import { Provider } from "react-redux"
import { store } from "./state/store"
import { useEvents } from "./hooks/useEvents"
import { useInitialize } from "./hooks/useInitialize"
import { TopNav } from "./components/top-nav"
import { PrivyProvider } from "./components/providers/PrivyProvider"
import { InlineLogin } from "./components/auth/InlineLogin"
import { BrowserLogin } from "./pages/browser-login"
import { useDeepLink } from "./hooks/use-deep-link"
import { usePersonalServer } from "./hooks/usePersonalServer"
import { usePendingApprovalRetry } from "./hooks/usePendingApproval"
Expand Down Expand Up @@ -84,7 +81,6 @@ function AppContent() {
<Route path={ROUTES.settings} element={<Settings />} />
<Route path={ROUTES.connect} element={<Connect />} />
<Route path={ROUTES.grant} element={<Grant />} />
<Route path={ROUTES.login} element={<InlineLogin />} />
</Routes>
</Suspense>
</main>
Expand All @@ -93,47 +89,32 @@ function AppContent() {
)
}

// Router wrapper that handles both app content and standalone browser login
function AppRouter() {
const location = useLocation()

// Browser login page is standalone (for external browser auth flow)
if (location.pathname === ROUTES.browserLogin) {
return <BrowserLogin />
}

return <AppContent />
}

function App() {
return (
<Provider store={store}>
<PrivyProvider>
<div style={dotPatternStyle} className="min-h-screen">
<BrowserRouter>
<Suspense fallback={<div className="p-8">Loading...</div>}>
<Routes>
<Route path={ROUTES.browserLogin} element={<BrowserLogin />} />
<Route
path={ROUTES.rickrollMockRoot}
element={<RickrollMockRoot />}
/>
<Route
path={ROUTES.rickrollMockSignIn}
element={<RickrollMockSignIn />}
/>
{/* Demo flow (throwaway — for video recording) */}
<Route path={ROUTES.demo} element={<DemoIndex />} />
<Route path={ROUTES.demoConnect} element={<DemoConnect />} />
<Route path={ROUTES.demoAuth} element={<DemoAuth />} />
<Route path={ROUTES.demoConsent} element={<DemoConsent />} />
<Route path={ROUTES.demoSuccess} element={<DemoSuccess />} />
<Route path="/*" element={<AppRouter />} />
</Routes>
</Suspense>
</BrowserRouter>
</div>
</PrivyProvider>
<div style={dotPatternStyle} className="min-h-screen">
<BrowserRouter>
<Suspense fallback={<div className="p-8">Loading...</div>}>
<Routes>
<Route
path={ROUTES.rickrollMockRoot}
element={<RickrollMockRoot />}
/>
<Route
path={ROUTES.rickrollMockSignIn}
element={<RickrollMockSignIn />}
/>
{/* Demo flow (throwaway — for video recording) */}
<Route path={ROUTES.demo} element={<DemoIndex />} />
<Route path={ROUTES.demoConnect} element={<DemoConnect />} />
<Route path={ROUTES.demoAuth} element={<DemoAuth />} />
<Route path={ROUTES.demoConsent} element={<DemoConsent />} />
<Route path={ROUTES.demoSuccess} element={<DemoSuccess />} />
<Route path="/*" element={<AppContent />} />
</Routes>
</Suspense>
</BrowserRouter>
</div>
</Provider>
)
}
Expand Down
Loading