ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-02-03 08:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:AutoMaker-Org/automaker into cursor-docker-oauth

Browse Source
This commit is contained in:
webdevcody
2026-01-05 21:29:20 -05:00
parent 0af5bc86f4 2934d73db2
commit 49f32c4d59
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/ui/src/components/layout/sidebar/hooks/use-spec-regeneration.ts
View File

@@ -42,6 +42,9 @@ export function useSpecRegeneration({
} }
if (event.type === 'spec_regeneration_complete') { if (event.type === 'spec_regeneration_complete') {
// Only show toast if we're in active creation flow (not regular regeneration)
const isCreationFlow = creatingSpecProjectPath !== null;
setSpecCreatingForProject(null); setSpecCreatingForProject(null);
setShowSetupDialog(false); setShowSetupDialog(false);
setProjectOverview(''); setProjectOverview('');
@@ -49,9 +52,12 @@ export function useSpecRegeneration({
// Clear onboarding state if we came from onboarding // Clear onboarding state if we came from onboarding
setNewProjectName(''); setNewProjectName('');
setNewProjectPath(''); setNewProjectPath('');
toast.success('App specification created', {
description: 'Your project is now set up and ready to go!', if (isCreationFlow) {
}); toast.success('App specification created', {
description: 'Your project is now set up and ready to go!',
});
}
} else if (event.type === 'spec_regeneration_error') { } else if (event.type === 'spec_regeneration_error') {
setSpecCreatingForProject(null); setSpecCreatingForProject(null);
toast.error('Failed to create specification', { toast.error('Failed to create specification', {

1
apps/ui/src/components/views/setup-view/hooks/use-cli-status.ts
View File

@@ -7,6 +7,7 @@ interface UseCliStatusOptions {
setCliStatus: (status: any) => void; setCliStatus: (status: any) => void;
setAuthStatus: (status: any) => void; setAuthStatus: (status: any) => void;
} }
const logger = createLogger('CliStatus');
// Create logger once outside the hook to prevent infinite re-renders // Create logger once outside the hook to prevent infinite re-renders
const logger = createLogger('CliStatus'); const logger = createLogger('CliStatus');

7
apps/ui/src/components/views/setup-view/steps/theme-step.tsx
View File

@@ -11,7 +11,7 @@ interface ThemeStepProps {
} }
export function ThemeStep({ onNext, onBack }: ThemeStepProps) { export function ThemeStep({ onNext, onBack }: ThemeStepProps) {
const { theme, setTheme, setPreviewTheme } = useAppStore(); const { theme, setTheme, setPreviewTheme, currentProject, setProjectTheme } = useAppStore();
const [activeTab, setActiveTab] = useState<'dark' | 'light'>('dark'); const [activeTab, setActiveTab] = useState<'dark' | 'light'>('dark');
const handleThemeHover = (themeValue: string) => { const handleThemeHover = (themeValue: string) => {
@@ -24,6 +24,11 @@ export function ThemeStep({ onNext, onBack }: ThemeStepProps) {
const handleThemeClick = (themeValue: string) => { const handleThemeClick = (themeValue: string) => {
setTheme(themeValue as typeof theme); setTheme(themeValue as typeof theme);
// Also update the current project's theme if one exists
// This ensures the selected theme is visible since getEffectiveTheme() prioritizes project theme
if (currentProject) {
setProjectTheme(currentProject.id, themeValue as typeof theme);
}
setPreviewTheme(null); setPreviewTheme(null);
}; };