Commit Graph

194 Commits

Author SHA1 Message Date
Aaron Sun
0562c66dbb Can now display the grand total of items in shopping list 2020-10-25 22:15:27 -07:00
Aaron Sun
a3e72d3699 Shopping list can now display actual image of item 2020-10-25 21:47:48 -07: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
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
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
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
Aaron Sun
22f8cabc67 Simplified code for verification code pop-up 2020-10-21 20:09:40 -07:00
DreamCoder23
4a35c5de92
Merge pull request #66 from ClaytonWWilson/master
Merge pull request #65 from ClaytonWWilson/aaron-branch-2
2020-10-21 19:33:14 -07:00
DreamCoder23
7e19a898ff
Merge pull request #65 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-10-21 19:32:39 -07:00
Aaron Sun
f62e666652 User can no longer reaccess login-required pages through the back button 2020-10-21 19:31:24 -07:00
Aaron Sun
465318eb84 Sign out button is now in the hamburger menu 2020-10-21 14:31:00 -07:00
Aaron Sun
fdf27b9e62 User can now log out and also automatically gets logged in after signing up 2020-10-21 12:22:42 -07:00
Aaron Sun
8dd2f33b42 App directs user to Login page if not logged in 2020-10-21 11:52:20 -07:00
DreamCoder23
ff14f59ddd
Merge pull request #64 from ClaytonWWilson/master
Merge pull request #62 from ClaytonWWilson/aaron-branch-2
2020-10-21 10:27:34 -07:00
DreamCoder23
dacd469a56
Merge pull request #62 from ClaytonWWilson/aaron-branch-2 2020-10-21 10:26:05 -07:00
Aaron Sun
a3ed7ba8d9 Finished with adding an extra security step to the delete account process 2020-10-20 23:37:27 -07:00
Aaron Sun
e1c670fed0 Renamed xml file for list entry 2020-10-20 22:55:43 -07:00
Aaron Sun
4623718e3a Restructured Forgot Password code similar to that of Sign Up 2020-10-20 20:55:02 -07:00
Aaron Sun
6337422f52 Added Confirm Password to Forgot Password 2020-10-20 20:36:42 -07:00
Aaron Sun
8acf630382 Removed everything except Login and Delete Account buttons in Home/Profile page 2020-10-20 20:07:31 -07:00
Aaron Sun
85f78e3333 Can now display splashscreen when first entering the app v.3 2020-10-09 12:14:44 -07:00
Clayton Wilson
8fa081e4b7 Fix creating list from hamburger menu 2020-10-09 02:15:08 -04:00
NMerz
24554b50dd Revert "Can now display splashscreen when first entering the app v.1"
This reverts commit 61d7c88e1a.
2020-10-09 01:40:55 -04:00
NMerz
0151fa7db2 Revert "Can now display splashscreen when first entering the app v.2"
This reverts commit 55d07f23e8.
2020-10-09 01:40:48 -04:00
Nathan Merz
491e32b07f
Merge pull request #61 from ClaytonWWilson/aaron-branch
Aaron branch
2020-10-09 01:39:41 -04:00
Aaron Sun
55d07f23e8 Can now display splashscreen when first entering the app v.2 2020-10-08 22:37:14 -07:00
43bd0a7fb4
Merge pull request #60 from ClaytonWWilson/layout-improvements
Layout improvements
2020-10-09 01:36:45 -04:00
Aaron Sun
61d7c88e1a Can now display splashscreen when first entering the app v.1 2020-10-08 22:35:38 -07:00
Clayton Wilson
c1a8103da8 Various layout improvements 2020-10-09 01:35:16 -04:00
NMerz
a7ac3d6ec9 Enforce synchronous updates for quanitity
Also added a new delete method to requestor to allow for a receiver.
2020-10-09 01:16:42 -04:00
Aaron Sun
702a83ff85 Can now save quantity after changing it in List v.1 2020-10-08 22:03:45 -07:00
Aaron Sun
23fc181fc0 Removed upper limit for quantity -- not needed 2020-10-08 21:31:43 -07:00
Aaron Sun
e7d2ec333a Implemented Confirm Password and quantity fetching from shopping list v.1 2020-10-08 21:30:08 -07:00
NMerz
f4d1458eb7 Update StatementInjector for missing rsReturns 2020-10-09 00:15:57 -04:00
NMerz
d42013a07e Merge branch 'master' of https://github.com/ClaytonWWilson/Listify 2020-10-09 00:11:56 -04:00
NMerz
86975532bc Merge identical ListEntries
Each productID should have a single list entry
2020-10-09 00:11:44 -04:00
DreamCoder23
7a210f5ac9
Merge pull request #59 from ClaytonWWilson/master
Merge pull request #58 from ClaytonWWilson/aaron-branch
2020-10-08 21:00:43 -07:00
DreamCoder23
a01eb994bb
Merge pull request #58 from ClaytonWWilson/aaron-branch
Aaron branch
2020-10-08 21:00:15 -07:00
Aaron Sun
4680103dd2 Can now display auth error message 2020-10-08 20:59:15 -07:00
DreamCoder23
57ca4dbd85
Merge pull request #57 from ClaytonWWilson/master
Merge pull request #56 from ClaytonWWilson/aaron-branch
2020-10-08 20:15:33 -07:00
DreamCoder23
09735f5ce3
Merge pull request #56 from ClaytonWWilson/aaron-branch
Aaron branch
2020-10-08 20:14:56 -07:00
Aaron Sun
cd1dbf2589 Can now remove items from database 2020-10-08 20:14:25 -07:00
Clayton Wilson
38aea790d8 UserDeleter 'unit tests' 2020-10-08 23:07:53 -04:00
DreamCoder23
1d4704483f
Merge pull request #55 from ClaytonWWilson/master
Merge from master
2020-10-08 19:00:00 -07:00
DreamCoder23
cd13f96be4
Merge pull request #54 from ClaytonWWilson/aaron-branch
Aaron branch
2020-10-08 18:59:27 -07:00
Aaron Sun
725724738e Halfway through removing items from database 2020-10-08 18:58:50 -07:00
NMerz
5cf3a6a647 Allow for deleting an instance of a class 2020-10-08 21:40:09 -04:00