chore: Update frontend queries and types

theopensystemslab · Dec 22, 2023 · 76d294a · 76d294a
1 parent 1852600
commit 76d294a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/editor.planx.uk/src/components/Header.test.tsx b/editor.planx.uk/src/components/Header.test.tsx
@@ -18,6 +18,9 @@ const mockTeam1: Team = {
   slug: "opensystemslab",
   theme: {
     logo: "logo.jpg",
+    primary: "#0010A4",
+    secondary: null,
+    favicon: null,
   },
 };
 

diff --git a/editor.planx.uk/src/components/Header.tsx b/editor.planx.uk/src/components/Header.tsx
@@ -183,7 +183,7 @@ const TeamLogo: React.FC = () => {
   const altText = teamSettings?.homepage
     ? `${teamName} Homepage (opens in a new tab)`
     : `${teamName} Logo`;
-  const logo = <Logo alt={altText} src={teamTheme?.logo} />;
+  const logo = <Logo alt={altText} src={teamTheme?.logo ?? undefined} />;
   return teamSettings?.homepage ? (
     <LogoLink href={teamSettings?.homepage} target="_blank">
       {logo}

diff --git a/editor.planx.uk/src/routes/views/published.tsx b/editor.planx.uk/src/routes/views/published.tsx
@@ -71,7 +71,12 @@ const fetchDataForPublishedView = async (
           ) {
             id
             team {
-              theme
+              theme {
+                primary: primary_colour
+                secondary: secondary_colour
+                logo
+                favicon
+              }
               name
               settings
               slug

diff --git a/editor.planx.uk/src/routes/views/standalone.tsx b/editor.planx.uk/src/routes/views/standalone.tsx
@@ -59,7 +59,12 @@ const fetchDataForStandaloneView = async (
           ) {
             id
             team {
-              theme
+              theme {
+                primary: primary_colour
+                secondary: secondary_colour
+                logo
+                favicon
+              }
               name
               settings
               slug

diff --git a/editor.planx.uk/src/routes/views/unpublished.tsx b/editor.planx.uk/src/routes/views/unpublished.tsx
@@ -62,7 +62,12 @@ const fetchDataForUnpublishedView = async (
           ) {
             id
             team {
-              theme
+              theme {
+                primary: primary_colour
+                secondary: secondary_colour
+                logo
+                favicon
+              }
               name
               settings
               slug

diff --git a/editor.planx.uk/src/types.ts b/editor.planx.uk/src/types.ts
@@ -27,8 +27,10 @@ export interface Team {
 }
 
 export interface TeamTheme {
-  primary?: string;
-  logo?: string;
+  primary: string;
+  secondary: string | null;
+  logo: string | null;
+  favicon: string | null;
 }
 
 export interface TeamSettings {
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,12 @@ const fetchDataForPublishedView = async ( @@
               ) {
                 id
                 team {
-                  theme
+                  theme {
+                    primary: primary_colour
+                    secondary: secondary_colour
+                    logo
+                    favicon
+                  }
                   name
                   settings
                   slug
@@ Expand Down @@