Skip to content

Commit

Permalink
2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Joshua Tazman Reinier committed Jan 3, 2024
1 parent 4448ddd commit 4a93e28
Show file tree
Hide file tree
Showing 25 changed files with 499 additions and 508 deletions.
18 changes: 15 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,34 @@
# Roadmap

## Planned
## Developing
- Add support for [ICS Calendar repeats](https://github.com/joshuatazrein/obsidian-time-ruler/issues/50)
- Fix [wrong date bug](https://github.com/joshuatazrein/obsidian-time-ruler/issues/85)

## Planned
- Support [Task repeats](https://github.com/joshuatazrein/obsidian-time-ruler/issues/5)
- Support [aliases](https://github.com/joshuatazrein/obsidian-time-ruler/issues/76)
- Fix [timezones](https://github.com/joshuatazrein/obsidian-time-ruler/issues/70) in calendars
- Support [colors in calendar & tasks](https://github.com/joshuatazrein/obsidian-time-ruler/issues/72)
- Add support for [ICS Calendar repeats](https://github.com/joshuatazrein/obsidian-time-ruler/issues/50)
- Option to support [Tasks API on click](https://github.com/joshuatazrein/obsidian-time-ruler/issues/74)

## Considering
- [CalDAV calendars](https://github.com/joshuatazrein/obsidian-time-ruler/issues/34)
- Add more flexibility for [Tasks](https://github.com/joshuatazrein/obsidian-time-ruler/issues/46#issuecomment-1708749520) users


# Changelog

## 2.1.0 (1/1/2023)

**Added:**
- **Now** view: timer has been moved to its own pane, which collects all incomplete tasks scheduled for past times. Now is a focused view for current tasks.

**Fixed:**
- Bug where events crossing date boundaries render as 0 length
- Smoothed out deleting multiple tasks at once
- Improved look of dragged tasks

## 2.0.3 (12/25/2023)

**Fixed:**
- Quick fix for menu hiding too quickly

Expand Down
91 changes: 32 additions & 59 deletions dist/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@
#time-ruler :is(.left-0) {
left: 0px;
}
#time-ruler :is(.right-1) {
right: 0.25rem;
}
#time-ruler :is(.right-10) {
right: 2.5rem;
#time-ruler :is(.right-12) {
right: 3rem;
}
#time-ruler :is(.top-0) {
top: 0px;
Expand Down Expand Up @@ -97,27 +94,18 @@
#time-ruler :is(.h-0) {
height: 0px;
}
#time-ruler :is(.h-1) {
height: 0.25rem;
}
#time-ruler :is(.h-10) {
height: 2.5rem;
}
#time-ruler :is(.h-14) {
height: 3.5rem;
#time-ruler :is(.h-12) {
height: 3rem;
}
#time-ruler :is(.h-2) {
height: 0.5rem;
}
#time-ruler :is(.h-4) {
height: 1rem;
}
#time-ruler :is(.h-5) {
height: 1.25rem;
}
#time-ruler :is(.h-6) {
height: 1.5rem;
}
#time-ruler :is(.h-\[16px\]) {
height: 16px;
}
Expand All @@ -137,9 +125,6 @@
#time-ruler :is(.h-line) {
height: calc(var(--line-height-normal) * 1em);
}
#time-ruler :is(.\!max-h-line) {
max-height: var(--font-text-size) !important;
}
#time-ruler :is(.max-h-\[50\%\]) {
max-height: 50%;
}
Expand Down Expand Up @@ -328,9 +313,6 @@
#time-ruler :is(.\!rounded-full) {
border-radius: 9999px !important;
}
#time-ruler :is(.rounded) {
border-radius: 0.25rem;
}
#time-ruler :is(.rounded-checkbox) {
border-radius: var(--checkbox-radius);
}
Expand All @@ -340,17 +322,14 @@
#time-ruler :is(.rounded-icon) {
border-radius: var(--clickable-icon-radius);
}
#time-ruler :is(.rounded-lg) {
border-radius: 0.5rem;
}
#time-ruler :is(.border) {
border-width: 1px;
}
#time-ruler :is(.border-0) {
border-width: 0px;
}
#time-ruler :is(.border-b) {
border-bottom-width: 1px;
#time-ruler :is(.border-\[1px\]) {
border-width: 1px;
}
#time-ruler :is(.border-l) {
border-left-width: 1px;
Expand All @@ -367,13 +346,12 @@
#time-ruler :is(.\!border-none) {
border-style: none !important;
}
#time-ruler :is(.border-divider) {
border-color: var(--divider-color);
}
#time-ruler :is(.border-faint) {
border-color: var(--text-faint);
}
#time-ruler :is(.border-red-800) {
--tw-border-opacity: 1;
border-color: rgb(153 27 27 / var(--tw-border-opacity));
}
#time-ruler :is(.border-l-accent) {
border-left-color: var(--text-accent);
}
Expand All @@ -389,32 +367,25 @@
#time-ruler :is(.bg-accent) {
background-color: var(--text-accent);
}
#time-ruler :is(.bg-code) {
background-color: var(--code-background);
}
#time-ruler :is(.bg-faint) {
background-color: var(--text-faint);
}
#time-ruler :is(.bg-primary) {
background-color: var(--background-primary);
}
#time-ruler :is(.bg-primary-alt) {
background-color: var(--background-primary-alt);
}
#time-ruler :is(.bg-red-500\/20) {
background-color: rgb(239 68 68 / 0.2);
}
#time-ruler :is(.bg-red-800) {
--tw-bg-opacity: 1;
background-color: rgb(153 27 27 / var(--tw-bg-opacity));
}
#time-ruler :is(.bg-red-800\/50) {
background-color: rgb(153 27 27 / 0.5);
}
#time-ruler :is(.bg-red-900) {
--tw-bg-opacity: 1;
background-color: rgb(127 29 29 / var(--tw-bg-opacity));
}
#time-ruler :is(.bg-secondary-alt) {
background-color: var(--background-secondary-alt);
}
#time-ruler :is(.bg-selection) {
background-color: var(--text-selection);
}
Expand All @@ -433,9 +404,6 @@
#time-ruler :is(.p-2) {
padding: 0.5rem;
}
#time-ruler :is(.p-4) {
padding: 1rem;
}
#time-ruler :is(.p-8) {
padding: 2rem;
}
Expand Down Expand Up @@ -480,15 +448,15 @@
#time-ruler :is(.pl-8) {
padding-left: 2rem;
}
#time-ruler :is(.pl-9) {
padding-left: 2.25rem;
}
#time-ruler :is(.pl-\[8px\]) {
padding-left: 8px;
}
#time-ruler :is(.pl-indent) {
padding-left: 28px;
}
#time-ruler :is(.pr-1) {
padding-right: 0.25rem;
}
#time-ruler :is(.pr-2) {
padding-right: 0.5rem;
}
Expand Down Expand Up @@ -689,7 +657,7 @@
line-height: 1.25rem;
}
.tr-menu > div {
border-radius: 0.5rem;
border-radius: var(--clickable-icon-radius);
border-width: 1px;
border-style: solid;
border-color: var(--text-faint);
Expand Down Expand Up @@ -917,26 +885,31 @@ div.unscheduled div.time-ruler-group {
#time-ruler :is(.child\:snap-start > *) {
scroll-snap-align: start;
}
#time-ruler :is(.child\:rounded-lg > *) {
border-radius: 0.5rem;
#time-ruler :is(.child\:whitespace-nowrap > *) {
white-space: nowrap;
}
#time-ruler :is(.child\:rounded-icon > *) {
border-radius: var(--clickable-icon-radius);
}
#time-ruler :is(.child\:border-\[1px\] > *) {
border-width: 1px;
}
#time-ruler :is(.child\:border-solid > *) {
border-style: solid;
}
#time-ruler :is(.child\:border-divider > *) {
border-color: var(--divider-color);
}
#time-ruler :is(.child\:bg-primary-alt > *) {
background-color: var(--background-primary-alt);
#time-ruler :is(.child\:bg-primary > *) {
background-color: var(--background-primary);
}
#time-ruler :is(.child\:p-1 > *) {
padding: 0.25rem;
}
#time-ruler :is(.child\:px-1 > *) {
padding-left: 0.25rem;
padding-right: 0.25rem;
}
#time-ruler :is(.child\:pb-0 > *) {
padding-bottom: 0px;
}
#time-ruler :is(.child\:invert > *) {
--tw-invert: invert(100%);
filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
}
#time-ruler :is(.ancestor\:\!bg-transparent *) {
background-color: transparent !important;
}
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "time-ruler",
"name": "Time Ruler",
"version": "2.0.3",
"version": "2.1.0",
"minAppVersion": "0.15.0",
"description": "A drag-and-drop time ruler combining the best of a task list and a calendar view (integrates with Tasks, Full Calendar, and Dataview).",
"author": "Joshua Tazman Reinier",
Expand Down
24 changes: 22 additions & 2 deletions src/app/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export type AppState = {
findingTask: string | null
inScroll: number
searchStatus: boolean
viewMode: 'now' | 'hour' | 'day' | 'week'

dailyNoteInfo: {
format: string
folder: string
Expand All @@ -44,11 +44,19 @@ export type AppState = {
| 'showCompleted'
| 'extendBlocks'
| 'hideTimes'
| 'borders'
| 'viewMode'
>
collapsed: Record<string, boolean>
showingPastDates: boolean
searchWithinWeeks: [number, number]
childWidth: number
timer: {
negative: boolean
maxSeconds: number | null
startISO?: string
playing: boolean
}
}

export const useAppStore = createWithEqualityFn<AppState>(() => ({
Expand Down Expand Up @@ -76,11 +84,18 @@ export const useAppStore = createWithEqualityFn<AppState>(() => ({
showCompleted: false,
extendBlocks: false,
hideTimes: false,
separatorHour: 0,
borders: false,
viewMode: 'day',
},
showingPastDates: false,
searchWithinWeeks: [-1, 1],
childWidth: 1,
timer: {
negative: false,
maxSeconds: null,
startISO: undefined,
playing: false,
},
}))

export const useAppStoreRef = <T>(callback: (state: AppState) => T) => {
Expand Down Expand Up @@ -121,6 +136,11 @@ export const setters = {
parseFileFromPath(beforeHeading)
)
},
patchTimer: (timer: Partial<AppState['timer']>) => {
modify((state) => {
state.timer = { ...state.timer, ...timer }
})
},
}

export const getters = {
Expand Down
Loading

0 comments on commit 4a93e28

Please sign in to comment.