Skip to content

Commit 2dd9e70

Browse files
Merge branch 'main' into contributing-documentation
2 parents be0fb2e + ad403b6 commit 2dd9e70

24 files changed

Lines changed: 1356 additions & 136 deletions

.env.example

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Example `.env` file #
33
###########################
44

5-
# API key for the Google Civic API
6-
# See https://github.com/ProgramEquity/amplify/blob/main/.github/CONTRIBUTING.md#using-the-google-civic-information-api-locally
7-
CIVIC_API_KEY=
5+
# API key for the Cicero API
6+
# Check with the team leads for the latest Cicero API key to be used
7+
CICERO_API_KEY=
88

99
# Production environment API key for the Lob API
1010
# This value can be found in Heroku application config var of the same name
@@ -28,4 +28,4 @@ STRIPE_SECRET_KEY=sk_test_51IravfFqipIA40A3FOW6EzlXlJiXjL9V0FXKfb9n7cxh25Ww9QMA9
2828
# To run in single-campaign mode, set the following environment vars
2929
VUE_APP_CAMPAIGN_MODE = "single" # or "default" for normaal operation
3030
VUE_APP_FEATURED_CAMPAIGN = "5" # campaign's id from Postgres
31-
VUE_APP_LETTER_TEMPLATE = "" # the template associated with the featured campaign
31+
VUE_APP_LETTER_TEMPLATE = "" # the template associated with the featured campaign

.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
},
88
"extends": ["eslint:recommended", "prettier"],
99
"parserOptions": {
10-
"ecmaVersion": 12
10+
"ecmaVersion": 13,
11+
"parser": "@babel/eslint-parser"
1112
},
1213
"rules": {},
1314
"ignorePatterns": ["/dist/**/*.js"]

.github/mention-to-slack.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,9 @@ LoopFruits: 'U03A63J8U4V'
2424
ericvennemeyer: 'U04354QA2K0'
2525
sammychinedu2ky: 'U042T8UV7GF'
2626
JoseEspinosaMachado: 'U043XLVG5R9'
27+
Alex-is-Gonzalez: 'U04NASJJ5R6'
28+
rsensenig: 'U04LD85GHDH'
29+
SAUMILDHANKAR: 'U04MG19LM7G'
30+
beverand: 'U04M9E6CXHS'
31+
yoyoyojoe: 'U04LSCZPGF9'
32+
christina-ml: 'U04M0BU9GCE'
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: 'Welcome New Contributors'
2+
3+
on:
4+
issues:
5+
types: [opened]
6+
pull_request_target:
7+
types: [opened]
8+
permissions:
9+
issues: write
10+
pull-requests: write
11+
jobs:
12+
welcome-new-contributor:
13+
runs-on: ubuntu-latest
14+
timeout-minutes: 2
15+
steps:
16+
- name: 'Greet the contributor'
17+
uses: garg3133/welcome-new-contributors@a38583ed8282e23d63d7bf919ca2d9fb95300ca6
18+
with:
19+
token: ${{ secrets.GITHUB_TOKEN }}
20+
issue-message: 'Hello there, thanks for opening your first issue. We welcome you to the community!'
21+
pr-message: 'Hello there, thanks for opening your first Pull Request. Someone will review it soon.'

CODE_OF_CONDUCT.md

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
team@programequity.com.
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series
86+
of actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or
93+
permanent ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within
113+
the community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.0, available at
119+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
120+
121+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122+
enforcement ladder](https://github.com/mozilla/diversity).
123+
124+
[homepage]: https://www.contributor-covenant.org
125+
126+
For answers to common questions about this code of conduct, see the FAQ at
127+
https://www.contributor-covenant.org/faq. Translations are available at
128+
https://www.contributor-covenant.org/translations.

README.md

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Amplify
22

3+
Amplify is an open-source app created for users to take the initiative in being part of an actionable step in the efforts to protect against climate change. The user is able to choose a climate campaign, then using their zip code, they will be able to select a representative of their choice. The user then donates to have their letter sent out by Amplify.
4+
35
## Table of Contents
46

57
* [Getting Started](#getting-started)
@@ -15,8 +17,6 @@ The frontend code is stored in the `src/` directory.
1517

1618
The backend (API) code is stored in the `server/` directory.
1719

18-
19-
2020
**Project Workflow:**
2121

2222
[Enablement Deck](https://docs.google.com/presentation/d/1llJgeTU1EzRSYB8kL-IQeAdoq7p6xb4ApEac5E3M8Qo/edit?usp=sharing)
@@ -29,22 +29,30 @@ The backend (API) code is stored in the `server/` directory.
2929
- [Wiki](https://github.com/ProgramEquity/amplify/wiki): API methods, Data Structures
3030

3131
**Resources:**
32-
- We meet every **Wednesday from 12-1 pm pt and Thursdays from 8-8:30 pm pt**. Sign up for an [orientation](https://forms.gle/4miQJ8ccuWdeJha16)
32+
- We meet every **Wednesday from 12-1 p.m. PT and Thursdays from 8-8:30 p.m. PT**. Sign up for an [orientation](https://forms.gle/4miQJ8ccuWdeJha16)
3333
- Try out our [demo](https://www.figma.com/file/46c9cmuTiCpFA4DHB8OK0H/Amplify-User-Interface-%2B-Design-Guide?node-id=1585%3A653) or review [App Research](https://www.notion.so/programequity/Dare-to-Dream-Civic-Engagement-is-key-to-change-595ca4db3a2948c6b44569b58d530c8c)
3434

3535

3636

37-
## Project setup
37+
# Project setup
38+
In order to get started, you can clone, download a ZIP, or fork this repository to work on your local machine. If you would like to get started with Codespaces instead, the video below will walk you through setting up your Codespace.
3839

3940
https://user-images.githubusercontent.com/9143339/159093687-6fc90733-0599-445c-b08b-a6378d988e4b.mov
4041

42+
<b>Codespaces Set Up</b>
43+
4144
## Contributing
4245
Would you like to become a contributor? Please check out our [contributors guide](.github/CONTRIBUTING.md)! 💝
4346

47+
Run the following script first:
4448
```shell
4549
script/bootstrap
4650
```
47-
You will need to copy the `.env.example` file to a `.env` file in this repo.
51+
52+
You will need to copy the `.env.example` file to a `.env` file in this repo. You can use the following command in your terminal:
53+
```shell
54+
cp .env.example .env
55+
```
4856

4957
### Compiles and hot-reloads full app for development
5058
```shell
@@ -61,6 +69,12 @@ npm run build
6169
npm run lint
6270
```
6371

72+
### Runs Prettier and fixes files
73+
```shell
74+
npm run format
75+
```
76+
77+
6478
### Build and run as if in prod
6579
```shell
6680
npm start
@@ -69,7 +83,7 @@ npm start
6983
### Customize configuration
7084
See [Configuration Reference](https://cli.vuejs.org/config/).
7185

72-
## App Walkthrough
86+
# App Walkthrough
7387

7488
**App Structure**
7589

@@ -87,6 +101,7 @@ Goal Structure:
87101
https://user-images.githubusercontent.com/9143339/159093855-c01e1d77-0d6a-4f6e-b691-81491830001a.mp4
88102

89103

104+
90105
<img width="1561" alt="Screen Shot 2021-11-11 at 1 51 44 PM" src="https://user-images.githubusercontent.com/9143339/141374196-a32d140f-885c-4e45-8bba-99696f81ee80.png">
91106

92107

0 commit comments

Comments
 (0)