Skip to content

Commit

Permalink
PIR-23, PIR-76, PIR-1106, PIR-1107, PIR-1108, PIR-1111: Users, Grids,…
Browse files Browse the repository at this point in the history 
… Boards, Firebase Database Init
  • Loading branch information
rakib committed Feb 14, 2025
1 parent fadb052 commit 6ffadb2
Show file tree
Hide file tree
Showing 40 changed files with 3,713 additions and 536 deletions.
16 changes: 9 additions & 7 deletions components/auth-state.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import { useContext } from 'react';
import { StateContext } from '../pages/_app';

export default function AuthState({ classes }: any) {
let { user, authState } = useContext<any>(StateContext);
export default function AuthState({ classes, nextOverride = ``, hideOnUsersLoading = false }: any) {
let { user, authState, usersLoading } = useContext<any>(StateContext);
return (
<span className={`${classes} textOverflow extended`} style={{minWidth: `fit-content`}}>
{user != null ? (
`Welcome, ${user?.name}`
) : authState}
</span>
hideOnUsersLoading == true && usersLoading ? <></> : (
<span className={`${classes} textOverflow extended`} style={{minWidth: `fit-content`}}>
{user != null ? (
`Welcome, ${user?.name}`
) : (nextOverride != `` && authState == `Next`) ? nextOverride : authState}
</span>
)
)
}
46 changes: 17 additions & 29 deletions components/boards/board.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,6 @@ export default function Board(props) {
})
}

const onDragStart = (dragStartEvent) => {
if (dev()) {
setLoading(true);
setSystemStatus(`Rearranging...`);
}
}

const onShowSearchClick = (e?: any) => {
setShowSearch(!showSearch);
toast.info(`Board Search in Development`);
Expand All @@ -85,7 +78,7 @@ export default function Board(props) {
setBoard(prevBoard => {
return {
...prevBoard,
expanded: !prevBoard.expanded
expanded: !prevBoard.expanded,
}
});
}
Expand Down Expand Up @@ -159,13 +152,8 @@ export default function Board(props) {
const onDragEnd = (dragEndEvent) => {
const { destination, source, draggableId, type } = dragEndEvent;

if (!destination) {
return;
}

if (destination.droppableId === source.droppableId && destination.index === source.index) {
return;
}
if (!destination) return;
if (destination.droppableId === source.droppableId && destination.index === source.index) return;

if (dev()) {
setLoading(false);
Expand Down Expand Up @@ -275,11 +263,11 @@ export default function Board(props) {
}, [board])

return (
<DragDropContext onDragStart={onDragStart} onDragEnd={onDragEnd}>
<DragDropContext onDragEnd={onDragEnd}>
<section className={`boardsTitle boards`} style={{paddingBottom: 0}}>
<div className={`board boardInner boardTitle`}>
<div {...props.provided.dragHandleProps} className={`boardDetailsRowContainer titleRow flex row`}>
<div className={`boardDetailsRow flex row innerRow`}>
<div className={`boardDetailsRow flex row innerRow ${board?.expanded ? `expandedBoardDetailsRow` : `collapsedBoardDetailsRow`}`}>
<div className={`boardIndexAndTitle flex row left ${board?.expanded ? `` : `stretch`}`}>
<h3 className={`boardIndexBadge`}>
<span className={`subscript itemOrder slashes`}>
Expand All @@ -296,8 +284,8 @@ export default function Board(props) {
defaultValue={board?.name ?? `Board`}
onBlur={(e) => changeLabel(e, board, setBoard)}
onKeyDown={(e) => forceFieldBlurOnPressEnter(e)}
style={{ width: board.titleWidth ? board.titleWidth : `75px` }}
className={`boardNameField changeLabel textOverflow ${board?.expanded ? `` : `stretch`}`}
style={{ width: board?.expanded ? (board.titleWidth ? board.titleWidth : `75px`) : `100%` }}
className={`boardNameField changeLabel textOverflow ${board?.expanded ? `expandedBoardChangeLabel` : `stretch collapsedBoardChangeLabel`}`}
/>
</h2>
{board?.expanded && <>
Expand All @@ -322,16 +310,16 @@ export default function Board(props) {
</span>
</h3>
<div className={`boardMetaData flex row middle`}>
<h3>
{board?.columnOrder && board?.columnOrder?.length} {(
<span className={`subscript`}>
<h3 className={`boardCount boardColumnCount`}>
{board?.data?.columnIDs && board?.data?.columnIDs?.length} {(
<span className={`boardCountLabel boardColumnCountLabel subscript`}>
Column(s)
</span>
)}
</h3>
<h3>
{board?.items && Object.values(board?.items).length} {(
<span className={`subscript`}>
<h3 className={`boardCount boardItemCount`}>
{board?.data?.itemIDs && board?.data?.itemIDs?.length} {(
<span className={`boardCountLabel boardItemCountLabel subscript`}>
Items(s)
</span>
)}
Expand All @@ -344,9 +332,9 @@ export default function Board(props) {
</h3>
<div className={`boardOptionsRow flex row right ${board?.expanded ? `expandedBoardOptionsRow` : `collapsedBoardOptionsRow`}`}>
{board?.expanded && <>
<h3 className={`filtersSubscript`}>
<span className={`subscript`}>
Filters
<h3 className={`boardOptions filtersSubscript`}>
<span className={`boardOptionsLabel subscript`}>
Options
</span>
</h3>
</>}
Expand Down Expand Up @@ -377,7 +365,7 @@ export default function Board(props) {
</span>
</button>
<section className={`addListFormItemSection`} style={{ margin: 0, padding: 0, position: `relative` }}>
<div title={`Change Column Type`} onClick={(e) => toast.info(`Column Types are In Development`)} className={`typeIcon changeColumnTypeIcon hoverGlowButton ${showSearch ? `disabledIconBtn` : ``}`}>
<div title={`Change Column Type`} onClick={(e) => toast.info(`Column Types are In Development`)} className={`typeIcon changeColumnTypeIcon ${showSearch ? `disabledIconBtn` : ``}`}>
{showSearch ? <i style={{ color: `var(--gameBlue)`, fontSize: 13 }} className={`fas fa-search`} /> : `+`}
</div>
<form onSubmit={addNewColumn} title={`Add Column`} id={`addListForm_${board?.id}`} className={`flex addListForm itemButtons addForm`} style={{ width: `100%`, flexDirection: `row` }}>
Expand Down
Loading

0 comments on commit 6ffadb2

Please sign in to comment.