Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
91dbc6c
Bump path-parse from 1.0.6 to 1.0.7
dependabot[bot] Aug 12, 2021
ecf048c
Changes in navbar UI and content
shubham-y Oct 18, 2021
a08c02e
Change in navbar UI
shubham-y Oct 18, 2021
1f39daf
Change in navbar UI as per new design
shubham-y Dec 18, 2021
26a5f51
Add login url from constants
shubham-y Dec 19, 2021
7db6477
Added changes to fetch and display data for signed-in users
shubham-y Dec 19, 2021
6f21386
Fixed display data for signed-out users
shubham-y Dec 19, 2021
6a371bb
Added mobile UI change for currency exchange page
shubham-y Dec 19, 2021
229305d
Added changes to use Link component for anchor tags
shubham-y Dec 19, 2021
fa950d0
Remove commented code
shubham-y Dec 19, 2021
6e23e6a
css code refactor changes
shubham-y Dec 20, 2021
49e06d5
Add and load paths from constants file
shubham-y Dec 20, 2021
49a8890
Remove !important property from navbar css
shubham-y Dec 20, 2021
9f51ca9
Refactor css code
shubham-y Dec 20, 2021
6946565
Add UI changes in navbar
shubham-y Dec 21, 2021
f7c164e
Add default avatar for user profile picture
shubham-y Dec 22, 2021
c58540a
Add UI changes in navbar
shubham-y Dec 22, 2021
9ccb644
Add UI changes in navbar
shubham-y Dec 23, 2021
9b5d2e1
Add profile link on greet message & error handling in fetch user
shubham-y Dec 27, 2021
c82d48e
Fix profile url
shubham-y Dec 28, 2021
f6d3658
Merge pull request #241 from shubham-y/navbar-change
rohan09-raj Dec 31, 2021
71e51c3
Added .env.development file (#245)
rohan09-raj Jan 1, 2022
204941f
Improvement in code and changes to use cloudinary images
shubham-y Jan 13, 2022
1d7516f
Add key prop
shubham-y Jan 13, 2022
fd64c80
Replace useEffect by useLayoutEffect for login button
shubham-y Jan 16, 2022
a49ec41
Improvement in navbar code
shubham-y Jan 21, 2022
de3b224
Update ecmaVersion in ESLint config
shubham-y Jan 21, 2022
079aa85
Revert useLayoutEffect changes for login button
shubham-y Jan 22, 2022
769e2d5
Fix login button UI
shubham-y Jan 22, 2022
01744ff
Merge pull request #247 from shubham-y/navbar-change
rohan09-raj Jan 24, 2022
737f2f4
document/readme
akshay1502 Jan 29, 2022
ede85df
Contribution.md file updated (#251)
DeRaowl Feb 4, 2022
d55bb05
upgrade packages
akshay1502 Feb 12, 2022
472619d
Revert "upgrade packages"
akshay1502 Feb 13, 2022
30cccc2
Bump follow-redirects from 1.13.3 to 1.14.8
dependabot[bot] Feb 13, 2022
29d2859
Bump minimist from 1.2.5 to 1.2.6
dependabot[bot] Mar 27, 2022
5a33a7a
Bump moment from 2.29.0 to 2.29.2
dependabot[bot] Apr 9, 2022
ac3a9bf
updated packages
MehulKChaudhari Apr 14, 2022
a318007
fixed: build error added postcss 8
MehulKChaudhari Apr 15, 2022
3436b9f
updataed packages
MehulKChaudhari Apr 15, 2022
32b1458
+1
MehulKChaudhari Apr 15, 2022
4389ddd
changes npm version
MehulKChaudhari Apr 15, 2022
38ae4d2
fix: fsevent error
MehulKChaudhari Apr 22, 2022
11d199f
fix:package-lock as per node version
MehulKChaudhari Apr 25, 2022
d5abc18
checking CI build using using node 16
MehulKChaudhari May 5, 2022
80f8bbc
fixed: styled components version
MehulKChaudhari May 5, 2022
64a724e
deleting yarn.lock
MehulKChaudhari May 5, 2022
fbc2b6e
updated package lock file
MehulKChaudhari May 5, 2022
f3abbe4
build fix
MehulKChaudhari May 5, 2022
2af0367
added: volta
MehulKChaudhari May 5, 2022
b1eaae8
added: about volta
MehulKChaudhari May 13, 2022
16fe4ee
Create LICENSE
oneonone97 May 21, 2022
7dd3739
Merge pull request #258 from Real-Dev-Squad/dependabot/npm_and_yarn/m…
ankushdharkar Jun 21, 2022
57fee5c
Merge pull request #257 from Real-Dev-Squad/dependabot/npm_and_yarn/m…
ankushdharkar Jun 21, 2022
c86ad2c
Bump ejs from 3.1.5 to 3.1.8
dependabot[bot] Jun 21, 2022
cf4931f
Bump nanoid from 3.1.20 to 3.3.4
dependabot[bot] Jun 21, 2022
63015b1
Bump lodash-es from 4.17.20 to 4.17.21
dependabot[bot] Jun 21, 2022
35c91e1
Bump next from 10.0.7 to 12.1.0
dependabot[bot] Jun 21, 2022
3d48348
Merge pull request #255 from Real-Dev-Squad/dependabot/npm_and_yarn/n…
ankushdharkar Jun 21, 2022
3e3dfe4
Merge pull request #231 from Real-Dev-Squad/dependabot/npm_and_yarn/p…
ankushdharkar Jun 21, 2022
cb23457
Merge pull request #268 from Real-Dev-Squad/dependabot/npm_and_yarn/l…
ankushdharkar Jun 21, 2022
346ada7
Merge pull request #254 from Real-Dev-Squad/dependabot/npm_and_yarn/f…
ankushdharkar Jun 21, 2022
d0b8663
Merge pull request #266 from Real-Dev-Squad/dependabot/npm_and_yarn/e…
ankushdharkar Jun 21, 2022
d26edfb
Merge pull request #267 from Real-Dev-Squad/dependabot/npm_and_yarn/n…
ankushdharkar Jun 21, 2022
2f91e2a
Bump node-fetch from 2.6.1 to 2.6.7
dependabot[bot] Jun 21, 2022
331a3fd
Merge pull request #265 from Real-Dev-Squad/add-license-1
ankushdharkar Jun 21, 2022
b697801
Merge pull request #269 from Real-Dev-Squad/dependabot/npm_and_yarn/n…
ankushdharkar Jun 21, 2022
e2798cf
Merge branch 'develop' of github.com:Real-Dev-Squad/website-crypto in…
MehulKChaudhari Jun 23, 2022
b9c8044
Merge pull request #259 from Real-Dev-Squad/mehul/packages-update
ankushdharkar Jun 27, 2022
6b97b0b
refactor: make navbar component available to all routes from one plac…
Maianki Jul 25, 2022
918b707
chore-added tailwind config
manish591 Aug 26, 2022
1f5e3b3
Merge pull request #286 from manish591/chore/add-tailwind-css
ankushdharkar Aug 27, 2022
2f0e329
Add: Move to yarn (#289)
MehulKChaudhari Dec 4, 2022
955df28
*WIP* Add: cypress tests setup (#276)
MehulKChaudhari Dec 4, 2022
fc04834
add: msw (#288)
MehulKChaudhari Dec 4, 2022
9feaa96
Feature/integrating-new-signup-flow (#293)
ranitasahaa1230 Dec 6, 2022
46c0000
FEAT: added dropdown with sign-out option in navbar (#290)
kotesh-arya Feb 10, 2023
a57408f
Styles Change For Auctions Page (#306)
bajajcodes Feb 23, 2023
d91a74f
upgrade the node, nextjs and react version (#309)
RitikJaiswal75 Oct 14, 2023
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
1 change: 1 addition & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NEXT_PUBLIC_BASE_API_URL=https://api.realdevsquad.com
81 changes: 44 additions & 37 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,39 +1,46 @@
{
"env": {
"browser": true,
"commonjs": true,
"es6": true,
"node": true,
"jest": true,
},
"plugins": [
"react",
"react-hooks",
"jest",
"better-styled-components"
],
"extends": ["eslint:recommended", "plugin:react/recommended", "plugin:prettier/recommended"],
"parserOptions": {
"sourceType": "module",
"ecmaVersion": 2018
},
"settings": {
"react": {
"version": "detect"
}
},
"rules": {
"linebreak-style": ["warn", "unix"],
"no-unused-vars" : "warn",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn",
"react/react-in-jsx-scope": "off",
"react/prop-types": "off",
"jest/no-disabled-tests": "warn",
"jest/no-focused-tests": "error",
"jest/no-identical-title": "error",
"jest/prefer-to-have-length": "warn",
"jest/valid-expect": "error",
"better-styled-components/sort-declarations-alphabetically": "warn"
"env": {
"browser": true,
"commonjs": true,
"es6": true,
"node": true,
"jest": true
},
"plugins": [
"react",
"react-hooks",
"jest",
"better-styled-components",
"cypress"
],
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:prettier/recommended",
"plugin:cypress/recommended"
],
"parserOptions": {
"sourceType": "module",
"ecmaVersion": 12
},
"settings": {
"react": {
"version": "detect"
}
}
},
"rules": {
"linebreak-style": ["warn", "unix"],
"no-unused-vars": "warn",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn",
"react/react-in-jsx-scope": "off",
"react/prop-types": "off",
"jest/no-disabled-tests": "warn",
"jest/no-focused-tests": "error",
"jest/no-identical-title": "error",
"jest/prefer-to-have-length": "warn",
"jest/valid-expect": "error",
"better-styled-components/sort-declarations-alphabetically": "warn",
"react/no-unknown-property": "warn"
}
}
6 changes: 3 additions & 3 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:

strategy:
matrix:
node-version: [14.x]
node-version: [18.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm run build
- run: yarn install --frozen-lockfile
- run: yarn build
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ yarn-error.log*
# vercel
.vercel

cypress/videos
cypress/screenshots
108 changes: 83 additions & 25 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# How can I contribute?
# HOW CAN I CONTRIBUTE TO THE PROJECT?

- You can style the pages using CSS.
- If you find a bug anywhere, you can fix it.
- You can add a feature once you get approval from the community.
- Check out Real-Dev-Squad on github. You will find many repositories there(e.g. website-crypto, website-my etc.)
- Click on any repository. You will find [issues](https://github.com/Real-Dev-Squad/website-crypto/issues) there. Clicking on assignee and filter by selecting **Assigned to nobody**
- **Comment** on the issue that you would like to get assigned to you. (Remember: Do not work on issues assigned to someone else and do not work on any issue without having it assigned to you.)
- Create issue if you see any bug and then once you get approved from the admins, you can assign yourself and start working on it.

# File Structure

Expand Down Expand Up @@ -43,7 +44,11 @@
├── package.json
```

# How can you make your first **Pull Request**
# How can you make a **Pull Request** (PR)

If you get an issue assigned to you, consider following steps mentioned below.

**Note**: Steps 1, 2 and 3 are **one-time** steps required for setup. If you have already cloned the repo and added upstream, consider following this documentation from step 4.

1. **Forking repository**

Expand All @@ -59,6 +64,12 @@ Clone your forked repository, this will download your copy of repository in your
git clone <link which you copied in the step 1>
```

Once you have cloned the repository, now you should go into the folder containing the repository. You can do that with:

```
cd website-crypto
```

3. **Adding remote repository**

Add the original repository as a remote repository, so that you can anytime pull the latest changes from the main repository which is being deployed. This needs to be done only for the first time.
Expand All @@ -67,31 +78,45 @@ Add the original repository as a remote repository, so that you can anytime pull
git remote add upstream https://github.com/Real-Dev-Squad/website-crypto/
```

To make sure you always have the latest copy of the main repository before starting with your changes, execute the following command:
4. **Creating a branch**

If it's been quite a while after you have cloned the repo/made the last pull request, it's recommended to take a pull from the develop branch. Reason being, there may be some changes which could have merged after you had cloned the repo/made the last pull request.

To do so, make sure you're in the develop branch by checking out to the **develop** branch:

```
git pull upstream main
git checkout develop
```

4. **Creating a branch**
Once you're in the **develop** branch, it's time to take a pull:

```
git pull upstream develop
```

Now that you've made sure that you've got latest changes, we can proceed to creating our branch

5. **Creating a new branch**

Create a new branch to work on. We require a different branch so that we always have a stable, working version in the default (main) branch.
Let's create a new branch to work on. We require a different branch so that we always have a stable, working version in the default (develop) branch. We're not supposed to touch the **main** branch as it is the one getting deployed on production.

```
git checkout -b <branch-name>
```

For example, if I want to name my branch as **develop**, I'll enter the following command:
We will try to name the branch according to the task we are going to perform in it. If it is going to be a `feature`, the branch name should begin with `feat` or `feature`. If it is going to be a `fix`, the branch name should begin with `fix` or `bugfix`. The branch name should be self-explanatory.
For example, if I want to work on a `feature` called `login-form`, the branch name will be **feature/login-form**. If it is going to be a `fix` in `navbar`, the branch name will be `fix/navbar`.
Command example:

```
git checkout -b develop
git checkout -b feature/login-form
```

5. **Just do it!**
6. **Just do it!**

Perform the tasks you wanted to, can be anything, ranging from fixing simple typo to re-designing the whole page!

6. **Committing your changes**
7. **Committing your changes**

Now you have made the changes, though they are saved in your system, Git doesn't know what changes you've done. So you have to **commit** your changes. First step is to add the files which you want to add to the staging area, the dot after **add** in the first command tells Git to check for changes in all the files. The second step is about committing your changes. The message part is short description of your commit, like "merge branch".

Expand All @@ -100,32 +125,36 @@ git add .
git commit -m "Write message about your commit"
```

7. **Merging your branch into main branch**
8. **Making sure you have the latest changes from the develop branch**

Now your branch (develop, in my case) has the changes you made, once you're sure that your code is stable, it's time to merge the changes into the main branch of your local machine. The following command takes you to the main branch:
It may so happen that since the last time you cloned the repo/took a pull from develop, some changes may be merged in the develop branch. So to be on the safer side, we should have those changes as well.

In order to do that, we first checkout to **develop** branch by:

```
git checkout main
git checkout develop
```

It's recommended that you have the latest copy of the original repo into your main before you merge your changes into it. So pull the latest changes again:
Once we're in develop, it's time to take a pull:

```
git pull upstream main
git pull upstream develop
```

Now you can merge your branch into the main branch.
Now that our **local** develop branch is in sync with **remote** develop branch (of the Real Dev Squad Repository), we should let our branch know about the changes from the develop branch (if any). To do so we first checkout to our branch:

```
git merge <branch-name>
git checkout <branch-name>
```

For example, if the branch name is develop:
Once we're in our branch, we **rebase** our branch on top of the current develop branch (we change the base of our branch, so that it appears as if we have worked from the time the latest changes were merged in the develop branch). To do so:

```
git merge develop
git rebase develop
```

You should solve the merge conflicts, if any.

8. **Pushing your code**

Now it is the time to push the changes of your local main branch to your copy of the repository (aka forked repository) which is on Github (which we cloned in step 2).
Expand All @@ -136,12 +165,41 @@ git push origin

9. **Pull request**

Now go to your forked repository and you'll see that **This branch is xx commits ahead of Real-Dev-Squad:main.** Right next to it will be an option to **Pull Request**. Click on it, submit your pull request (also known as _PR_) explaining what you've done.
Now that we have made our changes plus we have the latest changes made by other contributors, we should push our code from **local** branch to the same branch on our **GitHub fork**. We do so by:

```
git push origin <branch-name>
```

For example, if the branch name is `feat/login-form`, we enter `git push origin feat/login-form`

The **origin** refers to your GitHub fork. You can check it by entering `git remote -v`, you should the link to your fork against **origin**.

10. **Making a pull request**

Your GitHub fork now has the changes, but you want those changes to be merged in the Real Dev Squad repository, right? There's a twist, you can't directly merge your code in the Real Dev Squad. Imagine you own a company whose code is open sourced, would you like if anyone could code make changes in the directly without asking you? For the same reason, **Pull Requests** exist. You `request` the repository maintainers/admins to `pull` your code in their repository.

To make a pull request, go to your **forked repository** and you'll see **<branch-name> had recent pushes less than a minute ago** . Right next to it will be an option to **Compare & pull request**. Click on it, submit your pull request (also known as _PR_) explaining what you've done. Again, the PR title should be self-explanatory but concise. If you want to write details, you can add it in the description. If you're making some UI (User Interface) changes, please make sure to add a short screen recording. If that's not possible, at least add some screenshots.

![how-to-open-pull-request](https://i.imgur.com/NMAeWc2.png)

10. **Review stage**
**Before making a pull request**

If an issue doesn't exist for a while..

- Talk to your AO and decide whether an issue should be created🤔

Otherwise make sure that the below points are chekced! ⬇

- Changes running locally ✅
- PR is linked to an issue. ✅
- Description in your PR to make your reviewer's life easy.😌
- Screenshot(s) of UI changes attached if required ✅
- Reviewers and Assignees added to PR/Issue ✅
- Labels added (makes it easy to filter PRs and they're very beautiful) ✅

All the above points make the PRs and issues easier to maintain, so make sure each one of them is checked! ✅✅

Wait for it to get reviewed, make the changes required (if any) , commit your changes and hit **Pull Request** again, your commits will be added to the same pull request you had opened earlier (if it is NOT closed).
Now the maintainers/admins will review your pull request. They might suggest some changes if required. You should then make the required changes in the **same branch**, commit them and push your changes to the **same branch** (follow the steps 8, 9 and 10 for the same).

11. **Congratulations on making your first Pull Request! 🎉**
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2022 Real Dev Squad

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
48 changes: 28 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,43 @@
**Crypto Site**
# Crypto Site

This is micro transaction application for RDS. Each member in RDS get assigned certain amount of currencies based on various activities. You can shop items, exchange money from bank, send and request money.
This is a microtransaction application for RDS. Each member in RDS gets assigned to a certain amount of currencies based on various activities. You can shop for items, exchange money from the bank, send and request money.

**Tech Stack**
Visit our site at https://crypto.realdevsquad.com

Next, Redux, CSS, Styled Components
## Tech Stack used

**Upcoming features**
[React](https://reactjs.org/docs/getting-started.html), [Next](https://nextjs.org/docs/getting-started), Redux, CSS, Styled Components

Turn this into trading application
### Upcoming features

**How to get started**
- Turn this into a trading application

## How to get started

- If you are new to React please you go through react documents and we can discuss from there.
- Clone the repo and go through the code base.
- Make sure you have node installed on your computer.
- Go through the issues and find the one you find interesting.
- Discuss and send the PR.
- If you need any other help, feel free to ping on crypto channel at discord.
- Go through the [issues](https://github.com/Real-Dev-Squad/website-crypto/issues) and comment on the issue you want to work on to get yourself assigned.
- Read the issue description and raise the PR.
- Follow the [installation](#installation) guide.
- For contributing follow this [CONTRIBRUTING.md](./CONTRIBUTING.md)
- If you need any other help, feel free to ping on the `#crypto-site-next` channel at discord.

**Installation**
## Installation

- `git clone<repository-url>` this repository
- `cd website-crypto`
- `npm install`
- `yarn`

## Installation 0.1

[Why Volta?](https://docs.volta.sh/guide/#why-volta)

To install Volta, please follow the [process](https://docs.volta.sh/guide/getting-started)

**Running/Development**
## Running/Development

- `npm run dev`
- To build: `npm run build`
- To serve the production build: `npm run start`
- Visit your app at [http://localhost](http://localhost).
Setup `dev.realdevsquad.com` for development by following the instructions here - [Avoiding CORS during development](https://github.com/Real-Dev-Squad/docs/tree/main/docs/dev/https-dev-url-cors)

### For more details you can connect with @Kratika0907
- For development: `yarn run dev`
- Visit your app at https://dev.realdevsquad.com.
- To build: `yarn run build`
- To serve the production build: `yarn run start`
2 changes: 2 additions & 0 deletions __mocks__/axios.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import mockAxios from 'jest-mock-axios';
export default mockAxios;
4 changes: 4 additions & 0 deletions __mocks__/browser.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { setupWorker } from 'msw';
import handlers from './handlers';

export const worker = setupWorker(...handlers);
1 change: 1 addition & 0 deletions __mocks__/fileMock.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = 'test-file-stub';
5 changes: 5 additions & 0 deletions __mocks__/handlers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import testHandlers from './handlers/test.handler';

const handlers = [...testHandlers];

export default handlers;
Loading