Skip to content

Commit

Permalink
Merge branch 'dnd_settings' into main
Browse files Browse the repository at this point in the history
* dnd_settings:
  DndSettings: remove console log degugging
  DndSettings: update README
  DndSettings: update TODO
  DndSettings: elm-review
  DndSettings: use grab and grabbing cursors
  DndSettings: hide the board name that is being dragged
  DndSettings: show ghost image
  DndSettings: handle the board title dragging
  DndSettings: pass ElementDragged Msg to Settings page
  DndSettings: give the dragables ids
  DndSettings: add beacons to the view
  DndSettings: handle mouse down on board name
  • Loading branch information
roovo committed Nov 18, 2023
2 parents 6f57a6a + 189d7d1 commit 70dc4eb
Show file tree
Hide file tree
Showing 12 changed files with 274 additions and 62 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ An [Obsidian](https://obsidian.md/) plugin to make working with tasks a pleasure
- Tag based (uses `#tags` to define your boards).

## New
- Board reordering - drag and drop the tab headers
- Board reordering
- drag and drop tab headers or board names in the settings dialog
- Improved styling of tab headers (consistent with obsidian)

![date based board screenshot](/images/dateBoard.png?raw=true)
Expand Down
4 changes: 1 addition & 3 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
- enable reorder boards on settings page too
- why isn't grab cursor working over "draggables"?
- tidy typescript
- tidy elm

- can I animate tab moving so it isn't instantaneous?
- touch events - iPad ??

Expand Down
1 change: 0 additions & 1 deletion src/DragAndDrop/DragData.elm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ module DragAndDrop.DragData exposing
import DragAndDrop.BeaconPosition as BeaconPosition exposing (BeaconPosition)
import DragAndDrop.Coords as Coords exposing (Coords)
import DragAndDrop.Rect as Rect exposing (Rect)
import Json.Encode as JE
import TsJson.Decode as TsDecode


Expand Down
5 changes: 3 additions & 2 deletions src/DragAndDrop/DragTracker.elm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module DragAndDrop.DragTracker exposing
( ClientData
, DomData
, DragTracker(..)
, dragType
, init
Expand All @@ -9,9 +10,9 @@ module DragAndDrop.DragTracker exposing
, waitForDrag
)

import DragAndDrop.Coords as Coords exposing (Coords)
import DragAndDrop.Coords exposing (Coords)
import DragAndDrop.DragData exposing (DragData)
import DragAndDrop.Rect as Rect exposing (Rect)
import DragAndDrop.Rect exposing (Rect)



Expand Down
5 changes: 3 additions & 2 deletions src/Main.elm
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,9 @@ update msg model =
BoardPage.update (BoardPage.ElementDragged dragData) subModel
|> updateWith Boards GotBoardPageMsg

( ElementDragged _, _ ) ->
( model, Cmd.none )
( ElementDragged dragData, Settings subModel ) ->
SettingsPage.update (SettingsPage.ElementDragged dragData) subModel
|> updateWith Settings GotSettingsPageMsg

( FilterCandidatesReceived filterCandidates, Settings subModel ) ->
SettingsPage.update (SettingsPage.FilterCandidatesReceived filterCandidates) subModel
Expand Down
Loading

0 comments on commit 70dc4eb

Please sign in to comment.