t

[33mcommit a6b0d81d0539dfa3f2544cc777dfaec0f0dd66d6[m[33m ([m[1;32mmaster[m[33m)[m
Merge: 39a8020 ca29983
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue Jun 14 18:49:28 2022 -0400

    Merge branch 'master' of github.com:MarlAndre/food-4-all

[33mcommit ca299835b40362ab330d26d08631c9442ba9ee73[m[33m ([m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m
Merge: 4d09236 f6545df
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Tue Jun 14 18:49:00 2022 -0400

    Merge pull request #109 from MarlAndre/card-index
    
    Card index

[33mcommit 39a8020ccae69eee0e1cb200aee2cb4d64af38da[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue Jun 14 18:45:51 2022 -0400

    added back items controller

[33mcommit f6545df8a0f3ff01f7cc5fe4c36998c7fbf2d83f[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue Jun 14 18:34:43 2022 -0400

    applied same changes to my favorites. Might be issue with donated or reserved

[33mcommit 4d092369bbd7da2dfde81556f23149457af38331[m
Merge: 91f5b90 8b1b366
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Tue Jun 14 18:08:26 2022 -0400

    Merge pull request #108 from MarlAndre/show-margin-bottom
    
    added the same margin-top/bottom for the last div

[33mcommit 91f5b904e31ee61e8af2a89634419189d0e0e45d[m
Merge: 69be7ee c535a9d
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Tue Jun 14 18:07:49 2022 -0400

    Merge pull request #107 from MarlAndre/requests-show-img
    
    Requests show img

[33mcommit 69be7eedc71c0596bac6e10f776633b611069aa1[m
Merge: f4b6223 e4aedd4
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Tue Jun 14 18:07:08 2022 -0400

    Merge pull request #102 from MarlAndre/messages-item-img
    
    item seed img and dynamic item img in messages

[33mcommit c3addff4d96235d80d6a1d5781f5dcc811fa716a[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue Jun 14 18:04:31 2022 -0400

    km is now bold

[33mcommit 11405673ab4ae1e1f4e417bbba9f5ebbbcb5dfd7[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue Jun 14 18:02:22 2022 -0400

    changed styling of the card to put km and address on the same line

[33mcommit f4b622374f0b2ae82d67c735ccd981c765822efe[m
Merge: 965fd6c 462433f
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Tue Jun 14 17:50:51 2022 -0400

    Merge pull request #105 from MarlAndre/fix/items-index-postal-code-popup
    
    Fix/items index postal code popup

[33mcommit 462433fcae63eb58452059b25751a67e31de9122[m
Author: nicolas fraisse <ni.fraisse@gmail.com>
Date:   Tue Jun 14 17:09:02 2022 -0400

    Fix distances

[33mcommit 8b1b366aa1e121540b97b6962c195b83a3f79067[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue Jun 14 16:14:31 2022 -0400

    added the same margin-top/bottom for the last div

[33mcommit 965fd6cea05de4af0adccbcc66c40152b693b92d[m
Merge: 8146265 1b24bf8
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Tue Jun 14 16:11:48 2022 -0400

    Merge pull request #106 from MarlAndre/status-item
    
    Status item

[33mcommit c535a9d6733c151992440e003c6ef30ba5dca816[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue Jun 14 16:01:53 2022 -0400

    resized the item img like other pages

[33mcommit 1b24bf8fb440493ddd9437a6f516abb2c17df35d[m
Merge: ad5e1dc 8146265
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue Jun 14 16:00:53 2022 -0400

    Merge branch 'master' into status-item

[33mcommit 71791ba04f45d9de8cdcb919b74ab9d235a23dbe[m
Merge: 8146265 e4aedd4
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue Jun 14 16:00:48 2022 -0400

    Merge branch 'messages-item-img' into requests-show-img

[33mcommit ad5e1dc3eef92ce3cddc5ad6a1e9aacf14bceb74[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue Jun 14 16:00:34 2022 -0400

    added opacity for the item status and moved it at the bottom of the picture

[33mcommit 8146265c89d05e90054d66a2784c8a2f136e075a[m
Merge: d569567 82ca353
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Tue Jun 14 15:50:11 2022 -0400

    Merge pull request #104 from MarlAndre/move-back-btn
    
    moved back button underneath logo, changed cauliflower picture

[33mcommit e4aedd400a317ce8284cd84da67b3674ea7061ea[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue Jun 14 15:46:21 2022 -0400

    added margin bottom of request card

[33mcommit 97e5f8616f33448e9afa8423fc021d096d20404b[m
Author: nicolas fraisse <ni.fraisse@gmail.com>
Date:   Tue Jun 14 15:42:00 2022 -0400

    Display none by default

[33mcommit 33de250641a5a9543a07cfb753371890e693f6b5[m
Author: nicolas fraisse <ni.fraisse@gmail.com>
Date:   Tue Jun 14 15:41:01 2022 -0400

    Fix items page postal code popup behavior

[33mcommit d569567a9ced909ae569058fec37dc9ffff97b0e[m
Merge: 66bc41f c0a3caa
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Tue Jun 14 14:00:58 2022 -0400

    Merge pull request #103 from MarlAndre/item-cards-img
    
    wrapped img by a div

[33mcommit 82ca35315c78f8e0912ecf5e9c39f814bf713733[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue Jun 14 12:37:16 2022 -0400

    small change, i changed wording from best before to expired on on show page

[33mcommit c0a3caa7e8a3242427d5551c2a168c8956e83c56[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue Jun 14 12:30:37 2022 -0400

    fixed the same in my favorites, my items and my profile pages

[33mcommit c09c2748bebcf93c2011ee285f65070f98042ffa[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue Jun 14 12:28:41 2022 -0400

    moved back button underneath logo, changed cauliflower picture

[33mcommit 8f3af00672950ee386a97e85dac2ec982f894eb8[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue Jun 14 12:17:52 2022 -0400

    wrapped img by a div

[33mcommit 27515249161e3f0f9539e816789094bb920833da[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue Jun 14 12:03:03 2022 -0400

    item seed img and dynamic item img in messages

[33mcommit 66bc41f7b8dcdff8f9f81bac9fe16730dc9ebb37[m
Merge: 470d29e f55ce65
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Tue Jun 14 10:48:25 2022 -0400

    Merge pull request #101 from MarlAndre/back-button
    
    added back button on every pages : show, new, messages and my favorites

[33mcommit 470d29effd7eea2f3a7a1b17c7fca2c504ab5269[m
Merge: 171eae4 00eaade
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Tue Jun 14 10:42:12 2022 -0400

    Merge pull request #92 from MarlAndre/styling-index
    
    Styling index

[33mcommit f55ce650619d0636af1cfc79dc55fd8858beaa30[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue Jun 14 08:08:31 2022 -0400

    added back button on every pages : show, new, messages and my favorites

[33mcommit 00eaadee6713205c14972ec4fb6864cf009a94bb[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue Jun 14 07:38:15 2022 -0400

    added warning sign on markers and show page

[33mcommit 171eae4d5cac12bf5d9e1a42c08a608f8dcc67a9[m
Merge: eb019c5 d06d801
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue Jun 14 07:28:31 2022 -0400

    Merge pull request #100 from MarlAndre/margin-bottom
    
    index and show pages

[33mcommit d06d801f65d160d7bde06d78f4b0f229e819b939[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Mon Jun 13 12:12:20 2022 -0400

    index and show pages

[33mcommit eb019c512c8fe23eb3e73ad4ce19e5c46613b2ef[m
Merge: 3a49f17 b62513c
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Mon Jun 13 07:00:10 2022 -0400

    Merge pull request #99 from MarlAndre/user-img
    
    udpated user images in cards

[33mcommit 3a49f1796fa205965eeb868bb596cdd509509ab7[m
Merge: 8f2720f 706e3cf
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Mon Jun 13 06:59:15 2022 -0400

    Merge pull request #98 from MarlAndre/best-before
    
    suggested wording change

[33mcommit 8f2720f473eac037e248688fb7b16a08178a696b[m
Merge: c141f12 a07cd01
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Mon Jun 13 06:57:56 2022 -0400

    Merge pull request #97 from MarlAndre/card-truncate
    
    make item description shorter in cards

[33mcommit c141f127a9ffcb45401bb4b85e07b77f491006cb[m
Merge: 9e78dbc c8ef5e5
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Mon Jun 13 06:56:27 2022 -0400

    Merge pull request #96 from MarlAndre/form-validations
    
    added new item form validations

[33mcommit b62513cec28ff16062c3ec20ac5ae38e100b0e4b[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun Jun 12 18:46:44 2022 -0400

    udpated user images in cards

[33mcommit 706e3cf52032050ac0646e0385ec2bab56484fc0[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun Jun 12 18:33:03 2022 -0400

    suggested wording change

[33mcommit a07cd01c0269e0a76a6fdc825471e66b6aeb735c[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun Jun 12 18:20:58 2022 -0400

    further truncated item description looking in mobile view

[33mcommit 69765052c682f669c114a48c6fbf404290b5ecbd[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun Jun 12 18:09:29 2022 -0400

    make item description shorter in cards

[33mcommit 9e78dbc3d37c1781c43264673bda1fd632ce2a62[m
Merge: 9567c8a e6265ab
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Sun Jun 12 18:04:45 2022 -0400

    Merge pull request #95 from MarlAndre/update-seed-for-demo
    
    Update seed for demo

[33mcommit 9567c8ab9eaf074d3a67dc562a78e92bd17b0e27[m
Merge: c5f95fb 3dca106
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Sun Jun 12 17:50:51 2022 -0400

    Merge pull request #94 from MarlAndre/add-distance-to-favorites
    
    Add distance to favorites

[33mcommit c8ef5e5b90476934205f65abceac8652cf7f6696[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun Jun 12 17:38:40 2022 -0400

    added new item form validations

[33mcommit e6265ab63169cc542be3c3cd50e666f79d45f214[m[33m ([m[1;31morigin/update-seed-for-demo[m[33m)[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sun Jun 12 14:18:23 2022 -0400

    changed order of ingredients.json

[33mcommit 913baa4c048a9ebb7ebdaf311146e37536e54235[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sun Jun 12 14:07:02 2022 -0400

    added better ingredient descriptions and changed seed

[33mcommit 3dca106f2cceb7abca4ca434830198784891382b[m[33m ([m[1;31morigin/add-distance-to-favorites[m[33m)[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sun Jun 12 12:23:33 2022 -0400

    fixed method that was breaking

[33mcommit 220801291863782c608684b5171b012b6e43beaf[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sun Jun 12 12:21:26 2022 -0400

    fixed comments

[33mcommit 9516d521e2150e79d943b1d8dd260c3e70d794d1[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sun Jun 12 12:20:23 2022 -0400

    tweaked method

[33mcommit 6658d459ea6adcaee0f3f46dac5176106d079606[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sun Jun 12 12:18:30 2022 -0400

    added distance to favorites

[33mcommit 17df0bb862781863775a5519ce2e4e9c42c9cda9[m
Merge: 5501c60 c5f95fb
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sun Jun 12 11:22:11 2022 -0400

    Merge branch 'master' into update-seed-for-demo

[33mcommit c5f95fb4e49c6ad9d15272cbab521d23c862ed5c[m
Merge: de062bd d02f984
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Sun Jun 12 11:17:27 2022 -0400

    Merge pull request #88 from MarlAndre/fix-favs
    
    fixed toggle effect of fav icon

[33mcommit de062bdc7c80e17f3fe2e0bef8bedaf88b21caff[m
Merge: 9e2d1aa faca8ec
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Sun Jun 12 11:14:54 2022 -0400

    Merge pull request #93 from MarlAndre/card-colors-status
    
    Card colors status

[33mcommit 5501c604afea1e237aede9f0bfae54b042f971dd[m
Merge: bd019c4 9e2d1aa
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sun Jun 12 11:07:48 2022 -0400

    Merge branch 'master' into update-seed-for-demo

[33mcommit faca8ec7dd2bba297f59c14ee49fc67d5b9e8fb2[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 11 23:59:47 2022 -0400

    wording

[33mcommit 5a2f26d7ca9f76dbef72cef0a901cd16545de4c8[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 11 23:32:56 2022 -0400

    added same logic to my fav items and requested item

[33mcommit 78ada20cd434ad338b6f9a2c08d2a77747df5331[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 11 23:23:25 2022 -0400

    index cards to change color based on donated/reserved status

[33mcommit 9b2d8c7b35fd2854d234a1bd8d6592d20ef9e9f2[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 11 23:04:02 2022 -0400

    message card changes color based on item.status

[33mcommit d02f984f2d9748e99a977af585ee379d3cc570dc[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 11 17:50:31 2022 -0400

    change icon to red color

[33mcommit d69a365811e940ff5834d133084215d255b00b5b[m[33m ([m[1;31morigin/styling-index[m[33m)[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 17:39:11 2022 -0400

    changed range back to 5km

[33mcommit 9e2d1aab16cd78c421e6d2b33dd923ad2cc5d3d9[m
Merge: f7c751f 3485a55
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 17:34:46 2022 -0400

    Merge pull request #91 from MarlAndre/add-item-button
    
    changed wording of the button in new item form as discussed

[33mcommit f7c751f5d027fdf51b1b33dc5991fa9d2c6dcca3[m
Merge: 743d1eb b690722
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 17:34:33 2022 -0400

    Merge pull request #90 from MarlAndre/higher-navbar
    
    making the navbar just a little taller

[33mcommit 743d1eb936580d194a58aad5f1f1149015717187[m
Merge: 25ec971 7cac9a1
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 17:34:22 2022 -0400

    Merge pull request #89 from MarlAndre/pg_search
    
    add item_type into search filter

[33mcommit 4004732e0816de7e368c6a2574c75eac9b327861[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 17:30:05 2022 -0400

    changed icon

[33mcommit 3485a55642403569944032ae183579d5069a211f[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 11 17:28:16 2022 -0400

    changed wording of the button in new item form as discussed

[33mcommit b6907225a12bfa2e12fe873862a438adc03fb1cf[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 11 16:59:36 2022 -0400

    making the navbar just a little taller

[33mcommit bd019c4a1932a33af2079104d3abe1d809f7984f[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 11 16:54:46 2022 -0400

    added photo

[33mcommit 7cac9a1b9cb0576138b6a4e2eead1e1d90e2d16f[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 11 16:49:11 2022 -0400

    add item_type into search filter

[33mcommit da1c119e7fc15911790564a0722271cbb51d2b9d[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 11 16:47:21 2022 -0400

    added sugar image

[33mcommit cf529e389ea441d1d557091bba6b6a49932df467[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 11 16:29:16 2022 -0400

    fixed toggle effect of fav icon

[33mcommit 65067f0b6ad22f8337861fda7f876b9732f13cff[m
Merge: ba339a3 25ec971
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 16:25:00 2022 -0400

    Merge branch 'master' into styling-index

[33mcommit ba339a31f99ba85dadbccb63c32de792509036d9[m
Merge: d2f57b2 a8d7152
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 16:24:35 2022 -0400

    added icons on show

[33mcommit 25ec971154c52dbba632c69085225aff0d8b505a[m
Merge: 04fd57a 1c9d3e7
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Sat Jun 11 16:23:32 2022 -0400

    Merge pull request #85 from MarlAndre/styling-landing
    
    my changes has not been saved, here is the landing page

[33mcommit 04fd57a6f72b0de86b39a8b65856007745549ec8[m
Merge: a8d7152 c59d21d
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 16:23:27 2022 -0400

    Merge pull request #87 from MarlAndre/change-my-profile
    
    Change my profile

[33mcommit d2f57b2d01f4f301fd6a47af55f40853a636bc20[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 16:07:15 2022 -0400

    added icon on show and fixed image on index

[33mcommit e8a930973771b88df53d7183a29dd93a1b46541f[m
Merge: b5991c9 b03c2e6
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 15:56:35 2022 -0400

    Merge branch 'master' into styling-index

[33mcommit b5991c9ef754871959c754d758b33a8bcb76d6bf[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 15:49:16 2022 -0400

    fixed overflow on map

[33mcommit c59d21d248659eca180d7ab12e8565b24bdb55b4[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 11 15:19:35 2022 -0400

    added space after private

[33mcommit 04f20c55187c6cef90843b904793091cf11c457c[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 11 15:17:44 2022 -0400

    removed comment

[33mcommit 320d08699574b3cfa5721eba2f23113fb202e095[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 11 15:14:38 2022 -0400

    deleted my custom method since Geocoder has it

[33mcommit 457d04e08f440114d8ce1e626c53916e27bdf284[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 11 15:13:07 2022 -0400

    uncommented a method used for messages

[33mcommit 28bc83098b457f1ea3b8de48613d98b66c443e31[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 11 15:06:31 2022 -0400

    finished final touches

[33mcommit a8d7152a96e754b9e63b9371ef40e393a4cffa89[m[33m ([m[1;31morigin/change-status[m[33m)[m
Merge: b03c2e6 179e9eb
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 14:59:23 2022 -0400

    Merge pull request #86 from MarlAndre/branding
    
    branding in each page

[33mcommit 4ae189ae77675e4504e744c8adda5b2f2bee253b[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 11 14:58:37 2022 -0400

    added distance on cards

[33mcommit 179e9eb907b1d4ae010519b6c37f0d8105459466[m
Author: Williams <valerow@outlook.com>
Date:   Sat Jun 11 14:54:11 2022 -0400

    branding in each page

[33mcommit 1c9d3e7814e06aa6602dbbcbb9b1006a7e1a1bd3[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 14:41:27 2022 -0400

    my changes has not been saved, here is the landing page

[33mcommit b03c2e631ad9ccafd96e5c8888b73e97d3599df2[m
Merge: fd9aa8e 3803ed3
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Sat Jun 11 14:35:34 2022 -0400

    Merge pull request #84 from MarlAndre/postal-landing
    
    fixed landing

[33mcommit 3803ed32050463e1a38ed4dae4b05e384eef534f[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 14:34:56 2022 -0400

    changed modal popup

[33mcommit 29d48da021d4930bb902da18cc3933b4ccdce858[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 14:33:37 2022 -0400

    changed validation back

[33mcommit 0ed9dc192da1ec952708877882bd05c9de3e55d7[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 11 14:28:17 2022 -0400

    centerd my-items button

[33mcommit 9e65fa54806b4d17527cf0d83944800ac5972cc7[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 14:27:55 2022 -0400

    changing controller back to normal

[33mcommit a8caa045f6278d992566c45481b7809b667dcb96[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 14:27:00 2022 -0400

    changing index page back to normal

[33mcommit 4926b305b318743aa27243bd131c1f19a88fe07f[m
Merge: 3eff8f7 5433481
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 14:14:55 2022 -0400

    put the photo validation back

[33mcommit 3eff8f7220ebae8483acf55255da2d340427a2d2[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 14:13:20 2022 -0400

    put the photo validation back

[33mcommit c740d0929ccbc6ee16a3bf5e1cb2fd93935a0066[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 14:02:23 2022 -0400

    trying to fix the issue with fetching real items close to location

[33mcommit ad8df95e020bb9ca24ecf7ec2550cf9426b73761[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 11 13:59:06 2022 -0400

    finally was able to add items to profile

[33mcommit 3cc6b29313d6d92250c26e3c63a9194ea0819d40[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 11 13:26:21 2022 -0400

    saving my work, stuck on something

[33mcommit cee13eddd2698a2fbf1f1e7139c58e19fa5f3376[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 11 11:51:25 2022 -0400

    removed buttons from profile, moved chat info to my profile

[33mcommit 5433481143de2b56c489f42dc57d810f8ca63608[m
Merge: aa28307 fd9aa8e
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 11:48:49 2022 -0400

    Merge branch 'master' into postal-landing

[33mcommit fd9aa8e8e15e233b551a66dda568cf3dcc9dc684[m
Merge: c2c6f31 9a9dc30
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 11:48:01 2022 -0400

    Merge pull request #83 from MarlAndre/new-item-form
    
    New item form

[33mcommit aa283079c0ebe0930774c8a2d03d989435ae311b[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 11:46:52 2022 -0400

    fixed landing

[33mcommit 9a9dc30611f39376cfe3d57732fd20c1bbc5c931[m
Merge: f58194b c2c6f31
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 11 11:39:16 2022 -0400

    Merge branch 'master' of github.com:MarlAndre/food-4-all

[33mcommit f58194b613ff3ea7fab207f3447727550705c0e0[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 11 11:37:43 2022 -0400

    change wording of the button in new item form

[33mcommit c2c6f31c67993b9c50ac32ba90672efb615581a5[m
Merge: 982d749 7b54b36
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Sat Jun 11 11:32:46 2022 -0400

    Merge pull request #82 from MarlAndre/fix-seed-with-photo-issues
    
    fixed issues where seed file would crash

[33mcommit 982d749dc08ecf462beb06d20786e37ca4d44f83[m
Merge: 2627bba b3ec417
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Sat Jun 11 11:31:28 2022 -0400

    Merge pull request #81 from MarlAndre/navbar
    
    remove border-radius in navbar

[33mcommit 7b54b36a2613e126363a0fd14c8f3198e074dfbc[m[33m ([m[1;31morigin/fix-seed-with-photo-issues[m[33m)[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 11 11:29:25 2022 -0400

    fixed issues where seed file would crash

[33mcommit b3ec41701d9179ecb7b3c6cda49bccf1e20783ae[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 11 11:19:37 2022 -0400

    remove border-radius in navbar

[33mcommit 2627bbabf4762be701c3b5a044def51768042303[m
Merge: 1a7a937 afbe5e1
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 11:18:59 2022 -0400

    Merge pull request #80 from MarlAndre/fix-item-validation
    
    small fix, adds photos validation and fixes item_status conflict

[33mcommit 1a7a937f02b470081237677edf9aeb5b79882d86[m
Merge: e4d6977 c6ebaab
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 11:18:47 2022 -0400

    Merge pull request #78 from MarlAndre/heart-icon
    
    changed heart icon to outline heart icon in navbar

[33mcommit afbe5e1c648458935ab45c7f1b92fd0bf9513c03[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 11 11:16:34 2022 -0400

    small fix, adds photos valivadtion and fixes item_status conflict with seed

[33mcommit e4d6977993489cfb6a2abca94ba8e52897b75c20[m
Merge: 73477c6 9148238
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Sat Jun 11 10:43:00 2022 -0400

    Merge pull request #79 from MarlAndre/fixing-issue-landing
    
    fixed issue

[33mcommit 91482380a06b68fd05d3d2463d73560717ce8356[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 10:42:20 2022 -0400

    fixed issue

[33mcommit c6ebaabf8437adce8aefd05cd8f8f97b66d07901[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 11 10:38:03 2022 -0400

    changed heart icon to outline heart icon in navbar

[33mcommit 73477c6b87fc6a09e67eb01dffb08eca44eb13b2[m
Merge: 7adf163 e0ec0f9
Author: Williams <valerow@outlook.com>
Date:   Sat Jun 11 10:36:36 2022 -0400

    Merge pull request #77 from MarlAndre/styling-show
    
    Styling show

[33mcommit 7adf1634939630c15ccd7230b5aedc4119076cb2[m
Merge: 7e5515f 8c7bcaa
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Sat Jun 11 10:36:07 2022 -0400

    Merge pull request #74 from MarlAndre/postal-dode-landing
    
    changed behaviours of the landing screen, it is now a popup

[33mcommit e0ec0f96d12f36b9df4e1da2fe63b87e8c8a2251[m
Merge: c5975f8 7e5515f
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 10:31:34 2022 -0400

    Merge branch 'master' into styling-show

[33mcommit 7e5515f8fd32fa45292016f96e6ca011428fcefa[m
Merge: 25483d0 249abd5
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 10:30:31 2022 -0400

    Merge pull request #76 from MarlAndre/change-status
    
    Change status

[33mcommit 249abd52bfbc928bdece4bf8064f207d8e7a5740[m
Merge: 3d37183 25483d0
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Sat Jun 11 10:30:04 2022 -0400

    Merge branch 'master' into change-status

[33mcommit c5975f852d8a96abeb117e0da090ab2dee9ce1b0[m
Merge: 608148d 25483d0
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 10:29:19 2022 -0400

    Merge branch 'master' into styling-show

[33mcommit 3d371836347b89bbf18586690dc1c55dd841f21a[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 11 10:29:12 2022 -0400

    removed raise

[33mcommit 8c7bcaab9ce540cfdea3ae5581203c33ef280cfb[m[33m ([m[1;31morigin/postal-dode-landing[m[33m)[m
Merge: 1f6d409 25483d0
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 10:07:20 2022 -0400

    Merge branch 'master' into postal-dode-landing

[33mcommit 608148df56c8dc8cfe80300ec071a5d2eb9d63f9[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 10:01:48 2022 -0400

    merged last master to avoid conflicts

[33mcommit 25483d08b5281bf72605088654a58e7a1ada55a3[m
Merge: 8475be0 5ce9ae6
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 11 09:50:55 2022 -0400

    Merge pull request #75 from MarlAndre/new-item
    
    New item

[33mcommit ccad4bb725806f8bd30b436b9daafac0b1f9a15b[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri Jun 10 23:19:08 2022 -0400

    removed wrong class

[33mcommit 8c47e35954e559629b3b69029708ff820323d6bf[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri Jun 10 23:10:29 2022 -0400

    added back css class for the green border

[33mcommit 36c1be92843891a655cf45154057943ee7cdefce[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri Jun 10 23:04:32 2022 -0400

    remove wrong css classes

[33mcommit 2b1831e5a4be05814be7ddfa87577f9a88ef32b2[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri Jun 10 23:03:16 2022 -0400

    remove test pic

[33mcommit bc8a91656607551bd62825311453395fe9d2f14f[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri Jun 10 23:02:23 2022 -0400

    my-items page with heading and change status button

[33mcommit 4a12087c4357fa39a678d4bb7c9ec2037ced2efc[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri Jun 10 22:44:27 2022 -0400

    added change status form in my-items page

[33mcommit 5ce9ae6482c5ecc0ba3be591da3feb97ef2c2675[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri Jun 10 19:03:06 2022 -0400

    params permit

[33mcommit d2050b40c7953edbbc85ca08800ebfdf01b55851[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri Jun 10 19:01:33 2022 -0400

    merged master

[33mcommit 44f7c978bed4390d2ccf57f21cc40aea4d932d9c[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri Jun 10 18:55:53 2022 -0400

    item create form

[33mcommit 6e6619346f58ce56830a2d6fb3394982bcb6b331[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Thu Jun 9 23:29:08 2022 -0400

    changed the add new item form because it was too small on iphone screen, added back icon too

[33mcommit 4443920c28988e52dda060a3443b7cf288fd619f[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Thu Jun 9 23:21:26 2022 -0400

    fixed navbar issue, moved back button to the top and put an icon, changed styling of the card

[33mcommit ea5ceb1cb19ac8ea77552831f83769ed88b74f4e[m
Merge: 51e17f1 8475be0
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu Jun 9 22:47:41 2022 -0400

    Merge branch 'master' of github.com:MarlAndre/food-4-all

[33mcommit 32b91c2b9505b92130c005d472a82e5d12ffbfce[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu Jun 9 22:40:42 2022 -0400

    form association added in

[33mcommit cd6cddc22a82aaa3b2daa132a72483e9f75c342f[m
Merge: cba9c8c 8475be0
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Thu Jun 9 22:09:59 2022 -0400

    Merge branch 'master' into styling-show

[33mcommit 8475be0eaab08a8fbbd74d0291c39e2f1837ccdd[m[33m ([m[1;31morigin/psotal-code-index[m[33m)[m
Merge: 0daf9e2 2deedc7
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Thu Jun 9 21:33:18 2022 -0400

    Merge pull request #73 from MarlAndre/add-image-to-spaghetti
    
    added photo during seed for shaynas meal

[33mcommit 1f6d4092e6b5db48e11d113f3b5df66a91e1ca05[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Thu Jun 9 21:27:21 2022 -0400

    changed behaviours of the landing screen, it is now a popup

[33mcommit 0daf9e2d25e5b7b7e30b28a94ccc319ea8e877df[m
Merge: b4e4ba6 17919a9
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Thu Jun 9 21:06:33 2022 -0400

    Merge pull request #72 from MarlAndre/object_fit_for_index_pictures
    
    changed object-fit from contain to cover

[33mcommit b4e4ba6f41c4fc979efd1e2786e13b4bebd71e88[m
Merge: bf062b1 aedc032
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Thu Jun 9 21:05:51 2022 -0400

    Merge pull request #71 from MarlAndre/add-distance-to-messages
    
    adds distance to chat

[33mcommit 2deedc7db06f26ef47a583d76b37ac0ff3df980e[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu Jun 9 21:04:43 2022 -0400

    added photo during seed for shaynas meal

[33mcommit aedc032958dae54dc918560202e5fb845dee7578[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu Jun 9 20:57:35 2022 -0400

    removed unecessary method

[33mcommit b8644f0acc54ce3ba6dca6c4ba2946c89e11d2f7[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu Jun 9 20:55:42 2022 -0400

    adds distance to chat

[33mcommit 51e17f1e0d53f223e66bbc8c4bb30b4911f2b804[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu Jun 9 20:52:43 2022 -0400

    image

[33mcommit 17919a9e646831cf951e920a360e5e7fc69bbf72[m
Author: Williams <valerow@outlook.com>
Date:   Thu Jun 9 20:45:45 2022 -0400

    changed object-fit from contain to cover

[33mcommit cba9c8c4ac50fd74fc5e94e919bfdb5eb8119cf8[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Thu Jun 9 20:17:33 2022 -0400

    trying to fix styling issue

[33mcommit bf062b1c2702263731e94e55569fcf7a459b673b[m
Merge: d8a9c14 94e7dd2
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Thu Jun 9 20:17:24 2022 -0400

    Merge pull request #70 from MarlAndre/ingredient-pictures
    
    The picture of the ingredients have been added

[33mcommit 94e7dd2a977511088005160cfefdea7ab3791c4e[m[33m ([m[1;31morigin/ingredient-pictures[m[33m)[m
Author: Williams <valerow@outlook.com>
Date:   Thu Jun 9 20:16:09 2022 -0400

    revised db/schema for line 122 added null: false

[33mcommit 49e95843fcdc217fcce398299ae41688f5a4964e[m
Author: Williams <valerow@outlook.com>
Date:   Thu Jun 9 20:10:53 2022 -0400

    revised message and message_test request_id :bigint from empty to not null

[33mcommit 9dbd29da0da3956878b0ae73caf136e306dd86b3[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu Jun 9 20:08:27 2022 -0400

    form styling

[33mcommit 9465a770409fc2d1deb42af52a3df45c34676996[m
Author: Williams <valerow@outlook.com>
Date:   Thu Jun 9 20:01:51 2022 -0400

    The picture of the ingredients have been added

[33mcommit d8a9c14046014e72a9563024dcb12d3eac577b37[m
Merge: b69d1a7 0538e4f
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Thu Jun 9 19:19:28 2022 -0400

    Merge pull request #69 from MarlAndre/psotal-code-index
    
    removed postal container from index

[33mcommit 0538e4fd5ca8251d3b4ad8c43c8b8194b64f241b[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Thu Jun 9 19:17:26 2022 -0400

    removed postal container from index

[33mcommit b69d1a74b58475feb4d0f83b96ead5298d712cc7[m
Merge: a5c4175 ff2c0b9
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Thu Jun 9 19:11:30 2022 -0400

    Merge pull request #65 from MarlAndre/index-page-link
    
    Index page link

[33mcommit a5c41750217fda8da6e55caf0b1d6f88ec46bcf0[m
Merge: bf78679 ac09abb
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Thu Jun 9 19:07:32 2022 -0400

    Merge pull request #64 from MarlAndre/landing-page
    
    Landing page

[33mcommit ac09abbb17c8a6c5b9437159ed7a721f93c75ef5[m
Merge: 6498bbb bf78679
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Thu Jun 9 19:06:59 2022 -0400

    Merge branch 'master' into landing-page

[33mcommit ff2c0b90c788af1fbb1a191dff6884943b56c633[m
Merge: a477e35 1613e7e
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Thu Jun 9 19:06:53 2022 -0400

    Merge branch 'index-page-link' of github.com:MarlAndre/food-4-all into index-page-link

[33mcommit a477e35466c364d349008dc1d5b83ad3abcc762f[m
Merge: 4274aa0 bf78679
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Thu Jun 9 19:05:01 2022 -0400

    fixed merging conflict

[33mcommit 6498bbbe6082606199444265d91334091b400459[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Thu Jun 9 19:01:36 2022 -0400

    added some styling

[33mcommit 1613e7eeb00106a083827510d7cc0c89493bdbc8[m
Merge: 4274aa0 bf78679
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Thu Jun 9 18:52:15 2022 -0400

    Merge branch 'master' into index-page-link

[33mcommit bf78679ebe6f9682c6050b8ecbb3f03b4e987360[m
Merge: 4694f96 9ff5572
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Thu Jun 9 18:49:55 2022 -0400

    Merge pull request #68 from MarlAndre/geocoder-add-distance
    
    Geocoder add distance

[33mcommit 9ff5572f88716b4b089bf129b1f7d7db774dbabd[m[33m ([m[1;31morigin/geocoder-add-distance[m[33m)[m
Merge: d16bd72 4694f96
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu Jun 9 18:17:04 2022 -0400

    Merge branch 'master' into geocoder-add-distance

[33mcommit d16bd720a0b1e7cb1cffb3f50db3975aadd9b758[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu Jun 9 18:13:45 2022 -0400

    fixed long loading issue with index

[33mcommit 01eedfed7162b7ceda5d7eb475edf57d1f1f44b0[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu Jun 9 18:02:58 2022 -0400

    added allergens and diets

[33mcommit 7dc4a302f816b4870412375021d008a7800ee77c[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu Jun 9 17:38:21 2022 -0400

    saving work, pushing to work on my laptop

[33mcommit 669b13da2f9552e167ad632949c45273d99074a8[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu Jun 9 15:28:11 2022 -0400

    padding

[33mcommit 8a8cd47b1bf682874d283337c178d4cba15b2300[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu Jun 9 14:47:24 2022 -0400

    form

[33mcommit 4e9d89a1b65c30fba6e20082157793347a6b98ba[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu Jun 9 12:18:56 2022 -0400

    item new form edit

[33mcommit 1c8f0bb11fdab9ab76c52e27c40f7486be1c3e32[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Wed Jun 8 20:44:21 2022 -0400

    trying to fix json

[33mcommit 4694f968c3694c9c0d7458aef98a5553239efad9[m
Merge: 77bcb14 c3dfd0c
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Wed Jun 8 20:24:47 2022 -0400

    Merge pull request #62 from MarlAndre/chatroom-messages
    
    Chatroom messages

[33mcommit c3dfd0cd03d005876cadbe098c0c54ff30cb0d36[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 8 20:04:47 2022 -0400

    re-styling as requested

[33mcommit 157f71c6a77c7d6478e702153bc395f449ff078a[m
Merge: b5480c6 77bcb14
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 8 19:56:00 2022 -0400

    Merge branch 'master' into chatroom-messages

[33mcommit 77bcb1423630783602b0bd6df1c8bc4aae1576aa[m
Merge: fd60839 0f37876
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Wed Jun 8 12:35:00 2022 -0400

    Merge pull request #66 from MarlAndre/nav-link
    
    changed icon

[33mcommit 0f378768fe108c47dbd6b1a7d15d929951a7a559[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 8 12:31:13 2022 -0400

    changed heart icon

[33mcommit fd608397d9b11712d1133630cd94020591117760[m
Merge: c0f7a01 4e75f5e
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Wed Jun 8 12:23:11 2022 -0400

    Merge pull request #67 from MarlAndre/my-profile
    
    logout link in my profile page

[33mcommit 4e75f5e76af0e53d108c05694b17acd56860839d[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 8 12:02:32 2022 -0400

    logout link in my profile page

[33mcommit b5480c62914cd0a5aad92b8172c2681552f0fa12[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 8 11:18:09 2022 -0400

    change item details

[33mcommit 15a6480d719519bb39b782aa2459971bd8254f5a[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 8 11:11:54 2022 -0400

    changed icon

[33mcommit f4eabc7fe5902c4ce41af4a448878e07ba4eb77d[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 8 10:44:31 2022 -0400

    padding

[33mcommit db3b43fd1a699f7b4a412d2b8851491247950c5d[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 8 10:36:43 2022 -0400

    font size

[33mcommit 2b990f8c68d9434bc7d55172852648920fe08f29[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 8 10:27:30 2022 -0400

    amended item details

[33mcommit 4274aa07282347e0c1de84fc51d273ab7f33ae6c[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Wed Jun 8 10:19:10 2022 -0400

    changed default icon in browser tab

[33mcommit c55170489fa15c172619d8321c460870259247ed[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Wed Jun 8 10:16:35 2022 -0400

    changing map markers

[33mcommit d76ed5de291679ea6a31216fec453b55821da3ee[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Wed Jun 8 09:00:08 2022 -0400

    fixed styling conflicts between tabs on index and my-items page

[33mcommit d8f83d2950cf6e2f15c07b71c836da0ee9a43880[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Wed Jun 8 08:43:34 2022 -0400

    fixing styling of tabs

[33mcommit 19b282cc0cbff80ee003e407e8d92050d6ac05e4[m
Merge: 7a9da1c c0f7a01
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Wed Jun 8 03:00:26 2022 -0400

    Merge branch 'master' into landing-page

[33mcommit 7a9da1c839fa61c9522c4d0ea49ef5f255b0b41d[m
Merge: 955357b 8ac519a
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Wed Jun 8 02:59:42 2022 -0400

    Merge branch 'master' into landing-page

[33mcommit 955357bd7909fb333a00a50b1da74d0aa026b268[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Wed Jun 8 02:59:16 2022 -0400

    adding postal form on landing page

[33mcommit c0f7a0127e8cdfd4dd07ed1dd161015849de3530[m
Merge: 8ac519a 1e4d178
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Wed Jun 8 01:42:18 2022 -0400

    Merge pull request #63 from MarlAndre/my_items
    
    tabs are done, just need to be centered and change the color for the hyperlink

[33mcommit 9578d3351dcab442b32305af73ab5789b421dec2[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue Jun 7 23:22:05 2022 -0400

    typo

[33mcommit 1e4d178675258e842e2fde8f7eb64ea5d331e527[m[33m ([m[1;31morigin/my_items[m[33m)[m
Author: Williams <valerow@outlook.com>
Date:   Tue Jun 7 23:17:08 2022 -0400

    tabs are done, just need to be centered and change the color for the hyperlink

[33mcommit fe2ca876f42a835934a108e98fc04c90005f6231[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue Jun 7 23:17:07 2022 -0400

    remove emojis

[33mcommit 935378a8a90e5e2cce1e4dfb81199c217fabce14[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue Jun 7 22:58:29 2022 -0400

    chatroom is ready except for distance

[33mcommit d40c31083f6ea77d5a178e772edfe56e712616e0[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue Jun 7 22:46:06 2022 -0400

    fixing postal code and search filtering, also fixing huge delay now present

[33mcommit 56f2696d2b4fd27b474fe3b22036db15e62e8016[m
Merge: d8af806 8ac519a
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue Jun 7 21:53:00 2022 -0400

    Merge branch 'master' into geocoder-add-distance

[33mcommit d8af806128486168691bd800fb46dffd221c7aee[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue Jun 7 21:51:54 2022 -0400

    set default postal code to nil, to allow searching

[33mcommit 9d6d5f8ab7dd37ac5523dcb55034446dc64bc398[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue Jun 7 21:47:56 2022 -0400

    Added distance to cards

[33mcommit 1b5cc3e353defba45e255594ddc69b754dd83a0c[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue Jun 7 21:28:54 2022 -0400

    adding postal form to landing page

[33mcommit 391549b7b240bf7497ba487701301f03750dedc0[m
Merge: 8d4f639 139fcc1
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue Jun 7 20:54:07 2022 -0400

    merging with master

[33mcommit 8ac519ae7a66ac6f49d9a68c08cf7afdb7ffc972[m
Merge: 139fcc1 8f73b61
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Tue Jun 7 20:39:44 2022 -0400

    Merge pull request #60 from MarlAndre/my_items
    
    pictures added to the seed

[33mcommit 8f73b6153073248b13433bd15b792af80c5e4eee[m
Author: Williams <valerow@outlook.com>
Date:   Tue Jun 7 20:32:12 2022 -0400

    pictures added to the seed

[33mcommit 139fcc16f3ad7eb9fbf3567515d9d599aacb0e3f[m
Merge: 53a0a16 22036d9
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue Jun 7 20:30:04 2022 -0400

    Merge pull request #59 from MarlAndre/fix-filtering-in-index
    
    Fix filtering in index

[33mcommit 22036d9a86f5e52ea58e3f3106f2b23f25751f2e[m
Merge: 9ab476b 53a0a16
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue Jun 7 20:29:58 2022 -0400

    Merge branch 'master' into fix-filtering-in-index

[33mcommit 53a0a16272776b1d1168c00a674a19022f9be31c[m
Merge: ce53069 f52d43d
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue Jun 7 20:20:47 2022 -0400

    Merge pull request #58 from MarlAndre/markers-items-map
    
    Markers items map

[33mcommit f52d43dfccf3ba6115ac01664a048627ab082da6[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue Jun 7 20:16:35 2022 -0400

    adding partial window and location on show page

[33mcommit 9ab476ba93a9de4ac6c3d3849ff44cb7b15b98f3[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue Jun 7 20:16:07 2022 -0400

    removed raise

[33mcommit 960ac516fbc3478c6ae24200dce01cb0b42632e3[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue Jun 7 20:02:03 2022 -0400

    creating item card in chatroom

[33mcommit 03b8856d201105b5009625aa9eeaad0b4ff3c469[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue Jun 7 19:58:43 2022 -0400

    changed photos to match ruby index show

[33mcommit 340638e923c8f24a2432a61560de12b1804e3136[m
Merge: 5f0c92f ce53069
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue Jun 7 19:27:18 2022 -0400

    merged master to resolve conflicts

[33mcommit 81a28347fd714ff5dc67b38c271ac360bc4da9c3[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue Jun 7 19:26:41 2022 -0400

    merged index methods to avoid reasigning @users

[33mcommit 951e21c9b734452043a65ddc8c302d19cc54bf6b[m
Merge: ef5a36f ce53069
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue Jun 7 19:16:39 2022 -0400

    Merge branch 'master' of github.com:MarlAndre/food-4-all into chatroom-messages

[33mcommit ce53069a48413f310825ffe4a1fa262e744c38b5[m
Merge: 2725808 38768ad
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue Jun 7 19:16:14 2022 -0400

    Merge pull request #57 from MarlAndre/tabs
    
    Tabs

[33mcommit ef5a36fb49aabd35aa7de48e5f1d82b4506b6587[m
Merge: 9d5ec7b 2725808
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue Jun 7 19:09:02 2022 -0400

    merged master

[33mcommit 8d4f639fa2289d4480adf59e365b594973345de0[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue Jun 7 19:03:02 2022 -0400

    fixing distance

[33mcommit 27258087e41b3e3457af1aac1a5d6bc0ec42a36b[m
Merge: 76155d2 eb0ada6
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue Jun 7 18:59:45 2022 -0400

    Merge pull request #54 from MarlAndre/map-show-page
    
    Map show page

[33mcommit 29a40bf9d3a11db46f6c3d6cb0b68e059687a9c0[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Mon Jun 6 21:10:33 2022 -0400

    working on fixing index page, km away added

[33mcommit 603278333df656562368dfb694e880bc8baf227b[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Mon Jun 6 17:21:52 2022 -0400

    committing to fetch my work on my desktop

[33mcommit 38768ad8b54c7bcb6c158435e67e4c23ab9112cf[m[33m ([m[1;31morigin/tabs[m[33m)[m
Merge: 239d38b 76155d2
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Mon Jun 6 12:26:27 2022 -0400

    adding tabs and styling to it

[33mcommit 76155d27073e93ded4df474c1e70b91b8560d095[m
Merge: b37acc1 87e9563
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Sun Jun 5 19:43:43 2022 -0400

    Merge pull request #53 from MarlAndre/landing-page-new
    
    adding animation to landing page

[33mcommit b37acc1c6858198e70b92a97fc19c8c7de7822d3[m
Merge: a7ff070 e6d5f68
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sun Jun 5 18:56:02 2022 -0400

    Merge pull request #56 from MarlAndre/my-favs-page
    
    My favs page

[33mcommit a7ff07094d232fa655c6f86acc7ddb1657165332[m
Merge: b5a6c4d 1b0ac97
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sun Jun 5 18:54:49 2022 -0400

    Merge pull request #55 from MarlAndre/truncate
    
    simplified codes

[33mcommit 87e9563515b44f114215b5dc47646268dd15d0e7[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sun Jun 5 18:52:31 2022 -0400

    nested fas class to avoid conflict

[33mcommit 239d38baf7df44b96df5e744441bf4d819917fcb[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sun Jun 5 18:47:15 2022 -0400

    adding tabs to switch from map to items

[33mcommit e6d5f680c3d5bd62a28f1010add489c642c06896[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun Jun 5 17:42:31 2022 -0400

    created item cards in My Favorites page

[33mcommit 1b0ac971f16bae5311e034804d8f0feb853615c3[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun Jun 5 17:08:18 2022 -0400

    simplied codes

[33mcommit 032065ae4482da74224a3ebb2b5d5bf36500a39d[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun Jun 5 17:02:20 2022 -0400

    set up my-favs page

[33mcommit 258aecb85802dcaee0053f6a629e33c19b03d6a4[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun Jun 5 15:58:49 2022 -0400

    created /my-favorites path and views

[33mcommit e834b3f6a56ae1c679366defc5d6333fe0907c5f[m[33m ([m[1;31morigin/toggle-index[m[33m)[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun Jun 5 15:37:18 2022 -0400

    fixed tabs in index

[33mcommit 5cdb8070b197c49c0dd919d8cf523c01e9c0ee56[m
Merge: f825463 b5a6c4d
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sun Jun 5 08:38:36 2022 -0400

    adding tabs

[33mcommit b5a6c4d40c375ffaff70acdcc36872ee2a6fdee2[m
Merge: e41fdb8 204849b
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sun Jun 5 08:02:34 2022 -0400

    Merge pull request #52 from MarlAndre/my-favs
    
    My favs

[33mcommit e41fdb82180616167da2c63c6679317965e9e8f7[m
Merge: 66163f3 ef39031
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sun Jun 5 08:01:54 2022 -0400

    Merge pull request #50 from MarlAndre/enums
    
    item.donated?

[33mcommit eb0ada69f0af1e94507c86a8a3810c651af563c3[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sun Jun 5 07:59:45 2022 -0400

    changed layout of map

[33mcommit 7539d1e51e6610505ff98dc9e30771fa7442b570[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sun Jun 5 07:54:11 2022 -0400

    map added but it shows all the items on the map instead of the show item

[33mcommit 24a460fb087df2cf2f965de5e81daa350044e75e[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sun Jun 5 07:11:54 2022 -0400

    adding animation to landing page

[33mcommit 204849b50ea236429536860ddd30de72ace0aed0[m
Merge: b097aac 66163f3
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Sat Jun 4 22:49:14 2022 -0400

    Merge branch 'master' into my-favs

[33mcommit b097aac62a918d6693678888d20f00818ff41e4c[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 4 22:11:26 2022 -0400

    remove overlapping sizing class for the icon

[33mcommit 5bb78e79c771671639dc0d7cb7006a311d01bdbc[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 4 22:06:45 2022 -0400

    'heart an item' is working

[33mcommit 1f79c141ae056ee5b6ac933aa02dbfd244ccb5de[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 4 17:53:00 2022 -0400

    changing icon

[33mcommit a1f2f889f1119f9bcb3a5616b44f92c567a6ec91[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 4 17:50:55 2022 -0400

    change show page container-details to light-green as bg color

[33mcommit 5f0c92f0b2fa21ed7f5bc911196b3e5330ed2596[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 4 17:34:16 2022 -0400

    trying to add window on markers to show details of the item

[33mcommit 1f60793637be1d06a0bd7ee0a1a6318b16dac7ff[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 4 17:31:31 2022 -0400

    my favorites toggle

[33mcommit 3df38a3c4caee9aab3de048066f5938917ec7659[m
Merge: cfc0997 66163f3
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 4 17:12:45 2022 -0400

    Merge branch 'master' of github.com:MarlAndre/food-4-all into geocoder-add-distance

[33mcommit cfc0997536a3b1b0e4df72abc9581898abb77c40[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 4 17:12:15 2022 -0400

    fixing long loading (adding distance)

[33mcommit 2517c58c93ed1c174f621cd3aa56e66168250d09[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 4 16:53:26 2022 -0400

    trying to access item on map

[33mcommit 66163f36d6fe65c279f8eda62b4041a9201136e6[m
Merge: 5dc5673 5e1d46c
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 4 16:52:00 2022 -0400

    Merge pull request #51 from MarlAndre/show_page_avatar_and_item_photo
    
    Show page avatar and item photo

[33mcommit 5e1d46cfab65d9ce2013f617a67f56b8457c56f1[m
Merge: 9026f3b 5dc5673
Author: Williams <valerow@outlook.com>
Date:   Sat Jun 4 16:51:42 2022 -0400

    Merge branch 'master' into show_page_avatar_and_item_photo

[33mcommit 9026f3b17afd85f79faa03062dafe6bbe1858ea0[m
Author: Williams <valerow@outlook.com>
Date:   Sat Jun 4 16:46:58 2022 -0400

    avatar picture matches with justin, allergens and diets are added, carousel is working

[33mcommit ef390315970a786e7f8e2f5ff1cfcb681368cc1b[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 4 16:39:01 2022 -0400

    item.donated?

[33mcommit 7ac3edff9ddb1678294561df1fa5a2823e1951f1[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 4 16:33:33 2022 -0400

    stimulus controller

[33mcommit 8456a30db23a721fa41c0d75282f5ac1da98bd4e[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 4 15:36:47 2022 -0400

    trying to add distance between 2 points

[33mcommit af65602f93b2bcefeb736f46f40ba7d4585657b4[m
Merge: 3411c3b 5dc5673
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 4 14:43:31 2022 -0400

    Merge branch 'master' into my-favs

[33mcommit 5dc5673936c72a1e9e18c1e0c0b43a8316899bcd[m
Merge: 0bfcbb2 ac821e7
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Sat Jun 4 14:42:38 2022 -0400

    Merge pull request #49 from MarlAndre/fixing-markers
    
    Fixing markers

[33mcommit 0bfcbb2ac9fbc5e40aed301e2a89442c67fc1c0d[m
Merge: 024c322 f8e85c2
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 4 14:38:43 2022 -0400

    Merge pull request #47 from MarlAndre/active-navbar
    
    Active navbar

[33mcommit f8e85c2776b55002baf46a2fe7748d0fac920216[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 4 14:38:16 2022 -0400

    active navbar with border radius and green icons

[33mcommit 3411c3b22b7faf91b9684a45f61d1be977ee4037[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 4 14:27:11 2022 -0400

    stimulus action

[33mcommit ac821e762eeddb3307915e4859f73f797152c3dd[m
Merge: ae485e1 a682282
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 4 14:22:58 2022 -0400

    merge last master to avoid conflicts

[33mcommit ae485e1530ca17c8d51b0d00615bbe1641e1f0a4[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 4 14:19:23 2022 -0400

    popup appears one per session and we can click cards after submiting address

[33mcommit c2c76a242a6dbcc7cdf9bffda6f4dbe4c731774e[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 4 13:56:30 2022 -0400

    fixed index issue where images were not showing

[33mcommit c150a3eee32aeafe8e65a722e1020ff166791313[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 4 13:47:49 2022 -0400

    fixing bug

[33mcommit 8c62d7858c3be620f163037df76d3380b54e8057[m
Merge: d33b591 024c322
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 4 13:47:14 2022 -0400

    Merge branch 'master' into my-favs

[33mcommit d33b591f0cdad84f9eacf55fb8989470967a093f[m
Merge: 5023945 83bd429
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 4 13:46:37 2022 -0400

    Merge branch 'active-navbar' into my-favs

[33mcommit 024c322f2269f7aa8b4b2472aa37bd260449127b[m
Merge: db8f3fb d8483fc
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Sat Jun 4 13:41:37 2022 -0400

    Merge pull request #48 from MarlAndre/add-authentication-for-show-page
    
    prevent app from crashing on show page

[33mcommit 179e49c46460f85b0edaee7934676303e51db26f[m
Author: Williams <valerow@outlook.com>
Date:   Sat Jun 4 13:40:07 2022 -0400

    show pic and index pic

[33mcommit d8483fca774119537f105833aee044bdd6c8084a[m[33m ([m[1;31morigin/add-authentication-for-show-page[m[33m)[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 4 12:33:03 2022 -0400

    prevent app from crashing on show page

[33mcommit 83bd42947e83655060beed06cb2d7fcaa40c5077[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 4 12:23:04 2022 -0400

    navbar

[33mcommit 4832e53b45fb32d4927048e13c836e6347d12a63[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat Jun 4 12:20:40 2022 -0400

    navbar items

[33mcommit db8f3fb3ce4564339f1622af658418397cca994b[m
Merge: e27549e dd6f797
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat Jun 4 12:19:30 2022 -0400

    Merge pull request #46 from MarlAndre/remove-coordinates-from-items
    
    removed lat and lon from items. User will use User.address for Geocoder

[33mcommit dd6f797f4592d0c48669ae1e79b9d20a31a988de[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat Jun 4 12:11:18 2022 -0400

    removed lat and lon from items. User will use User.address for Geocoder

[33mcommit 4ae79341f4b98b4e91684a960ab6757adff27b59[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 4 11:57:55 2022 -0400

    adding local storage

[33mcommit 7b4d66bdc7727cd4178b12758779f9b9cbc93fff[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 4 11:26:13 2022 -0400

    markers are now display on the map

[33mcommit e27549e2905ead7e74196fac93fa378ad632907f[m
Merge: a682282 37fdedc
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Sat Jun 4 11:15:18 2022 -0400

    Merge pull request #45 from MarlAndre/fix-messages
    
    Message model - request_id

[33mcommit f825463b7cfe5357eac224e6af18aa8293434fa7[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat Jun 4 11:15:16 2022 -0400

    adding controller

[33mcommit 5023945ed19597dd9f4d9975ed052f764abe9abc[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri Jun 3 23:02:08 2022 -0400

    added stimulus controller

[33mcommit 5f6599e1a475ee62a622a8da1c0575a0e20c8071[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri Jun 3 21:26:33 2022 -0400

    added active_link_to gem

[33mcommit 37fdedc83876a4ad3667bf70e1359fcf36bf681b[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu Jun 2 20:47:08 2022 -0400

    to fix request_id :bigint           not null in Message model

[33mcommit a68228205b84c2e1f275bf5d57ca4cb3e1ee7de8[m
Merge: 3bc99d8 aa488ae
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Thu Jun 2 20:20:11 2022 -0400

    Merge pull request #44 from MarlAndre/map_hidden
    
    removed map

[33mcommit aa488ae7c69afaff24bfff1a3e6964bacb7441d1[m[33m ([m[1;31morigin/map_hidden[m[33m)[m
Author: Williams <valerow@outlook.com>
Date:   Thu Jun 2 20:01:46 2022 -0400

    removed map

[33mcommit 66abb0f4c9ef2aa3efe075d0c20d2f7637ba363c[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Thu Jun 2 19:20:35 2022 -0400

    trying to fix the issue

[33mcommit 3bc99d8728dfd13074a72c02d477b33f5aec2498[m[33m ([m[1;31morigin/adding-cloudinary-api[m[33m)[m
Merge: e37f985 fcf6977
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Thu Jun 2 19:19:26 2022 -0400

    Merge pull request #43 from MarlAndre/hardcode-item-image
    
    replaced hardcoded image in items#index page

[33mcommit fcf697704fdab3394865c5ffb5fdce5168195f70[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu Jun 2 19:17:39 2022 -0400

    replaced hardcoded image in items#index page

[33mcommit e37f985ed1a4a1c20f6810bc45d316a2647bb3e8[m
Merge: 550447d 4e1f391
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Thu Jun 2 19:01:42 2022 -0400

    Merge pull request #42 from MarlAndre/as_a_receiver_i_can_view_the_details_of_an_item
    
    cloudinary is working

[33mcommit 4e1f3919bc992615c69d8584700b06fc0dcc1876[m[33m ([m[1;31morigin/as_a_receiver_i_can_view_the_details_of_an_item[m[33m)[m
Merge: 6f7fed7 550447d
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Thu Jun 2 18:58:46 2022 -0400

    Merge branch 'master' into as_a_receiver_i_can_view_the_details_of_an_item

[33mcommit 550447da1ef9f84455726ba9fe75b58ab188d200[m
Merge: 5fc8a70 c71a503
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Thu Jun 2 18:57:07 2022 -0400

    Merge pull request #41 from MarlAndre/create-pitch-update-seed-maybe
    
    Create pitch update seed maybe

[33mcommit c71a5030f673ac52bd1d6d252a53089d0ec19846[m[33m ([m[1;31morigin/create-pitch-update-seed-maybe[m[33m)[m
Merge: 2056ba9 5fc8a70
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Thu Jun 2 18:56:18 2022 -0400

    Merge branch 'master' into create-pitch-update-seed-maybe

[33mcommit 6f7fed72e1af20a26d14380243e84fc5d119ef04[m
Author: Williams <valerow@outlook.com>
Date:   Thu Jun 2 18:54:47 2022 -0400

    cloudinary is working

[33mcommit 2056ba96ce14d97107190431714ce9f038c5091f[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu Jun 2 18:12:06 2022 -0400

    made a few small changes for the pitch

[33mcommit 5fc8a707011838904c9428f67999a56ab8cda022[m
Merge: 35d7e74 c119877
Author: Williams <valerow@outlook.com>
Date:   Thu Jun 2 16:52:24 2022 -0400

    Merge pull request #40 from MarlAndre/profile
    
    Profile

[33mcommit c119877c8fb6389dddac0fa83439c08ca50d9bbd[m
Merge: 765f7bb 853b2e7
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu Jun 2 16:51:13 2022 -0400

    Merge branch 'profile' of github.com:MarlAndre/food-4-all into profile

[33mcommit 765f7bb201fb642d15e691105661a1fa31889ff2[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu Jun 2 16:50:35 2022 -0400

    merged master

[33mcommit 6f948eb1ee659f48231224f7d1b90ff299a9ef86[m
Merge: 443ebc6 35d7e74
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu Jun 2 16:48:28 2022 -0400

    merged master

[33mcommit 853b2e7f6c595097bf4443630352b44f2a16da14[m
Merge: 443ebc6 35d7e74
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Thu Jun 2 16:38:42 2022 -0400

    Merge branch 'master' into profile

[33mcommit 35d7e74e2bac38c83b327a17c0eb33578e445fd2[m
Merge: 2d914c0 c3ae64b
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Thu Jun 2 16:34:55 2022 -0400

    Merge pull request #35 from MarlAndre/as_a_receiver_i_can_view_the_details_of_an_item
    
    As a receiver i can view the details of an item

[33mcommit c3ae64bd9316496b0201434027564b1043ed0127[m
Merge: f044079 88ae624
Author: Williams <valerow@outlook.com>
Date:   Thu Jun 2 16:33:10 2022 -0400

    merged conflicts

[33mcommit f044079fb19a176d0ebb0e5b7ca4e73ec93cfe77[m
Author: Williams <valerow@outlook.com>
Date:   Thu Jun 2 16:26:58 2022 -0400

    revised div

[33mcommit 443ebc65ba7b830ff26e1dc47ac1dbaa839395ba[m
Merge: 66ee682 2d914c0
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 1 20:02:32 2022 -0400

    Merge branch 'master' into profile

[33mcommit 66ee6822ceecb7a728de278bcca5e15b262f3d64[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 1 19:48:24 2022 -0400

    added heart icon

[33mcommit 37c8b9dbaeeca226d36f244852dec10f38ba6e25[m
Merge: 12303f9 2d914c0
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Wed Jun 1 18:59:56 2022 -0400

    merging to master

[33mcommit 2d914c065734a04d2a19a325dcfe98e0f256a627[m
Merge: 8f70241 4425384
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Wed Jun 1 18:58:05 2022 -0400

    Merge pull request #39 from MarlAndre/popup-messages
    
    (Please review the earlier PR first) Popup messages

[33mcommit 12303f9dae4563d15db8853dcacbdfe5de83324f[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Wed Jun 1 18:56:45 2022 -0400

    working on seed / pitch for tomorrow

[33mcommit 8f702411d8dae8cce9714fe855dd00d51845ee7a[m
Merge: 63fa785 a5e111a
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Wed Jun 1 18:50:55 2022 -0400

    Merge pull request #37 from MarlAndre/logics
    
    owners cannot book his own items

[33mcommit 0555049c978bca06ca4cd1833f543eef9b184d1c[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 1 18:50:33 2022 -0400

    created my-profile page and link it in the navbar

[33mcommit bdc562872b4446bb3277d7def2e438cabbd486d8[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 1 18:05:22 2022 -0400

    replacing like icon by heart icon

[33mcommit 2642f319d04629d0e3c5b62bec5c92fe01105f56[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 1 16:58:47 2022 -0400

    added acts_as_favoritor gem

[33mcommit 8890c888191af8df7dbc22e28cce414ea0e271e7[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 1 16:52:26 2022 -0400

    added a 'my profile' page, linked in the dropdown menu of the navbar too

[33mcommit 4425384e75919d053cb91a9829f00c69b0aeb7a6[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 1 14:51:49 2022 -0400

    added fade-in effect to new messages

[33mcommit 767476b654a0598f9c2485e2134ff2c9057f55d1[m
Merge: d6bb109 a5e111a
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 1 14:21:04 2022 -0400

    Merge branch 'logics' into popup-messages

[33mcommit a5e111a684397511602a40d62b68a7a63fed1ae7[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 1 14:04:24 2022 -0400

    remove duplicate code

[33mcommit e3f651eb66909ef94aabb57debebef562c829677[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 1 13:59:51 2022 -0400

    fixed logic

[33mcommit d6bb109ab8124912dba7239b7b6b773a487f9829[m
Merge: 63fa785 7822a1d
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed Jun 1 13:03:39 2022 -0400

    Merge branch 'logics' into popup-messages

[33mcommit 7822a1d73445e6f205f50bacbf0a550173c92484[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue May 31 23:50:17 2022 -0400

    included also if @requests.nil? || @requests.all? { |r| r.messages.empty? }

[33mcommit 63fa78556e1501bde118d7b2b226164bca0012bd[m
Merge: b82c7ec b037393
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Tue May 31 22:33:02 2022 -0400

    Merge pull request #38 from MarlAndre/fix-cards-click
    
    the whole card is clickable

[33mcommit b82c7ec386eca162df16411e7005bf9b51f0086e[m
Merge: 45f8ca5 ab0f627
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Tue May 31 22:31:32 2022 -0400

    Merge pull request #36 from MarlAndre/index-page-postal-code
    
    Index page postal code

[33mcommit 88ae624298d206a34f6a2c2cb1a3dcb8dbeff610[m
Merge: 29449e6 45f8ca5
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Tue May 31 22:10:23 2022 -0400

    Merge branch 'master' into as_a_receiver_i_can_view_the_details_of_an_item

[33mcommit ab0f6277009f07cbde49a879b5dceaa052728e10[m[33m ([m[1;31morigin/index-page-postal-code[m[33m)[m
Merge: 8f4fdb6 45f8ca5
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue May 31 21:39:30 2022 -0400

    Merge branch 'master' into index-page-postal-code

[33mcommit 544d74a46d7a7bc25a1c55aaa2d401e1a13c5107[m
Merge: 29449e6 45f8ca5
Author: Williams <valerow@outlook.com>
Date:   Tue May 31 21:10:43 2022 -0400

    merging master

[33mcommit b03739303195a10dbd3ea7acaa8f3a631f815c93[m[33m ([m[1;31morigin/fix-cards-click[m[33m)[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue May 31 21:09:33 2022 -0400

    the whole card is clickable

[33mcommit 8f4fdb6d809dfabd17fd716a3d72dca5e93d59fe[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue May 31 20:59:56 2022 -0400

    we can search per address or postal code. There is still a small issue to fix with the address when we enter our location

[33mcommit 29449e66ebee44c7960aa2a511925833e09fc9b7[m
Author: Williams <valerow@outlook.com>
Date:   Tue May 31 20:59:54 2022 -0400

    tabs added, still working on the list of items

[33mcommit df3810f8091edcf834a92d740d3e80660262d989[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue May 31 20:55:21 2022 -0400

    owner cannot book his own items

[33mcommit 4dcdda56d3016a354f4863e343e531b52b854d25[m
Author: Williams <valerow@outlook.com>
Date:   Tue May 31 20:40:03 2022 -0400

    add back button

[33mcommit 45f8ca50cf21f44b042ba2173f0849957844aff0[m
Merge: 7d1e109 2547f74
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue May 31 19:17:48 2022 -0400

    Merge pull request #33 from MarlAndre/item-status
    
    fixed item.status and added back enums

[33mcommit 7d1e1099445105b687e66533dd6efa01451372f8[m
Merge: 183d542 555c586
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Tue May 31 19:17:08 2022 -0400

    Merge pull request #34 from MarlAndre/small-merge-fix
    
    fixed small bug

[33mcommit 555c5862c1108f256502343b7a74af5b83353bf3[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 31 19:16:17 2022 -0400

    fixed small bug

[33mcommit 2547f74a7245f904e9f848e4f4d808c5162958c8[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue May 31 19:14:23 2022 -0400

    fixed item.status and added back enums

[33mcommit a4433dfd86a2ff1ab4efa63edf8bb5c64ea83a76[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue May 31 18:59:19 2022 -0400

    test

[33mcommit 183d54234b28dce14210f907503d1a8343ee5259[m
Merge: b84baef 604c3eb
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue May 31 18:58:55 2022 -0400

    Merge pull request #29 from MarlAndre/fixing-landing-page-margin
    
    i fixed the margin error on the homepage by creating an exception. it…

[33mcommit 604c3eb380e4c33955b73487b54baa3c9f8ac903[m
Merge: b1037a2 b84baef
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue May 31 18:58:46 2022 -0400

    Merge branch 'master' into fixing-landing-page-margin

[33mcommit b84baef9093b35835a0247194eb0236a471ca515[m
Merge: fd9e712 cc0fbf4
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue May 31 18:54:00 2022 -0400

    Merge pull request #28 from MarlAndre/index-page-link
    
    cards are clickable

[33mcommit cc0fbf4d4414247568fcd4b1b4f7ca2660703031[m
Merge: 9afa93b fd9e712
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue May 31 18:53:36 2022 -0400

    Merge branch 'master' into index-page-link

[33mcommit f6710a9d427c796ef301dd339ed01224a71c1a9d[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue May 31 18:36:16 2022 -0400

    trying to remove the postal code once we enter our address

[33mcommit fd9e712cb0480676dfefae42facd3d3961e84d77[m
Merge: 22f05f7 cf781c6
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Tue May 31 17:47:50 2022 -0400

    Merge pull request #32 from MarlAndre/update-seed-file
    
    Update seed file

[33mcommit cf781c6330f0bd516e44de0f7d8b37d967ffb812[m[33m ([m[1;31morigin/update-seed-file[m[33m)[m
Merge: 0db6bf1 22f05f7
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 31 16:07:57 2022 -0400

    Merge branch 'master' into update-seed-file

[33mcommit 22f05f792afdb2bbf1ce1c1cf1107772d9776c38[m
Merge: edae70c 2a2e35c
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue May 31 16:07:35 2022 -0400

    Merge pull request #31 from MarlAndre/timezone-reset
    
    Timezone reset

[33mcommit 0db6bf1519a61573e86d23bf8622f6272f980c5a[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 31 16:02:26 2022 -0400

    finished updating seed file

[33mcommit 67d9c67748a057b22396f17ff4dc53f54aa21a4e[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 31 15:55:05 2022 -0400

    created seed data for all models (except messages). Created seed data for demo

[33mcommit 2a2e35c08baadc68954fa6bcd94a01b1cbf18a48[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue May 31 15:31:01 2022 -0400

    migration to AddTimeZoneToUsers

[33mcommit e92584e06d33f4bc86347a3e50cd8c55d78ff249[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 31 15:16:42 2022 -0400

    added allergens and diets to meals

[33mcommit eb6007d5e91fac48f49daf9a7cb27e743fa41a2f[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue May 31 14:45:48 2022 -0400

    Added logics in Request#index page

[33mcommit c9f7aa054cafcd97493a663296b2db3a667734d1[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 31 13:34:17 2022 -0400

    changed diets and allergens to not delete unless entire database is wiped

[33mcommit 77313ba11eb78c215ef7ad408cd78383b7fab40f[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 31 12:46:43 2022 -0400

    saving progress

[33mcommit beb76e68b1e69e01ad5b98754e5c3516c96e9419[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 31 07:27:31 2022 -0400

    installing js package

[33mcommit 52e473d8ac7f32c14b7f2201bdcf52f7329be3d9[m
Merge: 0a1707f edae70c
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 31 07:26:59 2022 -0400

    Merge branch 'master' into update-seed-file

[33mcommit edae70c0276c36a2ffdd40ebf330fb7d8fce81fd[m
Merge: 9f1245e d60daf2
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue May 31 07:25:54 2022 -0400

    Merge pull request #30 from MarlAndre/requests-index
    
    (Pls review the earlier PR before this one) Requests#index page

[33mcommit 9f1245e8c58ac26544097aa08f134be690335c2e[m
Merge: e7e29e7 1d8c1dd
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue May 31 07:23:21 2022 -0400

    Merge pull request #27 from MarlAndre/messages
    
    Messages

[33mcommit b1037a273a5b1d04f8d4c0c5cb17433206c5275a[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sun May 29 15:52:27 2022 -0400

    i fixed the margin error on the homepage by creating an exception. it is now working and back to normal

[33mcommit 9afa93b2a882d0f158b49de5fb16c9cf988ae061[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sun May 29 15:40:25 2022 -0400

    removing a line of code that belongs to another branch

[33mcommit d60daf20c30d3116a9513b453d3a1d0c950f4707[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun May 29 15:36:09 2022 -0400

    Requests#index page - show all messages

[33mcommit 643338b7a528ec10e07981ce8753b74b4a8fbe58[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sun May 29 15:35:43 2022 -0400

    cards are clickable

[33mcommit a7e75d3c3c547d1ec885d7f63058ec27e859b1f8[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun May 29 01:02:33 2022 -0400

    trying to fix message length

[33mcommit a68c1405d88cfbfd1959b11a9ae0492ff54e94ef[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun May 29 00:39:50 2022 -0400

    added last message date

[33mcommit 2652a1c35dae7fcdd68c1039280e42e81d78ab4a[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat May 28 23:33:16 2022 -0400

    adjusted navbar padding

[33mcommit 471d488661ad618ce2a02777fdc304265ba2cc7a[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat May 28 20:41:36 2022 -0400

    reset app container just for Requests#index page

[33mcommit 1d8c1ddc7d60b5f4c77bac112e4c375079fb6741[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat May 28 19:51:35 2022 -0400

    button styling

[33mcommit acf1f147e4bc1345d61ee7fccf5b24dd38767125[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat May 28 18:43:59 2022 -0400

    remove clg

[33mcommit 532848a58c7e29df1477ca409a2f157d5443cec9[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat May 28 18:29:27 2022 -0400

    Requests#show works with ajax and is limited to only the receiver and the giver

[33mcommit 80d652af6d9862569b5b21010fab708898805048[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat May 28 18:16:29 2022 -0400

    add validations to messages.rb

[33mcommit bfad534d53c3407654ecc6a408d4d5237d8439ae[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat May 28 18:14:38 2022 -0400

    fix request.messages, null: false

[33mcommit f4a017134184299afca8169dd39ace07a49c61fe[m
Merge: adbb04b e7e29e7
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat May 28 18:13:25 2022 -0400

    merged master

[33mcommit adbb04b2ae3e22fedbafae14a7ebeea09789487c[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat May 28 18:08:05 2022 -0400

    fix ajax messages

[33mcommit 0a1707f24f6ce579081cee274ec6a727eb5ea33b[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat May 28 17:39:27 2022 -0400

    saving progress for seed

[33mcommit b45572f58e8cd684f9240faef1ef39b873913bfa[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat May 28 17:34:11 2022 -0400

    messages ajax

[33mcommit b753eeb1994c6ae239a09859f8b2be66debef573[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat May 28 17:33:52 2022 -0400

    adding logic in the controller

[33mcommit e29ea6a681a03633da0f7a414ef7a037767aca9e[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat May 28 16:43:22 2022 -0400

    added logic of going to existing/new chat in Items#show page

[33mcommit abcdba621f6b4278613ac7cccc3574e7f3fd552c[m
Merge: e6bbfdd e7e29e7
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat May 28 16:27:04 2022 -0400

    Merge branch 'master' into update-seed-file

[33mcommit e6bbfdd57ccc7c72378099f743194d28a58560bb[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat May 28 16:26:47 2022 -0400

    added list of meals and ingredients

[33mcommit e7e29e7ebbdd81542aafa7b702dcdc71cd776b4a[m
Merge: 4ad216e 9527147
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat May 28 16:23:56 2022 -0400

    Merge pull request #26 from MarlAndre/as_a_receiver_i_can_view_the_details_of_an_item
    
    As a receiver i can view the details of an item

[33mcommit 9527147aac508fe8ad7bc8d38313cacd79026922[m
Author: Williams <valerow@outlook.com>
Date:   Sat May 28 16:16:31 2022 -0400

    renamed the container class for the main page from container to avoid conflict

[33mcommit c0890ac90eb60dd91841a8dd227ef39962bda5aa[m
Merge: be0800a 4ad216e
Author: Williams <valerow@outlook.com>
Date:   Sat May 28 16:09:43 2022 -0400

    removed green color from main page

[33mcommit be0800aca3964845c66974c67cac53e58ecff95d[m
Merge: 595fd3e 5cff2d3
Author: Williams <valerow@outlook.com>
Date:   Sat May 28 15:51:14 2022 -0400

    nothing in this one

[33mcommit 4ad216e9cf1f81a2b66b9ed378898f2e8ca52df2[m
Merge: 5cff2d3 a177ff4
Author: Williams <valerow@outlook.com>
Date:   Sat May 28 15:49:52 2022 -0400

    Merge pull request #25 from MarlAndre/index-page-postal-code
    
    Index page postal code

[33mcommit a177ff4bdb4879ef68de75459605d902dc2b4867[m
Merge: 36549da 5cff2d3
Author: Williams <valerow@outlook.com>
Date:   Sat May 28 15:49:45 2022 -0400

    Merge branch 'master' into index-page-postal-code

[33mcommit 595fd3ec7a6940c6c046801106aa565c0da0746e[m
Author: Williams <valerow@outlook.com>
Date:   Sat May 28 15:46:15 2022 -0400

    just saving some changes

[33mcommit 36549da9c02c2fdd7e432f25e1dc6edf06b35a9b[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat May 28 15:42:34 2022 -0400

    adding stimulus

[33mcommit 92979bb5b42cf337d17a6b05250fa8db05de8acd[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat May 28 15:29:04 2022 -0400

    filtering by address or postal code is working

[33mcommit 29008aca32e04fd450a11c0a392e233637144255[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sat May 28 15:11:10 2022 -0400

    renamed 'chatroom' wording to 'request' in channel and js controller

[33mcommit 5cff2d3826331552bf62558413edc75a665291b8[m
Merge: 7e2a216 c1d733d
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Sat May 28 15:09:35 2022 -0400

    Merge pull request #24 from MarlAndre/remove-request-from-feedback
    
    Remove request from feedback

[33mcommit c1d733d29f5e5a58bc96a83032cbe6c2d7a2c332[m[33m ([m[1;31morigin/remove-request-from-feedback[m[33m)[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat May 28 15:05:50 2022 -0400

    removed request from feedback model

[33mcommit b0108f04e7b766d8e474169135fc47876212bc87[m
Merge: ad6db84 7e2a216
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat May 28 15:00:20 2022 -0400

    Merge branch 'master' into remove-request-from-feedback

[33mcommit ad6db842c542acb328e50f93ba03595f08866178[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat May 28 14:59:45 2022 -0400

    making migration to remove request_id from feedbacks table

[33mcommit 7e2a216ff52a9d8a7bff28b790bf2b6ce33ce783[m
Merge: 6988ebd ab193e6
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Sat May 28 14:59:00 2022 -0400

    Merge pull request #23 from MarlAndre/fix-model-associations
    
    Fix model associations

[33mcommit ab193e679ed8fc3333c8e58436c5ab261ed4046f[m[33m ([m[1;31morigin/fix-model-associations[m[33m)[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat May 28 14:53:44 2022 -0400

    removed associations between request and feedback. added depenent destroy for messages

[33mcommit 4c0f0664f24aaa58b83e8f5aa827d9b5622adc44[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat May 28 14:28:11 2022 -0400

    modifying geocoder to make it work

[33mcommit e8fd204f6b7f8436d5a713d5b14f2578bf15c97a[m
Author: Williams <valerow@outlook.com>
Date:   Sat May 28 14:03:28 2022 -0400

    adding style

[33mcommit 04947a0d37cb99abbca1e40a8b84ceb18a799ba7[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat May 28 13:40:35 2022 -0400

    adding postal code and try to add the filter logic

[33mcommit 72b1c0c40684ba2ba7311caaf205eba7c9f657da[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat May 28 12:14:56 2022 -0400

    removed unecessary comment

[33mcommit cb19ccabb472df9af67bef1b9010fe9a2376f555[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat May 28 12:13:53 2022 -0400

    fix small typo

[33mcommit 4ed6c4e44f540ffb7b87e37f6410a8d03d43dc9c[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat May 28 12:06:51 2022 -0400

    added one last dependency, now all models should get deleted if their association parent is deleted/destroyed

[33mcommit 9e56ac7f94b00339de7dbe23988e5169c15516ca[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Sat May 28 12:04:08 2022 -0400

    changed model associations to be able to run User.destroy_all and delete the entire database

[33mcommit 6988ebd00164d86d5ddc876cf07393fa477ffe01[m
Merge: bd4edcc 21c00b9
Author: Williams <valerow@outlook.com>
Date:   Sat May 28 11:06:13 2022 -0400

    Merge pull request #22 from MarlAndre/background-design
    
    adding the background layout we will use throughout the app

[33mcommit 21c00b9cd6b5af8faac5c77619bfdee62a64616e[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat May 28 11:05:02 2022 -0400

    adding the background layout we will use throughout the app

[33mcommit bd4edccc32a10937d582042a966b8737b31c2881[m
Merge: bd947a5 44972b1
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat May 28 10:46:56 2022 -0400

    Merge pull request #21 from MarlAndre/create-ui-components
    
    Create UI components

[33mcommit 44972b1329dd60d2a91ae0ca3f36ccd159aa0f0b[m
Merge: b51a665 bd947a5
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat May 28 10:46:29 2022 -0400

    Merge branch 'master' into create-ui-components

[33mcommit bd947a58def682e2e8c663ab2d13dd013db5fdc8[m
Merge: 86ac920 9a70af6
Author: Williams <valerow@outlook.com>
Date:   Sat May 28 10:29:45 2022 -0400

    Merge pull request #17 from MarlAndre/creating-items-index
    
    Creating items index

[33mcommit 9a70af69637a7c00b93884699bbdac08f1710c31[m
Merge: da9624d 86ac920
Author: Williams <valerow@outlook.com>
Date:   Sat May 28 10:29:28 2022 -0400

    Merge branch 'master' into creating-items-index

[33mcommit 86ac9202c368b339d33a41f53c072487444ba892[m
Merge: 352cd4d 3b196f5
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Sat May 28 10:26:53 2022 -0400

    Merge pull request #19 from MarlAndre/request-model
    
    updated models after discussion yesterday

[33mcommit 352cd4d602cec93f69cc961158b9d24e690f42d8[m
Merge: 0b03746 b3f90f2
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat May 28 10:25:53 2022 -0400

    Merge pull request #20 from MarlAndre/as_a_receiver_i_can_view_the_details_of_an_item
    
    creating some divs for the item card

[33mcommit b3f90f2ddbec97a1c825b843acda809efe80b202[m
Merge: 385d92b 0b03746
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Sat May 28 10:25:42 2022 -0400

    Merge branch 'master' into as_a_receiver_i_can_view_the_details_of_an_item

[33mcommit 385d92b8467e79bb7fe8a840fbfe52ee278af0bd[m
Author: Williams <valerow@outlook.com>
Date:   Sat May 28 09:59:51 2022 -0400

    creating some divs for the item card

[33mcommit 0b03746a6391108c432a7078411bcb7daa5e387e[m
Merge: 9b5c47c 5a87ad8
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Fri May 27 17:44:22 2022 -0400

    Merge pull request #18 from MarlAndre/navbar
    
    navbar with icons

[33mcommit 3b196f5e389f4f3be9c34573b13689150e6dbcf0[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri May 27 16:45:05 2022 -0400

    updated models after discussion yesterday

[33mcommit b51a6656bc1edc4e9cd89784580678e58183b8b4[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Fri May 27 13:50:04 2022 -0400

    finished basic design for button and avatar component, switch pseudo-class hover to active for a more realistic mobile feel

[33mcommit a2fcba8d55380f10f76cde788366514984b9554b[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Fri May 27 13:21:28 2022 -0400

    created simple avatar, large-avatar and button scss design

[33mcommit 5a87ad881ef322b61c6cd5cfe8f2cf4f7e2b1ef7[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri May 27 11:56:24 2022 -0400

    text-end

[33mcommit 2158cc94c1d7417ed0fd95d3305c5271f3a21a77[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri May 27 11:47:52 2022 -0400

    updated as requested

[33mcommit 822412732cb04babcdee7b7fb411dc7ad1ab0bac[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu May 26 23:46:25 2022 -0400

    updated links in navbar

[33mcommit 4e62e6699c3bde2585f78eeacf9974d41a89fa58[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu May 26 23:36:15 2022 -0400

    navbar with icons

[33mcommit da9624d28dbe6f9dec2119b16b3b2affd45d3f70[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Thu May 26 21:51:54 2022 -0400

    finishing the product cards

[33mcommit 5c783670d3e6639d760450328fffdd2837d85cc8[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Thu May 26 21:32:48 2022 -0400

    adding geocoder

[33mcommit 235a4bbe607cbe384466391de7ce2a0f4f3a779b[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu May 26 20:42:56 2022 -0400

    created button and working on avatar

[33mcommit 22d489f3ae52e38bc017668f00c30872c7e1eb74[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Thu May 26 20:41:53 2022 -0400

    problems with enum on item model

[33mcommit 9b5c47c61763ff2623db0d24531ecb4ab349c7c2[m
Merge: 3823693 ee25941
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Thu May 26 18:44:40 2022 -0400

    Merge pull request #13 from MarlAndre/chatroom-show-page
    
    Chatrooms#show page

[33mcommit 3823693b74701b90e88a12a42d3c89079f62514c[m
Merge: 7167902 14c040b
Author: Marlène <andre.marlene1990@gmail.com>
Date:   Thu May 26 18:44:26 2022 -0400

    Merge pull request #16 from MarlAndre/add-photos-to-assets
    
    added sample images to be used for cards

[33mcommit aa4fdde92361a3ded739d504674851e3876cbde9[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Thu May 26 18:41:36 2022 -0400

    adding alert and cards

[33mcommit 14c040b13dbbcc3ab88c45dd56fc82d0f7c2a0be[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu May 26 18:06:15 2022 -0400

    added sample images to be used for cards

[33mcommit ee25941cc24fb624f76d7326861ddd32ab3f592a[m
Merge: ec5e710 6c01fcf
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu May 26 13:43:10 2022 -0400

    Merge branch 'chatroom-show-page' of github.com:MarlAndre/food-4-all into chatroom-show-page

[33mcommit ec5e7109475e2428a641adc5e6a8f6db0492608c[m
Merge: 1e20b24 7167902
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu May 26 13:34:59 2022 -0400

    merged master

[33mcommit 1e20b248a76acde0fc8ab63c0b9f7922ad79fbb5[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu May 26 13:32:34 2022 -0400

    to reset the form and unsubscribe from chatroom (after leaving the page)

[33mcommit 6c01fcf1ff728749ba0659e78df217ed17c4a93e[m
Merge: 68228bd 7167902
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Wed May 25 18:50:58 2022 -0400

    Merge branch 'master' into chatroom-show-page

[33mcommit 68228bde43870800dd8b02511b6c07651cbd24d5[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed May 25 18:49:55 2022 -0400

    real-time chatroom messages

[33mcommit 96fc3834ead3d6927a3e567f6d296226b0efa382[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Wed May 25 14:11:52 2022 -0400

    adding special covid alert

[33mcommit 00005bb67446c6bdbc9fd14754520b6af0929e82[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue May 24 22:00:08 2022 -0400

    chatroom subscription createde w/o ajax

[33mcommit c559c5faba621c566fc74d7467d6855ed569911d[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue May 24 21:50:28 2022 -0400

    added geocoder but commented out because of bug issues

[33mcommit 7167902ecc2851e09b1c22c73d3730704b7c9434[m
Merge: 7b1b830 e1f9423
Author: Williams <valerow@outlook.com>
Date:   Tue May 24 20:44:21 2022 -0400

    Merge pull request #15 from MarlAndre/landing-page
    
    adding landing page

[33mcommit e1f94230141499cbf9efd23bb7f4b6da6d7d4094[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Tue May 24 20:33:12 2022 -0400

    adding landing page

[33mcommit 7b1b830e5ba5650fadd4c4427653d3a0595f7a44[m
Merge: 166f390 79c80fa
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Tue May 24 20:03:58 2022 -0400

    Merge pull request #14 from MarlAndre/creating-user-story-add-items
    
    Creating user story add items

[33mcommit 79c80fa89dfcb642b542b294cb16fba4ff5ffa78[m[33m ([m[1;31morigin/creating-user-story-add-items[m[33m)[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 24 19:58:52 2022 -0400

    user able to add items

[33mcommit b6ed6642455379219ee7f88c9b76f3410bf39c76[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 24 19:46:38 2022 -0400

    created functional create form for item

[33mcommit 00c3843ed85e47cba3d8d23ed2865acfe0ca75b2[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue May 24 19:07:05 2022 -0400

    creating chatrooms#show page - issue with simple_form to create a message

[33mcommit 81dd1bb81e85d16d2ce6a57da195d1accd9eff00[m
Merge: 86f445f 166f390
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 24 18:54:27 2022 -0400

    Merge branch 'master' of github.com:MarlAndre/food-4-all

[33mcommit 166f390844df2f1e361d841473d3ba9aacf67104[m
Merge: d586d27 aff4749
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue May 24 18:53:59 2022 -0400

    Merge pull request #12 from MarlAndre/Feedback-model
    
    created Feedback model

[33mcommit aff4749837ef4724bb347120dd8a414a812d7d45[m
Merge: f112435 d586d27
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Tue May 24 18:45:28 2022 -0400

    Merge branch 'master' into Feedback-model

[33mcommit 9d5ec7be7e09e391c63456adf00b555a7fa55c18[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue May 24 17:19:51 2022 -0400

    updated boilerplate in Messages#show page

[33mcommit 86f445f5b7f71a62570fae31ca4313d91f21f0ad[m
Merge: bbedf27 d586d27
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 24 17:19:47 2022 -0400

    Merge branch 'master' of github.com:MarlAndre/food-4-all

[33mcommit bbedf275b918928c4f8f58394d06b67426865620[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 24 17:19:42 2022 -0400

    saving for merge

[33mcommit d586d276b62e538766416bc8a636f3216fc2670b[m
Merge: 193927a b9832ba
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue May 24 17:18:01 2022 -0400

    Merge pull request #11 from MarlAndre/feedback-transactions-controllers
    
    created plain Feedbacks and Transactions controllers

[33mcommit 193927a5e45ccbe200322a1a3dce32a7c3432613[m
Merge: d6b8367 ef6422e
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Tue May 24 17:16:45 2022 -0400

    Merge pull request #10 from MarlAndre/chatroom-messages
    
    Chatroom and Message models

[33mcommit f112435a092ed7f63a1620a50da4c00efa1ea0b5[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Tue May 24 00:01:04 2022 -0400

    created Feedback model

[33mcommit b9832ba16b8818e7de0f043114485a5c6df879c5[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun May 22 17:45:08 2022 -0400

    created plain Feedbacks and Transactions controllers

[33mcommit ef6422e1a5ae10ba27333d0e41653be174e4b92f[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun May 22 17:36:13 2022 -0400

    commit all changes

[33mcommit 8351f55b79917f2bec5211a7515acd56074927ec[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Sun May 22 17:20:30 2022 -0400

    created chatroom and messages models; set up basic chatrooms#index and chatrooms#show pages

[33mcommit d6b8367ef4e402c5dec3035df2c768939173c028[m
Merge: db8ffb9 4e514b8
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Fri May 20 23:36:01 2022 -0400

    Merge pull request #9 from MarlAndre/create-seed
    
    Create seed

[33mcommit 4e514b8f651dc88287d1803d551481b13a4c75f4[m[33m ([m[1;31morigin/create-seed[m[33m)[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Fri May 20 17:07:46 2022 -0400

    fixed small merge conflict

[33mcommit 6eabc662851f9dcc5d2052bdd5d9e501ec9eb485[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Fri May 20 17:02:41 2022 -0400

    finished seed

[33mcommit 330d2c972348031e4e51e6b58bcfca6c69fdb6e5[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Fri May 20 16:55:23 2022 -0400

    merged files, tested seed. all good

[33mcommit bfecc8ee2b5157a03e62ac72810e6dc0a5d9dfcd[m
Merge: 6be5b77 db8ffb9
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Fri May 20 16:47:08 2022 -0400

    merging master

[33mcommit db8ffb97388f19c09379dccdf435ff1c9acad04f[m
Merge: 2a1cfd8 e2f274f
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Fri May 20 16:43:13 2022 -0400

    Merge pull request #7 from MarlAndre/basic-views
    
    Basic views

[33mcommit 2a1cfd802953c7f04256c3b2f8e14c058ffa725f[m
Merge: 3be2f46 17c9cd6
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Fri May 20 16:42:30 2022 -0400

    Merge pull request #8 from MarlAndre/Items-associations
    
    adding 'User' as class_name to giver and receiver

[33mcommit 17c9cd6d72e18732f8a420234e5e4b8b2346d949[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri May 20 15:55:47 2022 -0400

    adding 'User' as class_name to giver and receiver

[33mcommit 6be5b77056a05755450e8f1d881dc57edb496339[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Fri May 20 15:48:28 2022 -0400

    Finished first draft seed file, changed Transaction model belongs_to, to has_one.

[33mcommit e2f274fe775b3bbb7668fa5db9232b1b18797fef[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri May 20 15:26:56 2022 -0400

    updated new item form to use 'item_type' field

[33mcommit 2647fb0b1ebcb1f54cdf2738870dde0a1c1bd042[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Fri May 20 15:22:32 2022 -0400

    add DB migration to rename 'type' as 'item_type' in Items table. Updated the codes in relevant controller and model

[33mcommit 5049ac2397a1bfeec7412f7046bb591649e87dc6[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Fri May 20 13:41:04 2022 -0400

    added some color and a title to seed file

[33mcommit 9e82822d1a8d63762e0081270f95c315fec95d88[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Fri May 20 13:12:27 2022 -0400

    added Allergens and Diets

[33mcommit 3e79db6fe6668a57917dfcce1597f832331d05a5[m
Merge: bd32883 3be2f46
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Fri May 20 07:42:39 2022 -0400

    merged with master

[33mcommit bd32883bef68395ab3a062590cd63b3cba338435[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu May 19 22:26:07 2022 -0400

    changed type field to item_type, working on seed

[33mcommit e6a6be31266a2fea54e37c86abafb9150c12ec1d[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu May 19 21:21:18 2022 -0400

    added Items#show page in views too

[33mcommit 2e835a3012a66ce874b1de96655ce0f615508be7[m
Merge: ebe84c1 3be2f46
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu May 19 21:18:52 2022 -0400

    Merge branch 'master' into basic-views

[33mcommit 3be2f466f48717370fadb79fcf4a7ca9d32586f8[m
Merge: c50a974 2217916
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Thu May 19 21:18:07 2022 -0400

    Merge pull request #5 from MarlAndre/adding-routes
    
    Adding routes

[33mcommit ebe84c1366e60cbae63430edc6df6b7941c34d6e[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu May 19 21:15:17 2022 -0400

    generated view pages for Items#index and Items#show

[33mcommit 22179160dccd8819c067ec8a411a1d22749924b4[m[33m ([m[1;31morigin/adding-routes[m[33m)[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu May 19 21:14:02 2022 -0400

    removed unecessary route to edit my items, changed user to profile in certain routes

[33mcommit 52131c47a654b72780e0dc6cfe6cc8277c603c50[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu May 19 21:11:58 2022 -0400

    created persona user for testing, working on items

[33mcommit 8ae02616ce9b896f49317a73653c508258da89f5[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu May 19 20:52:21 2022 -0400

    added few comments

[33mcommit b1ce082178d42377064ebba904ac10769e605f3c[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu May 19 20:51:03 2022 -0400

    working on seed

[33mcommit 47316ce945d636dc454f03aaaa566ec875ff4288[m
Merge: 350a3f1 efec48c
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu May 19 20:35:32 2022 -0400

    Merge branch 'adding-routes' into create-seed

[33mcommit efec48cfc095c1f8da9afbe980c6378541d56c68[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu May 19 20:35:11 2022 -0400

    Changed users controller name to profiles

[33mcommit acbfe13e591308f5c08758edb76a8034e3a25657[m
Merge: 302fd3f c50a974
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu May 19 20:29:46 2022 -0400

    Merge branch 'master' into adding-routes

[33mcommit c50a974b930cecf5fc4ae1955f9a50374bfc92d5[m
Merge: fdb64d0 afaead4
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Thu May 19 20:28:47 2022 -0400

    Merge pull request #4 from MarlAndre/controllers
    
    created controllers for chatrooms, messages, users

[33mcommit fdb64d03d9ea573c92b95cc9c25d98771180d018[m
Merge: e38ca90 9760334
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Thu May 19 20:27:34 2022 -0400

    Merge pull request #6 from MarlAndre/model-validations
    
    added validations in all created models

[33mcommit 350a3f134c94dd1736bba673609ed6ff8cf5429e[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu May 19 20:13:22 2022 -0400

    imported code from pokemonDo, keeping what can be usefule

[33mcommit 97603343ac08a71cae16d99f303012ef53411c70[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu May 19 19:52:51 2022 -0400

    added validations in all created models

[33mcommit 302fd3fb3a7c9787a88d9fe560d7a9d3f8768dda[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu May 19 19:50:34 2022 -0400

    added all routes for project

[33mcommit afaead48fd5e4a8e7bca79e3ccfa32b9c4f68bf6[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Thu May 19 19:19:29 2022 -0400

    created controllers for chatrooms, messages, users

[33mcommit d2da82e9231f93360d20c115ad77b5ac41e7b772[m
Merge: 66c081e e38ca90
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Thu May 19 07:50:12 2022 -0400

    Merge branch 'master' into adding-routes

[33mcommit e38ca9058f9e8a81ad0a5aba778c21183eac80c0[m
Merge: b8983f5 ef2c48b
Author: Denzel Braithwaite <85902450+DenzelBraithwaite@users.noreply.github.com>
Date:   Thu May 19 07:48:37 2022 -0400

    Merge pull request #3 from MarlAndre/models
    
    kickstart models and items controller

[33mcommit ef2c48bff84b027638671ce9b7bc3030fc1270b9[m
Author: stshayna@gmail.com <stshayna@gmail.com>
Date:   Wed May 18 21:05:48 2022 -0400

    kickstart models and items controller

[33mcommit 66c081eaa02fec8b9c355277d003323532ffe3cc[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 17 21:48:18 2022 -0400

    saving work for tonight, working on adding all routes

[33mcommit b8983f54b0881d910b68819ec870b7eec9cd72c2[m
Merge: 286b38f 038dd87
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Tue May 17 20:43:45 2022 -0400

    Merge pull request #2 from MarlAndre/install-active-storage
    
    Install active storage

[33mcommit 286b38f29b7a2d6a10a67ecd77b8f85fb59c132f[m
Merge: c210d03 ec30421
Author: stshayna <75033073+stshayna@users.noreply.github.com>
Date:   Tue May 17 20:41:53 2022 -0400

    Merge pull request #1 from MarlAndre/add-faker-gem
    
    adds faker and colorize gem

[33mcommit 038dd874874d1ed44b36ae8d1563d75f82999200[m[33m ([m[1;31morigin/install-active-storage[m[33m)[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 17 20:33:02 2022 -0400

    added active storage support for seed file (so we can destroy the DB)

[33mcommit ec3042178cb25bcd0fb9e4627be9ce57e96f1ad3[m[33m ([m[1;31morigin/add-faker-gem[m[33m)[m
Author: Denzel Braithwaite <braithwaite.d@hotmail.com>
Date:   Tue May 17 20:16:45 2022 -0400

    adds faker and colorize gem

[33mcommit c210d0339f87aaa50b585be9355b6fb0560da6c4[m
Author: Williams <valerow@outlook.com>
Date:   Sat May 14 17:43:51 2022 -0400

    testing

[33mcommit 2e24edd4a0fc7def2914ebdc86fad361bd3580d9[m
Author: Marlene Andre <andre.marlene1990@gmail.com>
Date:   Sat May 14 17:28:42 2022 -0400

    Initial commit with devise template from https://github.com/lewagon/rails-templates