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.

Sign up for GitHub

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

Jump to bottom

Add people view #1155

Merged
merged 45 commits into from
Aug 23, 2022
Merged

Add people view #1155

merged 45 commits into from
Aug 23, 2022

Conversation

marcelklehr
Copy link
Member

@marcelklehr marcelklehr commented Aug 12, 2022 •
edited
Loading

Depends on nextcloud/recognize#270

  • Fix people disappearing when renaming them
  • Make selection work
  • Make viewer work
  • Check diff since rebasing, which b0rked the content view
  • Allow merging two people
  • Add check for whether recognize is installed

@marcelklehr marcelklehr changed the base branch from master to feat/album_frontend August 12, 2022 14:18
This was referenced Aug 13, 2022
Merged
Closed
artonge
artonge requested changes Aug 18, 2022
View reviewed changes
Copy link
Collaborator

@artonge artonge 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, but did not test yet.

To test I only have to install the recognize app ?

src/Photos.vue Outdated Show resolved Hide resolved
src/Photos.vue Show resolved Hide resolved
src/mixins/FaceCoverMixin.js Show resolved Hide resolved
src/mixins/FaceCoverMixin.js Show resolved Hide resolved
src/mixins/FetchFacesMixin.js Outdated Show resolved Hide resolved
src/store/faces.js Outdated Show resolved Hide resolved
src/store/faces.js Outdated Show resolved Hide resolved
src/store/faces.js Outdated Show resolved Hide resolved
src/store/faces.js Outdated Show resolved Hide resolved
src/views/FaceContent.vue Outdated Show resolved Hide resolved
@marcelklehr
Copy link
Member Author

Testing is a bit tough, currently. You'll need this PR of recognize: nextcloud/recognize#270

@artonge artonge force-pushed the feat/album_frontend branch 4 times, most recently from 7934385 to c8bf3a5 Compare August 22, 2022 18:07
Base automatically changed from feat/album_frontend to photos2 August 23, 2022 11:05
artonge
artonge approved these changes Aug 23, 2022
View reviewed changes
Copy link
Collaborator

@artonge artonge left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I just merge the album work into photos2. Please rebase on photos2 then you can merge :)
We will address the php warnings later.
Also, compile and commit your js files

artonge and others added 16 commits August 23, 2022 13:50
@artonge @marcelklehr
Add Albums view
c7bdf09 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge @marcelklehr
Don't limit album content height and fix loading icon
18693ec 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge @marcelklehr
Minor rendering improvements
65940ca 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge @marcelklehr
Refactor album store and services
c8b432b 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge @marcelklehr
Some more linking to DAV APIs
41bc491 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge @marcelklehr
Fix copyright headers
6999be2 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge @marcelklehr
Use Object.freeze to make some objects read only
14fc150 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge @marcelklehr
Make section headers sticky
8c8dac7 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge @marcelklehr
Reduce the number of displayed row by VirtualScrolling
a52c430 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge @marcelklehr
Fix delete of a photos
4b9110e 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge @marcelklehr
Remove debug logs
3a1b187 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge @marcelklehr
Fix lint error
427d90d 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge @marcelklehr
Add spacing for AlbumContent loader
07c0ead 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge @marcelklehr
Fix refresh on /folders view
d4d4c7a 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge @marcelklehr
Address reviews
e3738a5 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@marcelklehr
First pass implementing faces overview
632207b 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
marcelklehr and others added 24 commits August 23, 2022 14:30
@marcelklehr
Fix Viewer in FaceContent
388be02 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Implement removeFilesFromFace
5da9f5d 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Fix FaceContent header
795b994 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Fix renaming people (again)
40e1381 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Add new empty face illustration
df59eaa 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Implement merging faces
0723f15 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Use illustration for Faces > empty content
e2101b4 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Implement isRecognizeInstalled check
41da638 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Update FaceCoverMixin
8dfae85 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Faces: Sort people by amount of pictures
eb081a4 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Lots of design and UX fixes
706c560 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
FaceContent: ResetSelection after removing photos from face
5236f5f 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
FaceCover: text-align: center
d3b6dc2 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Faces: Do not use illustration for empty content
62ecc53 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Add copyright
2ce46b3 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr @artonge
Update src/services/IsRecognizeInstalled.js
22465e7 
Co-authored-by: Louis <6653109+artonge@users.noreply.github.com>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr @artonge
Update src/mixins/FetchFacesMixin.js
a93ac3a 
Co-authored-by: Louis <6653109+artonge@users.noreply.github.com>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
ALbum => face
49d4a4b 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Explain face zooming magic
611159b 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Make eslint happy
df6c790 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Rename class (album => face)
4bb96f7 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Fix stylelint error
709700f 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Navigation: Make people icon size=20
b9c995e 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
router: Use dynamic import for faces routes
fabd498 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr marcelklehr marked this pull request as ready for review August 23, 2022 12:50
@marcelklehr marcelklehr merged commit 07a960d into photos2 Aug 23, 2022
@marcelklehr marcelklehr deleted the feat/faces-ui branch August 23, 2022 12:51
@blizzz blizzz mentioned this pull request Aug 24, 2022
Merged
@joshtrichards joshtrichards mentioned this pull request Jul 1, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@artonge artonge artonge approved these changes

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@marcelklehr @artonge