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.

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

Previous emotions #38

Merged
merged 10 commits into from
Oct 18, 2018
Merged

Previous emotions #38

merged 10 commits into from
Oct 18, 2018

Conversation

RobStallion
Copy link
Collaborator

  • Restructure emotion folders
  • Creates helper functions for accessing emotion data
  • Creates the daily calendar emotion view Record emotions  #29 Today's Log template/Calendar Daily view #34
  • Alters happy and angry tables (@Danwhy I have altered the migrations directly here 😱. The reason I did this is because there is currently no data in the database so thought it would be okay. Let me know if this is an issue)
  • Creates share with trusted adult button (currently only the button as share functionality is not yet built)

Copy link
Collaborator

@Danwhy Danwhy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good

@Danwhy Danwhy merged commit 3a1ed50 into master Oct 18, 2018
@Danwhy Danwhy deleted the previous-emotions branch October 18, 2018 10:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants