Add Applications list to Pet show #288
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
Co-authored-by: FionaDL fionadlapham@gmail.com
Co-authored-by: FionaDL fionadlapham@gmail.com
Co-authored-by: FionaDL fionadlapham@gmail.com
aisayo
changed the title
aisayo
changed the title
Co-authored-by: FionaDL fionadlapham@gmail.com
aisayo
changed the base branch from
Staff-can-view-checklist-on-pets-show-and-interact
to
main
aisayo
changed the base branch from
main
to
Staff-can-view-checklist-on-pets-show-and-interact
|
Looks good! At the moment I cannot pull this down as I am on the wrong computer, but is the side navbar now narrower than it was before? It looks like it is. I think we should keep this as it was i.e., the width it is on main right now. |
|
@kasugaijin I did compare the two sidebars, and here is how it looks in main vs this branch main: this branch: I believe the width of the sidebar is still the same. I just fixed the position of the navlinks as they were spilling over to the navlinks that belong to the tabs which was causing a navigation error. I.e. if overview was clicked, it would activate the link for foster applications instead. Happy to revert this change if you would like. Let me know! |
kasugaijin
approved these changes
Oct 20, 2023
|
@aisayo ah thank you for confirming! In that case...looks good to me. |
kasugaijin
merged commit f788559
into
rubyforgood:Staff-can-view-checklist-on-pets-show-and-interact
kasugaijin
added a commit
that referenced
this pull request
Nov 29, 2023
* Update with partial * Update with attempt with nice_partials gem * Syntax cleanup * Added new nice_partails folder * Syntax cleanup * Update with path params value changed * Update Front-end spacing clean up * Added new partials and Table to DB * Update Changed the task list to now be a modal * Post merge commit * Add Applications list to Pet show (#288) * Update sidebar styling to avoid spilling to tab links Co-authored-by: FionaDL fionadlapham@gmail.com * Fix applicant name on applications page Co-authored-by: FionaDL fionadlapham@gmail.com * add applications partial and test Co-authored-by: FionaDL fionadlapham@gmail.com * add tests for application tab Co-authored-by: FionaDL fionadlapham@gmail.com * Clear default_url_options[:script_name] after each test (#287) * Added edit partial * 281: Pets Show Overview Tab make Edit and Delete buttons more visible (#286) * Replace dropdown button with edit button, add delete button beneath summary card * Modify delete button styling * docs: add jadekstewart3 as a contributor for code (#291) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * docs: add edwinthinks as a contributor for code (#292) * docs: update README.md [skip ci] * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ben <95949082+kasugaijin@users.noreply.github.com> * Org dashboard (#290) * Add instance variables that will be used in the dashboard view * Add template html and begin inital formatting to utilize instance variables scoped to organization * remove img tag for non existant avatar * Merge conflict updated * Merge conflict updated * Add column 2 org profiles (#289) * Create migration file to add about us to organization profiles table, and add column to seed files * add about us field for organization_profiles * add validation for about us * add validation for about us * standard * Remove validation that we didnt need * remove null false from migration file and migrate * standard rb * add validation for about us * Add back in accidentially removed validation * Migrate updated migration file * Add null false back into correct place and migrate * remove not null comment * standard rb * merge main * Remove default values from foreign keys (#298) * Improve UI of Accept Invitation Form (#300) * Improve tests stability (#296) * Fix global tests setup * Ensure organization slugs are uniq in tests * Fix factories so they use the same organization for associations * Ensure user emails are uniq in tests * Use current_tenant in factories * Use ActsAsTenant.test_tenant in tests * run standard:fix * fix all contributors table (#293) * 268 part 1: staff can upload profile pic (#276) * Add model changes and tests * Add form field, and changes into the controller * change naming from Picture to Avatar * Run standard fix * Move avatarable tests to shared module * Add uniq index to organization slug (#302) * Merge conflict updated * Update with working but ugly crud features * Syntax error cleanup * Removed binding * Added partial files and corrected before acgtion * Remove 'overview' from the default active tab options * Update Frontend form still nested * Linter error cleanup * Merge conflict resolved * Pet controller refactor * Update with code clean up * Pet controller syntax cleanup * Removed partials * Cleanup Syntax * Test file merge conflict solution * Syntax cleanup * Code refactor * Update spacing in file clean up * Updated frontend with turbo delete button * Update with Features rendering correctly but code is sloppy * Standard error fix * Update spacing and code clean up * Removed unneeded CSS file * Removed more unneeded css * Removed hardcoded org * Added turbo_stream file and last commit before migration that moves away from Tasks * Update with skipped unit tests * Syntax cleanup * Update to spacing * Update spacing cleanup * Update spacing cleanup part 2 * Update spacing and syntax cleanup part 3 * Update styling changes to tasks * Added model tests * Update with passing tests * Update syntax cleanup * Update syntax spacing * Update syntax spacing * Update syntax spacing * Update with Frontend cleanup * Testing all passing * Spacing cleanup * Update cleanup * Update spacing cleanup * Added null:false to tasks name * Added migration file * Added updated test --------- Co-authored-by: aisayo <aysan@ombulabs.com> Co-authored-by: Piotr Borowiec <p.borowiec01@gmail.com> Co-authored-by: MooseCowBear <82609260+MooseCowBear@users.noreply.github.com> Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ben <95949082+kasugaijin@users.noreply.github.com> Co-authored-by: Jade Stewart <114014697+jadekstewart3@users.noreply.github.com> Co-authored-by: Marlena Borowiec <96994176+marlena-b@users.noreply.github.com> Co-authored-by: Yuri Pains <yuricarvalhop@gmail.com>
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.
Co-authored-by: FionaDL fionadlapham@gmail.com
馃敆 Issue
#258
鉁嶏笍 Description
/adoption_application_reviews馃摲 Screenshots/Demos