Skip to content

feat: Add the template page #1754

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.

Sign up for GitHub

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 11 commits into from
May 26, 2022
Merged

feat: Add the template page #1754

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0764df3
Add basic template page
BrunoQuaresma May 25, 2022
b8ff946
Add template stats storybook
BrunoQuaresma May 25, 2022
02747cf
Add storybook for the template page view
BrunoQuaresma May 25, 2022
f63f04c
Add tests
BrunoQuaresma May 25, 2022
fac8e3e
Remove unecessary brackets
BrunoQuaresma May 26, 2022
792ee73
Fix links on readme
BrunoQuaresma May 26, 2022
2822db0
Use Id instead of ID
BrunoQuaresma May 26, 2022
b42f3e9
Use selector to get the organization Id
BrunoQuaresma May 26, 2022
728c270
Pin react-markdown dependency
BrunoQuaresma May 26, 2022
c011edb
Merge branch 'main' of github.com:coder/coder into bq/add-template-page
BrunoQuaresma May 26, 2022
5eb55cc
Add missing language
BrunoQuaresma May 26, 2022
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
Use Id instead of ID
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed May 26, 2022
commit 2822db08af58b3d51663ab49008aaefe89b964b0
2 changes: 1 addition & 1 deletion site/src/hooks/useOrganizationID.ts → site/src/hooks/useOrganizationId.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useActor } from "@xstate/react"
import { useContext } from "react"
import { XServiceContext } from "../xServices/StateContext"

export const useOrganizationID = (): string => {
export const useOrganizationId = (): string => {
const xServices = useContext(XServiceContext)
const [authState] = useActor(xServices.authXService)
const organizationId = authState.context.me?.organization_ids[0]
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import { useMachine } from "@xstate/react"
import React from "react"
import { useNavigate, useSearchParams } from "react-router-dom"
import { Template } from "../../api/typesGenerated"
import { useOrganizationID } from "../../hooks/useOrganizationID"
import { useOrganizationId } from "../../hooks/useOrganizationId"
import { createWorkspaceMachine } from "../../xServices/createWorkspace/createWorkspaceXService"
import { CreateWorkspacePageView } from "./CreateWorkspacePageView"

const CreateWorkspacePage: React.FC = () => {
const organizationId = useOrganizationID()
const organizationId = useOrganizationId()
const [searchParams] = useSearchParams()
const preSelectedTemplateName = searchParams.get("template")
const navigate = useNavigate()
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/TemplatePage/TemplatePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useMachine } from "@xstate/react"
import React from "react"
import { useParams } from "react-router-dom"
import { Loader } from "../../components/Loader/Loader"
import { useOrganizationID } from "../../hooks/useOrganizationID"
import { useOrganizationId } from "../../hooks/useOrganizationId"
import { templateMachine } from "../../xServices/template/templateXService"
import { TemplatePageView } from "./TemplatePageView"

Expand All @@ -17,7 +17,7 @@ const useTemplateName = () => {
}

export const TemplatePage: React.FC = () => {
const organizationId = useOrganizationID()
const organizationId = useOrganizationId()
const templateName = useTemplateName()
const [templateState] = useMachine(templateMachine, {
context: {
Expand Down