WIP

cot-rs · Aug 8, 2024 · 4003894 · 4003894
1 parent bd6ae75
commit 4003894
Show file tree

Hide file tree

Showing 20 changed files with 1,045 additions and 100 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,6 +7,7 @@ members = [
     "flareon-orm",
     # Examples
     "examples/hello-world",
+    "examples/todo-list",
 ]
 resolver = "2"
 
@@ -15,13 +16,17 @@ edition = "2021"
 license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]
+askama = "0.12.1"
 async-trait = "0.1.80"
 axum = "0.7.5"
 bytes = "1.6.1"
 chrono = { version = "0.4.38", features = ["serde"] }
 clap = { version = "4.5.8", features = ["derive", "env"] }
 derive_builder = "0.20.0"
 env_logger = "0.11.3"
+flareon = { path = "flareon" }
+flareon_macros = { path = "flareon-macros" }
+form_urlencoded = "1.2.1"
 indexmap = "2.2.6"
 itertools = "0.13.0"
 log = "0.4.22"

diff --git a/examples/hello-world/src/main.rs b/examples/hello-world/src/main.rs
@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
-use flareon::prelude::{
-    Body, Error, FlareonApp, FlareonProject, Request, Response, Route, StatusCode,
-};
+use flareon::prelude::{Body, Error, FlareonApp, FlareonProject, Response, StatusCode};
+use flareon::request::Request;
+use flareon::router::Route;
 
 fn return_hello(_request: Request) -> Result<Response, Error> {
     Ok(Response::new_html(

diff --git a/examples/todo-list/Cargo.toml b/examples/todo-list/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "example-todo-list"
+version = "0.1.0"
+publish = false
+description = "TODO List - Flareon example."
+edition = "2021"
+
+[dependencies]
+askama = "0.12.1"
+flareon = { path = "../../flareon" }
+tokio = { version = "1.38.0", features = ["macros", "rt-multi-thread"] }
+env_logger = "0.11.5"
diff --git a/examples/todo-list/src/main.rs b/examples/todo-list/src/main.rs
@@ -0,0 +1,77 @@
+use std::sync::Arc;
+
+use askama::Template;
+use flareon::forms::{AsFormField, CharField, Form, FormField};
+use flareon::prelude::{Body, Error, FlareonApp, FlareonProject, Response, Route, StatusCode};
+use flareon::request::Request;
+
+#[derive(Debug)]
+struct TodoItem {
+    id: u32,
+    title: String,
+}
+
+#[derive(Debug, Template)]
+#[template(path = "index.html")]
+struct IndexTemplate {
+    todo_items: Vec<TodoItem>,
+}
+
+async fn index(_request: Request) -> Result<Response, Error> {
+    let index_template = IndexTemplate {
+        todo_items: vec![
+            TodoItem {
+                id: 1,
+                title: "Buy milk".to_string(),
+            },
+            TodoItem {
+                id: 2,
+                title: "Buy eggs".to_string(),
+            },
+        ],
+    };
+    let rendered = index_template.render().unwrap();
+
+    Ok(Response::new_html(
+        StatusCode::OK,
+        Body::fixed(rendered.as_bytes().to_vec()),
+    ))
+}
+
+#[derive(Debug, Form)]
+struct TodoForm {
+    title: String,
+}
+
+async fn add_todo(mut request: Request) -> Result<Response, Error> {
+    let todo_form = TodoForm::from_request(&mut request).await.unwrap();
+
+    println!("todo_form: {:?}", todo_form);
+
+    // TODO add to global list
+
+    Ok(Response::new_html(
+        StatusCode::OK,
+        Body::fixed("redirect is not implemented yet".as_bytes().to_vec()),
+    ))
+}
+
+#[tokio::main]
+async fn main() {
+    env_logger::init();
+
+    let todo_app = FlareonApp::builder()
+        .urls([
+            Route::with_handler("/", Arc::new(Box::new(index))),
+            Route::with_handler("/add", Arc::new(Box::new(add_todo))),
+        ])
+        .build()
+        .unwrap();
+
+    let todo_project = FlareonProject::builder()
+        .register_app_with_views(todo_app, "")
+        .build()
+        .unwrap();
+
+    flareon::run(todo_project, "127.0.0.1:8000").await.unwrap();
+}
diff --git a/examples/todo-list/templates/index.html b/examples/todo-list/templates/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>TODO List</title>
+</head>
+<body>
+<h1>TODO List</h1>
+<form id="todo-form" action="/add" method="post">
+    <input type="text" id="title" name="title" placeholder="Enter a new TODO" required>
+    <button type="submit">Add TODO</button>
+</form>
+<ul id="todo-list">
+    {% for todo in todo_items %}
+    <li>
+        <span>{{ todo.title }}</span>
+        <button onclick="removeTodoItem(this)">Remove</button>
+    </li>
+    {% endfor %}
+</ul>
+</body>
+</html>
diff --git a/flareon-macros/Cargo.toml b/flareon-macros/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "flareon-macros"
+name = "flareon_macros"
 version = "0.1.0"
 edition.workspace = true
 license.workspace = true
@@ -8,4 +8,19 @@ description = "Modern web framework focused on speed and ease of use - macros."
 [lib]
 proc-macro = true
 
+[[test]]
+name = "tests"
+path = "tests/compile_tests.rs"
+
 [dependencies]
+darling = "0.20.10"
+proc-macro-crate = "3.1.0"
+proc-macro2 = "1.0.86"
+proc-macro2-diagnostics = "0.10.1"
+quote = "1.0.36"
+syn = { version = "2.0.72", features = ["full"] }
+
+[dev-dependencies]
+flareon.workspace = true
+serde.workspace = true
+trybuild = { version = "1.0.99", features = ["diff"] }