1
Fork 0
mirror of https://github.com/Steffo99/todocolors.git synced 2024-11-22 08:14:18 +00:00

CSS fixes and single column mode

This commit is contained in:
Steffo 2023-08-06 03:24:36 +02:00
parent def0298b12
commit 79b6d65436
Signed by: steffo
GPG key ID: 2A24051445686895
7 changed files with 104 additions and 53 deletions

View file

@ -1,21 +0,0 @@
.boardColumn {
display: flex;
flex-direction: column;
gap: 8px;
}
.boardColumnContents > * {
flex-shrink: 0;
}
.boardColumnContents {
display: flex;
flex-direction: column;
gap: 8px;
padding-left: 4px;
padding-right: 4px;
padding-bottom: 8px;
overflow-x: hidden;
overflow-y: scroll;
}

View file

@ -1,17 +0,0 @@
import {TaskDisplay} from "@/app/board/[board]/TaskDisplay"
import {TaskGroup} from "@/app/board/[board]/useBoardTaskArranger"
import style from "./BoardColumn.module.css"
export function BoardColumn({taskGroup}: {taskGroup: TaskGroup}) {
return (
<div className={style.boardColumn}>
<h3>
{taskGroup.name}
</h3>
<div className={style.boardColumnContents}>
{taskGroup.tasks.map(task => <TaskDisplay task={task} key={task.id}/>)}
</div>
</div>
)
}

View file

@ -2,7 +2,7 @@ import {useRouter} from "next/navigation"
import {ReactNode, useCallback} from "react" import {ReactNode, useCallback} from "react"
import style from "./BoardHeader.module.css" import style from "./BoardHeader.module.css"
import {useManagedBoard} from "@/app/board/[board]/BoardManager" import {useManagedBoard} from "@/app/board/[board]/BoardManager"
import {faArrowDownWideShort, faHouse, faPencil, faTableColumns} from "@fortawesome/free-solid-svg-icons" import {faArrowDownWideShort, faHouse, faPencil, faObjectGroup, faTableColumns} from "@fortawesome/free-solid-svg-icons"
import {FontAwesomeIcon} from "@fortawesome/react-fontawesome" import {FontAwesomeIcon} from "@fortawesome/react-fontawesome"
import cn from "classnames" import cn from "classnames"
@ -20,6 +20,7 @@ export function BoardHeader({className}: {className?: string}) {
<EditTitleButton/> <EditTitleButton/>
</LeftButtonsArea> </LeftButtonsArea>
<RightButtonsArea> <RightButtonsArea>
<ToggleSingleColumnButton/>
<CycleGroupButton/> <CycleGroupButton/>
<CycleSortButton/> <CycleSortButton/>
</RightButtonsArea> </RightButtonsArea>
@ -114,6 +115,20 @@ function RightButtonsArea({children}: {children: ReactNode}) {
) )
} }
function ToggleSingleColumnButton() {
const {webSocketState, isSingleColumn, setSingleColumn} = useManagedBoard()
if(webSocketState != WebSocket.OPEN) {
return null;
}
return (
<button title={"Cambia numero di colonne"} onClick={() => setSingleColumn(prev => !prev)}>
<FontAwesomeIcon icon={faTableColumns}/>
</button>
)
}
function CycleGroupButton() { function CycleGroupButton() {
const {webSocketState, nextGrouper} = useManagedBoard() const {webSocketState, nextGrouper} = useManagedBoard()
@ -123,7 +138,7 @@ function CycleGroupButton() {
return ( return (
<button title={"Cambia raggruppamento"} onClick={nextGrouper}> <button title={"Cambia raggruppamento"} onClick={nextGrouper}>
<FontAwesomeIcon icon={faTableColumns}/> <FontAwesomeIcon icon={faObjectGroup}/>
</button> </button>
) )
} }

View file

@ -1,19 +1,69 @@
.boardMainTaskGroups { .boardMainTaskGroups {
display: flex; display: flex;
justify-content: flex-start; overflow-x: hidden;
flex-wrap: nowrap;
--todoblue-column-min-width: 240px;
--todoblue-column-max-width: 480px;
}
.boardMainTaskGroupsSingleColumn {
flex-direction: column;
justify-content: flex-start;
align-items: stretch;
overflow-y: scroll;
}
.boardMainTaskGroupsMultiColumn {
flex-direction: row;
justify-content: flex-start;
align-items: flex-start;
overflow-x: scroll;
overflow-y: hidden; overflow-y: hidden;
} }
.boardMainTaskGroups > div { .boardMainTaskGroupsMultiColumn .boardColumnContents {
flex-basis: 240px; overflow-y: scroll;
}
.boardColumn {
flex-shrink: 0; flex-shrink: 0;
flex-grow: 1; flex-grow: 1;
margin-right: auto; display: flex;
margin-left: auto; flex-direction: column;
justify-content: stretch;
gap: 8px;
max-width: 480px; margin-left: auto;
margin-right: auto;
}
.boardMainTaskGroupsSingleColumn .boardColumn {
width: var(--todoblue-column-max-width);
}
.boardMainTaskGroupsMultiColumn .boardColumn {
width: 248px;
max-width: var(--todoblue-column-max-width);
height: 100%;
}
.boardColumnContents {
display: flex;
flex-direction: column;
gap: 8px;
padding-left: 4px;
padding-right: 4px;
padding-bottom: 8px;
}
.boardMainTaskGroupsMultiColumn .boardColumnContents {
overflow-y: scroll;
}
.boardColumnContents > * {
flex-shrink: 0;
} }

View file

@ -1,15 +1,33 @@
import {BoardColumn} from "@/app/board/[board]/BoardColumn"
import {useManagedBoard} from "@/app/board/[board]/BoardManager" import {useManagedBoard} from "@/app/board/[board]/BoardManager"
import {TaskDisplay} from "@/app/board/[board]/TaskDisplay"
import {TaskGroup} from "@/app/board/[board]/useBoardTaskArranger"
import cn from "classnames" import cn from "classnames"
import style from "./BoardMainTaskGroups.module.css" import style from "./BoardMainTaskGroups.module.css"
export function BoardMainTaskGroups({className}: {className?: string}) { export function BoardMainTaskGroups({className}: {className?: string}) {
const {taskGroups} = useManagedBoard() const {taskGroups, isSingleColumn} = useManagedBoard()
return ( return (
<main className={cn(style.boardMainTaskGroups, className)}> <main className={cn(className, {
[style.boardMainTaskGroups]: true,
[style.boardMainTaskGroupsMultiColumn]: !isSingleColumn,
[style.boardMainTaskGroupsSingleColumn]: isSingleColumn,
})}>
{taskGroups.map((tg) => <BoardColumn taskGroup={tg} key={tg.key}/>)} {taskGroups.map((tg) => <BoardColumn taskGroup={tg} key={tg.key}/>)}
</main> </main>
) )
} }
function BoardColumn({taskGroup}: {taskGroup: TaskGroup}) {
return (
<div className={style.boardColumn}>
<h3>
{taskGroup.name}
</h3>
<div className={style.boardColumnContents}>
{taskGroup.tasks.map(task => <TaskDisplay task={task} key={task.id}/>)}
</div>
</div>
)
}

View file

@ -2,7 +2,7 @@
display: grid; display: grid;
align-items: center; align-items: center;
min-width: 240px; min-width: 240px;
min-height: 44px; min-height: 46px;
cursor: pointer; cursor: pointer;
} }

View file

@ -8,7 +8,7 @@ import {useBoardWs} from "@/app/board/[board]/useBoardWs"
import {TaskGroup, useBoardTaskArranger} from "@/app/board/[board]/useBoardTaskArranger" import {TaskGroup, useBoardTaskArranger} from "@/app/board/[board]/useBoardTaskArranger"
import {useBoardTitleEditor} from "@/app/board/[board]/useBoardTitleEditor" import {useBoardTitleEditor} from "@/app/board/[board]/useBoardTitleEditor"
import {useCycleState} from "@/app/useCycleState" import {useCycleState} from "@/app/useCycleState"
import {Dispatch, SetStateAction} from "react" import {Dispatch, SetStateAction, useState} from "react"
export interface UseBoardReturns { export interface UseBoardReturns {
title: string, title: string,
@ -32,6 +32,8 @@ export interface UseBoardReturns {
setEditedTaskText: (text: string) => void, setEditedTaskText: (text: string) => void,
editedTask: Task, editedTask: Task,
setEditedTask: (task: Task) => void, setEditedTask: (task: Task) => void,
isSingleColumn: boolean,
setSingleColumn: Dispatch<SetStateAction<boolean>>,
} }
export function useBoard(name: string): UseBoardReturns { export function useBoard(name: string): UseBoardReturns {
@ -45,6 +47,8 @@ export function useBoard(name: string): UseBoardReturns {
const {editedTaskText, setEditedTaskText, editedTask, setEditedTask} = useBoardTaskEditor() const {editedTaskText, setEditedTaskText, editedTask, setEditedTask} = useBoardTaskEditor()
const [isSingleColumn, setSingleColumn] = useState<boolean>(false)
return { return {
title, title,
tasksById, tasksById,
@ -67,5 +71,7 @@ export function useBoard(name: string): UseBoardReturns {
setEditedTaskText, setEditedTaskText,
editedTask, editedTask,
setEditedTask, setEditedTask,
isSingleColumn,
setSingleColumn,
} }
} }