Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/91 checkout in naira #94

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ public/sw.js.map
public/fallback-*.js
public/workbox-*.js
public/workbox-*.js.map

pnpm-lock.yaml
4 changes: 2 additions & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn lint
yarn build
pnpm lint
pnpm build
6 changes: 1 addition & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# Contributing

Currently, this project is in [Phase 2](https://github.com/amjedidiah/dad/milestone/2).
To contribute, pick any item in either [#44](https://github.com/amjedidiah/dad/issues/44), or [#46](https://github.com/amjedidiah/dad/issues/46) based on your competency level.

- Before you make any changes, keep your fork in sync to avoid merge conflicts:

```bash
Expand All @@ -21,7 +18,7 @@ git checkout -b <branch-name>
Refer to the [naming conventions](#naming-conventions) for guide on how to name branches

- After making changes, add the changes with `git add`, `git commit` (write a good commit message, refer to [commit convention](#commit-conventions) for guide)
**_Never commit `yarn.lock` file_**
**_Never commit lock files: `yarn.lock`, `package-lock.json`, or `pnpm-lock.yaml` files_**

- Push your changes to your forked repository:

Expand Down Expand Up @@ -59,5 +56,4 @@ If there are any conflicts, you will get a notification and be required to resol
> Don't **push** to, **merge** into, or **delete** these branches

- `chore/readme-update`: This branch is for updating the readme file
- `chore/checkly`: This branch is for updating checkly tests for monitoring the website
- `main`: This is the production branch. Only @amjedidiah or one of the maintainers can merge into this branch.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ Practice / grow your skills while contributing to a real-world project.

- Checkout to develop: `git checkout develop`

- Install dependencies: `yarn install`
- Install dependencies: `pnpm install`

- Fetch env variables: `yarn env`
- Request env variables

- Start development server: `yarn dev`
- Start development server: `pnpm dev`

- Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

Expand Down