fix: merge issues

jaaydenh · jaaydenh · commit c52c3dcd90cd · 2024-07-25T23:25:27.000Z
diff --git a/site/src/pages/CreateTemplatesGalleryPage/CreateTemplatesPageView.tsx b/site/src/pages/CreateTemplatesGalleryPage/CreateTemplatesPageView.tsx
@@ -10,7 +10,7 @@ import { ExternalImage } from "components/ExternalImage/ExternalImage";
 import { Loader } from "components/Loader/Loader";
 import { Margins } from "components/Margins/Margins";
 import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
-import type { StarterTemplatesByTag } from "utils/templateAggregators";
+import type { StarterTemplatesByTag } from "utils/starterTemplates";
 import { StarterTemplates } from "./StarterTemplates";
 
 export interface CreateTemplatePageViewProps {
diff --git a/site/src/pages/CreateTemplatesGalleryPage/StarterTemplates.tsx b/site/src/pages/CreateTemplatesGalleryPage/StarterTemplates.tsx
@@ -3,7 +3,7 @@ import type { FC } from "react";
 import { Link, useSearchParams } from "react-router-dom";
 import { Stack } from "components/Stack/Stack";
 import { TemplateExampleCard } from "modules/templates/TemplateExampleCard/TemplateExampleCard";
-import type { StarterTemplatesByTag } from "utils/templateAggregators";
+import type { StarterTemplatesByTag } from "utils/starterTemplates";
 
 const getTagLabel = (tag: string) => {
   const labelByTag: Record<string, string> = {
diff --git a/site/src/pages/CreateTemplatesGalleryPage/StarterTemplatesPageView.tsx b/site/src/pages/CreateTemplatesGalleryPage/StarterTemplatesPageView.tsx
@@ -7,7 +7,7 @@ import {
   PageHeaderSubtitle,
   PageHeaderTitle,
 } from "components/PageHeader/PageHeader";
-import type { StarterTemplatesByTag } from "utils/templateAggregators";
+import type { StarterTemplatesByTag } from "utils/starterTemplates";
 import { StarterTemplates } from "./StarterTemplates";
 
 export interface StarterTemplatesPageViewProps {
diff --git a/site/src/pages/TemplatesPage/TemplatesPageView.tsx b/site/src/pages/TemplatesPage/TemplatesPageView.tsx
@@ -1,4 +1,5 @@
 import type { Interpolation, Theme } from "@emotion/react";
+import AddIcon from "@mui/icons-material/AddOutlined";
 import ArrowForwardOutlined from "@mui/icons-material/ArrowForwardOutlined";
 import Button from "@mui/material/Button";
 import Skeleton from "@mui/material/Skeleton";
@@ -43,7 +44,6 @@ import {
   formatTemplateBuildTime,
   formatTemplateActiveDevelopers,
 } from "utils/templates";
-import { CreateTemplateButton } from "./CreateTemplateButton";
 import { EmptyTemplates } from "./EmptyTemplates";
 
 export const Language = {
@@ -171,7 +171,17 @@ export const TemplatesPageView: FC<TemplatesPageViewProps> = ({
     <Margins>
       <PageHeader
         actions={
-          canCreateTemplates && <CreateTemplateButton onNavigate={navigate} />
+          canCreateTemplates && (
+            <Button
+              startIcon={<AddIcon />}
+              variant="contained"
+              onClick={() => {
+                navigate("/starter-templates");
+              }}
+            >
+              Create Template
+            </Button>
+          )
         }
       >
         <PageHeaderTitle>
