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

Sk ja create edit programs #76

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Conversation

ja0911
Copy link
Contributor

@ja0911 ja0911 commented Oct 16, 2022

ℹ️ Issue

Closes #59

📝 Description

Implemented UI for Admins to create and edit events in the Programs page

✔️ Verification

Tested functionality and UI on local server

Screenshot (13)

Screenshot (4)

🏕️ (Optional) Future Work / Notes

  • Form values are yet to be stored in variables

Copy link
Contributor

@thejamielin thejamielin left a comment

Choose a reason for hiding this comment

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

Great progress so far! will make more reviews tomorrow

lib/components/header/index.tsx Outdated Show resolved Hide resolved
lib/components/header/index.tsx Outdated Show resolved Hide resolved
lib/components/edit-program-modal/index.tsx Show resolved Hide resolved
Copy link
Contributor

@adriannaliu adriannaliu left a comment

Choose a reason for hiding this comment

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

looking great so far guys! jamie made some good points, but other than that lgtm!

@adriannaliu adriannaliu self-requested a review October 23, 2022 19:42
Copy link
Contributor

@adriannaliu adriannaliu left a comment

Choose a reason for hiding this comment

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

thanks for addressing all the changes! mind taking a look at the failing check?

@yanDavid21
Copy link
Contributor

yanDavid21 commented Oct 24, 2022

nit: non-functional changes should be kept separate from functional changes (ie. .github and prettier, white space changes)

Copy link
Contributor

@yanDavid21 yanDavid21 left a comment

Choose a reason for hiding this comment

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

Looks good! submitted a couple bits of feedback, lmk if you agree

lib/components/create-program-modal/index.tsx Show resolved Hide resolved
lib/components/edit-program-modal/index.tsx Show resolved Hide resolved
lib/components/edit-program-modal/index.tsx Show resolved Hide resolved
lib/components/header/index.tsx Outdated Show resolved Hide resolved
<Flex flexDir={'row'} justifyContent="space-between" mb={'3px'}>
<Heading>{header}</Heading>
{hasButton ? (
<Button
Copy link
Contributor

Choose a reason for hiding this comment

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

Perhaps a separate functional component would be helpful here so you can name this button, because right now I'd have to dig where this is called to figure out the context/meaning of the button

Copy link
Contributor

Choose a reason for hiding this comment

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

+1 to this!

lib/components/pop-up/index.tsx Outdated Show resolved Hide resolved
lib/components/programs-list/index.tsx Show resolved Hide resolved
@saahilkumar
Copy link
Contributor

Will EditProgramModal and CreateProgramModal both have Pop and ProgramModal components? If so, I think abstraction would still be helpful if you anticipate a change to one would mean a change to another

I think they're as abstracted as they should be rn, the only similarity between the two is that they use the same form which we abstracted into ProgramForm. Wdym by "a change to one would mean a change to another"?

Copy link
Contributor

@thejamielin thejamielin left a comment

Choose a reason for hiding this comment

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

still reading through this! lg so far

.github/ISSUE_TEMPLATE/ticket-story.md Outdated Show resolved Hide resolved
.github/pull_request_template.md Outdated Show resolved Hide resolved
.github/workflows/ci.yml Outdated Show resolved Hide resolved
.prettierrc.json Outdated Show resolved Hide resolved
cypress/integration/TC01_about_us.spec.js Outdated Show resolved Hide resolved
global.d.ts Outdated Show resolved Hide resolved
lib/components/program-form/index.tsx Outdated Show resolved Hide resolved
Copy link
Contributor

@thejamielin thejamielin left a comment

Choose a reason for hiding this comment

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

found some last couple things! i think we can get this merged as soon as we resolve these comments

<Flex flexDir={'row'} justifyContent="space-between" mb={'3px'}>
<Heading>{header}</Heading>
{hasButton ? (
<Button
Copy link
Contributor

Choose a reason for hiding this comment

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

+1 to this!

lib/components/pop-up/index.tsx Show resolved Hide resolved
lib/components/pop-up/index.tsx Show resolved Hide resolved
pages/programs/index.tsx Show resolved Hide resolved
thejamielin
thejamielin previously approved these changes Nov 4, 2022
Copy link
Contributor

@thejamielin thejamielin left a comment

Choose a reason for hiding this comment

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

Omg fantastic work @saahilkumar and @ja0911! Please respond to the comments and you can decide whether or not you want to merge what we have now, or update the formatting

</Flex>
</Container>
<>
<CreateProgramModal modalManagement={createProgramModalManagement} />
Copy link
Contributor

Choose a reason for hiding this comment

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

Did we want to adjust the header so our implementation matches the Figma file?

Figma:
image

Current Implementation:
image

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm ok with changing it, don't really have a preference. It's just like that cuz the header was recently changed to not have the line go all the way to the end

Copy link
Contributor

Choose a reason for hiding this comment

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

i think Al fixed the october events so that the line extends all the way to the end bc of Jamie's PR comment about that, so can we stay consistent :3

_hover={{ textDecoration: 'none' }}
_focus={{ outline: 'none' }}>
<>
<EditProgramModal modalManagement={editProgramModalManagement} />
Copy link
Contributor

Choose a reason for hiding this comment

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

Small thing but I want to know your thoughts: In the Figma designs, we don't have a version with both buttons yet since the Admin version technically can't see the button

Figma Comparison
![image](https://user-images.githubusercontent.com/71473137/200030680-d4fe71c8-fae8-45e2-adc7-c00e9a94b669.png)

Seems like it would make sense to keep the Register here button on the Admin version
Should we distance these buttons or add an "edit" icon to make them look more distinct?

adriannaliu
adriannaliu previously approved these changes Nov 6, 2022
Copy link
Contributor

@adriannaliu adriannaliu left a comment

Choose a reason for hiding this comment

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

approving this so you guys have the option of merging, but check out this slack thread regarding using icons

@thejamielin thejamielin dismissed stale reviews from adriannaliu and themself via 40eb8af November 6, 2022 19:52
@saahilkumar
Copy link
Contributor

I can add the icons in tomorrow probably

Copy link
Contributor

@adriannaliu adriannaliu left a comment

Choose a reason for hiding this comment

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

amazing guys

Copy link
Contributor

@thejamielin thejamielin left a comment

Choose a reason for hiding this comment

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

this is literally fire! great job @ja0911 and @saahilkumar

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.

6 participants