Skip to content

The only tool you need to know what is happening and how to fix it.

loading projects by default

ddux3c3b1c41be9f
diff --git a/backend/app/controllers/auth.controller.go b/backend/app/controllers/auth.controller.go
index b7529d68..74afaec1 100644
--- a/backend/app/controllers/auth.controller.go
+++ b/backend/app/controllers/auth.controller.go
@@ -39,9 +39,20 @@ func (a authController) Login(c *gin.Context) {
return nil, err
}
+ projects, err := repositories.ProjectRepository.FindByUserId(tx, user.Id)
+ if err != nil {
+ return nil, err
+ }
+
+ projectsResponse := make([]models.ProjectResponse, len(projects))
+ for i, proj := range projects {
+ projectsResponse[i] = proj.ToResponse()
+ }
+
return &models.LoginResponse{
- Token: token,
- User: user.ToResponse(),
+ Token: token,
+ User: user.ToResponse(),
+ Projects: projectsResponse,
}, nil
})
@@ -66,7 +77,6 @@ func (a authController) Register(c *gin.Context) {
}
result, err := pgdb.ExecuteTransaction(func(tx *sql.Tx) (*models.RegisterResponse, error) {
- // Check if email already exists
exists, err := repositories.UserRepository.EmailExists(tx, request.Email)
if err != nil {
return nil, err
@@ -75,46 +85,51 @@ func (a authController) Register(c *gin.Context) {
return nil, &EmailExistsError{}
}
- // Hash password
hashedPassword, err := services.HashPassword(request.Password)
if err != nil {
return nil, err
}
- // Create user
user, err := repositories.UserRepository.Create(tx, request.Email, request.Name, hashedPassword)
if err != nil {
return nil, err
}
- // Create organization
org, err := repositories.OrganizationRepository.Create(tx, request.OrganizationName)
if err != nil {
return nil, err
}
- // Add user to organization as owner
_, err = repositories.OrganizationRepository.AddUser(tx, org.Id, user.Id, "owner")
if err != nil {
return nil, err
}
- // Create project with organization
project, err := repositories.ProjectRepository.CreateWithOrganization(tx, request.ProjectName, request.Framework, org.Id)
if err != nil {
return nil, err
}
- // Generate JWT token
token, err := services.GenerateToken(user.Id, user.Email)
if err != nil {
return nil, err
}
+ projects, err := repositories.ProjectRepository.FindByUserId(tx, user.Id)
+ if err != nil {
+ return nil, err
+ }
+
+ projectsResponse := make([]models.ProjectResponse, len(projects))
+ for i, proj := range projects {
+ projectsResponse[i] = proj.ToResponse()
+ }
+
return &models.RegisterResponse{
- Token: token,
- User: user.ToResponse(),
- Project: project.ToWithToken(),
+ Token: token,
+ User: user.ToResponse(),
+ Project: project.ToWithToken(),
+ Projects: projectsResponse,
}, nil
})
diff --git a/backend/app/models/auth.model.go b/backend/app/models/auth.model.go
index b32ac0e3..ff08629d 100644
--- a/backend/app/models/auth.model.go
+++ b/backend/app/models/auth.model.go
@@ -6,8 +6,9 @@ type LoginRequest struct {
}
type LoginResponse struct {
- Token string `json:"token"`
- User UserResponse `json:"user"`
+ Token string `json:"token"`
+ User UserResponse `json:"user"`
+ Projects []ProjectResponse `json:"projects"`
}
type RegisterRequest struct {
@@ -20,7 +21,8 @@ type RegisterRequest struct {
}
type RegisterResponse struct {
- Token string `json:"token"`
- User UserResponse `json:"user"`
- Project ProjectWithToken `json:"project"`
+ Token string `json:"token"`
+ User UserResponse `json:"user"`
+ Project ProjectWithToken `json:"project"`
+ Projects []ProjectResponse `json:"projects"`
}
diff --git a/frontend/src/lib/state/projects.svelte.ts b/frontend/src/lib/state/projects.svelte.ts
index 78879b62..f0e70906 100644
--- a/frontend/src/lib/state/projects.svelte.ts
+++ b/frontend/src/lib/state/projects.svelte.ts
@@ -36,23 +36,27 @@ class ProjectsState {
});
}
+ setProjects(projects: Project[]) {
+ this.projects = projects;
+
+ // If no current project selected or current project not in list, select first one
+ if (!this.currentProjectId || !this.projects.find(p => p.id === this.currentProjectId)) {
+ if (this.projects.length > 0) {
+ this.currentProjectId = this.projects[0].id;
+ }
+ }
+
+ // Cache in localStorage
+ localStorage.setItem('PROJECTS_CACHE', JSON.stringify(this.projects));
+ }
+
async loadProjects() {
this.loading = true;
this.error = null;
try {
const response = await api.get('/projects');
- this.projects = response;
-
- // If no current project selected or current project not in list, select first one
- if (!this.currentProjectId || !this.projects.find(p => p.id === this.currentProjectId)) {
- if (this.projects.length > 0) {
- this.currentProjectId = this.projects[0].id;
- }
- }
-
- // Cache in localStorage
- localStorage.setItem('PROJECTS_CACHE', JSON.stringify(this.projects));
+ this.setProjects(response)
} catch (e: unknown) {
const errorMessage = e instanceof Error ? e.message : 'Failed to load projects';
this.error = errorMessage;
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index e7bf8190..ee367c21 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -16,6 +16,7 @@
import * as DropdownMenu from "$lib/components/ui/dropdown-menu/index.js";
import { ChevronDown } from 'lucide-svelte';
import { Toaster } from 'svelte-sonner';
+ import { page } from '$app/state';
let { children } = $props();
let showAddProjectModal = $state(false);
@@ -42,7 +43,6 @@
initTheme();
initTimezone();
- // Load projects after auth check
if (authState.isAuthenticated) {
projectsState.initFromCache();
projectsState.loadProjects();
@@ -72,7 +72,9 @@
<svelte:head><link rel="icon" href="/favicon.ico" /></svelte:head>
-{#if authState.isAuthenticated}
+<!-- This is not ideal, but because our layout is a top level route it can end up showing sidebar on the login page (after the login before the transition). -->
+<!-- We could consider moving this to a lower level layout for the actual app, for now it's just a path check -->
+{#if authState.isAuthenticated && page.url.pathname !== "/login" && page.url.pathname !== "/register"}
<Sidebar.SidebarProvider>
<AppSidebar />
<Sidebar.SidebarInset>
diff --git a/frontend/src/routes/login/+page.svelte b/frontend/src/routes/login/+page.svelte
index 9dbd8d91..79fe140d 100644
--- a/frontend/src/routes/login/+page.svelte
+++ b/frontend/src/routes/login/+page.svelte
@@ -35,12 +35,9 @@
const data = await response.json();
- // Store token and user
authState.setToken(data.token);
userState.setUser(data.user);
-
- // Load projects after successful login
- await projectsState.loadProjects();
+ projectsState.setProjects(data.projects);
goto('/');
} catch (e) {
diff --git a/frontend/src/routes/register/+page.svelte b/frontend/src/routes/register/+page.svelte
index 4f6ca258..1dd8cd0a 100644
--- a/frontend/src/routes/register/+page.svelte
+++ b/frontend/src/routes/register/+page.svelte
@@ -30,7 +30,6 @@
];
async function handleRegister() {
- // Validate passwords match
if (password !== confirmPassword) {
error = 'Passwords do not match';
return;
@@ -67,14 +66,10 @@
const data = await response.json();
- // Store token and user
authState.setToken(data.token);
userState.setUser(data.user);
+ projectsState.setProjects(data.projects);
- // Load projects (will include the newly created project)
- await projectsState.loadProjects();
-
- // Redirect to connection page to show SDK setup
goto('/connection');
} catch (e) {
error = e instanceof Error ? e.message : 'Registration failed';