Commitc377cd0

authored

fix: Move CLI auth screen outside of dashboard (#5755)

1 parentf0eddba commitc377cd0Copy full SHA for c377cd0

File tree

+27

-23

lines changed

+27

-23

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,6 @@ export const AppRouter: FC = () => {`
`142`	`142`	`<Routeelement={<DashboardLayout/>}>`
`143`	`143`	`<Routeindexelement={<IndexPage/>}/>`
`144`	`144`
`145`		`-<Routepath="cli-auth"element={<CliAuthenticationPage/>}/>`
`146`	`145`	`<Routepath="gitauth"element={<GitAuthPage/>}/>`
`147`	`146`
`148`	`147`	`<Routepath="workspaces"element={<WorkspacesPage/>}/>`
`@@ -241,11 +240,12 @@ export const AppRouter: FC = () => {`
`241`	`240`	`</Route>`
`242`	`241`	`</Route>`
`243`	`242`
`244`		`-{/* Terminalpage don't have the dashboard layout */}`
	`243`	`+{/* Terminaland CLI auth pages don't have the dashboard layout */}`
`245`	`244`	`<Route`
`246`	`245`	`path="/@:username/:workspace/terminal"`
`247`	`246`	`element={<TerminalPage/>}`
`248`	`247`	`/>`
	`248`	`+<Routepath="cli-auth"element={<CliAuthenticationPage/>}/>`
`249`	`249`	`</Route>`
`250`	`250`
`251`	`251`	`{/* Using path="*"" means "match anything", so this route`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,12 @@ export const useStyles = makeStyles((theme) => ({`
`15`	`15`	`},`
`16`	`16`	`container:{`
`17`	`17`	`marginTop:theme.spacing(-8),`
`18`		`-minWidth:"320px",`
`19`		`-maxWidth:"320px",`
	`18`	`+maxWidth:385,`
`20`	`19`	`},`
`21`		`-copyright:{`
`22`		`-marginTop:theme.spacing(2),`
	`20`	`+footer:{`
	`21`	`+fontSize:12,`
	`22`	`+color:theme.palette.text.secondary,`
	`23`	`+marginTop:theme.spacing(3),`
`23`	`24`	`},`
`24`	`25`	`}))`
`25`	`26`
`@@ -30,7 +31,7 @@ export const SignInLayout: FC<{ children: ReactNode }> = ({ children }) => {`
`30`	`31`	`<divclassName={styles.root}>`
`31`	`32`	`<divclassName={styles.layout}>`
`32`	`33`	`<divclassName={styles.container}>{children}</div>`
`33`		`-<divclassName={styles.copyright}>`
	`34`	`+<divclassName={styles.footer}>`
`34`	`35`	{`\u00a9${newDate().getFullYear()} Coder Technologies, Inc.`}
`35`	`36`	`</div>`
`36`	`37`	`</div>`

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,15 +34,20 @@ const useStyles = makeStyles((theme) => ({`
`34`	`34`	`justifyContent:"center",`
`35`	`35`	`},`
`36`	`36`	`logo:{`
`37`		`-width:80,`
`38`		`-height:56,`
`39`	`37`	`color:theme.palette.text.primary,`
	`38`	`+fontSize:theme.spacing(8),`
`40`	`39`	`},`
`41`	`40`	`title:{`
`42`		`-fontSize:24,`
`43`		`-letterSpacing:-0.3,`
`44`		`-marginBottom:theme.spacing(3),`
`45`		`-marginTop:theme.spacing(6),`
`46`	`41`	`textAlign:"center",`
	`42`	`+fontSize:theme.spacing(4),`
	`43`	`+fontWeight:400,`
	`44`	`+margin:0,`
	`45`	`+marginBottom:theme.spacing(2),`
	`46`	`+marginTop:theme.spacing(2),`
	`47`	`+lineHeight:1,`
	`48`	`+`
	`49`	`+"& strong":{`
	`50`	`+fontWeight:600,`
	`51`	`+},`
`47`	`52`	`},`
`48`	`53`	`}))`

Lines changed: 7 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,24 +1,21 @@`
`1`		`-import{useActor}from"@xstate/react"`
`2`		`-import{useContext,useEffect,useState,FC,PropsWithChildren}from"react"`
	`1`	`+import{useEffect,useState,FC,PropsWithChildren}from"react"`
`3`	`2`	`import{Helmet}from"react-helmet-async"`
`4`	`3`	`import{getApiKey}from"../../api/api"`
`5`	`4`	`import{pageTitle}from"../../util/page"`
`6`		`-import{XServiceContext}from"../../xServices/StateContext"`
`7`	`5`	`import{CliAuthPageView}from"./CliAuthPageView"`
`8`	`6`
`9`	`7`	`exportconstCliAuthenticationPage:FC<PropsWithChildren<unknown>>=()=>{`
`10`		`-constxServices=useContext(XServiceContext)`
`11`		`-const[authState]=useActor(xServices.authXService)`
`12`		`-const{ me}=authState.context`
`13`	`8`	`const[apiKey,setApiKey]=useState<string\|null>(null)`
`14`	`9`
`15`	`10`	`useEffect(()=>{`
`16`		`-if(me?.id){`
`17`		`-voidgetApiKey().then(({ key})=>{`
	`11`	`+getApiKey()`
	`12`	`+.then(({ key})=>{`
`18`	`13`	`setApiKey(key)`
`19`	`14`	`})`
`20`		`-}`
`21`		`-},[me?.id])`
	`15`	`+.catch((error)=>{`
	`16`	`+console.error(error)`
	`17`	`+})`
	`18`	`+},[])`
`22`	`19`
`23`	`20`	`return(`
`24`	`21`	`<>`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ export const CliAuthPageView: FC<CliAuthPageViewProps> = ({ sessionToken }) => {`
`21`	`21`	`return(`
`22`	`22`	`<SignInLayout>`
`23`	`23`	`<Welcomemessage="Session token"/>`
	`24`	`+`
`24`	`25`	`<pclassName={styles.text}>`
`25`	`26`	`Copy the session token below and{" "}`
`26`	`27`	`<strongclassName={styles.lineBreak}>paste it in your terminal</strong>.`

Comments

(0)