From fb781d105dc5d69b3579869ac19c47611c03c941 Mon Sep 17 00:00:00 2001 From: Kipruto <43873157+kelvinkipruto@users.noreply.github.com> Date: Wed, 16 Oct 2024 09:54:21 +0300 Subject: [PATCH 1/3] Fix SVG imports Signed-off-by: Kipruto <43873157+kelvinkipruto@users.noreply.github.com> --- .../src/components/HURUmap/Chart/index.js | 18 +++++++++--------- .../components/HURUmap/ChartFilter/index.js | 2 +- .../components/HURUmap/LocationHeader/index.js | 2 +- .../Panel/MobilePanel/SubcategoryList.js | 2 +- .../HURUmap/Panel/MobilePanel/index.js | 2 +- .../components/HURUmap/PinAndCompare/index.js | 4 ++-- .../src/components/HURUmap/TreeView/index.js | 2 +- .../HURUmap/Tutorial/TutorialStep/index.js | 2 +- .../src/components/Select/index.js | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/apps/climatemappedafrica/src/components/HURUmap/Chart/index.js b/apps/climatemappedafrica/src/components/HURUmap/Chart/index.js index c87683530..9425926bb 100644 --- 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 index 18bfb64b2..e986d16f4 100644 --- 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 index e74abf92f..ca10402df 100644 --- 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 index 2b8099f73..2b0c51c22 100644 --- 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 index a73489c9e..0e5230de0 100644 --- a/apps/climatemappedafrica/src/components/HURUmap/Panel/MobilePanel/index.js +++ b/apps/climatemappedafrica/src/components/HURUmap/Panel/MobilePanel/index.js @@ -5,7 +5,7 @@ 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 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"; diff --git a/apps/climatemappedafrica/src/components/HURUmap/PinAndCompare/index.js b/apps/climatemappedafrica/src/components/HURUmap/PinAndCompare/index.js index 4116f94e7..1d0839f6d 100644 --- 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 index 61a6d2448..503066580 100644 --- 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 index d3a264a65..1fdbe01cd 100644 --- 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 index a90540397..2f951926a 100644 --- 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 ; From a3f700040c1ea6b8ead62d8be9424a11c35d28bb Mon Sep 17 00:00:00 2001 From: Kipruto <43873157+kelvinkipruto@users.noreply.github.com> Date: Wed, 16 Oct 2024 10:05:13 +0300 Subject: [PATCH 2/3] Update URL Signed-off-by: Kipruto <43873157+kelvinkipruto@users.noreply.github.com> --- .github/workflows/climatemappedafrica-deploy-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/climatemappedafrica-deploy-dev.yml b/.github/workflows/climatemappedafrica-deploy-dev.yml index 477e761f8..708ebd184 100644 --- 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 From 74e4957e73999fa123056808decaa2cebda7bf2d Mon Sep 17 00:00:00 2001 From: Kipruto <43873157+kelvinkipruto@users.noreply.github.com> Date: Wed, 16 Oct 2024 13:45:37 +0300 Subject: [PATCH 3/3] Update app version Signed-off-by: Kipruto <43873157+kelvinkipruto@users.noreply.github.com> --- apps/climatemappedafrica/package.json | 2 +- .../src/components/HURUmap/Panel/MobilePanel/index.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/climatemappedafrica/package.json b/apps/climatemappedafrica/package.json index e8306b32e..0b636161e 100644 --- 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 ", "description": "Climate Mapped Africa ", diff --git a/apps/climatemappedafrica/src/components/HURUmap/Panel/MobilePanel/index.js b/apps/climatemappedafrica/src/components/HURUmap/Panel/MobilePanel/index.js index 0e5230de0..a9d101820 100644 --- a/apps/climatemappedafrica/src/components/HURUmap/Panel/MobilePanel/index.js +++ b/apps/climatemappedafrica/src/components/HURUmap/Panel/MobilePanel/index.js @@ -4,7 +4,7 @@ import React from "react"; import RichData from "./RichData"; -import Print from "@/climatemappedafrica/assets/icons/print.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"; @@ -52,7 +52,7 @@ function MobilePanel({ scrollToTopLabel, activeType, ...props }) {