Skip to content

Commit

Permalink
Merge pull request #155 from carbonplan/msft-2021
Browse files Browse the repository at this point in the history
Microsoft 2021 RFP Projects Update
  • Loading branch information
freeman-lab committed Mar 17, 2021
2 parents b63f889 + 6c3c97f commit 5c60a83
Show file tree
Hide file tree
Showing 110 changed files with 11,193 additions and 8,948 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
secrets/** filter=git-crypt diff=git-crypt
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2.1.4
uses: actions/setup-node@v2.1.5
with:
node-version: ${{ matrix.node-version }}
- run: npm install
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
node_modules
.DS_Store
/public/icons
.now
.now
.env
__pycache__
2 changes: 2 additions & 0 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[settings]
known_third_party = click,gspread,msft2021,oauth2client,pandas,strp2020,utils
41 changes: 37 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,40 @@
exclude: ^(secrets/|data/)
repos:
- repo: https://github.com/prettier/prettier
rev: '2.0.5'
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.3.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-docstring-first
- id: check-json
- id: check-yaml
- id: pretty-format-json
args: ['--autofix', '--indent=2', '--no-sort-keys']

- repo: https://github.com/ambv/black
rev: 20.8b1
hooks:
- id: black
args: ['--line-length', '100', '--skip-string-normalization']

- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.4
hooks:
- id: flake8

- repo: https://github.com/asottile/seed-isort-config
rev: v2.2.0
hooks:
- id: seed-isort-config
- repo: https://github.com/pre-commit/mirrors-isort
rev: v5.6.4
hooks:
- id: isort
- repo: https://github.com/pre-commit/mirrors-prettier
rev: 'v2.2.0'
hooks:
- id: prettier
language_version: system
files: "\\.(\
css|less|scss\
|graphql|gql\
Expand All @@ -13,11 +45,12 @@ repos:
|vue\
|yaml|yml\
)$"
- repo: https://github.com/prettier/prettier
rev: '2.0.5'
- repo: https://github.com/pre-commit/mirrors-prettier
rev: 'v2.2.0'
hooks:
- id: prettier
name: prettier-markdown
language_version: system
entry: prettier --write --parser mdx
files: "\\.(\
|md|markdown|mdown|mkdn\
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
secrets/
19 changes: 10 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@
height='48'
/>

# carbonplan / reports
# carbonplan / cdr-database

**reports on carbon removal projects and technologies**

[![GitHub][github-badge]][github]
![Build Status][]
[![Build Status]][actions]
![MIT License][]

[github]: https://github.com/carbonplan/reports
[github-badge]: https://flat.badgen.net/badge/-/github?icon=github&label
[build status]: https://flat.badgen.net/github/checks/carbonplan/reports
[mit license]: https://flat.badgen.net/badge/license/MIT/blue
[github]: https://github.com/carbonplan/cdr-database
[github-badge]: https://badgen.net/badge/-/github?icon=github&label
[build status]: https://github.com/carbonplan/cdr-database/actions/workflows/main.yaml/badge.svg
[actions]: https://github.com/carbonplan/cdr-database/actions/workflows/main.yaml
[mit license]: https://badgen.net/badge/license/MIT/blue

## resources

- Main website: https://carbonplan.org/
- Projects API: https://api.carbonplan.org/docs
- This site: https://carbonplan.org/research/cdr-database

## to build the site locally

Expand All @@ -35,12 +36,12 @@ To start a development version of the site, simply run:
npm run dev
```

and then visit `http://localhost:5000/reports` in your browser.
and then visit `http://localhost:5000/research/cdr-database` in your browser.

## license

All the code in this repository is [MIT](https://choosealicense.com/licenses/mit/) licensed, but we request that you please provide attribution if reusing any of our digital content (graphics, logo, reports, etc.). Some of the data featured here is sourced from content made available under a [CC-BY-4.0](https://choosealicense.com/licenses/cc-by-4.0/) license. We include attribution for this content, and we please request that you also maintain that attribution if using this data.

## about us

CarbonPlan is a non-profit organization working on the science and data of carbon removal. We aim to improve the transparency and scientific integrity of carbon removal and climate solutions through open data and tools. Find out more at [carbonplan.org](https://carbonplan.org/) or get in touch by [opening an issue](https://github.com/carbonplan/reports/issues/new) or [sending us an email](mailto:hello@carbonplan.org).
CarbonPlan is a non-profit organization working on the science and data of carbon removal. We aim to improve the transparency and scientific integrity of carbon removal and climate solutions through open data and tools. Find out more at [carbonplan.org](https://carbonplan.org/) or get in touch by [opening an issue](https://github.com/carbonplan/cdr-database/issues/new) or [sending us an email](mailto:hello@carbonplan.org).
139 changes: 0 additions & 139 deletions components/charts/cost.js

This file was deleted.

1 comment on commit 5c60a83

@vercel
Copy link

@vercel vercel bot commented on 5c60a83 Mar 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.