Worked on issue #700

[Abhiishekk31]

#700

[Abhiishekk31]

_ No description provided. _

@maebeale Please check into it. I hope it can be merged now.

[jmilljr24]

@Abhiishekk31 Looks like you committed some extra files again but otherwise it's looking good!

You can keep the same PR, just remove schema.rb .env.example and package-lock.json

A new commit reverting them is fine or edit your previous commit and force push the change to this PR without those files.

[Abhiishekk31]

@jmilljr24 removed those three extra files that you asked for.

[jmilljr24]

@Abhiishekk31 Ah, so the way you did it will completely remove them from our repo if I accept and merge this. Not sure if github has a UI option but locally you need to do something like:

# reset a file back to main
git checkout origin/main -- path/to/file
git commit -m "Revert file from PR"
git push

Basically taking the version from the main branch and putting it into your working branch. It's fine if you keep pushing up commits to try things. No worries.

[jmilljr24]

I'm still seeing those extra files that shouldn't have changes in this PR.

[Abhiishekk31]

I'm still seeing those extra files that shouldn't have changes in this PR.

-- those three files are present in the codebase, I just reconfigured them to their default settings.

-- I think those were the instructions.

-- I am still unclear on what to do right now , please guide

[jmilljr24]

I'm still seeing those extra files that shouldn't have changes in this PR.

-- those three files are present in the codebase, I just reconfigured them to their default settings.

-- I think those were the instructions.

-- I am still unclear on what to do right now , please guide

Ah, I see why my last comment didn't work for you. You've made commits to the main branch on your fork. People generally create a working branch for their changes and keep their fork's main branch the same code as the project's code.

Here is the alternative:

This restores specific files from the real repo’s main branch directly into your fork’s main branch.

1. Make sure you’re on your fork’s main branch

   git checkout main

2. Fetch the latest changes from upstream

   git fetch upstream

3. Restore the files from upstream/main
   (this overwrites your local versions of these files)

   git checkout upstream/main -- db/schema.rb .env.sample package-lock.json

4. Commit the reverted files

   git status
   git commit -m "Revert schema, env sample, and lockfile from upstream main"

5. Push the fix to your fork

   git push origin main

[jmilljr24]

@Abhiishekk31 Almost there! After you make the changes but before committing and pushing can you run the rubocop linter.

From the command line, with the current directory being the project run:
rubocop -a

This should hopefully autocorrect any issues. This is required to pass our CI checks on github.

Contributing Guide

[jmilljr24]

Looks like you were successful reverting the other two files. Try that again with this one, along with the other changes I'm requesting.

[Abhiishekk31]

I think I have done the neccessary

[jmilljr24]

@Abhiishekk31 Just need to fix the before_action and run rubocop -a as it still has linting errors.

[Abhiishekk31]

ran rubocop -a and also updated the user_controller.rb file

[jmilljr24]

@Abhiishekk31 Awesome! Thank you