Rename app

.github/workflows/climatemapped-africa-deploy-dev.yml → .github/workflows/climatemappedafrica-deploy-dev.yml

@@ -4,9 +4,9 @@ on:
   push:
     branches: [main]
     paths:
-      - "apps/climatemapped-africa/**"
+      - "apps/climatemappedafrica/**"
       - "Dockerfile"
-      - ".github/workflows/climatemapped-africa-deploy-dev.yml"
+      - ".github/workflows/climatemappedafrica-deploy-dev.yml"
 
 concurrency:
   group: "${{ github.workflow }} @ ${{ github.ref }}"
@@ -15,7 +15,7 @@ concurrency:
 env:
   DOKKU_REMOTE_BRANCH: "master"
   DOKKU_REMOTE_URL: "ssh://azureuser@ui-1.dev.codeforafrica.org"
-  IMAGE_NAME: "codeforafrica/climatemapped-africa-ui"
+  IMAGE_NAME: "codeforafrica/climatemappedafrica-ui"
   NEXT_PUBLIC_APP_URL: "https://climatemapped-africa-ui.dev.codeforafrica.org"
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   APP_NAME: climatemapped-africa-ui
@@ -58,7 +58,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
-          target: climatemapped-africa-runner
+          target: climatemappedafrica-runner
           push: true
           tags: "${{ env.IMAGE_NAME }}:${{ github.sha }}"
 

Dockerfile

@@ -604,21 +604,21 @@ CMD ["node", "apps/vpnmanager/server.js"]
 # ============================================================================
 
 #
-# climatemapped-africa-desp: image with all climatemapped-africa dependencies
+# climatemappedafrica-desp: image with all climatemappedafrica dependencies
 # ---------------------------------------------------
 
-  FROM base-deps as climatemapped-africa-deps
+  FROM base-deps as climatemappedafrica-deps
 
-  COPY apps/climatemapped-africa/package.json ./apps/climatemapped-africa/package.json
+  COPY apps/climatemappedafrica/package.json ./apps/climatemappedafrica/package.json
 
   # Use virtual store: https://pnpm.io/cli/fetch#usage-scenario
-  RUN pnpm --filter "./apps/climatemapped-africa" install --offline --frozen-lockfile
+  RUN pnpm --filter "./apps/climatemappedafrica" install --offline --frozen-lockfile
 
   #
-  # climatemapped-africa-builder: image that uses deps to build shippable output
+  # climatemappedafrica-builder: image that uses deps to build shippable output
   # ----------------------------------------------------------------
 
-  FROM base-builder as climatemapped-africa-builder
+  FROM base-builder as climatemappedafrica-builder
 
   ARG NEXT_TELEMETRY_DISABLED \
     # Next.js / Payload (build time)
@@ -640,19 +640,19 @@ CMD ["node", "apps/vpnmanager/server.js"]
     HURUMAP_API_URL
 
   # This is in app-builder instead of base-builder just incase app-deps adds deps
-  COPY --from=climatemapped-africa-deps /workspace/node_modules ./node_modules
+  COPY --from=climatemappedafrica-deps /workspace/node_modules ./node_modules
 
-  COPY --from=climatemapped-africa-deps /workspace/apps/climatemapped-africa/node_modules ./apps/climatemapped-africa/node_modules
+  COPY --from=climatemappedafrica-deps /workspace/apps/climatemappedafrica/node_modules ./apps/climatemappedafrica/node_modules
 
-  COPY apps/climatemapped-africa ./apps/climatemapped-africa
+  COPY apps/climatemappedafrica ./apps/climatemappedafrica
 
-  RUN pnpm --filter "./apps/climatemapped-africa" build
+  RUN pnpm --filter "./apps/climatemappedafrica" build
 
   #
-  # climatemapped-africa-runner: final deployable image
+  # climatemappedafrica-runner: final deployable image
   # ---------------------------------------
 
-  FROM base-runner as climatemapped-africa-runner
+  FROM base-runner as climatemappedafrica-runner
 
   ARG NEXT_PUBLIC_IMAGE_DOMAINS \
     NEXT_PUBLIC_IMAGE_SCALE_FACTOR \
@@ -666,24 +666,24 @@ CMD ["node", "apps/vpnmanager/server.js"]
 
   RUN set -ex \
     # Create nextjs cache dir w/ correct permissions
-    && mkdir -p ./apps/climatemapped-africa/.next \
-    && chown nextjs:nodejs ./apps/climatemapped-africa/.next
+    && mkdir -p ./apps/climatemappedafrica/.next \
+    && chown nextjs:nodejs ./apps/climatemappedafrica/.next
 
   # PNPM
   # symlink some dependencies
-  COPY --from=climatemapped-africa-builder --chown=nextjs:nodejs /workspace/node_modules ./node_modules
+  COPY --from=climatemappedafrica-builder --chown=nextjs:nodejs /workspace/node_modules ./node_modules
 
   # Next.js
   # Public assets
-  COPY --from=climatemapped-africa-builder --chown=nextjs:nodejs /workspace/apps/climatemapped-africa/public ./apps/climatemapped-africa/public
+  COPY --from=climatemappedafrica-builder --chown=nextjs:nodejs /workspace/apps/climatemappedafrica/public ./apps/climatemappedafrica/public
 
   # Automatically leverage output traces to reduce image size
   # https://nextjs.org/docs/advanced-features/output-file-tracing
-  COPY --from=climatemapped-africa-builder --chown=nextjs:nodejs /workspace/apps/climatemapped-africa/.next/standalone ./apps/climatemapped-africa
-  COPY --from=climatemapped-africa-builder --chown=nextjs:nodejs /workspace/apps/climatemapped-africa/.next/static ./apps/climatemapped-africa/.next/static
+  COPY --from=climatemappedafrica-builder --chown=nextjs:nodejs /workspace/apps/climatemappedafrica/.next/standalone ./apps/climatemappedafrica
+  COPY --from=climatemappedafrica-builder --chown=nextjs:nodejs /workspace/apps/climatemappedafrica/.next/static ./apps/climatemappedafrica/.next/static
 
   USER nextjs
 
   # server.js is created by next build from the standalone output
   # https://nextjs.org/docs/pages/api-reference/next-config-js/output
-  CMD ["node", "apps/climatemapped-africa/server.js"]
+  CMD ["node", "apps/climatemappedafrica/server.js"]

apps/climatemapped-africa/jest.config.js → apps/climatemappedafrica/jest.config.js

@@ -6,7 +6,7 @@ module.exports = {
   ...defaultConfig,
   moduleNameMapper: {
     ...moduleNameMapper,
-    "^@/climatemapped-africa/(.*)$": "<rootDir>/src/$1",
+    "^@/climatemappedafrica/(.*)$": "<rootDir>/src/$1",
     "^@/commons-ui/core/(.*)$":
       "<rootDir>/../../packages/commons-ui-core/src/$1",
     "^@/commons-ui/next/(.*)$":

apps/climatemapped-africa/jsconfig.json → apps/climatemappedafrica/jsconfig.json

@@ -4,7 +4,7 @@
     "paths": {
       "@/commons-ui/core/*": ["../../packages/commons-ui-core/src/*"],
       "@/commons-ui/next/*": ["../../packages/commons-ui-next/src/*"],
-      "@/climatemapped-africa/*": ["./src/*"]
+      "@/climatemappedafrica/*": ["./src/*"]
     }
   },
   "exclude": ["node_modules"]

apps/climatemapped-africa/package.json → apps/climatemappedafrica/package.json

@@ -1,11 +1,11 @@
 {
-  "name": "climatemapped-africa",
+  "name": "climatemappedafrica",
   "version": "0.0.1",
   "private": true,
   "author": "Code for Africa <tech@codeforafrica.org>",
   "description": "Climate Mapped Africa ",
   "keywords": [
-    "climatemapped-africa",
+    "climatemappedafrica",
     "next",
     "next.js",
     "react",
@@ -14,7 +14,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/codeforafrica/ui.git",
-    "directory": "apps/climatemapped-africa"
+    "directory": "apps/climatemappedafrica"
   },
   "license": "MIT",
   "bugs": {

apps/climatemapped-africa/src/components/DropdownSearch/index.js → apps/climatemappedafrica/src/components/DropdownSearch/index.js

@@ -11,8 +11,8 @@ import { useRouter } from "next/router";
 import PropTypes from "prop-types";
 import React, { useEffect, useState } from "react";
 
-import SearchIcon from "@/climatemapped-africa/assets/icons/Group 3257.svg";
-import Link from "@/climatemapped-africa/components/Link";
+import SearchIcon from "@/climatemappedafrica/assets/icons/Group 3257.svg";
+import Link from "@/climatemappedafrica/components/Link";
 
 const useStyles = makeStyles(({ palette, typography }) => ({
   root: {},

apps/climatemapped-africa/src/components/DropdownSearch/index.stories.js → apps/climatemappedafrica/src/components/DropdownSearch/index.stories.js

@@ -2,7 +2,7 @@ import React from "react";
 
 import DropdownSearch from ".";
 
-import { searchArgs } from "@/climatemapped-africa/config";
+import { searchArgs } from "@/climatemappedafrica/config";
 
 export default {
   title: "Components/DropdownSearch",

apps/climatemapped-africa/src/components/ExplorePage/index.js → apps/climatemappedafrica/src/components/ExplorePage/index.js

@@ -8,11 +8,11 @@ import useExplore from "./useExplore";
 import useProfileGeography from "./useProfileGeography";
 import useStyles from "./useStyles";
 
-import Location from "@/climatemapped-africa/components/HURUmap/Location";
-import Panel from "@/climatemapped-africa/components/HURUmap/Panel";
+import Location from "@/climatemappedafrica/components/HURUmap/Location";
+import Panel from "@/climatemappedafrica/components/HURUmap/Panel";
 
 const Map = dynamic(
-  () => import("@/climatemapped-africa/components/HURUmap/Map"),
+  () => import("@/climatemappedafrica/components/HURUmap/Map"),
   {
     ssr: false,
   },

apps/climatemapped-africa/src/components/ExplorePage/useExplore.js → apps/climatemappedafrica/src/components/ExplorePage/useExplore.js

@@ -1,6 +1,6 @@
 import { useReducer } from "react";
 
-import Link from "@/climatemapped-africa/components/Link";
+import Link from "@/climatemappedafrica/components/Link";
 
 function extendProfileTags(profile, options) {
   const { tags: originalTags, ...other } = profile || {};

apps/climatemapped-africa/src/components/ExplorePage/useProfileGeography.js → apps/climatemappedafrica/src/components/ExplorePage/useProfileGeography.js

@@ -1,6 +1,6 @@
 import useSWR from "swr";
 
-import fetchJson from "@/climatemapped-africa/utils/fetchJson";
+import fetchJson from "@/climatemappedafrica/utils/fetchJson";
 
 function useProfileGeography(shouldFetch) {
   const fetcher = (code) => {

apps/climatemapped-africa/src/components/Footer/index.js → apps/climatemappedafrica/src/components/Footer/index.js

@@ -13,8 +13,8 @@ import React from "react";
 
 import useStyles from "./useStyles";
 
-import Link from "@/climatemapped-africa/components/Link";
-import Section from "@/climatemapped-africa/components/Section";
+import Link from "@/climatemappedafrica/components/Link";
+import Section from "@/climatemappedafrica/components/Section";
 
 function Footer({
   title,

apps/climatemapped-africa/src/components/Footer/index.stories.js → apps/climatemappedafrica/src/components/Footer/index.stories.js

@@ -3,7 +3,7 @@ import React from "react";
 
 import Footer from ".";
 
-import { footerArgs } from "@/climatemapped-africa/config";
+import { footerArgs } from "@/climatemappedafrica/config";
 
 export default {
   title: "Sections/Footer",

apps/climatemapped-africa/src/components/HURUmap/CategoryHeader/index.js → apps/climatemappedafrica/src/components/HURUmap/CategoryHeader/index.js

@@ -5,7 +5,7 @@ import React from "react";
 
 import useStyles from "./useStyles";
 
-import Image from "@/climatemapped-africa/components/Image";
+import Image from "@/climatemappedafrica/components/Image";
 
 function CategoryHeader({ title, description, icon, ...props }) {
   const classes = useStyles();

apps/climatemapped-africa/src/components/HURUmap/CategoryHeader/index.stories.js → apps/climatemappedafrica/src/components/HURUmap/CategoryHeader/index.stories.js

@@ -1,7 +1,7 @@
 import React from "react";
 
-import Group4658 from "@/climatemapped-africa/assets/icons/Group 4658-white.svg";
-import CategoryHeader from "@/climatemapped-africa/components/HURUmap/CategoryHeader";
+import Group4658 from "@/climatemappedafrica/assets/icons/Group 4658-white.svg";
+import CategoryHeader from "@/climatemappedafrica/components/HURUmap/CategoryHeader";
 
 export default {
   title: "Components/HURUmap/CategoryHeader",

apps/climatemapped-africa/src/components/HURUmap/Chart/BarChartScope.js → apps/climatemappedafrica/src/components/HURUmap/Chart/BarChartScope.js

@@ -2,7 +2,7 @@ import merge from "deepmerge";
 
 import Scope from "./Scope";
 
-import theme from "@/climatemapped-africa/theme";
+import theme from "@/climatemappedafrica/theme";
 
 export default function BarChartScope(
   primaryData,

apps/climatemapped-africa/src/components/HURUmap/Chart/DonutChartScope.js → apps/climatemappedafrica/src/components/HURUmap/Chart/DonutChartScope.js

@@ -2,7 +2,7 @@ import merge from "deepmerge";
 
 import Scope from "./Scope";
 
-import theme from "@/climatemapped-africa/theme";
+import theme from "@/climatemappedafrica/theme";
 
 export default function DonutChartScope(
   primaryData,

apps/climatemapped-africa/src/components/HURUmap/Chart/Filters.js → apps/climatemappedafrica/src/components/HURUmap/Chart/Filters.js

@@ -5,7 +5,7 @@ import React, { useEffect, useState, useCallback } from "react";
 
 import { idify } from "./utils";
 
-import ChartFilter from "@/climatemapped-africa/components/HURUmap/ChartFilter";
+import ChartFilter from "@/climatemappedafrica/components/HURUmap/ChartFilter";
 
 const useStyles = makeStyles(({ typography }) => ({
   root: {

apps/climatemapped-africa/src/components/HURUmap/Chart/LineChartScope.js → apps/climatemappedafrica/src/components/HURUmap/Chart/LineChartScope.js

@@ -2,7 +2,7 @@ import merge from "deepmerge";
 
 import Scope from "./Scope";
 
-import theme from "@/climatemapped-africa/theme";
+import theme from "@/climatemappedafrica/theme";
 
 export default function LineChartScope(
   primaryData,

apps/climatemapped-africa/src/components/HURUmap/Chart/MultiLineChartScope.js → apps/climatemappedafrica/src/components/HURUmap/Chart/MultiLineChartScope.js

@@ -2,7 +2,7 @@ import merge from "deepmerge";
 
 import Scope from "./Scope";
 
-import theme from "@/climatemapped-africa/theme";
+import theme from "@/climatemappedafrica/theme";
 
 export default function MultiLineChartScope(
   primaryData,

apps/climatemapped-africa/src/components/HURUmap/Chart/Scope/index.js → apps/climatemappedafrica/src/components/HURUmap/Chart/Scope/index.js

@@ -1,8 +1,8 @@
 import data from "./data";
 import signals from "./signals";
 
-import { createFiltersForGroups } from "@/climatemapped-africa/components/HURUmap/Chart/utils";
-import theme from "@/climatemapped-africa/theme";
+import { createFiltersForGroups } from "@/climatemappedafrica/components/HURUmap/Chart/utils";
+import theme from "@/climatemappedafrica/theme";
 
 export default function Scope(
   primaryData,

apps/climatemapped-africa/src/components/HURUmap/Chart/Scope/signals.js → apps/climatemappedafrica/src/components/HURUmap/Chart/Scope/signals.js

@@ -1,5 +1,5 @@
-import { hurumapArgs } from "@/climatemapped-africa/config";
-import theme from "@/climatemapped-africa/theme";
+import { hurumapArgs } from "@/climatemappedafrica/config";
+import theme from "@/climatemappedafrica/theme";
 
 const graphValueTypes = {
   Percentage: "percentage",

apps/climatemapped-africa/src/components/HURUmap/Chart/StackedChartScope.js → apps/climatemappedafrica/src/components/HURUmap/Chart/StackedChartScope.js

@@ -2,7 +2,7 @@ import merge from "deepmerge";
 
 import Scope from "./Scope";
 
-import theme from "@/climatemapped-africa/theme";
+import theme from "@/climatemappedafrica/theme";
 
 export default function StackedChartScope(
   primaryData,

apps/climatemapped-africa/src/components/HURUmap/Chart/TreemapChartScope.js → apps/climatemappedafrica/src/components/HURUmap/Chart/TreemapChartScope.js

@@ -2,7 +2,7 @@ import merge from "deepmerge";
 
 import Scope from "./Scope";
 
-import theme from "@/climatemapped-africa/theme";
+import theme from "@/climatemappedafrica/theme";
 
 export default function TreemapChartScope(
   primaryData,

apps/climatemapped-africa/src/components/HURUmap/Chart/VerticalBarChartScope.js → apps/climatemappedafrica/src/components/HURUmap/Chart/VerticalBarChartScope.js

@@ -2,7 +2,7 @@ import merge from "deepmerge";
 
 import Scope from "./Scope";
 
-import theme from "@/climatemapped-africa/theme";
+import theme from "@/climatemappedafrica/theme";
 
 export default function VerticalBarChartScope(
   primaryData,

apps/climatemapped-africa/src/components/HURUmap/Chart/VerticalStackedChartScope.js → apps/climatemappedafrica/src/components/HURUmap/Chart/VerticalStackedChartScope.js

@@ -2,7 +2,7 @@ import merge from "deepmerge";
 
 import Scope from "./Scope";
 
-import theme from "@/climatemapped-africa/theme";
+import theme from "@/climatemappedafrica/theme";
 
 export default function VerticalStackedChartScope(
   primaryData,

apps/climatemapped-africa/src/components/HURUmap/Chart/index.js → apps/climatemappedafrica/src/components/HURUmap/Chart/index.js

@@ -10,10 +10,10 @@ import configureScope from "./configureScope";
 import Filters from "./Filters";
 import { calculateTooltipPosition, idify } from "./utils";
 
-import ChartTooltip from "@/climatemapped-africa/components/HURUmap/ChartTooltip";
-import IndicatorTitle from "@/climatemapped-africa/components/HURUmap/IndicatorTitle";
-import Source from "@/climatemapped-africa/components/HURUmap/Source";
-import theme from "@/climatemapped-africa/theme";
+import ChartTooltip from "@/climatemappedafrica/components/HURUmap/ChartTooltip";
+import IndicatorTitle from "@/climatemappedafrica/components/HURUmap/IndicatorTitle";
+import Source from "@/climatemappedafrica/components/HURUmap/Source";
+import theme from "@/climatemappedafrica/theme";
 
 const useStyles = makeStyles(({ typography }) => ({
   root: {

apps/climatemapped-africa/src/components/HURUmap/Chart/index.stories.js → apps/climatemappedafrica/src/components/HURUmap/Chart/index.stories.js

@@ -1,7 +1,7 @@
 /* eslint-disable import/no-anonymous-default-export */
 import React from "react";
 
-import Chart from "@/climatemapped-africa/components/HURUmap/Chart";
+import Chart from "@/climatemappedafrica/components/HURUmap/Chart";
 
 export default {
   title: "Components/HURUmap/Chart",

apps/climatemapped-africa/src/components/HURUmap/ChartFilter/index.js → apps/climatemappedafrica/src/components/HURUmap/ChartFilter/index.js

@@ -4,8 +4,8 @@ import React, { useEffect, useState } from "react";
 
 import useStyles from "./useStyles";
 
-import { ReactComponent as CloseIcon } from "@/climatemapped-africa/assets/icons/Component1081.svg";
-import Select from "@/climatemapped-africa/components/Select";
+import { ReactComponent as CloseIcon } from "@/climatemappedafrica/assets/icons/Component1081.svg";
+import Select from "@/climatemappedafrica/components/Select";
 
 function ChartFilter({
   groups,

apps/climatemapped-africa/src/components/HURUmap/ChartFilter/index.stories.js → apps/climatemappedafrica/src/components/HURUmap/ChartFilter/index.stories.js

@@ -1,6 +1,6 @@
 import React from "react";
 
-import ChartFilter from "@/climatemapped-africa/components/HURUmap/ChartFilter";
+import ChartFilter from "@/climatemappedafrica/components/HURUmap/ChartFilter";
 
 export default {
   title: "Components/HURUmap/ChartFilter",

apps/climatemapped-africa/src/components/HURUmap/ChartTooltip/index.stories.js → apps/climatemappedafrica/src/components/HURUmap/ChartTooltip/index.stories.js

@@ -1,6 +1,6 @@
 import React from "react";
 
-import ChartTooltip from "@/climatemapped-africa/components/HURUmap/ChartTooltip";
+import ChartTooltip from "@/climatemappedafrica/components/HURUmap/ChartTooltip";
 
 export default {
   title: "Components/HURUmap/ChartTooltip",