Commitc52c3dc

committed

fix: merge issues

1 parent6499543 commitc52c3dcCopy full SHA for c52c3dc

File tree

+15

-5

lines changed

+15

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import { ExternalImage } from "components/ExternalImage/ExternalImage";`
`10`	`10`	`import{Loader}from"components/Loader/Loader";`
`11`	`11`	`import{Margins}from"components/Margins/Margins";`
`12`	`12`	`import{PageHeader,PageHeaderTitle}from"components/PageHeader/PageHeader";`
`13`		`-importtype{StarterTemplatesByTag}from"utils/templateAggregators";`
	`13`	`+importtype{StarterTemplatesByTag}from"utils/starterTemplates";`
`14`	`14`	`import{StarterTemplates}from"./StarterTemplates";`
`15`	`15`
`16`	`16`	`exportinterfaceCreateTemplatePageViewProps{`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import type { FC } from "react";`
`3`	`3`	`import{Link,useSearchParams}from"react-router-dom";`
`4`	`4`	`import{Stack}from"components/Stack/Stack";`
`5`	`5`	`import{TemplateExampleCard}from"modules/templates/TemplateExampleCard/TemplateExampleCard";`
`6`		`-importtype{StarterTemplatesByTag}from"utils/templateAggregators";`
	`6`	`+importtype{StarterTemplatesByTag}from"utils/starterTemplates";`
`7`	`7`
`8`	`8`	`constgetTagLabel=(tag:string)=>{`
`9`	`9`	`constlabelByTag:Record<string,string>={`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import {`
`7`	`7`	`PageHeaderSubtitle,`
`8`	`8`	`PageHeaderTitle,`
`9`	`9`	`}from"components/PageHeader/PageHeader";`
`10`		`-importtype{StarterTemplatesByTag}from"utils/templateAggregators";`
	`10`	`+importtype{StarterTemplatesByTag}from"utils/starterTemplates";`
`11`	`11`	`import{StarterTemplates}from"./StarterTemplates";`
`12`	`12`
`13`	`13`	`exportinterfaceStarterTemplatesPageViewProps{`

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`importtype{Interpolation,Theme}from"@emotion/react";`
	`2`	`+importAddIconfrom"@mui/icons-material/AddOutlined";`
`2`	`3`	`importArrowForwardOutlinedfrom"@mui/icons-material/ArrowForwardOutlined";`
`3`	`4`	`importButtonfrom"@mui/material/Button";`
`4`	`5`	`importSkeletonfrom"@mui/material/Skeleton";`
`@@ -43,7 +44,6 @@ import {`
`43`	`44`	`formatTemplateBuildTime,`
`44`	`45`	`formatTemplateActiveDevelopers,`
`45`	`46`	`}from"utils/templates";`
`46`		`-import{CreateTemplateButton}from"./CreateTemplateButton";`
`47`	`47`	`import{EmptyTemplates}from"./EmptyTemplates";`
`48`	`48`
`49`	`49`	`exportconstLanguage={`
`@@ -171,7 +171,17 @@ export const TemplatesPageView: FC<TemplatesPageViewProps> = ({`
`171`	`171`	`<Margins>`
`172`	`172`	`<PageHeader`
`173`	`173`	`actions={`
`174`		`-canCreateTemplates&&<CreateTemplateButtononNavigate={navigate}/>`
	`174`	`+canCreateTemplates&&(`
	`175`	`+<Button`
	`176`	`+startIcon={<AddIcon/>}`
	`177`	`+variant="contained"`
	`178`	`+onClick={()=>{`
	`179`	`+navigate("/starter-templates");`
	`180`	`+}}`
	`181`	`+>`
	`182`	`+ Create Template`
	`183`	`+</Button>`
	`184`	`+)`
`175`	`185`	`}`
`176`	`186`	`>`
`177`	`187`	`<PageHeaderTitle>`

Comments

(0)