atridad/pollo
1
0
Fork 0
Code Activity Actions

Merge branch 'dev'

Browse source
This commit is contained in:
Atridad Lahiji 2023-06-19 23:46:37 -06:00
commit eaedd545ac
No known key found for this signature in database
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/Navbar.tsx
View file

@ -53,7 +53,7 @@ const Navbar: React.FC<NavbarProps> = ({ title }) => {
{sessionStatus === "loading" ? ( {sessionStatus === "loading" ? (
<div className="flex items-center justify-center"> <div className="flex items-center justify-center">
<span className="loading loading-spinner loading-lg"></span> <span className="loading loading-dots loading-lg"></span>
</div> </div>
) : ( ) : (
navigationMenu() navigationMenu()

2
src/components/RoomList.tsx
View file

@ -137,7 +137,7 @@ const RoomList: React.FC = () => {
{roomsFromDb === undefined && ( {roomsFromDb === undefined && (
<div className="flex items-center justify-center"> <div className="flex items-center justify-center">
<span className="loading loading-spinner loading-lg"></span> <span className="loading loading-dots loading-lg"></span>
</div> </div>
)} )}
</div> </div>

2
src/pages/_app.tsx
View file

@ -43,7 +43,7 @@ const MyApp: AppType<{ session: Session | null }> = ({
<Navbar title="Sprint Padawan" /> <Navbar title="Sprint Padawan" />
<div className="flex flex-row items-center justify-center min-h-[calc(100%-114px)]"> <div className="flex flex-row items-center justify-center min-h-[calc(100%-114px)]">
{pageLoading ? ( {pageLoading ? (
<span className="loading loading-spinner loading-lg"></span> <span className="loading loading-dots loading-lg"></span>
) : ( ) : (
<Component {...pageProps} /> <Component {...pageProps} />
)} )}

8
src/pages/admin/index.tsx
View file

@ -148,7 +148,7 @@ const AdminBody: React.FC = () => {
<div className="stat-title">Users</div> <div className="stat-title">Users</div>
<div className="stat-value"> <div className="stat-value">
{usersCountLoading || usersCountFetching ? ( {usersCountLoading || usersCountFetching ? (
<span className="loading loading-spinner loading-lg"></span> <span className="loading loading-dots loading-lg"></span>
) : ( ) : (
<>{usersCount ? usersCount : "0"}</> <>{usersCount ? usersCount : "0"}</>
)} )}
@ -159,7 +159,7 @@ const AdminBody: React.FC = () => {
<div className="stat-title">Rooms</div> <div className="stat-title">Rooms</div>
<div className="stat-value"> <div className="stat-value">
{roomsCountLoading || roomsCountFetching ? ( {roomsCountLoading || roomsCountFetching ? (
<span className="loading loading-spinner loading-lg"></span> <span className="loading loading-dots loading-lg"></span>
) : ( ) : (
<>{roomsCount ? roomsCount : "0"}</> <>{roomsCount ? roomsCount : "0"}</>
)} )}
@ -170,7 +170,7 @@ const AdminBody: React.FC = () => {
<div className="stat-title">Votes</div> <div className="stat-title">Votes</div>
<div className="stat-value"> <div className="stat-value">
{votesCountLoading || votesCountFetching ? ( {votesCountLoading || votesCountFetching ? (
<span className="loading loading-spinner loading-lg"></span> <span className="loading loading-dots loading-lg"></span>
) : ( ) : (
<>{votesCount ? votesCount : "0"}</> <>{votesCount ? votesCount : "0"}</>
)} )}
@ -194,7 +194,7 @@ const AdminBody: React.FC = () => {
<h2 className="card-title">Users:</h2> <h2 className="card-title">Users:</h2>
{usersLoading || usersFetching ? ( {usersLoading || usersFetching ? (
<span className="loading loading-spinner loading-lg"></span> <span className="loading loading-dots loading-lg"></span>
) : ( ) : (
<div className="overflow-x-scroll"> <div className="overflow-x-scroll">
<table className="table text-center"> <table className="table text-center">

2
src/pages/profile/index.tsx
View file

@ -127,7 +127,7 @@ const ProfileBody: React.FC = () => {
{providersLoading ? ( {providersLoading ? (
<div className="mx-auto"> <div className="mx-auto">
<span className="loading loading-spinner loading-lg"></span> <span className="loading loading-dots loading-lg"></span>{" "}
</div> </div>
) : ( ) : (
<div className="mx-auto"> <div className="mx-auto">

2
src/pages/room/[id].tsx
View file

@ -247,7 +247,7 @@ const RoomBody: React.FC = () => {
if (roomFromDb === undefined) { if (roomFromDb === undefined) {
return ( return (
<div className="flex flex-col items-center justify-center text-center"> <div className="flex flex-col items-center justify-center text-center">
<span className="loading loading-spinner loading-lg"></span> <span className="loading loading-dots loading-lg"></span>{" "}
</div> </div>
); );
// Room has been loaded // Room has been loaded