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

Three column layout (rebased/squashed) #1021

Merged
merged 10 commits into from
May 5, 2023

Conversation

juliushaertl
Copy link
Member

@juliushaertl juliushaertl commented Apr 13, 2023

Rebased and squashed version of #842 to have an easier way to resolve the conflicts

So far pushed another commit additionally to bring back the actions menu in the list after my rebase and some minor styling fixes

Screenshot 2023-04-29 at 12 28 00

@juliushaertl juliushaertl force-pushed the three-column-layout-rebased branch 2 times, most recently from 9b18098 to e117cc1 Compare April 13, 2023 21:01
@juliushaertl juliushaertl mentioned this pull request Apr 13, 2023
@juliushaertl juliushaertl force-pushed the three-column-layout-rebased branch 2 times, most recently from 605fa47 to d5accf8 Compare April 26, 2023 14:03
@juliushaertl juliushaertl added enhancement New feature or request design Related to the design or user experience labels Apr 26, 2023
@juliushaertl juliushaertl marked this pull request as ready for review April 29, 2023 10:27
Copy link
Contributor

@theatischbein theatischbein left a comment

Choose a reason for hiding this comment

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

I will test the function tomorrow, but here some comments on the code

src/App.vue Show resolved Hide resolved
src/App.vue Outdated Show resolved Hide resolved
src/components/CategoriesList.vue Outdated Show resolved Hide resolved
src/components/NoteItem.vue Show resolved Hide resolved
src/components/NoteItem.vue Outdated Show resolved Hide resolved
},

displayedNotes() {
if (this.filteredNotes.length > 40 && this.showFirstNotesOnly) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why you catch for > 40 but slice to 0-30 ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Something to consider separately I'd say as it is not introduced here but originating from https://github.com/nextcloud/notes/pull/424/files#diff-84c733529b3b3fd6edfc369f85fe95b5cfb8d1f0a74d39712293aa3b037a0848R113-R117 s

if (note.favorite) {
return ''
}
const t = note.modified * 1000
Copy link
Contributor

Choose a reason for hiding this comment

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

May move 1000 to const variable

Copy link
Member Author

Choose a reason for hiding this comment

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

I'd still keep this as this is a pattern that js developers likely know well and a constant (or timestampToMilliseconds helper that I was thinking about) would be easy to be overseen in new code introduced and then we'd have two ways of doing that.

src/components/Sidebar.vue Outdated Show resolved Hide resolved
@juliushaertl
Copy link
Member Author

Thanks for the review @jonnytischbein, very much appreciated. I addressed most of them, two I'd keep out of this PR.

joachimeichborn and others added 10 commits May 5, 2023 15:03
Signed-off-by: Joachim von Eichborn <joachimeichborn@users.noreply.github.com>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
… router-link

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl
Copy link
Member Author

Let's get this in so we can have a first beta for more testing.

@juliushaertl juliushaertl merged commit c9e478e into master May 5, 2023
@juliushaertl juliushaertl deleted the three-column-layout-rebased branch May 5, 2023 14:32
@juliushaertl juliushaertl mentioned this pull request May 12, 2023
22 tasks
@theatischbein
Copy link
Contributor

Hey,
I can load any note on the current master branch. The JS console shows:

Uncaught TypeError: this.note is null
    refreshNote NotePlain.vue:206
    refreshTimer NotePlain.vue:201
    setTimeout handler*startRefreshTimer NotePlain.vue:199
    fetchData NotePlain.vue:129
    promise callback*fetchData NotePlain.vue:123
    created NotePlain.vue:94
    VueJS 28

Do I have to do any migration steps ?
This UI looks great though! :)

@juliushaertl
Copy link
Member Author

Hm, I cannot think of any. Can you test with a new user account to see if it might be related to the account settings with which editor is being used as I see NotePlain in the trace?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
design Related to the design or user experience enhancement New feature or request
Projects
Archived in project
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants