Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

feat: Add page titles#2070

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
kylecarbs merged 1 commit intomainfromtitles
Jun 6, 2022
Merged
Show file tree
Hide file tree
Changes fromall commits
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
1 change: 0 additions & 1 deletionsite/htmlTemplates/index.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
<link rel="mask-icon" href="/static/favicon.svg" color="#000000" crossorigin="use-credentials" />
<link rel="alternate icon" type="image/png" href="/favicon.png" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<title>Coder</title>
</head>

<body>
Expand Down
2 changes: 2 additions & 0 deletionssite/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@
"history":"5.3.0",
"react":"17.0.2",
"react-dom":"17.0.2",
"react-helmet":"^6.1.0",
"react-markdown":"8.0.3",
"react-router-dom":"6.3.0",
"sourcemapped-stacktrace":"1.1.11",
Expand DownExpand Up@@ -73,6 +74,7 @@
"@types/node":"14.18.16",
"@types/react":"17.0.44",
"@types/react-dom":"17.0.16",
"@types/react-helmet":"^6.1.5",
"@types/superagent":"4.1.15",
"@types/uuid":"8.3.4",
"@typescript-eslint/eslint-plugin":"5.23.0",
Expand Down
5 changes: 5 additions & 0 deletionssite/src/components/SettingsLayout/SettingsLayout.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
importBoxfrom"@material-ui/core/Box"
import{FC}from"react"
import{Helmet}from"react-helmet"
import{Outlet}from"react-router-dom"
import{pageTitle}from"../../util/page"
import{AuthAndFrame}from"../AuthAndFrame/AuthAndFrame"
import{Margins}from"../Margins/Margins"
import{TabPanel}from"../TabPanel/TabPanel"
Expand All@@ -22,6 +24,9 @@ export const SettingsLayout: FC = () => {
return(
<AuthAndFrame>
<Boxdisplay="flex"flexDirection="column">
<Helmet>
<title>{pageTitle("Settings")}</title>
</Helmet>
<Margins>
<TabPaneltitle={Language.settingsLabel}menuItems={menuItems}>
<Outlet/>
Expand Down
5 changes: 5 additions & 0 deletionssite/src/pages/CliAuthPage/CliAuthPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
import{makeStyles}from"@material-ui/core/styles"
import{useActor}from"@xstate/react"
importReact,{useContext,useEffect,useState}from"react"
import{Helmet}from"react-helmet"
import{getApiKey}from"../../api/api"
import{CliAuthToken}from"../../components/CliAuthToken/CliAuthToken"
import{FullScreenLoader}from"../../components/Loader/FullScreenLoader"
import{pageTitle}from"../../util/page"
import{XServiceContext}from"../../xServices/StateContext"

exportconstCliAuthenticationPage:React.FC=()=>{
Expand All@@ -29,6 +31,9 @@ export const CliAuthenticationPage: React.FC = () => {

return(
<divclassName={styles.root}>
<Helmet>
<title>{pageTitle("CLI Auth")}</title>
</Helmet>
<CliAuthTokensessionToken={apiKey}/>
</div>
)
Expand Down
53 changes: 30 additions & 23 deletionssite/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
import{useMachine}from"@xstate/react"
import{FC}from"react"
import{Helmet}from"react-helmet"
import{useNavigate,useSearchParams}from"react-router-dom"
import{Template}from"../../api/typesGenerated"
import{useOrganizationId}from"../../hooks/useOrganizationId"
import{pageTitle}from"../../util/page"
import{createWorkspaceMachine}from"../../xServices/createWorkspace/createWorkspaceXService"
import{CreateWorkspacePageView}from"./CreateWorkspacePageView"

Expand All@@ -21,29 +23,34 @@ const CreateWorkspacePage: FC = () => {
})

return(
<CreateWorkspacePageView
loadingTemplates={createWorkspaceState.matches("gettingTemplates")}
loadingTemplateSchema={createWorkspaceState.matches("gettingTemplateSchema")}
creatingWorkspace={createWorkspaceState.matches("creatingWorkspace")}
templates={createWorkspaceState.context.templates}
selectedTemplate={createWorkspaceState.context.selectedTemplate}
templateSchema={createWorkspaceState.context.templateSchema}
onCancel={()=>{
navigate(preSelectedTemplateName ?"/templates" :"/workspaces")
}}
onSubmit={(request)=>{
send({
type:"CREATE_WORKSPACE",
request,
})
}}
onSelectTemplate={(template:Template)=>{
send({
type:"SELECT_TEMPLATE",
template,
})
}}
/>
<>
<Helmet>
<title>{pageTitle("Create Workspace")}</title>
</Helmet>
<CreateWorkspacePageView
loadingTemplates={createWorkspaceState.matches("gettingTemplates")}
loadingTemplateSchema={createWorkspaceState.matches("gettingTemplateSchema")}
creatingWorkspace={createWorkspaceState.matches("creatingWorkspace")}
templates={createWorkspaceState.context.templates}
selectedTemplate={createWorkspaceState.context.selectedTemplate}
templateSchema={createWorkspaceState.context.templateSchema}
onCancel={()=>{
navigate(preSelectedTemplateName ?"/templates" :"/workspaces")
}}
onSubmit={(request)=>{
send({
type:"CREATE_WORKSPACE",
request,
})
}}
onSelectTemplate={(template:Template)=>{
send({
type:"SELECT_TEMPLATE",
template,
})
}}
/>
</>
)
}

Expand Down
5 changes: 5 additions & 0 deletionssite/src/pages/LoginPage/LoginPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
import{makeStyles}from"@material-ui/core/styles"
import{useActor}from"@xstate/react"
importReact,{useContext}from"react"
import{Helmet}from"react-helmet"
import{Navigate,useLocation}from"react-router-dom"
import{isApiError}from"../../api/errors"
import{Footer}from"../../components/Footer/Footer"
import{SignInForm}from"../../components/SignInForm/SignInForm"
import{pageTitle}from"../../util/page"
import{retrieveRedirect}from"../../util/redirect"
import{XServiceContext}from"../../xServices/StateContext"

Expand DownExpand Up@@ -50,6 +52,9 @@ export const LoginPage: React.FC = () => {
}else{
return(
<divclassName={styles.root}>
<Helmet>
<title>{pageTitle("Login")}</title>
</Helmet>
<divclassName={styles.layout}>
<divclassName={styles.container}>
<SignInForm
Expand Down
17 changes: 12 additions & 5 deletionssite/src/pages/TemplatePage/TemplatePage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
import{useMachine}from"@xstate/react"
import{FC}from"react"
import{Helmet}from"react-helmet"
import{useParams}from"react-router-dom"
import{Loader}from"../../components/Loader/Loader"
import{useOrganizationId}from"../../hooks/useOrganizationId"
import{pageTitle}from"../../util/page"
import{templateMachine}from"../../xServices/template/templateXService"
import{TemplatePageView}from"./TemplatePageView"

Expand DownExpand Up@@ -33,10 +35,15 @@ export const TemplatePage: FC = () => {
}

return(
<TemplatePageView
template={template}
activeTemplateVersion={activeTemplateVersion}
templateResources={templateResources}
/>
<>
<Helmet>
<title>{pageTitle(`${template.name} · Template`)}</title>
</Helmet>
<TemplatePageView
template={template}
activeTemplateVersion={activeTemplateVersion}
templateResources={templateResources}
/>
</>
)
}
17 changes: 12 additions & 5 deletionssite/src/pages/TemplatesPage/TemplatesPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import{useActor,useMachine}from"@xstate/react"
importReact,{useContext}from"react"
import{Helmet}from"react-helmet"
import{pageTitle}from"../../util/page"
import{XServiceContext}from"../../xServices/StateContext"
import{templatesMachine}from"../../xServices/templates/templatesXService"
import{TemplatesPageView}from"./TemplatesPageView"
Expand All@@ -10,11 +12,16 @@ const TemplatesPage: React.FC = () => {
const[templatesState]=useMachine(templatesMachine)

return(
<TemplatesPageView
templates={templatesState.context.templates}
canCreateTemplate={authState.context.permissions?.createTemplates}
loading={templatesState.hasTag("loading")}
/>
<>
<Helmet>
<title>{pageTitle("Templates")}</title>
</Helmet>
<TemplatesPageView
templates={templatesState.context.templates}
canCreateTemplate={authState.context.permissions?.createTemplates}
loading={templatesState.hasTag("loading")}
/>
</>
)
}

Expand Down
11 changes: 11 additions & 0 deletionssite/src/pages/TerminalPage/TerminalPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
import{makeStyles}from"@material-ui/core/styles"
import{useMachine}from"@xstate/react"
import{FC,useEffect,useRef,useState}from"react"
import{Helmet}from"react-helmet"
import{useLocation,useNavigate,useParams}from"react-router-dom"
import{v4asuuidv4}from"uuid"
import*asXTermfrom"xterm"
import{FitAddon}from"xterm-addon-fit"
import{WebLinksAddon}from"xterm-addon-web-links"
import"xterm/css/xterm.css"
import{MONOSPACE_FONT_FAMILY}from"../../theme/constants"
import{pageTitle}from"../../util/page"
import{terminalMachine}from"../../xServices/terminal/terminalXService"

exportconstLanguage={
Expand DownExpand Up@@ -179,6 +181,15 @@ const TerminalPage: FC<{

return(
<>
<Helmet>
<title>
{terminalState.context.workspace
?pageTitle(
`Terminal ·${terminalState.context.workspace.owner_name}/${terminalState.context.workspace.name}`,
)
:""}
</title>
</Helmet>
{/* This overlay makes it more obvious that the terminal is disconnected. */}
{/* It's nice for situations where Coder restarts, and they are temporarily disconnected. */}
<divclassName={`${styles.overlay}${isDisconnected ?"" :"connected"}`}>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
import{useActor,useSelector}from"@xstate/react"
importReact,{useContext}from"react"
import{Helmet}from"react-helmet"
import{useNavigate}from"react-router"
import*asTypesGenfrom"../../../api/typesGenerated"
import{CreateUserForm}from"../../../components/CreateUserForm/CreateUserForm"
import{Margins}from"../../../components/Margins/Margins"
import{pageTitle}from"../../../util/page"
import{selectOrgId}from"../../../xServices/auth/authSelectors"
import{XServiceContext}from"../../../xServices/StateContext"

Expand All@@ -23,6 +25,9 @@ export const CreateUserPage: React.FC = () => {

return(
<Margins>
<Helmet>
<title>{pageTitle("Create User")}</title>
</Helmet>
<CreateUserForm
formErrors={createUserFormErrors}
onSubmit={(user:TypesGen.CreateUserRequest)=>usersSend({type:"CREATE", user})}
Expand Down
5 changes: 5 additions & 0 deletionssite/src/pages/UsersPage/UsersPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
import{useActor,useSelector}from"@xstate/react"
importReact,{useContext,useEffect}from"react"
import{Helmet}from"react-helmet"
import{useNavigate}from"react-router"
import{ConfirmDialog}from"../../components/ConfirmDialog/ConfirmDialog"
import{ResetPasswordDialog}from"../../components/ResetPasswordDialog/ResetPasswordDialog"
import{pageTitle}from"../../util/page"
import{selectPermissions}from"../../xServices/auth/authSelectors"
import{XServiceContext}from"../../xServices/StateContext"
import{UsersPageView}from"./UsersPageView"
Expand DownExpand Up@@ -48,6 +50,9 @@ export const UsersPage: React.FC = () => {

return(
<>
<Helmet>
<title>{pageTitle("Users")}</title>
</Helmet>
<UsersPageView
roles={roles}
users={users}
Expand Down
5 changes: 5 additions & 0 deletionssite/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,15 @@ import { makeStyles } from "@material-ui/core/styles"
importTypographyfrom"@material-ui/core/Typography"
import{useMachine}from"@xstate/react"
import{FC}from"react"
import{Helmet}from"react-helmet"
import{useParams}from"react-router-dom"
import{ProvisionerJobLog}from"../../api/typesGenerated"
import{Loader}from"../../components/Loader/Loader"
import{Margins}from"../../components/Margins/Margins"
import{Stack}from"../../components/Stack/Stack"
import{WorkspaceBuildLogs}from"../../components/WorkspaceBuildLogs/WorkspaceBuildLogs"
import{WorkspaceBuildStats}from"../../components/WorkspaceBuildStats/WorkspaceBuildStats"
import{pageTitle}from"../../util/page"
import{workspaceBuildMachine}from"../../xServices/workspaceBuild/workspaceBuildXService"

constsortLogsByCreatedAt=(logs:ProvisionerJobLog[])=>{
Expand All@@ -34,6 +36,9 @@ export const WorkspaceBuildPage: FC = () => {

return(
<Margins>
<Helmet>
<title>{build ?pageTitle(`Build #${build.build_number} ·${build.workspace_name}`) :""}</title>
</Helmet>
<Stack>
<Typographyvariant="h4"className={styles.title}>
Logs
Expand Down
5 changes: 5 additions & 0 deletionssite/src/pages/WorkspacePage/WorkspacePage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import{useMachine}from"@xstate/react"
importReact,{useEffect}from"react"
import{Helmet}from"react-helmet"
import{useNavigate,useParams}from"react-router-dom"
import{DeleteWorkspaceDialog}from"../../components/DeleteWorkspaceDialog/DeleteWorkspaceDialog"
import{ErrorSummary}from"../../components/ErrorSummary/ErrorSummary"
Expand All@@ -8,6 +9,7 @@ import { Margins } from "../../components/Margins/Margins"
import{Stack}from"../../components/Stack/Stack"
import{Workspace}from"../../components/Workspace/Workspace"
import{firstOrItem}from"../../util/array"
import{pageTitle}from"../../util/page"
import{workspaceMachine}from"../../xServices/workspace/workspaceXService"
import{workspaceScheduleBannerMachine}from"../../xServices/workspaceSchedule/workspaceScheduleBannerXService"

Expand DownExpand Up@@ -36,6 +38,9 @@ export const WorkspacePage: React.FC = () => {
}else{
return(
<Margins>
<Helmet>
<title>{pageTitle(`${workspace.owner_name}/${workspace.name}`)}</title>
</Helmet>
<Stackspacing={4}>
<>
<Workspace
Expand Down
5 changes: 5 additions & 0 deletionssite/src/pages/WorkspacesPage/WorkspacesPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,13 @@ import SearchIcon from "@material-ui/icons/Search"
import{useMachine}from"@xstate/react"
import{FormikErrors,useFormik}from"formik"
import{FC,useState}from"react"
import{Helmet}from"react-helmet"
import{LinkasRouterLink}from"react-router-dom"
import{CloseDropdown,OpenDropdown}from"../../components/DropdownArrows/DropdownArrows"
import{Margins}from"../../components/Margins/Margins"
import{Stack}from"../../components/Stack/Stack"
import{getFormHelpers,onChangeTrimmed}from"../../util/formUtils"
import{pageTitle}from"../../util/page"
import{workspacesMachine}from"../../xServices/workspaces/workspacesXService"
import{WorkspacesPageView}from"./WorkspacesPageView"

Expand DownExpand Up@@ -74,6 +76,9 @@ const WorkspacesPage: FC = () => {

return(
<Margins>
<Helmet>
<title>{pageTitle("Workspaces")}</title>
</Helmet>
<Stackdirection="row"className={styles.workspacesHeaderContainer}>
<Stackdirection="column"className={styles.filterColumn}>
<Stackdirection="row"spacing={0}className={styles.filterContainer}>
Expand Down
3 changes: 3 additions & 0 deletionssite/src/util/page.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
exportconstpageTitle=(prefix:string):string=>{
return`${prefix} – Coder`
}
2 changes: 1 addition & 1 deletionsite/webpack.dev.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ const config: Configuration = {
port:process.env.PORT||8080,
proxy:{
"/api":{
target:"http://localhost:3000",
target:"https://dev.coder.com",
ws:true,
secure:false,
},
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp