fix: repo structure + formatting issues

.env

@@ -1 +1 @@
-SERVER_ENDPOINT=https://api.hungermapdata.org/v2
+NEXT_PUBLIC_API_URL=https://api.hungermapdata.org/v2

.env_template

@@ -1 +1 @@
-SERVER_ENDPOINT=https://api.hungermapdata.org/v2
+NEXT_PUBLIC_API_URL=https://api.hungermapdata.org/v2

.gitignore

@@ -26,6 +26,7 @@ yarn-error.log*
 
 # local env files
 .env*.local
+.env
 
 # vercel
 .vercel

.husky/commit-msg

@@ -0,0 +1 @@
+yarn commitlint --edit $1

README.md

@@ -40,7 +40,11 @@ Linting and styling is based on [Airbnb's React style guide](https://airbnb.io/j
 
 ### Git and GitHub
 
-Always work on a separate branch, never commit to main! When you're creating a branch, you should use the branchname provided by Linear. Click the branch icon in the upper right corner of issue's page on Linear to copy the branchname. It should have the following format: `feature/<issue no.>-<concise description of issue>`. Also use meaningful, but concise commit messages. After you're done with your task, create a Pull Request and share it with your teammates, ask your team lead and/or TPL for a review. Use squash merge when the PR is approved.
+Always work on a separate branch, never commit to main! When you're creating a branch, you should use the branchname provided by Linear. Click the branch icon in the upper right corner of issue's page on Linear to copy the branchname. It should have the following format: `feature/<issue no.>-<concise description of issue>`.
+
+Commit messages are also linted using husky and commitlint, so make sure to start each commit message with `feat:`, `fix:` or `docs:` depending on the type of work implemented in that commit.
+
+After you're done with your task, create a Pull Request and share it with your teammates, ask your team lead and/or TPL for a review. Use squash merge when the PR is approved.
 
 ### Project Structure
 
@@ -54,7 +58,8 @@ What this means for a React application, is that instead of using one global sta
 
 - The domain folder contains all the entities and repositories. (Types, Interfaces, etc.)
 - The infrastructure folder contains the implementations of the interfaces. (API calls, etc.)
-- The application folder contains the services that use the infrastructure to implement the business logic.
+- The operations folder contains the business logic that is not related to a specific entity.
+- Bigger files and functions should be placed in the operations folder
 
 ### Dependency Injection
 

next.config.js

@@ -1,4 +1,4 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {}
+const nextConfig = {};
 
-module.exports = nextConfig
+module.exports = nextConfig;

package.json

@@ -35,14 +35,16 @@
     "leaflet": "^1.9.4",
     "leaflet-defaulticon-compatibility": "^0.1.2",
     "leaflet-geosearch": "^4.0.0",
-    "next": "14.2.4",
+    "next": "14.2.10",
     "next-themes": "^0.2.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-leaflet": "^4.2.1",
     "tailwind-variants": "0.1.20"
   },
   "devDependencies": {
+    "@commitlint/cli": "^19.5.0",
+    "@commitlint/config-conventional": "^19.5.0",
     "@types/leaflet": "^1.9.14",
     "@types/node": "20.5.7",
     "@types/react": "^18.3.12",
@@ -64,5 +66,22 @@
     "prettier": "^3.3.3",
     "tailwindcss": "3.4.3",
     "typescript": "5.0.4"
+  },
+  "commitlint": {
+    "rules": {
+      "type-enum": [
+        2,
+        "always",
+        [
+          "feat",
+          "docs",
+          "fix"
+        ]
+      ],
+      "type-empty": [
+        2,
+        "never"
+      ]
+    }
   }
 }

postcss.config.js

@@ -3,4 +3,4 @@ module.exports = {
     tailwindcss: {},
     autoprefixer: {},
   },
-}
+};

src/app/elements/page.tsx

@@ -1,19 +1,11 @@
-import { Suspense } from 'react';
-
-import { ClientChart } from '@/components/Charts/ClientChart';
-
-import Providers from './providers';
+import { Chart } from '@/components/Charts/Chart';
+import container from '@/container';
+import CountryRepository from '@/domain/repositories/CountryRepository';
 /**
  * You can use this page to try and show off your components.
  * It's not accessible from the UI, but you can reach it by manually navigating to /elements
  */
-
-export default function Elements() {
-  return (
-    <Suspense fallback={<div className="w-full h-full flex justify-center items-center">Loading...</div>}>
-      <Providers>
-        <ClientChart />
-      </Providers>
-    </Suspense>
-  );
+export default async function Elements() {
+  const countryData = await container.resolve<CountryRepository>('CountryRepository').getCountryData(50);
+  return <Chart chartData={countryData.fcsGraph} />;
 }

src/components/Charts/Chart.tsx

@@ -5,72 +5,10 @@
 import * as Highcharts from 'highcharts';
 import { HighchartsReact } from 'highcharts-react-official';
 
-import { FcsChartData } from '@/domain/entities/charts/FcsChartData';
+import ChartProps from '@/domain/props/ChartProps';
+import ChartOperations from '@/operations/charts/ChartOperations';
 
-export function Chart(data: { data: FcsChartData[] }) {
-  const options: Highcharts.Options = {
-    title: {
-      text: 'FCS Chart',
-    },
-    xAxis: {
-      type: 'datetime',
-      labels: {
-        format: '{value:%b %d}',
-      },
-      categories: data.data.map((item) => item.x),
-    },
-    yAxis: {
-      title: {
-        text: 'FCS Value',
-      },
-    },
-    series: [
-      {
-        name: 'FCS',
-        type: 'line',
-        data: data.data.map((item) => item.fcs),
-        zIndex: 1,
-        marker: {
-          fillColor: 'white',
-          lineWidth: 2,
-          lineColor: 'orange',
-        },
-      },
-      {
-        name: 'High',
-        type: 'line',
-        data: data.data.map((item) => item.fcsHigh),
-        linkedTo: ':previous',
-        color: 'orange',
-        opacity: 0.3,
-        showInLegend: false,
-      },
-      {
-        name: 'Low',
-        type: 'line',
-        data: data.data.map((item) => item.fcsLow),
-        linkedTo: ':previous',
-        color: 'orange',
-        opacity: 0.3,
-        showInLegend: false,
-      },
-    ],
-    plotOptions: {
-      line: {
-        animation: true,
-        marker: {
-          enabled: true,
-        },
-      },
-      arearange: {
-        animation: true,
-        fillOpacity: 0.1,
-        lineWidth: 0,
-        marker: {
-          enabled: false,
-        },
-      },
-    },
-  };
+export function Chart({ chartData }: ChartProps) {
+  const options: Highcharts.Options = ChartOperations.getChartData(chartData);
   return <HighchartsReact highcharts={Highcharts} options={options} />;
 }

src/container.tsx

@@ -1,4 +1,6 @@
+import { AlertRepositoryImpl } from './infrastructure/repositories/AlertRepositoryImpl';
 import CountryRepositoryImpl from './infrastructure/repositories/CountryRepositoryImpl';
+import GlobalDataRepositoryImpl from './infrastructure/repositories/GlobalDataRepositoryImpl';
 
 class Container {
   private dependencies: { [key: string]: unknown } = {};
@@ -18,5 +20,7 @@ class Container {
 const container = new Container();
 
 container.register('CountryRepository', new CountryRepositoryImpl());
+container.register('AlertRepository', new AlertRepositoryImpl());
+container.register('GlobalDataRepository', new GlobalDataRepositoryImpl());
 
 export default container;

src/domain/entities/Adm0Data.ts

@@ -0,0 +1,41 @@
+import { Coordinate } from './common/Coordinate';
+import { Feature } from './common/Feature';
+
+/**
+ * Not really sure what this represents...
+ */
+export type Adm0Data = Feature<{
+  OBJECTID: number;
+  adm0_name: string;
+  map_lab: string;
+  adm0_altnm: string;
+  iso3: string;
+  disp_area: string;
+  adm0_id: number;
+  source: string;
+  validity: number;
+  last_modif: string;
+  STSCOD: string;
+  MAPCLR: string;
+  source_adm: string;
+  Shape_Leng: number;
+  Shape_Area: number;
+  interactive?: boolean;
+  fcs?: number;
+  fcs_people_total?: number;
+  undernourishment?: number;
+  ipcPopulation?: number;
+  ipcAreasAnalysis?: string;
+  incomeLevel?: string;
+  alerts: {
+    covid: boolean;
+    fcs: boolean;
+    marketAccess: boolean;
+    conflict: boolean;
+    ndvi: boolean;
+    climateDry: boolean;
+    climateWet: boolean;
+  };
+  centroid: Coordinate;
+  dataType?: string;
+}>;

src/domain/entities/ChangeLogItem.ts

@@ -0,0 +1,5 @@
+export interface ChangeLogItem {
+  id_log: number;
+  date_log: string;
+  description: string;
+}

src/domain/entities/DisputedAreas.ts

@@ -0,0 +1,14 @@
+import { Feature } from './common/Feature';
+
+export interface DisputedAreas {
+  type: string;
+  features: Feature<{
+    Code: number;
+    CodeISO3166_1A2: unknown;
+    CodeISO3166_1A3: string;
+    DataSource: string;
+    DisputedArea: boolean;
+    CreateDate: string;
+    Name: string;
+  }>[];
+}

src/domain/entities/YearInReview.ts

@@ -0,0 +1,4 @@
+export interface YearInReview {
+  label: string;
+  url: string;
+}

src/domain/entities/alerts/Conflict.ts

@@ -0,0 +1,8 @@
+import { ConflictType } from '@/domain/enums/ConflictType';
+
+import { Feature } from '../common/Feature';
+
+export type Conflict = Feature<{
+  count: number;
+  event_type: ConflictType;
+}>;

src/domain/entities/alerts/Hazard.ts

@@ -0,0 +1,10 @@
+export interface Hazard {
+  Id: number;
+  type: string;
+  severity_id: string;
+  hazard_name: string;
+  latitude: number;
+  longitude: number;
+  create_date: string;
+  last_update: string;
+}

src/domain/entities/charts/BalanceOfTradeGraph.ts

@@ -0,0 +1,5 @@
+import { ChartData } from '../common/ChartData';
+
+export interface BalanceOfTradeGraph {
+  data: ChartData[];
+}

src/domain/entities/charts/CurrencyExchangeGraph.ts

@@ -0,0 +1,8 @@
+import { ChartData } from '../common/ChartData';
+
+export interface CurrencyExchangeGraph {
+  name: string;
+  source: string;
+  updated: string;
+  data: ChartData[];
+}

src/domain/entities/charts/InflationGraphs.ts

@@ -0,0 +1,10 @@
+import { ChartData } from '../common/ChartData';
+
+export interface InflationGraphs {
+  headline: {
+    data: ChartData[];
+  };
+  food: {
+    data: ChartData[];
+  };
+}

src/domain/entities/charts/RegionFcsChartData.ts

@@ -0,0 +1,6 @@
+export interface RegionFcsChartData {
+  x: string;
+  fcs: number;
+  fcsHigh: number;
+  fcsLow: number;
+}

src/domain/entities/common/ChartData.ts

@@ -0,0 +1,4 @@
+export interface ChartData {
+  y: number;
+  x: string;
+}

src/domain/entities/common/Coordinate.ts

@@ -0,0 +1,4 @@
+export interface Coordinate {
+  latitude: number;
+  longitude: number;
+}

src/domain/entities/common/Feature.ts

@@ -0,0 +1,7 @@
+import { Geometry } from './Geometry';
+
+export interface Feature<T> {
+  type: string;
+  geometry: Geometry;
+  properties: T;
+}