Merge pull request #957 from CodeForAfrica/ft/fix-svg-imports

Fix SVG imports
CodeForAfrica · Oct 16, 2024 · 6c775eb · 6c775eb
2 parents 967f126 + 74e4957
commit 6c775eb
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/climatemappedafrica-deploy-dev.yml b/.github/workflows/climatemappedafrica-deploy-dev.yml
@@ -16,7 +16,7 @@ env:
   DOKKU_REMOTE_BRANCH: "master"
   DOKKU_REMOTE_URL: "ssh://azureuser@ui-1.dev.codeforafrica.org"
   IMAGE_NAME: "codeforafrica/climatemappedafrica-ui"
-  NEXT_PUBLIC_APP_URL: "https://climatemapped-africa-ui.dev.codeforafrica.org"
+  NEXT_PUBLIC_APP_URL: "https://climatemapped-africa.dev.codeforafrica.org"
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   APP_NAME: climatemapped-africa-ui
 

diff --git a/apps/climatemappedafrica/package.json b/apps/climatemappedafrica/package.json
@@ -1,6 +1,6 @@
 {
   "name": "climatemappedafrica",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "private": true,
   "author": "Code for Africa <tech@codeforafrica.org>",
   "description": "Climate Mapped Africa ",

diff --git a/apps/climatemappedafrica/src/components/HURUmap/Chart/index.js b/apps/climatemappedafrica/src/components/HURUmap/Chart/index.js
@@ -11,15 +11,15 @@ import configureScope from "./configureScope";
 import Filters from "./Filters";
 import { calculateTooltipPosition, idify } from "./utils";
 
-import { ReactComponent as CopyIcon } from "@/climatemappedafrica/assets/icons/copy.svg";
-import { ReactComponent as DownloadIcon } from "@/climatemappedafrica/assets/icons/download.svg";
-import { ReactComponent as EmailIcon } from "@/climatemappedafrica/assets/icons/Email.svg";
-import { ReactComponent as FacebookIcon } from "@/climatemappedafrica/assets/icons/Facebook.svg";
-import { ReactComponent as LinkedInIcon } from "@/climatemappedafrica/assets/icons/LinkedIn.svg";
-import { ReactComponent as InfoIcon } from "@/climatemappedafrica/assets/icons/plus.svg";
-import { ReactComponent as ShareIcon } from "@/climatemappedafrica/assets/icons/share.svg";
-import { ReactComponent as TwitterIcon } from "@/climatemappedafrica/assets/icons/Twitter.svg";
-import { ReactComponent as WhatsAppIcon } from "@/climatemappedafrica/assets/icons/WhatsApp.svg";
+import CopyIcon from "@/climatemappedafrica/assets/icons/copy.svg";
+import DownloadIcon from "@/climatemappedafrica/assets/icons/download.svg";
+import EmailIcon from "@/climatemappedafrica/assets/icons/Email.svg";
+import FacebookIcon from "@/climatemappedafrica/assets/icons/Facebook.svg";
+import LinkedInIcon from "@/climatemappedafrica/assets/icons/LinkedIn.svg";
+import InfoIcon from "@/climatemappedafrica/assets/icons/plus.svg";
+import ShareIcon from "@/climatemappedafrica/assets/icons/share.svg";
+import TwitterIcon from "@/climatemappedafrica/assets/icons/Twitter.svg";
+import WhatsAppIcon from "@/climatemappedafrica/assets/icons/WhatsApp.svg";
 import cfalogo from "@/climatemappedafrica/assets/logos/cfa.svg";
 import projectlogo from "@/climatemappedafrica/assets/logos/projectLogo.svg";
 import config, { hurumapArgs } from "@/climatemappedafrica/config";

diff --git a/apps/climatemappedafrica/src/components/HURUmap/ChartFilter/index.js b/apps/climatemappedafrica/src/components/HURUmap/ChartFilter/index.js
@@ -4,7 +4,7 @@ import React, { useEffect, useState } from "react";
 
 import useStyles from "./useStyles";
 
-import { ReactComponent as CloseIcon } from "@/climatemappedafrica/assets/icons/x.svg";
+import CloseIcon from "@/climatemappedafrica/assets/icons/x.svg";
 import Select from "@/climatemappedafrica/components/Select";
 
 function ChartFilter({

diff --git a/apps/climatemappedafrica/src/components/HURUmap/LocationHeader/index.js b/apps/climatemappedafrica/src/components/HURUmap/LocationHeader/index.js
@@ -10,7 +10,7 @@ import React from "react";
 
 import useStyles from "./useStyles";
 
-import { ReactComponent as CloseIcon } from "@/climatemappedafrica/assets/icons/closeBlack.svg";
+import CloseIcon from "@/climatemappedafrica/assets/icons/closeBlack.svg";
 import Image from "@/climatemappedafrica/components/Image";
 import slugify from "@/climatemappedafrica/utils/slugify";
 

diff --git a/apps/climatemappedafrica/src/components/HURUmap/Panel/MobilePanel/SubcategoryList.js b/apps/climatemappedafrica/src/components/HURUmap/Panel/MobilePanel/SubcategoryList.js
@@ -4,7 +4,7 @@ import clsx from "clsx";
 import PropTypes from "prop-types";
 import React from "react";
 
-import { ReactComponent as Caret } from "@/climatemappedafrica/assets/icons/caret.svg";
+import Caret from "@/climatemappedafrica/assets/icons/caret.svg";
 import Link from "@/climatemappedafrica/components/Link";
 import slugify from "@/climatemappedafrica/utils/slugify";
 

diff --git a/apps/climatemappedafrica/src/components/HURUmap/Panel/MobilePanel/index.js b/apps/climatemappedafrica/src/components/HURUmap/Panel/MobilePanel/index.js
@@ -4,8 +4,8 @@ import React from "react";
 
 import RichData from "./RichData";
 
-import Print from "@/climatemappedafrica/assets/icons/print.svg";
-import { ReactComponent as TopIcon } from "@/climatemappedafrica/assets/icons/top.svg";
+import PrintIcon from "@/climatemappedafrica/assets/icons/print.svg";
+import TopIcon from "@/climatemappedafrica/assets/icons/top.svg";
 import LocationHeader from "@/climatemappedafrica/components/HURUmap/LocationHeader";
 import PinAndCompare from "@/climatemappedafrica/components/HURUmap/PinAndCompare";
 import Section from "@/climatemappedafrica/components/Section";
@@ -52,7 +52,7 @@ function MobilePanel({ scrollToTopLabel, activeType, ...props }) {
         <Section>
           <LocationHeader
             variant="primary"
-            icon={Print}
+            icon={PrintIcon}
             title={geography.name}
             {...geography}
           />

diff --git a/apps/climatemappedafrica/src/components/HURUmap/PinAndCompare/index.js b/apps/climatemappedafrica/src/components/HURUmap/PinAndCompare/index.js
@@ -4,8 +4,8 @@ import React, { useState } from "react";
 
 import useStyles from "./useStyles";
 
-import { ReactComponent as PinIconDefault } from "@/climatemappedafrica/assets/pinBlack.svg";
-import { ReactComponent as PinIconSelected } from "@/climatemappedafrica/assets/pinSelected.svg";
+import PinIconDefault from "@/climatemappedafrica/assets/pinBlack.svg";
+import PinIconSelected from "@/climatemappedafrica/assets/pinSelected.svg";
 import Select from "@/climatemappedafrica/components/Select";
 
 function PinIcon(props) {

diff --git a/apps/climatemappedafrica/src/components/HURUmap/TreeView/index.js b/apps/climatemappedafrica/src/components/HURUmap/TreeView/index.js
@@ -7,7 +7,7 @@ import React, { useState } from "react";
 
 import useStyles from "./useStyles";
 
-import { ReactComponent as CheckIcon } from "@/climatemappedafrica/assets/icons/checked.svg";
+import CheckIcon from "@/climatemappedafrica/assets/icons/checked.svg";
 import slugify from "@/climatemappedafrica/utils/slugify";
 
 function TreeView({ items, onLabelClick, ...props }) {

diff --git a/apps/climatemappedafrica/src/components/HURUmap/Tutorial/TutorialStep/index.js b/apps/climatemappedafrica/src/components/HURUmap/Tutorial/TutorialStep/index.js
@@ -7,7 +7,7 @@ import React from "react";
 
 import useStyles from "./useStyles";
 
-import { ReactComponent as CloseIcon } from "@/climatemappedafrica/assets/icons/close.svg";
+import CloseIcon from "@/climatemappedafrica/assets/icons/close.svg";
 
 function TutorialStep({ description, title, image, selector, ...props }) {
   const classes = useStyles(props);

diff --git a/apps/climatemappedafrica/src/components/Select/index.js b/apps/climatemappedafrica/src/components/Select/index.js
@@ -14,7 +14,7 @@ import React, { useState } from "react";
 
 import useStyles from "./useStyles";
 
-import { ReactComponent as ExpandMore } from "@/climatemappedafrica/assets/icons/expand_more.svg";
+import ExpandMore from "@/climatemappedafrica/assets/icons/expand_more.svg";
 
 function ExpandMoreIcon(props) {
   return <SvgIcon {...props} component={ExpandMore} />;