Skip to content

Implemented My Account page#97

Open
Prutha-Upadhyay wants to merge 12 commits intoMAVRICK-1:devfrom
Prutha-Upadhyay:MyAccountPage
Open

Implemented My Account page#97
Prutha-Upadhyay wants to merge 12 commits intoMAVRICK-1:devfrom
Prutha-Upadhyay:MyAccountPage

Conversation

@Prutha-Upadhyay
Copy link
Copy Markdown

#67 Implemented My Account page -->

Screenshots (if appropriate):

Screenshot 2024-06-10 231722

Types of changes

  • New feature (non-breaking change which adds functionality)

@vercel
Copy link
Copy Markdown

vercel Bot commented Jun 10, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
nest-ondc ❌ Failed (Inspect) Jul 6, 2024 7:47am
nest-ondc-arzx ❌ Failed (Inspect) Jul 6, 2024 7:47am

Copy link
Copy Markdown

@github-actions github-actions Bot left a comment

Choose a reason for hiding this comment

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

Welcome to our repository. 🎊

Thank you so much for taking the time to point this out. Please note that this is the project owner, @MAVRICK-1. I won't be available for 3-4 days and will reply to every PR after May 18. Thank you for your cooperation.

@Prutha-Upadhyay
Copy link
Copy Markdown
Author

please check this!

@MAVRICK-1
Copy link
Copy Markdown
Owner

@Prutha-Upadhyay MyAccount page is not created .

@Prutha-Upadhyay
Copy link
Copy Markdown
Author

@MAVRICK-1,Now please check this!

@MAVRICK-1 MAVRICK-1 requested a review from Sahilll15 June 17, 2024 11:29
@Sahilll15
Copy link
Copy Markdown
Collaborator

it has conflicts in yarn.lock file please solve that @Prutha-Upadhyay

@Prutha-Upadhyay
Copy link
Copy Markdown
Author

@Sahilll15 Can you help me out where is the conflict? How to solve it?

@akbatra567
Copy link
Copy Markdown
Contributor

@Sahilll15 Can you help me out where is the conflict? How to solve it?

@Prutha-Upadhyay, I can help if you're still looking for help in resolving conflict.

@Prutha-Upadhyay
Copy link
Copy Markdown
Author

@akbatra567 Yes please, I tried it so many times but I am enable to find where is the exact problem and how to solve it?

@akbatra567
Copy link
Copy Markdown
Contributor

@akbatra567 Yes please, I tried it so many times but I am enable to find where is the exact problem and how to solve it?

@Prutha-Upadhyay, You have to take a pull of recent changes in your current branch into your branch.
One such way is

  1. Add the original repo as an upstream remote

-> using ssh

git remote add upstream git@github.com:MAVRICK-1/Nest-Ondc.git

-> using https

git remote add upstream https://github.com/MAVRICK-1/Nest-Ondc.git
  1. Take pull
git pull upstream dev

Note: This might give a warning to use Fast-forward or Rebase

To use Rebase:

git pull --rebase upstream dev
  • You need to resolve commit in order
  • use git status and follow the steps mentioned.

Reference commands:

To Continue rebase:
git rebase --continue

To abort rebase
git rebase --abort

@Prutha-Upadhyay
Copy link
Copy Markdown
Author

@akbatra567 Thank you for your help!!👍

Comment thread src/components/header/header.js Outdated
Comment thread src/App.js
@Prutha-Upadhyay
Copy link
Copy Markdown
Author

Resolved that and now My Account Page

Screen.Recording.2024-07-01.194442.mp4

and also change Email format because it is replacing . to _ and stored wrong email address.....! @akbatra567 please kindly review this!!

@akbatra567
Copy link
Copy Markdown
Contributor

Resolved that and now My Account Page

Screen.Recording.2024-07-01.194442.mp4
and also change Email format because it is replacing . to _ and stored wrong email address.....! @akbatra567 please kindly review this!!

Looks fine, Just a look query. Have you added any new packages or upgraded any package ? @Prutha-Upadhyay

@Prutha-Upadhyay
Copy link
Copy Markdown
Author

Prutha-Upadhyay commented Jul 1, 2024

Resolved that and now My Account Page
Screen.Recording.2024-07-01.194442.mp4
and also change Email format because it is replacing . to _ and stored wrong email address.....! @akbatra567 please kindly review this!!

Looks fine, Just a look query. Have you added any new packages or upgraded any package ? @Prutha-Upadhyay

No, I did not!

@akbatra567
Copy link
Copy Markdown
Contributor

Resolved that and now My Account Page
Screen.Recording.2024-07-01.194442.mp4
and also change Email format because it is replacing . to _ and stored wrong email address.....! @akbatra567 please kindly review this!!

Looks fine, Just a look query. Have you added any new packages or upgraded any package ? @Prutha-Upadhyay

No, I did not!

Then, could you remove package-lock.json and yarn.lock

@Prutha-Upadhyay
Copy link
Copy Markdown
Author

Resolved that and now My Account Page
Screen.Recording.2024-07-01.194442.mp4
and also change Email format because it is replacing . to _ and stored wrong email address.....! @akbatra567 please kindly review this!!

Looks fine, Just a look query. Have you added any new packages or upgraded any package ? @Prutha-Upadhyay

No, I did not!

Then, could you remove package-lock.json and yarn.lock

But I have added one dependency fsevents in yarn file, so is it safe to remove yarn file?

@akbatra567
Copy link
Copy Markdown
Contributor

Resolved that and now My Account Page
Screen.Recording.2024-07-01.194442.mp4
and also change Email format because it is replacing . to _ and stored wrong email address.....! @akbatra567 please kindly review this!!

Looks fine, Just a look query. Have you added any new packages or upgraded any package ? @Prutha-Upadhyay

No, I did not!

Then, could you remove package-lock.json and yarn.lock

But I have added one dependency fsevents in yarn file, so is it safe to remove yarn file?

If you've added a new package it should also be in package.json file, just verify if you are upgrading the version of any package and mention the same in the PR description.

@Prutha-Upadhyay
Copy link
Copy Markdown
Author

Okay, I am removing both files!

@akbatra567
Copy link
Copy Markdown
Contributor

@MAVRICK-1, Would need some help here to see the logs on vercel, as I can't see on my end. Need to identify the cause of checks falling.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants