Skip to content

Commit

Permalink
Merge branch 'develop' into feature/transport-sector-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
cephaschapa committed Jun 11, 2024
2 parents aad5f8f + b83a477 commit f6d905e
Show file tree
Hide file tree
Showing 26 changed files with 55,598 additions and 3,220 deletions.
4,964 changes: 2,660 additions & 2,304 deletions app/package-lock.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
"@chakra-ui/icons": "^2.1.0",
"@chakra-ui/next-js": "^2.2.0",
"@chakra-ui/react": "^2.8.2",
"@huggingface/inference": "^2.6.4",
"@huggingface/inference": "^2.7.0",
"@react-email/components": "^0.0.16",
"@reduxjs/toolkit": "^2.2.3",
"@storybook/cli": "^8.0.8",
"@storybook/react": "^7.4.5",
"@storybook/react": "^8.1.6",
"@storybook/testing-library": "^0.2.2",
"@types/bcrypt": "^5.0.2",
"@types/geojson": "^7946.0.14",
Expand Down Expand Up @@ -81,7 +81,7 @@
"react": "18.2.0",
"react-circle-flags": "^0.0.20",
"react-dom": "18.2.0",
"react-email": "^2.1.0",
"react-email": "^2.1.4",
"react-hook-form": "^7.51.5",
"react-i18next": "^14.0.5",
"react-icons": "^5.1.0",
Expand All @@ -99,14 +99,14 @@
},
"devDependencies": {
"@playwright/test": "^1.43.1",
"@storybook/addon-essentials": "^7.6.16",
"@storybook/addon-essentials": "^8.1.6",
"@storybook/addon-interactions": "^7.4.5",
"@storybook/addon-links": "^7.6.17",
"@storybook/blocks": "^8.0.4",
"@storybook/nextjs": "^8.0.8",
"@types/glob": "^8.1.0",
"cypress": "^13.7.3",
"glob": "^10.3.10",
"glob": "^10.4.1",
"prettier": "3.2.5",
"sequelize-auto": "^0.8.8",
"start-server-and-test": "^2.0.3",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dataset_name,datasource_name,URL,publisher_id,datasource_id
IPCC Emission Factor Database (EFDB) [2006 IPCC Guidelines],IPCC,https://www.ipcc-nggip.iges.or.jp/EFDB/main.php,02359a57-1fd1-397f-9d75-692c569c8ed7,6a508faa-80a8-3246-9941-90d8cc8dec85
datasource_name,dataset_name,URL,publisher_id,datasource_id
IPCC,IPCC Emission Factor Database (EFDB) [2006 IPCC Guidelines],https://www.ipcc-nggip.iges.or.jp/EFDB/main.php,02359a57-1fd1-397f-9d75-692c569c8ed7,6a508faa-80a8-3246-9941-90d8cc8dec85

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Emission factors from the [2006 IPCC Guidelines for National Greenhouse Gas Inve
2. Click on `Basic Search` at the tope
3. Search for `"2006 IPCC Guidelines"` in the `Source of Data`
4. Click `Export to XLS` to save the data to an Excel file.
5. Convert to CSV within Excel (I was unable to open the `.xls` file from Python)

Notes: [how to search the database](https://www.ipcc-nggip.iges.or.jp/EFDB/help.php)

Expand Down
264 changes: 0 additions & 264 deletions app/seed-data/emissions_factors/scripts/EFDB_2006_IPCC_guidelines.py

This file was deleted.

Loading

0 comments on commit f6d905e

Please sign in to comment.