Commit graph

628 commits

Author SHA1 Message Date
21bd211889 Give Users a display_name. 2018-04-15 14:23:24 -07:00
df211454bb Include username and password length requirements on form. 2018-04-15 13:20:08 -07:00
f77ab51b14 Add Album.has_any_photo and has_any_subalbum_photo. 2018-04-15 02:41:24 -07:00
0c9582598d Add arg --https even for non-443. 2018-04-15 01:00:37 -07:00
c1fd863999 Add jinja_filters.py with bytestring. 2018-04-15 00:59:54 -07:00
4fcb524211 Show number of photos in h3 on Album page 2018-04-06 21:50:13 -07:00
ac41598bb0 Add some more give_token.
I probably should just put it as a global pre-request hook.
2018-03-29 19:24:48 -07:00
cfa5d269d1 Add keybinds CTRL+A and +D to select/deselect all cards. 2018-03-23 11:58:39 -07:00
27885df64e Fix binding of the fallback handler. 2018-03-23 10:25:03 -07:00
abaeb2321f Oops, should be .remove instead of .pop for the cacheclass. 2018-03-23 00:35:56 -07:00
6ee86431e5 Add Album.normalize_title and _description. 2018-03-23 00:35:55 -07:00
0e3ae11610 Improve normalizers, use less None; Add author search box.
It was getting difficult to remember which of the normalizers
use None and which don't. So let's try to be a little more consistent
and just use empty sets, etc, so the caller can rely on receiving a
set instead of having to check for None.

Also renamed search parameter authors->author to be more in line
with the singular form of extension.
2018-03-22 21:09:21 -07:00
5be174d1b3 Completely rewrite search to use more SQL and less application.
In order to achieve tag_musts, we break each of the musts down
into separate EXISTS queries for each of the matchable children.
Then we INTERSECT those, and finally do other filtering and
ordering as usual.
2018-03-21 19:20:43 -07:00
7b4ae3045a Remove some excessive newlines from photo_card output. 2018-03-19 22:52:15 -07:00
b4cd4b6130 Fix body not filling vertical space. 2018-03-19 15:06:07 -07:00
45bd80caa4 Remove height:40px from plain_link. Only nice_link. 2018-03-19 15:03:53 -07:00
b90971813f Oops, fix broken click-to-join because of the qualname change. 2018-03-19 14:11:25 -07:00
b5274fefb9 Add caching.py to enable browser caching of files. 2018-03-18 21:42:31 -07:00
ea7401b4f2 Fix common.send_file to use pathclass. 2018-03-18 21:40:32 -07:00
0de755f138 Let the SessionManager use a cacheclass instead of plain dict. 2018-03-18 21:23:48 -07:00
a5aef63c6f Tags on this page should also display qualnames with maxlen. 2018-03-18 19:47:08 -07:00
84599b44f7 Store author for bookmark creation. 2018-03-18 15:59:58 -07:00
dffde094e8 Give Albums and Tags an author_id column.
Keeping V11 because I hadn't published previous commits yet.
2018-03-18 15:28:26 -07:00
4a39b527f3 Use dot_extension on the photo cards. 2018-03-18 00:19:30 -07:00
ffe0be21f5 Fix Photo thumbnail paths to be relative to the PDB's thumb dir.
Previously they were relative to the directory from which the client
was launched, meaning it usually started with ./_etiquette.
Now it should be more portable and less tight.
2018-03-13 02:50:54 -07:00
8fcaf15fbe Remove the word "Album" from the h2. The number is okay.
I just decided I like this better.
2018-03-10 19:54:56 -08:00
df86d0f128 Replace "you are here" with the album's name. 2018-03-10 19:54:22 -08:00
45091c6596 Fix thumbnail height in CSS only, no html attr. Don't h-stretch. 2018-03-10 19:53:29 -08:00
f04e055ca3 On the tag page, put descr in a dark box like albums. 2018-03-10 13:40:02 -08:00
6de0ad8e36 Oops, add this.open fallback to the open binder. 2018-03-10 13:28:13 -08:00
daf824caf5 Improve album page's use of data-editor-empty-text. 2018-03-10 13:24:23 -08:00
494d44aa03 Improve editor.js comments and usage of this.
I realized what I was doing wrong with `this`, so now the function
binder is much cleaner.
2018-03-10 13:23:37 -08:00
f9bee5716c Don't clear the clipboard after pasting into album.
Sometimes I want to do more operations.
2018-03-09 17:50:41 -08:00
a1919a7725 Support giving title when creating albums. Two-step prompt. 2018-03-09 17:38:40 -08:00
5f6d21fdee Give Photos a searchhidden property.
By default, photos with searchhidden do not appear in the search
results. This allows a small number of representative images from
a large album to appear in the results, while the rest can be
found on the album's page.

The same effect could be achieved with a tag and forbid search,
but tag searching has much higher cost and it would be more difficult
to implement as a default behavior without requiring lots of special
checks whenever listing tags etc.
2018-03-09 17:10:27 -08:00
faacf7b594 Oops, use response["data"]. 2018-02-26 19:06:27 -08:00
f34164bf85 Add search feature has_thumbnails.
Search needs a complete refactor.
But until then, let's keep adding to it!
2018-02-24 23:06:25 -08:00
5f7266c519 Add button to clear clipboard. 2018-02-24 23:00:28 -08:00
4e98fcf137 Oops, add the session to /clipboard. 2018-02-24 19:18:15 -08:00
0228fbebfd Move the random hex generator to helpers. 2018-02-24 18:54:59 -08:00
2fceeedbbb Add /clipboard UI for mass refresh metadata. 2018-02-24 13:23:35 -08:00
5add26d8fb Add endpoint /batch/photos/refresh_metadata. 2018-02-24 12:52:36 -08:00
30c9148092 Move the remaining common css / js to their folders. 2018-02-24 12:51:36 -08:00
79b20369db Oops, apply listeners to /photo input box as well. 2018-02-24 01:08:21 -08:00
e359180467 Move clipboard_tray rules to own file in css folder. 2018-02-24 01:06:27 -08:00
aabcb61a9c Create css folder. Move photo_card rules to own file. 2018-02-24 00:58:43 -08:00
840185072b Move photoclipboard.js to the js folder. 2018-02-24 00:47:44 -08:00
56a998682d Create js folder. Move Editor to its own file. 2018-02-24 00:46:55 -08:00
aa284c388d Fix message_area on /login.
Because the rules are no longer in common.
2018-02-24 00:34:46 -08:00
9c6cae7177 Use event listeners instead of setting onkeyup manually. 2018-02-24 00:24:38 -08:00
5a1d259780 Add /clipboard UI for mass-tagging. 2018-02-22 15:23:57 -08:00
4b79308119 Move 0-item clipboard collapser to update_clipboard_tray. 2018-02-22 13:36:31 -08:00
2adadf9871 Rewrite tags.html with more Grid. 2018-02-21 22:13:46 -08:00
a9248d8cab Add CSS clipboard_size; and other clip hook improvements.
Any element with class clipboard_size will have its text updated;
Removed the call to on_pageload from save_ because it redundantly
causes a load. Separate those update hooks.
2018-02-20 20:20:20 -08:00
761ae5c30c Add endpoints /batch/photos/add_tag and /remove_tag. 2018-02-20 17:23:51 -08:00
13e8bc4a6f Add more items to to-do list; minor fixes. 2018-02-20 16:50:39 -08:00
ebe0fcee40 Rename URL /photo_cards -> /batch/photos/photo_card. 2018-02-19 23:44:24 -08:00
6ad41eb516 Improve bookmark appearance; don't send edit with blank url. 2018-02-17 19:36:48 -08:00
91d445a877 Add new page /clipboard, with full photo cards. 2018-02-17 19:12:34 -08:00
ef5bbf5fc3 Split HTTP response dict into ["meta"] and ["data"]. 2018-02-17 18:47:17 -08:00
f4756d97e4 Improve html & Jinja indentation. 2018-02-17 18:19:47 -08:00
b02374136f Let the page add its own clipboard load/save hooks. 2018-02-17 16:31:51 -08:00
1b631b33e9 Make separate functions for HTTP get / post. 2018-02-17 16:08:38 -08:00
606a66cbf9 Remove Photo.filepath and real_filepath in favor of real_path. 2018-02-17 15:19:36 -08:00
59cd922a53 Remove unnecessary methods=GET. 2018-02-17 14:59:02 -08:00
574ac9f656 Slightly scale down image thumbnail to match others.
It was too big!
2018-02-16 23:30:27 -08:00
b4a28f5034 Make Photo.bytestring a @property.
This is the kind of thing that should be a @property, because
it's very low processing power and doesn't hit the database.
2018-02-16 23:16:02 -08:00
bbe392ac09 Rename Photo.author -> get_author; no longer a @property. 2018-02-16 23:11:25 -08:00
205c49c21f Rename Photo.albums -> get_containing_albums. 2018-02-16 23:08:44 -08:00
2f9b51b636 Rename Photo.tags -> get_tags. 2018-02-16 23:07:21 -08:00
ac9d7ede22 Rename Album.photos -> get_photos. 2018-02-16 23:03:54 -08:00
6574450ad1 Rename Tag.synonyms -> get_synonyms. 2018-02-16 23:01:07 -08:00
fdcf07940a Rename Groupable.children -> get_children. 2018-02-16 23:00:43 -08:00
75effafaf5 Rename Groupable.parent -> get_parent.
After making the "if x.parent is None" mistake too many times,
forgetting that it was not a @property, I've decided that the
verby name is better.
2018-02-16 22:59:34 -08:00
3c4f69f647 Specify name= on calls to PDB.get_tag.
Sometimes it's easy to forget whether its the name or ID,
and I like the consistency of specifying.
2018-02-16 22:25:56 -08:00
1c1e7f158f Minor fixes & pylint appeasements. 2018-02-16 21:28:36 -08:00
6f4530c88c Let SessionManager.get require Request object; Check IP addr.
So far there is no use case in which get needs to be called with
something other than a Request, and I don't think there will be.
So let's make that part of the design and we can also take the
opportunity to check IP.
2018-02-03 02:10:07 -08:00
c6a396c658 Move ef/endpoints/common.py to ef/common.py
Decided it doesn't belong with the endpoints files.
2018-02-03 01:43:41 -08:00
b39f2e3f7b Create basic_endpoints file. Don't put them in __init__. 2018-02-03 01:34:07 -08:00
20462f1085 Oops, add back missing CSS on mmf deleter. 2018-01-30 19:45:59 -08:00
75953c2999 Add docstrings to the photoclipboard functions. 2018-01-19 22:24:07 -08:00
cf59f96813 Perform serverside expiration of sessions on get attempt.
Also remove unnecessary conversion to int.
2018-01-19 21:59:50 -08:00
cdd8f9e248 Only reload the page if the clip operation was successful. 2018-01-19 21:44:21 -08:00
b00d93901a Apply werkzeug ProxyFix so that request.remote_addr is correct. 2018-01-17 20:53:25 -08:00
7352d1e141 If the user has a token we don't recognize, give them a new one. 2018-01-15 20:04:47 -08:00
55e1281774 Improve technique for finding cookie set by function.
Instead of iterating through all the outgoing headers.
2018-01-15 18:56:41 -08:00
be0fca729f Create sessions for anons as well, instead of just logged in.
It makes sense that anon sessions are still sessions. So @give_token
will ensure that every request has a session. Logged in conditionals
move from 'if session' to 'if session.user'.
2018-01-15 18:41:21 -08:00
8a1f2c65f9 Tighten the types for _normalize_token; include werkzeug wrappers. 2018-01-15 18:39:40 -08:00
526cc7e07d Add search form input for created. 2018-01-13 20:02:12 -08:00
ec4b5b014b Oops, fix missing return statement.
That would cause problems.
2018-01-13 16:14:01 -08:00
57f007d595 Don't use from etiquette import. 2018-01-13 16:12:52 -08:00
d84fc037fe Use urandom instead of uuid for session id. 2018-01-13 15:49:14 -08:00
c049b97bc6 Replace etiquette_flask.py with endpoints package.
Split the object types' endpoints into separate files and group
them better. Should be much easier to navigate and expand.
2018-01-11 19:40:56 -08:00
5fccf5548b Add Before and After search links to the photo sidebar. 2018-01-11 16:11:38 -08:00
fe88cdc413 Add decorator catch_etiquette_exception.
To reduce the number of 500 errors and provide 400 instead.
2018-01-09 21:21:15 -08:00
b89d5f77d5 Oops, add back some css classes that I missed during the rearrangement. 2017-12-20 20:11:34 -08:00
1f7247dbe1 Add paste/unpaste buttons to clipboard tray toolbox for albums. 2017-12-16 14:19:37 -08:00
3d8aeec484 Add API endpoints for add/remove photo from album. 2017-12-16 14:19:00 -08:00
e41532cff1 Rearrange some button CSS classes to be more generic.
Adds CSS variables for the highlight and shadow so they don't need
to be custom-defined for each color of button.
Elements should use more generic classes like green_button instead of
add_tag_button unless there's a good reason.
2017-12-16 14:13:02 -08:00
f59f94cae9 Fix required_fields looking at wrong jsonify file. 2017-12-16 12:25:01 -08:00
4a5583c091 Add tray_lines div so that tray_body might hold more buttons. 2017-12-16 12:24:46 -08:00
443d93ce18 Add the clipboard tray where users manage their photo clipboard.
Appearing on search and album pages, the tray is where you can
remove items from your clipboard without having to click on its
checkbox -- that photo card may not even be on the current page.
2017-12-16 03:47:54 -08:00
0b5f736574 Few minor text fixes. 2017-12-16 03:45:07 -08:00
55f7da7bb2 Add the photo_clipboard feature with localStorage.
photo_card objects now have a checkbox which adds them
to the clipboard. No pasting or other operations yet.
2017-12-09 17:48:56 -08:00
f69d9d409d Give the editor toolbox a CSS class. 2017-12-08 11:59:27 -08:00
0d0354f4da Rename normalize_filepath to remove_path_badchars.
Because the function does not do any resolving or converting
to an absolute path, I feel the name 'normalize' is inaccurate
and could be misleading when read. This is more clear.
2017-12-07 21:15:10 -08:00
156e467814 Display album hierarchy as nested bullets instead of separate lists.
Not perfect yet but I didn't like having all those header elements.
2017-11-27 16:00:52 -08:00
bdbded6467 'info' link should point to /tag/x instead of /tags/x 2017-11-26 02:49:57 -08:00
a0e0e9fbd2 Add a link to the info page for each tag. 2017-11-26 02:40:15 -08:00
b3c9dd58f5 Allow custom innertext besides just the tag's name. 2017-11-26 02:38:39 -08:00
f052858d5f Improve log creation and use custom formatter. 2017-11-26 02:37:11 -08:00
a510c7b55c Improve Album bytes caching, start caching photo count.
More careful uncaching of the summed bytes, to minimize
recalculation. Fewer cases where the album itself
is removed from the photodb's getter cache.

This also helps the download link on album pages disappear if
the child albums don't actually have any photos.
2017-11-12 15:21:53 -08:00
b721e5a1cd Move site tests to the site frontend folder. 2017-11-12 01:14:02 -08:00
bb5fa816d8 Cleanup: Rename GroupableMixin.add to add_child for clarity.
Especially since for albums it might sound like you're adding a photo.
2017-11-11 22:41:26 -08:00
3f69a2c240 Cleanup: Replace "objectid" with "object_id" in the Python portions. 2017-11-11 22:38:51 -08:00
26a034c9a0 Make Photo.author a @property; None if no author. 2017-09-23 10:58:04 -07:00
4836efcf23 HTTP redirect /tag/synonym to /tag/master. 2017-09-18 14:16:33 -07:00
f4ee7ddd9e Include werkzeug Response type in typecheck. 2017-09-18 14:10:25 -07:00
e592b55fb1 Use CSS Grid for the header container.
The elements still use flex for spacing simplicity.
2017-08-01 18:37:25 -07:00
f9524a1858 Switch to CSS Grid for the photo cards. 2017-08-01 18:25:28 -07:00
c3c86de7f8 Only navigate to the album on 200. 2017-07-29 15:40:40 -07:00
4fc203634c Add new config "enable_login". 2017-07-20 23:25:23 -07:00
797b3376a7 Add meta viewport to all pages. 2017-07-20 23:10:48 -07:00
0ce07b0c7b Use over-under style for #right on narrow displays. 2017-07-20 23:08:58 -07:00
463b627920 Put login / register boxes vertical when narrow. 2017-07-20 23:02:09 -07:00
f14d5fa312 Hide the description when the user saves it empty. 2017-07-16 18:23:56 -07:00
6986d56b71 Fix CSS so #left and #right don't overlap.
So that the elements in left don't go underneath right.
2017-07-16 18:20:30 -07:00
2c5617207a Add name and description editor. 2017-07-16 17:29:14 -07:00
9f45f0851a Allow renaming the tag via /tag/x/edit. 2017-07-16 17:28:44 -07:00
23349e7823 Use <pre> instead of <p> so \n is kept. 2017-07-16 17:28:06 -07:00
a1178ca3a5 Focus the title editor on open. 2017-07-16 17:26:34 -07:00
05d84c733c Add <pre> to the types that get textarea inste of input. 2017-07-16 17:21:37 -07:00
61ab1fb452 Use the provided display_element_map instead of the global vars. 2017-07-13 23:32:14 -07:00
8bf33f7ac6 Nevermind, the span wasn't useless.
The h2 needs to hold the title input so it stays block-level.
2017-07-13 23:28:51 -07:00
ee555f5f41 Also provide a display_element_map in addition to edit_element_map. 2017-07-13 23:17:47 -07:00
0e17350d84 Add Editor elements for bookmarks. 2017-07-13 23:13:34 -07:00
1f9dd35e89 Add data-editor-empty-text attribute.
When the display element specifies this attribute, it will be used when
the user leaves that field empty.
2017-07-13 23:07:44 -07:00
22c0163f5b Add /bookmark/id/edit and /bookmark/id.json endpoints. 2017-07-13 23:02:57 -07:00
5a512d8a25 Include an extra, more general css class "editor_button". 2017-07-09 19:51:58 -07:00
1149283c7b Add interface for creating bookmarks. 2017-07-09 19:40:14 -07:00
9a156672b0 Remove unnecessary span. Put album title in the h2 directly. 2017-07-09 19:27:12 -07:00
2d732c5ab0 Add the tag's name into the <head> title. 2017-07-09 16:41:57 -07:00
533970f248 Add more stuff to the to-do list. 2017-07-09 15:48:47 -07:00
a2906db06a Let /refresh_metadata try to generate a thumbnail. 2017-07-09 15:45:10 -07:00
57355cb032 Add /userid/id redirect to /user/name 2017-06-19 17:03:07 -07:00
f61570acfb Fix "tags on this page" members not superceding parents. 2017-06-19 16:27:24 -07:00
24e162c782 Add basic thumbnail for image types. 2017-06-19 16:13:42 -07:00
e58c50c94f Return 400 instead of 500 for /albums/create_album errors. 2017-06-16 02:24:57 -07:00
56655d2cd0 Fix tag_object having too much whitespace. 2017-06-16 02:22:42 -07:00
1b9f7608b1 Send more jsonified exceptions instead of just 500. 2017-06-14 22:48:50 -07:00
1240c1785c Fix blank_title_text not being restored upon cancel. 2017-06-14 21:56:47 -07:00
160aeb6950 Replace old work with new Editor class. 2017-06-14 21:45:20 -07:00
6e679f79b6 Add Editor class to generalize in-place editors. 2017-06-14 21:44:18 -07:00
d208a254a9 Add /tag/abcd/edit endpoint, no interface yet. 2017-06-14 12:31:39 -07:00
fa176fdfb8 Redirect /tags/abcde to /tag/abcde 2017-06-14 12:31:17 -07:00
5ba2ecd38a Add tag_object html macro to centralize that effort. Still needs work. 2017-06-13 21:42:23 -07:00
aa30d5903d Don't clip editor_area bg when scrollbar appears.
Instead of applying the background-color to the holder, apply it to the editor
area and message area separately. Then they can flex differently so that
the editor always maintains full height, and the message area shrinks to
a minimum of 30px.
2017-06-13 21:35:13 -07:00
6cb13c7835 Order endpoints by URL instead of by name.
That way, gets and posts of same type can be together.
2017-06-12 20:59:01 -07:00
8a0bbbcc56 Add /bookmarks/create_bookmark endpoint. No interface yet. 2017-06-12 20:15:02 -07:00
821a5f3371 Move export functions to their own module. 2017-06-11 22:55:45 -07:00
c4d1cf12e4 Make outline thickness more consistent 10 units 2017-06-09 19:15:50 -07:00
1ad83937b4 Add 'Create Album' endpoint and interface. 2017-05-13 16:13:26 -07:00
956c55ac9a Remove unused code for add-tag-to-all of album.
I'll put it back when I actually make it work.
2017-05-13 15:52:08 -07:00
4928095abb Minor commentary and cleanup 2017-05-13 15:27:08 -07:00
eafb7fcffe Improve editor appearance and use ctrl+enter for desc. 2017-05-13 15:26:34 -07:00
95f4d79805 Move album dl link to bottom. Just feels better. 2017-05-13 15:25:31 -07:00
d18b34f2d9 bind_box_to_button can use ctrl+enter 2017-05-13 15:24:41 -07:00
a4a278c173 Give Tags a description field. 2017-05-12 17:31:17 -07:00
a485be3c64 Make bitrate a real attribute instead of calculating in jinja 2017-05-11 22:34:19 -07:00
f8a78c6ee7 Minor cosmetics 2017-05-06 17:04:42 -07:00
824430dfa8 Add helper div to maintain bg color on filename hover
Without it, gaps are visible between the lines of text.
2017-05-06 04:13:33 -07:00
1fe3b99876 Move filename to be its own li 2017-05-06 03:45:01 -07:00
ae08f9919a Oops, don't forget to hide editor on cancel. 2017-05-05 23:04:33 -07:00
980688fbc1 Fix hoverzoom snapping to last known position.
Suddenly hoverzoom started acting wrongly. Possibly a Chrome update.
2017-05-05 23:02:42 -07:00
87abb055c3 Fix photo message_area from dominating screen height 2017-05-05 22:59:22 -07:00
19a9aee4fe Keep editor open until response. New Submitting... text. 2017-05-05 21:17:13 -07:00
e5d22e766a Fix usage of request.status 2017-05-05 21:08:32 -07:00
1c30ef5785 Further separate front & back; Create frontends folder
New frontends folder will hold all front-end interfaces for etiquette. Existing flask site moved here and refers to itself as a package with external launcher. etiquette_site renamed to etiquette_flask
2017-05-01 21:49:28 -07:00