Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UI dev #17

Open
wants to merge 171 commits into
base: main
Choose a base branch
from
Open

UI dev #17

wants to merge 171 commits into from

Commits on Oct 18, 2021

  1. fixing time and date displaying wrong information

    @EmilianoHuerta
    EmilianoHuerta committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    2d5136c View commit details
    Browse the repository at this point in the history

  2. fixing routing issues

    @EmilianoHuerta
    EmilianoHuerta committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    757c1bf View commit details
    Browse the repository at this point in the history

  3. implementing full-calender from api

    @EmilianoHuerta
    EmilianoHuerta committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    9e38496 View commit details
    Browse the repository at this point in the history

  4. updating package lock

    @EmilianoHuerta
    EmilianoHuerta committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    81fb55b View commit details
    Browse the repository at this point in the history

  5. attempts at fixing profile formatting

    @EmilianoHuerta
    EmilianoHuerta committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    a11c1b7 View commit details
    Browse the repository at this point in the history

  6. Deleting Calendar.js

    @EmilianoHuerta
    EmilianoHuerta committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    147f081 View commit details
    Browse the repository at this point in the history

  7. fixing exports for testing

    @EmilianoHuerta
    EmilianoHuerta committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    dfa745c View commit details
    Browse the repository at this point in the history

  8. Updating event-utils

    @EmilianoHuerta
    EmilianoHuerta committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    a935d7c View commit details
    Browse the repository at this point in the history

  9. removing calendar pic and main jsx

    @EmilianoHuerta
    EmilianoHuerta committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    4e6f109 View commit details
    Browse the repository at this point in the history

  10. introducing css file

    @EmilianoHuerta
    EmilianoHuerta committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    5c6ffdf View commit details
    Browse the repository at this point in the history

  11. removing on confirm issue, will add in a remove option later

    @EmilianoHuerta
    EmilianoHuerta committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    8adac35 View commit details
    Browse the repository at this point in the history

  12. fixing shrinkage on image hover

    @EmilianoHuerta
    EmilianoHuerta committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    9a182f1 View commit details
    Browse the repository at this point in the history

  13. updating button font family

    @EmilianoHuerta
    EmilianoHuerta committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    2c9b1cd View commit details
    Browse the repository at this point in the history

  14. centered text on profile pages

    @jawhitelaw
    jawhitelaw committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    7ab018d View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2021

  1. fix error

    @jawhitelaw
    jawhitelaw committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    dfed6da View commit details
    Browse the repository at this point in the history

  2. updating bug fix for time clock WIP

    @EmilianoHuerta
    EmilianoHuerta committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    d6222bb View commit details
    Browse the repository at this point in the history

  3. Updating '/' path to redirect to '/Home' from start

    @EmilianoHuerta
    EmilianoHuerta committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    165e70f View commit details
    Browse the repository at this point in the history

  4. fixing grammar errors

    @EmilianoHuerta
    EmilianoHuerta committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    01cd061 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2021

  1. generate recipe title

    @jawhitelaw
    jawhitelaw committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    9877d02 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2021

  1. fixing timeclock error after 12pm

    @EmilianoHuerta
    EmilianoHuerta committed Nov 1, 2021
    Configuration menu
    Copy the full SHA
    444bc55 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2021

  1. Added instructions to home page

    @abigailstolp
    abigailstolp committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    b1ea30c View commit details
    Browse the repository at this point in the history

  2. Fixed filteredRecipesData undefined error that came from generating r… 

    …ecipes without filling out profile. Instructs user to go fill out profile first
    @kate2724
    kate2724 committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    a653afc View commit details
    Browse the repository at this point in the history

  3. Fixed home page typo, added Grocery List page again

    @kate2724
    kate2724 committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    708e755 View commit details
    Browse the repository at this point in the history

  4. fixed type

    @kate2724
    kate2724 committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    5e4995c View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2021

  1. removing context adding to index.html

    @EmilianoHuerta
    EmilianoHuerta committed Nov 3, 2021
    Configuration menu
    Copy the full SHA
    6c3709f View commit details
    Browse the repository at this point in the history

  2. removing dateTime implementation in App.js

    @EmilianoHuerta
    EmilianoHuerta committed Nov 3, 2021
    Configuration menu
    Copy the full SHA
    dc997f6 View commit details
    Browse the repository at this point in the history

  3. adding in a react component for rendering

    @EmilianoHuerta
    EmilianoHuerta committed Nov 3, 2021
    Configuration menu
    Copy the full SHA
    9a4527b View commit details
    Browse the repository at this point in the history

  4. fixing logic with time rendering

    @EmilianoHuerta
    EmilianoHuerta committed Nov 3, 2021
    Configuration menu
    Copy the full SHA
    b29b4b8 View commit details
    Browse the repository at this point in the history

  5. updating imports

    @EmilianoHuerta
    EmilianoHuerta committed Nov 3, 2021
    Configuration menu
    Copy the full SHA
    15c0462 View commit details
    Browse the repository at this point in the history

  6. added recipe image

    @jawhitelaw
    jawhitelaw committed Nov 3, 2021
    Configuration menu
    Copy the full SHA
    e3d0616 View commit details
    Browse the repository at this point in the history

  7. fixing time format

    @EmilianoHuerta
    EmilianoHuerta committed Nov 3, 2021
    Configuration menu
    Copy the full SHA
    8dc768d View commit details
    Browse the repository at this point in the history

  8. bullshit

    @jawhitelaw
    jawhitelaw committed Nov 3, 2021
    Configuration menu
    Copy the full SHA
    d7452df View commit details
    Browse the repository at this point in the history

  9. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @jawhitelaw
    jawhitelaw committed Nov 3, 2021
    Configuration menu
    Copy the full SHA
    5d3cc67 View commit details
    Browse the repository at this point in the history

  10. attemp at fixing time clock

    @EmilianoHuerta
    EmilianoHuerta committed Nov 3, 2021
    Configuration menu
    Copy the full SHA
    089ac02 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2021

  1. Deleted commented out guidance code

    @kate2724
    kate2724 committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    efbe8ad View commit details
    Browse the repository at this point in the history

  2. changed misnamed recipeId variable, exported savedRecipes

    @kate2724
    kate2724 committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    86103ec View commit details
    Browse the repository at this point in the history

  3. debugging attempts

    @kate2724
    kate2724 committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    0914676 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2021

  1. code wasn't running, reverted to previous commit

    @kate2724
    kate2724 committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    63c6f73 View commit details
    Browse the repository at this point in the history

  2. Deleted extra code

    @kate2724
    kate2724 committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    fc8ef8f View commit details
    Browse the repository at this point in the history

  3. formatting

    @kate2724
    kate2724 committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    aed3b3c View commit details
    Browse the repository at this point in the history

  4. renamed variables for clarity

    @kate2724
    kate2724 committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    7559224 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2021

  1. Fixed bug, made save and get recipe buttons work

    @kate2724
    kate2724 committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    c2c6517 View commit details
    Browse the repository at this point in the history

  2. added back save button to profile diet page

    @kate2724
    kate2724 committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    a13cd31 View commit details
    Browse the repository at this point in the history

  3. fixed bug of filtered recipes undefined when profile not filled out

    @kate2724
    kate2724 committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    7b86661 View commit details
    Browse the repository at this point in the history

  4. Fixed filteredRecipes undefined error (third try)

    @kate2724
    kate2724 committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    f291f77 View commit details
    Browse the repository at this point in the history

  5. updating link to recipe page

    @EmilianoHuerta
    EmilianoHuerta committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    b837d8c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @EmilianoHuerta
    EmilianoHuerta committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    35fb377 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2021

  1. debugging Grocery List page (still errors)

    @kate2724
    kate2724 committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    b508d33 View commit details
    Browse the repository at this point in the history

  2. took out opts, can get ingredients with specific id

    @kate2724
    kate2724 committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    2c7c4ed View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2021

  1. added recipe link with bugs

    @jawhitelaw
    jawhitelaw committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    b33bd3d View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2021

  1. partially fixed recipe page

    @jawhitelaw
    jawhitelaw committed Nov 16, 2021
    Configuration menu
    Copy the full SHA
    95f6ea7 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2021

  1. finished all recipe page functionality

    @jawhitelaw
    jawhitelaw committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    5bd2b73 View commit details
    Browse the repository at this point in the history

  2. commented out api call on grocery page

    @jawhitelaw
    jawhitelaw committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    7b405f3 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2021

  1. updating calendar to appear as week only

    @EmilianoHuerta
    EmilianoHuerta committed Nov 28, 2021
    Configuration menu
    Copy the full SHA
    d2cb451 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2021

  1. added more to groceryList page, ingredients show up on console

    @kate2724
    kate2724 committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    d470183 View commit details
    Browse the repository at this point in the history

  2. took out excess code

    @kate2724
    kate2724 committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    7eb68f8 View commit details
    Browse the repository at this point in the history

  3. debugging attempts to make ingredients show on screen

    @kate2724
    kate2724 committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    4077128 View commit details
    Browse the repository at this point in the history

  4. new API key

    @abigailstolp
    abigailstolp committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    c950c02 View commit details
    Browse the repository at this point in the history

  5. new API key

    @abigailstolp
    abigailstolp committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    67562ed View commit details
    Browse the repository at this point in the history

  6. fixed undefined title bug

    @jawhitelaw
    jawhitelaw committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    5db2edc View commit details
    Browse the repository at this point in the history

  7. adding in css spacing

    @EmilianoHuerta
    EmilianoHuerta committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    eb4c4ae View commit details
    Browse the repository at this point in the history

  8. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @EmilianoHuerta
    EmilianoHuerta committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    0c1c8ed View commit details
    Browse the repository at this point in the history

  9. fixed recipe formatting

    @jawhitelaw
    jawhitelaw committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    1e7d9ae View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2021

  1. fixed image/text disappearing bug

    @jawhitelaw
    jawhitelaw committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    83a3abd View commit details
    Browse the repository at this point in the history

  2. debugging attempts of grocery list

    @kate2724
    kate2724 committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    80e224d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @kate2724
    kate2724 committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    43ef4fc View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2021

  1. debugging grocery list, added comments

    @kate2724
    kate2724 committed Dec 1, 2021
    Configuration menu
    Copy the full SHA
    f4b6652 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2021

  1. fixing calendar events to update with INITAL_EVENTS as elements are a… 

    …dded to the array
    @EmilianoHuerta
    EmilianoHuerta committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    06b6b3f View commit details
    Browse the repository at this point in the history

  2. Update spoonacular.js

    @EmilianoHuerta
    EmilianoHuerta committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    2b521d5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @EmilianoHuerta
    EmilianoHuerta committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    107cd58 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2021

  1. profile saves checkbox selections and overwrites previous selections

    @jawhitelaw
    jawhitelaw committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    aece9af View commit details
    Browse the repository at this point in the history

  2. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @jawhitelaw
    jawhitelaw committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    46e3c49 View commit details
    Browse the repository at this point in the history

  3. added clear saved recipes button to Recipes.js, debugging groceryList

    @kate2724
    kate2724 committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    ea91075 View commit details
    Browse the repository at this point in the history

  4. moved functions out of render in groceryList

    @kate2724
    kate2724 committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    f51f7a7 View commit details
    Browse the repository at this point in the history

  5. put profile higher in sidebar

    @kate2724
    kate2724 committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    f41b752 View commit details
    Browse the repository at this point in the history

  6. added user instructions, page doesn't rerender when coming from profi… 

    …le though
    @kate2724
    kate2724 committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    446c70f View commit details
    Browse the repository at this point in the history

  7. changed api key

    @kate2724
    kate2724 committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    887295c View commit details
    Browse the repository at this point in the history

  8. improved user instructions

    @kate2724
    kate2724 committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    c6a81a6 View commit details
    Browse the repository at this point in the history

  9. more userInstructions

    @kate2724
    kate2724 committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    f0c31f9 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2021

  1. README test

    @abigailstolp
    abigailstolp committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    f4fcfc0 View commit details
    Browse the repository at this point in the history

  2. Updated README

    @abigailstolp
    abigailstolp committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    8f779d6 View commit details
    Browse the repository at this point in the history

  3. Updated README

    @abigailstolp
    abigailstolp committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    74f0d69 View commit details
    Browse the repository at this point in the history

  4. Homepage Instructions

    @abigailstolp
    abigailstolp committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    2d01fea View commit details
    Browse the repository at this point in the history

  5. updating calendar and event-utils api pull methods

    @EmilianoHuerta
    EmilianoHuerta committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    df5c38c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @EmilianoHuerta
    EmilianoHuerta committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    d1a7fd9 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2021

  1. fixed callback issues, list now fills

    @kate2724
    kate2724 committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    1e208da View commit details
    Browse the repository at this point in the history

  2. printed grocery list to screen, deleted excess code

    @kate2724
    kate2724 committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    9ab1b6f View commit details
    Browse the repository at this point in the history

  3. adding comments to functions

    @EmilianoHuerta
    EmilianoHuerta committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    2c0a6f6 View commit details
    Browse the repository at this point in the history

  4. adding in comments

    @EmilianoHuerta
    EmilianoHuerta committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    9988382 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @EmilianoHuerta
    EmilianoHuerta committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    f95d425 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2021

  1. removing user ability to add / change events

    @EmilianoHuerta
    EmilianoHuerta committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    a5b2f8e View commit details
    Browse the repository at this point in the history

  2. implmented new array indexing for js object

    @EmilianoHuerta
    EmilianoHuerta committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    a88c5f3 View commit details
    Browse the repository at this point in the history

  3. grammar fix on homepage

    @abigailstolp
    abigailstolp committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    36d66d3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @abigailstolp
    abigailstolp committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    359d613 View commit details
    Browse the repository at this point in the history

  5. enabled removal of events from the calendar if no longer needed // mu… 

    …st update saved recipes
    @EmilianoHuerta
    EmilianoHuerta committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    648c30e View commit details
    Browse the repository at this point in the history

  6. adding comments for future removal method

    @EmilianoHuerta
    EmilianoHuerta committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    f78a9f4 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @EmilianoHuerta
    EmilianoHuerta committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    6baa9b5 View commit details
    Browse the repository at this point in the history

  8. adding in comments for future removal method

    @EmilianoHuerta
    EmilianoHuerta committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    8b7d72d View commit details
    Browse the repository at this point in the history

  9. creating search and remove methods for initial events

    @EmilianoHuerta
    EmilianoHuerta committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    30c3a26 View commit details
    Browse the repository at this point in the history

  10. implementing search and remove methods // not fully implemented

    @EmilianoHuerta
    EmilianoHuerta committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    5a974fc View commit details
    Browse the repository at this point in the history

  11. adding in comments for functions

    @EmilianoHuerta
    EmilianoHuerta committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    70a5332 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2021

  1. implmenting new search method by title

    @EmilianoHuerta
    EmilianoHuerta committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    2b14a92 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2021

  1. grocery list now displays groceries on new lines

    @kate2724
    kate2724 committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    86bfe8a View commit details
    Browse the repository at this point in the history

  2. added some notes

    @kate2724
    kate2724 committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    5822539 View commit details
    Browse the repository at this point in the history

  3. added style elements to grocery list

    @kate2724
    kate2724 committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    9618022 View commit details
    Browse the repository at this point in the history

  4. fixed cuisine bug

    @jawhitelaw
    jawhitelaw committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    fee2519 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @jawhitelaw
    jawhitelaw committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    6161229 View commit details
    Browse the repository at this point in the history

  6. fixed typos

    @kate2724
    kate2724 committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    729067a View commit details
    Browse the repository at this point in the history

  7. fully implement removal on events and current events

    @EmilianoHuerta
    EmilianoHuerta committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    868ba71 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @EmilianoHuerta
    EmilianoHuerta committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    e2604e6 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2021

  1. fixed empty list bug

    @kate2724
    kate2724 committed Dec 11, 2021
    Configuration menu
    Copy the full SHA
    3e22170 View commit details
    Browse the repository at this point in the history

  2. implemented button link to recipe, will develop further so that all s… 

    …aved recipes will have button links
    @kate2724
    kate2724 committed Dec 11, 2021
    Configuration menu
    Copy the full SHA
    3143851 View commit details
    Browse the repository at this point in the history

  3. displays links to saved recipes

    @kate2724
    kate2724 committed Dec 11, 2021
    Configuration menu
    Copy the full SHA
    0ab9756 View commit details
    Browse the repository at this point in the history

  4. fixing hour bug before 12pm

    @jawhitelaw
    jawhitelaw committed Dec 11, 2021
    Configuration menu
    Copy the full SHA
    446fad7 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2021

  1. changed formatting

    @kate2724
    kate2724 committed Dec 12, 2021
    Configuration menu
    Copy the full SHA
    d42ce1b View commit details
    Browse the repository at this point in the history

  2. changed formatting to wrap excess buttons

    @kate2724
    kate2724 committed Dec 12, 2021
    Configuration menu
    Copy the full SHA
    a33b4a4 View commit details
    Browse the repository at this point in the history

  3. minor README edit

    @abigailstolp
    abigailstolp committed Dec 12, 2021
    Configuration menu
    Copy the full SHA
    37dc51b View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2021

  1. resized home page photo

    @abigailstolp
    abigailstolp committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    7f732b7 View commit details
    Browse the repository at this point in the history

  2. pushing time fix

    @EmilianoHuerta
    EmilianoHuerta committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    ee276e3 View commit details
    Browse the repository at this point in the history

  3. adding in spacing in title render

    @EmilianoHuerta
    EmilianoHuerta committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    59ec526 View commit details
    Browse the repository at this point in the history

  4. adding in updating saved recipes method from remove in calendar

    @EmilianoHuerta
    EmilianoHuerta committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    5d0af9b View commit details
    Browse the repository at this point in the history

  5. pushing -- still render bug issue

    @EmilianoHuerta
    EmilianoHuerta committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    0dca226 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @EmilianoHuerta
    EmilianoHuerta committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    4cfee09 View commit details
    Browse the repository at this point in the history

  7. removing cs file

    @EmilianoHuerta
    EmilianoHuerta committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    4517209 View commit details
    Browse the repository at this point in the history

  8. adding in sweet alert and css for it

    @EmilianoHuerta
    EmilianoHuerta committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    ff28781 View commit details
    Browse the repository at this point in the history

  9. updating node packages

    @EmilianoHuerta
    EmilianoHuerta committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    0e91d7f View commit details
    Browse the repository at this point in the history

  10. adding in comment with source for popup

    @EmilianoHuerta
    EmilianoHuerta committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    c757786 View commit details
    Browse the repository at this point in the history

  11. pushing time fix

    @EmilianoHuerta
    EmilianoHuerta committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    a9c613d View commit details
    Browse the repository at this point in the history

  12. installed sweetalert2

    @kate2724
    kate2724 committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    1a13ac4 View commit details
    Browse the repository at this point in the history

  13. fixed render issue on calendar that forced user to click off calendar… 

    … and come back to see recipes. Recipes now appear on calendar on first load
    @kate2724
    kate2724 committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    d714a9d View commit details
    Browse the repository at this point in the history

  14. update calendar state

    @kate2724
    kate2724 committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    765d4be View commit details
    Browse the repository at this point in the history

  15. small edits

    @kate2724
    kate2724 committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    e0e6316 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2021

  1. fixed bugs and improved user experience + ui

    @jawhitelaw
    jawhitelaw committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    1a90984 View commit details
    Browse the repository at this point in the history

  2. improved user experience on recipe page

    @jawhitelaw
    jawhitelaw committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    6104b74 View commit details
    Browse the repository at this point in the history

  3. fixed too specifc profile bug

    @jawhitelaw
    jawhitelaw committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    4f205c3 View commit details
    Browse the repository at this point in the history

  4. fixed duplicate recipe bug

    @jawhitelaw
    jawhitelaw committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    5ae1780 View commit details
    Browse the repository at this point in the history

  5. updating imports alongside changing var states

    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    b6984ff View commit details
    Browse the repository at this point in the history

  6. removing unused code

    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    78099e2 View commit details
    Browse the repository at this point in the history

  7. implementing remove method for saved recipes

    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    7aa4a84 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    df4d057 View commit details
    Browse the repository at this point in the history

  9. removing funciton

    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    5e0d931 View commit details
    Browse the repository at this point in the history

  10. REAME reflects updates

    @abigailstolp
    abigailstolp committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    c83f373 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @abigailstolp
    abigailstolp committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    42df747 View commit details
    Browse the repository at this point in the history

  12. Update README

    @abigailstolp
    abigailstolp committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    fa3e1ab View commit details
    Browse the repository at this point in the history

  13. Update README

    @abigailstolp
    abigailstolp committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    7060c82 View commit details
    Browse the repository at this point in the history

  14. Update README

    @abigailstolp
    abigailstolp committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    73c39f8 View commit details
    Browse the repository at this point in the history

  15. adding in npm react success alert on saved button

    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    f366a3b View commit details
    Browse the repository at this point in the history

  16. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    ca51524 View commit details
    Browse the repository at this point in the history

  17. adding in source for alert

    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    25c2739 View commit details
    Browse the repository at this point in the history

  18. removing certain functions

    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    58062f6 View commit details
    Browse the repository at this point in the history

  19. updating with comments

    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    218e78a View commit details
    Browse the repository at this point in the history

  20. adding in space

    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    0a0ecfc View commit details
    Browse the repository at this point in the history

  21. adding in source for alert

    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    c3fa7bc View commit details
    Browse the repository at this point in the history

  22. removing unused imports

    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    563e8d3 View commit details
    Browse the repository at this point in the history

  23. fixed no recipes on diet page bug

    @jawhitelaw
    jawhitelaw committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    f1b4f77 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @jawhitelaw
    jawhitelaw committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    c239076 View commit details
    Browse the repository at this point in the history

  25. removing unused file

    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    9589177 View commit details
    Browse the repository at this point in the history

  26. adding comments to all functions and necessary vars

    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    a8ab8bf View commit details
    Browse the repository at this point in the history

  27. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    d1c81bc View commit details
    Browse the repository at this point in the history

  28. adding in comments

    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    af6169b View commit details
    Browse the repository at this point in the history

  29. fixed link bug

    @jawhitelaw
    jawhitelaw committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    4e16fec View commit details
    Browse the repository at this point in the history

  30. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @jawhitelaw
    jawhitelaw committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    3ab8d72 View commit details
    Browse the repository at this point in the history

  31. adding in comments for app.js

    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    eea7367 View commit details
    Browse the repository at this point in the history

  32. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @EmilianoHuerta
    EmilianoHuerta committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    ac34580 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2021

  1. made comments and cleaned up code

    @jawhitelaw
    jawhitelaw committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    d09b6c7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @jawhitelaw
    jawhitelaw committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    0d15b21 View commit details
    Browse the repository at this point in the history

  3. adding comments

    @EmilianoHuerta
    EmilianoHuerta committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    95c435e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @EmilianoHuerta
    EmilianoHuerta committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    dc114d9 View commit details
    Browse the repository at this point in the history

  5. fixed linking bug

    @jawhitelaw
    jawhitelaw committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    8559ba8 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d… 

    …evelopment into UI-Dev
    @jawhitelaw
    jawhitelaw committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    26b1bb8 View commit details
    Browse the repository at this point in the history

  7. fixed bug

    @jawhitelaw
    jawhitelaw committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    d11652c View commit details
    Browse the repository at this point in the history