Add some local editor stuff #305
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vhoof
approved these changes
Jul 18, 2019
|
Why is circleci still in waiting status? |
vhoof
pushed a commit
that referenced
this pull request
Jul 27, 2019
* initial layout * day two * fixed the specs and Tags * fixed the border colors * fixed spacing * line spacing * code review changes * fixes icons * linting fixes * code review changes * corrections * liting * spacing * spacing tag * linting * -color difficulty icon * footer * merge fixes * spacing * linting * linting * Clear up some endpoint naming shenanigans (#297) * Clear up some endpoint naming shenanigans * Get error messages to work correctly * Use plural entities in api * linting errors * linting * linting fixes * errors * linting * linting progress * linting closer * final linting * final linting 1 * final linting * change font size * changed font size * css changes * fixed linter issues * fixed style of edit user modal * fixed all modal related names to be specific to the edit modal so there aren't overlap issues with the delete modal * fixed button layout and cleaned up some comments * database now updates when user information is saved * changed Users.js back to functional component with hooks * pulled out onClick function * axios recipe * recipecard function * add route on recipecard page * fixed image * recipe page * fixes scroll page * updates * image fix * linting * linting issues * componentdidmount * dependency * modified the recipe photo name , added the window scroll function * set state variable * state * Revert "modified the recipe photo name , added the window scroll function" This reverts commit d0266c1. * reverted the command * Revert "reverted the command" This reverts commit d96faa7. * scroll to top, recipe-image-wrapper * cookie methods * removes consoles * fix package page * Add some local editor stuff (#305) * Use a blank volume for node_modules to prevent installation issues (#307) * open to false, componentdidmount * false * name changes * Feature/198 (#296) * Add dropdown header working on logged in header will be removing some folders working on logged in headerDropdown updated headerDropdown added profile picture to headerDropdown added css and changed style for headerDropdown component * Hook up login * Fix toggling of search instructions (#309)
vhoof
added a commit
that referenced
this pull request
Aug 9, 2019
* initial layout * day two * fixed the specs and Tags * fixed the border colors * fixed spacing * line spacing * code review changes * fixes icons * linting fixes * code review changes * corrections * liting * spacing * spacing tag * linting * -color difficulty icon * footer * merge fixes * spacing * linting * linting * Clear up some endpoint naming shenanigans (#297) * Clear up some endpoint naming shenanigans * Get error messages to work correctly * Use plural entities in api * linting errors * linting * linting fixes * errors * linting * linting progress * linting closer * final linting * final linting 1 * final linting * change font size * changed font size * css changes * fixed linter issues * fixed style of edit user modal * fixed all modal related names to be specific to the edit modal so there aren't overlap issues with the delete modal * fixed button layout and cleaned up some comments * database now updates when user information is saved * changed Users.js back to functional component with hooks * pulled out onClick function * axios recipe * recipecard function * add route on recipecard page * fixed image * recipe page * fixes scroll page * updates * image fix * linting * linting issues * componentdidmount * dependency * modified the recipe photo name , added the window scroll function * set state variable * state * Revert "modified the recipe photo name , added the window scroll function" This reverts commit d0266c1. * reverted the command * Revert "reverted the command" This reverts commit d96faa7. * scroll to top, recipe-image-wrapper * cookie methods * removes consoles * fix package page * Add some local editor stuff (#305) * Use a blank volume for node_modules to prevent installation issues (#307) * open to false, componentdidmount * false * name changes * Feature/198 (#296) * Add dropdown header working on logged in header will be removing some folders working on logged in headerDropdown updated headerDropdown added profile picture to headerDropdown added css and changed style for headerDropdown component * Hook up login * Fix toggling of search instructions (#309) * added mailers * Feature/277 (#304) * Changed placeholder in search bar * changed made * tried to add collapsible box * pushed changes * testing collapsible panel * removed test file * collapsible panel working and css still needs working * fixing css properties to match mockup * pushing changes * messing with css * messing with css * commiting before pull changes from staging * testing css * got collapse keyword to close panel * trying to scale boxes * trying to scale boxes * trying to scale boxes * Changed eslint verison * need to make button disappear when clicked * button now disappears when clicked and reappears when panel is collapsed * added containers to search bar and chevron button. now chevron button is more relative when page shrinks * fixed css file * making requested code changes * trying to fix package.json file * trying to fix package.json file * removing dependecies from package file * removing dependecies from package file * getting ready to checkout package and lockfile * revert package files * copied package files from stagin * making suggested changes * making suggested changes * still making suggested changes * still making suggested changes * Revert package changes * fixed destructuring statements * fixed destructuring and setstate callback * fixed lint errors * fixed naming convention in css file * trying to pull ternary out of render and into a method that renders the button and search instructions * trying to get renderexplainer panel to work in render * fixing recommended changes * added ternary to render in order to show/collapse search instructions * fixed linter issues * fixed style of edit user modal * add is_suspended to users table * trying to get modal to pop up * seed file * Added a default hidden icon for suspended user * Modal * created suspend modal and trying to have same modal pop up on button click * Rando testing * fixed linter issues * fixed style of edit user modal * fixed all modal related names to be specific to the edit modal so there aren't overlap issues with the delete modal * fixed button layout and cleaned up some comments * Suspend user button displays the suspend user modal * Added functionality to the close button in AdminSuspendModal * Added some CSS to AdminSuspendModal to match edit modal * fixing merge cinflicts * created suspendUser in apiClient.js and trying to pass row id as parameter * cleaning up merge changes * nothing new * Suspend icons display depending on if user is_suspended or not * Linter fixes * trying to fix patch call on suspend user method * suspend user works but refresh is not implemented yet * fixed merge conflicts * lint fixes * Changed % to px in css re: Jesse's PR comment * Suspend button also closes modal * Icons update when suspend user button clicked * able to block suspended email from signing in * as of right now submit does not able to connect to backend (500) * Corrected alignment of icons * final changes * Fixed CSS to remove borders on suspend icon * making recommended pr changes * Made a couple changes RE: changes requested * fixed indentation on modal button declarations * fixed indentation on modal button declarations * created migration file and added methods to user.rb to stop suspended user from signing in * trying to get device to display message related to suspended users * trying to get device to display error message * added custom error message and model methods in user * undid last migration files and fixed other files affected * looking up how to send error message to frontend * still trying to get error message to frontend * got appropriate error message to appear below sign in button * merge issues * revert package file * fixing suggested changes * changed suspendUser method in apiClient file * merge issues from staging * package revert and removed comments * Changed component from class to functional * Fixed close-modal icon links * suggested changes * deleted html.erb files * deleted additional files * Feature/246/password reset (#300) * password verifitication alert * some reset password logic written * front end of email input written * request new password logic * chekcing errors * incorporating feedback * small changes * updated password reset in apiclient to work * updated password reset in apiclient to work * replaced redirect with success message * trying to fix merge conflicts * removed duplicate export * incporating feedback * implementing feedback and changed error message display * changed error message * reordered apiClient * changed error message and added error for other conditions. * fixing package.json issue * fixing other package.json issue * changed link color * removing recipe controller file * removing recipe controller * trying to fix circle/ci failing * Add tool-versions file (#312) * Feature/164 2 (#315) * Current user data displays in console * Component displays undefined property of user object * Profile page displays current user's name * Added error message to display when user is not logged in. * trying to fix eslint issues * Refactoring conditional in render function * Simplify profile page render functions * Add from email for devise mailings * Add redirect kludge for reset password * Update reset password to use properly named token * changed greeting and password change * save * Add newline to template * Feature/246/controller (#316) * override divise passwordscontroller and updated routes * updated the password controller so that it returns a user * auto login implemented * remove console log * fixing linter issues * added link to reset request * Add rudimentary cloudinary uploader (#314) * Feature/235/edit search (#298) * adds new lozenge component * adds lozenge bubbles with search terms to homepage * adds recipe search result number * has lozenges and search result number appear after a search has been made * adds some styling to results counter and fixes some changes that were requested * fixes some css on the lozenge bubbles * fixes changes requested * fixes indentation errors * adds lozenge delete functionality and embedds both components into RecipeSearchList * adds semicolon in ResultsCounter * Remove parsed from props * Fix auth-related page styling and several other things (#313) * DRY up the auth components * Tweak font and a few styling issues * Restore thank you card
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ticket Number:
???
Describe The Problem Being Solved:
Hopefully some of the local env issues we've been having surrounding language versions & code formatting.
Checklist For Submitter
[ ] I have screenshotted new UI changes and attached them to this PR