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

Org dashboard #290

Merged
merged 3 commits into from
Oct 20, 2023
Merged

Org dashboard #290

merged 3 commits into from
Oct 20, 2023

Conversation

jadekstewart3
Copy link
Collaborator

🔗 Issue

#284

✍️ Description

I tracked down where the organization dashboard was being routed. It was present, but being routed through the index action. I updated the index action to use instance variables scoped to the current user, and imported and formatted the html associated with the desired template. Added in organization name, and personalized welcome message to the user.

I am unsure what exactly we want in the card for the dashboard I think some more discussion might need to take place, but I'm happy to make any changes suggested :)

📷 Screenshots/Demos

Screenshot 2023-10-19 at 1 42 19 PM

Copy link
Collaborator

@kasugaijin kasugaijin left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@kasugaijin
Copy link
Collaborator

@all-contributors
please add @edwinthinks for code.

@allcontributors
Copy link
Contributor

@kasugaijin

I've put up a pull request to add @edwinthinks! 🎉

@kasugaijin
Copy link
Collaborator

Added Edwin in this PR as it didn't work when I tried in your migration PR :)

@jadekstewart3 jadekstewart3 merged commit 797ae66 into main Oct 20, 2023
3 checks passed
@jadekstewart3 jadekstewart3 deleted the org_dashboard branch October 20, 2023 20:22
ErinClaudio pushed a commit that referenced this pull request Oct 27, 2023
* 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
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 [email protected]

* Fix applicant name on applications page

Co-authored-by: FionaDL [email protected]

* add applications partial and test

Co-authored-by: FionaDL [email protected]

* add tests for application tab

Co-authored-by: FionaDL [email protected]

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Piotr Borowiec <[email protected]>
Co-authored-by: MooseCowBear <[email protected]>
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: Ben <[email protected]>
Co-authored-by: Jade Stewart <[email protected]>
Co-authored-by: Marlena Borowiec <[email protected]>
Co-authored-by: Yuri Pains <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants