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

Bye bye 'New person..' #336

Merged
merged 25 commits into from
Oct 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5b741f4
Bye bye 'New person..'
matiasdelellis Sep 8, 2020
8d934d5
Fix migrations
matiasdelellis Sep 9, 2020
c508735
Dont set 'New person' to new clusters
matiasdelellis Sep 9, 2020
71fbb40
Implement person view..
matiasdelellis Sep 9, 2020
a0dc73d
Implement person view with user images of that person.
matiasdelellis Oct 7, 2020
f5e67d0
Improve sidebar..
matiasdelellis Oct 7, 2020
2a9d8cc
Build the path of the thumbnails exactly like the photos app.
matiasdelellis Oct 9, 2020
7ada7e1
Implement rename person, that rename all clusters with same name.
matiasdelellis Oct 10, 2020
0985319
Suggest naming unassigned clusters.
matiasdelellis Oct 11, 2020
d3d4595
Add a button to rename clsuters instead of show the dialog directly
matiasdelellis Oct 11, 2020
b2bde73
Fix sidebar rename dialog and some styles
matiasdelellis Oct 11, 2020
3262dce
Change URL when select an person. You can put it as favorite to acces…
matiasdelellis Oct 12, 2020
1a87423
Do happy to scrutinizer-ci
matiasdelellis Oct 12, 2020
45a2b17
D'oh...
matiasdelellis Oct 12, 2020
5162aa8
Split PersonController with ClusterController. Add add UrlService to …
matiasdelellis Oct 12, 2020
34bf7e3
Try to clean personal.js
matiasdelellis Oct 12, 2020
538ca7d
New dialog to assign name. Implement rename person instead cluster on…
matiasdelellis Oct 12, 2020
ed4a918
Try to fix tests. When create new clusters, their names are null.
matiasdelellis Oct 13, 2020
02129cd
More null fixes.
matiasdelellis Oct 13, 2020
023bee2
More null fixes when create new persons.
matiasdelellis Oct 13, 2020
6d446da
Fix last test due to new behavior when merge persons
matiasdelellis Oct 13, 2020
441d8c8
Misc fixes.
matiasdelellis Oct 13, 2020
bb4f7f2
Add an new method on UrlService to get the person link
matiasdelellis Oct 13, 2020
7f72630
Remove SHOW_NOT_GROUPED option since it is not needed.
matiasdelellis Oct 14, 2020
2c3c133
Various fixes in the fronted
matiasdelellis Oct 14, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
- **🚀 Build your own thing:** FaceRecognition app is just a basic building block. Through FaceRecognition API, you can build your advanced scenarios - automatically add tags to images, connect contacts and persons, share images from specific person… We want to hear your ideas!
]]>
</description>
<version>0.6.3</version>
<version>0.6.4</version>
<licence>agpl</licence>
<author>Matias De lellis</author>
<author>Branko Kokanovic</author>
Expand Down
50 changes: 43 additions & 7 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
@@ -1,36 +1,66 @@
<?php
return ['routes' =>
return ['routes' =>
[
/*
* Persons
*/
// Get all face clusters with faces and file asociated.
[
'name' => 'person#index',
'url' => '/clusters',
'url' => '/persons',
'verb' => 'GET'
],
// Get all clusters filtered by Name.
// Get all images filtered by Name.
[
'name' => 'person#findByName',
'name' => 'person#find',
'url' => '/person/{personName}',
'verb' => 'GET'
],
// Change name to a person.
[
'name' => 'person#updateName',
'url' => '/person/{personName}',
'verb' => 'PUT'
],
/*
* Clusters
*/
// Get a cluster by Id.
[
'name' => 'person#find',
'name' => 'cluster#find',
'url' => '/cluster/{id}',
'verb' => 'GET'
],
// Change name to a person.
// Get all clusters filtered by Name.
[
'name' => 'person#updateName',
'name' => 'cluster#findByName',
'url' => '/clusters/{personName}',
'verb' => 'GET'
],
// Get all clusters unassigned clusters.
[
'name' => 'cluster#findUnassigned',
'url' => '/clusters',
'verb' => 'GET'
],
// Change name to a cluster.
[
'name' => 'cluster#updateName',
'url' => '/cluster/{id}',
'verb' => 'PUT'
],
/*
* Face thumbails
*/
// Get a face Thumb
[
'name' => 'face#getThumb',
'url' => '/face/{id}/thumb/{size}',
'verb' => 'GET'
],
/*
* File and Folders
*/
// Get persons from path
[
'name' => 'file#getPersonsFromPath',
Expand All @@ -49,6 +79,9 @@
'url' => '/folder',
'verb' => 'PUT'
],
/*
* Settings
*/
// User settings
[
'name' => 'settings#setUserValue',
Expand All @@ -71,6 +104,9 @@
'url' => '/getappvalue',
'verb' => 'GET'
],
/*
* Status of process.
*/
// Get process status.
[
'name' => 'process#index',
Expand Down
46 changes: 23 additions & 23 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 40 additions & 20 deletions css/facerecognition.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,24 @@
width: 100%;
}

.person-title {
display: inline-flex;
.icon-back {
@include icon-color('back', 'facerecognition', $color-black);
}

.image-box,
.person-box {
display: inline-block;
margin: 3px;
}

.person-desc {
text-align: center;
margin-top: -5px;
color: var(--color-text-lighter);
}

.cluster-title {
padding: 10px;
padding-left: 34px;
background-position: 10px center;
text-align: left;
margin-top: 22px;
margin-bottom: 0px !important;
Expand All @@ -16,40 +29,47 @@
padding-left: 34px;
}

.person-name {
text-align: center;
margin-top: 5px;
margin-bottom: 0px;
}

.persons-previews {
margin-top: 22px;
}

.faces-previews {
margin-left: 24px;
display: flex;
flex-wrap: wrap;
}

.face-preview-big,
.file-preview-big {
background-color: rgba(210, 210, 210, .75);
background-size: cover;
border-radius: 12px;
height: 128px;
width: 128px;
margin: 0 auto;
cursor: pointer;
}

.face-preview {
background-color: rgba(210, 210, 210, .75);
background-size: cover;
border-radius: 3px;
margin: 2px;
height: 50px;
width: 50px;
}

.face-preview-big:hover,
.face-preview:hover {
opacity: .5;
}

/*
* Rename dialog
*/

#fr-dialog-content-input {
width: 80%;
margin: 6px;
}

.face-preview-dialog {
background-color: rgba(210, 210, 210, .75);
border-radius: 25px;
height: 50px;
width: 50px;
}

/*
* Admin page
*/
Expand Down
9 changes: 5 additions & 4 deletions css/fr-dialogs.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#fr-dialog-content-input {
width: 80%;
margin: 6px;
#fr-assign-dialog-input,
#fr-rename-dialog-input {
width: 100%;
}

.face-preview-dialog {
background-color: rgba(210, 210, 210, .75);
border-radius: 50%;
height: 50px;
width: 50px;
}
margin: 1px;
}
53 changes: 53 additions & 0 deletions img/back.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading