Skip to content

Commit

Permalink
Admin App: Switch to MUI (#135)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
2 people authored and lickem22 committed Mar 22, 2024
1 parent ba44070 commit 656b71c
Show file tree
Hide file tree
Showing 34 changed files with 4,066 additions and 3,124 deletions.
3 changes: 0 additions & 3 deletions admin_app/.eslintrc.json

This file was deleted.

8 changes: 8 additions & 0 deletions admin_app/next.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/* @type {import('next').NextConfig} */
const nextConfig = {
experimental: {
missingSuspenseWithCSRBailout: false,
},
};

export default nextConfig;
3,975 changes: 1,877 additions & 2,098 deletions admin_app/package-lock.json

Large diffs are not rendered by default.

25 changes: 12 additions & 13 deletions admin_app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "admin_app",
"version": "0.1.0",
"name": "admin-app",
"version": "0.2.0",
"private": true,
"scripts": {
"dev": "next dev",
Expand All @@ -9,24 +9,23 @@
"lint": "next lint"
},
"dependencies": {
"@heroicons/react": "^2.0.18",
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@fontsource/roboto": "^5.0.12",
"@mui/icons-material": "^5.15.10",
"@mui/material": "^5.15.10",
"jwt-decode": "^4.0.0",
"next": "13.5.4",
"next": "14.1.3",
"react": "^18",
"react-dom": "^18",
"react-markdown": "^9.0.1",
"react-textarea-autosize": "^8.5.3",
"tailwindcss": "^3"
"react-dom": "^18"
},
"devDependencies": {
"@types/node": "^20.8.10",
"@types/node": "^20",
"@types/react": "^18",
"@types/react-dom": "^18",
"autoprefixer": "^10",
"eslint": "^8",
"eslint-config-next": "13.5.4",
"postcss": "^8",
"prettier": "^3.0.3",
"eslint-config-next": "14.1.3",
"prettier-plugin-organize-imports": "^3.2.4",
"typescript": "^5"
}
}
5 changes: 0 additions & 5 deletions admin_app/postcss.config.js

This file was deleted.

85 changes: 0 additions & 85 deletions admin_app/src/app/chat/page.tsx

This file was deleted.

Loading

0 comments on commit 656b71c

Please sign in to comment.