Commit Graph

  • 9a6996d2c1 changed origin main Colin McKechney 2023-05-07 20:39:14 +00:00
  • fbbdfd246c fixed issue with transaction Colin McKechney 2023-05-07 20:26:37 +00:00
  • 7fc27e3337 fixed comma Ava DeCroix 2023-05-07 15:25:08 -04:00
  • c07b0143e7 Update package.json Ava DeCroix 2023-05-07 15:15:34 -04:00
  • 342f0c9501 Merge pull request #9 from ColinMcKechney/backend Colin McKechney 2023-05-07 15:13:47 -04:00
  • f7f00e9364 final commit for backend Colin McKechney 2023-05-07 19:12:58 +00:00
  • 6e1ed08637 Merge pull request #8 from ColinMcKechney/final_ava Ava DeCroix 2023-05-07 15:07:39 -04:00
  • 264d3ff80b made weekly goal daily value but multiplied by 7 in the post - just much more intuitve Ava DeCroix 2023-05-04 18:18:15 -04:00
  • b91b1afa62 Merge pull request #7 from ColinMcKechney/final_ava Ava DeCroix 2023-05-03 14:55:21 -04:00
  • 2c05005ca0 final updates Ava DeCroix 2023-05-03 14:54:45 -04:00
  • 6c30a3e0eb fixed search weirdness and eatery name works now Ava DeCroix 2023-05-02 18:36:04 -04:00
  • 12f16b4145 minor bug fix Colin McKechney 2023-05-02 22:12:31 +00:00
  • c52bc3ce7e add to result and pub plan Colin McKechney 2023-05-02 18:08:03 -04:00
  • e423c9b86f function to send results to plan Ava DeCroix 2023-05-02 18:03:26 -04:00
  • 1517e72833 added 3 new endpoints Colin McKechney 2023-05-02 17:53:33 -04:00
  • 8209f6e505 Merge pull request #6 from ColinMcKechney/AVA Ava DeCroix 2023-05-02 17:23:51 -04:00
  • c2fc10e561 cleanup and comments Ava DeCroix 2023-05-02 17:22:29 -04:00
  • 17f7df6924 latest round of updates Ava DeCroix 2023-05-01 23:01:32 -04:00
  • 370866232a chip colors actually work now Ava DeCroix 2023-05-01 21:13:47 -04:00
  • d762fe343e I'm stupid Ava DeCroix 2023-05-01 19:58:23 -04:00
  • fcd91602c2 chips turn colors according to day now Ava DeCroix 2023-05-01 19:56:44 -04:00
  • c37166eb12 fixed query Colin McKechney 2023-05-01 17:18:49 -04:00
  • 50b5fe53dd added endpoint for plan lookup Colin McKechney 2023-05-01 17:16:12 -04:00
  • a884c45995 chip coloring Ava DeCroix 2023-05-01 15:16:55 -04:00
  • 32053d9ff9 fixed search and added routes for past Ava DeCroix 2023-05-01 14:18:19 -04:00
  • 09a59d77cf Plan progress works now Ava DeCroix 2023-05-01 01:14:08 -04:00
  • 9a362728e3 added sums Colin McKechney 2023-05-01 00:56:41 -04:00
  • d2127218ee lookup on instert into week Colin McKechney 2023-05-01 00:31:39 -04:00
  • 1355ce7b49 changed to vec Colin McKechney 2023-05-01 04:08:18 +00:00
  • 62821f2081 week progress lookup and remove warnings Colin McKechney 2023-04-30 23:43:51 -04:00
  • d4cf4d8e53 merged master into AVA Ava DeCroix 2023-04-30 22:24:19 -04:00
  • 3b541cae0d minor aesthetic changes Ava DeCroix 2023-04-30 22:20:55 -04:00
  • 0b874a712d Merge pull request #5 from ColinMcKechney/yourPlan selinawy06 2023-04-30 22:18:16 -04:00
  • d108441d38 Merge branch 'master' into yourPlan selinawy06 2023-04-30 22:17:54 -04:00
  • b0a484e154 everything up until Selina's merge Ava DeCroix 2023-04-30 22:03:57 -04:00
  • d4ee895b80 menu search complete Colin McKechney 2023-05-01 01:44:41 +00:00
  • 0d1595bf4e can search for food items in on campus locations Sunrise 2023-04-30 21:43:46 -04:00
  • 81574ab905 Tabs, and checkboxes Ava DeCroix 2023-04-30 21:42:04 -04:00
  • d1138c12cf fixed paren Colin McKechney 2023-04-30 21:32:38 -04:00
  • 7c52c2dd0e added menu search Colin McKechney 2023-04-30 21:31:04 -04:00
  • 8ebf0c162c added extra null Colin McKechney 2023-05-01 01:03:29 +00:00
  • 4f6bffaf17 added menu item end Colin McKechney 2023-04-30 20:57:26 -04:00
  • 41cfdb65ae can insert off campus food data to db Sunrise 2023-04-30 20:45:51 -04:00
  • 7dd488d23f added amount Colin McKechney 2023-04-30 20:30:04 -04:00
  • cff79f2cc6 created week endpoint Colin McKechney 2023-04-30 20:26:49 -04:00
  • 509417bc75 added fields to user table Colin McKechney 2023-05-01 00:03:51 +00:00
  • d65d412a11 fixed table creation Colin McKechney 2023-04-30 23:57:07 +00:00
  • b0dce09473 added amount Colin McKechney 2023-04-30 19:48:13 -04:00
  • 159faa8fef beginning week Colin McKechney 2023-04-30 19:46:53 -04:00
  • bbab7882cc fix user table creation Colin McKechney 2023-04-30 19:45:21 -04:00
  • 5f2dc5edc1 table worksgit add -A! sticky headersgit add -A Ava DeCroix 2023-04-30 18:48:02 -04:00
  • 176882d34b added a goal Sunrise 2023-04-30 18:46:45 -04:00
  • 402dcd8efe closing and committing Colin McKechney 2023-04-30 22:46:10 +00:00
  • 5c11b7b463 added date Colin McKechney 2023-04-30 18:41:15 -04:00
  • 443dc0e101 fixed bug with sodium Colin McKechney 2023-04-30 22:35:58 +00:00
  • 0d75f09c57 GOD IT WORKED Ava DeCroix 2023-04-30 18:18:16 -04:00
  • 24ca48fe51 changed to options Colin McKechney 2023-04-30 22:06:09 +00:00
  • f009dd7166 added config + plan Colin McKechney 2023-04-30 17:33:47 -04:00
  • 5117a3318f accounted for null Colin McKechney 2023-04-30 21:03:44 +00:00
  • 19343cb9ab added handlers for off campus items Sunrise 2023-04-30 16:47:43 -04:00
  • ec08c12780 creating response json Colin McKechney 2023-04-30 16:25:57 -04:00
  • 82b4be1ba1 adding menu items Colin McKechney 2023-04-30 16:01:13 -04:00
  • 49a59fde65 Merge branch 'yourPlan' of https://github.com/ColinMcKechney/advanced_db into yourPlan Ava DeCroix 2023-04-30 15:50:08 -04:00
  • 780a66c6b5 added axios post for weekly goal Sunrise 2023-04-30 15:46:16 -04:00
  • 63d175f842 added axios to get menu in Menu Expansion Ava DeCroix 2023-04-30 15:35:02 -04:00
  • 9c52585688 added handlers for weekly goal Sunrise 2023-04-30 15:21:19 -04:00
  • 1b55e2aedd added logo Ava DeCroix 2023-04-30 14:42:40 -04:00
  • fad3f9a859 merge with ? Sunrise 2023-04-30 14:22:06 -04:00
  • e8cfe67228 Merge pull request #4 from ColinMcKechney/revert-3-yourPlan selinawy06 2023-04-30 14:21:13 -04:00
  • 47eed0417b Revert "Your plan" selinawy06 2023-04-30 14:20:49 -04:00
  • 77eb1ffd0b Merge pull request #3 from ColinMcKechney/yourPlan selinawy06 2023-04-30 14:20:10 -04:00
  • ad13624765 before pulling from master Sunrise 2023-04-30 14:15:33 -04:00
  • 7c4494bdbf navigate to menu expansion Ava DeCroix 2023-04-30 14:14:56 -04:00
  • cd1510f573 completed layout of page Sunrise 2023-04-30 01:55:36 -04:00
  • 2dfbf9abbd merged master branch in Sunrise 2023-04-30 00:03:31 -04:00
  • 7c20cb7ebd session variable for eatery from menu Ava DeCroix 2023-04-29 23:31:58 -04:00
  • 55a0634be6 session variable: net_id Sunrise 2023-04-29 23:04:58 -04:00
  • 24c5eb4b5e Updated login stuff plus logout button works now Ava DeCroix 2023-04-29 22:52:09 -04:00
  • 0fdf3e6bed working on page formatting Sunrise 2023-04-29 22:51:57 -04:00
  • c76a63735a added table creation Colin McKechney 2023-04-29 22:10:54 -04:00
  • afca4ad31b added text fields Sunrise 2023-04-29 21:23:55 -04:00
  • 86ecb279de updates Ava DeCroix 2023-04-29 21:19:57 -04:00
  • 7d3a34c3a8 Merge pull request #2 from ColinMcKechney/eateries Ava DeCroix 2023-04-29 17:09:34 -04:00
  • fe9457bf0a plan page has nav bar Ava DeCroix 2023-04-29 17:08:56 -04:00
  • 13a0757bf3 added ui to create account page Ava DeCroix 2023-04-29 16:24:23 -04:00
  • 1e8c00f016 Merge pull request #1 from ColinMcKechney/login Ava DeCroix 2023-04-29 16:16:28 -04:00
  • 6ad72baa5c a bunch of aesthetics and also create user http requests Ava DeCroix 2023-04-29 16:15:28 -04:00
  • 692b46ec06 new pages, some http requests Ava DeCroix 2023-04-29 12:01:45 -04:00
  • cc1c370e56 moved backend into backend directory Colin McKechney 2023-04-28 01:10:08 -04:00
  • 7f1e4a0808 added signup api Colin McKechney 2023-04-28 00:46:47 -04:00
  • 2a47588eb1 failed login results in 401 Colin McKechney 2023-04-28 00:19:45 -04:00
  • e32c1f9492 beginnings of authentication Colin McKechney 2023-04-27 23:59:14 -04:00
  • 940fc164cf Create account page now has form Ava DeCroix 2023-04-27 14:40:49 -04:00
  • 38e5d82a13 links to create account page (empty) Ava DeCroix 2023-04-27 14:30:17 -04:00
  • 3e468738c2 changed default port to 8009 Ava DeCroix 2023-04-27 14:15:37 -04:00
  • 56d6c4adb7 bare bones login Ava DeCroix 2023-04-27 14:05:07 -04:00
  • 3a6b9e9556 very bare bones login Ava DeCroix 2023-04-27 14:02:58 -04:00
  • e5bf43829d added react app Colin McKechney 2023-04-27 17:43:31 +00:00
  • 57563c6968 moved security files to separate module Colin McKechney 2023-04-27 17:34:08 +00:00
  • 54b4a30f90 basic web server functionality Colin McKechney 2023-04-27 01:46:34 -04:00