Compare commits

..

116 Commits

Author SHA1 Message Date
Julien Calixte
002cf9a4b1 fix(stacked-note): act on outdated badge clicks
Clicking the badge while it shows outdated now pulls the latest version
from GitHub when there are no unsaved edits, or opens the conflict
modal when edits are in flight. Previously the click only re-ran the
same freshness check, so the badge appeared dead.
2026-05-03 23:37:28 +02:00
Julien Calixte
efe9c01e63 chore(github-content): pin api version on fetchLatestSha request
Silences the @octokit/request deprecation warning that prints whenever
the unversioned /repos/{owner}/{repo}/contents/{path} call fires.
2026-05-03 23:37:24 +02:00
Julien Calixte
d31c774ace feat(stacked-note): surface note freshness and guard saves on conflict
Adds a Tabler-icon badge in the stacked-note action bar showing whether
the loaded copy still matches GitHub HEAD (verified / outdated / offline
/ checking / unknown / stale-known). The save flow now re-checks before
the PUT and opens a conflict modal when GitHub has moved on, with three
explicit choices: discard local edits and pull, overwrite anyway, or
cancel. Race-condition 409s from the PUT itself are routed through the
same modal.
2026-05-03 23:32:54 +02:00
Julien Calixte
d8a59467a0 refactor(github-content): expose conflict info and add latest-sha lookup
updateFile/createFile now return { sha, conflict } so 409/422 from GitHub
can drive a UI flow instead of being swallowed as a generic save error.
Also adds fetchLatestSha(path) for cheap freshness checks against HEAD.
2026-05-03 23:32:37 +02:00
Julien Calixte
dffee40776 2026-05-02 22:48:10 2026-05-02 22:48:10 +02:00
Julien Calixte
4328411d88 chore(zed): disable deno LSP for TS/JS in this project 2026-05-02 22:43:49 +02:00
Julien Calixte
3339e28d41 style(notes): distinguish scrollable column from canvas
Tint the surrounding viewport and add a soft right-edge shadow on
the leftmost note so users can see where scrolling actually applies.
2026-05-02 09:51:24 +02:00
Julien Calixte
c8e5fd26a0 chore: drop disabled husky pre-push hook and dependency
The .husky/_pre-push script was renamed from pre-push, which
disables it under husky v9. With no remaining active hooks, husky
is dead weight, so remove the dependency and prepare script too.
2026-05-02 09:26:52 +02:00
Julien Calixte
f562ca48b1 docs(welcome): link footer atproto entry to atproto.com 2026-05-02 09:16:14 +02:00
Julien Calixte
7c40feeae0 style(welcome): drop network card hover left border 2026-05-02 09:08:09 +02:00
Julien Calixte
4d7b7d01f6 fix(welcome): keep network strip from widening the hero grid
Grid items default to min-width: auto, so the 5×220px scroll strip
forced the 1.2fr column to its intrinsic width and pushed the right
column out. min-width: 0 lets the track shrink and overflow-x scroll.
2026-05-02 08:31:04 +02:00
Julien Calixte
c78ce38845 docs(welcome): rephrase public-notes label to fit pool metaphor 2026-05-01 23:54:24 +02:00
Julien Calixte
b572380c37 feat(welcome): show live public-notes preview inline
Replaces the static "From the open network" CTA and sidebar button with a
horizontal strip and compact list of recent public notes fetched from the
public api.remanso.space/notes endpoint, so visitors can taste the network
before clicking through. Includes shimmer skeletons and a quiet fallback
when the endpoint is unreachable.
2026-05-01 23:27:55 +02:00
Julien Calixte
43c5e65077 docs(welcome): rephrase zettelkasten closing line for clarity 2026-05-01 12:40:56 +02:00
Julien Calixte
7b5af57941 fix(welcome): make zettelkasten link example read grammatically 2026-05-01 12:18:17 +02:00
Julien Calixte
abda5264a8 feat(welcome): use tabler svg icons for feature row 2026-05-01 12:16:36 +02:00
Julien Calixte
e715fb02d3 fix(markdown): cache Shikiji init promise to avoid race on parallel callers
The boolean guard flipped synchronously before the async plugin load
resolved, so concurrent callers (e.g. multiple stacked non-markdown
notes mounting on reload) returned early and rendered before
markdown-it-shikiji was attached to the shared md instance. Cache the
in-flight promise instead so all callers await the same resolution.
2026-04-30 11:03:29 +02:00
Julien Calixte
4c7c688688 2026-04-30 10:34:00 2026-04-30 10:34:00 +02:00
Julien Calixte
7b4c7947aa fix: remove bottom padding 2026-04-29 22:06:58 +02:00
Julien Calixte
68022971cd refactor(notes): restore fixed mobile heights for scroll math
Re-pin .note and .stacked-note to 100dvh on mobile and bring back the
container height in useResizeContainer so (index + 1) * height has a
reachable scroll target. Switch the polled scroll helper to that same
formula instead of offsetTop.
2026-04-29 11:32:23 +02:00
Julien Calixte
f529832eee refactor(notes): scope stacked-note sticky to desktop
Move position: sticky from the global .note rule into the desktop
@media block of the scoped stacked-note components, so mobile no longer
inherits sticky positioning (and no top is set there).
2026-04-29 11:32:13 +02:00
Julien Calixte
3e9418285f refactor(notes): let mobile notes size to content 2026-04-29 11:09:31 +02:00
Julien Calixte
17f015b686 fix(notes): wait for stacked note element before scrolling on mobile
A single nextTick is not enough for a freshly added stacked note to be
in the DOM, so the mobile scroll target was computed against a null
element. Poll with requestAnimationFrame (mirroring scrollToHashInNote)
and use offsetTop, with an (index + 1) * height fallback.
2026-04-29 10:52:07 +02:00
Julien Calixte
adb1bd5945 fix: fix height on mobile 2026-04-29 10:34:46 +02:00
Julien Calixte
86866e7d77 feat(welcome): wire demo note links with stack reveal and flash 2026-04-27 23:10:29 +02:00
Julien Calixte
cf5567de7c refactor(notes): use options object for renderCodeFile params 2026-04-27 20:36:46 +02:00
Julien Calixte
9d6f70546e feat(notes): render code files with Shikiji syntax highlighting
Non-markdown files opened as stacked notes are now highlighted using
the existing markdown-it-shikiji pipeline (4-backtick fence wrapping)
with a h1 filename heading. Edit controls are hidden for code files.
Adds alloy language grammar and a fileLanguage utility mapping
extensions to Shikiji language IDs.
2026-04-27 19:57:15 +02:00
Julien Calixte
812f393283 design: reduce padding for pre in tabs 2026-04-27 18:22:48 +02:00
Julien Calixte
37b39a6d96 design: box for tabs instead 2026-04-27 15:34:12 +02:00
Julien Calixte
df8bda0130 feat(markdown): render tabs as DaisyUI radio input pattern
Use @mdit/plugin-tab custom renderers to emit DaisyUI tabs-lift
structure (radio inputs + tab-content divs) instead of unstyled
default output. CSS-driven, no JS required.
2026-04-27 15:28:10 +02:00
Julien Calixte
74491a45a9 fix(repoList): prevent duplicate entries from concurrent loadMore calls
Add isLoading guard so concurrent fetches are rejected, and include
isLoading in canLoadMore so vInfiniteScroll waits before firing again.
2026-04-27 10:33:31 +02:00
Julien Calixte
da4fada8a1 fix(repoList): handle Bad credentials error from GitHub API
Catch 401 responses in useRepos loadMore and expose hasCredentialError,
then show a sign-in prompt in RepoList instead of an unhandled rejection.
2026-04-27 10:32:37 +02:00
Julien Calixte
df3e217d01 fix(userRepo): unwrap reactive proxies before postMessage to worker
Vue reactive Proxies cannot be serialized by the Structured Clone
Algorithm used by postMessage/Comlink. Use toRaw() on this.files and
this.userSettings before passing them to data.update() to avoid the
DataCloneError.
2026-04-27 10:22:20 +02:00
Julien Calixte
d50adc72e9 refactor(downloadFont): handle generic families and multi-family strings
Strips generic CSS families (serif, monospace, etc.) before building
the font API URL, and correctly parses comma-separated font stacks.
2026-04-27 10:12:12 +02:00
Julien Calixte
78de5e280f feat: show GitHub sign-in when repo is not accessible
Adds a message + sign-in button in FluxNote when the readme resolves
to null (private/unauthorized repo), and on the SpaceCowboy 404 page.
2026-04-27 10:12:09 +02:00
Julien Calixte
28ca9a17a9 fix(FluxNote): stop skeleton showing when repo is inaccessible
The skeleton was conditioned on `isLoading || !hasContent`, so it
persisted forever when readme resolved to null (e.g. private repo
visited while logged out). Skeleton now only shows while loading.
2026-04-27 10:07:08 +02:00
Julien Calixte
836b480ea6 fix(navigation): resolve clicked anchor when target is a nested element
A click on a child of an <a> (e.g. nested <strong>, <em>, <code>, icon)
made event.target a non-anchor, so getAttribute('href') returned null
and the handler bailed without preventDefault. The browser then
performed the native navigation, which for relative links like
'../note.md' resolved against the current /:user/:repo URL and the SPA
re-routed treating the destination as a new repo.
2026-04-26 13:58:48 +02:00
Julien Calixte
9f75e7971d fix(layout): cache pageWidth in localStorage to avoid render glitch
The page width from .remanso.json was only applied after an async
PouchDB + network fetch, so notes briefly rendered at the default
500px before snapping to the configured value. Persist pageWidth
alongside the existing font cache (key renamed to remanso:layout:*),
so it is read synchronously during setUserRepo and applied before
the first render. Also always reset --note-width with a default
fallback to prevent stale values leaking across repo navigation.
2026-04-26 13:44:10 +02:00
Julien Calixte
181ffd1e5c feat(navigation): smooth scroll for in-note anchor links
Pure-fragment links (#heading) used to fall through to the browser's
default jump. Handle them in the click listener and scope the lookup
to the same stacked note so identical heading ids in other notes
don't win, with smooth scroll behavior to match cross-note anchors
into already-stacked notes.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-26 09:59:12 +02:00
Julien Calixte
c00065ce4a refactor(navigation): scrollToFocusedNote takes an options object
Smooth-scroll for the anchor jump when the target note is already
stacked, instant otherwise. While threading the new flag, the four
positional params got hard to read, so collapse them into
{ noteId, notes, hash, smoothHash } and update all call sites.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-26 09:56:32 +02:00
Julien Calixte
4ce8c30649 fix(navigation): support anchor fragments in note links
Links like `path/to/note.md#heading` previously errored with "Note not
found" because the full href (including `#hash`) was matched against
file paths. Split the fragment off in the link handler, plumb it through
the event bus, and scroll the matching heading into view once the
target note is in place. Headings now get GitHub-style ids via
markdown-it-anchor + github-slugger so the anchors actually exist.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-26 09:40:30 +02:00
Julien Calixte
d098b3b404 fix: no more clip overflow y 2026-04-25 00:02:12 +02:00
Julien Calixte
e03ff49764 fix(mobile): restore overflow-y and unstick readme on vertical scroll
- Restore explicit overflow-y:auto on #main-app for mobile (removed in
  63f5d64) — implicit coercion from overflow-x:auto is not reliable in
  all Safari/WebKit versions.
- Override position:sticky on .readme to position:relative on mobile.
  The desktop sticky (left:0) is correct for horizontal scroll, but on
  mobile vertical scroll it pinned the 100dvh-tall readme across the
  entire viewport, hiding all stacked notes behind it.
2026-04-24 23:42:22 +02:00
Julien Calixte
19495ddf0c feat(scroll): use smooth scrollTo instead of direct property assignment 2026-04-23 18:07:44 +02:00
Julien Calixte
63f5d644eb fix: remove overflow y 2026-04-23 18:03:51 +02:00
Julien Calixte
63bc3f4d5d fix(mobile): scroll #main-app instead of body on mobile
body/html have overflow:hidden so scrollTop is a no-op on them.
#main-app is the actual scroll container; use overflow-y:auto on
mobile and target it directly in scrollToNote and the scroll listener.
2026-04-23 18:01:30 +02:00
Julien Calixte
ded770aff1 fix(mobile): restore body scroll and prevent spurious section scroll
Three layered fixes for mobile note scrolling:

1. app.css / App.vue: on mobile, override overflow:hidden on html/body
   and overflow:visible on #main-app so content from useResizeContainer
   (which sets the note-container height to (n+1)*100vh) propagates to
   the document and document.body.scrollTop works again.

2. FluxNote.vue: give each .note an explicit height:100dvh on mobile so
   the percentage-based height:100% does not resolve against the
   inflated container height set by useResizeContainer.

3. StackedNote / StackedPublicNote: replace overflow-y:hidden with
   overflow-y:clip on the section. Unlike hidden, clip does not create a
   scroll container, so touch events fall through to the page scroll and
   the section never feels "draggable" when content fits within the note.
2026-04-23 17:58:33 +02:00
Julien Calixte
d12d7b660b Revert "fix(layout): make stacked notes stick horizontally when scrolling"
This reverts commit 86c9feaf55.
2026-04-22 23:59:36 +02:00
Julien Calixte
86c9feaf55 fix(layout): make stacked notes stick horizontally when scrolling
Add left offset to each stacked note so position: sticky activates
during horizontal scroll, pinning notes progressively to the right
of the readme column at calc((index + 1) * var(--note-width)).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-22 23:56:43 +02:00
Julien Calixte
449a16f791 fix(layout): prevent document-level scroll-y when stacked notes overflow
Contain horizontal overflow within #main-app instead of leaking to the
document, which caused a horizontal scrollbar to consume viewport height
and trigger an unwanted vertical scrollbar. Also fix note pane height
to use 100% instead of 100vh, and switch useResizeContainer to minWidth
so the flex container can grow when the window is wider than the notes.
Add a window resize listener to keep the value accurate on resize.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-22 23:52:03 +02:00
Julien Calixte
ee8bbd4a37 feat(config): add pageWidth setting to .remanso.json
Allows repo owners to configure note column width via `"pageWidth": "700px"` in .remanso.json. Applies the value to the --note-width CSS variable and invalidates the cached width so resize/overlay hooks pick it up.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-22 23:34:26 +02:00
Julien Calixte
1f272bc3e2 fix: no more after for repos 2026-04-22 23:01:40 +02:00
Julien Calixte
29c22a9b0f copy(home): reframe manifesto sentence without negative framing 2026-04-20 18:23:47 +02:00
Julien Calixte
5c76170645 style(home): adjust CTA card width from w-2xl to w-xl 2026-04-20 18:19:42 +02:00
Julien Calixte
ceb800b6ac refactor(home): replace gh-form pill with DaisyUI input + joined button
Wrap inputs in <label class="input"> (DaisyUI v5 compound input pattern).
Form uses flex fill so inputs auto-size and the button stays on the right
on a single line regardless of container width.
2026-04-20 18:15:12 +02:00
Julien Calixte
f809a1f5f8 style(home): enlarge GitHub repo and open network CTA cards 2026-04-20 18:00:42 +02:00
Julien Calixte
5cda110a98 style(home): sharpen hero headline and lede copy
"settles into a pool" → "comes to rest" (clearer double meaning)
"margin enough to think" → "where your thinking finally runs clear"
2026-04-20 17:58:45 +02:00
Julien Calixte
ce690b6767 fix(home): remove z-index from footer/main so PWA toast is not obscured 2026-04-20 17:17:24 +02:00
Julien Calixte
73253c9ad2 style(home): replace "Link, don't file" with "Link, don't nest" 2026-04-20 16:44:17 +02:00
Julien Calixte
369d730f70 feat: highlight on link clicked 2026-04-20 16:41:09 +02:00
Julien Calixte
668f73b546 feat(home): highlight linked note card on "durable enough" click 2026-04-20 16:38:00 +02:00
Julien Calixte
b1be42b5bf feat(home): redesign homepage with editorial and launchpad layouts
Replace the minimal centered layout with a full literary/academic
homepage: logged-out users see an editorial hero, manifesto, demo
notes, and ZK primer; logged-in users see a personal launchpad
(greeting, repo tiles, last visited, review queue) followed by the
same editorial content below.

Uses DaisyUI CSS variables throughout (color-mix) so it adapts to
any theme change without hardcoded overrides.
2026-04-20 14:32:48 +02:00
Julien Calixte
70b679b204 Merge branch 'main' of ssh://git.apoena.dev:22222/remanso-space/remanso 2026-04-20 11:10:48 +02:00
Julien Calixte
36dc1293f9 docs: fix ATProto session storage split between SecureStore and SQLite 2026-04-20 10:56:03 +02:00
Julien Calixte
801b7cb94a docs: add React Native migration design spec 2026-04-20 10:55:44 +02:00
Julien Calixte
1fa66d8594 fix: prevent spurious y-scrollbar when section has overflow-x: auto on mobile
Setting overflow-x: auto forces overflow-y off 'visible' per CSS spec,
which caused an unwanted vertical scrollbar in stacked note sections.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-19 14:28:25 +02:00
Julien Calixte
b827f31cf0 fix: current color for svg in buttons 2026-04-19 10:49:37 +02:00
Julien Calixte
cf02569c75 design: change light theme to emerald 2026-04-19 10:39:49 +02:00
Julien Calixte
0a4f8dbf41 fix: make BackButton and LinkedNotes keyboard accessible
Replace <a> (no href) with <button> so both elements receive tab focus.
BackButton gets text-base-content to preserve icon color; LinkedNotes
uses btn class="link" to keep the inline text-link appearance.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-14 01:08:34 +02:00
Julien Calixte
b6f6759af5 fix: restore icon color on button elements in header
<button> gets color:ButtonText from the browser UA stylesheet, making
SVG stroke="currentColor" render black. Add text-base-content to
inherit the DaisyUI theme color like the <a>-based router-links do.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-14 01:07:25 +02:00
Julien Calixte
c42c26a407 fix: restore icon color on FontChange trigger button
<button> defaults to color: ButtonText (black) in browsers, unlike <a>
which inherits. Adding color: inherit restores the theme color for the
SVG stroke (which uses currentColor).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-14 01:06:25 +02:00
Julien Calixte
cfe5ef8fcd fix: make HomeButton keyboard accessible
Replace <a> with <button> so the home logo receives tab focus.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-14 01:04:50 +02:00
Julien Calixte
4c5116bc89 fix: make FontChange modal trigger keyboard accessible
Replace <a> with <button> for the typography icon in HeaderNote so it
receives tab focus — <a> without href is excluded from the tab order.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-14 01:02:12 +02:00
Julien Calixte
8581baafb7 design: change dark theme to forest 2026-04-08 19:07:03 +02:00
Julien Calixte
29c092e0a0 design: change dark theme to abyss 2026-04-08 19:04:28 +02:00
Julien Calixte
410c0cec7c design: change dark theme to sunset 2026-04-08 19:03:07 +02:00
Julien Calixte
66a1bcbaa9 design: change dark theme to black 2026-04-08 19:01:48 +02:00
Julien Calixte
541e058d12 fix: restore dark theme and fix theme script regex
Dark theme was set to "dim" in theme.config.ts while app.css registered
"sunset" as the prefersdark theme. The script's regex required a trailing
comma that didn't exist on the last property, causing silent failures.
2026-04-08 19:01:29 +02:00
Julien Calixte
a05ff9f238 design: change dark theme to sunset 2026-04-08 18:57:36 +02:00
Julien Calixte
6558de8df5 design: change dark theme to black 2026-04-08 18:51:30 +02:00
Julien Calixte
b48c1bd0d5 prune: remove obsolete agent 2026-04-06 23:41:19 +02:00
Julien Calixte
e369541dc0 refactor: scope PouchDB writes to repo config, not user font prefs
chosen* fields are per-browser preferences — localStorage is the correct
and sufficient store for them. Removing data.update from font setters and
stripping chosen* from the GitHub fetch PouchDB write prevents stale PouchDB
data from conflicting with localStorage on reload.
2026-04-06 23:26:50 +02:00
Julien Calixte
73a6014750 fix: persist font selections across navigation and page reloads
- Use v-model with writable computeds instead of :value+@change so selects
  re-sync when the options list changes asynchronously
- Always include currently chosen fonts in sortedFontFamilies so a selected
  font not present in .remanso.json fontFamilies still shows in the select
- Initialize userSettings instead of returning early in font setters so
  changes made before async GitHub fetch completes are not silently dropped
- Back font choices with localStorage so they survive hard reloads even when
  PouchDB/IndexedDB fails silently in the web worker
2026-04-06 18:51:27 +02:00
Julien Calixte
c197b80095 feat: smaller modal 2026-04-06 17:44:43 +02:00
Julien Calixte
f3e74aed34 fix: resolve all TypeScript type errors
- Install missing comlink (was in lockfile but not node_modules)
- Add @ts-rest/core and @ts-rest/vue-query (imported but not declared as deps)
- Add declare module '*.vue' shim to shims-vue.d.ts
- Replace arktype validators in ts-rest contract with contract.type<T>() since @ts-rest expects Zod schemas
2026-04-06 15:05:57 +02:00
Julien Calixte
8d9134a062 perf: cache repo list with 20-minute stale time
Hoist useRepos state to module scope so all callers share one instance, and skip re-fetching until data is older than 20 minutes.
2026-04-06 14:59:12 +02:00
Julien Calixte
006cd63388 feat: paginate repo list with infinite scroll
Load 30 repos at a time instead of 100 at once, showing data sooner.
Adds v-infinite-scroll to RepoList.vue to fetch subsequent pages on scroll.
2026-04-05 11:56:36 +02:00
Julien Calixte
3de9eb35f6 feat: show font family selectors with default fonts when no .remanso.json 2026-04-05 10:49:01 +02:00
Julien Calixte
99c349f6df fix: preserve font settings when repo has no .remanso.json
When no config file exists, userSettings was set to null which destroyed
cached user preferences and silently blocked all setFont* actions.
2026-04-04 14:39:34 +02:00
Julien Calixte
64b29bcdef fix: remove favicon.png from PWA manifest icons to fix dock icon on macOS 2026-04-04 14:22:14 +02:00
Julien Calixte
9e26e231cb fix: show theme and font size controls before font families load
Move the v-if guard from the outer FontChange wrapper to only the font-family
selects, so ThemeSwap and the font-size select are always visible in the modal
even before userSettings.fontFamilies resolves asynchronously.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-04 11:35:05 +02:00
Julien Calixte
b003a3e008 perf: move PouchDB/IndexedDB operations to a Web Worker
All database reads and writes now run off the main thread via a
dedicated worker, eliminating IndexedDB overhead from the frame budget.

- Create data.worker.ts exposing the Data class via Comlink
- Refactor data.ts to export a Comlink-wrapped proxy and a standalone
  generateId() pure function (workers can't expose sync methods cleanly)
- Update all 10 call sites to import generateId directly instead of
  calling data.generateId()

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-04 11:27:45 +02:00
Julien Calixte
1b5e23e3d4 fix: keep font settings visible during repo navigation
- resetFiles() no longer clears userSettings so FontChange stays visible
  while navigating between repos (old fonts show until new ones load)
- Add _requestId counter to setUserRepo() to discard stale async callbacks
  from previous navigations, preventing state corruption on quick nav
- Load savedRepo and userSettings caches in parallel with Promise.all,
  reducing yield points so cache hits apply before first render

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-04 11:21:56 +02:00
Julien Calixte
52d7c84bd0 perf: prevent FPS drops during navigation in FluxNoteView
- Narrow backlinks watcher from entire store to store.files only,
  reducing trigger count from ~8 to 2 per navigation
- Defer computation start by 300ms so it runs after the 250ms view
  transition animation completes
- Yield to the browser between each file iteration using
  scheduler.yield() (with setTimeout fallback) to avoid blocking frames

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-04 11:14:02 +02:00
Julien Calixte
d76182b2c2 Merge branch 'main' of ssh://git.apoena.dev:22222/remanso-space/remanso 2026-04-03 15:02:46 +02:00
Julien Calixte
ed1a6b7fba fix: add the right margin to the right components 2026-03-29 22:09:01 +02:00
Julien Calixte
d5b251c4a0 fix: remove overflow because it's causing too much trouble 2026-03-29 22:00:22 +02:00
Julien Calixte
19b77810ec chore: remove healthcheck in docker to be faster 2026-03-29 21:55:32 +02:00
Julien Calixte
c8b0a78973 fix: add nginx SPA fallback to serve index.html for all routes
Prevents 404 errors when navigating directly to client-side routes.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-29 21:50:50 +02:00
Julien Calixte
087d1a355e revert: remove justify-content center from welcome content
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-28 22:37:19 +01:00
Julien Calixte
5d90da8ab5 feat: center welcome content vertically
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-28 22:36:40 +01:00
Julien Calixte
72d065975d fix: lock html/body to 100dvh overflow hidden on all screen sizes
All views that need scroll use their own overflow-y: auto containers.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-28 22:35:11 +01:00
Julien Calixte
8b3df48791 fix: clip app at 100dvh to prevent body scroll on mobile
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-28 22:29:50 +01:00
Julien Calixte
cd8e173e05 fix: use 100dvh for body and #app to match dynamic viewport
Prevents white space below the app on Android Chrome where the
system nav bar makes 100vh > 100dvh.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-28 22:25:19 +01:00
Julien Calixte
8767f7c430 fix: give .home explicit height so flex children resolve correctly
On Chrome Android, cross-axis stretch doesn't always produce a
definite height for inner flex items. Adding height: 100dvh to
.home ensures flex: 1 on .welcome-world resolves to full viewport.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-28 22:22:54 +01:00
Julien Calixte
369a200a42 fix: wrap content in flex:1 div so footer doesn't overflow
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-28 22:07:08 +01:00
Julien Calixte
06eaa3c9a7 fix: ensure footer stays at bottom with align-self stretch
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-28 21:56:09 +01:00
Julien Calixte
4cbcf42e3d feat: replace BackButton and logo with HomeButton in PublicNoteView
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-28 21:32:19 +01:00
Julien Calixte
a0be25c0dd fix: prevent layout shift on first load in PWA mode
Replace space-between with flex-start + margin-top:auto on footer and
add gap to avoid wide spacing while async components are loading.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-28 21:28:47 +01:00
Julien Calixte
dcee26100f fix: use 100dvh to prevent scroll on mobile first load
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-28 21:05:34 +01:00
Julien Calixte
ac68c68f8a feat: reorganize FontChange layout and resize header icons
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-28 20:46:44 +01:00
Julien Calixte
982f3070a1 fix: use <a> for font modal trigger to match icon color
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-28 20:35:52 +01:00
Julien Calixte
20e9538983 feat: mv profile to footer 2026-03-28 20:24:08 +01:00
Julien Calixte
10c3e1ca60 feat: replace back button with HomeButton and fix view transition
- Use HomeButton component in HeaderNote for logo, hover, and view-transition-name
- Eagerly import HeaderNote in FluxNote so the logo exists in the DOM when the transition snapshot is taken
- Wait for afterEach + nextTick in the view transition hook to handle lazy-loaded routes
- Add cursor: pointer to font change button

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-28 20:19:59 +01:00
6dc98c80ca Merge pull request 'chore/migrate-to-oxc' (#1) from chore/migrate-to-oxc into main
Reviewed-on: #1
2026-03-28 09:00:30 +00:00
Julien Calixte
1aef212a36 docs: rolldown and oxc 2026-03-22 01:23:13 +01:00
72 changed files with 4739 additions and 1007 deletions

View File

@@ -1,8 +0,0 @@
{
"name": "remanso-skills",
"version": "1.0.0",
"description": "Local skills for the Remanso project",
"author": {
"name": "julien"
}
}

View File

@@ -1,196 +0,0 @@
---
name: migrate-oxlint
description: Guide for migrating a project from ESLint to Oxlint. Use when asked to migrate, convert, or switch a JavaScript/TypeScript project's linter from ESLint to Oxlint.
---
This skill guides you through migrating a JavaScript/TypeScript project from ESLint to [Oxlint](https://oxc.rs/docs/guide/usage/linter/).
## Overview
Oxlint is a high-performance linter that implements many popular ESLint rules natively in Rust. It can be used alongside ESLint or as a full replacement.
An official migration tool is available, and will be used by this skill: [`@oxlint/migrate`](https://github.com/oxc-project/oxlint-migrate)
## Step 1: Run Automated Migration
Run the migration tool in the project root:
```bash
npx @oxlint/migrate
```
This reads your ESLint flat config (`eslint.config.js` for example) and generates a `.oxlintrc.json` file from it. It will find your ESLint config file automatically in most cases.
See options below for more info.
### Key Options
| Option | Description |
| --------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
| `--type-aware` | Include type-aware rules from `@typescript-eslint` (will require the `oxlint-tsgolint` package to be installed after migrating) |
| `--with-nursery` | Include experimental rules still under development, may not be fully stable or consistent with ESLint equivalents |
| `--js-plugins [bool]` | Enable/disable ESLint plugin migration via `jsPlugins` (default: enabled) |
| `--details` | List rules that could not be migrated |
| `--replace-eslint-comments` | Convert all `// eslint-disable` comments to `// oxlint-disable` |
| `--output-file <file>` | Specify a different output path (default: `.oxlintrc.json`) |
If your ESLint config is not at the default location, pass the path explicitly:
```bash
npx @oxlint/migrate ./path/to/eslint.config.js
```
## Step 2: Review Generated Config
After migration, review the generated `.oxlintrc.json`.
### Plugin Mapping
The migration tool automatically maps ESLint plugins to oxlint's built-in equivalents. The following table is for reference when reviewing the generated config:
| ESLint Plugin | Oxlint Plugin Name |
| --------------------------------------------------- | ------------------ |
| `@typescript-eslint/eslint-plugin` | `typescript` |
| `eslint-plugin-react` / `eslint-plugin-react-hooks` | `react` |
| `eslint-plugin-import` / `eslint-plugin-import-x` | `import` |
| `eslint-plugin-unicorn` | `unicorn` |
| `eslint-plugin-jsx-a11y` | `jsx-a11y` |
| `eslint-plugin-react-perf` | `react-perf` |
| `eslint-plugin-promise` | `promise` |
| `eslint-plugin-jest` | `jest` |
| `@vitest/eslint-plugin` | `vitest` |
| `eslint-plugin-jsdoc` | `jsdoc` |
| `eslint-plugin-next` | `nextjs` |
| `eslint-plugin-node` | `node` |
| `eslint-plugin-vue` | `vue` |
Default plugins (enabled when `plugins` field is omitted): `unicorn`, `typescript`, `oxc`.
Setting the `plugins` array explicitly overrides these defaults.
ESLint core rules are usable in oxlint without needing to configure a plugin in the config file.
### Rule Categories
Oxlint groups rules into categories for bulk configuration, though only `correctness` is enabled by default:
```json
{
"categories": {
"correctness": "error",
"suspicious": "warn"
}
}
```
Available categories: `correctness` (default: enabled), `suspicious`, `pedantic`, `perf`, `style`, `restriction`, `nursery`.
Individual rule settings in `rules` override category settings.
`@oxlint/migrate` will turn `correctness` off to avoid enabling additional rules that weren't enabled by your ESLint config. You can choose to enable additional categories after migration if desired.
### Check Unmigrated Rules
Run with `--details` to see which ESLint rules could not be migrated:
```bash
npx @oxlint/migrate --details
```
Review the output and decide whether to keep ESLint for those rules or not. Some rules may be mentioned in the output from `--details` as having equivalents in oxlint that were not automatically mapped by the migration tool. In those cases, consider enabling the equivalent oxlint rule manually after migration.
## Step 3: Install Oxlint
Install the core oxlint package (use `yarn install`, `pnpm install`, `vp install`, `bun install`, etc. depending on your package manager):
```bash
npm install -D oxlint
```
If you want to add the `oxlint-tsgolint` package, if you intend to use type-aware rules that require TypeScript type information:
```bash
npm install -D oxlint-tsgolint
```
No other packages besides the above are needed by default, though you will need to keep/install any additional ESLint plugins that were migrated into `jsPlugins`. Do not add `@oxlint/migrate` to the package.json, it is meant for one-off usage.
## Step 4: Handle Unsupported Features
Some features require manual attention:
- Local plugins (relative path imports): Must be migrated manually to `jsPlugins`
- `eslint-plugin-prettier`: Supported, but very slow. It is recommended to use [oxfmt](https://oxc.rs/docs/guide/usage/formatter) instead, or switch to `prettier --check` as a separate step alongside oxlint.
- `settings` in override configs: Oxlint does not support `settings` inside `overrides` blocks.
- ESLint v9+ plugins: Not all work with oxlint's JS Plugins API, but the majority will.
### Local Plugins
If you have any custom ESLint rules in the project repo itself, you can migrate them manually after running the migration tool by adding them to the `jsPlugins` field in `.oxlintrc.json`:
```json
{
"jsPlugins": ["./path/to/my-plugin.js"],
"rules": {
"local-plugin/rule-name": "error"
}
}
```
### External ESLint Plugins
For ESLint plugins without a built-in oxlint equivalent, use the `jsPlugins` field to load them:
```json
{
"jsPlugins": ["eslint-plugin-custom"],
"rules": {
"custom/my-rule": "warn"
}
}
```
## Step 5: Update CI and Scripts
Replace ESLint commands with oxlint. Path arguments are optional; oxlint defaults to the current working directory.
```bash
# Before
npx eslint src/
npx eslint --fix src/
# After
npx oxlint src/
npx oxlint --fix src/
```
### Common CLI Options
| ESLint | oxlint equivalent |
| ------------------------- | ---------------------------------------------- |
| `eslint .` | `oxlint` (default: lints the cwd) |
| `eslint src/` | `oxlint src/` |
| `eslint --fix` | `oxlint --fix` |
| `eslint --max-warnings 0` | `oxlint --deny-warnings` or `--max-warnings 0` |
| `eslint --format json` | `oxlint --format json` |
Additional oxlint options:
- `--tsconfig <path>`: Specify tsconfig.json path, likely unnecessary unless you have a non-standard name for `tsconfig.json`.
## Tips
- You can run alongside ESLint if necessary: Oxlint is designed to complement ESLint during migration, but with JS Plugins many projects can switch over fully without losing many rules.
- Disable comments work: `// eslint-disable` and `// eslint-disable-next-line` comments are supported by oxlint. Use `--replace-eslint-comments` when running @oxlint/migrate to convert them to `// oxlint-disable` equivalents if desired.
- List available rules: Run `npx oxlint --rules` to see all supported rules, or refer to the [rule documentation](https://oxc.rs/docs/guide/usage/linter/rules.html).
- Schema support: Add `"$schema": "./node_modules/oxlint/configuration_schema.json"` to `.oxlintrc.json` for editor autocompletion if the migration tool didn't do it automatically.
- Output formats: `default`, `stylish`, `json`, `github`, `gitlab`, `junit`, `checkstyle`, `unix`
- Ignore files: `.eslintignore` is supported by oxlint if you have it, but it's recommended to move any ignore patterns into the `ignorePatterns` field in `.oxlintrc.json` for consistency and simplicity. All files and paths ignored via a `.gitignore` file will be ignored by oxlint by default as well.
- If you ran the migration tool multiple times, remove the `.oxlintrc.json.bak` backup file created by the migration tool once you've finished migrating.
- If you are not using any JS Plugins and have replaced your ESLint configuration, you can remove all ESLint packages from your project dependencies.
- Ensure your editor is configured to use oxlint instead of ESLint for linting and error reporting. You may want to install the Oxc extension for your preferred editor. See https://oxc.rs/docs/guide/usage/linter/editors.html for more details.
## References
- [CLI Reference](https://oxc.rs/docs/guide/usage/linter/cli.html)
- [Config File Reference](https://oxc.rs/docs/guide/usage/linter/config-file-reference.html)
- [Complete Oxlint rule list and docs](https://oxc.rs/docs/guide/usage/linter/rules.html)

View File

@@ -1,14 +0,0 @@
{
"name": "remanso-local",
"description": "Local plugins for the Remanso project",
"owner": {
"name": "julien"
},
"plugins": [
{
"name": "remanso-skills",
"description": "Local skills for the Remanso project (migrate-oxlint, etc.)",
"source": "./.agents"
}
]
}

View File

@@ -5,10 +5,6 @@
"label": "Vue i18n", "label": "Vue i18n",
"uri": "https://vue-i18n.intlify.dev/guide/introduction.html" "uri": "https://vue-i18n.intlify.dev/guide/introduction.html"
} }
], ]
"vite.config.ts": {
"label": "Remanso GitHub app",
"uri": "https://github.com/organizations/remanso-spance/settings/apps/lite-note"
}
} }
} }

1
.gitignore vendored
View File

@@ -2,7 +2,6 @@
node_modules node_modules
/dist /dist
# local env files # local env files
.env.local .env.local
.env.*.local .env.*.local

View File

@@ -1,37 +0,0 @@
# Define the checksum file
CHECKSUM_FILE=".env.checksum"
# Calculate the current checksum of the .env file
CURRENT_CHECKSUM=$(shasum -a 256 .env | awk '{ print $1 }')
# Check if checksum file exists
if [ -f "$CHECKSUM_FILE" ]; then
# Read the previous checksum
PREVIOUS_CHECKSUM=$(cat "$CHECKSUM_FILE")
# Compare the current checksum with the previous checksum
if [ "$CURRENT_CHECKSUM" = "$PREVIOUS_CHECKSUM" ]; then
echo ".env file has not changed. Skipping Netlify environment import."
exit 0
fi
fi
# If the checksum is different or the file doesn't exist, import the variables
echo "Importing environment variables to Netlify..."
netlify env:import .env
if [ $? -ne 0 ]; then
echo "Failed to import environment variables to Netlify. Aborting push."
exit 1
fi
# Save the new checksum
echo "$CURRENT_CHECKSUM" > "$CHECKSUM_FILE"
# Stage the checksum file
git add "$CHECKSUM_FILE"
# Amend the last commit with the updated checksum
git commit -m "Update .env checksum"
echo "Environment variables imported successfully."

23
.zed/settings.json Normal file
View File

@@ -0,0 +1,23 @@
{
"format_on_save": "on",
"formatter": {
"external": {
"command": "node_modules/.bin/oxfmt",
"arguments": ["--stdin-filepath", "{buffer_path}"]
}
},
"languages": {
"TypeScript": {
"language_servers": ["!deno", "..."]
},
"TSX": {
"language_servers": ["!deno", "..."]
},
"JavaScript": {
"language_servers": ["!deno", "..."]
},
"JSX": {
"language_servers": ["!deno", "..."]
}
}
}

View File

@@ -28,8 +28,6 @@ RUN pnpm run build
FROM nginx:alpine AS runner FROM nginx:alpine AS runner
COPY --from=builder /app/dist /usr/share/nginx/html COPY --from=builder /app/dist /usr/share/nginx/html
COPY nginx.conf /etc/nginx/conf.d/default.conf
EXPOSE 80 EXPOSE 80
HEALTHCHECK --interval=30s --timeout=3s \
CMD wget -qO- http://localhost:80/ || exit 1

View File

@@ -28,8 +28,8 @@ let themeConfigContent = readFileSync(themeConfigPath, "utf8")
// Remplacer la valeur du thème sombre // Remplacer la valeur du thème sombre
themeConfigContent = themeConfigContent.replace( themeConfigContent = themeConfigContent.replace(
/dark:\s*['"][^'"]*['"],/, /dark:\s*['"][^'"]*['"](,?)/,
`dark: '${newTheme}',` `dark: '${newTheme}'$1`
) )
// Écrire le contenu mis à jour dans le fichier // Écrire le contenu mis à jour dans le fichier

View File

@@ -0,0 +1,236 @@
# Remanso React Native Migration — Design Spec
**Date:** 2026-04-20
**Status:** Approved
## Overview
Migrate Remanso from a Vue 3 web app to a fully native iOS + Android app built with Expo (React Native). The primary motivation is native feel: fluid stack animations, swipe-back gestures, and native navigation chrome. The scope is a full replacement of the web app.
## Tech Stack
| Concern | Current (Vue) | React Native |
| ---------------- | ---------------------- | ---------------------------------------------------------- |
| Framework | Vue 3 + Vite | Expo SDK (managed workflow) |
| Routing | Vue Router | Expo Router (file-system routing over React Navigation v7) |
| State | Pinia | Zustand |
| Server state | TanStack Vue Query | TanStack Query (same library) |
| Styling | DaisyUI + Tailwind CSS | NativeWind v4 |
| Local DB | PouchDB (IndexedDB) | Expo SQLite |
| Simple KV store | localStorage | MMKV |
| Auth | OAuth redirects | expo-auth-session |
| GitHub API | @octokit/rest | @octokit/rest (unchanged) |
| i18n | vue-i18n | react-i18next |
| Date utils | date-fns | date-fns (unchanged) |
| Markdown content | markdown-it (DOM) | react-native-webview |
| Fonts | CSS custom properties | expo-font |
## Navigation Structure
Expo Router generates a React Navigation v7 tree from the file system. The stacked note pattern — the core native feel win — maps to a nested Stack navigator where each backlink push adds a note with a native slide animation and swipe-left pops it.
```
Root Stack
├── Auth screens (unauthenticated, no tab bar)
│ ├── Home / Welcome
│ ├── GitHub OAuth callback
│ └── ATProto OAuth callback
└── Authenticated App — Bottom Tabs
├── Tab: Feed (Stack)
│ ├── Repo picker
│ └── Note Stack (nested Stack)
│ ├── Note (root)
│ ├── Note (pushed via backlink) ← swipe-back to pop
│ └── Note (pushed via backlink) ← swipe-back to pop
├── Tab: Inbox / Drafts / Todos (Stack)
│ └── Note list → Note detail
├── Tab: Public Notes (Stack)
│ ├── Public note list
│ └── Public note detail
└── Tab: Settings (Stack)
├── Settings root
└── Font picker (presented as modal)
```
History and Spaced Repetition are accessible as sections within the Feed tab or as additional tabs — to be decided during implementation.
## Data Layer
PouchDB is replaced by **Expo SQLite** for structured data and **MMKV** for simple key-value preferences.
### Expo SQLite schema
```sql
CREATE TABLE IF NOT EXISTS github_tokens (
id TEXT PRIMARY KEY,
access_token TEXT NOT NULL,
refresh_token TEXT,
expires_at INTEGER
);
CREATE TABLE IF NOT EXISTS atproto_sessions (
id TEXT PRIMARY KEY,
did TEXT NOT NULL
-- full session_json stored in Expo SecureStore keyed by id
);
CREATE TABLE IF NOT EXISTS saved_repos (
id TEXT PRIMARY KEY,
user TEXT NOT NULL,
repo TEXT NOT NULL,
files_json TEXT NOT NULL,
cached_at INTEGER NOT NULL
);
CREATE TABLE IF NOT EXISTS history (
id TEXT PRIMARY KEY,
user TEXT NOT NULL,
repo TEXT NOT NULL,
note_path TEXT NOT NULL,
content TEXT NOT NULL,
created_at INTEGER NOT NULL
);
```
The existing `DataApi` interface (`add`, `update`, `remove`, `get`, `getAll`) is re-implemented as a thin wrapper over Expo SQLite. No ORM — plain async SQL with `CREATE TABLE IF NOT EXISTS` on first open handles schema initialization at this scale.
Sensitive data (access tokens, refresh tokens, ATProto sessions) is stored in **Expo SecureStore** rather than plain SQLite. SQLite holds only metadata and content cache.
### MMKV
Replaces localStorage for user settings: font family, font size, theme preference. Synchronous reads, no async overhead.
### No Web Worker
Database calls move to the main thread via Expo SQLite's async API. The performance concern that justified the Web Worker on web does not apply on mobile.
## Auth Flows
### GitHub OAuth
The existing auth server (`api.remanso.space/auth/github`) handles code exchange — the client flow is unchanged:
1. `expo-auth-session` opens an in-app browser tab with the GitHub authorize URL
2. OAuth redirect captured by Expo's deep link handler
3. Code sent to `api.remanso.space/auth/github?code=...` for token exchange
4. Access token + refresh token stored in Expo SecureStore
5. Token refresh logic (15-minute pre-expiry check) stays the same; HTTP calls use `fetch`
### ATProto / Bluesky OAuth
`@atproto/oauth-client-browser` is browser-only (IndexedDB, `window.crypto`, browser redirects). There is no official React Native client. A custom client (~200300 lines) is implemented using:
- `expo-auth-session` for the OAuth redirect flow (PKCE)
- `expo-crypto` for PKCE code verifier/challenge generation
- Expo SecureStore for session persistence
- The same Bluesky API endpoints as the browser client
This keeps ATProto auth fully client-side, consistent with the app's current architecture.
## State Management
Zustand replaces Pinia. The store shape is identical to `userRepo.store.ts`:
```ts
const useRepoStore = create<RepoState>((set, get) => ({
user: "",
repo: "",
files: [],
userSettings: null,
needToLogin: false,
setRepo: (user, repo) => set({ user, repo }),
loadFiles: async () => {
/* Octokit call */
},
loadSettings: async () => {
/* MMKV read */
}
}))
```
TanStack Query handles all GitHub API server state (file fetching, README, repo listing) — same library, same patterns as today.
## Styling
NativeWind v4 provides Tailwind utility classes in React Native. DaisyUI is web-only and has no React Native equivalent — all component styling (buttons, cards, modals) is hand-written using NativeWind utilities.
The two DaisyUI themes (`retro` light, `coffee` dark) are translated into a custom NativeWind theme in `tailwind.config.ts` with the same color tokens. System appearance (`useColorScheme`) drives theme selection.
Font customization uses `expo-font` for loading custom fonts and React Native's `fontFamily` style prop, replacing the CSS custom property approach.
## Markdown Rendering
The markdown-it pipeline (KaTeX, Mermaid, shiki, tabler icons, html5-media, GitHub alerts, checkboxes) runs in the React Native JS context unchanged — same code, same output. The resulting HTML string is passed to a `NoteWebView` component built on `react-native-webview`.
`NoteWebView` is a native UIView/View wrapper around a WebView engine. It is a React Native component — not a web app. The surrounding app (navigation chrome, tab bar, headers, settings, auth screens) is 100% native. Only the note content pane renders HTML. This is the standard pattern for rich content in React Native (used by GitHub Mobile, Linear, and others).
The WebView communicates back to the native layer via `postMessage` for:
- Internal note link taps (trigger React Navigation push)
- External URL taps (open in system browser)
- Backlink detection events
## Project Structure
```
src/
├── app/ # Expo Router — file-system screens
│ ├── _layout.tsx # Root Stack navigator
│ ├── index.tsx # Home / Welcome
│ └── (tabs)/ # Authenticated tab navigator
│ ├── _layout.tsx
│ ├── feed/ # Feed + Note Stack screens
│ ├── inbox/
│ ├── public/
│ └── settings/
├── modules/ # Feature domains (mirrors current structure)
│ ├── note/ # Note models, hooks, caching
│ ├── repo/ # Zustand store, Octokit service
│ ├── user/
│ │ ├── auth/ # GitHub + ATProto OAuth hooks
│ │ └── fonts.ts # Font downloading (was utils/downloadFont.ts)
│ ├── card/ # Spaced repetition
│ ├── history/ # Edit history
│ ├── atproto/ # Custom ATProto OAuth client, DID resolution
│ └── post/ # ts-rest API client (unchanged)
├── components/ # Shared UI components
├── rendering/ # Markdown pipeline — first-class module
│ ├── pipeline.ts # markdown-it setup + plugin registration
│ ├── plugins/ # Custom plugins
│ │ ├── html5-media.ts
│ │ ├── regexp.ts
│ │ └── tabler-icons.ts
│ └── NoteWebView.tsx # react-native-webview wrapper
├── lib/ # Shared low-level, stateless helpers
│ ├── text.ts # slugify, noteTitle, displayLanguage
│ ├── links.ts # link.ts + youtube.ts
│ ├── encoding.ts # decodeBase64ToUTF8
│ └── notifications.ts # notif.ts
├── hooks/ # React hooks
├── data/ # Expo SQLite wrapper (same DataApi interface)
├── locales/ # i18n strings (unchanged)
└── constants/ # Theme tokens, note width constants
```
## Key Risks
1. **ATProto custom OAuth client** — no official SDK; requires careful PKCE implementation and session lifecycle management.
2. **DaisyUI → NativeWind component styling** — no 1:1 mapping; all themed components need to be rebuilt. Most labor-intensive non-feature work.
3. **NoteWebView ↔ native bridge** — link tap handling and scroll coordination between the WebView and the native Stack navigator require careful implementation to feel seamless.
4. **Mermaid in WebView** — Mermaid is JS-heavy; initial render may be slow on lower-end Android. May need lazy rendering or a timeout fallback.
## Out of Scope
- PWA / service worker (not applicable to native)
- Web Worker (replaced by async SQLite)
- Comlink (not applicable)
- Server-side rendering

View File

@@ -1,5 +1,5 @@
<!doctype html> <!doctype html>
<html lang="en" data-theme="garden"> <html lang="en" data-theme="emerald">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />

9
nginx.conf Normal file
View File

@@ -0,0 +1,9 @@
server {
listen 80;
root /usr/share/nginx/html;
index index.html;
location / {
try_files $uri $uri/ /index.html;
}
}

View File

@@ -12,33 +12,37 @@
"lint:fix": "oxlint --fix", "lint:fix": "oxlint --fix",
"fmt": "oxfmt", "fmt": "oxfmt",
"fmt:check": "oxfmt --check", "fmt:check": "oxfmt --check",
"prepare": "husky",
"theme:light": "esno _scripts/change-theme-light.ts", "theme:light": "esno _scripts/change-theme-light.ts",
"theme:dark": "esno _scripts/change-theme-dark.ts", "theme:dark": "esno _scripts/change-theme-dark.ts"
"generate-pwa-assets": "pwa-assets-generator"
}, },
"dependencies": { "dependencies": {
"@atproto/oauth-client-browser": "^0.3.41", "@atproto/oauth-client-browser": "^0.3.41",
"@better-fetch/fetch": "^1.1.21", "@better-fetch/fetch": "^1.1.21",
"@better-fetch/logger": "^1.1.21", "@better-fetch/logger": "^1.1.21",
"@intlify/unplugin-vue-i18n": "^6.0.8", "@intlify/unplugin-vue-i18n": "^6.0.8",
"@mdit/plugin-tab": "^0.24.2",
"@octokit/core": "^7.0.6", "@octokit/core": "^7.0.6",
"@octokit/rest": "^22.0.1", "@octokit/rest": "^22.0.1",
"@openpanel/web": "^1.3.0", "@openpanel/web": "^1.3.0",
"@tailwindcss/postcss": "^4.1.16", "@tailwindcss/postcss": "^4.1.16",
"@tanstack/vue-query": "^5.92.9", "@tanstack/vue-query": "^5.92.9",
"@toycode/markdown-it-class": "^1.2.4", "@toycode/markdown-it-class": "^1.2.4",
"@ts-rest/core": "^3.52.1",
"@ts-rest/vue-query": "^3.52.1",
"@vscode/markdown-it-katex": "^1.1.2", "@vscode/markdown-it-katex": "^1.1.2",
"@vueuse/components": "^14.2.1", "@vueuse/components": "^14.2.1",
"@vueuse/core": "^13.6.0", "@vueuse/core": "^13.6.0",
"@vueuse/router": "^13.6.0", "@vueuse/router": "^13.6.0",
"arktype": "^2.1.29", "arktype": "^2.1.29",
"comlink": "^4.4.2",
"date-fns": "^4.1.0", "date-fns": "^4.1.0",
"events": "^3.3.0", "events": "^3.3.0",
"font-color-contrast": "^11.1.0", "font-color-contrast": "^11.1.0",
"fontfaceobserver": "^2.3.0", "fontfaceobserver": "^2.3.0",
"github-slugger": "^2.0.0",
"isomorphic-fetch": "^3.0.0", "isomorphic-fetch": "^3.0.0",
"markdown-it": "^14.1.0", "markdown-it": "^14.1.0",
"markdown-it-anchor": "^9.2.0",
"markdown-it-block-embed": "^0.0.3", "markdown-it-block-embed": "^0.0.3",
"markdown-it-checkbox": "^1.1.0", "markdown-it-checkbox": "^1.1.0",
"markdown-it-github-alerts": "^1.0.0", "markdown-it-github-alerts": "^1.0.0",
@@ -79,7 +83,6 @@
"eslint-plugin-simple-import-sort": "^12.1.1", "eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-unused-imports": "^4.4.1", "eslint-plugin-unused-imports": "^4.4.1",
"esno": "^4.8.0", "esno": "^4.8.0",
"husky": "^9.1.7",
"oxfmt": "^0.42.0", "oxfmt": "^0.42.0",
"oxlint": "^1.57.0", "oxlint": "^1.57.0",
"prettier": "^3.8.1", "prettier": "^3.8.1",

171
pnpm-lock.yaml generated
View File

@@ -20,6 +20,9 @@ importers:
'@intlify/unplugin-vue-i18n': '@intlify/unplugin-vue-i18n':
specifier: ^6.0.8 specifier: ^6.0.8
version: 6.0.8(@vue/compiler-dom@3.5.28)(eslint@8.57.1)(rollup@2.79.2)(typescript@5.9.3)(vue-i18n@11.1.11(vue@3.5.18(typescript@5.9.3)))(vue@3.5.18(typescript@5.9.3)) version: 6.0.8(@vue/compiler-dom@3.5.28)(eslint@8.57.1)(rollup@2.79.2)(typescript@5.9.3)(vue-i18n@11.1.11(vue@3.5.18(typescript@5.9.3)))(vue@3.5.18(typescript@5.9.3))
'@mdit/plugin-tab':
specifier: ^0.24.2
version: 0.24.2(markdown-it@14.1.0)
'@octokit/core': '@octokit/core':
specifier: ^7.0.6 specifier: ^7.0.6
version: 7.0.6 version: 7.0.6
@@ -38,6 +41,12 @@ importers:
'@toycode/markdown-it-class': '@toycode/markdown-it-class':
specifier: ^1.2.4 specifier: ^1.2.4
version: 1.2.4 version: 1.2.4
'@ts-rest/core':
specifier: ^3.52.1
version: 3.52.1(@types/node@22.15.24)(zod@3.25.76)
'@ts-rest/vue-query':
specifier: ^3.52.1
version: 3.52.1(@tanstack/vue-query@5.92.9(vue@3.5.18(typescript@5.9.3)))(@ts-rest/core@3.52.1(@types/node@22.15.24)(zod@3.25.76))(zod@3.25.76)
'@vscode/markdown-it-katex': '@vscode/markdown-it-katex':
specifier: ^1.1.2 specifier: ^1.1.2
version: 1.1.2 version: 1.1.2
@@ -53,6 +62,9 @@ importers:
arktype: arktype:
specifier: ^2.1.29 specifier: ^2.1.29
version: 2.1.29 version: 2.1.29
comlink:
specifier: ^4.4.2
version: 4.4.2
date-fns: date-fns:
specifier: ^4.1.0 specifier: ^4.1.0
version: 4.1.0 version: 4.1.0
@@ -65,12 +77,18 @@ importers:
fontfaceobserver: fontfaceobserver:
specifier: ^2.3.0 specifier: ^2.3.0
version: 2.3.0 version: 2.3.0
github-slugger:
specifier: ^2.0.0
version: 2.0.0
isomorphic-fetch: isomorphic-fetch:
specifier: ^3.0.0 specifier: ^3.0.0
version: 3.0.0 version: 3.0.0
markdown-it: markdown-it:
specifier: ^14.1.0 specifier: ^14.1.0
version: 14.1.0 version: 14.1.0
markdown-it-anchor:
specifier: ^9.2.0
version: 9.2.0(@types/markdown-it@14.1.2)(markdown-it@14.1.0)
markdown-it-block-embed: markdown-it-block-embed:
specifier: ^0.0.3 specifier: ^0.0.3
version: 0.0.3 version: 0.0.3
@@ -186,9 +204,6 @@ importers:
esno: esno:
specifier: ^4.8.0 specifier: ^4.8.0
version: 4.8.0 version: 4.8.0
husky:
specifier: ^9.1.7
version: 9.1.7
oxfmt: oxfmt:
specifier: ^0.42.0 specifier: ^0.42.0
version: 0.42.0 version: 0.42.0
@@ -1053,12 +1068,6 @@ packages:
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
'@eslint-community/eslint-utils@4.4.0':
resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
'@eslint-community/eslint-utils@4.7.0': '@eslint-community/eslint-utils@4.7.0':
resolution: {integrity: sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==} resolution: {integrity: sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -1069,10 +1078,6 @@ packages:
resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==} resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
'@eslint-community/regexpp@4.6.2':
resolution: {integrity: sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==}
engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
'@eslint/eslintrc@2.1.4': '@eslint/eslintrc@2.1.4':
resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==} resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -1308,6 +1313,24 @@ packages:
'@jridgewell/trace-mapping@0.3.31': '@jridgewell/trace-mapping@0.3.31':
resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
'@mdit/helper@0.23.2':
resolution: {integrity: sha512-w4oja7kZYnkSiodfn4Neg1gmlIkvQtmCBJTLvLFOaET7xt8KomDNPQeumpGobQ9dWkXFqBKHlxjTYgroPH+CvA==}
engines: {node: '>= 20'}
peerDependencies:
markdown-it: ^14.1.0
peerDependenciesMeta:
markdown-it:
optional: true
'@mdit/plugin-tab@0.24.2':
resolution: {integrity: sha512-9rN23SP4beO0shBOuSGLGR+Ia7fminVSH6xl5Rb6rh6rRYQ6R3NR2KkIfLZvoMCRiN2uDwhXT/R9LyXHOdRMUQ==}
engines: {node: '>= 20'}
peerDependencies:
markdown-it: ^14.1.0
peerDependenciesMeta:
markdown-it:
optional: true
'@mermaid-js/parser@0.6.3': '@mermaid-js/parser@0.6.3':
resolution: {integrity: sha512-lnjOhe7zyHjc+If7yT4zoedx2vo4sHaTmtkl1+or8BRTnCtDmcTpAjpzDSfCZrshM5bCoz0GyidzadJAH1xobA==} resolution: {integrity: sha512-lnjOhe7zyHjc+If7yT4zoedx2vo4sHaTmtkl1+or8BRTnCtDmcTpAjpzDSfCZrshM5bCoz0GyidzadJAH1xobA==}
@@ -2119,6 +2142,27 @@ packages:
'@toycode/markdown-it-class@1.2.4': '@toycode/markdown-it-class@1.2.4':
resolution: {integrity: sha512-hA4gHBK8moObkOYdWTjhy1wYcYy0MJeM3JjSKbsXHRpRMvIKhk6Jm+t3bXsSScTdz/byWqQbs8YIwVYjHp+SlQ==} resolution: {integrity: sha512-hA4gHBK8moObkOYdWTjhy1wYcYy0MJeM3JjSKbsXHRpRMvIKhk6Jm+t3bXsSScTdz/byWqQbs8YIwVYjHp+SlQ==}
'@ts-rest/core@3.52.1':
resolution: {integrity: sha512-tAjz7Kxq/grJodcTA1Anop4AVRDlD40fkksEV5Mmal88VoZeRKAG8oMHsDwdwPZz+B/zgnz0q2sF+cm5M7Bc7g==}
peerDependencies:
'@types/node': ^18.18.7 || >=20.8.4
zod: ^3.22.3
peerDependenciesMeta:
'@types/node':
optional: true
zod:
optional: true
'@ts-rest/vue-query@3.52.1':
resolution: {integrity: sha512-89u7aS9LGDC7uNUC5CagWX1EB7vTwyXohYcizLi1D9v7MD/Cnu5OTQNf8SY3PuAK62RcFJXB2XZGsMAPC0svNw==}
peerDependencies:
'@tanstack/vue-query': ^4.0.0
'@ts-rest/core': ~3.52.0
zod: ^3.22.3
peerDependenciesMeta:
zod:
optional: true
'@tybys/wasm-util@0.10.1': '@tybys/wasm-util@0.10.1':
resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==} resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==}
@@ -2985,6 +3029,9 @@ packages:
resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==} resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
engines: {node: '>= 0.8'} engines: {node: '>= 0.8'}
comlink@4.4.2:
resolution: {integrity: sha512-OxGdvBmJuNKSCMO4NTl1L47VRp6xn2wG4F/2hYzB6tiCb709otOxtEYCSvK80PtjODfXXZu8ds+Nw5kVCjqd2g==}
commander@2.20.3: commander@2.20.3:
resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
@@ -3275,15 +3322,6 @@ packages:
supports-color: supports-color:
optional: true optional: true
debug@4.3.4:
resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
engines: {node: '>=6.0'}
peerDependencies:
supports-color: '*'
peerDependenciesMeta:
supports-color:
optional: true
debug@4.4.1: debug@4.4.1:
resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==} resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
engines: {node: '>=6.0'} engines: {node: '>=6.0'}
@@ -3857,6 +3895,9 @@ packages:
getpass@0.1.7: getpass@0.1.7:
resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==} resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==}
github-slugger@2.0.0:
resolution: {integrity: sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==}
glob-base@0.3.0: glob-base@0.3.0:
resolution: {integrity: sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==} resolution: {integrity: sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==}
engines: {node: '>=0.10.0'} engines: {node: '>=0.10.0'}
@@ -4008,11 +4049,6 @@ packages:
resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==} resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==}
engines: {node: '>=14.18.0'} engines: {node: '>=14.18.0'}
husky@9.1.7:
resolution: {integrity: sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==}
engines: {node: '>=18'}
hasBin: true
ico-endec@0.1.6: ico-endec@0.1.6:
resolution: {integrity: sha512-ZdLU38ZoED3g1j3iEyzcQj+wAkY2xfWNkymszfJPoxucIUhK7NayQ+/C4Kv0nDFMIsbtbEHldv3V8PU494/ueQ==} resolution: {integrity: sha512-ZdLU38ZoED3g1j3iEyzcQj+wAkY2xfWNkymszfJPoxucIUhK7NayQ+/C4Kv0nDFMIsbtbEHldv3V8PU494/ueQ==}
@@ -4834,6 +4870,12 @@ packages:
resolution: {integrity: sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==} resolution: {integrity: sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==}
engines: {node: '>=0.10.0'} engines: {node: '>=0.10.0'}
markdown-it-anchor@9.2.0:
resolution: {integrity: sha512-sa2ErMQ6kKOA4l31gLGYliFQrMKkqSO0ZJgGhDHKijPf0pNFM9vghjAh3gn26pS4JDRs7Iwa9S36gxm3vgZTzg==}
peerDependencies:
'@types/markdown-it': '*'
markdown-it: '*'
markdown-it-block-embed@0.0.3: markdown-it-block-embed@0.0.3:
resolution: {integrity: sha512-coWuC/uZY6Z1Gp3wthhJo5yjkG3/gHErNF/emaiEvD98fKzEHNP6GCYGfJfk5o0n31xiaYjbDgef+XtabKOZzA==} resolution: {integrity: sha512-coWuC/uZY6Z1Gp3wthhJo5yjkG3/gHErNF/emaiEvD98fKzEHNP6GCYGfJfk5o0n31xiaYjbDgef+XtabKOZzA==}
@@ -4959,9 +5001,6 @@ packages:
ms@2.0.0: ms@2.0.0:
resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
ms@2.1.2:
resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
ms@2.1.3: ms@2.1.3:
resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
@@ -7642,25 +7681,17 @@ snapshots:
'@esbuild/win32-x64@0.25.5': '@esbuild/win32-x64@0.25.5':
optional: true optional: true
'@eslint-community/eslint-utils@4.4.0(eslint@8.57.1)':
dependencies:
eslint: 8.57.1
eslint-visitor-keys: 3.4.3
'@eslint-community/eslint-utils@4.7.0(eslint@8.57.1)': '@eslint-community/eslint-utils@4.7.0(eslint@8.57.1)':
dependencies: dependencies:
eslint: 8.57.1 eslint: 8.57.1
eslint-visitor-keys: 3.4.3 eslint-visitor-keys: 3.4.3
'@eslint-community/regexpp@4.12.1': '@eslint-community/regexpp@4.12.1': {}
optional: true
'@eslint-community/regexpp@4.6.2': {}
'@eslint/eslintrc@2.1.4': '@eslint/eslintrc@2.1.4':
dependencies: dependencies:
ajv: 6.12.6 ajv: 6.12.6
debug: 4.3.4 debug: 4.4.3
espree: 9.6.1 espree: 9.6.1
globals: 13.20.0 globals: 13.20.0
ignore: 5.2.4 ignore: 5.2.4
@@ -7676,7 +7707,7 @@ snapshots:
'@humanwhocodes/config-array@0.13.0': '@humanwhocodes/config-array@0.13.0':
dependencies: dependencies:
'@humanwhocodes/object-schema': 2.0.3 '@humanwhocodes/object-schema': 2.0.3
debug: 4.3.4 debug: 4.4.3
minimatch: 3.1.2 minimatch: 3.1.2
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@@ -7877,6 +7908,19 @@ snapshots:
'@jridgewell/resolve-uri': 3.1.2 '@jridgewell/resolve-uri': 3.1.2
'@jridgewell/sourcemap-codec': 1.5.5 '@jridgewell/sourcemap-codec': 1.5.5
'@mdit/helper@0.23.2(markdown-it@14.1.0)':
dependencies:
'@types/markdown-it': 14.1.2
optionalDependencies:
markdown-it: 14.1.0
'@mdit/plugin-tab@0.24.2(markdown-it@14.1.0)':
dependencies:
'@mdit/helper': 0.23.2(markdown-it@14.1.0)
'@types/markdown-it': 14.1.2
optionalDependencies:
markdown-it: 14.1.0
'@mermaid-js/parser@0.6.3': '@mermaid-js/parser@0.6.3':
dependencies: dependencies:
langium: 3.3.1 langium: 3.3.1
@@ -8424,6 +8468,18 @@ snapshots:
'@toycode/markdown-it-class@1.2.4': {} '@toycode/markdown-it-class@1.2.4': {}
'@ts-rest/core@3.52.1(@types/node@22.15.24)(zod@3.25.76)':
optionalDependencies:
'@types/node': 22.15.24
zod: 3.25.76
'@ts-rest/vue-query@3.52.1(@tanstack/vue-query@5.92.9(vue@3.5.18(typescript@5.9.3)))(@ts-rest/core@3.52.1(@types/node@22.15.24)(zod@3.25.76))(zod@3.25.76)':
dependencies:
'@tanstack/vue-query': 5.92.9(vue@3.5.18(typescript@5.9.3))
'@ts-rest/core': 3.52.1(@types/node@22.15.24)(zod@3.25.76)
optionalDependencies:
zod: 3.25.76
'@tybys/wasm-util@0.10.1': '@tybys/wasm-util@0.10.1':
dependencies: dependencies:
tslib: 2.8.1 tslib: 2.8.1
@@ -8656,7 +8712,7 @@ snapshots:
'@typescript-eslint/types': 8.46.2 '@typescript-eslint/types': 8.46.2
'@typescript-eslint/typescript-estree': 8.46.2(typescript@5.9.3) '@typescript-eslint/typescript-estree': 8.46.2(typescript@5.9.3)
'@typescript-eslint/visitor-keys': 8.46.2 '@typescript-eslint/visitor-keys': 8.46.2
debug: 4.4.1 debug: 4.4.3
eslint: 8.57.1 eslint: 8.57.1
typescript: 5.9.3 typescript: 5.9.3
transitivePeerDependencies: transitivePeerDependencies:
@@ -8676,7 +8732,7 @@ snapshots:
dependencies: dependencies:
'@typescript-eslint/tsconfig-utils': 8.46.2(typescript@5.9.3) '@typescript-eslint/tsconfig-utils': 8.46.2(typescript@5.9.3)
'@typescript-eslint/types': 8.46.2 '@typescript-eslint/types': 8.46.2
debug: 4.4.1 debug: 4.4.3
typescript: 5.9.3 typescript: 5.9.3
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@@ -8707,7 +8763,7 @@ snapshots:
'@typescript-eslint/types': 8.46.2 '@typescript-eslint/types': 8.46.2
'@typescript-eslint/typescript-estree': 8.46.2(typescript@5.9.3) '@typescript-eslint/typescript-estree': 8.46.2(typescript@5.9.3)
'@typescript-eslint/utils': 8.46.2(eslint@8.57.1)(typescript@5.9.3) '@typescript-eslint/utils': 8.46.2(eslint@8.57.1)(typescript@5.9.3)
debug: 4.4.1 debug: 4.4.3
eslint: 8.57.1 eslint: 8.57.1
ts-api-utils: 2.1.0(typescript@5.9.3) ts-api-utils: 2.1.0(typescript@5.9.3)
typescript: 5.9.3 typescript: 5.9.3
@@ -8742,7 +8798,7 @@ snapshots:
'@typescript-eslint/tsconfig-utils': 8.46.2(typescript@5.9.3) '@typescript-eslint/tsconfig-utils': 8.46.2(typescript@5.9.3)
'@typescript-eslint/types': 8.46.2 '@typescript-eslint/types': 8.46.2
'@typescript-eslint/visitor-keys': 8.46.2 '@typescript-eslint/visitor-keys': 8.46.2
debug: 4.4.1 debug: 4.4.3
fast-glob: 3.3.3 fast-glob: 3.3.3
is-glob: 4.0.3 is-glob: 4.0.3
minimatch: 9.0.5 minimatch: 9.0.5
@@ -9542,6 +9598,8 @@ snapshots:
dependencies: dependencies:
delayed-stream: 1.0.0 delayed-stream: 1.0.0
comlink@4.4.2: {}
commander@2.20.3: {} commander@2.20.3: {}
commander@7.2.0: {} commander@7.2.0: {}
@@ -9836,10 +9894,6 @@ snapshots:
dependencies: dependencies:
ms: 2.1.3 ms: 2.1.3
debug@4.3.4:
dependencies:
ms: 2.1.2
debug@4.4.1: debug@4.4.1:
dependencies: dependencies:
ms: 2.1.3 ms: 2.1.3
@@ -10155,8 +10209,8 @@ snapshots:
eslint@8.57.1: eslint@8.57.1:
dependencies: dependencies:
'@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1) '@eslint-community/eslint-utils': 4.7.0(eslint@8.57.1)
'@eslint-community/regexpp': 4.6.2 '@eslint-community/regexpp': 4.12.1
'@eslint/eslintrc': 2.1.4 '@eslint/eslintrc': 2.1.4
'@eslint/js': 8.57.1 '@eslint/js': 8.57.1
'@humanwhocodes/config-array': 0.13.0 '@humanwhocodes/config-array': 0.13.0
@@ -10165,8 +10219,8 @@ snapshots:
'@ungap/structured-clone': 1.2.0 '@ungap/structured-clone': 1.2.0
ajv: 6.12.6 ajv: 6.12.6
chalk: 4.1.2 chalk: 4.1.2
cross-spawn: 7.0.3 cross-spawn: 7.0.6
debug: 4.3.4 debug: 4.4.3
doctrine: 3.0.0 doctrine: 3.0.0
escape-string-regexp: 4.0.0 escape-string-regexp: 4.0.0
eslint-scope: 7.2.2 eslint-scope: 7.2.2
@@ -10547,6 +10601,8 @@ snapshots:
dependencies: dependencies:
assert-plus: 1.0.0 assert-plus: 1.0.0
github-slugger@2.0.0: {}
glob-base@0.3.0: glob-base@0.3.0:
dependencies: dependencies:
glob-parent: 2.0.0 glob-parent: 2.0.0
@@ -10698,8 +10754,6 @@ snapshots:
human-signals@4.3.1: {} human-signals@4.3.1: {}
husky@9.1.7: {}
ico-endec@0.1.6: {} ico-endec@0.1.6: {}
iconv-lite@0.4.24: iconv-lite@0.4.24:
@@ -11584,6 +11638,11 @@ snapshots:
dependencies: dependencies:
object-visit: 1.0.1 object-visit: 1.0.1
markdown-it-anchor@9.2.0(@types/markdown-it@14.1.2)(markdown-it@14.1.0):
dependencies:
'@types/markdown-it': 14.1.2
markdown-it: 14.1.0
markdown-it-block-embed@0.0.3: {} markdown-it-block-embed@0.0.3: {}
markdown-it-checkbox@1.1.0: markdown-it-checkbox@1.1.0:
@@ -11745,8 +11804,6 @@ snapshots:
ms@2.0.0: {} ms@2.0.0: {}
ms@2.1.2: {}
ms@2.1.3: {} ms@2.1.3: {}
multiformats@9.9.0: {} multiformats@9.9.0: {}

View File

@@ -17,10 +17,18 @@ const { isATProtoReady } = useATProtoLogin()
<style lang="scss"> <style lang="scss">
#main-app { #main-app {
height: 100vh; height: 100dvh;
width: 100%; width: 100%;
max-width: none;
display: flex; display: flex;
flex: 1; flex: 1;
overflow-x: auto;
}
@media screen and (max-width: 768px) {
#main-app {
overflow-y: auto;
}
} }
::view-transition-old(root), ::view-transition-old(root),

View File

@@ -4,6 +4,7 @@ interface EventBusParams {
user: string user: string
repo: string repo: string
path: string path: string
hash?: string
currentNoteSHA?: string currentNoteSHA?: string
} }

View File

@@ -24,7 +24,7 @@ const goBack = () => {
</script> </script>
<template> <template>
<a class="btn btn-sm back-button" @click="goBack"> <button class="btn btn-sm back-button text-base-content" @click="goBack">
<svg <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
class="icon icon-tabler icon-tabler-arrow-narrow-left" class="icon icon-tabler icon-tabler-arrow-narrow-left"
@@ -41,5 +41,5 @@ const goBack = () => {
<line x1="5" y1="12" x2="9" y2="16" /> <line x1="5" y1="12" x2="9" y2="16" />
<line x1="5" y1="12" x2="9" y2="8" /> <line x1="5" y1="12" x2="9" y2="8" />
</svg> </svg>
</a> </button>
</template> </template>

View File

@@ -1,14 +1,8 @@
<script lang="ts" setup> <script lang="ts" setup>
import { import { computed, nextTick, onMounted, onUnmounted, toRefs, watch } from "vue"
computed,
defineAsyncComponent,
nextTick,
onMounted,
onUnmounted,
toRefs,
watch
} from "vue"
import HeaderNote from "@/components/HeaderNote.vue"
import SignInGithub from "@/components/SignInGithub.vue"
import SkeletonLoader from "@/components/SkeletonLoader.vue" import SkeletonLoader from "@/components/SkeletonLoader.vue"
import StackedNote from "@/components/StackedNote.vue" import StackedNote from "@/components/StackedNote.vue"
import { useLinks } from "@/hooks/useLinks.hook" import { useLinks } from "@/hooks/useLinks.hook"
@@ -21,10 +15,6 @@ import CacheAllNotes from "@/modules/note/components/CacheAllNote.vue"
import { useUserRepoStore } from "@/modules/repo/store/userRepo.store" import { useUserRepoStore } from "@/modules/repo/store/userRepo.store"
import { useUserSettings } from "@/modules/user/hooks/useUserSettings.hook" import { useUserSettings } from "@/modules/user/hooks/useUserSettings.hook"
const HeaderNote = defineAsyncComponent(
() => import("@/components/HeaderNote.vue")
)
const props = withDefaults( const props = withDefaults(
defineProps<{ defineProps<{
user: string user: string
@@ -112,9 +102,13 @@ onUnmounted(() => {
<cache-all-notes /> <cache-all-notes />
</div> </div>
<slot /> <slot />
<skeleton-loader v-if="isLoading || !hasContent" /> <skeleton-loader v-if="isLoading" />
<div v-else-if="withContent && !hasContent" class="repo-not-found">
<p>This repository is not accessible.</p>
<sign-in-github />
</div>
<p <p
v-else-if="withContent" v-else-if="withContent && hasContent"
class="note-display" class="note-display"
v-html="renderedContent" v-html="renderedContent"
/> />
@@ -200,6 +194,15 @@ $header-height: 40px;
} }
} }
.repo-not-found {
display: flex;
flex-direction: column;
align-items: center;
gap: 1rem;
padding: 2rem 0;
color: var(--color-base-content);
}
.note-display { .note-display {
padding-bottom: 2rem; padding-bottom: 2rem;
} }
@@ -208,12 +211,6 @@ $header-height: 40px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow-y: auto; overflow-y: auto;
height: 100vh;
position: sticky;
&:not(:first-child) {
border-top: 1px solid rgba(18, 19, 58, 0.2);
}
.title { .title {
text-align: left; text-align: left;
@@ -221,6 +218,8 @@ $header-height: 40px;
} }
@media screen and (min-width: 769px) { @media screen and (min-width: 769px) {
background-color: var(--note-canvas-bg);
.repo-title-breadcrumb { .repo-title-breadcrumb {
padding: 0.5rem 1rem 0; padding: 0.5rem 1rem 0;
transform-origin: 0 0; transform-origin: 0 0;
@@ -237,6 +236,11 @@ $header-height: 40px;
.note { .note {
min-width: var(--note-width); min-width: var(--note-width);
max-width: var(--note-width); max-width: var(--note-width);
background-color: var(--color-base-100);
}
.readme {
box-shadow: var(--note-sheet-shadow);
} }
} }
} }
@@ -245,6 +249,7 @@ $header-height: 40px;
.flux-note { .flux-note {
.readme { .readme {
padding: 0 0.75rem; padding: 0 0.75rem;
position: relative;
} }
} }
@@ -254,6 +259,7 @@ $header-height: 40px;
.note { .note {
width: 100vw; width: 100vw;
height: 100dvh;
overflow-y: visible; overflow-y: visible;
} }

View File

@@ -7,50 +7,94 @@ import { useUserRepoStore } from "../modules/repo/store/userRepo.store"
const store = useUserRepoStore() const store = useUserRepoStore()
const fontFamilies = computed(() => store.userSettings?.fontFamilies ?? []) const DEFAULT_FONT_FAMILIES = [
const sortedFontFamilies = computed(() => "EB Garamond",
[...fontFamilies.value].sort((a, b) => a.localeCompare(b)) "Inter",
"Lato",
"Libertinus Serif",
"Lora",
"Merriweather",
"Playfair Display",
"Roboto",
"Source Serif 4"
]
const fontFamilies = computed(
() => store.userSettings?.fontFamilies ?? DEFAULT_FONT_FAMILIES
) )
const sortedFontFamilies = computed(() => {
const base = fontFamilies.value
const extras = [
store.userSettings?.chosenTitleFont,
store.userSettings?.chosenBodyFont
].filter((f): f is string => !!f && !base.includes(f))
return [...base, ...extras].sort((a, b) => a.localeCompare(b))
})
const fontSizes = Array.from({ length: 7 }, (_, i) => `${9 + i * 2}pt`) const fontSizes = Array.from({ length: 7 }, (_, i) => `${9 + i * 2}pt`)
const titleFont = computed({
get: () => store.userSettings?.chosenTitleFont,
set: (value) => store.setTitleFont(value!)
})
const bodyFont = computed({
get: () => store.userSettings?.chosenBodyFont,
set: (value) => store.setBodyFont(value!)
})
const fontSize = computed({
get: () => store.userSettings?.chosenFontSize,
set: (value) => store.setFontSize(value!)
})
</script> </script>
<template> <template>
<div class="font-change" v-if="sortedFontFamilies.length > 0"> <div class="font-change">
<theme-swap /> <div>
<label for="title-font" class="font-label">t</label>
<select <select id="title-font" class="select" v-model="titleFont">
class="select"
:value="store.userSettings?.chosenFontFamily"
@change="store.setFontFamily(($event.target as HTMLSelectElement).value)"
>
<option v-for="font in sortedFontFamilies" :key="font" :value="font"> <option v-for="font in sortedFontFamilies" :key="font" :value="font">
{{ font }} {{ font }}
</option> </option>
</select> </select>
<select <label for="body-font" class="font-label">p</label>
class="select" <select id="body-font" class="select" v-model="bodyFont">
:value="store.userSettings?.chosenFontSize" <option v-for="font in sortedFontFamilies" :key="font" :value="font">
@change="store.setFontSize(($event.target as HTMLSelectElement).value)" {{ font }}
> </option>
</select>
</div>
<div>
<theme-swap />
<label for="font-size" class="font-label">s</label>
<select id="font-size" class="select" v-model="fontSize">
<option v-for="size in fontSizes" :key="size" :value="size"> <option v-for="size in fontSizes" :key="size" :value="size">
{{ size }} {{ size }}
</option> </option>
</select> </select>
</div> </div>
</div>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.font-change { .font-change {
flex: 1;
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 1rem;
select { select {
flex: 1; flex: 1;
display: flex; display: flex;
} }
div {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 1rem;
margin: 1rem;
}
}
.font-label {
font-weight: bold;
font-size: 0.75rem;
opacity: 0.6;
} }
</style> </style>

View File

@@ -1,32 +1,13 @@
<script lang="ts" setup> <script lang="ts" setup>
import FontChange from "@/components/FontChange.vue" import FontChange from "@/components/FontChange.vue"
import HomeButton from "@/components/HomeButton.vue"
defineProps<{ user: string; repo: string }>() defineProps<{ user: string; repo: string }>()
</script> </script>
<template> <template>
<header class="header-note"> <header class="header-note">
<router-link <home-button />
:to="{ name: 'Home' }"
class="button is-small is-white back-button"
>
<svg
xmlns="http://www.w3.org/2000/svg"
class="icon icon-tabler icon-tabler-arrow-narrow-left"
width="28"
height="28"
viewBox="0 0 24 24"
stroke-width="1.5"
stroke="currentColor"
fill="none"
stroke-linecap="round"
stroke-linejoin="round"
>
<line x1="5" y1="12" x2="19" y2="12" />
<line x1="5" y1="12" x2="9" y2="16" />
<line x1="5" y1="12" x2="9" y2="8" />
</svg>
</router-link>
<!-- <router-link <!-- <router-link
:to="{ name: 'SpacedRepetitionCard', params: { user, repo } }" :to="{ name: 'SpacedRepetitionCard', params: { user, repo } }"
> >
@@ -51,12 +32,15 @@ defineProps<{ user: string; repo: string }>()
</svg> </svg>
</router-link> --> </router-link> -->
<button onclick="font_modal.showModal()"> <button
class="btn btn-ghost btn-circle text-base-content"
onclick="font_modal.showModal()"
>
<svg <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
class="icon icon-tabler icons-tabler-outline icon-tabler-typography" class="icon icon-tabler icons-tabler-outline icon-tabler-typography"
width="36" width="30"
height="36" height="30"
viewBox="0 0 24 24" viewBox="0 0 24 24"
stroke-width="1.5" stroke-width="1.5"
stroke="currentColor" stroke="currentColor"
@@ -71,11 +55,14 @@ defineProps<{ user: string; repo: string }>()
<path d="M5 20l6 -16l2 0l7 16" /> <path d="M5 20l6 -16l2 0l7 16" />
</svg> </svg>
</button> </button>
<router-link :to="{ name: 'FluxNoteView', params: { user, repo } }"> <router-link
class="btn btn-ghost btn-circle"
:to="{ name: 'FluxNoteView', params: { user, repo } }"
>
<svg <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
width="36" width="30"
height="36" height="30"
viewBox="0 0 24 24" viewBox="0 0 24 24"
stroke="currentColor" stroke="currentColor"
fill="none" fill="none"
@@ -88,12 +75,15 @@ defineProps<{ user: string; repo: string }>()
<path d="M9 21v-6a2 2 0 0 1 2 -2h2a2 2 0 0 1 2 2v6" /> <path d="M9 21v-6a2 2 0 0 1 2 -2h2a2 2 0 0 1 2 2v6" />
</svg> </svg>
</router-link> </router-link>
<router-link :to="{ name: 'DraftNotes', params: { user, repo } }"> <router-link
class="btn btn-ghost btn-circle"
:to="{ name: 'DraftNotes', params: { user, repo } }"
>
<svg <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
class="icon icon-tabler icon-tabler-notes" class="icon icon-tabler icon-tabler-notes"
width="36" width="30"
height="36" height="30"
viewBox="0 0 24 24" viewBox="0 0 24 24"
stroke-width="1.5" stroke-width="1.5"
stroke="currentColor" stroke="currentColor"
@@ -107,11 +97,14 @@ defineProps<{ user: string; repo: string }>()
<line x1="9" y1="15" x2="13" y2="15" /> <line x1="9" y1="15" x2="13" y2="15" />
</svg> </svg>
</router-link> </router-link>
<router-link :to="{ name: 'TodoNotes', params: { user, repo } }"> <router-link
class="btn btn-ghost btn-circle"
:to="{ name: 'TodoNotes', params: { user, repo } }"
>
<svg <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
width="36" width="30"
height="36" height="30"
viewBox="0 0 24 24" viewBox="0 0 24 24"
fill="none" fill="none"
stroke="currentColor" stroke="currentColor"
@@ -129,12 +122,15 @@ defineProps<{ user: string; repo: string }>()
<path d="M11 18l9 0" /> <path d="M11 18l9 0" />
</svg> </svg>
</router-link> </router-link>
<router-link :to="{ name: 'FleetingNotes', params: { user, repo } }"> <router-link
class="btn btn-ghost btn-circle"
:to="{ name: 'FleetingNotes', params: { user, repo } }"
>
<svg <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
class="icon icon-tabler icon-tabler-mailbox" class="icon icon-tabler icon-tabler-mailbox"
width="36" width="30"
height="36" height="30"
viewBox="0 0 24 24" viewBox="0 0 24 24"
stroke-width="1.5" stroke-width="1.5"
stroke="currentColor" stroke="currentColor"
@@ -150,7 +146,7 @@ defineProps<{ user: string; repo: string }>()
</svg> </svg>
</router-link> </router-link>
<dialog id="font_modal" class="modal"> <dialog id="font_modal" class="modal">
<div class="modal-box"> <div class="modal-box w-10/12 max-w-2xl">
<h3 class="text-lg font-bold">Style settings</h3> <h3 class="text-lg font-bold">Style settings</h3>
<font-change /> <font-change />
</div> </div>
@@ -168,12 +164,6 @@ defineProps<{ user: string; repo: string }>()
justify-content: space-between; justify-content: space-between;
margin-top: 10px; margin-top: 10px;
img {
&:hover {
cursor: pointer;
}
}
button { button {
color: var(--color-accent); color: var(--color-accent);
} }

View File

@@ -6,9 +6,12 @@ const goHome = () => router.push({ name: "Home" })
</script> </script>
<template> <template>
<a class="btn btn-ghost btn-circle btn-lg" @click="goHome"> <button
class="btn btn-ghost btn-circle btn-lg text-base-content"
@click="goHome"
>
<img src="/favicon.png" alt="Remanso icon" class="remanso-logo" /> <img src="/favicon.png" alt="Remanso icon" class="remanso-logo" />
</a> </button>
</template> </template>
<style> <style>

View File

@@ -24,9 +24,9 @@ const emitNote = (sha: string) => {
<h5 class="subtitle is-5">🔗</h5> <h5 class="subtitle is-5">🔗</h5>
<ul class="links"> <ul class="links">
<li v-for="link in backlink?.links" :key="link.sha"> <li v-for="link in backlink?.links" :key="link.sha">
<a @click.prevent="emitNote(link.sha)"> <button class="link" @click="emitNote(link.sha)">
{{ link.title }} {{ link.title }}
</a> </button>
</li> </li>
</ul> </ul>
</div> </div>

View File

@@ -0,0 +1,82 @@
<script lang="ts" setup>
import { onMounted, ref, watch } from "vue"
const props = defineProps<{ open: boolean }>()
const emit = defineEmits<{
(e: "discard"): void
(e: "overwrite"): void
(e: "cancel"): void
(e: "update:open", value: boolean): void
}>()
const dialogRef = ref<HTMLDialogElement | null>(null)
const close = () => {
if (dialogRef.value?.open) dialogRef.value.close()
emit("update:open", false)
}
const choose = (action: "discard" | "overwrite" | "cancel") => {
emit(action)
close()
}
watch(
() => props.open,
(open) => {
const el = dialogRef.value
if (!el) return
if (open && !el.open) el.showModal()
else if (!open && el.open) el.close()
}
)
onMounted(() => {
if (props.open) dialogRef.value?.showModal()
})
</script>
<template>
<dialog
ref="dialogRef"
class="modal"
@close="emit('update:open', false)"
@cancel.prevent="choose('cancel')"
>
<div class="modal-box">
<h3 class="text-lg font-bold">GitHub has a newer version of this note</h3>
<p class="py-3 text-sm">
Someone (or another device) updated this note on GitHub since you
started editing. If you save now, their changes will be overwritten.
</p>
<div class="modal-action flex-col gap-2 sm:flex-row sm:justify-end">
<button
type="button"
class="btn btn-ghost"
@click="choose('cancel')"
>
Cancel
</button>
<button
type="button"
class="btn btn-warning"
@click="choose('overwrite')"
>
Save anyway (overwrite)
</button>
<button
type="button"
class="btn btn-primary"
@click="choose('discard')"
>
Discard my edits, pull latest
</button>
</div>
</div>
<form method="dialog" class="modal-backdrop">
<button type="submit" @click="choose('cancel')">close</button>
</form>
</dialog>
</template>

View File

@@ -0,0 +1,237 @@
<script lang="ts" setup>
import { computed } from "vue"
import type { FreshnessStatus } from "@/hooks/useNoteFreshness.hook"
const props = defineProps<{
status: FreshnessStatus
lastCheckedAt: Date | null
}>()
defineEmits<{ (e: "click"): void }>()
const formatTime = (d: Date) =>
d.toLocaleTimeString(undefined, { hour: "2-digit", minute: "2-digit" })
const minutesAgo = (d: Date) =>
Math.max(1, Math.round((Date.now() - d.getTime()) / 60000))
const label = computed(() => {
switch (props.status) {
case "verified":
return "Up to date"
case "checking":
return "Checking…"
case "outdated":
return "Outdated"
case "stale-known":
return props.lastCheckedAt
? `Checked ${minutesAgo(props.lastCheckedAt)}m ago`
: "Not checked"
case "offline":
return "Cant reach GitHub"
case "unknown":
default:
return "Not checked"
}
})
const tooltip = computed(() => {
switch (props.status) {
case "verified":
return props.lastCheckedAt
? `Verified at ${formatTime(props.lastCheckedAt)}. Click to re-check.`
: "Click to re-check."
case "outdated":
return "GitHub has a newer version. Click to pull latest."
case "stale-known":
return "Click to verify against GitHub."
case "offline":
return "Could not reach GitHub. Click to retry."
case "checking":
return "Checking against GitHub…"
case "unknown":
default:
return "Click to check against GitHub."
}
})
const stateClass = computed(() => `state-${props.status}`)
const isBusy = computed(() => props.status === "checking")
</script>
<template>
<button
class="freshness button is-text is-light"
:class="stateClass"
:title="tooltip"
:aria-label="tooltip"
:disabled="isBusy"
@click="$emit('click')"
>
<svg
v-if="status === 'verified'"
xmlns="http://www.w3.org/2000/svg"
class="icon icon-tabler icon-tabler-cloud-check"
width="20"
height="20"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="1.75"
stroke-linecap="round"
stroke-linejoin="round"
>
<path
d="M11 18.004h-4.343c-2.572 -.004 -4.657 -2.011 -4.657 -4.487c0 -2.475 2.085 -4.482 4.657 -4.482c.393 -1.762 1.794 -3.2 3.675 -3.773c1.88 -.572 3.956 -.193 5.444 1c1.488 1.19 2.162 3.007 1.77 4.769h.99c1.388 0 2.585 .82 3.138 2.007"
/>
<path d="M15 19l2 2l4 -4" />
</svg>
<svg
v-else-if="status === 'unknown' || status === 'stale-known'"
xmlns="http://www.w3.org/2000/svg"
class="icon icon-tabler"
:class="
status === 'stale-known'
? 'icon-tabler-clock'
: 'icon-tabler-cloud-question'
"
width="20"
height="20"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="1.75"
stroke-linecap="round"
stroke-linejoin="round"
>
<template v-if="status === 'stale-known'">
<path d="M3 12a9 9 0 1 0 18 0a9 9 0 0 0 -18 0" />
<path d="M12 7v5l3 3" />
</template>
<template v-else>
<path
d="M14.5 18.004h-7.843c-2.572 -.004 -4.657 -2.011 -4.657 -4.487c0 -2.475 2.085 -4.482 4.657 -4.482c.393 -1.762 1.794 -3.2 3.675 -3.773c1.88 -.572 3.956 -.193 5.444 1c1.488 1.19 2.162 3.007 1.77 4.769h.99"
/>
<path d="M19 22v.01" />
<path
d="M19 19a2.003 2.003 0 0 0 .914 -3.782a1.98 1.98 0 0 0 -2.414 .483"
/>
</template>
</svg>
<svg
v-else-if="status === 'outdated'"
xmlns="http://www.w3.org/2000/svg"
class="icon icon-tabler icon-tabler-cloud-download"
width="20"
height="20"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="1.75"
stroke-linecap="round"
stroke-linejoin="round"
>
<path
d="M19 18a3.5 3.5 0 0 0 0 -7h-1a5 4.5 0 0 0 -11 -2a4.6 4.4 0 0 0 -2.1 8.4"
/>
<path d="M12 13l0 9" />
<path d="M9 19l3 3l3 -3" />
</svg>
<svg
v-else-if="status === 'checking'"
xmlns="http://www.w3.org/2000/svg"
class="icon icon-tabler icon-tabler-loader-2 spin"
width="20"
height="20"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="1.75"
stroke-linecap="round"
stroke-linejoin="round"
>
<path d="M12 3a9 9 0 1 0 9 9" />
</svg>
<svg
v-else
xmlns="http://www.w3.org/2000/svg"
class="icon icon-tabler icon-tabler-cloud-off"
width="20"
height="20"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="1.75"
stroke-linecap="round"
stroke-linejoin="round"
>
<path
d="M9.58 5.548c.24 -.11 .492 -.207 .752 -.286c1.88 -.572 3.956 -.193 5.444 1c1.488 1.19 2.162 3.007 1.77 4.769h.99c1.913 0 3.464 1.56 3.464 3.486c0 .957 -.383 1.824 -1.003 2.454m-2.997 1.033h-11.343c-2.572 -.004 -4.657 -2.011 -4.657 -4.487c0 -2.475 2.085 -4.482 4.657 -4.482c.13 -.582 .37 -1.128 .7 -1.62"
/>
<path d="M3 3l18 18" />
</svg>
<span class="freshness-label">{{ label }}</span>
</button>
</template>
<style lang="scss" scoped>
.freshness {
display: inline-flex;
align-items: center;
gap: 0.35rem;
font-size: 0.75rem;
padding: 0.15rem 0.5rem;
background: transparent;
border: 0;
cursor: pointer;
vertical-align: middle;
&[disabled] {
cursor: progress;
}
.icon {
flex-shrink: 0;
}
.freshness-label {
line-height: 1;
}
}
.state-verified {
color: var(--color-success, hsl(140, 60%, 35%));
}
.state-outdated {
color: var(--color-warning, hsl(35, 90%, 45%));
}
.state-offline {
color: var(--color-error, hsl(0, 70%, 45%));
}
.state-unknown,
.state-stale-known,
.state-checking {
color: var(--color-base-content);
opacity: 0.6;
}
.spin {
animation: freshness-spin 1s linear infinite;
}
@keyframes freshness-spin {
to {
transform: rotate(360deg);
}
}
@media screen and (max-width: 768px) {
.freshness-label {
display: none;
}
}
</style>

View File

@@ -40,6 +40,7 @@ const getStyle = (seed: string) => {
<style scoped lang="scss"> <style scoped lang="scss">
.repo-list { .repo-list {
display: flex; display: flex;
justify-content: space-evenly;
gap: 1rem; gap: 1rem;
flex-wrap: wrap; flex-wrap: wrap;

View File

@@ -13,18 +13,32 @@ import { useFile } from "@/hooks/useFile.hook"
import { useGitHubContent } from "@/hooks/useGitHubContent.hook" import { useGitHubContent } from "@/hooks/useGitHubContent.hook"
import { useImages } from "@/hooks/useImages.hook" import { useImages } from "@/hooks/useImages.hook"
import { useLinks } from "@/hooks/useLinks.hook" import { useLinks } from "@/hooks/useLinks.hook"
import { runMermaid, useShikiji } from "@/hooks/useMarkdown.hook" import {
renderCodeFile,
runMermaid,
useShikiji
} from "@/hooks/useMarkdown.hook"
import { useNoteFreshness } from "@/hooks/useNoteFreshness.hook"
import { useNoteOverlay } from "@/hooks/useNoteOverlay.hook" import { useNoteOverlay } from "@/hooks/useNoteOverlay.hook"
import { useRouteQueryStackedNotes } from "@/hooks/useRouteQueryStackedNotes.hook" import { useRouteQueryStackedNotes } from "@/hooks/useRouteQueryStackedNotes.hook"
import { useTitleNotes } from "@/hooks/useTitleNotes.hook" import { useTitleNotes } from "@/hooks/useTitleNotes.hook"
import { useUserRepoStore } from "@/modules/repo/store/userRepo.store" import { useUserRepoStore } from "@/modules/repo/store/userRepo.store"
import { encodeUTF8ToBase64 } from "@/utils/decodeBase64ToUTF8" import { encodeUTF8ToBase64 } from "@/utils/decodeBase64ToUTF8"
import { getFileLanguage, isMarkdownPath } from "@/utils/fileLanguage"
import { filenameToNoteTitle } from "@/utils/noteTitle" import { filenameToNoteTitle } from "@/utils/noteTitle"
const LinkedNotes = defineAsyncComponent( const LinkedNotes = defineAsyncComponent(
() => import("@/components/LinkedNotes.vue") () => import("@/components/LinkedNotes.vue")
) )
const NoteFreshnessBadge = defineAsyncComponent(
() => import("@/components/NoteFreshnessBadge.vue")
)
const NoteConflictModal = defineAsyncComponent(
() => import("@/components/NoteConflictModal.vue")
)
const EditNote = defineAsyncComponent( const EditNote = defineAsyncComponent(
() => import("@/modules/note/components/EditNote.vue") () => import("@/modules/note/components/EditNote.vue")
) )
@@ -53,6 +67,35 @@ const {
getEditedSha getEditedSha
} = useFile(sha) } = useFile(sha)
const initialRawContent = ref<string | null>(null) const initialRawContent = ref<string | null>(null)
const isMarkdown = computed(() =>
path.value ? isMarkdownPath(path.value) : true
)
const displayedContent = ref("")
watch(
[rawContent, isMarkdown, path],
async ([raw, isMd, p]) => {
if (!raw) {
displayedContent.value = ""
return
}
if (isMd) {
displayedContent.value = content.value
return
}
const lang = p ? getFileLanguage(p) : null
const filename = p?.split("/").pop()
const result = await renderCodeFile({ rawContent: raw, lang, filename })
if (rawContent.value === raw) {
displayedContent.value = result
}
},
{ immediate: true }
)
watch(content, (c) => {
if (isMarkdown.value) displayedContent.value = c
})
const className = computed(() => `stacked-note-${props.index}`) const className = computed(() => `stacked-note-${props.index}`)
const { listenToClick } = useLinks(className.value, sha) const { listenToClick } = useLinks(className.value, sha)
const titleClassName = computed(() => `title-${className.value}`) const titleClassName = computed(() => `title-${className.value}`)
@@ -70,10 +113,34 @@ const { updateFile } = useGitHubContent({
repo: repo.value repo: repo.value
}) })
const {
status: freshnessStatus,
lastCheckedAt,
latestSha,
check: checkFreshness,
pullLatest
} = useNoteFreshness({
user: user.value,
repo: repo.value,
sha,
path,
getEditedSha
})
const conflictOpen = ref(false)
onMounted(async () => { onMounted(async () => {
initialRawContent.value = await getRawContent() initialRawContent.value = await getRawContent()
}) })
watch(
path,
(p) => {
if (p) void checkFreshness()
},
{ immediate: true }
)
const { mode, toggleMode } = useEditionMode() const { mode, toggleMode } = useEditionMode()
watch([content, mode], () => { watch([content, mode], () => {
@@ -92,13 +159,49 @@ watch([content, mode], () => {
runMermaid(`.note-${sha.value} .mermaid`) runMermaid(`.note-${sha.value} .mermaid`)
} }
if (rawContent.value.includes("```")) { if (isMarkdown.value && rawContent.value.includes("```")) {
useShikiji() useShikiji()
} }
}) })
}) })
const performSave = async (overrideSha?: string) => {
if (!path.value) {
console.warn("no path found for this file")
return
}
const editedSha = overrideSha ?? (await getEditedSha()) ?? sha.value
const { sha: newSha, conflict } = await updateFile({
content: rawContent.value,
path: path.value,
sha: editedSha
})
if (conflict) {
await checkFreshness()
conflictOpen.value = true
if (mode.value === "read") toggleMode()
return
}
if (!newSha) {
console.warn("no new SHA found for this file")
return
}
await saveCacheNote(encodeUTF8ToBase64(rawContent.value), {
editedSha: newSha
})
initialRawContent.value = rawContent.value
}
watch(mode, async (newMode) => { watch(mode, async (newMode) => {
if (newMode === "edit") {
void checkFreshness()
return
}
const hasUserFinishedToEdit = const hasUserFinishedToEdit =
newMode === "read" && rawContent.value !== initialRawContent.value newMode === "read" && rawContent.value !== initialRawContent.value
@@ -107,28 +210,54 @@ watch(mode, async (newMode) => {
} }
if (!path.value) { if (!path.value) {
console.warn("no path found for this file") console.warn("no path found for this file")
return return
} }
const editedSha = (await getEditedSha()) ?? sha.value await checkFreshness()
const newSha = await updateFile({ if (freshnessStatus.value === "outdated") {
content: rawContent.value, conflictOpen.value = true
path: path.value,
sha: editedSha
})
if (!newSha) {
console.warn("no new SHA found for this file")
return return
} }
await saveCacheNote(encodeUTF8ToBase64(rawContent.value), { await performSave()
editedSha: newSha
})
initialRawContent.value = rawContent.value
}) })
const onConflictDiscard = async () => {
const newRaw = await pullLatest()
if (newRaw !== null) {
rawContent.value = newRaw
initialRawContent.value = newRaw
}
}
const onConflictOverwrite = async () => {
if (latestSha.value) {
await performSave(latestSha.value)
}
}
const onConflictCancel = () => {
if (mode.value === "read") toggleMode()
}
const onBadgeClick = async () => {
if (freshnessStatus.value !== "outdated") {
await checkFreshness()
return
}
const hasUnsavedEdits = rawContent.value !== initialRawContent.value
if (hasUnsavedEdits) {
conflictOpen.value = true
return
}
const newRaw = await pullLatest()
if (newRaw !== null) {
rawContent.value = newRaw
initialRawContent.value = newRaw
}
}
</script> </script>
<template> <template>
@@ -142,7 +271,7 @@ watch(mode, async (newMode) => {
> >
<a <a
class="title-stacked-note-link" class="title-stacked-note-link"
@click.prevent="scrollToFocusedNote(props.sha)" @click.prevent="scrollToFocusedNote({ noteId: props.sha })"
> >
<div <div
class="title-stacked-note breadcrumbs text-sm" class="title-stacked-note breadcrumbs text-sm"
@@ -156,7 +285,14 @@ watch(mode, async (newMode) => {
</div> </div>
</a> </a>
<section class="text-content"> <section class="text-content">
<div class="action-bar">
<note-freshness-badge
:status="freshnessStatus"
:last-checked-at="lastCheckedAt"
@click="onBadgeClick"
/>
<button <button
v-if="isMarkdown"
class="action button is-text is-light" class="action button is-text is-light"
:class="{ 'is-link': mode === 'edit' }" :class="{ 'is-link': mode === 'edit' }"
:style="mode === 'edit' ? 'color: var(--color-primary)' : ''" :style="mode === 'edit' ? 'color: var(--color-primary)' : ''"
@@ -205,12 +341,23 @@ watch(mode, async (newMode) => {
<path d="M14 4l0 4l-6 0l0 -4" /> <path d="M14 4l0 4l-6 0l0 -4" />
</svg> </svg>
</button> </button>
<div v-if="mode === 'edit'" class="edit"> </div>
<div v-if="mode === 'edit' && isMarkdown" class="edit">
<edit-note v-model="rawContent" /> <edit-note v-model="rawContent" />
</div> </div>
<div v-if="mode === 'read'" class="note-content" v-html="content"></div> <div
v-if="mode === 'read'"
class="note-content"
v-html="displayedContent"
></div>
</section> </section>
<linked-notes v-if="hasBacklinks && content" :sha="sha" /> <linked-notes v-if="hasBacklinks && content" :sha="sha" />
<note-conflict-modal
v-model:open="conflictOpen"
@discard="onConflictDiscard"
@overwrite="onConflictOverwrite"
@cancel="onConflictCancel"
/>
</div> </div>
</template> </template>
@@ -228,7 +375,7 @@ $border-color: rgba(18, 19, 58, 0.2);
} }
section { section {
padding: 0 0.5rem 2rem; padding: 0 0.5rem;
} }
} }
@@ -257,14 +404,22 @@ $border-color: rgba(18, 19, 58, 0.2);
flex: 1; flex: 1;
scrollbar-width: none; scrollbar-width: none;
div { > .edit,
> .note-content {
height: 100%; height: 100%;
} }
} }
.action-bar {
display: flex;
align-items: center;
justify-content: flex-end;
gap: 0.25rem;
margin: 0.2rem 0;
}
.action { .action {
float: right; margin: 0;
margin: 0.2rem;
img { img {
vertical-align: bottom; vertical-align: bottom;
@@ -274,9 +429,10 @@ $border-color: rgba(18, 19, 58, 0.2);
@media screen and (max-width: 768px) { @media screen and (max-width: 768px) {
.stacked-note { .stacked-note {
padding: 0 0.75rem 1rem; padding: 0 0.75rem 1rem;
height: 100dvh;
section { section {
padding: 1rem 0 2rem; padding: 1rem 0;
overflow-x: auto; overflow-x: auto;
} }
@@ -291,6 +447,8 @@ $border-color: rgba(18, 19, 58, 0.2);
.stacked-note { .stacked-note {
border-top: 0; border-top: 0;
border-left: 1px solid $border-color; border-left: 1px solid $border-color;
position: sticky;
top: 0;
} }
.title-stacked-note { .title-stacked-note {

View File

@@ -97,7 +97,7 @@ watch(
> >
<a <a
class="title-stacked-note-link" class="title-stacked-note-link"
@click.prevent="scrollToFocusedNote(didrkey)" @click.prevent="scrollToFocusedNote({ noteId: didrkey })"
> >
<div <div
class="title-stacked-note breadcrumbs text-sm" class="title-stacked-note breadcrumbs text-sm"
@@ -130,7 +130,7 @@ $border-color: rgba(18, 19, 58, 0.2);
} }
section { section {
padding: 0 0.5rem 2rem; padding: 0 0.5rem;
} }
} }
@@ -178,7 +178,7 @@ $border-color: rgba(18, 19, 58, 0.2);
padding: 0 0.75rem 1rem; padding: 0 0.75rem 1rem;
section { section {
padding: 1rem 0 2rem; padding: 1rem 0;
overflow-x: auto; overflow-x: auto;
} }
@@ -193,6 +193,8 @@ $border-color: rgba(18, 19, 58, 0.2);
.stacked-note { .stacked-note {
border-top: 0; border-top: 0;
border-left: 1px solid $border-color; border-left: 1px solid $border-color;
position: sticky;
top: 0;
} }
.title-stacked-note { .title-stacked-note {

File diff suppressed because it is too large Load Diff

View File

@@ -10,3 +10,7 @@ export const getNoteWidth = () => {
} }
return cached return cached
} }
export const resetNoteWidthCache = () => {
cached = undefined
}

View File

@@ -1,166 +1,31 @@
import { wrap } from "comlink"
import { nanoid } from "nanoid" import { nanoid } from "nanoid"
import indexedDb from "pouchdb-adapter-indexeddb"
import PouchDb from "pouchdb-browser"
import { DataType } from "./DataType.enum" import { DataType } from "./DataType.enum"
import { Model } from "./models/Model" import { Model } from "./models/Model"
PouchDb.plugin(indexedDb) export interface DataApi {
add<DT extends DataType>(model: Model<DT>): Promise<boolean>
interface GetAllParams { update<DT extends DataType, T extends Model<DT>>(model: T): Promise<boolean>
remove(id: string): Promise<boolean>
get<DT extends DataType, T extends Model<DT>>(id: string): Promise<T | null>
getOrCreate<DT extends DataType, T extends Model<DT>>(
id: string,
initialValue: T
): Promise<T>
getAll<DT extends DataType, T extends Model<DT>>(params: {
prefix?: string prefix?: string
includeDocs?: boolean includeDocs?: boolean
includeAttachments?: boolean includeAttachments?: boolean
keys?: string[] keys?: string[]
}): Promise<T[]>
} }
class Data { export const generateId = (type?: DataType | string, id?: string): string => {
// oxlint-disable-next-line typescript/ban-types if (!type) return id || nanoid()
private readonly locale: PouchDB.Database<{}> | null = null
constructor() {
try {
this.locale = new PouchDb("remanso", {
adapter: "indexeddb"
})
} catch (error) {
console.warn("data error", error)
}
}
public async add<DT extends DataType>(model: Model<DT>): Promise<boolean> {
try {
const result = await this.locale?.put(model)
return result?.ok ?? false
} catch (error) {
console.warn(error)
return false
}
}
public async update<DT extends DataType, T extends Model<DT>>(
model: T
): Promise<boolean> {
try {
if (!model._id) {
const result = await this.locale?.put(model)
return result?.ok ?? false
}
const oldModel = await this.get(model._id)
if (oldModel) {
const result = await this.locale?.put({ ...oldModel, ...model })
return result?.ok ?? false
}
const result = await this.locale?.put(model)
return result?.ok ?? false
} catch (error) {
console.warn(error)
return false
}
}
public async remove(id: string): Promise<boolean> {
try {
const doc = await this.get(id)
if (!doc) {
return false
}
const result = await this.locale?.put({
...doc,
_deleted: true
})
return result?.ok ?? false
} catch {
return false
}
}
public async get<DT extends DataType, T extends Model<DT>>(
id: string
): Promise<T | null> {
try {
return ((await this.locale?.get(id)) as T) || null
} catch {
return null
}
}
public async getOrCreate<DT extends DataType, T extends Model<DT>>(
id: string,
initialValue: T
): Promise<T> {
const element = await this.get<DT, T>(id)
if (element) {
return element
}
await data.add<DT>({ ...initialValue, _id: id })
return this.getOrCreate(id, initialValue)
}
public async getAll<DT extends DataType, T extends Model<DT>>({
prefix,
includeDocs = true,
includeAttachments = false,
keys = []
}: GetAllParams): Promise<T[]> {
if (!this.locale) {
return []
}
if (keys.length) {
const response = await this.locale.allDocs({
include_docs: includeDocs,
attachments: includeAttachments,
keys: keys.map((key) => this.generateId(prefix, key))
})
if (includeDocs) {
return response.rows
.map((row) => {
if ("error" in row) {
return null
}
return row.doc
})
.filter(Boolean) as T[]
} else {
return response.rows
.map((row) => {
if ("error" in row) {
return null
}
return { _id: row.id }
})
.filter(Boolean) as T[]
}
}
const response = await this.locale.allDocs({
include_docs: includeDocs,
attachments: includeAttachments,
startkey: prefix ? prefix : undefined,
endkey: prefix ? `${prefix}\ufff0` : undefined
})
return response.rows.map((row) => row.doc) as T[]
}
public generateId(type?: DataType | string, id?: string) {
if (!type) {
return id || nanoid()
}
return `${type}-${id || nanoid()}` return `${type}-${id || nanoid()}`
}
} }
export const data = new Data() import DataWorker from "./data.worker?worker"
export const data = wrap(new DataWorker()) as unknown as DataApi

156
src/data/data.worker.ts Normal file
View File

@@ -0,0 +1,156 @@
import { expose } from "comlink"
import { nanoid } from "nanoid"
import indexedDb from "pouchdb-adapter-indexeddb"
import PouchDb from "pouchdb-browser"
import { DataType } from "./DataType.enum"
import { Model } from "./models/Model"
PouchDb.plugin(indexedDb)
interface GetAllParams {
prefix?: string
includeDocs?: boolean
includeAttachments?: boolean
keys?: string[]
}
class Data {
// oxlint-disable-next-line typescript/ban-types
private readonly locale: PouchDB.Database<{}> | null = null
constructor() {
try {
this.locale = new PouchDb("remanso", {
adapter: "indexeddb"
})
} catch (error) {
console.warn("data error", error)
}
}
private buildId(type?: DataType | string, id?: string): string {
if (!type) return id || nanoid()
return `${type}-${id || nanoid()}`
}
public async add<DT extends DataType>(model: Model<DT>): Promise<boolean> {
try {
const result = await this.locale?.put(model)
return result?.ok ?? false
} catch (error) {
console.warn(error)
return false
}
}
public async update<DT extends DataType, T extends Model<DT>>(
model: T
): Promise<boolean> {
try {
if (!model._id) {
const result = await this.locale?.put(model)
return result?.ok ?? false
}
const oldModel = await this.get(model._id)
if (oldModel) {
const result = await this.locale?.put({ ...oldModel, ...model })
return result?.ok ?? false
}
const result = await this.locale?.put(model)
return result?.ok ?? false
} catch (error) {
console.warn(error)
return false
}
}
public async remove(id: string): Promise<boolean> {
try {
const doc = await this.get(id)
if (!doc) {
return false
}
const result = await this.locale?.put({
...doc,
_deleted: true
})
return result?.ok ?? false
} catch {
return false
}
}
public async get<DT extends DataType, T extends Model<DT>>(
id: string
): Promise<T | null> {
try {
return ((await this.locale?.get(id)) as T) || null
} catch {
return null
}
}
public async getOrCreate<DT extends DataType, T extends Model<DT>>(
id: string,
initialValue: T
): Promise<T> {
const element = await this.get<DT, T>(id)
if (element) {
return element
}
await this.add<DT>({ ...initialValue, _id: id })
return this.getOrCreate(id, initialValue)
}
public async getAll<DT extends DataType, T extends Model<DT>>({
prefix,
includeDocs = true,
includeAttachments = false,
keys = []
}: GetAllParams): Promise<T[]> {
if (!this.locale) {
return []
}
if (keys.length) {
const response = await this.locale.allDocs({
include_docs: includeDocs,
attachments: includeAttachments,
keys: keys.map((key) => this.buildId(prefix, key))
})
if (includeDocs) {
return response.rows
.map((row) => {
if ("error" in row) return null
return row.doc
})
.filter(Boolean) as T[]
} else {
return response.rows
.map((row) => {
if ("error" in row) return null
return { _id: row.id }
})
.filter(Boolean) as T[]
}
}
const response = await this.locale.allDocs({
include_docs: includeDocs,
attachments: includeAttachments,
startkey: prefix ? prefix : undefined,
endkey: prefix ? `${prefix}\ufff0` : undefined
})
return response.rows.map((row) => row.doc) as T[]
}
}
expose(new Data())

View File

@@ -17,8 +17,8 @@ export const useATProtoLinks = (
const { currentAtUri, mainNoteId } = options const { currentAtUri, mainNoteId } = options
const linkNote = (event: Event) => { const linkNote = (event: Event) => {
const target = event.target as HTMLElement const anchor = (event.target as HTMLElement).closest("a")
const href = target.getAttribute("href") const href = anchor?.getAttribute("href")
if (!href) { if (!href) {
return return
@@ -50,7 +50,7 @@ export const useATProtoLinks = (
: `${params.shortDid}-${params.rkey}` : `${params.shortDid}-${params.rkey}`
if (noteId === toValue(mainNoteId)) { if (noteId === toValue(mainNoteId)) {
scrollToFocusedNote(null) scrollToFocusedNote()
return return
} }
@@ -67,7 +67,7 @@ export const useATProtoLinks = (
const noteId = `${toShortDid(did)}-${rkey}` const noteId = `${toShortDid(did)}-${rkey}`
if (noteId === toValue(mainNoteId)) { if (noteId === toValue(mainNoteId)) {
scrollToFocusedNote(null) scrollToFocusedNote()
return return
} }

View File

@@ -14,14 +14,32 @@ import {
const did = ref<string | null>(null) const did = ref<string | null>(null)
const handle = ref<string | null>(null) const handle = ref<string | null>(null)
const avatarUrl = ref<string | null>(null)
let init = true let init = true
const fetchAvatar = async (actorDid: string) => {
try {
const res = await fetch(
`https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(actorDid)}`
)
if (res.ok) {
const data = await res.json()
avatarUrl.value = data.avatar ?? null
}
} catch {
avatarUrl.value = null
}
}
const initializeAuth = async () => { const initializeAuth = async () => {
// Load cached session from IndexedDB first (fast, local) so the UI can render immediately // Load cached session from IndexedDB first (fast, local) so the UI can render immediately
const stored = await loadSession() const stored = await loadSession()
did.value = stored?.did ?? "" did.value = stored?.did ?? ""
handle.value = stored?.handle ?? "" handle.value = stored?.handle ?? ""
if (stored?.did) {
fetchAvatar(stored.did)
}
// Then restore OAuth session in the background (may involve network) // Then restore OAuth session in the background (may involve network)
const session = await restoreSession() const session = await restoreSession()
@@ -32,6 +50,7 @@ const initializeAuth = async () => {
did.value = session.did did.value = session.did
handle.value = resolvedHandle handle.value = resolvedHandle
await saveSession(session.did, resolvedHandle) await saveSession(session.did, resolvedHandle)
fetchAvatar(session.did)
window.history.replaceState( window.history.replaceState(
null, null,
@@ -61,11 +80,13 @@ export const useATProtoLogin = () => {
await clearSession() await clearSession()
did.value = "" did.value = ""
handle.value = "" handle.value = ""
avatarUrl.value = null
} }
return { return {
did, did,
handle, handle,
avatarUrl,
isLoggedIn, isLoggedIn,
isATProtoReady, isATProtoReady,
signIn, signIn,

View File

@@ -2,7 +2,7 @@ import { useAsyncState } from "@vueuse/core"
import { ComputedRef, onUnmounted, toValue } from "vue" import { ComputedRef, onUnmounted, toValue } from "vue"
import { backlinkEventBus } from "@/bus/backlinkEventBus" import { backlinkEventBus } from "@/bus/backlinkEventBus"
import { data } from "@/data/data" import { data, generateId } from "@/data/data"
import { DataType } from "@/data/DataType.enum" import { DataType } from "@/data/DataType.enum"
import { BacklinkNote } from "@/modules/note/models/BacklinkNote" import { BacklinkNote } from "@/modules/note/models/BacklinkNote"
@@ -11,7 +11,7 @@ export const useBacklinks = (sha: string | ComputedRef<string>) => {
const { state: backlink, execute } = useAsyncState( const { state: backlink, execute } = useAsyncState(
data.get<DataType.BacklinkNote, BacklinkNote>( data.get<DataType.BacklinkNote, BacklinkNote>(
data.generateId(DataType.BacklinkNote, sha) generateId(DataType.BacklinkNote, sha)
), ),
null, null,
{ {

View File

@@ -74,7 +74,7 @@ export const useCheckboxCommit = ({
isCommitting.value = true isCommitting.value = true
const newSha = await updateFile({ const { sha: newSha } = await updateFile({
content: pendingContent.value, content: pendingContent.value,
path: pathValue, path: pathValue,
sha: currentSha.value sha: currentSha.value

View File

@@ -1,7 +1,7 @@
import { watch } from "vue" import { watch } from "vue"
import { backlinkEventBus } from "@/bus/backlinkEventBus" import { backlinkEventBus } from "@/bus/backlinkEventBus"
import { data } from "@/data/data" import { data, generateId } from "@/data/data"
import { DataType } from "@/data/DataType.enum" import { DataType } from "@/data/DataType.enum"
import { useFile } from "@/hooks/useFile.hook" import { useFile } from "@/hooks/useFile.hook"
import { Backlink } from "@/modules/note/models/Backlink" import { Backlink } from "@/modules/note/models/Backlink"
@@ -14,10 +14,21 @@ import { confirmMessage } from "@/utils/notif"
const isMarkdown = (filename?: string) => filename?.endsWith(".md") ?? false const isMarkdown = (filename?: string) => filename?.endsWith(".md") ?? false
const yieldToMain = () =>
"scheduler" in globalThis
? (
globalThis as unknown as { scheduler: { yield: () => Promise<void> } }
).scheduler.yield()
: new Promise<void>((r) => setTimeout(r, 0))
export const useComputeBacklinks = () => { export const useComputeBacklinks = () => {
const store = useUserRepoStore() const store = useUserRepoStore()
watch(store, async () => { watch(
() => store.files,
async () => {
await new Promise<void>((r) => setTimeout(r, 300))
if (!store.userSettings?.backlink) { if (!store.userSettings?.backlink) {
return return
} }
@@ -27,14 +38,17 @@ export const useComputeBacklinks = () => {
const backlinks: Map<string, Backlink[]> = new Map() const backlinks: Map<string, Backlink[]> = new Map()
for (const file of store.files) { for (const file of store.files) {
await yieldToMain()
if (!isMarkdown(file.path) || !file.sha) { if (!isMarkdown(file.path) || !file.sha) {
continue continue
} }
const fileBacklinkId = data.generateId(DataType.BacklinkNote, file.sha) const fileBacklinkId = generateId(DataType.BacklinkNote, file.sha)
const fileBacklink = await data.get<DataType.BacklinkNote, BacklinkNote>( const fileBacklink = await data.get<
fileBacklinkId DataType.BacklinkNote,
) BacklinkNote
>(fileBacklinkId)
if (fileBacklink) { if (fileBacklink) {
continue continue
} }
@@ -91,7 +105,7 @@ export const useComputeBacklinks = () => {
} }
for (const [sha, fileBacklinks] of backlinks) { for (const [sha, fileBacklinks] of backlinks) {
const fileBacklinkId = data.generateId(DataType.BacklinkNote, sha) const fileBacklinkId = generateId(DataType.BacklinkNote, sha)
const backlinkNote: BacklinkNote = { const backlinkNote: BacklinkNote = {
_id: fileBacklinkId, _id: fileBacklinkId,
$type: DataType.BacklinkNote, $type: DataType.BacklinkNote,
@@ -102,5 +116,6 @@ export const useComputeBacklinks = () => {
await data.update(backlinkNote) await data.update(backlinkNote)
backlinkEventBus.emit({ fileSha: sha }) backlinkEventBus.emit({ fileSha: sha })
} }
}) }
)
} }

View File

@@ -2,6 +2,8 @@ import { getOctokit } from "@/modules/repo/services/octo"
import { encodeUTF8ToBase64 } from "@/utils/decodeBase64ToUTF8" import { encodeUTF8ToBase64 } from "@/utils/decodeBase64ToUTF8"
import { confirmMessage, errorMessage } from "@/utils/notif" import { confirmMessage, errorMessage } from "@/utils/notif"
const isConflictStatus = (status: number) => status === 409 || status === 422
export const useGitHubContent = ({ export const useGitHubContent = ({
user, user,
repo repo
@@ -9,6 +11,26 @@ export const useGitHubContent = ({
user: string user: string
repo: string repo: string
}) => { }) => {
const fetchLatestSha = async (path: string): Promise<string | null> => {
try {
const octokit = await getOctokit()
const response = await octokit.request(
"GET /repos/{owner}/{repo}/contents/{path}",
{
owner: user,
repo,
path,
headers: { "X-GitHub-Api-Version": "2022-11-28" }
}
)
const data = response?.data
if (Array.isArray(data) || !data) return null
return "sha" in data ? data.sha : null
} catch {
return null
}
}
const putFile = async ({ const putFile = async ({
content, content,
path, path,
@@ -17,7 +39,7 @@ export const useGitHubContent = ({
content: string content: string
path: string path: string
sha?: string sha?: string
}) => { }): Promise<{ sha: string | null; conflict: boolean }> => {
try { try {
const octokit = await getOctokit() const octokit = await getOctokit()
@@ -35,18 +57,27 @@ export const useGitHubContent = ({
confirmMessage("✅ Note saved") confirmMessage("✅ Note saved")
return response?.data.content?.sha ?? null return { sha: response?.data.content?.sha ?? null, conflict: false }
} catch (error) { } catch (error) {
const status = (error as { status?: number })?.status
if (status && isConflictStatus(status)) {
errorMessage("⚠ Conflict: this note changed on GitHub")
console.warn(error)
return { sha: null, conflict: true }
}
errorMessage("❌ Note could not be saved") errorMessage("❌ Note could not be saved")
console.warn(error) console.warn(error)
return { sha: null, conflict: false }
} }
return null
} }
return { return {
updateFile: async (props: { content: string; path: string; sha: string }) => fetchLatestSha,
putFile(props), updateFile: async (props: {
content: string
path: string
sha: string
}) => putFile(props),
createFile: async (props: { content: string; path: string }) => createFile: async (props: { content: string; path: string }) =>
putFile(props) putFile(props)
} }

View File

@@ -11,14 +11,23 @@ export const useLinks = (
const store = useUserRepoStore() const store = useUserRepoStore()
const linkNote: EventListener = (event) => { const linkNote: EventListener = (event) => {
const target = event.target as HTMLElement const anchor = (event.target as HTMLElement).closest("a")
const href = target.getAttribute("href") const href = anchor?.getAttribute("href")
if (!href) { if (!href) {
return return
} }
if (href.startsWith("#")) { if (href.startsWith("#")) {
event.preventDefault()
const id = href.slice(1)
const container = document.querySelector(`.${toValue(className)}`)
const heading = container?.querySelector(`#${CSS.escape(id)}`)
heading?.scrollIntoView({
block: "start",
inline: "nearest",
behavior: "smooth"
})
return return
} }
@@ -30,8 +39,13 @@ export const useLinks = (
return return
} }
const hashIndex = href.indexOf("#")
const path = hashIndex === -1 ? href : href.slice(0, hashIndex)
const hash = hashIndex === -1 ? undefined : href.slice(hashIndex + 1)
noteEventBus.emit({ noteEventBus.emit({
path: href, path,
hash,
currentNoteSHA: toValue(sha), currentNoteSHA: toValue(sha),
user: store.user, user: store.user,
repo: store.repo repo: store.repo

View File

@@ -1,15 +1,21 @@
import type { MarkdownItTabData, MarkdownItTabInfo } from "@mdit/plugin-tab"
import { tab } from "@mdit/plugin-tab"
import markdownItKatex from "@vscode/markdown-it-katex" import markdownItKatex from "@vscode/markdown-it-katex"
import GithubSlugger from "github-slugger"
import MarkdownIt, { Options } from "markdown-it" import MarkdownIt, { Options } from "markdown-it"
import Renderer, { type RenderRuleRecord } from "markdown-it/lib/renderer.mjs" import Renderer, { type RenderRuleRecord } from "markdown-it/lib/renderer.mjs"
import type Token from "markdown-it/lib/token.mjs" import type Token from "markdown-it/lib/token.mjs"
import markdownItAnchor from "markdown-it-anchor"
import blockEmbedPlugin from "markdown-it-block-embed" import blockEmbedPlugin from "markdown-it-block-embed"
import markdownItCheckbox from "markdown-it-checkbox" import markdownItCheckbox from "markdown-it-checkbox"
import MarkdownItGitHubAlerts from "markdown-it-github-alerts" import MarkdownItGitHubAlerts from "markdown-it-github-alerts"
import markdownItIframe from "markdown-it-iframe" import markdownItIframe from "markdown-it-iframe"
import Shikiji from "markdown-it-shikiji" import Shikiji from "markdown-it-shikiji"
import mermaid from "mermaid" import mermaid from "mermaid"
import type { LanguageRegistration } from "shikiji-core"
import { Ref, toValue } from "vue" import { Ref, toValue } from "vue"
import alloyGrammar from "@/utils/alloy.tmLanguage.json"
import { decodeBase64ToUTF8 } from "@/utils/decodeBase64ToUTF8" import { decodeBase64ToUTF8 } from "@/utils/decodeBase64ToUTF8"
import { html5Media } from "@/utils/markdown/markdown-html5-media" import { html5Media } from "@/utils/markdown/markdown-html5-media"
import { markdownItTablerIcons } from "@/utils/markdown/markdown-it-tabler-icons" import { markdownItTablerIcons } from "@/utils/markdown/markdown-it-tabler-icons"
@@ -45,6 +51,12 @@ const markdownItMermaidExtractor = (md: MarkdownIt) => {
} }
} }
const slugger = new GithubSlugger()
let tabGroupCounter = 0
let currentTabGroup = 0
let currentTabActiveSet = false
const md = new MarkdownIt({ const md = new MarkdownIt({
typographer: true, typographer: true,
quotes: ["«\xA0", "\xA0»", "\xA0", "\xA0"] quotes: ["«\xA0", "\xA0»", "\xA0", "\xA0"]
@@ -64,17 +76,32 @@ const md = new MarkdownIt({
}) })
.use(MarkdownItGitHubAlerts) .use(MarkdownItGitHubAlerts)
.use(markdownItTablerIcons) .use(markdownItTablerIcons)
.use(tab, {
name: "tabs",
openRender: (info: MarkdownItTabInfo) => {
currentTabGroup = ++tabGroupCounter
currentTabActiveSet = info.active >= 0
return '<div class="tabs tabs-box">\n'
},
closeRender: () => "</div>\n",
tabOpenRender: (data: MarkdownItTabData) => {
const isChecked =
data.isActive || (!currentTabActiveSet && data.index === 0)
const checked = isChecked ? " checked" : ""
const title = data.title.replace(/"/g, "&quot;")
return `<input type="radio" name="md-tabs-${currentTabGroup}" class="tab" aria-label="${title}"${checked}>\n<div class="tab-content bg-base-100 border-base-300 rounded-box p-2">\n`
},
tabCloseRender: () => "</div>\n"
})
.use(markdownItAnchor, {
slugify: (s: string) => slugger.slug(s)
})
let shikijiInitialized = false let shikijiPromise: Promise<void> | null = null
export const useShikiji = async () => { export const useShikiji = (): Promise<void> => {
if (shikijiInitialized) { if (!shikijiPromise) {
return shikijiPromise = Shikiji({
}
shikijiInitialized = true
md.use(
await Shikiji({
themes: { themes: {
light: "vitesse-light", light: "vitesse-light",
dark: "vitesse-black" dark: "vitesse-black"
@@ -87,10 +114,18 @@ export const useShikiji = async () => {
"mermaid", "mermaid",
"html", "html",
"css", "css",
"json" "json",
{
...alloyGrammar,
name: "alloy",
aliases: ["als"]
} as unknown as LanguageRegistration
] ]
}).then((plugin) => {
md.use(plugin)
}) })
) }
return shikijiPromise
} }
let mermaidInitialized = false let mermaidInitialized = false
@@ -123,11 +158,33 @@ const stripFrontmatter = (content: string): string => {
return match ? content.slice(match[0].length) : content return match ? content.slice(match[0].length) : content
} }
const renderMarkdown = (content: string, env?: Record<string, unknown>) => {
slugger.reset()
return env ? md.render(content, env) : md.render(content)
}
export const renderCodeFile = async ({
rawContent,
lang,
filename
}: {
rawContent: string
lang: string | null
filename?: string
}): Promise<string> => {
await useShikiji()
const heading = filename ? `# ${filename}\n\n` : ""
if (lang !== null) {
return renderMarkdown(`${heading}\`\`\`\`${lang}\n${rawContent}\n\`\`\`\``)
}
return `${renderMarkdown(heading)}<pre><code>${md.utils.escapeHtml(rawContent)}</code></pre>`
}
export const markdownBuilder = (defaultPrefix?: Ref<string> | string) => { export const markdownBuilder = (defaultPrefix?: Ref<string> | string) => {
const getRawContent = (content: string) => decodeBase64ToUTF8(content) const getRawContent = (content: string) => decodeBase64ToUTF8(content)
const renderFromUTF8 = (content: string, prefix?: string) => { const renderFromUTF8 = (content: string, prefix?: string) => {
return content return content
? md.render(stripFrontmatter(content), { ? renderMarkdown(stripFrontmatter(content), {
docId: defaultPrefix ? toValue(defaultPrefix) : (prefix ?? "") docId: defaultPrefix ? toValue(defaultPrefix) : (prefix ?? "")
}) })
: "" : ""
@@ -135,7 +192,7 @@ export const markdownBuilder = (defaultPrefix?: Ref<string> | string) => {
return { return {
toHTML: (content: string) => toHTML: (content: string) =>
content ? md.render(stripFrontmatter(content)) : "", content ? renderMarkdown(stripFrontmatter(content)) : "",
render: (content: string, prefix?: string) => render: (content: string, prefix?: string) =>
renderFromUTF8(decodeBase64ToUTF8(content), prefix), renderFromUTF8(decodeBase64ToUTF8(content), prefix),
renderFromUTF8, renderFromUTF8,

View File

@@ -0,0 +1,106 @@
import { computed, Ref, ref } from "vue"
import { useGitHubContent } from "@/hooks/useGitHubContent.hook"
import { markdownBuilder } from "@/hooks/useMarkdown.hook"
import { prepareNoteCache } from "@/modules/note/cache/prepareNoteCache"
import { queryFileContent } from "@/modules/repo/services/repo"
import { useUserRepoStore } from "@/modules/repo/store/userRepo.store"
export type FreshnessStatus =
| "unknown"
| "checking"
| "verified"
| "stale-known"
| "outdated"
| "offline"
const STALE_AFTER_MS = 2 * 60 * 1000
export const useNoteFreshness = ({
user,
repo,
sha,
path,
getEditedSha
}: {
user: string
repo: string
sha: Ref<string>
path: Ref<string | undefined>
getEditedSha: () => Promise<string | null>
}) => {
const store = useUserRepoStore()
const { fetchLatestSha } = useGitHubContent({ user, repo })
const rawStatus = ref<FreshnessStatus>("unknown")
const lastCheckedAt = ref<Date | null>(null)
const latestSha = ref<string | null>(null)
const tick = ref(0)
let staleTimer: ReturnType<typeof setTimeout> | null = null
const status = computed<FreshnessStatus>(() => {
void tick.value
if (rawStatus.value !== "verified") return rawStatus.value
if (!lastCheckedAt.value) return rawStatus.value
const age = Date.now() - lastCheckedAt.value.getTime()
return age > STALE_AFTER_MS ? "stale-known" : "verified"
})
const armStaleTimer = () => {
if (staleTimer) clearTimeout(staleTimer)
staleTimer = setTimeout(() => {
tick.value++
}, STALE_AFTER_MS + 100)
}
const expectedSha = async () => (await getEditedSha()) ?? sha.value
const check = async () => {
if (!path.value) return
rawStatus.value = "checking"
const remoteSha = await fetchLatestSha(path.value)
if (remoteSha === null) {
rawStatus.value = "offline"
return
}
latestSha.value = remoteSha
lastCheckedAt.value = new Date()
const local = await expectedSha()
rawStatus.value = remoteSha === local ? "verified" : "outdated"
armStaleTimer()
}
const pullLatest = async (): Promise<string | null> => {
if (!path.value) return null
const remoteSha = latestSha.value ?? (await fetchLatestSha(path.value))
if (!remoteSha) {
rawStatus.value = "offline"
return null
}
const fileContent = await queryFileContent(user, repo, remoteSha)
if (!fileContent) {
rawStatus.value = "offline"
return null
}
const { saveCacheNote } = prepareNoteCache(sha.value, path.value)
await saveCacheNote(fileContent, {
editedSha: remoteSha,
path: path.value
})
store.addFile({ path: path.value, sha: remoteSha })
latestSha.value = remoteSha
lastCheckedAt.value = new Date()
rawStatus.value = "verified"
armStaleTimer()
const { getRawContent } = markdownBuilder(sha.value)
return getRawContent(fileContent)
}
return {
status,
lastCheckedAt,
latestSha,
check,
pullLatest
}
}

View File

@@ -25,7 +25,7 @@ export const useNoteView = () => {
) )
const unsubscribeLink = noteEventBus.addEventBusListener( const unsubscribeLink = noteEventBus.addEventBusListener(
({ path, currentNoteSHA }) => { ({ path, hash, currentNoteSHA }) => {
const currentFile = store.files.find( const currentFile = store.files.find(
(file) => file.sha === currentNoteSHA (file) => file.sha === currentNoteSHA
) )
@@ -38,7 +38,7 @@ export const useNoteView = () => {
return return
} }
addStackedNote(currentNoteSHA ?? "", file.sha) addStackedNote(currentNoteSHA ?? "", file.sha, undefined, hash)
} }
) )

View File

@@ -1,7 +1,7 @@
import { useAsyncState } from "@vueuse/core" import { useAsyncState } from "@vueuse/core"
import { computed, ref } from "vue" import { computed, ref } from "vue"
import { data } from "@/data/data" import { data, generateId } from "@/data/data"
import { DataType } from "@/data/DataType.enum" import { DataType } from "@/data/DataType.enum"
import { prepareNoteCache } from "@/modules/note/cache/prepareNoteCache" import { prepareNoteCache } from "@/modules/note/cache/prepareNoteCache"
import { Note } from "@/modules/note/models/Note" import { Note } from "@/modules/note/models/Note"
@@ -36,7 +36,7 @@ export const useOfflineNotes = () => {
if ( if (
!file.sha || !file.sha ||
cachedNotesSet.has(data.generateId(DataType.Note, file.sha)) cachedNotesSet.has(generateId(DataType.Note, file.sha))
) { ) {
continue continue
} }

View File

@@ -10,31 +10,28 @@ export const useOverlay = (listen = true) => {
const isMobile = computed(() => width.value <= MOBILE_BREAKPOINT) const isMobile = computed(() => width.value <= MOBILE_BREAKPOINT)
if (listen) { if (listen) {
// In Firefox/Chrome, body is the horizontal scroll container (body has
// computed overflow-x: auto from overflow-y: hidden). In Safari, the
// viewport (documentElement) is used instead. Listen on both.
const updateScroll = () => { const updateScroll = () => {
x.value = document.body.scrollLeft || window.scrollX const mainApp = document.getElementById("main-app")
y.value = document.body.scrollTop || window.scrollY x.value = mainApp?.scrollLeft ?? 0
y.value = mainApp?.scrollTop ?? 0
} }
useEventListener(window, "scroll", updateScroll, { useEventListener(
passive: true, () => document.getElementById("main-app"),
capture: false "scroll",
}) updateScroll,
useEventListener(document.body, "scroll", updateScroll, { { passive: true }
passive: true, )
capture: false
})
} }
const scrollToNote = (to: number) => { const scrollToNote = (to: number) => {
const go = () => { const go = () => {
const mainApp = document.getElementById("main-app")
if (!mainApp) return
if (isMobile.value) { if (isMobile.value) {
document.body.scrollTop = to mainApp.scrollTo({ top: to, behavior: "smooth" })
document.documentElement.scrollTop = to
} else { } else {
document.body.scrollLeft = to mainApp.scrollTo({ left: to, behavior: "smooth" })
document.documentElement.scrollLeft = to
} }
} }

View File

@@ -1,34 +1,82 @@
import { useAsyncState } from "@vueuse/core" import { computed, ref } from "vue"
import { useGitHubLogin } from "@/hooks/useGitHubLogin.hook" import { useGitHubLogin } from "@/hooks/useGitHubLogin.hook"
import { RepoBase } from "@/modules/repo/interfaces/RepoBase" import { RepoBase } from "@/modules/repo/interfaces/RepoBase"
import { getOctokit } from "@/modules/repo/services/octo" import { getOctokit } from "@/modules/repo/services/octo"
const PER_PAGE = 30
const STALE_TIME_MS = 20 * 60 * 1000
const repos = ref<RepoBase[]>([])
const isReady = ref(false)
const isLoading = ref(false)
const hasCredentialError = ref(false)
const currentPage = ref(0)
const totalCount = ref(0)
let lastFetchedAt = 0
export const useRepos = () => { export const useRepos = () => {
const { username, accessToken } = useGitHubLogin() const { username, accessToken } = useGitHubLogin()
const repos = useAsyncState<RepoBase[]>(async () => {
const loadMore = async () => {
if (!accessToken.value || !username.value) { if (!accessToken.value || !username.value) {
return [] isReady.value = true
return
} }
if (isLoading.value) return
isLoading.value = true
try {
const octokit = await getOctokit() const octokit = await getOctokit()
const nextPage = currentPage.value + 1
const repoList = await octokit.request("GET /search/repositories", { const repoList = await octokit.request("GET /search/repositories", {
q: `user:${username.value}`, q: `user:${username.value}`,
per_page: 100 per_page: PER_PAGE,
page: nextPage
}) })
currentPage.value = nextPage
return repoList.data.items totalCount.value = repoList.data.total_count
.map((item) => ({ const newItems = repoList.data.items.map((item) => ({
id: `${item.id}`, id: `${item.id}`,
name: item.name, name: item.name,
isPrivate: item.private isPrivate: item.private
})) }))
.sort((a, b) => (a.name < b.name ? -1 : 1)) repos.value = [...repos.value, ...newItems].sort((a, b) =>
}, []) a.name < b.name ? -1 : 1
)
return { } catch (err: unknown) {
repos: repos.state, if (
isReady: repos.isReady typeof err === "object" &&
err !== null &&
"status" in err &&
(err as { status: number }).status === 401
) {
hasCredentialError.value = true
} else {
throw err
} }
} finally {
isReady.value = true
isLoading.value = false
}
}
const canLoadMore = computed(
() => !isLoading.value && repos.value.length < totalCount.value
)
const isStale = Date.now() - lastFetchedAt > STALE_TIME_MS
if (!isReady.value || isStale) {
if (isStale && isReady.value) {
repos.value = []
currentPage.value = 0
totalCount.value = 0
isReady.value = false
isLoading.value = false
hasCredentialError.value = false
}
lastFetchedAt = Date.now()
loadMore()
}
return { repos, isReady, hasCredentialError, canLoadMore, loadMore }
} }

View File

@@ -1,4 +1,4 @@
import { onMounted, type Ref, watch } from "vue" import { onMounted, onUnmounted, type Ref, watch } from "vue"
import { getNoteWidth } from "@/constants/note-width" import { getNoteWidth } from "@/constants/note-width"
import { useOverlay } from "@/hooks/useOverlay.hook" import { useOverlay } from "@/hooks/useOverlay.hook"
@@ -19,9 +19,9 @@ export const useResizeContainer = (
} }
if (isMobile.value) { if (isMobile.value) {
container.style.height = `${(stackedNotes.value.length + 1) * 100}vh` container.style.height = `${(stackedNotes.value.length + 1) * 100}dvh`
} else { } else {
container.style.width = `${ container.style.minWidth = `${
getNoteWidth() * (stackedNotes.value.length + 1) getNoteWidth() * (stackedNotes.value.length + 1)
}px` }px`
} }
@@ -29,6 +29,11 @@ export const useResizeContainer = (
onMounted(() => { onMounted(() => {
resizeContainer() resizeContainer()
window.addEventListener("resize", resizeContainer)
})
onUnmounted(() => {
window.removeEventListener("resize", resizeContainer)
}) })
watch(stackedNotes, resizeContainer, { watch(stackedNotes, resizeContainer, {

View File

@@ -20,22 +20,76 @@ export const useRouteQueryStackedNotes = () => {
const { scrollToNote, isMobile } = useOverlay(false) const { scrollToNote, isMobile } = useOverlay(false)
const scrollToFocusedNote = ( const scrollToHashInNote = (
noteId: string | null = null, cleanSha: string,
notes: string[] = stackedNotes.value hash: string,
smooth: boolean,
attempts = 30
) => { ) => {
if (attempts <= 0) {
return
}
const heading = document.querySelector(
`.note-${cleanSha} #${CSS.escape(hash)}`
)
if (heading) {
heading.scrollIntoView({
block: "start",
inline: "nearest",
behavior: smooth ? "smooth" : "auto"
})
return
}
requestAnimationFrame(() => {
scrollToHashInNote(cleanSha, hash, smooth, attempts - 1)
})
}
const scrollToNoteElement = (
cleanNoteId: string,
index: number,
attempts = 30
) => {
const element = document.querySelector(
`.note-${cleanNoteId}`
) as HTMLElement | null
if (element) {
scrollToNote((index + 1) * element.clientHeight)
return
}
if (attempts <= 0) {
scrollToNote((index + 1) * height.value)
return
}
requestAnimationFrame(() => {
scrollToNoteElement(cleanNoteId, index, attempts - 1)
})
}
type ScrollToFocusedNoteOptions = {
noteId?: string | null
notes?: string[]
hash?: string
smoothHash?: boolean
}
const scrollToFocusedNote = ({
noteId = null,
notes = stackedNotes.value,
hash,
smoothHash = false
}: ScrollToFocusedNoteOptions = {}) => {
nextTick(() => { nextTick(() => {
const index = noteId ? notes.findIndex((nid) => nid === noteId) : 0 const index = noteId ? notes.findIndex((nid) => nid === noteId) : 0
if (isMobile.value) { if (isMobile.value) {
if (noteId) { if (noteId) {
const cleanNoteId = noteId.replaceAll(":", "-") scrollToNoteElement(noteId.replaceAll(":", "-"), index)
const element = document.querySelector(
`.note-${cleanNoteId}`
) as HTMLElement
const top = (index + 1) * (element?.clientHeight ?? height.value)
scrollToNote(top)
} else { } else {
scrollToNote(0) scrollToNote(0)
} }
@@ -47,16 +101,25 @@ export const useRouteQueryStackedNotes = () => {
scrollToNote(0) scrollToNote(0)
} }
} }
if (hash && noteId) {
scrollToHashInNote(noteId.replaceAll(":", "-"), hash, smoothHash)
}
}) })
} }
const addStackedNote = ( const addStackedNote = (
currentSha: string, currentSha: string,
sha: string, sha: string,
selector?: string selector?: string,
hash?: string
) => { ) => {
if (stackedNotes.value.includes(sha)) { if (stackedNotes.value.includes(sha)) {
scrollToFocusedNote(selector ?? sha) scrollToFocusedNote({
noteId: selector ?? sha,
hash,
smoothHash: true
})
return return
} }
@@ -76,7 +139,7 @@ export const useRouteQueryStackedNotes = () => {
stackedNotes.value = newStackedNotes stackedNotes.value = newStackedNotes
} }
scrollToFocusedNote(selector ?? sha, stackedNotes.value) scrollToFocusedNote({ noteId: selector ?? sha, hash })
} }
return { return {

View File

@@ -4,7 +4,7 @@ import { useAsyncState } from "@vueuse/core"
import { addDays, isAfter } from "date-fns" import { addDays, isAfter } from "date-fns"
import { computed, nextTick, watch } from "vue" import { computed, nextTick, watch } from "vue"
import { data } from "@/data/data" import { data, generateId } from "@/data/data"
import { DataType } from "@/data/DataType.enum" import { DataType } from "@/data/DataType.enum"
import { useFile } from "@/hooks/useFile.hook" import { useFile } from "@/hooks/useFile.hook"
import { useLinks } from "@/hooks/useLinks.hook" import { useLinks } from "@/hooks/useLinks.hook"
@@ -51,7 +51,7 @@ export const useSpacedRepetitionCards = () => {
const repetition = await data.getOrCreate< const repetition = await data.getOrCreate<
DataType.RepetitionCard, DataType.RepetitionCard,
RepetitionCard RepetitionCard
>(data.generateId(DataType.RepetitionCard, cardFile.path), { >(generateId(DataType.RepetitionCard, cardFile.path), {
$type: DataType.RepetitionCard, $type: DataType.RepetitionCard,
level: 1, level: 1,
repeatDate: new Date(), repeatDate: new Date(),

View File

@@ -1,17 +1,17 @@
import { useAsyncState } from "@vueuse/core" import { useAsyncState } from "@vueuse/core"
import { computed } from "vue" import { computed } from "vue"
import { data } from "@/data/data" import { data, generateId } from "@/data/data"
import { DataType } from "@/data/DataType.enum" import { DataType } from "@/data/DataType.enum"
import { History } from "@/data/models/History" import { History } from "@/data/models/History"
const HISTORY_ID = data.generateId(DataType.History, "history") const HISTORY_ID = generateId(DataType.History, "history")
export const useLastVisitedRepos = () => { export const useLastVisitedRepos = () => {
const history = useAsyncState( const history = useAsyncState(
() => () =>
data.get<DataType.History, History>( data.get<DataType.History, History>(
data.generateId(DataType.History, "history") generateId(DataType.History, "history")
), ),
null null
) )

View File

@@ -1,10 +1,10 @@
import { Ref, toValue } from "vue" import { Ref, toValue } from "vue"
import { data } from "@/data/data" import { data, generateId } from "@/data/data"
import { DataType } from "@/data/DataType.enum" import { DataType } from "@/data/DataType.enum"
import { History } from "@/data/models/History" import { History } from "@/data/models/History"
const HISTORY_ID = data.generateId(DataType.History, "history") const HISTORY_ID = generateId(DataType.History, "history")
const MAX_REPO_HISTORY = 10 const MAX_REPO_HISTORY = 10
export const useVisitRepo = (newRepo: { export const useVisitRepo = (newRepo: {

View File

@@ -1,4 +1,4 @@
import { data } from "@/data/data" import { data, generateId } from "@/data/data"
import { DataType } from "@/data/DataType.enum" import { DataType } from "@/data/DataType.enum"
import { Note } from "@/modules/note/models/Note" import { Note } from "@/modules/note/models/Note"
import { useUserRepoStore } from "@/modules/repo/store/userRepo.store" import { useUserRepoStore } from "@/modules/repo/store/userRepo.store"
@@ -14,8 +14,8 @@ type NoteCacheResult =
export const prepareNoteCache = (sha: string, path?: string) => { export const prepareNoteCache = (sha: string, path?: string) => {
const store = useUserRepoStore() const store = useUserRepoStore()
const noteId = data.generateId(DataType.Note, sha) const noteId = generateId(DataType.Note, sha)
const notePath = path ? data.generateId(DataType.Note, path) : null const notePath = path ? generateId(DataType.Note, path) : null
const getCachedNote = async (): Promise<NoteCacheResult> => { const getCachedNote = async (): Promise<NoteCacheResult> => {
const note = await data.get<DataType.Note, Note>(noteId) const note = await data.get<DataType.Note, Note>(noteId)

View File

@@ -29,31 +29,19 @@ export const noteRouter = contract.router({
noteLists: { noteLists: {
method: "GET", method: "GET",
path: "/notes", path: "/notes",
query: type({ query: contract.type<{ cursor?: string; limit?: number }>(),
cursor: "string | undefined",
limit: "number | undefined"
}),
responses: { responses: {
200: type({ 200: contract.type<{ notes: PublicNoteListItem[] }>()
notes: PublicNoteListItem.array()
})
}, },
summary: "List all notes" summary: "List all notes"
}, },
noteListsByDid: { noteListsByDid: {
method: "GET", method: "GET",
path: "/:did/notes", path: "/:did/notes",
pathParams: type({ pathParams: contract.type<{ did: string }>(),
did: "string" query: contract.type<{ cursor?: string; limit?: number }>(),
}),
query: type({
cursor: "string | undefined",
limit: "number | undefined"
}),
responses: { responses: {
200: type({ 200: contract.type<{ notes: PublicNoteListItem[] }>()
notes: PublicNoteListItem.array()
})
}, },
summary: "List all notes" summary: "List all notes"
} }

View File

@@ -1,6 +1,6 @@
import { computed, onMounted, ref } from "vue" import { computed, onMounted, ref } from "vue"
import { data } from "@/data/data" import { data, generateId } from "@/data/data"
import { DataType } from "@/data/DataType.enum" import { DataType } from "@/data/DataType.enum"
import { useRepos } from "@/hooks/useRepos.hook" import { useRepos } from "@/hooks/useRepos.hook"
import { RepoBase } from "@/modules/repo/interfaces/RepoBase" import { RepoBase } from "@/modules/repo/interfaces/RepoBase"
@@ -27,7 +27,7 @@ export const useFavoriteRepos = () => {
const toggleFavorite = async (repo: RepoBase, isFavorite: boolean) => { const toggleFavorite = async (repo: RepoBase, isFavorite: boolean) => {
const favorite: FavoriteRepo = { const favorite: FavoriteRepo = {
_id: data.generateId(DataType.FavoriteRepo, repo.id), _id: generateId(DataType.FavoriteRepo, repo.id),
$type: DataType.FavoriteRepo, $type: DataType.FavoriteRepo,
isFavorite, isFavorite,
name: repo.name, name: repo.name,

View File

@@ -6,7 +6,7 @@ import { RepoBase } from "@/modules/repo/interfaces/RepoBase"
export const useRepoList = () => { export const useRepoList = () => {
const { savedFavoriteRepos, addFavorite, removeFavorite } = useFavoriteRepos() const { savedFavoriteRepos, addFavorite, removeFavorite } = useFavoriteRepos()
const { repos } = useRepos() const { repos, canLoadMore, loadMore } = useRepos()
const favoriteRepos = computed(() => { const favoriteRepos = computed(() => {
return repos.value.filter((repo) => return repos.value.filter((repo) =>
@@ -38,6 +38,8 @@ export const useRepoList = () => {
favoriteRepos, favoriteRepos,
otherRepos, otherRepos,
favoriteCheckboxes, favoriteCheckboxes,
toggleCheckbox toggleCheckbox,
canLoadMore,
loadMore
} }
} }

View File

@@ -8,4 +8,7 @@ export interface UserSettings extends Model<DataType.UserSettings> {
fontSize?: string fontSize?: string
chosenFontSize?: string chosenFontSize?: string
backlink?: boolean backlink?: boolean
chosenTitleFont?: string
chosenBodyFont?: string
pageWidth?: string
} }

View File

@@ -104,7 +104,16 @@ export const getUserSettingsContent = async (
return null return null
} }
return JSON.parse(atob(content)) as UserSettings const raw = JSON.parse(atob(content)) as UserSettings & {
t?: string
p?: string
}
const { t, p, ...rest } = raw
return {
...rest,
chosenTitleFont: t,
chosenBodyFont: p
}
} }
export const queryFileContent = async ( export const queryFileContent = async (

View File

@@ -1,6 +1,7 @@
import { toRaw } from "vue"
import { defineStore } from "pinia" import { defineStore } from "pinia"
import { data } from "@/data/data" import { data, generateId } from "@/data/data"
import { DataType } from "@/data/DataType.enum" import { DataType } from "@/data/DataType.enum"
import { RepoFile } from "@/modules/repo/interfaces/RepoFile" import { RepoFile } from "@/modules/repo/interfaces/RepoFile"
import { UserSettings } from "@/modules/repo/interfaces/UserSettings" import { UserSettings } from "@/modules/repo/interfaces/UserSettings"
@@ -20,6 +21,7 @@ interface State {
readme?: string | null readme?: string | null
userSettings?: UserSettings | null userSettings?: UserSettings | null
needToLogin: boolean needToLogin: boolean
_requestId: number
} }
export const useUserRepoStore = defineStore("USER_REPO_STATE", { export const useUserRepoStore = defineStore("USER_REPO_STATE", {
@@ -29,40 +31,83 @@ export const useUserRepoStore = defineStore("USER_REPO_STATE", {
files: [], files: [],
readme: undefined, readme: undefined,
userSettings: undefined, userSettings: undefined,
needToLogin: false needToLogin: false,
_requestId: 0
}), }),
actions: { actions: {
_persistLayout() {
if (!this.userSettings) return
try {
const {
chosenTitleFont,
chosenBodyFont,
chosenFontSize,
chosenFontFamily,
pageWidth
} = this.userSettings
localStorage.setItem(
`remanso:layout:${this.user}:${this.repo}`,
JSON.stringify({
chosenTitleFont,
chosenBodyFont,
chosenFontSize,
chosenFontFamily,
pageWidth
})
)
} catch {
// ignore
}
},
async setUserRepo(user: string, repo: string) { async setUserRepo(user: string, repo: string) {
const requestId = ++this._requestId
this.user = user this.user = user
this.repo = repo this.repo = repo
const savedRepoId = data.generateId(DataType.SavedRepo, `${user}-${repo}`) let lsLayout: Partial<UserSettings> = {}
const cachedSavedRepo = await data.get<DataType.SavedRepo, SavedRepo>( try {
savedRepoId const lsRaw = localStorage.getItem(`remanso:layout:${user}:${repo}`)
) if (lsRaw) lsLayout = JSON.parse(lsRaw)
} catch {
// ignore
}
if (Object.keys(lsLayout).length) {
if (!this.userSettings)
this.userSettings = { $type: DataType.UserSettings }
Object.assign(this.userSettings, lsLayout)
}
const savedRepoId = generateId(DataType.SavedRepo, `${user}-${repo}`)
const userSettingsId = `UserSetting-${user}-${repo}`
const [cachedSavedRepo, cachedUserSettings] = await Promise.all([
data.get<DataType.SavedRepo, SavedRepo>(savedRepoId),
data.get<DataType.UserSettings, UserSettings>(userSettingsId)
])
if (requestId !== this._requestId) return
if (cachedSavedRepo) { if (cachedSavedRepo) {
this.files = cachedSavedRepo.files this.files = cachedSavedRepo.files
} }
if (cachedUserSettings) {
// localStorage layout choices take priority over PouchDB cache
this.userSettings = { ...cachedUserSettings, ...lsLayout }
}
try { try {
await refreshToken() await refreshToken()
} catch (error) { } catch (error) {
console.warn("impossible to refresh token", error) console.warn("impossible to refresh token", error)
} }
const userSettingsId = `UserSetting-${user}-${repo}` if (requestId !== this._requestId) return
const cachedUserSettings = await data.get<
DataType.UserSettings,
UserSettings
>(userSettingsId)
if (cachedUserSettings) {
this.userSettings = cachedUserSettings
}
getFiles(user, repo) getFiles(user, repo)
.then(async (files) => { .then(async (files) => {
if (requestId !== this._requestId) return
data.update<DataType.SavedRepo, SavedRepo>({ data.update<DataType.SavedRepo, SavedRepo>({
_id: savedRepoId, _id: savedRepoId,
$type: DataType.SavedRepo, $type: DataType.SavedRepo,
@@ -74,6 +119,7 @@ export const useUserRepoStore = defineStore("USER_REPO_STATE", {
return getUserSettingsContent(user, repo, files) return getUserSettingsContent(user, repo, files)
}) })
.then((userSettings) => { .then((userSettings) => {
if (requestId !== this._requestId) return
const chosenFontFamily = userSettings?.fontFamilies?.find( const chosenFontFamily = userSettings?.fontFamilies?.find(
(font) => font === this.userSettings?.chosenFontFamily (font) => font === this.userSettings?.chosenFontFamily
) )
@@ -81,24 +127,45 @@ export const useUserRepoStore = defineStore("USER_REPO_STATE", {
: userSettings?.fontFamily : userSettings?.fontFamily
const chosenFontSize = const chosenFontSize =
this.userSettings?.chosenFontSize ?? userSettings?.fontSize this.userSettings?.chosenFontSize ?? userSettings?.fontSize
const chosenTitleFont =
this.userSettings?.chosenTitleFont ??
userSettings?.chosenTitleFont ??
chosenFontFamily
const chosenBodyFont =
this.userSettings?.chosenBodyFont ??
userSettings?.chosenBodyFont ??
chosenFontFamily
if (userSettings) {
this.userSettings = userSettings this.userSettings = userSettings
} else if (!this.userSettings) {
if (!this.userSettings) { this.userSettings = { $type: DataType.UserSettings }
return
} }
this.userSettings.chosenFontFamily = this.userSettings.chosenFontFamily =
chosenFontFamily ?? this.userSettings.fontFamily chosenFontFamily ?? this.userSettings.fontFamily
this.userSettings.chosenFontSize = this.userSettings.chosenFontSize =
chosenFontSize ?? this.userSettings.fontSize chosenFontSize ?? this.userSettings.fontSize
this.userSettings.chosenTitleFont = chosenTitleFont
this.userSettings.chosenBodyFont = chosenBodyFont
this._persistLayout()
// Persist only repo config fields — chosen* are localStorage-only
const {
chosenTitleFont: _t,
chosenBodyFont: _b,
chosenFontSize: _s,
chosenFontFamily: _f,
...repoConfig
} = toRaw(this.userSettings)
data.update<DataType.UserSettings, UserSettings>({ data.update<DataType.UserSettings, UserSettings>({
...this.userSettings, ...repoConfig,
_id: userSettingsId _id: userSettingsId
}) })
}) })
getCachedMainReadme(user, repo).then(async (cachedReadme) => { getCachedMainReadme(user, repo).then(async (cachedReadme) => {
if (requestId !== this._requestId) return
this.readme = cachedReadme this.readme = cachedReadme
this.readme = await getMainReadme(user, repo) this.readme = await getMainReadme(user, repo)
}) })
@@ -114,11 +181,14 @@ export const useUserRepoStore = defineStore("USER_REPO_STATE", {
return return
} }
const savedRepoId = data.generateId( const savedRepoId = generateId(
DataType.SavedRepo, DataType.SavedRepo,
`${this.user}-${this.repo}` `${this.user}-${this.repo}`
) )
const newFiles = [...this.files.filter((f) => f.sha !== file.sha), file] const newFiles = [
...toRaw(this.files).filter((f) => f.sha !== file.sha),
toRaw(file)
]
data.update<DataType.SavedRepo, SavedRepo>({ data.update<DataType.SavedRepo, SavedRepo>({
_id: savedRepoId, _id: savedRepoId,
$type: DataType.SavedRepo, $type: DataType.SavedRepo,
@@ -132,35 +202,39 @@ export const useUserRepoStore = defineStore("USER_REPO_STATE", {
this.user = "" this.user = ""
this.repo = "" this.repo = ""
this.resetFiles() this.resetFiles()
this.userSettings = undefined
}, },
resetFiles() { resetFiles() {
this.files = [] this.files = []
this.readme = null this.readme = null
this.userSettings = undefined
}, },
setFontFamily(fontFamily: string) { setFontFamily(fontFamily: string) {
if (!this.userSettings) { if (!this.userSettings) {
return this.userSettings = { $type: DataType.UserSettings }
} }
this.userSettings.chosenFontFamily = fontFamily this.userSettings.chosenFontFamily = fontFamily
this._persistLayout()
const userSettingsId = `UserSetting-${this.user}-${this.repo}`
data.update<DataType.UserSettings, UserSettings>({
...this.userSettings,
_id: userSettingsId
})
}, },
setFontSize(fontSize: string) { setFontSize(fontSize: string) {
if (!this.userSettings) { if (!this.userSettings) {
return this.userSettings = { $type: DataType.UserSettings }
} }
this.userSettings.chosenFontSize = fontSize this.userSettings.chosenFontSize = fontSize
this._persistLayout()
const userSettingsId = `UserSetting-${this.user}-${this.repo}` },
data.update<DataType.UserSettings, UserSettings>({ setTitleFont(font: string) {
...this.userSettings, if (!this.userSettings) {
_id: userSettingsId this.userSettings = { $type: DataType.UserSettings }
}) }
this.userSettings.chosenTitleFont = font
this._persistLayout()
},
setBodyFont(font: string) {
if (!this.userSettings) {
this.userSettings = { $type: DataType.UserSettings }
}
this.userSettings.chosenBodyFont = font
this._persistLayout()
} }
} }
}) })

View File

@@ -1,10 +1,12 @@
import { watchEffect } from "vue" import { watchEffect } from "vue"
import { resetNoteWidthCache } from "@/constants/note-width"
import { useUserRepoStore } from "@/modules/repo/store/userRepo.store" import { useUserRepoStore } from "@/modules/repo/store/userRepo.store"
import { downloadFont } from "@/utils/downloadFont" import { downloadFont } from "@/utils/downloadFont"
const DEFAULT_FONT_POLICY = '"Libertinus Serif", serif' const DEFAULT_FONT_POLICY = '"Libertinus Serif", serif'
const DEFAULT_FONT_SIZE = "16px" const DEFAULT_FONT_SIZE = "16px"
const DEFAULT_NOTE_WIDTH = "500px"
export const useUserSettings = () => { export const useUserSettings = () => {
const store = useUserRepoStore() const store = useUserRepoStore()
@@ -12,10 +14,19 @@ export const useUserSettings = () => {
watchEffect(() => { watchEffect(() => {
const root = document.documentElement const root = document.documentElement
const fontFamily = store.userSettings?.chosenFontFamily
const fontSize = store.userSettings?.chosenFontSize const fontSize = store.userSettings?.chosenFontSize
const bodyFont = store.userSettings?.chosenBodyFont
const titleFont = store.userSettings?.chosenTitleFont
downloadFont(fontFamily || DEFAULT_FONT_POLICY) downloadFont(bodyFont || DEFAULT_FONT_POLICY, "--font-family")
downloadFont(
titleFont || bodyFont || DEFAULT_FONT_POLICY,
"--title-font-family"
)
root.style.setProperty("--font-size", fontSize || DEFAULT_FONT_SIZE) root.style.setProperty("--font-size", fontSize || DEFAULT_FONT_SIZE)
const pageWidth = store.userSettings?.pageWidth ?? DEFAULT_NOTE_WIDTH
root.style.setProperty("--note-width", pageWidth)
resetNoteWidthCache()
}) })
} }

View File

@@ -1,7 +1,7 @@
import { Octokit } from "@octokit/rest" import { Octokit } from "@octokit/rest"
import { addMinutes, addSeconds, isBefore } from "date-fns" import { addMinutes, addSeconds, isBefore } from "date-fns"
import { data } from "@/data/data" import { data, generateId } from "@/data/data"
import { DataType } from "@/data/DataType.enum" import { DataType } from "@/data/DataType.enum"
import { GithubAccessToken } from "@/data/models/GithubAccessToken" import { GithubAccessToken } from "@/data/models/GithubAccessToken"
import { GithubToken } from "@/modules/user/interfaces/GithubToken" import { GithubToken } from "@/modules/user/interfaces/GithubToken"
@@ -26,7 +26,7 @@ export const needToRefreshToken = async () => {
const accessToken = await data.get< const accessToken = await data.get<
DataType.GithubAccessToken, DataType.GithubAccessToken,
GithubAccessToken GithubAccessToken
>(data.generateId(DataType.GithubAccessToken, personalTokenId)) >(generateId(DataType.GithubAccessToken, personalTokenId))
if (!accessToken) { if (!accessToken) {
return false return false
@@ -42,7 +42,7 @@ export const refreshToken = async () => {
const accessToken = await data.get< const accessToken = await data.get<
DataType.GithubAccessToken, DataType.GithubAccessToken,
GithubAccessToken GithubAccessToken
>(data.generateId(DataType.GithubAccessToken, personalTokenId)) >(generateId(DataType.GithubAccessToken, personalTokenId))
if (!accessToken) { if (!accessToken) {
return null return null
@@ -74,7 +74,7 @@ export const getAccessToken = async () => {
const response = await data.get< const response = await data.get<
DataType.GithubAccessToken, DataType.GithubAccessToken,
GithubAccessToken GithubAccessToken
>(data.generateId(DataType.GithubAccessToken, personalTokenId)) >(generateId(DataType.GithubAccessToken, personalTokenId))
return response return response
} }
@@ -94,7 +94,7 @@ export const saveAccessToken = async (githubToken: GithubToken) => {
const accessToken: GithubAccessToken = { const accessToken: GithubAccessToken = {
...actualPAT, ...actualPAT,
_id: data.generateId(DataType.GithubAccessToken, personalTokenId), _id: generateId(DataType.GithubAccessToken, personalTokenId),
$type: DataType.GithubAccessToken, $type: DataType.GithubAccessToken,
token: githubToken.access_token, token: githubToken.access_token,
expiresIn: githubToken.expires_in, expiresIn: githubToken.expires_in,

View File

@@ -104,7 +104,12 @@ router.beforeEach(() => {
} }
).startViewTransition(async () => { ).startViewTransition(async () => {
resolve() resolve()
await nextTick() await new Promise<void>((r) => {
const unwatch = router.afterEach(() => {
unwatch()
nextTick().then(r)
})
})
}) })
}) })
}) })

6
src/shims-vue.d.ts vendored
View File

@@ -1,3 +1,9 @@
declare module "*.vue" {
import type { DefineComponent } from "vue"
const component: DefineComponent<{}, {}, any>
export default component
}
declare module "pouchdb-adapter-indexeddb" declare module "pouchdb-adapter-indexeddb"
declare module "@toycode/markdown-it-class" declare module "@toycode/markdown-it-class"
declare module "markdown-it-block-embed" declare module "markdown-it-block-embed"

View File

@@ -6,12 +6,15 @@
:root { :root {
--primary-color: #ffa4c0; --primary-color: #ffa4c0;
--font-family: "Libertinus Serif", serif; --font-family: "Libertinus Serif", serif;
--title-font-family: "Libertinus Serif", serif;
--font-size: 13pt; --font-size: 13pt;
--font-color: #4a4a4a; --font-color: #4a4a4a;
--link: #445fb9; --link: #445fb9;
--light-link: lighten(#445fb9, 45%); --light-link: lighten(#445fb9, 45%);
--background-color: #ffffff; --background-color: #ffffff;
--note-width: 500px; --note-width: 500px;
--note-canvas-bg: color-mix(in oklch, var(--color-base-100) 60%, var(--color-base-200));
--note-sheet-shadow: 1px 0 8px rgb(0 0 0 / 6%);
--color-contrast-content: var(--color-success); --color-contrast-content: var(--color-success);
--notyf-margin: 0.5rem; --notyf-margin: 0.5rem;
} }
@@ -24,8 +27,8 @@
@plugin 'daisyui' { @plugin 'daisyui' {
themes: themes:
garden --default, emerald --default,
dim --prefersdark; forest --prefersdark;
} }
@config '../../tailwind.config.js'; @config '../../tailwind.config.js';
@@ -48,21 +51,17 @@
} }
} }
html { html,
overflow-y: auto;
overflow-x: auto;
}
body { body {
height: 100vh; height: 100dvh;
overflow: hidden;
scroll-behavior: smooth; scroll-behavior: smooth;
overflow-y: auto;
} }
@media screen and (min-width: 769px) { @media screen and (max-width: 768px) {
html, html,
body { body {
overflow-y: hidden; overflow-y: auto;
} }
} }
@@ -77,7 +76,7 @@ body {
} }
#app { #app {
height: 100vh; height: 100dvh;
display: flex; display: flex;
} }
@@ -236,3 +235,12 @@ iframe {
.todo-notes li:has(> input[type="checkbox"]) { .todo-notes li:has(> input[type="checkbox"]) {
list-style: none; list-style: none;
} }
.tabs :where(pre):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
margin-top: 0;
margin-bottom: 0;
padding-top: 0.2rem;
padding-inline-end: 0.2rem;
padding-bottom: 0.2rem;
padding-inline-start: 0.2rem;
}

View File

@@ -2,6 +2,6 @@
// Update these values to change the light and dark themes // Update these values to change the light and dark themes
export const themeConfig = { export const themeConfig = {
light: "garden", light: "emerald",
dark: "dim" dark: "forest"
} }

View File

@@ -0,0 +1,296 @@
{
"$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
"name": "Alloy",
"scopeName": "source.als",
"patterns": [
{ "include": "#comments" },
{ "include": "#declaration" },
{ "include": "#expression" },
{ "include": "#built-in" },
{ "include": "#keywords" },
{ "include": "#digit" }
],
"repository": {
"comments": {
"patterns": [
{ "begin": "/\\*", "end": "\\*/", "name": "comment.block.alloy" },
{ "begin": "//", "end": "\n", "name": "comment.line.double-slash" },
{ "begin": "--", "end": "\n", "name": "comment.line.double-dash" }
]
},
"keywords": {
"patterns": [
{ "include": "#define" },
{ "include": "#modifier" },
{ "include": "#operator" },
{ "include": "#control" },
{ "include": "#variable" }
],
"repository": {
"define": {
"patterns": [
{ "match": "\\b(sig)\\b", "name": "keyword.language.sig.alloy" },
{ "match": "\\b(fact)\\b", "name": "keyword.language.fact.alloy" },
{ "match": "\\b(pred)\\b", "name": "keyword.language.pred.alloy" },
{ "match": "\\b(fun)\\b", "name": "keyword.language.fun.alloy" },
{
"match": "\\b(module)\\b",
"name": "keyword.language.module.alloy"
},
{
"match": "\\b(extends)\\b",
"name": "keyword.language.extends.alloy"
},
{ "match": ":", "name": "keyword.other.colon.alloy" },
{
"match": "\\b(check)\\b",
"name": "keyword.language.check.alloy"
},
{
"match": "\\b(assert)\\b",
"name": "keyword.language.assert.alloy"
},
{ "match": "\\b(run)\\b", "name": "keyword.language.run.alloy" },
{ "match": "\\b(open)\\b", "name": "keyword.other.open.alloy" },
{ "match": "\\b(as)\\b", "name": "keyword.other.as.alloy" },
{ "match": "\\b(in)\\b", "name": "keyword.other.in.alloy" }
]
},
"modifier": {
"patterns": [
{ "match": "\\b(var)\\b", "name": "keyword.modifier.var.alloy" },
{
"match": "\\b(private)\\b",
"name": "keyword.modifier.private.alloy"
},
{
"match": "\\b(abstract)\\b",
"name": "keyword.modifier.abstract.alloy"
},
{
"match": "\\b(all|disj|lone|no|one|set|seq|some|sum|univ|none)\\b",
"name": "keyword.modifier.set.alloy"
}
]
},
"operator": {
"patterns": [
{ "include": "#temporal" },
{ "include": "#unary" },
{ "include": "#binary" }
],
"repository": {
"temporal": {
"patterns": [
{
"match": "\\b(always|eventually|after|before|historically|once|prev)\\b",
"name": "keyword.operator.temporal.unary.alloy"
},
{
"match": "\\b(until|releases|since|triggered)\\b",
"name": "keyword.operator.temporal.binary.alloy"
}
]
},
"unary": {
"patterns": [
{
"match": "!|#|~|\\*|\\^|(\\b(not)\\b)",
"name": "keyword.operator.unary.alloy"
}
]
},
"binary": {
"patterns": [
{
"match": "(?:\\|\\|)|&&|<=>|=>|&|\\+|-|\\+\\+|<:|:>|\\.|=|->",
"name": "keyword.operator.binary.alloy"
},
{
"match": "\\b(and|or|iff|implies|else|in)\\b",
"name": "keyword.operator.binary.alloy"
},
{
"match": "=|<|>|=<|>=",
"name": "keyword.operator.binary.alloy"
},
{ "match": ",", "name": "keyword.other.comma.alloy" },
{ "match": "\\|", "name": "keyword.other.split.alloy" }
]
}
}
},
"variable": {
"patterns": [
{ "match": "\\b(let)\\b", "name": "keyword.language.let.alloy" },
{ "match": "\\b(this)\\b", "name": "keyword.language.this.alloy" }
]
},
"control": {
"patterns": [
{ "match": "\\b(for)\\b", "name": "keyword.control.for.alloy" },
{ "match": "\\b(but)\\b", "name": "keyword.control.but.alloy" },
{
"match": "\\b(exactly)\\b",
"name": "keyword.control.exactly.alloy"
},
{
"match": "\\b(expect)\\b",
"name": "keyword.control.expect.alloy"
},
{ "match": "\\b(steps)\\b", "name": "keyword.control.steps.alloy" }
]
}
}
},
"declaration": {
"patterns": [
{ "include": "#module" },
{ "include": "#predict" },
{ "include": "#signature" },
{ "include": "#fact" },
{ "include": "#fun" }
],
"repository": {
"module": {
"patterns": [
{
"match": "(module)\\b\\s*((?:\\w|'|_|\\d|/)+)",
"captures": {
"1": { "name": "keyword.language.module.alloy" },
"2": { "name": "support.class.module.alloy" }
}
}
]
},
"predict": {
"patterns": [
{
"match": "(pred)\\b\\s*((?:\\w|'|_|\\d|/)+)",
"captures": {
"1": { "name": "keyword.language.pred.alloy" },
"2": { "name": "entity.name.function.pred.alloy" }
}
}
]
},
"signature": {
"patterns": [
{
"begin": "(abstract)?\\s*(lone|some|one)?\\s*(var)?\\s*(sig)\\b\\s*",
"end": "(?=\\{)",
"beginCaptures": {
"1": { "name": "keyword.modifier.abstract.alloy" },
"2": { "name": "keyword.modifier.set.alloy" },
"3": { "name": "keyword.modifier.var.alloy" },
"4": { "name": "keyword.language.sig.alloy" }
},
"patterns": [
{
"begin": "(extends)",
"end": "(?=\\{)",
"beginCaptures": {
"1": { "name": "keyword.language.extends.alloy" }
},
"patterns": [
{
"match": "(?:\\w|'|_|\\d|/)+",
"name": "entity.other.inherited-class.alloy"
}
]
},
{
"begin": "(in)",
"end": "(?=\\{)",
"beginCaptures": {
"1": { "name": "keyword.other.in.alloy" }
},
"patterns": [
{
"match": "(?:\\w|'|_|\\d|/)+",
"name": "entity.other.inherited-class.alloy"
},
{ "match": "\\+", "name": "keyword.operator.binary.alloy" }
]
},
{
"match": "(?:\\w|'|_|\\d|/)+",
"name": "entity.name.type.signature.alloy"
},
{ "match": ",", "name": "keyword.other.comma.alloy" }
]
}
]
},
"fact": {
"patterns": [
{
"match": "(fact)\\b\\s*((?:\\w|'|_|\\d|/)+)",
"captures": {
"1": { "name": "keyword.language.fact.alloy" },
"2": { "name": "entity.name.function.fact.alloy" }
}
}
]
},
"fun": {
"patterns": [
{
"match": "(fun)\\b\\s*((?:\\w|'|_|\\d|/)+)",
"captures": {
"1": { "name": "keyword.language.fun.alloy" },
"2": { "name": "entity.name.function.fun.alloy" }
}
}
]
}
}
},
"expression": {
"patterns": [
{
"match": "(check)\\b\\s*((?:\\w|'|_|\\d|/)+)",
"captures": {
"1": { "name": "keyword.language.check.alloy" },
"2": { "name": "entity.name.function.check.alloy" }
}
},
{
"match": "(assert)\\b\\s*((?:\\w|'|_|\\d|/)+)",
"captures": {
"1": { "name": "keyword.language.assert.alloy" },
"2": { "name": "entity.name.function.check.alloy" }
}
}
]
},
"digit": {
"patterns": [
{ "match": "\\b(\\d+)\\b", "name": "constant.numeric.alloy" }
]
},
"built-in": {
"patterns": [
{
"match": "\\b(plus|minus|mul|div|rem|sum)\\[",
"captures": { "1": { "name": "support.function.numeric.alloy" } }
},
{
"match": "\\b(open)\\b\\s*((?:\\w|'|_|\\d|/)+)\\[",
"captures": {
"1": { "name": "keyword.other.open.alloy" },
"2": { "name": "support.class.module.alloy" }
}
},
{
"match": "(/(?:\\w|'|_|\\d|/)+)",
"captures": { "1": { "name": "support.function.order.alloy" } }
},
{
"match": "((?:\\w|'|_|\\d)+)\\s*\\[",
"captures": { "1": { "name": "support.function.order.alloy" } }
}
]
}
}
}

View File

@@ -1,30 +1,56 @@
import FontFaceObserver from "fontfaceobserver" import FontFaceObserver from "fontfaceobserver"
const assembleFontLink = (font: string) => { const GENERIC_FAMILIES = new Set([
return `https://api.fonts.coollabs.io/css2?display=swap&family=${font "serif",
.replaceAll(",", "&family=") "sans-serif",
.replaceAll(" ", "+")}` "monospace",
"cursive",
"fantasy",
"system-ui",
"ui-serif",
"ui-sans-serif",
"ui-monospace",
"ui-rounded"
])
const parseWebFontFamilies = (font: string): string[] =>
font
.split(",")
.map((f) => f.trim().replace(/^["']|["']$/g, ""))
.filter((f) => f && !GENERIC_FAMILIES.has(f))
const assembleFontLink = (families: string[]): string | null => {
if (families.length === 0) return null
return `https://api.fonts.coollabs.io/css2?display=swap&${families
.map((f) => `family=${f.replaceAll(" ", "+")}`)
.join("&")}`
} }
export const downloadFont = async (font: string): Promise<void> => { export const downloadFont = async (
const href = assembleFontLink(font) font: string,
cssVar = "--font-family"
): Promise<void> => {
const families = parseWebFontFamilies(font)
const href = assembleFontLink(families)
// check if the href already exists if (href) {
const existingLink = document.querySelector(`link[href="${href}"]`) const alreadyLoaded = Array.from(
document.head.querySelectorAll<HTMLLinkElement>('link[rel="stylesheet"]')
).some((link) => link.href === href)
if (!existingLink) { if (!alreadyLoaded) {
const link = document.createElement("link") const link = document.createElement("link")
link.href = href link.href = href
link.rel = "stylesheet" link.rel = "stylesheet"
document.head.appendChild(link) document.head.appendChild(link)
} }
try { try {
await new FontFaceObserver(font).load() await new FontFaceObserver(families[0]).load()
} catch {
document.documentElement.style.setProperty("--font-family", font)
} catch (error) {
console.warn("error when loading font") console.warn("error when loading font")
} }
}
document.documentElement.style.setProperty(cssVar, font)
} }

31
src/utils/fileLanguage.ts Normal file
View File

@@ -0,0 +1,31 @@
const EXT_TO_LANG: Record<string, string> = {
sh: "bash",
bash: "bash",
js: "javascript",
mjs: "javascript",
cjs: "javascript",
ts: "typescript",
mts: "typescript",
cts: "typescript",
md: "markdown",
mdx: "markdown",
html: "html",
htm: "html",
css: "css",
scss: "css",
json: "json",
jsonc: "json",
als: "alloy"
}
const MARKDOWN_EXTS = new Set(["md", "mdx"])
export function isMarkdownPath(path: string): boolean {
const ext = path.split(".").pop()?.toLowerCase() ?? ""
return MARKDOWN_EXTS.has(ext)
}
export function getFileLanguage(path: string): string | null {
const ext = path.split(".").pop()?.toLowerCase() ?? ""
return EXT_TO_LANG[ext] ?? null
}

View File

@@ -82,7 +82,7 @@ watch(mode, async (newMode) => {
newContent.value newContent.value
}` }`
const newSha = await createFile({ const { sha: newSha } = await createFile({
content, content,
path: newContentPath path: newContentPath
}) })

View File

@@ -15,7 +15,7 @@ import WelcomeWorld from "@/components/WelcomeWorld.vue"
display: flex; display: flex;
flex: 1; flex: 1;
flex-direction: column; flex-direction: column;
align-items: center; min-height: 100dvh;
} }
.authorize { .authorize {

View File

@@ -4,7 +4,7 @@ import { useTitle } from "@vueuse/core"
import { computed, nextTick, ref, watch } from "vue" import { computed, nextTick, ref, watch } from "vue"
import { useRouter } from "vue-router" import { useRouter } from "vue-router"
import BackButton from "@/components/BackButton.vue" import HomeButton from "@/components/HomeButton.vue"
import SkeletonLoader from "@/components/SkeletonLoader.vue" import SkeletonLoader from "@/components/SkeletonLoader.vue"
import StackedPublicNote from "@/components/StackedPublicNote.vue" import StackedPublicNote from "@/components/StackedPublicNote.vue"
import ThemeSwap from "@/components/ThemeSwap.vue" import ThemeSwap from "@/components/ThemeSwap.vue"
@@ -129,13 +129,7 @@ watch(
<main class="public-note-view repo-note note-container"> <main class="public-note-view repo-note note-container">
<div class="note article"> <div class="note article">
<div class="header"> <div class="header">
<back-button <home-button />
:fallback="{ name: 'PublicNoteListByDidView', params: { shortDid } }"
:prefer-fallback="false"
/>
<img src="/favicon.png" alt="Remanso" class="remanso-logo" />
<theme-swap /> <theme-swap />
</div> </div>
<div class="subheader"> <div class="subheader">
@@ -197,13 +191,6 @@ watch(
gap: 1rem; gap: 1rem;
} }
.remanso-logo {
width: 32px;
height: 32px;
box-shadow: none;
view-transition-name: remanso-logo;
}
.subheader { .subheader {
margin: 1rem auto 0; margin: 1rem auto 0;
} }
@@ -254,7 +241,6 @@ watch(
overflow-y: auto; overflow-y: auto;
height: 100vh; height: 100vh;
width: 100%; width: 100%;
position: sticky;
.title { .title {
text-align: left; text-align: left;
@@ -262,6 +248,8 @@ watch(
} }
@media screen and (min-width: 769px) { @media screen and (min-width: 769px) {
background-color: var(--note-canvas-bg);
.repo-title-breadcrumb { .repo-title-breadcrumb {
padding: 0.5rem 1rem 0; padding: 0.5rem 1rem 0;
transform-origin: 0 0; transform-origin: 0 0;
@@ -279,6 +267,11 @@ watch(
.note { .note {
min-width: var(--note-width); min-width: var(--note-width);
max-width: var(--note-width); max-width: var(--note-width);
background-color: var(--color-base-100);
}
.article {
box-shadow: var(--note-sheet-shadow);
} }
} }

View File

@@ -1,20 +1,36 @@
<script lang="ts" setup> <script lang="ts" setup>
import { vInfiniteScroll } from "@vueuse/components"
import GoBack from "@/components/GoBack.vue" import GoBack from "@/components/GoBack.vue"
import SignInGithub from "@/components/SignInGithub.vue"
import { useGitHubLogin } from "@/hooks/useGitHubLogin.hook" import { useGitHubLogin } from "@/hooks/useGitHubLogin.hook"
import { useRepos } from "@/hooks/useRepos.hook" import { useRepos } from "@/hooks/useRepos.hook"
import { useRepoList } from "@/modules/repo/hooks/useRepoList.hook" import { useRepoList } from "@/modules/repo/hooks/useRepoList.hook"
const { username } = useGitHubLogin() const { username } = useGitHubLogin()
const { isReady } = useRepos() const { isReady, hasCredentialError } = useRepos()
const { favoriteRepos, otherRepos, favoriteCheckboxes, toggleCheckbox } = const {
useRepoList() favoriteRepos,
otherRepos,
favoriteCheckboxes,
toggleCheckbox,
canLoadMore,
loadMore
} = useRepoList()
</script> </script>
<template> <template>
<div class="repo-list"> <div
class="repo-list"
v-infinite-scroll="[loadMore, { canLoadMore: () => canLoadMore }]"
>
<h1 class="title is-1">Repositories</h1> <h1 class="title is-1">Repositories</h1>
<go-back /> <go-back />
<div v-if="!isReady">loading...</div> <div v-if="!isReady">loading...</div>
<div v-else-if="hasCredentialError">
<p>Your GitHub credentials are invalid or expired.</p>
<sign-in-github />
</div>
<div v-else class="columns is-centered"> <div v-else class="columns is-centered">
<div class="column is-one-third"> <div class="column is-one-third">
<table <table

View File

@@ -1,4 +1,6 @@
<script lang="ts" setup></script> <script lang="ts" setup>
import SignInGithub from "@/components/SignInGithub.vue"
</script>
<template> <template>
<main class="space-cowboy content"> <main class="space-cowboy content">
@@ -43,6 +45,7 @@
<router-link class="button is-links" :to="{ name: 'Home' }" <router-link class="button is-links" :to="{ name: 'Home' }"
>return to homepage</router-link >return to homepage</router-link
> >
<sign-in-github />
</main> </main>
</template> </template>

View File

@@ -11,7 +11,8 @@ const defaultTitleStyles = Array.from(
...acc, ...acc,
[heading]: { [heading]: {
"margin-top": "0", "margin-top": "0",
"margin-bottom": "0.5em" "margin-bottom": "0.5em",
"font-family": "var(--title-font-family)"
} }
}), }),
{} {}

View File

@@ -47,11 +47,6 @@ export default defineConfig(({ command }) => {
sizes: "512x512", sizes: "512x512",
type: "image/png" type: "image/png"
}, },
{
src: "favicon.png",
sizes: "1024x1024",
type: "image/png"
},
{ {
src: "maskable-icon-512x512.png", src: "maskable-icon-512x512.png",
sizes: "512x512", sizes: "512x512",