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

79 view item #83

Merged
merged 13 commits into from
Apr 24, 2023
Merged

79 view item #83

merged 13 commits into from
Apr 24, 2023

Conversation

hunar1312
Copy link
Collaborator

Initial UI development of view item page
( Issue #79 )

@hunar1312 hunar1312 linked an issue Apr 21, 2023 that may be closed by this pull request
Copy link
Contributor

@DonKoko DonKoko 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. I made some comments

app/routes/_layout+/items.$itemId.tsx Show resolved Hide resolved
app/components/markdown/markdown-editor.tsx Outdated Show resolved Hide resolved
Copy link
Contributor

@DonKoko DonKoko left a comment

Choose a reason for hiding this comment

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

Cannot merge these changes. When you were solving conflicts when merging with dev you replaced the incoming dev branch code with the code from your branch which is older.

app/components/markdown/markdown-editor.tsx Show resolved Hide resolved
app/components/items/form.tsx Show resolved Hide resolved
app/routes/_layout+/items.new.tsx Outdated Show resolved Hide resolved
Copy link
Contributor

@DonKoko DonKoko left a comment

Choose a reason for hiding this comment

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

Still one file where the newer version is replaced with an older version.

app/routes/_layout+/items.new.tsx Outdated Show resolved Hide resolved
Copy link
Contributor

@DonKoko DonKoko left a comment

Choose a reason for hiding this comment

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

The Items list is still being contained. It should be taking all the available space:
Screenshot 2023-04-24 at 14 42 43

@DonKoko DonKoko mentioned this pull request Apr 24, 2023
Copy link
Contributor

@DonKoko DonKoko 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 good.

@DonKoko DonKoko merged commit 79f5e7f into dev Apr 24, 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.

View "Item"
2 participants