Skip to content

Feature/issue 494 - #575

Merged
DevinCLane merged 1 commit into
Together-100Devs:mainfrom
cevangel:feature/issue-494
Aug 11, 2025
Merged

Feature/issue 494#575
DevinCLane merged 1 commit into
Together-100Devs:mainfrom
cevangel:feature/issue-494

Conversation

@cevangel

@cevangel cevangel commented Jul 1, 2025

Copy link
Copy Markdown
Contributor

Description

Deleted client/src/setupProxy.js

Type of change

Please select everything applicable. Please, do not delete any lines.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update
  • This change requires an update to testing

Issue

Checklist:

  • This PR is up to date with the main branch, and merge conflicts have been resolved
  • I have executed npm run test and npm run test:e2e and all tests have passed successfully or I have included details within my PR on the failure.
  • I have executed npm run lint and resolved any outstanding errors. Most issues can be solved by executing npm run format
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings

@alcpereira alcpereira left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Thanks for the contribution, we're almost there 💪

Comment thread client/src/setupProxy.js

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I guess those changes are related to another issue?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Correct, they’re related to another issue.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The one with the hover involved

@cevangel
cevangel force-pushed the feature/issue-494 branch from 7b9df7e to 1587953 Compare July 8, 2025 18:24
@DevinCLane

Copy link
Copy Markdown
Collaborator

following up to see if there are any updates @cevangel

@cevangel

Copy link
Copy Markdown
Contributor Author

following up to see if there are any updates @cevangel

Feeling better, I was told to git squash my commits and looking it up now

@cevangel

Copy link
Copy Markdown
Contributor Author

I think I'm just not sure what to squash,

@DevinCLane

Copy link
Copy Markdown
Collaborator

so to squash means that at the end you will only have one commit instead of the 5 you have now.

you can find some preliminary docs here #574 (comment)

@cevangel

Copy link
Copy Markdown
Contributor Author

so to squash means that at the end you will only have one commit instead of the 5 you have now.

you can find some preliminary docs here #574 (comment)

Noted, going thru that doc

@cevangel

Copy link
Copy Markdown
Contributor Author

Doing "git log --oneline" and got this, just not sure what to do because I see a lot of repeating and what's the point of "skipping" in this output:
image
image
image

@DevinCLane

Copy link
Copy Markdown
Collaborator

do you want to ask for help in our discord?

@cevangel

cevangel commented Aug 3, 2025

Copy link
Copy Markdown
Contributor Author

do you want to ask for help in our discord?

I think we should set some time aside on Tuesday before or after the meeting in order to work on this, thanks

@DevinCLane

Copy link
Copy Markdown
Collaborator

here's a little walkthrough of squashing commits https://www.freecodecamp.org/news/git-squash-commits/

Delete client/src/setupProxy.js

Added title and aria-label attributes to CalendarHeader.jsx

Revert "Added title and aria-label attributes to CalendarHeader.jsx"

This reverts commit 39c52a6.

client/src/features/calendarHeader/CalendarHeader.jsx reverted adding
title/aria-label attributes to calendarHeader.jsx

Remove http-proxy-middleware from client and update codebase

Undo title and aria-label changes for CalendarHeader.jsx
@DevinCLane
DevinCLane merged commit 05c79cd into Together-100Devs:main Aug 11, 2025
1 check passed
@DevinCLane DevinCLane mentioned this pull request Aug 11, 2025
15 tasks
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.

3 participants