Skip to content

Commit 90451bf

Browse files
authored
Merge pull request #131 from orama254/house-keeping-05-04-2023
House keeping (05-04-2023)
2 parents 58930a2 + 9fbcb16 commit 90451bf

4 files changed

Lines changed: 81 additions & 47 deletions

File tree

.github/workflows/e2e.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,14 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v3
13+
- name: Prepare .env file
14+
run: |
15+
rm -f .env && touch .env
16+
echo "NEXT_PUBLIC_FORMSPREE_ID=fake123" >> .env
17+
echo "NEXT_PUBLIC_RECAPTCHA_SITE_KEY=123fAkE" >> .env
1318
- uses: actions/setup-node@v3
1419
with:
15-
node-version: '14.x'
20+
node-version: '18.x'
1621
- name: Install dependencies
1722
run: npm ci
1823
- name: Install Playwright Browsers

CONTRIBUTING.md

Lines changed: 56 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
# How to contribute
1+
# How to contribute to React Developers Kenya (Reactdevske) Website
22

33
Please note we have a [code of conduct](https://github.com/reactdeveloperske/reactdevske-website/blob/main/CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.
44

55
## Contributing procedure
66

7-
### Submit an issue
7+
### Find an issue to work on
8+
9+
- You can contribute to this project by either creating an issue or by checking out the open issues available.
10+
11+
#### 1. Submit an issue
812

913
- Create a [new issue](https://github.com/reactdeveloperske/reactdevske-website/issues)
1014
- Comment on the issue (if you'd like to be assigned to it) - that way the issue can be assigned to you.
1115

12-
### Open issues
16+
#### 2. Open issues
1317

1418
- Go to [open issues](https://github.com/reactdeveloperske/reactdevske-website/issues)
1519
- select an issue of your choice that is `open` or `need help` or is `up-for-grabs` and is not assigned.
@@ -19,7 +23,7 @@ Please note we have a [code of conduct](https://github.com/reactdeveloperske/rea
1923

2024
- If you're not sure, here's how to [fork the repo](https://help.github.com/en/articles/fork-a-repo)
2125

22-
### Set up your local environment (optional)
26+
#### Set up your local environment (optional)
2327

2428
If you're ready to contribute and create your PR, it will help to set up a local environment so you can see your changes.
2529

@@ -34,38 +38,34 @@ If you're ready to contribute and create your PR, it will help to set up a local
3438

3539
If this is your first time forking our repo, this is all you need to do for this step:
3640

37-
```
38-
$ git clone git@github.com:[your_github_handle]/reactdevske-website.git && cd reactdevske-website
41+
```bash
42+
git clone git@github.com:[your_github_handle]/reactdevske-website.git && cd reactdevske-website
3943
```
4044

41-
Make sure you checkout the `develop` branch `git checkout develop`
45+
Make sure you checkout the `develop` branch by running the command `git checkout develop`
4246

43-
If you've already forked the repo, you'll want to ensure your fork is configured and that it's up to date. This will save you the headache of potential merge conflicts.
47+
If you've already forked the repo and created the develop branch, you'll want to ensure your fork and your develop branch is configured and that it's up to date. This will save you the headache of potential merge conflicts.
4448

4549
To [configure your fork](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork):
4650

4751
```
4852
$ git remote add upstream https://github.com/reactdeveloperske/reactdevske-website.git
4953
```
5054

51-
To [sync your fork with the latest changes](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork):
55+
To [sync your fork and branch with the latest changes](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork):
5256

53-
```
54-
$ git checkout develop
55-
$ git fetch upstream
56-
$ git merge upstream/develop
57+
```bash
58+
git checkout develop
59+
git fetch upstream
60+
git merge upstream/develop
5761
```
5862

5963
3. Install dependencies
6064

61-
```
62-
$ yarn install
63-
```
65+
We use [npm](https://www.npmjs.com/) to manage dependencies. To install all dependencies, run:
6466

65-
or
66-
67-
```
68-
$ npm install
67+
```bash
68+
npm install
6969
```
7070

7171
<br>
@@ -76,49 +76,67 @@ $ npm install
7676

7777
1. Create new branch for your changes
7878

79-
```
80-
$ git checkout -b new_branch_name
79+
```bash
80+
git checkout -b new_branch_name
8181
```
8282

8383
2. start development server
8484

85-
```
86-
$ yarn run dev
87-
```
88-
89-
or
90-
91-
```
85+
```bash
9286
npm run dev
9387
```
9488

9589
<br>
9690

97-
### Start developing!
91+
---
92+
93+
##### :warning: RoadBlock: Missing environment variables
94+
95+
You may have noticed some error about providing a form key. This is because we use [Formspree](https://formspree.io/) to handle our contact form. To get around this, you can:
96+
97+
- Use your own [Formspree](https://formspree.io/) account and set the `FORMSPREE_KEY` environment variable to your key. (refer to the .env.example file for guidance on where to put your formspee key).
98+
99+
You may have also noticed a second error about missing required parameters: sitekey. This is because we use [reCAPTCHA](https://www.google.com/recaptcha/about/) to prevent spam. To get around this, you can:
100+
101+
- Use your own [reCAPTCHA](https://www.google.com/recaptcha/about/) account and set the `RECAPTCHA_SITE_KEY` environment variable to your keys. (refer to the .env.example file for guidance on where to put your recaptcha site key).
102+
103+
Both of these changes will require you to create a `.env` file in the root directory of the project. You can copy the contents of the `.env.example` file and paste them into the `.env` file. Then, you can add your keys to the appropriate variables.
104+
105+
---
98106

99107
<br>
100108

109+
3. Make changes to the codebase
110+
101111
- Open this directory in your favorite text editor / IDE, and see your changes live by visiting `localhost:3000` from your browser
102112
- Pro Tip: Explore scripts within `package.json` for more build options
113+
- Pro Tip: Use [Prettier](https://prettier.io/) to format your code before committing by running `npm run prettier:check` and `npm run prettier:format` to check and fix formatting issues
103114

104-
1. Add changes made to the repo addressing an issue
105-
```
115+
4. Add changes made to the repo addressing an issue
116+
117+
```bash
106118
git add [file_name]
107119
```
108-
2. Commit and prepare for pull request (PR). In your PR commit message, reference the issue it resolves (see [how to link a commit message to an issue using a keyword](https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword).
109120

110-
```
111-
$ git commit -m "brief description of changes [Fixes #1234]"
121+
5. Commit and prepare for pull request (PR). In your PR commit message, reference the issue it resolves (see [how to link a commit message to an issue using a keyword](https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword).
122+
123+
```bash
124+
git commit -m "brief description of changes [Fixes #1234]"
112125
```
113126

114-
1. Push to your GitHub account
127+
6. Push to your GitHub account
115128

116-
```
117-
$ git push -u origin [feature_branch]
129+
```bash
130+
git push -u origin [feature_branch]
118131
```
119132

120133
### Submit your Pull Request (PR)🚀
121134

122135
- After your changes are commited to your GitHub fork, submit a pull request (PR) to the `develop` branch of the `reactdeveloperske/reactdevske-website` repo
123136
- In your PR description, reference the issue it resolves (see [linking a pull request to an issue using a keyword](https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
124137
- ex. `Updates out of date content [Fixes #1234]`
138+
139+
### Sit back, relax and wait for your PR to be reviewed/merged
140+
141+
- We'll review your PR as soon as possible
142+
- We may suggest some changes or improvements or alternatives.

src/components/Events/Events.tsx

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ const events: EventData[] = [
77
id: 1,
88
title: 'Physical Meetups',
99
description: 'Physical meetups where we share, learn and network.',
10-
image_url: '/images/physical_meetup.jpg',
10+
image_url:
11+
'https://res.cloudinary.com/reactjs-devs-ke/image/upload/v1678532589/website-images/physical_meetup_fqkitv.jpg',
1112
target:
1213
'https://kommunity.com/reactjs-developer-community-kenya-reactdevske/events',
1314
},
@@ -16,15 +17,17 @@ const events: EventData[] = [
1617
title: 'Weekly Online Standups',
1718
description:
1819
'Weekly open calls in the community’s Telegram group discussing industry-related topics.',
19-
image_url: 'https://res.cloudinary.com/reactjs-devs-ke/image/upload/v1678532589/website-images/weekly_standups_lg3rth.jpg',
20+
image_url:
21+
'https://res.cloudinary.com/reactjs-devs-ke/image/upload/v1678532589/website-images/weekly_standups_lg3rth.jpg',
2022
target: 'https://bit.ly/joinreactdevske',
2123
},
2224
{
2325
id: 3,
2426
title: 'Community Power Sessions',
2527
description:
2628
'Community members meet and share technical concepts with other members of the community.',
27-
image_url: 'https://res.cloudinary.com/reactjs-devs-ke/image/upload/v1678532589/website-images/community_sessions_xsyd8d.jpg',
29+
image_url:
30+
'https://res.cloudinary.com/reactjs-devs-ke/image/upload/v1678532589/website-images/community_sessions_xsyd8d.jpg',
2831
target: 'https://www.youtube.com/channel/UC9_eVcPBk4T-DcZLHpQfy4w/videos',
2932
},
3033
{
@@ -40,7 +43,8 @@ const events: EventData[] = [
4043
title: 'Monthly Online Standups',
4144
description:
4245
'Monthly open calls on Google Meet bringing together people from different communities.',
43-
image_url: '/images/physical_meetup.jpg',
46+
image_url:
47+
'https://res.cloudinary.com/reactjs-devs-ke/image/upload/v1678532589/website-images/physical_meetup_fqkitv.jpg',
4448
target:
4549
'https://kommunity.com/reactjs-developer-community-kenya-reactdevske/events',
4650
},
@@ -49,7 +53,8 @@ const events: EventData[] = [
4953
title: 'Community Challenges',
5054
description:
5155
'We organize open source challenges to keep the community engaged.',
52-
image_url: '/images/physical_meetup.jpg',
56+
image_url:
57+
'https://res.cloudinary.com/reactjs-devs-ke/image/upload/v1678532589/website-images/physical_meetup_fqkitv.jpg',
5358
target: 'https://github.com/reactdeveloperske/community-coding-challenges',
5459
},
5560
];

src/components/MissionPillars/MissionPillars.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ export default function MissionPillars() {
1515
<div className="flex w-1/2 md:w-full">
1616
<div className="w-full overflow-hidden aspect-w-4 aspect-h-3">
1717
<Image
18-
src={'/images/mentorship-image.jpg'}
18+
src={
19+
'https://res.cloudinary.com/reactjs-devs-ke/image/upload/v1678532588/website-images/mentorship-image_tz0mor.jpg'
20+
}
1921
alt="Mentorship Image"
2022
layout="fill"
2123
/>
@@ -31,7 +33,9 @@ export default function MissionPillars() {
3133
<div className="flex w-1/2 md:w-full">
3234
<div className="w-full overflow-hidden aspect-w-4 aspect-h-3">
3335
<Image
34-
src={'/images/learning-image.jpg'}
36+
src={
37+
'https://res.cloudinary.com/reactjs-devs-ke/image/upload/v1678532588/website-images/learning-image_eylqwm.jpg'
38+
}
3539
alt="Learning Image"
3640
layout="fill"
3741
/>
@@ -47,7 +51,9 @@ export default function MissionPillars() {
4751
<div className="flex w-1/2 md:w-full">
4852
<div className="w-full overflow-hidden aspect-w-4 aspect-h-3">
4953
<Image
50-
src={'https://res.cloudinary.com/reactjs-devs-ke/image/upload/v1678532588/website-images/community-image_pkeqwj.jpg'}
54+
src={
55+
'https://res.cloudinary.com/reactjs-devs-ke/image/upload/v1678532588/website-images/community-image_pkeqwj.jpg'
56+
}
5157
alt="Community Image"
5258
layout="fill"
5359
/>

0 commit comments

Comments
 (0)