marketing: new website by ad-tra · Pull Request #3272 · lockbook/lockbook

ad-tra · 2025-01-04T11:25:05Z

No description provided.

Parth

I think a mild readme in pub site would go a long way describing the overall build, tools used, etc.
I would prefer to move the public_site into the docs folder.
how much effort would light mode / dark mode take? can happen after merge.
we should think about what deployment will take, can happen after merge.

Parth · 2025-03-10T16:47:09Z

Cargo.toml

 	"utils/dev-tool",
 	"utils/releaser",
 	"utils/winstaller",
+	"public-site/trunk",


Does it make sense to call this component trunk?

yeah it does make sense for me

Parth · 2025-03-10T16:50:02Z

libs/content/workspace/src/show.rs

                                    }
                                }
                                TabContent::Image(img) => img.show(ui),
+                                #[cfg(not(target_family = "wasm"))]


if you do this slightly differently you may deliver #2701

Parth · 2025-03-10T16:52:22Z

libs/content/workspace/Cargo.toml

 tracing-test = "0.2.5"
 indexmap = { version = "2.5.0", features = ["rayon"] }
+futures = "0.3.30"
+web-time = "=1.1.0"


why the specific pin?

Parth · 2025-03-10T16:58:25Z

libs/content/workspace/src/tab/markdown_editor/images.rs

-) -> Result<Vec<u8>, reqwest::Error> {
-    let response = client.get(url).send()?.bytes()?.to_vec();
-    Ok(response)
+fn download_image(client: &reqwest::Client, url: &str) -> Result<Vec<u8>, reqwest::Error> {


resolve once someone has checked to make sure this still works fine for the editor.

I recall images being vaguely broken in someway, if it's because of our inability to get them can we just include_bytes! them?

If it's something else maybe graphics related wanna just leave some context.

I also see that reqwests has some wasm things going on if it is a networking issue

yeah it broke the editor. but i fixed it and also fixed it on wasm so we can include images in the demo

Parth · 2025-03-10T17:06:44Z

libs/lb/lb-rs/Cargo.toml

 strip-ansi-escapes = "0.2.0"
 chrono = "0.4"
 rand = "0.8.4"
+getrandom = { version = "0.2", features = ["js"] }


does this remove rand? rand does support wasm iirc. Rand has cryptography implications iirc. Will continue to review.

Parth · 2025-03-10T17:37:37Z

public-site/static/linux-screenshot.png

same for git-lfs for these assets, maybe all pngs in this folder. Or you can pursue more aggressive compression. The overall repo should be fast to clone. There's some historic cleanup we have to do anyways. Cloning the repo is something a lot of scripts / CI / installers do.

public-site/trunk/resources/canvas-demo.svg

public-site/trunk/src/app.rs

public_site/CNAME

Parth · 2025-03-26T20:30:53Z

.gitattributes

+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.jpeg filter=lfs diff=lfs merge=lfs -text


I think these are ideally constrained to the public_site directory I don't want to break workspace logo or something like that

Parth · 2025-03-26T20:33:11Z

server/Cargo.toml

 jsonwebtoken = "8.2.0"
 x509-parser = { version = "0.15.0", features = ["verify", "validate"]}
-db-rs = "0.3.1"
+db-rs = {git="https://github.com/lockbook/db-rs"}


0.3.2 was published you can probably refer to this normally now

Parth · 2025-03-26T20:54:52Z

@ad-tra can you go through and resolve what you feel like you've completed? I checked a few things and found mixed results

Parth · 2025-03-26T21:00:10Z

@tvanderstad can you do a pass over the editor bits?

tvanderstad

Overall, this feels like it creates a small mess in order to deliver the feature quickly. I'm on board if we can align on a target state and a timeline to achieve it, and I'm down to do my part.

Here's a pitch to get us started:

Let's aim to drop WASM support for lb-rs and workspace, where the undue portion of the mess is concentrated imo, and instead ship just the editor and canvas modules (with simple wrappers if necessary).
I can start by factoring dependencies on lb-rs and workspace out of the editor. I'll just have it accept an optional FilePathResolver of some kind so we can resolve relative links in our apps and not depend on lb-rs in WASM (a feature I want to add anyway). I'll move any workspace helper functions to wherever I need to to make it happen. I'll aim to finish by the end of this quarter (2025 Q2).
You can apply the same pattern to canvas like we did with collaborative editing, then revert the lb-rs and workspace changes that were needed to support those in WASM, aiming to finish by end of Q3.

These timelines are approximate. Basically I see some of the changes as tech debt - the conditional compilation forces me to basically maintain two programs simultaneously which has been a bad time in the past - but we only pay interest on that tech debt when we're maintaining or building on that code. For example, if we want to up our persistence game and persist scroll positions in open files, we'll be reminded that PDFs are only present in the workspace content types enum for some targets. So here I'm saying Q2 or Q3 as a guess for "when is the next significant change to something affected by the debt" or possibly "when is the next engineer to onboard to the code affected by the debt".

tvanderstad · 2025-04-17T04:05:31Z

libs/lb/lb-rs/Cargo.toml

 bincode = "1.3.3"
 time = "0.3.20"
 diffy = "0.3.0"
+db-rs = {git="https://github.com/lockbook/db-rs"}


is this intended to stay this way? also, nit: formatting

not intended, the change has been released

tvanderstad · 2025-04-17T04:07:38Z

libs/lb/lb-rs/src/blocking.rs

+    where
+        F: Future,
+    {
+        block_on(future)


nit: I prefer to qualify instead of import a raw fn like this. There are a lot of block_on's happening around here

Suggested change

block_on(future)

futures::executor::block_on(future)

tvanderstad · 2025-04-17T04:08:25Z

libs/lb/lb-rs/src/io/mod.rs

+        let start = Instant::now();

-        // let guard = tokio::time::timeout(std::time::Duration::from_secs(1), self.db.read())
+        // let guard = web_timetimeout(std::time::Duration::from_secs(1), self.db.read())


nit: probably-unintended comment change

tvanderstad · 2025-04-17T04:13:35Z

libs/content/workspace/src/tab/markdown_editor/images.rs

+                #[cfg(not(target_arch = "wasm32"))]
+                thread::spawn(move || {


Could we have used something from futures, the way you managed the blocking behavior in lb-rs, to make the functions in this file async whether they're wasm or not? Then we wouldn't need two versions and I imagine this diff would be much cleaner (if yes I can make the change later)

Parth · 2025-04-17T14:58:10Z

Alternatively -- we could explicitly support wasm. I think there are situations where a web app makes sense and it would be annoying to factor all those things out of the editor and canvas for effectively no reason long term.

I think this forces us to do things the wasm way for the wasm situation, but my ideal investment would be to understand if these are just fundamentally the right ways to do these things anyways? Is it more correct for something like lb-rs (which has no main method) to just depend on a general futures implementation rather than forcing a tokio one, for instance.

But broadly I'm aligned on mess reduction happening in this quarter if this is merged.

I think this would still be a reasonable state for the standalone editor, lb-rs would go to resolve a link and find that you're not logged in and would not resolve the link if it's lb://.

Parth · 2025-04-17T14:58:32Z

And I'm down to make the lb-rs support of wasm my problem.

Parth · 2025-04-21T22:12:28Z

we chatted after standup and basically I think both things are going to happen

for standalone editor he'll abstract out lb, because
lb will also just support wasm
canvas can go either direction

but either way you should rebase and merge this

Parth · 2025-04-21T22:12:41Z

@tvanderstad I'm assuming you're certifying the editor changes

Parth · 2025-04-21T22:12:50Z

@ad-tra I would ideally merge this after wed's release

Parth · 2025-07-30T02:25:45Z

nix-release depends on public-site/favicon.svg existing, I can update this before you merge but we must correct it before a release.

ad-tra added 4 commits January 3, 2025 12:18

navbar and header

1897a38

finish simple front page and nuke old site

b35f419

add readme

b15330f

update gitignore

c944af1

ad-tra force-pushed the new-site branch from 941aa7a to c944af1 Compare January 5, 2025 21:04

ad-tra added 23 commits January 5, 2025 16:07

use eframe

72016ac

make ws compile in wasm, but with runtime erros

9fde685

editor in the browser, but broken

a402bea

wip

14beb90

canvas demo, editor theme and more html

bdaec25

add blog

33f57e5

wip

2cd223e

responsive navbar

c12bdf6

wip

7830d12

more responsivness

fe7f6d1

even more responsivness

b81a901

add roadmap

c2ab1df

Merge branch 'master' into new-site

82eb48f

clean up build artifacts and fix lints

c4ad7bf

update gitignore

4c95ea0

remove .vscode

cd0d7a0

add tos

c75c3c4

use correct version of db-rs

50629fa

tos and privacy policy done

7475a0f

fix build.sh and add favicon

f90b530

add new build sh

35e7ccf

wip merging travis' work

965614e

done merging travis' suggestions

732a514

Parth requested changes Mar 10, 2025

View reviewed changes

make images work

14fa279

ad-tra added 2 commits March 24, 2025 22:46

Tracking and adding LFS artifacts

5fa9651

remove openssl

a122cd5

Parth reviewed Mar 26, 2025

View reviewed changes

canvas demo hot fix

e8e3152

tvanderstad reviewed Apr 17, 2025

View reviewed changes

tvanderstad approved these changes Apr 21, 2025

View reviewed changes

Parth mentioned this pull request Jul 24, 2025

downloads page renders strangely on mobile #2144

Closed

update docs folder, and add docs to public site

2bf27f7

Parth mentioned this pull request Dec 4, 2025

more broadly compatible external link experience #4005

Open

ad-tra added 3 commits January 26, 2026 19:40

update free tier storage cap

22e420b

merge master

0cb8877

make std::threads work on wasm

cd6f6c3

Parth mentioned this pull request Feb 1, 2026

website price is wrong #3869

Closed

ad-tra added 6 commits February 1, 2026 14:42

images work

bbec8d6

fmt

101c518

fix images

ae9e484

Merge branch 'master' into new-site

72205eb

ci

913d278

udeps fix

56ff21d

ad-tra merged commit 07f12e4 into master Feb 3, 2026
1 check passed

ad-tra deleted the new-site branch February 3, 2026 05:04

Conversation

ad-tra commented Jan 4, 2025

Uh oh!

Parth left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ad-tra Mar 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Parth commented Mar 26, 2025

Uh oh!

Parth commented Mar 26, 2025

Uh oh!

tvanderstad left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tvanderstad Apr 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Parth commented Apr 17, 2025

Uh oh!

Parth commented Apr 17, 2025

Uh oh!

Parth commented Apr 21, 2025

Uh oh!

Parth commented Apr 21, 2025

Uh oh!

Parth commented Apr 21, 2025

Uh oh!

Parth commented Jul 30, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

ad-tra Mar 19, 2025 •

edited

Loading

tvanderstad Apr 17, 2025 •

edited

Loading