Skip to content

Commit

Permalink
refactor: defined slightly different file structure in prep for furth…
Browse files Browse the repository at this point in the history
…er refactor [2025-01-19]
  • Loading branch information
CHRISCARLON committed Jan 19, 2025
1 parent e29d53e commit 900fe77
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
DeleteIcon,
} from "lucide-react";
import { CreateProjectModal, DeleteProjectModal } from "./projectModal";
import { HelpSupportModal } from "../supportModal";
import { HelpSupportModal } from "../components/supportModal";
import { AddWorkspaceMemberModal } from "./addMemberModal";
import { ViewWorkspaceMemberModal } from "./viewMembersModal";
import { DeleteWorkspaceModal } from "./deleteWorkspaceModal";
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
DialogTitle,
DialogTrigger,
} from "@/components/ui/dialog";
import { ProfileData } from "./actions";
import { ProfileData } from "./actions/actions";
import { Button } from "@/components/ui/button";
import { User, Mail, Settings } from "lucide-react";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ import {
} from "@/components/ui/sheet";
import { Button } from "@/components/ui/button";
import { Menu, LogOut, ChevronDown, Plus, Briefcase } from "lucide-react";
import { ProfileData, Workspaces, logout, createWorkspace } from "./actions";
import {
ProfileData,
Workspaces,
logout,
createWorkspace,
} from "../actions/actions";
import { CreateWorkspaceSidebar } from "./createWorkspaceModal";
import { useRouter } from "next/navigation";
import { useState, useEffect } from "react";
Expand Down
9 changes: 5 additions & 4 deletions gridwalk-ui/src/app/workspace/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import { getProfile, getWorkspaces } from "./actions";
import { Sidebar } from "./sidebar";
import { getProfile, getWorkspaces } from "./actions/actions";
import { Sidebar } from "./components/sidebar";
import { WorkspaceProvider } from "./workspaceContext";

export const dynamic = "force-dynamic";
Expand All @@ -13,8 +13,9 @@ export default async function WorkspaceLayout({
const profileData = await getProfile();
const workspaceData = await getWorkspaces();

const initials =
`${profileData.first_name?.[0] || ""}${profileData.last_name?.[0] || ""}`.toUpperCase();
const initials = `${profileData.first_name?.[0] || ""}${
profileData.last_name?.[0] || ""
}`.toUpperCase();

return (
<WorkspaceProvider workspaces={workspaceData}>
Expand Down
6 changes: 3 additions & 3 deletions gridwalk-ui/src/app/workspace/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import {
Clock,
} from "lucide-react";
import { Button } from "@/components/ui/button";
import { CreateWorkspaceModal } from "./createWorkspaceModal";
import { createWorkspace } from "./actions";
import { CreateWorkspaceModal } from "./components/createWorkspaceModal";
import { createWorkspace } from "./actions/actions";
import { getProjects } from "@/app/workspace/[workspaceId]/actions/projects/get";
import { getWorkspaceMembers } from "@/app/workspace/[workspaceId]/actions/workspace/get_members";
import { HelpSupportModal } from "./supportModal";
import { HelpSupportModal } from "./components/supportModal";
import { useWorkspaces } from "./workspaceContext";

// Stat cards for the user
Expand Down

0 comments on commit 900fe77

Please sign in to comment.