From 7f460d8453e7e6ba9d6f8b8d49656d4ebe68c7cc Mon Sep 17 00:00:00 2001 From: Nicolas Vancea Date: Fri, 13 Oct 2023 14:14:15 +0200 Subject: [PATCH 1/2] Center logo --- src/lib/components/AppBarComponent.tsx | 27 +++++++++++--------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/lib/components/AppBarComponent.tsx b/src/lib/components/AppBarComponent.tsx index e1034d22..bfb85c52 100644 --- a/src/lib/components/AppBarComponent.tsx +++ b/src/lib/components/AppBarComponent.tsx @@ -53,24 +53,19 @@ const AppBarComponent: React.FC = ({ justifyContent: "center", }} > - Shape logo - - {versionSelectorComponent ?? <>} - {openApiSpecificationsComponent ?? <>} - + Shape logo + + {versionSelectorComponent ?? <>} + {openApiSpecificationsComponent ?? <>} + ); }; From aecfcd640a1e4b97c9fcca8bd0e9318d91991747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=B8vring?= Date: Fri, 13 Oct 2023 14:17:31 +0200 Subject: [PATCH 2/2] Shows selected project --- src/app/[...slug]/page.tsx | 2 +- src/lib/components/ProjectComponent.tsx | 18 +++++++++++++----- src/lib/components/ProjectListComponent.tsx | 7 ++++++- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/app/[...slug]/page.tsx b/src/app/[...slug]/page.tsx index 332c42d1..aa4c7d52 100644 --- a/src/app/[...slug]/page.tsx +++ b/src/app/[...slug]/page.tsx @@ -49,7 +49,7 @@ export default async function Page({ } projectListComponent={ - + } {...(projectName && projectName.length > 0 ? { diff --git a/src/lib/components/ProjectComponent.tsx b/src/lib/components/ProjectComponent.tsx index 12fee4d1..fa2637a2 100644 --- a/src/lib/components/ProjectComponent.tsx +++ b/src/lib/components/ProjectComponent.tsx @@ -1,6 +1,6 @@ "use client"; -import { Avatar, ListItem, ListItemButton, ListItemText } from "@mui/material"; +import { Avatar, ListItem, ListItemButton, ListItemText, Typography } from "@mui/material"; import { useTheme } from "@mui/material/styles"; import { IProject } from "../projects/IProject"; import { Folder, FolderOpen } from "@mui/icons-material"; @@ -14,15 +14,14 @@ import { IGitHubProject } from "../projects/IGitHubProject"; interface ProjectComponentProps { project: IGitHubProject; + selectedProject: boolean; } -const ProjectComponent: React.FC = ({ project }) => { - const [selectedProject, setSelectedProject] = useState(false); +const ProjectComponent: React.FC = ({ project, selectedProject }) => { const router = useRouter(); const selectProject = () => { router.push(`/${project.repository.replace("-openapi", "")}`); - setSelectedProject(true); }; const theme = useTheme(); @@ -47,7 +46,16 @@ const ProjectComponent: React.FC = ({ project }) => { sx={{ width: 35, height: 35, marginRight: "10px" }} /> )} - + {selectedProject && + + {project.name} + + } + /> + } + {!selectedProject && } ); diff --git a/src/lib/components/ProjectListComponent.tsx b/src/lib/components/ProjectListComponent.tsx index 8da8d48e..8b716106 100644 --- a/src/lib/components/ProjectListComponent.tsx +++ b/src/lib/components/ProjectListComponent.tsx @@ -2,15 +2,20 @@ import { List, Divider } from "@mui/material"; import ProjectComponent from "./ProjectComponent"; import { IProjectRepository } from "../projects/IProjectRepository"; import { IGitHubProject } from "../projects/IGitHubProject"; +import { getProject } from "../utils/UrlUtils"; interface ProjectListComponentProps { projectRepository: IProjectRepository; + projectName?: string; } const ProjectListComponent: React.FC = async ({ projectRepository, + projectName }) => { const projects = (await projectRepository.getProjects()) as IGitHubProject[]; + console.log(projects, projects) + console.log(projectName, projectName) // projects.push(...projects); // projects.push(...projects); // projects.push(...projects); @@ -32,7 +37,7 @@ const ProjectListComponent: React.FC = async ({ > {projects.map((project, index) => (
- + {index < projects.length - 1 && }
))}