Skip to content

Use Spaxum crate #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marlonbaeten merged 9 commits into from
Apr 15, 2025
Merged

Use Spaxum crate #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f87f77a
WIP spaxum
marlonbaeten Feb 28, 2025
9b1d8c3
Spaxum + Preact
marlonbaeten Mar 1, 2025
4b0bc05
leanup
marlonbaeten Mar 1, 2025
591e347
ve from yarn to npm
marlonbaeten Mar 1, 2025
392c58a
Format
marlonbaeten Mar 1, 2025
7aefcf3
Do not start frontend for test app
marlonbaeten Mar 1, 2025
1fb3b17
Format
marlonbaeten Mar 1, 2025
7b66222
Fix test path
marlonbaeten Mar 1, 2025
bdaca73
Format
marlonbaeten Mar 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@ jobs:
# build frontend
- uses: actions/setup-node@v4
with:
node-version: 20
cache: yarn
cache-dependency-path: frontend/yarn.lock
- run: |-
yarn install --frozen-lockfile
yarn build
node-version: 22
cache-dependency-path: frontend/package-lock.lock
- run: npm ci
working-directory: frontend

# build backend
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/target
target/
/.vscode
bin
!bin/.gitkeep
.env
.env
config-local.toml
69 changes: 45 additions & 24 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "etes"
version = "0.2.0"
edition = "2021"
edition = "2024"

[dependencies]
anyhow = "1.0"
Expand All @@ -17,7 +17,6 @@ cookie = "0.18.1"
futures = "0.3.31"
hyper = { version = "1.0", features = ["full"] }
hyper-util = { version = "0.1", features = ["client-legacy"] }
memory-serve = "1.0.0"
oauth2 = "4.4.2"
parking_lot = "0.12"
rand = "0.8.5"
Expand All @@ -35,6 +34,10 @@ tokio-util = "0.7.12"
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
url = "2.5.4"
spaxum = { git = "https://github.com/tweedegolf/spaxum.git" }

[build-dependencies]
spaxum = { git = "https://github.com/tweedegolf/spaxum.git" }

[dev-dependencies]
tower = "0.5.1"
Expand Down
3 changes: 3 additions & 0 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fn main() {
spaxum::bundle("./frontend/src/main.tsx");
}
2 changes: 1 addition & 1 deletion config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ authorize_url = "https://example.com/etes/authorize"
admins = ["example"]
api_key = "more-secret-than-this"
session_key = "more-entropy-than-this"
command_args = ["--port", "{port}"]
command_args = ["{port}"]
favicon = "🙂"
words = ['foo', 'bar', 'baz']
21 changes: 9 additions & 12 deletions frontend/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon"
href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>{favicon}</text></svg>" />
<title>{title}</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>%TITLE%</title>
<link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>%FAVICON%</text></svg>" />
<link rel="stylesheet" href="/static/%STYLESHEET%">
</head>

<body>
<div id="app"></div>
<script type="module" src="/src/main.tsx"></script>
<div id="root"></div>
<script src="/static/%SCRIPT%"></script>
</body>

</html>
</html>
Loading
Loading