Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Fix/heroku host (#24) * Create issue_template.md * Update issue templates * Update issue templates * Update issue templates * make it better * make it better * server moved to root; renamed habit-tracker to client; tweaked .gitignore * indicated static files are where React is * added heroku-postbuild for React * Added proxy for express port * rename require statement to include Habit.js * renaming Models2 to models * added path var * removed build from repo; added to .gitignore * got rid of favicon.ico refs * Update README.md * 🐛 added dotenv files to .gitignore (#27) * Feature/auth firebase - Google sign-in - 🦄 (#30) * 🐛 added dotenv files to .gitignore * 🦎 removed logo * following firebase tutorial https://blog.bitsrc.io/react-oauth-authentication-with-firebase-dfe0e8c5d0d4 * added back favicon refs to resolve compile errors; button added * portion of google auth working; scope not working * google auth working... now have to pass state * google-auth is working * fixed up special thanks link * Travis CI Version 1.0.0 (#33) * add concurrently to start both server and client locally at the same time * Fix/css setup merge (#37) * add google font * merge conflict * added files * header components created * sample text styles added * excess files removed * merged PR #36 locally * added content to Layout.cs * merge PR #36 * Newhabit (#42) * newhabit form version 1.0.0 * attached new habit form to POST request API, and created form validation * corrected merge conflict * form component created * form layout complete * specified node version in travis.yml (#45) * Dotenv configuration for backend (#43) * Packge.json: Run npm install in client folder everytime you run npm install on main app * Load DB Key from .env -Added dotenv npm package -Remove keys.js -Load DB key from .env file * Fix/backend routing (#47) * Create issue_template.md * Update issue templates * Update issue templates * Update issue templates * added static.json * Packge.json: Run npm install in client folder everytime you run npm install on main app * Load DB Key from .env -Added dotenv npm package -Remove keys.js -Load DB key from .env file * minor change to redo build on heroku * added express routing code * removed rubbish from path * specified client/build/index.html * routing resolved * removed testing string * header componet added * clean up started, circle styling started * clean up CSS, circle styled * google button styling added, css clean up * Update .gitignore * imput tags closed * check-in form added to Router * pull revisions * added closing tags for <br> in check-in.js (#53) * Update check-in.js extra closing > removed from <br /> * Update habit-tracker-feature.md * Update habit-tracker-feature.md * Update habit-tracker-feature.md * Update habit-tracker-feature.md * Create habit-tracker-wip * Update and rename habit-tracker-wip to habit-tracker-wip.md * Update habit-tracker-wip.md * Update habit-tracker-wip.md * Update habit-tracker-wip.md * Update habit-tracker-wip.md * Update habit-tracker-wip.md * Update habit-tracker-bug.md * Update habit-tracker-bug.md * Update habit-tracker-feature.md * Update habit-tracker-wip.md * Backend Work for Checkin Submission (#67) * Update Schema to include Array of checkins * Add API method to complete a checkin for a given habit * Add functionality to checkin form - Basically borrowed all the concepts from the New Habit form, albeit with less validation - Temporarily added Habit field for manual habit ID entry - Confirmed that it can update habits on the backend * CSS clean up (#73) * deleted based on tutorial * css consulidated to index.css/ parent level * new habit css cleaned up * forms using same styling * making form styles match * console errors cleaned up * bug, login not working see if this fixed * added dashboard.css to index.css * default page adjusted and styled * NewHabit Version 2.0 (#71) * NewHabit Version 2.0 * New Habit 2.1 * Feature/user settings menu setup (#74) * 🐛 - adding 404 page not found component Ugly but functional 404 page not found #49 * deleted based on tutorial * css consulidated to index.css/ parent level * new habit css cleaned up * forms using same styling * making form styles match * console errors cleaned up * bug, login not working see if this fixed * added dashboard.css to index.css * default page adjusted and styled * header state * log out and other buttons moved to header-logged-in * header google info not showing * fixed merge conflict * removed provider (google) name * commented-out unlink button * removed heading for 'Connected Social Accounts' * created footer component; playing with header and layout structure * testing profile picture in header * added footer component and HeaderLoggedIn container * fixed up header format; copied SocialProfileList.css into index.css * added back logout and unlink buttons for testing * Fixed syntax error handleUnlinkedProvider; resolve compile errors on className * 💄 - fixed as per code review Changed to h2; removed "404 error" from App.js. #72 * ✨ - added 'Enter New Habit' to header for testing * 💄 - fixed up initial login screen to show header * 💄 - moved footer to the bottom * ✨ - Moved profile picture; fixed up headers This was a combination of a branch @SaraSweetie was working on earlier; and some other bugs... primary purpose was to move the user's profile picture into the top right corner. The hamburger button is currently not working but all the buttons have been place in the header for testing purposes #40 * New Habit 2.2 added close button (#75) * GET Request (#81) * New Habit 2.2 added close button * GET request to retrieve habit info * New habit edge (#82) * New Habit 2.2 added close button * GET request to retrieve habit info * removed route for newhabit * hamburger component created * state not passing to hamburger menu button * slide out menu positioned and styled * Feature/widget calendar (#83) * ✨ - added react-calendar-heatmap Added a progress component with now holds the first widget, react-calendar-heatmap. #78 * 🐛 - fixed up the display copying bootstrap ref * ➕ - added react-tooltip * ➕ - added ReactTooltip to client * 🐛 - tweaked footer css; remove bootstrap * 💄 - made the calendar heatmap a sep component * 🐛 - fixed spacing on NotFound component (#84) * Added additional supporting backend methods (#85) * Countdown timer (#86) * Added additional supporting backend methods * Call logged in users first habit instead of hardcoded habit * Add Current Habit info to dashboard * Countdown for current habit in dashboard * pushing progress * not working * paired programming props passed down -- working * New User Functionality (#87) * New Habit 2.2 added close button * GET request to retrieve habit info * removed route for newhabit * New User Functionality * clean up unused code * button styling * duplicate button deleted merge conflict from hamburger-menu PR. Duplicate buttons. * Check in (#91) * New Habit 2.2 added close button * GET request to retrieve habit info * removed route for newhabit * New User Functionality * Updated Logic on Dashboard * Fixed New Habit Entry edge case * Check in - Responsive Update (#93) * New Habit 2.2 added close button * GET request to retrieve habit info * removed route for newhabit * New User Functionality * Updated Logic on Dashboard * Fixed New Habit Entry edge case * made check in and newhabit forms responsive * Header sidebar page added, Login Circle fixed (#95) * layout circle appearing on log in * text added to login and footer, footer centered * user settings page shell created * User settings linked * user login info centered * font awesome library updated, close icon added to logout * hamburger menu hover color added * unlink button still needs uncommented and moved * Check in (#96) * New Habit 2.2 added close button * GET request to retrieve habit info * removed route for newhabit * New User Functionality * Updated Logic on Dashboard * Fixed New Habit Entry edge case * made check in and newhabit forms responsive * Update to keep checkins to once per day * Map habit checkins to calendar values (#97) * Current habit - fix react error (#98) * switching branches * unlink button uncommented, styled * Feature/cal tool tip (#101) * ✨ - adding tooltip popup; null values now Using demo reference https://codesandbox.io/s/73mk9wlyx and npm react-calendar-heatmap doc: https://www.npmjs.com/package/react-calendar-heatmap / https://github.com/okize/react-calendar-heatmap #78 * ✨ - tooltip displays effort in pop-up used reverse lookup function for effort value object: https://stackoverflow.com/questions/9907419/how-to-get-a-key-in-a-javascript-object-by-its-value #78 * 🎨 - time added but unable to substring #101 * Fix formatting on tooltips (#103) * Make checkins appear immediately (#104) * Css mobile (#105) * hamburger button moved for mobile * header layout for mobile * sidebar adjusted for mobile because header height adjusted * circle removed from mobile * width made responsive % not fixed px value * Added new CheckiDtail component (#106) * About Text added, Small CSS changes (#107) * typo fix, minor wording changes * about text added, slideout width increased * log-in page and new-habit module screenshots * sidebar height adjusted, overflow scrolled added * heat map font size smaller * images added to about slideout * link hover styles added * screenshots * Added delete habit button to user settings page (#108) * Fix/calendar doesnt include today (#109) * Start calendar 1 day earlier * Remove unnecessary toDate() call * Fix minor erros and warnings (#110)
- Loading branch information
