Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat(site): display template's readme first on template page #6863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 3, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into move_readme_template_page
  • Loading branch information
rodrimaia committed Apr 3, 2023
commit 6e535346df06dfeead42a423f05104314eded723
12 changes: 8 additions & 4 deletions site/src/AppRouter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,18 @@ const WorkspaceSettingsPage = lazy(
const CreateTokenPage = lazy(
() => import("./pages/CreateTokenPage/CreateTokenPage"),
)

const TemplateDocsPage = lazy(
() => import("./pages/TemplatePage/TemplateDocsPage/TemplateDocsPage"),
)

const TemplateFilesPage = lazy(
() => import("./pages/TemplatePage/TemplateFilesPage/TemplateFilesPage"),
)

const TemplateDocsPage = lazy(
() => import("./pages/TemplatePage/TemplateDocsPage/TemplateDocsPage"),
const TemplateVersionsPage = lazy(
() =>
import("./pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage"),
)
const TemplateSchedulePage = lazy(
() =>
Expand Down Expand Up @@ -174,9 +180,7 @@ export const AppRouter: FC = () => {
<Route path=":template">
<Route element={<TemplateLayout />}>
<Route index element={<TemplateSummaryPage />} />

<Route path="docs" element={<TemplateDocsPage />} />

<Route path="files" element={<TemplateFilesPage />} />
<Route path="versions" element={<TemplateVersionsPage />} />
</Route>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { Loader } from "components/Loader/Loader"
import { Stack } from "components/Stack/Stack"
import { TemplateResourcesTable } from "components/TemplateResourcesTable/TemplateResourcesTable"
import { TemplateStats } from "components/TemplateStats/TemplateStats"
import { VersionsTable } from "components/VersionsTable/VersionsTable"
import { FC, useEffect } from "react"
import { DAUChart } from "../../../components/DAUChart/DAUChart"
import { TemplateSummaryData } from "./data"
Expand Down Expand Up @@ -40,7 +39,7 @@ export const TemplateSummaryPageView: FC<TemplateSummaryPageViewProps> = ({
return <Loader />
}

const { daus, resources, versions } = data
const { daus, resources } = data

const getStartedResources = (resources: WorkspaceResource[]) => {
return resources.filter(
Expand All @@ -51,12 +50,8 @@ export const TemplateSummaryPageView: FC<TemplateSummaryPageViewProps> = ({
return (
<Stack spacing={4}>
<TemplateStats template={template} activeVersion={activeVersion} />

{daus && <DAUChart daus={daus} />}

<TemplateResourcesTable resources={getStartedResources(resources)} />

<VersionsTable versions={versions} />
</Stack>
)
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.