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 content pages #130

Merged
merged 55 commits into from
Mar 18, 2024
Merged

MUI content pages #130

merged 55 commits into from
Mar 18, 2024

Conversation

sidravi1
Copy link
Member

@sidravi1 sidravi1 commented Mar 17, 2024

Reviewer: @amiraliemami

Estimate: 1 hrs


Ticket

Fixes: 405

Description, Motivation and Context

Goal

This is the first PR for the admin app.
The main content page with card + add, edit, delete now work.

Changes

Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console

How has this been tested?

  • Start backend as per dev instructions (so that it runs on "localhost:8000")
    • There's no auth in the admin app yet, so we need to use a bearer token. To get this, go to the swaggerUI, login, send a call to a content endpoint and copy the Authorization bearer token that's generated.
  • In admin_app_2:
    • Add a file called temp_secrets.json with the following in it: {"ACCESS_TOKEN": "token from SwaggerUI"}. This is read into admin_app_2/src/utils/api.js.
    • run npm i
    • run npm run dev

To do

Next up:

  1. auth and login page
  2. playground
  3. improve style based on figma
  4. filters

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
  • I have updated the automated tests (if applicable)
  • I have updated the requirements (if applicable)
  • I have updated the README file (if applicable)
  • I have updated affected documentation (if applicable)

Copy link
Collaborator

@amiraliemami amiraliemami left a comment

Choose a reason for hiding this comment

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

Thanks for the additions @sidravi1 ! Approved with some comments :) (committed some simple cleanups too)

@sidravi1 sidravi1 merged commit 9c9c70f into feature-mui-admin Mar 18, 2024
1 check passed
@amiraliemami amiraliemami deleted the mui-content branch March 18, 2024 04:41
amiraliemami pushed a commit that referenced this pull request Mar 18, 2024
Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors
sidravi1 added a commit that referenced this pull request Mar 18, 2024
Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors
amiraliemami pushed a commit that referenced this pull request Mar 18, 2024
Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors
amiraliemami added a commit that referenced this pull request Mar 20, 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 <[email protected]>
amiraliemami pushed a commit that referenced this pull request Mar 21, 2024
Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors
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 <[email protected]>
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 <[email protected]>

* 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 <[email protected]>
lickem22 pushed a commit that referenced this pull request Mar 22, 2024
Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors
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 <[email protected]>

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

* 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 <[email protected]>
lickem22 pushed a commit that referenced this pull request Mar 22, 2024
Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors
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 <[email protected]>
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 <[email protected]>

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

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

* 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 <[email protected]>
lickem22 pushed a commit that referenced this pull request Apr 11, 2024
Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors
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 <[email protected]>
lickem22 pushed a commit that referenced this pull request Apr 11, 2024
Basic content grid
Alerts and Snackbars
Fixed warnings and errors in console
Better modals
Better validation errors
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.

4 participants