diff --git a/.gitignore b/.gitignore index d0db3e4..fa3dd2a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ todo.org node_modules static/scripts/dist static/templates/* +generated/ diff --git a/Rocket.toml b/Rocket.toml index 4fdf2a0..a0c647a 100644 --- a/Rocket.toml +++ b/Rocket.toml @@ -1,5 +1,5 @@ [default] -template_dir = "static/templates/" +template_dir = "generated/templates/" [development] address = "localhost" diff --git a/package.json b/package.json index 1e58c75..f550315 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "webpack-dev": "cd static/scripts && webpack serve --watch --inline --port 8081 --host 0.0.0.0 --output-path=./build", + "webpack-dev": "webpack serve --watch --inline --port 8081 --host 0.0.0.0 --output-path=./build", "build:protobuf": "mkdir -p src/frontend/_proto && protoc --plugin=protoc-gen-ts=./node_modules/.bin/protoc-gen-ts -I ./proto --js_out=import_style=commonjs,binary:./src/frontend/_proto --ts_out=service=grpc-web:./src/frontend/_proto ./proto/*.proto", "build:webpack": "webpack" }, diff --git a/src/main.rs b/src/main.rs index 4c90547..9549ffc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -43,7 +43,7 @@ async fn make_rocket(database: sqlx::SqlitePool) -> Result<(), Box