Skip to content

Glasgow | May-2025 | Salah Ahmed| Sprint-3 #634

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

Open
wants to merge 64 commits into
base: main
Choose a base branch
from

Conversation

avatarit
Copy link

@avatarit avatarit commented Jul 3, 2025

Self checklist

  • I have committed my files one by one, on purpose, and for a reason
  • I have titled my PR with REGION | COHORT_NAME | FIRST_NAME LAST_NAME | PROJ_NAME
  • I have tested my changes
  • My changes follow the style guide
  • My changes meet the requirements of this task

Changelist

All the issues have been solved in Sprint 3

Millena28 and others added 30 commits February 21, 2025 14:43
@avatarit avatarit added the Needs Review Participant to add when requesting review label Jul 16, 2025
Copy link

@jenny-alexander jenny-alexander left a comment

Choose a reason for hiding this comment

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

@avatarit The changes you made are good and you're on the right track. 👍

I added a few comments of a few things I noticed while re-reviewing it.

Also, please remove the package-lock.json and package.json files from the PR as they shouldn't be included in the PR.

@jenny-alexander jenny-alexander removed the Needs Review Participant to add when requesting review label Jul 18, 2025
@avatarit avatarit added the Needs Review Participant to add when requesting review label Jul 18, 2025
Copy link

@jenny-alexander jenny-alexander left a comment

Choose a reason for hiding this comment

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

I think there might be a bit of confusion regarding the package.json and package-lock.json files.

When I asked you to remove them from the PR, it seems you may have thought I asked you to "remove" the file from the project completely.
The file needs to remain in the project (on GitHub) but shouldn't be in your PR.
If you included the file as a deletion in your PR, it could cause issues.

You can use chatGPT to see how you can remove this file from the PR. If you find you are stuck, let me know and I can give you more instructions on how to revert these changes!

The package-lock.json file shouldn't be included in the PR either.

Image

@avatarit
Copy link
Author

avatarit commented Jul 19, 2025 via email

@avatarit avatarit added Complete Volunteer to add when work is complete and review comments have been addressed and removed Complete Volunteer to add when work is complete and review comments have been addressed labels Jul 19, 2025
@jenny-alexander
Copy link

@avatarit - I think there are many CYF trainees who have found this sprint challenging. A lot is being asked of you with these exercises and because the learning curve with these concepts is high -> it can feel frustrating.
But don't forget, for each frustration you overcome, you learned something new and the next time, it won't be so hard!


There are 4 files that shouldn't be in your PR:

  1. .vscode/extensions.json: This file was modified so you should revert to the version of this file on the main branch.
  2. .gitignore: This file was modified so you should revert to the version of this file on the main branch.
  3. package-lock.json: This file was added, so you can delete it from the PR.
  4. package.json: This file was modified so you should revert to the version of this file on the main branch.

The main branch version of these files can be found here: https://github.com/CodeYourFuture/Module-Structuring-and-Testing-Data

You can make these changes either using git command line or using the GitHub interface:

➡️ Here is what chatGPT says on how to do that using the GitHub interface:
Screenshot 2025-07-19 at 11 40 43 AM

➡️ Here is what chatGPT says on how to modify the files using the git command line:
Screenshot 2025-07-19 at 11 38 21 AM

If you aren't already, I strongly recommend that at some point in your training you start to use the git command line as it is very powerful and gives you better control over git (compared with GitHub UI). 😄

Message back here if you need more help with it!

@avatarit
Copy link
Author

avatarit commented Jul 19, 2025 via email

@jenny-alexander
Copy link

No problem!

  • Can you post what steps you followed?
  • Can you post a screenshot of how it is failing to be removed?
  • Did you try with the git commands via terminal within VSCode? ❓ Would you like to me take a video of doing it via git command line?

@avatarit
Copy link
Author

avatarit commented Jul 20, 2025 via email

@jenny-alexander
Copy link

It's just after midnight for me here in central USA. I don't know how easy it will be tomorrow with the time difference. I'll ask another volunteer that is in your timezone to help with this last step. Is that okay with you?

@avatarit
Copy link
Author

avatarit commented Jul 20, 2025 via email

@jenny-alexander
Copy link

I requested for help from the review team regarding your PR. Let's see what they say!

@avatarit
Copy link
Author

avatarit commented Jul 20, 2025 via email

@cjyuan
Copy link
Contributor

cjyuan commented Jul 20, 2025

@avatarit These are the four "changed files" you need to revert if you were to make the branch cleaner.
image

Here is one possible way you can revert the changes:

  1. Download your main branch from GitHub as a ZIP file: https://github.com/avatarit/Module-Structuring-and-Testing-Data/tree/main

  2. Open your repository in VSCode and switch to branch "coursework/sprint-3" (this branch).

  3. Delete package-lock.json.

  4. Replace the following three files in this branch by the version of these files in the downloaded ZIP file.

  • .gitignore
  • .vscode/extensions.json
  • package.json
  1. Commit the change and push the change to GitHub.

@avatarit
Copy link
Author

avatarit commented Jul 20, 2025 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review Participant to add when requesting review Reviewed Volunteer to add when completing a review 📅 Sprint 3 Assigned during Sprint 3 of this module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants