Merge pull request #539 from UTNkar/feat/miljogruppentheme

Theme added
UTNkar · Oct 6, 2023 · ef1fd1d · ef1fd1d
2 parents ad77988 + c54a55e
commit ef1fd1d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 0 deletions.
diff --git a/backend/models.py b/backend/models.py
@@ -167,6 +167,7 @@ class ThemesEnum(models.TextChoices):
         KLUBBVERKET = 'klubbverket', 'Klubbverket'
         FORSRANNINGEN = 'forsranningen', 'Forsränningen'
         REBUSRALLYT = 'rebusrallyt', 'Rebusrallyt'
+        MILJOGRUPPEN = 'miljogruppen', 'Miljögruppen'
 
     id = models.AutoField(primary_key=True)
     name = models.CharField(

diff --git a/frontend/src/@types/Database.ts b/frontend/src/@types/Database.ts
@@ -41,6 +41,7 @@ export enum OrganisationTheme {
   KLUBBVERKET = 'klubbverket',
   FORSRANNINGEN = 'forsranningen',
   REBUSRALLYT = 'rebusrallyt',
+  MILJOGRUPPEN = 'miljogruppen',
 }
 
 export interface Organisation {

diff --git a/frontend/src/assets/images/miljogruppen.png b/frontend/src/assets/images/miljogruppen.png
diff --git a/frontend/src/components/Header/Header.tsx b/frontend/src/components/Header/Header.tsx
@@ -25,6 +25,7 @@ import TdLogo from '../../assets/images/td.png';
 import KlubbverketLogo from '../../assets/images/klubbverket.png';
 import ForsranningenLogo from '../../assets/images/forsranningen.png';
 import RebusrallytLogo from '../../assets/images/rebusrallyt.png';
+import MiljogruppenLogo from '../../assets/images/miljogruppen.png';
 
 import { OrganisationTheme } from '../../@types';
 
@@ -35,6 +36,7 @@ const THEME_TO_IMAGE = Object.freeze({
   [OrganisationTheme.KLUBBVERKET]: KlubbverketLogo,
   [OrganisationTheme.FORSRANNINGEN]: ForsranningenLogo,
   [OrganisationTheme.REBUSRALLYT]: RebusrallytLogo,
+  [OrganisationTheme.MILJOGRUPPEN]: MiljogruppenLogo,
 });
 
 interface HeaderProps {

diff --git a/frontend/src/utils/themes.ts b/frontend/src/utils/themes.ts
@@ -130,4 +130,16 @@ export const themes = {
       },
     },
   })),
+  [OrganisationTheme.MILJOGRUPPEN]: responsiveFontSizes(createTheme({
+    typography,
+    palette: {
+      ...paletteBase,
+      primary: {
+        main: '#8ac163',
+        dark: '#4a8a1d',
+        light: '#a2c987',
+        contrastText: '#fff',
+      },
+    },
+  })),
 };