a13f2d288f
Merge branch 'master' into aaron-branch-2
2020-10-31 20:58:25 -04:00
52e76be34a
Merge pull request #73 from ClaytonWWilson/search-filter
...
Search filter
2020-10-31 20:48:06 -04:00
Clayton Wilson
fdb1ea6213
Fix branch merge bug
2020-10-31 20:47:48 -04:00
7cb7f5f468
Merge branch 'master' into search-filter
2020-10-31 20:40:19 -04:00
d7a86aac7d
Merge pull request #74 from ClaytonWWilson/total-price-bar
...
Floating total price bar
2020-10-31 20:35:43 -04:00
Clayton Wilson
1f7a1b10db
Remove print statements
2020-10-31 20:35:31 -04:00
Clayton Wilson
d9ea934021
Fix total price being incorrect
2020-10-31 20:34:54 -04:00
Aaron Sun
4b8561ebd7
Removed my grand total code (Clayton's job) and reformatted shopping list page
2020-10-31 17:25:56 -07:00
1f2ea26efe
Merge branch 'master' into total-price-bar
2020-10-31 20:21:00 -04:00
19fdd96b76
Merge pull request #69 from ClaytonWWilson/async-loading
...
Async loading
2020-10-31 20:11:36 -04:00
Clayton Wilson
8364ed049b
Fixed formatting from merge
2020-10-31 20:10:09 -04:00
4a43b84aba
Merge branch 'master' into async-loading
2020-10-31 20:05:18 -04:00
Clayton Wilson
739699d7a5
Explicitly declared inner loop variables to final
2020-10-31 19:54:11 -04:00
Clayton Wilson
e392820404
Default can be sorted descending
2020-10-31 19:36:45 -04:00
Nathan Merz
3b8e13e84c
Merge pull request #70 from ClaytonWWilson/item-search-limit
...
Limit item search results
2020-10-31 19:16:18 -04:00
NMerz
8233a989ef
ListDELETE lambda
...
List deletion now working
Integration tested independently.
Still needs tests and user deletion should now use this.
2020-10-31 14:54:42 -04:00
Aaron Sun
7cf6c0534a
Merge pull request #76 from ClaytonWWilson/master
...
Merge pull request #72 from ClaytonWWilson/aaron-branch-2
2020-10-27 11:07:13 -07:00
Aaron Sun
7c6045ba46
Merge pull request #72 from ClaytonWWilson/aaron-branch-2
...
Aaron branch 2
2020-10-27 11:06:42 -07:00
32dd8c56ca
New sort dialog fully implemented
2020-10-26 19:15:58 -04:00
20b86c573a
New sort dialog layout
2020-10-26 03:49:43 -04:00
Aaron Sun
2c73e8b224
Properly formatted the price values in shopping list
2020-10-25 23:27:25 -07:00
Aaron Sun
049d95bb91
Can now clear shopping list (i.e. remove all items)
2020-10-25 22:39:56 -07:00
Aaron Sun
0562c66dbb
Can now display the grand total of items in shopping list
2020-10-25 22:15:27 -07:00
e7c1ab85ea
Moving sort and filter code to the correct files
2020-10-26 00:59:18 -04:00
Aaron Sun
a3e72d3699
Shopping list can now display actual image of item
2020-10-25 21:47:48 -07:00
d8bf4e02f8
Add menu to search and rename SortDialogFragment to FilterDialogFragment
2020-10-26 00:25:47 -04:00
367ff12f58
Merge pull request #75 from ClaytonWWilson/search-filter
...
Search filter
2020-10-26 00:11:39 -04:00
04a944f2d5
Update total price when quantities change and items are removed
2020-10-25 23:06:56 -04:00
caf929a71e
Floating total price bar
2020-10-25 22:52:35 -04:00
07db1c833a
Fix duplicate lists displaying
2020-10-25 21:57:57 -04:00
9462bc6723
Price range filtering finished
2020-10-25 21:19:02 -04:00
Aaron Sun
7bc43d8249
Simplified a section of code for total price by store (used HashMap to access header section)
2020-10-25 16:15:42 -07:00
c07599ecc6
Add threads in awaited for loops. Remove new threads from Requestor.getObject calls
2020-10-25 16:53:51 -04:00
Aaron Sun
8afa81db59
Total prices change on the spot after changing quantity and removing items
2020-10-24 16:14:17 -07:00
Aaron Sun
6fe3110c29
Can now display the total price of the items from each store in shopping list
2020-10-24 12:40:28 -07:00
NMerz
f2346f32a9
Add client-side shareWithEmail
...
Define the contract for sharing lists. To share, simply post an instance of ListShare.
2020-10-24 14:50:11 -04:00
NMerz
34d74aae6a
Treat ListSharee as access table
...
This is so that multiple users can be paired with a single list.
In the future, we may want to reconsider list deletion behavior to simply remove a user's access and only delete it when no one has access.
We may also want the user deletion Lambda to use the list deletion Lambda when it is created.
2020-10-24 14:46:56 -04:00
c9d40d0eae
Price filter debugging
2020-10-24 13:51:11 -04:00
NMerz
2637cab282
Create userID retrieval Lambda
...
Allow for the retrieval of userIDs from email (or just generally).
This may need the apigateway passthrough info modified for privacy protection
2020-10-24 12:52:45 -04:00
NMerz
45c7ac15bd
Limit item search results
...
Add a limit on item search results so the user is not overwhelmed.
2020-10-24 11:53:12 -04:00
Aaron Sun
4eddf3ce2d
Can now divde the items in shopping list by store
2020-10-23 22:06:21 -07:00
Aaron Sun
8f6ecdbab1
Removed unnecessary code for Cancel button in pop-up window
2020-10-23 20:20:31 -07:00
6b30476ccd
Move loading circle into its own object
2020-10-23 22:27:01 -04:00
e21913882c
Merge branch 'master' into async-loading
2020-10-22 23:12:41 -04:00
Clayton Wilson
8604d98e63
Async creating lists and adding items
2020-10-22 23:09:57 -04:00
Clayton Wilson
07d0cd44cb
Async loading list products
2020-10-22 18:36:00 -04:00
Clayton Wilson
ec28e8babc
Async loading lists page
2020-10-22 18:06:10 -04:00
Clayton Wilson
20408ea42b
async search bug fixes
2020-10-22 16:28:00 -04:00
DreamCoder23
378878d746
Merge pull request #68 from ClaytonWWilson/master
...
Merge pull request #67 from ClaytonWWilson/aaron-branch-2
2020-10-21 20:11:19 -07:00
DreamCoder23
c6b5e28755
Merge pull request #67 from ClaytonWWilson/aaron-branch-2
...
Aaron branch 2
2020-10-21 20:10:44 -07:00
