Skip to content
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

Jiawei/recruitment/eventpage #95

Merged
merged 6 commits into from
Jun 28, 2023
Merged

Conversation

Kappaccinoh
Copy link
Member

Description

Add edit and delete functions to event page

Fixes # (issue)

Reorganised router file structure, separated attendance and event
Pending final UI updates from Dilys for Button or Popup UI

Type of change

Please delete options that are not relevant.

  • 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

Checklist:

  • 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
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

@woowenjun99 woowenjun99 changed the base branch from main to recruitment June 13, 2023 16:07
@woowenjun99
Copy link
Collaborator

Hi, good attempt. No worries, if you need help, feel free to reach out to Michael, me or Jess. Try to fix the merge conflicts via rebase (or merge if you are not confident) first

Copy link
Contributor

@michaelseyo michaelseyo left a comment

Choose a reason for hiding this comment

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

Some changes required and also resolving the merge conflicts

@Kappaccinoh
Copy link
Member Author

Hi @michaelseyo and @woowenjun99 I have made the changes and resolved the conflicts, hope the PR is fine this time. Thanks.

Copy link
Contributor

@michaelseyo michaelseyo left a comment

Choose a reason for hiding this comment

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

Just a small change to be made but other than that looks good, try and do yarn run build to see if you're able to build.

@Kappaccinoh
Copy link
Member Author

okay should be good @michaelseyo

@michaelseyo
Copy link
Contributor

Nice ok thanks @Kappaccinoh :)

Base automatically changed from recruitment to main June 24, 2023 12:23
@michaelseyo michaelseyo merged commit 6380997 into main Jun 28, 2023
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