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

MUI improvements + search bar + navbar activation #131

Merged
merged 32 commits into from
Mar 20, 2024

Conversation

amiraliemami
Copy link
Collaborator

@amiraliemami amiraliemami commented Mar 18, 2024

Reviewer: @sidravi1
Estimate: 30mins


Ticket

Fixes: 415 Search bar, 416 Nav bar

Description, Motivation and Context

Goal

  • Add search bar
  • Activate nav bar
  • Cleanup

Changes

  • Alignment with wireframe
  • QoL improvements and code simplification
  • Search bar filtering
  • Make nav bar functional (other than Logout button under settings - this is fixed in Sid's Auth PR Mui admin app auth #134)

How has this been tested?

Same as #130

Checklist

Fill with x for completed. Delete any lines that are not relevant

  • My code follows the style guidelines of this project
  • I have reviewed my own code to ensure good quality
  • I have tested the functionality of my code to ensure it works as intended
  • I have resolved merge conflicts

@amiraliemami amiraliemami changed the title MUI improvements MUI improvements + search Mar 18, 2024
@amiraliemami amiraliemami changed the title MUI improvements + search MUI improvements + search bar Mar 19, 2024
@amiraliemami amiraliemami marked this pull request as ready for review March 19, 2024 11:09
@amiraliemami amiraliemami changed the title MUI improvements + search bar MUI improvements + search bar + navbar activation Mar 20, 2024
Copy link
Member

@sidravi1 sidravi1 left a comment

Choose a reason for hiding this comment

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

Love it. Nice work @amiraliemami :)
Please merge when ready.

admin_app_2/src/components/ContentCard.tsx Show resolved Hide resolved
admin_app_2/src/components/ContentCard.tsx Outdated Show resolved Hide resolved
@amiraliemami amiraliemami merged commit c30612d into feature-mui-admin Mar 20, 2024
1 check was pending
@amiraliemami amiraliemami deleted the mui-improvements branch March 20, 2024 19:28
amiraliemami added a commit that referenced this pull request Mar 21, 2024
* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* address leftover PR#130 comments

* remove unnecessary spacing on cards

* Make page buttons circular and smaller

* cleanup imports

* add max count to title input

* Revert text box identifiers to reflect wireframe

* Cleanup text boxes in Edit

* add date back to cards to reflect wireframe

* date to 12hr format

* add space to bottom of page

* reduce cardgrid density

* change all instances of content_id to number (some where string)

* improve delete button and modal

* use the Content type in main grid

* Add skeleton of search bar

* Implement search functionality!

* remove unnecessary wrapper

* Move SearchBar and PageNavigation to components

* Move sx parameters out of SearchBar component

* Make CardsGrid backdrop persist even without cards on it

* Convert Box to FlexBox and revert to 4-columns of cards on large screens

* NavBar: add homepage link to AAQ logo

* NavBar: enable links (but disable inactive pages)

* NavBar: Make logo and user icon smaller

* Set max cards back to 12

* Use content_id as key instead of index in Grid component

* PR feedback fixes

* cleanup imports

* Simplify editAccess check boolean (use !editAccess)

* Widen gap between date and buttons on cards

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>
lickem22 pushed a commit that referenced this pull request Mar 22, 2024
* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* Mui admin app auth (#134)

* sort results by content_id
* Auth and access level
* fixes from review

* HOTFIX: Layout import missing from "ProtectedComponent.tsx"

* MUI improvements + search bar + navbar activation (#131)

* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* address leftover PR#130 comments

* remove unnecessary spacing on cards

* Make page buttons circular and smaller

* cleanup imports

* add max count to title input

* Revert text box identifiers to reflect wireframe

* Cleanup text boxes in Edit

* add date back to cards to reflect wireframe

* date to 12hr format

* add space to bottom of page

* reduce cardgrid density

* change all instances of content_id to number (some where string)

* improve delete button and modal

* use the Content type in main grid

* Add skeleton of search bar

* Implement search functionality!

* remove unnecessary wrapper

* Move SearchBar and PageNavigation to components

* Move sx parameters out of SearchBar component

* Make CardsGrid backdrop persist even without cards on it

* Convert Box to FlexBox and revert to 4-columns of cards on large screens

* NavBar: add homepage link to AAQ logo

* NavBar: enable links (but disable inactive pages)

* NavBar: Make logo and user icon smaller

* Set max cards back to 12

* Use content_id as key instead of index in Grid component

* PR feedback fixes

* cleanup imports

* Simplify editAccess check boolean (use !editAccess)

* Widen gap between date and buttons on cards

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>

* Replace old admin app with new MUI admin app (#136)

* temp - remove old `src`

* temp - replace/remove files

* move logo png to inside admin app

* Add condition for catching missing content_id

* TEMP FIX: Disable missingSuspenseWithCSRBailout error. See Jira ticket 424 for details.

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>
lickem22 pushed a commit that referenced this pull request Mar 22, 2024
* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* Mui admin app auth (#134)

* sort results by content_id
* Auth and access level
* fixes from review

* HOTFIX: Layout import missing from "ProtectedComponent.tsx"

* MUI improvements + search bar + navbar activation (#131)

* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* address leftover PR#130 comments

* remove unnecessary spacing on cards

* Make page buttons circular and smaller

* cleanup imports

* add max count to title input

* Revert text box identifiers to reflect wireframe

* Cleanup text boxes in Edit

* add date back to cards to reflect wireframe

* date to 12hr format

* add space to bottom of page

* reduce cardgrid density

* change all instances of content_id to number (some where string)

* improve delete button and modal

* use the Content type in main grid

* Add skeleton of search bar

* Implement search functionality!

* remove unnecessary wrapper

* Move SearchBar and PageNavigation to components

* Move sx parameters out of SearchBar component

* Make CardsGrid backdrop persist even without cards on it

* Convert Box to FlexBox and revert to 4-columns of cards on large screens

* NavBar: add homepage link to AAQ logo

* NavBar: enable links (but disable inactive pages)

* NavBar: Make logo and user icon smaller

* Set max cards back to 12

* Use content_id as key instead of index in Grid component

* PR feedback fixes

* cleanup imports

* Simplify editAccess check boolean (use !editAccess)

* Widen gap between date and buttons on cards

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>

* Replace old admin app with new MUI admin app (#136)

* temp - remove old `src`

* temp - replace/remove files

* move logo png to inside admin app

* Add condition for catching missing content_id

* TEMP FIX: Disable missingSuspenseWithCSRBailout error. See Jira ticket 424 for details.

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>
lickem22 pushed a commit that referenced this pull request Mar 22, 2024
* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* address leftover PR#130 comments

* remove unnecessary spacing on cards

* Make page buttons circular and smaller

* cleanup imports

* add max count to title input

* Revert text box identifiers to reflect wireframe

* Cleanup text boxes in Edit

* add date back to cards to reflect wireframe

* date to 12hr format

* add space to bottom of page

* reduce cardgrid density

* change all instances of content_id to number (some where string)

* improve delete button and modal

* use the Content type in main grid

* Add skeleton of search bar

* Implement search functionality!

* remove unnecessary wrapper

* Move SearchBar and PageNavigation to components

* Move sx parameters out of SearchBar component

* Make CardsGrid backdrop persist even without cards on it

* Convert Box to FlexBox and revert to 4-columns of cards on large screens

* NavBar: add homepage link to AAQ logo

* NavBar: enable links (but disable inactive pages)

* NavBar: Make logo and user icon smaller

* Set max cards back to 12

* Use content_id as key instead of index in Grid component

* PR feedback fixes

* cleanup imports

* Simplify editAccess check boolean (use !editAccess)

* Widen gap between date and buttons on cards

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>
lickem22 pushed a commit that referenced this pull request Mar 22, 2024
* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* Mui admin app auth (#134)

* sort results by content_id
* Auth and access level
* fixes from review

* HOTFIX: Layout import missing from "ProtectedComponent.tsx"

* MUI improvements + search bar + navbar activation (#131)

* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* address leftover PR#130 comments

* remove unnecessary spacing on cards

* Make page buttons circular and smaller

* cleanup imports

* add max count to title input

* Revert text box identifiers to reflect wireframe

* Cleanup text boxes in Edit

* add date back to cards to reflect wireframe

* date to 12hr format

* add space to bottom of page

* reduce cardgrid density

* change all instances of content_id to number (some where string)

* improve delete button and modal

* use the Content type in main grid

* Add skeleton of search bar

* Implement search functionality!

* remove unnecessary wrapper

* Move SearchBar and PageNavigation to components

* Move sx parameters out of SearchBar component

* Make CardsGrid backdrop persist even without cards on it

* Convert Box to FlexBox and revert to 4-columns of cards on large screens

* NavBar: add homepage link to AAQ logo

* NavBar: enable links (but disable inactive pages)

* NavBar: Make logo and user icon smaller

* Set max cards back to 12

* Use content_id as key instead of index in Grid component

* PR feedback fixes

* cleanup imports

* Simplify editAccess check boolean (use !editAccess)

* Widen gap between date and buttons on cards

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>

* Replace old admin app with new MUI admin app (#136)

* temp - remove old `src`

* temp - replace/remove files

* move logo png to inside admin app

* Add condition for catching missing content_id

* TEMP FIX: Disable missingSuspenseWithCSRBailout error. See Jira ticket 424 for details.

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>
lickem22 pushed a commit that referenced this pull request Mar 22, 2024
* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* address leftover PR#130 comments

* remove unnecessary spacing on cards

* Make page buttons circular and smaller

* cleanup imports

* add max count to title input

* Revert text box identifiers to reflect wireframe

* Cleanup text boxes in Edit

* add date back to cards to reflect wireframe

* date to 12hr format

* add space to bottom of page

* reduce cardgrid density

* change all instances of content_id to number (some where string)

* improve delete button and modal

* use the Content type in main grid

* Add skeleton of search bar

* Implement search functionality!

* remove unnecessary wrapper

* Move SearchBar and PageNavigation to components

* Move sx parameters out of SearchBar component

* Make CardsGrid backdrop persist even without cards on it

* Convert Box to FlexBox and revert to 4-columns of cards on large screens

* NavBar: add homepage link to AAQ logo

* NavBar: enable links (but disable inactive pages)

* NavBar: Make logo and user icon smaller

* Set max cards back to 12

* Use content_id as key instead of index in Grid component

* PR feedback fixes

* cleanup imports

* Simplify editAccess check boolean (use !editAccess)

* Widen gap between date and buttons on cards

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>
lickem22 pushed a commit that referenced this pull request Mar 22, 2024
* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* Mui admin app auth (#134)

* sort results by content_id
* Auth and access level
* fixes from review

* HOTFIX: Layout import missing from "ProtectedComponent.tsx"

* MUI improvements + search bar + navbar activation (#131)

* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* address leftover PR#130 comments

* remove unnecessary spacing on cards

* Make page buttons circular and smaller

* cleanup imports

* add max count to title input

* Revert text box identifiers to reflect wireframe

* Cleanup text boxes in Edit

* add date back to cards to reflect wireframe

* date to 12hr format

* add space to bottom of page

* reduce cardgrid density

* change all instances of content_id to number (some where string)

* improve delete button and modal

* use the Content type in main grid

* Add skeleton of search bar

* Implement search functionality!

* remove unnecessary wrapper

* Move SearchBar and PageNavigation to components

* Move sx parameters out of SearchBar component

* Make CardsGrid backdrop persist even without cards on it

* Convert Box to FlexBox and revert to 4-columns of cards on large screens

* NavBar: add homepage link to AAQ logo

* NavBar: enable links (but disable inactive pages)

* NavBar: Make logo and user icon smaller

* Set max cards back to 12

* Use content_id as key instead of index in Grid component

* PR feedback fixes

* cleanup imports

* Simplify editAccess check boolean (use !editAccess)

* Widen gap between date and buttons on cards

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>

* Replace old admin app with new MUI admin app (#136)

* temp - remove old `src`

* temp - replace/remove files

* move logo png to inside admin app

* Add condition for catching missing content_id

* TEMP FIX: Disable missingSuspenseWithCSRBailout error. See Jira ticket 424 for details.

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>
lickem22 pushed a commit that referenced this pull request Mar 22, 2024
* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* Mui admin app auth (#134)

* sort results by content_id
* Auth and access level
* fixes from review

* HOTFIX: Layout import missing from "ProtectedComponent.tsx"

* MUI improvements + search bar + navbar activation (#131)

* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* address leftover PR#130 comments

* remove unnecessary spacing on cards

* Make page buttons circular and smaller

* cleanup imports

* add max count to title input

* Revert text box identifiers to reflect wireframe

* Cleanup text boxes in Edit

* add date back to cards to reflect wireframe

* date to 12hr format

* add space to bottom of page

* reduce cardgrid density

* change all instances of content_id to number (some where string)

* improve delete button and modal

* use the Content type in main grid

* Add skeleton of search bar

* Implement search functionality!

* remove unnecessary wrapper

* Move SearchBar and PageNavigation to components

* Move sx parameters out of SearchBar component

* Make CardsGrid backdrop persist even without cards on it

* Convert Box to FlexBox and revert to 4-columns of cards on large screens

* NavBar: add homepage link to AAQ logo

* NavBar: enable links (but disable inactive pages)

* NavBar: Make logo and user icon smaller

* Set max cards back to 12

* Use content_id as key instead of index in Grid component

* PR feedback fixes

* cleanup imports

* Simplify editAccess check boolean (use !editAccess)

* Widen gap between date and buttons on cards

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>

* Replace old admin app with new MUI admin app (#136)

* temp - remove old `src`

* temp - replace/remove files

* move logo png to inside admin app

* Add condition for catching missing content_id

* TEMP FIX: Disable missingSuspenseWithCSRBailout error. See Jira ticket 424 for details.

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>
suzinyou pushed a commit that referenced this pull request Apr 8, 2024
* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* Mui admin app auth (#134)

* sort results by content_id
* Auth and access level
* fixes from review

* HOTFIX: Layout import missing from "ProtectedComponent.tsx"

* MUI improvements + search bar + navbar activation (#131)

* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* address leftover PR#130 comments

* remove unnecessary spacing on cards

* Make page buttons circular and smaller

* cleanup imports

* add max count to title input

* Revert text box identifiers to reflect wireframe

* Cleanup text boxes in Edit

* add date back to cards to reflect wireframe

* date to 12hr format

* add space to bottom of page

* reduce cardgrid density

* change all instances of content_id to number (some where string)

* improve delete button and modal

* use the Content type in main grid

* Add skeleton of search bar

* Implement search functionality!

* remove unnecessary wrapper

* Move SearchBar and PageNavigation to components

* Move sx parameters out of SearchBar component

* Make CardsGrid backdrop persist even without cards on it

* Convert Box to FlexBox and revert to 4-columns of cards on large screens

* NavBar: add homepage link to AAQ logo

* NavBar: enable links (but disable inactive pages)

* NavBar: Make logo and user icon smaller

* Set max cards back to 12

* Use content_id as key instead of index in Grid component

* PR feedback fixes

* cleanup imports

* Simplify editAccess check boolean (use !editAccess)

* Widen gap between date and buttons on cards

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>

* Replace old admin app with new MUI admin app (#136)

* temp - remove old `src`

* temp - replace/remove files

* move logo png to inside admin app

* Add condition for catching missing content_id

* TEMP FIX: Disable missingSuspenseWithCSRBailout error. See Jira ticket 424 for details.

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>
lickem22 pushed a commit that referenced this pull request Apr 11, 2024
* MUI content pages (#130)

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors

* address leftover PR#130 comments

* remove unnecessary spacing on cards

* Make page buttons circular and smaller

* cleanup imports

* add max count to title input

* Revert text box identifiers to reflect wireframe

* Cleanup text boxes in Edit

* add date back to cards to reflect wireframe

* date to 12hr format

* add space to bottom of page

* reduce cardgrid density

* change all instances of content_id to number (some where string)

* improve delete button and modal

* use the Content type in main grid

* Add skeleton of search bar

* Implement search functionality!

* remove unnecessary wrapper

* Move SearchBar and PageNavigation to components

* Move sx parameters out of SearchBar component

* Make CardsGrid backdrop persist even without cards on it

* Convert Box to FlexBox and revert to 4-columns of cards on large screens

* NavBar: add homepage link to AAQ logo

* NavBar: enable links (but disable inactive pages)

* NavBar: Make logo and user icon smaller

* Set max cards back to 12

* Use content_id as key instead of index in Grid component

* PR feedback fixes

* cleanup imports

* Simplify editAccess check boolean (use !editAccess)

* Widen gap between date and buttons on cards

---------

Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com>
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.

None yet

2 participants