Skip to content

Commit

Permalink
app redesign
Browse files Browse the repository at this point in the history
  • Loading branch information
anastasiya1155 committed Dec 20, 2023
1 parent ee7e019 commit fed771d
Show file tree
Hide file tree
Showing 643 changed files with 16,639 additions and 40,952 deletions.
5 changes: 3 additions & 2 deletions apps/desktop/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,9 @@
"hiddenTitle": true,
"titleBarStyle": "Overlay",
"minHeight": 700,
"minWidth": 1000
"minWidth": 1000,
"fileDropEnabled": false
}
]
}
}
}
57 changes: 35 additions & 22 deletions apps/desktop/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import { polling } from '../../../client/src/utils/requestUtils';
import ReportBugModal from '../../../client/src/components/ReportBugModal';
import { UIContext } from '../../../client/src/context/uiContext';
import { DeviceContextProvider } from '../../../client/src/context/providers/DeviceContextProvider';
import { EnvContext } from '../../../client/src/context/envContext';
import TextSearch from './TextSearch';
import SplashScreen from './SplashScreen';

Expand Down Expand Up @@ -226,12 +227,18 @@ function App() {
isRepoManagementAllowed: true,
forceAnalytics: false,
isSelfServe: false,
envConfig,
setEnvConfig,
showNativeMessage: message,
relaunch,
}),
[homeDirectory, indexFolder, os, release, envConfig],
[homeDirectory, indexFolder, os, release],
);

const envContextValue = useMemo(
() => ({
envConfig,
setEnvConfig,
}),
[envConfig],
);

const bugReportContextValue = useMemo(
Expand All @@ -244,26 +251,32 @@ function App() {
);

return (
<LocaleContext.Provider value={localeContextValue}>
<AnimatePresence initial={false}>
{shouldShowSplashScreen && <SplashScreen />}
</AnimatePresence>
{shouldShowSplashScreen && (
<DeviceContextProvider deviceContextValue={deviceContextValue}>
<UIContext.BugReport.Provider value={bugReportContextValue}>
<ReportBugModal errorBoundaryMessage={serverCrashedMessage} />
</UIContext.BugReport.Provider>
</DeviceContextProvider>
)}
<TextSearch contentRoot={contentContainer.current} />
<div ref={contentContainer}>
<BrowserRouter>
{!shouldShowSplashScreen && (
<ClientApp deviceContextValue={deviceContextValue} />
<DeviceContextProvider
deviceContextValue={deviceContextValue}
envConfig={envConfig}
>
<EnvContext.Provider value={envContextValue}>
<LocaleContext.Provider value={localeContextValue}>
<AnimatePresence initial={false}>
{shouldShowSplashScreen && <SplashScreen />}
</AnimatePresence>
{shouldShowSplashScreen && (
<UIContext.BugReport.Provider value={bugReportContextValue}>
<ReportBugModal errorBoundaryMessage={serverCrashedMessage} />
</UIContext.BugReport.Provider>
)}
</BrowserRouter>
</div>
</LocaleContext.Provider>
<TextSearch contentRoot={contentContainer.current} />
<div
ref={contentContainer}
className="w-screen h-screen overflow-hidden"
>
<BrowserRouter>
{!shouldShowSplashScreen && <ClientApp />}
</BrowserRouter>
</div>
</LocaleContext.Provider>
</EnvContext.Provider>
</DeviceContextProvider>
);
}

Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src/SplashScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const SplashScreen = ({}: Props) => {
<div className="animate-pulse-slow text-label-title">
<LogoFull />
</div>
<div className="flex gap-3 items-center rounded-lg shadow-high border border-bg-border bg-bg-shade px-4 py-2 absolute bottom-0 left-1/2 transform -translate-x-1/2 translate-y-1/2 body-s z-10 text-label-base">
<div className="flex gap-3 items-center rounded-lg shadow-high border border-bg-border bg-bg-shade px-4 py-2 absolute bottom-0 left-1/2 transform -translate-x-1/2 translate-y-1/2 body-s-b z-10 text-label-base">
<Trans>Loading...</Trans>
</div>
</div>
Expand Down
Binary file modified client/public/bloopHeadMascot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/bloopHeadMascotLight.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/stripe_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit fed771d

Please sign in to comment.