move role to user types files

Author: calebbourg

src/components/ui/members/member-card.tsx

@@ -6,7 +6,8 @@ import { Trash2 } from "lucide-react";
 import { CoachingRelationshipWithUserNames } from "@/types/coaching_relationship_with_user_names";
 import { OrganizationStateStore } from "@/lib/stores/organization-state-store";
 import { AuthStore } from "@/lib/stores/auth-store";
-import { Id, Role } from "@/types/general";
+import { Id } from "@/types/general";
+import { Role } from "@/types/user";
 
 interface MemberCardProps {
   firstName: string;

src/components/ui/members/member-container.tsx

@@ -1,7 +1,7 @@
 import { MemberList } from "./member-list";
 import { AddMemberButton } from "./add-member-button";
 import { User } from "@/types/user";
-import { Role } from "@/types/general";
+import { Role } from "@/types/user";
 import { CoachingRelationshipWithUserNames } from "@/types/coaching_relationship_with_user_names";
 import { UserSession } from "@/types/user-session";
 

src/types/general.ts

@@ -111,11 +111,6 @@ export enum ItemStatus {
   WontDo = "WontDo",
 }
 
-export enum Role {
-  User = "User",
-  Admin = "Admin"
-}
-
 export function stringToActionStatus(statusString: string): ItemStatus {
   const status = statusString.trim();
 

src/types/user-session.ts

@@ -1,5 +1,5 @@
-import { User } from "@/types/user";
-import { Role } from "@/types/general";
+import { User, Role } from "@/types/user";
+
 /**
  * This is an intersection type that combines the User type with additional properties.
  * Currently, it does not add any new properties, but it can be extended in the future

src/types/user.ts

@@ -1,4 +1,4 @@
-import { Id, Role } from "@/types/general";
+import { Id } from "@/types/general";
 
 // This must always reflect the Rust struct on the backend entity::users::Model
 export interface User {
@@ -25,6 +25,11 @@ export interface NewUserPassword {
   confirm_password: string;
 }
 
+export enum Role {
+  User = "User",
+  Admin = "Admin"
+}
+
 export function parseUser(data: unknown): User {
   if (!isUser(data)) {
     throw new Error("Invalid User object data");