backend/static/style.css
backend/file.db
*.sqlite
-conf.ron
\ No newline at end of file
+conf.ron
+
+*.wasm
+node_modules
+pkg
+package-lock.json
\ No newline at end of file
"ahash",
"bytes",
"bytestring",
- "cfg-if",
+ "cfg-if 1.0.0",
"cookie",
"derive_more",
"encoding_rs",
"jobserver",
]
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
[[package]]
name = "cfg-if"
version = "1.0.0"
"xdg",
]
+[[package]]
+name = "console_error_panic_hook"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
+dependencies = [
+ "cfg-if 1.0.0",
+ "wasm-bindgen",
+]
+
[[package]]
name = "convert_case"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
]
[[package]]
[[package]]
name = "cxx"
-version = "1.0.82"
+version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453"
+checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
dependencies = [
"cc",
"cxxbridge-flags",
[[package]]
name = "cxx-build"
-version = "1.0.82"
+version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0"
+checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
dependencies = [
"cc",
"codespan-reporting",
[[package]]
name = "cxxbridge-flags"
-version = "1.0.82"
+version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71"
+checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.82"
+version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470"
+checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
dependencies = [
"proc-macro2",
"quote",
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
]
[[package]]
"percent-encoding",
]
+[[package]]
+name = "frontend"
+version = "0.1.0"
+dependencies = [
+ "common",
+ "console_error_panic_hook",
+ "wasm-bindgen",
+ "web-sys",
+ "wee_alloc",
+]
+
[[package]]
name = "futures"
version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
"libc",
"wasi 0.11.0+wasi-snapshot-preview1",
]
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
]
[[package]]
[[package]]
name = "libc"
-version = "0.2.137"
+version = "0.2.138"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
[[package]]
name = "libsqlite3-sys"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
]
[[package]]
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+[[package]]
+name = "memory_units"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
+
[[package]]
name = "mime"
version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
"libc",
"redox_syscall",
"smallvec",
[[package]]
name = "pest"
-version = "2.5.0"
+version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f400b0f7905bf702f9f3dc3df5a121b16c54e9e8012c082905fdf09a931861a"
+checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0"
dependencies = [
"thiserror",
"ucd-trie",
[[package]]
name = "pest_derive"
-version = "2.5.0"
+version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "423c2ba011d6e27b02b482a3707c773d19aec65cc024637aec44e19652e66f63"
+checksum = "cdc078600d06ff90d4ed238f0119d84ab5d43dbaad278b0e33a8820293b32344"
dependencies = [
"pest",
"pest_generator",
[[package]]
name = "pest_generator"
-version = "2.5.0"
+version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e64e6c2c85031c02fdbd9e5c72845445ca0a724d419aa0bc068ac620c9935c1"
+checksum = "28a1af60b1c4148bb269006a750cff8e2ea36aff34d2d96cf7be0b14d1bed23c"
dependencies = [
"pest",
"pest_meta",
[[package]]
name = "pest_meta"
-version = "2.5.0"
+version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57959b91f0a133f89a68be874a5c88ed689c19cd729ecdb5d762ebf16c64d662"
+checksum = "fec8605d59fc2ae0c6c1aefc0c7c7a9769732017c0ce07f7a9cfffa7b4404f20"
dependencies = [
"once_cell",
"pest",
[[package]]
name = "quoted_printable"
-version = "0.4.5"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fee2dce59f7a43418e3382c766554c614e06a552d53a8f07ef499ea4b332c0f"
+checksum = "20f14e071918cbeefc5edc986a7aa92c425dae244e003a35e1cdddb5ca39b5cb"
[[package]]
name = "r2d2"
[[package]]
name = "rustix"
-version = "0.36.4"
+version = "0.36.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23"
+checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
dependencies = [
"bitflags",
"errno",
[[package]]
name = "serde"
-version = "1.0.148"
+version = "1.0.149"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc"
+checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.148"
+version = "1.0.149"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c"
+checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4"
dependencies = [
"proc-macro2",
"quote",
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
"cpufeatures",
"digest",
]
[[package]]
name = "syn"
-version = "1.0.104"
+version = "1.0.105"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce"
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
dependencies = [
"proc-macro2",
"quote",
[[package]]
name = "tokio"
-version = "1.22.0"
+version = "1.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3"
+checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
dependencies = [
"autocfg",
"bytes",
"pin-project-lite",
"signal-hook-registry",
"socket2",
- "winapi",
+ "windows-sys",
]
[[package]]
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
"log",
"pin-project-lite",
"tracing-core",
[[package]]
name = "typenum"
-version = "1.15.0"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
[[package]]
name = "ucd-trie"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
"wasm-bindgen-macro",
]
"webpki",
]
+[[package]]
+name = "wee_alloc"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "memory_units",
+ "winapi",
+]
+
[[package]]
name = "winapi"
version = "0.3.9"
\r
members = [\r
"backend",\r
+ "frontend",\r
"common",\r
]\r
\r
# Use cases
## Create a recipe
+
+To create a recipe the user must have an account.
+
+* The user
(A group is automatically created)
## Create a groupe
The toolchain for Raspberry Pi 64 bits is available here: https://gnutoolchains.com/raspberry64/
-
## How to install service on RPI Zero
1. Copy doc/recipes.service to /lib/systemd/system
2. Enabled it: #> systemctl enable recipes
+## Backend
+
+Autoreload: https://actix.rs/docs/autoreload/
+
+### Frontend
+
+## WebAssembly
+
+'frontend' project needs some tools to generate the WebAssembly stuff. Everything is explained here: https://rustwasm.github.io/wasm-bindgen/examples/hello-world.html
+
+To compile run 'wasm-pack build' in 'frontend' directory
+To launch node run 'npm run start' in 'frontend/www' directory
## Useful URLs
* Rust patterns : https://github.com/rust-unofficial/patterns/tree/master/patterns
* Rusqlite (SQLite) : https://docs.rs/rusqlite/0.20.0/rusqlite/
-
-## How to develop
-
-Autoreload: https://actix.rs/docs/autoreload/
+* Node install: https://nodejs.org/en/download/
+* Change all id to i64
* Try using WASM for all the client logic (test on signup page)
* Describe the use cases.
* Define the UI (mockups).
* Two CSS: one for desktop and one for mobile
* Define the logic behind each page and action.
+* Add support to language into db model.
[ok] Check cookie lifetime -> Session by default
[ok] Asynchonous email sending and database requests
INSERT INTO [User] ([id], [email], [name], [password], [creation_datetime], [validation_token])
VALUES (
1,
- 'paul@test.org',
+ 'paul@atreides.com',
'paul',
'$argon2id$v=19$m=4096,t=3,p=1$1vtXcacYjUHZxMrN6b2Xng$wW8Z59MIoMcsIljnjHmxn3EBcc5ymEySZPUVXHlRxcY',
0,
[estimate_time] INTEGER,
[description] TEXT,
[servings] INTEGER DEFAULT 4,
+ [is_published] INTEGER NOT NULL DEFAULT FALSE,
FOREIGN KEY([user_id]) REFERENCES [User]([id]) ON DELETE SET NULL
);
+CREATE TABLE [Image] (
+ [Id] INTEGER PRIMARY KEY,
+ [recipe_id] INTEGER NOT NULL,
+ [name] TEXT,
+ [description] TEXT,
+ [image] BLOB,
+
+ FOREIGN KEY([recipe_id]) REFERENCES [Recipe]([id]) ON DELETE CASCADE
+);
+
CREATE TABLE [RecipeTag] (
[id] INTEGER PRIMARY KEY,
type Result<T> = std::result::Result<T, DBAsyncError>;
impl Connection {
- pub async fn get_all_recipe_titles_async(&self) -> Result<Vec<(i32, String)>> {
+ pub async fn get_all_recipe_titles_async(&self) -> Result<Vec<(i64, String)>> {
let self_copy = self.clone();
web::block(move || { self_copy.get_all_recipe_titles().unwrap_or_default() }).await.map_err(DBAsyncError::from)
}
- pub async fn get_recipe_async(&self, id: i32) -> Result<model::Recipe> {
+ pub async fn get_recipe_async(&self, id: i64) -> Result<model::Recipe> {
let self_copy = self.clone();
combine_errors(web::block(move || { self_copy.get_recipe(id).map_err(DBAsyncError::from) }).await)
}
- pub async fn load_user_async(&self, user_id: i32) -> Result<User> {
+ pub async fn load_user_async(&self, user_id: i64) -> Result<User> {
let self_copy = self.clone();
combine_errors(web::block(move || { self_copy.load_user(user_id).map_err(DBAsyncError::from) }).await)
}
let token_copy = token.to_string();
combine_errors(web::block(move || { self_copy.sign_out(&token_copy).map_err(DBAsyncError::from) }).await)
}
+
+ pub async fn create_recipe_async(&self, user_id: i64) -> Result<i64> {
+ let self_copy = self.clone();
+ combine_errors(web::block(move || { self_copy.create_recipe(user_id).map_err(DBAsyncError::from) }).await)
+ }
+
+ pub async fn set_recipe_title_async(&self, recipe_id: i64, title: &str) -> Result<()> {
+ let self_copy = self.clone();
+ let title_copy = title.to_string();
+ combine_errors(web::block(move || { self_copy.set_recipe_title(recipe_id, &title_copy).map_err(DBAsyncError::from) }).await)
+ }
}
\ No newline at end of file
pub enum ValidationResult {
UnknownUser,
ValidationExpired,
- Ok(String, i32), // Returns token and user id.
+ Ok(String, i64), // Returns token and user id.
}
#[derive(Debug)]
UserNotFound,
WrongPassword,
AccountNotValidated,
- Ok(String, i32), // Returns token and user id.
+ Ok(String, i64), // Returns token and user id.
}
#[derive(Debug)]
pub enum AuthenticationResult {
NotValidToken,
- Ok(i32), // Returns user id.
+ Ok(i64), // Returns user id.
}
#[derive(Clone)]
pub struct Connection {
- //con: rusqlite::Connection
pool: Pool<SqliteConnectionManager>
}
fn create_connection(manager: SqliteConnectionManager) -> Result<Connection> {
let pool = r2d2::Pool::new(manager).unwrap();
let connection = Connection { pool };
- connection.create_or_update()?;
+ connection.create_or_update_db()?;
Ok(connection)
}
/// Called after the connection has been established for creating or updating the database.
/// The 'Version' table tracks the current state of the database.
- fn create_or_update(&self) -> Result<()> {
+ fn create_or_update_db(&self) -> Result<()> {
// Check the Database version.
let mut con = self.pool.get()?;
let tx = con.transaction()?;
}
}
- pub fn get_all_recipe_titles(&self) -> Result<Vec<(i32, String)>> {
+ pub fn get_all_recipe_titles(&self) -> Result<Vec<(i64, String)>> {
let con = self.pool.get()?;
let mut stmt = con.prepare("SELECT [id], [title] FROM [Recipe] ORDER BY [title]")?;
- let titles: std::result::Result<Vec<(i32, String)>, rusqlite::Error> =
+ let titles: std::result::Result<Vec<(i64, String)>, rusqlite::Error> =
stmt.query_map([], |row| {
Ok((row.get("id")?, row.get("title")?))
})?.collect();
Ok(recipes)
} */
- pub fn get_recipe(&self, id: i32) -> Result<model::Recipe> {
+ pub fn get_recipe(&self, id: i64) -> Result<model::Recipe> {
let con = self.pool.get()?;
con.query_row("SELECT [id], [title], [description] FROM [Recipe] WHERE [id] = ?1", [id], |row| {
Ok(model::Recipe::new(row.get("id")?, row.get("title")?, row.get("description")?))
}).map_err(DBError::from)
}
- pub fn load_user(&self, user_id: i32) -> Result<User> {
+ pub fn load_user(&self, user_id: i64) -> Result<User> {
let con = self.pool.get()?;
con.query_row("SELECT [email] FROM [User] WHERE [id] = ?1", [user_id], |r| {
Ok(User {
let tx = con.transaction()?;
let token =
match tx.query_row("SELECT [id], [validation_token] FROM [User] WHERE [email] = ?1", [email], |r| {
- Ok((r.get::<&str, i32>("id")?, r.get::<&str, Option<String>>("validation_token")?))
+ Ok((r.get::<&str, i64>("id")?, r.get::<&str, Option<String>>("validation_token")?))
}).optional()? {
Some((id, validation_token)) => {
if validation_token.is_none() {
let tx = con.transaction()?;
let user_id =
match tx.query_row("SELECT [id], [creation_datetime] FROM [User] WHERE [validation_token] = ?1", [token], |r| {
- Ok((r.get::<&str, i32>("id")?, r.get::<&str, DateTime<Utc>>("creation_datetime")?))
+ Ok((r.get::<&str, i64>("id")?, r.get::<&str, DateTime<Utc>>("creation_datetime")?))
}).optional()? {
Some((id, creation_datetime)) => {
if Utc::now() - creation_datetime > validation_time {
let mut con = self.pool.get()?;
let tx = con.transaction()?;
match tx.query_row("SELECT [id], [password], [validation_token] FROM [User] WHERE [email] = ?1", [email], |r| {
- Ok((r.get::<&str, i32>("id")?, r.get::<&str, String>("password")?, r.get::<&str, Option<String>>("validation_token")?))
+ Ok((r.get::<&str, i64>("id")?, r.get::<&str, String>("password")?, r.get::<&str, Option<String>>("validation_token")?))
}).optional()? {
Some((id, stored_password, validation_token)) => {
if validation_token.is_some() {
let mut con = self.pool.get()?;
let tx = con.transaction()?;
match tx.query_row("SELECT [id], [user_id] FROM [UserLoginToken] WHERE [token] = ?1", [token], |r| {
- Ok((r.get::<&str, i32>("id")?, r.get::<&str, i32>("user_id")?))
+ Ok((r.get::<&str, i64>("id")?, r.get::<&str, i64>("user_id")?))
}).optional()? {
Some((login_id, user_id)) => {
tx.execute("UPDATE [UserLoginToken] SET [last_login_datetime] = ?2, [ip] = ?3, [user_agent] = ?4 WHERE [id] = ?1", params![login_id, Utc::now(), ip, user_agent])?;
let mut con = self.pool.get()?;
let tx = con.transaction()?;
match tx.query_row("SELECT [id] FROM [UserLoginToken] WHERE [token] = ?1", [token], |r| {
- Ok(r.get::<&str, i32>("id")?)
+ Ok(r.get::<&str, i64>("id")?)
}).optional()? {
Some(login_id) => {
tx.execute("DELETE FROM [UserLoginToken] WHERE [id] = ?1", params![login_id])?;
Ok(())
}
+ pub fn create_recipe(&self, user_id: i64) -> Result<i64> {
+ let con = self.pool.get()?;
+
+ // Verify if an empty recipe already exists. Returns its id if one exists.
+ match con.query_row(
+ "SELECT [Recipe].[id] FROM [Recipe]
+ INNER JOIN [Image] ON [Image].[recipe_id] = [Recipe].[id]
+ INNER JOIN [Group] ON [Group].[recipe_id] = [Recipe].[id]
+ WHERE [Recipe].[user_id] = ?1 AND [Recipe].[estimate_time] = NULL AND [Recipe].[description] = NULL",
+ [user_id],
+ |r| {
+ Ok(r.get::<&str, i64>("id")?)
+ }
+ ).optional()? {
+ Some(recipe_id) => Ok(recipe_id),
+ None => {
+ con.execute("INSERT INTO [Recipe] ([user_id], [title]) VALUES (?1, '')", [user_id])?;
+ Ok(con.last_insert_rowid())
+ },
+ }
+ }
+
+ pub fn set_recipe_title(&self, recipe_id: i64, title: &str) -> Result<()> {
+ let con = self.pool.get()?;
+ con.execute("UPDATE [Recipe] SET [title] = ?2 WHERE [id] = ?1", params![recipe_id, title]).map(|_n| ()).map_err(DBError::from)
+ }
+
/// Execute a given SQL file.
pub fn execute_file<P: AsRef<Path> + fmt::Display>(&self, file: P) -> Result<()> {
let con = self.pool.get()?;
}
// Return the token.
- fn create_login_token(tx: &rusqlite::Transaction, user_id: i32, ip: &str, user_agent: &str) -> Result<String> {
+ fn create_login_token(tx: &rusqlite::Transaction, user_id: i64, ip: &str, user_agent: &str) -> Result<String> {
let token = generate_token();
tx.execute("INSERT INTO [UserLoginToken] ([user_id], [last_login_datetime], [token], [ip], [user_agent]) VALUES (?1, ?2, ?3, ?4, ?5)", params![user_id, Utc::now(), token, ip, user_agent])?;
Ok(token)
#[cfg(test)]
mod tests {
use super::*;
+ use rusqlite::{Error, ErrorCode, ffi, types::Value};
#[test]
fn sign_up() -> Result<()> {
Ok(())
}
+
+
+ #[test]
+ fn create_a_new_recipe_then_update_its_title() -> Result<()> {
+ let connection = Connection::new_in_memory()?;
+
+ connection.execute_sql(
+ "INSERT INTO [User] ([id], [email], [name], [password], [creation_datetime], [validation_token]) VALUES (?1, ?2, ?3, ?4, ?5, ?6)",
+ params![
+ 1,
+ "paul@atreides.com",
+ "paul",
+ "$argon2id$v=19$m=4096,t=3,p=1$G4fjepS05MkRbTqEImUdYg$GGziE8uVQe1L1oFHk37lBno10g4VISnVqynSkLCH3Lc",
+ "2022-11-29 22:05:04.121407300+00:00",
+ Value::Null,
+ ]
+ )?;
+
+ match connection.create_recipe(2) {
+ Err(DBError::SqliteError(Error::SqliteFailure(ffi::Error { code: ErrorCode::ConstraintViolation, extended_code: _ }, Some(_)))) => (), // Nominal case.
+ other => panic!("Creating a recipe with an inexistant user must fail: {:?}", other),
+ }
+
+ let recipe_id = connection.create_recipe(1)?;
+ assert_eq!(recipe_id, 1);
+
+ connection.set_recipe_title(recipe_id, "Crêpe")?;
+
+ let recipe = connection.get_recipe(recipe_id)?;
+ assert_eq!(recipe.title, "Crêpe".to_string());
+
+ Ok(())
+ }
}
pub struct Recipe {\r
- pub id: i32,\r
+ pub id: i64,\r
pub title: String,\r
pub description: Option<String>,\r
pub estimate_time: Option<i32>, // [min].\r
}\r
\r
impl Recipe {\r
- pub fn new(id: i32, title: String, description: Option<String>) -> Recipe {\r
+ pub fn new(id: i64, title: String, description: Option<String>) -> Recipe {\r
Recipe {\r
id,\r
title,\r
use crate::model;
use crate::data::{db, asynchronous};
+mod api;
+
///// UTILS /////
fn get_ip_and_user_agent(req: &HttpRequest) -> (String, String) {
#[template(path = "home.html")]
struct HomeTemplate {
user: Option<User>,
- recipes: Vec<(i32, String)>,
- current_recipe_id: Option<i32>,
+ recipes: Vec<(i64, String)>,
+ current_recipe_id: Option<i64>,
}
#[get("/")]
#[template(path = "view_recipe.html")]
struct ViewRecipeTemplate {
user: Option<User>,
- recipes: Vec<(i32, String)>,
- current_recipe_id: Option<i32>,
+ recipes: Vec<(i64, String)>,
+ current_recipe_id: Option<i64>,
current_recipe: model::Recipe,
}
#[get("/recipe/view/{id}")]
-pub async fn view_recipe(req: HttpRequest, path: web::Path<(i32,)>, connection: web::Data<db::Connection>) -> Result<HttpResponse> {
+pub async fn view_recipe(req: HttpRequest, path: web::Path<(i64,)>, connection: web::Data<db::Connection>) -> Result<HttpResponse> {
let (id,)= path.into_inner();
let user = get_current_user(&req, connection.clone()).await;
let recipes = connection.get_all_recipe_titles_async().await?;
Ok(db::SignUpResult::UserCreatedWaitingForValidation(token)) => {
let url = {
let host = req.headers().get(header::HOST).map(|v| v.to_str().unwrap_or_default()).unwrap_or_default();
- let port: Option<i32> = 'p: {
+ let port: Option<u16> = 'p: {
let split_port: Vec<&str> = host.split(':').collect();
if split_port.len() == 2 {
- if let Ok(p) = split_port[1].parse::<i32>() {
+ if let Ok(p) = split_port[1].parse::<u16>() {
break 'p Some(p)
}
}
--- /dev/null
+use actix_web::{http::{header, header::ContentType, StatusCode}, get, post, put, web, Responder, HttpRequest, HttpResponse, cookie::Cookie};
+use chrono::Duration;
+use serde::Deserialize;
+use log::{debug, error, log_enabled, info, Level};
+
+use super::Result;
+use crate::utils;
+use crate::consts;
+use crate::config::Config;
+use crate::user::User;
+use crate::model;
+use crate::data::{db, asynchronous};
+
+#[put("/ron-api/set-title")]
+pub async fn set_title(req: HttpRequest, connection: web::Data<db::Connection>) -> Result<HttpResponse> {
+ //req.app_config()
+ let id = 1;
+ let title = "XYZ".to_string();
+
+ //let recipes = connection.set_recipe_title_async(id, title).await?;
+
+ Ok(
+ HttpResponse::Ok()
+ .content_type("application/ron")
+ .body("DATA")
+ )
+}
\ No newline at end of file
--- /dev/null
+
+let wasm;
+
+const cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
+
+cachedTextDecoder.decode();
+
+let cachedUint8Memory0 = new Uint8Array();
+
+function getUint8Memory0() {
+ if (cachedUint8Memory0.byteLength === 0) {
+ cachedUint8Memory0 = new Uint8Array(wasm.memory.buffer);
+ }
+ return cachedUint8Memory0;
+}
+
+function getStringFromWasm0(ptr, len) {
+ return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
+}
+
+const heap = new Array(32).fill(undefined);
+
+heap.push(undefined, null, true, false);
+
+let heap_next = heap.length;
+
+function addHeapObject(obj) {
+ if (heap_next === heap.length) heap.push(heap.length + 1);
+ const idx = heap_next;
+ heap_next = heap[idx];
+
+ heap[idx] = obj;
+ return idx;
+}
+
+function getObject(idx) { return heap[idx]; }
+
+function dropObject(idx) {
+ if (idx < 36) return;
+ heap[idx] = heap_next;
+ heap_next = idx;
+}
+
+function takeObject(idx) {
+ const ret = getObject(idx);
+ dropObject(idx);
+ return ret;
+}
+
+let WASM_VECTOR_LEN = 0;
+
+const cachedTextEncoder = new TextEncoder('utf-8');
+
+const encodeString = (typeof cachedTextEncoder.encodeInto === 'function'
+ ? function (arg, view) {
+ return cachedTextEncoder.encodeInto(arg, view);
+}
+ : function (arg, view) {
+ const buf = cachedTextEncoder.encode(arg);
+ view.set(buf);
+ return {
+ read: arg.length,
+ written: buf.length
+ };
+});
+
+function passStringToWasm0(arg, malloc, realloc) {
+
+ if (realloc === undefined) {
+ const buf = cachedTextEncoder.encode(arg);
+ const ptr = malloc(buf.length);
+ getUint8Memory0().subarray(ptr, ptr + buf.length).set(buf);
+ WASM_VECTOR_LEN = buf.length;
+ return ptr;
+ }
+
+ let len = arg.length;
+ let ptr = malloc(len);
+
+ const mem = getUint8Memory0();
+
+ let offset = 0;
+
+ for (; offset < len; offset++) {
+ const code = arg.charCodeAt(offset);
+ if (code > 0x7F) break;
+ mem[ptr + offset] = code;
+ }
+
+ if (offset !== len) {
+ if (offset !== 0) {
+ arg = arg.slice(offset);
+ }
+ ptr = realloc(ptr, len, len = offset + arg.length * 3);
+ const view = getUint8Memory0().subarray(ptr + offset, ptr + len);
+ const ret = encodeString(arg, view);
+
+ offset += ret.written;
+ }
+
+ WASM_VECTOR_LEN = offset;
+ return ptr;
+}
+/**
+* @param {string} name
+*/
+export function greet(name) {
+ const ptr0 = passStringToWasm0(name, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+ const len0 = WASM_VECTOR_LEN;
+ wasm.greet(ptr0, len0);
+}
+
+/**
+*/
+export function main() {
+ wasm.main();
+}
+
+function handleError(f, args) {
+ try {
+ return f.apply(this, args);
+ } catch (e) {
+ wasm.__wbindgen_export_2(addHeapObject(e));
+ }
+}
+
+function isLikeNone(x) {
+ return x === undefined || x === null;
+}
+
+async function load(module, imports) {
+ if (typeof Response === 'function' && module instanceof Response) {
+ if (typeof WebAssembly.instantiateStreaming === 'function') {
+ try {
+ return await WebAssembly.instantiateStreaming(module, imports);
+
+ } catch (e) {
+ if (module.headers.get('Content-Type') != 'application/wasm') {
+ console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
+
+ } else {
+ throw e;
+ }
+ }
+ }
+
+ const bytes = await module.arrayBuffer();
+ return await WebAssembly.instantiate(bytes, imports);
+
+ } else {
+ const instance = await WebAssembly.instantiate(module, imports);
+
+ if (instance instanceof WebAssembly.Instance) {
+ return { instance, module };
+
+ } else {
+ return instance;
+ }
+ }
+}
+
+function getImports() {
+ const imports = {};
+ imports.wbg = {};
+ imports.wbg.__wbg_alert_02b82f812a9453a9 = function(arg0, arg1) {
+ alert(getStringFromWasm0(arg0, arg1));
+ };
+ imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
+ const ret = getStringFromWasm0(arg0, arg1);
+ return addHeapObject(ret);
+ };
+ imports.wbg.__wbg_log_4b5638ad60bdc54a = function(arg0) {
+ console.log(getObject(arg0));
+ };
+ imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
+ takeObject(arg0);
+ };
+ imports.wbg.__wbg_self_6d479506f72c6a71 = function() { return handleError(function () {
+ const ret = self.self;
+ return addHeapObject(ret);
+ }, arguments) };
+ imports.wbg.__wbg_window_f2557cc78490aceb = function() { return handleError(function () {
+ const ret = window.window;
+ return addHeapObject(ret);
+ }, arguments) };
+ imports.wbg.__wbg_globalThis_7f206bda628d5286 = function() { return handleError(function () {
+ const ret = globalThis.globalThis;
+ return addHeapObject(ret);
+ }, arguments) };
+ imports.wbg.__wbg_global_ba75c50d1cf384f4 = function() { return handleError(function () {
+ const ret = global.global;
+ return addHeapObject(ret);
+ }, arguments) };
+ imports.wbg.__wbindgen_is_undefined = function(arg0) {
+ const ret = getObject(arg0) === undefined;
+ return ret;
+ };
+ imports.wbg.__wbg_newnoargs_b5b063fc6c2f0376 = function(arg0, arg1) {
+ const ret = new Function(getStringFromWasm0(arg0, arg1));
+ return addHeapObject(ret);
+ };
+ imports.wbg.__wbg_call_97ae9d8645dc388b = function() { return handleError(function (arg0, arg1) {
+ const ret = getObject(arg0).call(getObject(arg1));
+ return addHeapObject(ret);
+ }, arguments) };
+ imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
+ const ret = getObject(arg0);
+ return addHeapObject(ret);
+ };
+ imports.wbg.__wbg_instanceof_Window_acc97ff9f5d2c7b4 = function(arg0) {
+ let result;
+ try {
+ result = getObject(arg0) instanceof Window;
+ } catch {
+ result = false;
+ }
+ const ret = result;
+ return ret;
+ };
+ imports.wbg.__wbg_document_3ead31dbcad65886 = function(arg0) {
+ const ret = getObject(arg0).document;
+ return isLikeNone(ret) ? 0 : addHeapObject(ret);
+ };
+ imports.wbg.__wbg_body_3cb4b4042b9a632b = function(arg0) {
+ const ret = getObject(arg0).body;
+ return isLikeNone(ret) ? 0 : addHeapObject(ret);
+ };
+ imports.wbg.__wbg_createElement_976dbb84fe1661b5 = function() { return handleError(function (arg0, arg1, arg2) {
+ const ret = getObject(arg0).createElement(getStringFromWasm0(arg1, arg2));
+ return addHeapObject(ret);
+ }, arguments) };
+ imports.wbg.__wbg_setinnerHTML_32081d8a164e6dc4 = function(arg0, arg1, arg2) {
+ getObject(arg0).innerHTML = getStringFromWasm0(arg1, arg2);
+ };
+ imports.wbg.__wbg_appendChild_e513ef0e5098dfdd = function() { return handleError(function (arg0, arg1) {
+ const ret = getObject(arg0).appendChild(getObject(arg1));
+ return addHeapObject(ret);
+ }, arguments) };
+ imports.wbg.__wbindgen_throw = function(arg0, arg1) {
+ throw new Error(getStringFromWasm0(arg0, arg1));
+ };
+ imports.wbg.__wbindgen_rethrow = function(arg0) {
+ throw takeObject(arg0);
+ };
+
+ return imports;
+}
+
+function initMemory(imports, maybe_memory) {
+
+}
+
+function finalizeInit(instance, module) {
+ wasm = instance.exports;
+ init.__wbindgen_wasm_module = module;
+ cachedUint8Memory0 = new Uint8Array();
+
+ wasm.__wbindgen_start();
+ return wasm;
+}
+
+function initSync(module) {
+ const imports = getImports();
+
+ initMemory(imports);
+
+ if (!(module instanceof WebAssembly.Module)) {
+ module = new WebAssembly.Module(module);
+ }
+
+ const instance = new WebAssembly.Instance(module, imports);
+
+ return finalizeInit(instance, module);
+}
+
+async function init(input) {
+ if (typeof input === 'undefined') {
+ input = new URL('frontend_bg.wasm', import.meta.url);
+ }
+ const imports = getImports();
+
+ if (typeof input === 'string' || (typeof Request === 'function' && input instanceof Request) || (typeof URL === 'function' && input instanceof URL)) {
+ input = fetch(input);
+ }
+
+ initMemory(imports);
+
+ const { instance, module } = await load(await input, imports);
+
+ return finalizeInit(instance, module);
+}
+
+export { initSync }
+export default init;
background-color: $background;
margin: 0px;
+ .recipe-item {
+ padding: 4px;
+ }
+
+ .recipe-item-current {
+ padding: 3px;
+ border: 1px solid white;
+ }
+
/*
.header-container {
</head>
<body>
+ <script type="module">
+ import init from '/static/frontend.js';
+ async function run() {
+ await init();
+ }
+ run();
+ </script>
+
{% block body_container %}{% endblock %}
<div class="footer-container">gburri - 2022</div>
</body>
{% block body_container %}
<div class="header-container">
- <h1><a href="/">~~ Recettes de cuisine ~~</a></h1>
+ <a class="title" href="/">~~ Recettes de cuisine ~~</a>
+
+ <span class="create-recipe">Create a new recipe</span>
+
{% match user %}
{% when Some with (user) %}
- <div>{{ user.email }} / <a href="/signout" />Sign out</a></div>
+ <span>{{ user.email }} / <a href="/signout" />Sign out</a></span>
{% when None %}
- <div><a href="/signin" >Sign in</a> / <a href="/signup">Sign up</a></div>
+ <span><a href="/signin" >Sign in</a> / <a href="/signup">Sign up</a></span>
{% endmatch %}
+
</div>
<div class="main-container">
{% block main_container %}{% endblock %}
{% extends "base_with_header.html" %}
+{% macro recipe_item(id, title, class) %}
+<a href="/recipe/view/{{ id }}" class="{{ class }}">{{ title }}</a>
+{% endmacro %}
+
{% block main_container %}
<div class="list">
<ul>
{% for (id, title) in recipes %}
<li>
- {% let item_html = "<a href=\"/recipe/view/{}\">{}</a>"|format(id, title) %}
{% match current_recipe_id %}
{# Don't know how to avoid repetition: comparing (using '==' or .eq()) current_recipe_id.unwrap() and id doesn't work. Guards for match don't exist.
See: https://github.com/djc/askama/issues/752 #}
{% when Some (current_id) %}
{% if current_id == id %}
- [{{ item_html|escape("none") }}]
+ {% call recipe_item(id, title, "recipe-item-current") %}
{% else %}
- {{ item_html|escape("none") }}
+ {% call recipe_item(id, title, "recipe-item") %}
{% endif %}
{% when None %}
- {{ item_html|escape("none") }}
+ {% call recipe_item(id, title, "recipe-item") %}
{% endmatch %}
</li>
{% endfor %}
--- /dev/null
+[package]
+name = "frontend"
+version = "0.1.0"
+authors = ["Greg Burri <greg.burri@gmail.com>"]
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib"]
+
+[features]
+default = ["console_error_panic_hook"]
+
+[dependencies]
+common = {path = "../common"}
+
+wasm-bindgen = "0.2"
+web-sys = { version = "0.3", features = ['console', 'Document', 'Element', 'HtmlElement', 'Node', 'Window'] }
+
+# The `console_error_panic_hook` crate provides better debugging of panics by
+# logging them with `console.error`. This is great for development, but requires
+# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
+# code size when deploying.
+console_error_panic_hook = { version = "0.1", optional = true }
+
+# `wee_alloc` is a tiny allocator for wasm that is only ~1K in code size
+# compared to the default allocator's ~10K. It is slower than the default
+# allocator, however.
+wee_alloc = { version = "0.4", optional = true }
+
+# [dev-dependencies]
+# wasm-bindgen-test = "0.3"
+
+[profile.release]
+# Tell `rustc` to optimize for small code size.
+opt-level = "s"
+lto = true
+
+[package.metadata.wasm-pack.profile.release]
+wasm-opt = false
\ No newline at end of file
--- /dev/null
+wasm-pack build --target web
+cp pkg/frontend.js ../backend/static
+cp pkg/frontend_bg.wasm ../backend/static
\ No newline at end of file
--- /dev/null
+// Note that a dynamic `import` statement here is required due to
+// webpack/webpack#6615, but in theory `import { greet } from './pkg';`
+// will work here one day as well!
+const rust = import('./pkg');
+
+rust
+ .then(m => m.greet('Paul!'))
+ .catch(console.error);
\ No newline at end of file
--- /dev/null
+{
+ "scripts": {
+ "build": "webpack",
+ "serve": "webpack serve"
+ },
+ "devDependencies": {
+ "@wasm-tool/wasm-pack-plugin": "1.5.0",
+ "html-webpack-plugin": "^5.3.2",
+ "text-encoding": "^0.7.0",
+ "webpack": "^5.75.0",
+ "webpack-cli": "^4.10.0",
+ "webpack-dev-server": "^3.11.2"
+ }
+}
--- /dev/null
+mod utils;
+
+use wasm_bindgen::prelude::*;
+use web_sys::console;
+
+// When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
+// allocator.
+#[cfg(feature = "wee_alloc")]
+#[global_allocator]
+static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
+
+#[wasm_bindgen]
+extern {
+ fn alert(s: &str);
+}
+
+#[wasm_bindgen]
+pub fn greet(name: &str) {
+ alert(&format!("Hello, {}!", name));
+ console::log_1(&"Hello bg".into());
+}
+
+#[wasm_bindgen(start)]
+pub fn main() -> Result<(), JsValue> {
+ let window = web_sys::window().expect("no global `window` exists");
+ let document = window.document().expect("should have a document on window");
+ let body = document.body().expect("document should have a body");
+
+ let val = document.create_element("p")?;
+ val.set_inner_html("Hello from Rust!");
+
+ body.append_child(&val)?;
+
+ Ok(())
+}
\ No newline at end of file
--- /dev/null
+pub fn set_panic_hook() {
+ // When the `console_error_panic_hook` feature is enabled, we can call the
+ // `set_panic_hook` function at least once during initialization, and then
+ // we will get better error messages if our code ever panics.
+ //
+ // For more details see
+ // https://github.com/rustwasm/console_error_panic_hook#readme
+ #[cfg(feature = "console_error_panic_hook")]
+ console_error_panic_hook::set_once();
+}
--- /dev/null
+npm run serve
\ No newline at end of file
--- /dev/null
+//! Test suite for the Web and headless browsers.
+
+#![cfg(target_arch = "wasm32")]
+
+extern crate wasm_bindgen_test;
+use wasm_bindgen_test::*;
+
+wasm_bindgen_test_configure!(run_in_browser);
+
+#[wasm_bindgen_test]
+fn pass() {
+ assert_eq!(1 + 1, 2);
+}
--- /dev/null
+const path = require('path');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const webpack = require('webpack');
+const WasmPackPlugin = require("@wasm-tool/wasm-pack-plugin");
+
+module.exports = {
+ entry: './index.js',
+ output: {
+ path: path.resolve(__dirname, 'dist'),
+ filename: 'index.js',
+ },
+ plugins: [
+ new HtmlWebpackPlugin(),
+ new WasmPackPlugin({
+ crateDirectory: path.resolve(__dirname, ".")
+ }),
+ // Have this example work in Edge which doesn't ship `TextEncoder` or
+ // `TextDecoder` at this time.
+ new webpack.ProvidePlugin({
+ TextDecoder: ['text-encoding', 'TextDecoder'],
+ TextEncoder: ['text-encoding', 'TextEncoder']
+ })
+ ],
+ mode: 'development',
+ experiments: {
+ asyncWebAssembly: true
+ }
+};
\ No newline at end of file
projects / recipes.git / commitdiff