First version
This commit is contained in:
16
README.md
Normal file
16
README.md
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
# CalFlow
|
||||||
|
A simple calorie tracking app
|
||||||
|
|
||||||
|
## Development Setup
|
||||||
|
### DB
|
||||||
|
Start the corresponding docker-compose file to run a temporary postgres instance.
|
||||||
|
|
||||||
|
To inspect the DB state directly `docker compose exec pg psql -U postgres test`
|
||||||
|
|
||||||
|
### Backend
|
||||||
|
Go into the backend folder and run it using `cargo run`
|
||||||
|
|
||||||
|
### Frontend
|
||||||
|
1. Start a node environment using docker (`docker run -it -v $(pwd):/mnt/calflow --net=host node:25 /bin/bash`)
|
||||||
|
2. Go into the frontend folder (`cd /mnt/calflow/frontend`)
|
||||||
|
3. Start the dev server (`npm run dev -- --host`)
|
||||||
1
backend/.gitignore
vendored
Normal file
1
backend/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
target/
|
||||||
1995
backend/Cargo.lock
generated
Normal file
1995
backend/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
16
backend/Cargo.toml
Normal file
16
backend/Cargo.toml
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
[package]
|
||||||
|
name = "backend"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
axum = { version = "0.8.7" }
|
||||||
|
tokio = { version = "1.48.0", features = ["rt", "net"] }
|
||||||
|
tracing = { version = "0.1.43" }
|
||||||
|
tracing-subscriber = { version = "0.3.22", features = ["json"] }
|
||||||
|
|
||||||
|
sqlx = { version = "0.8.6", features = ["runtime-tokio", "postgres", "sqlite"] }
|
||||||
|
serde_json = "1.0.145"
|
||||||
|
serde = { version = "1.0.228", features = ["derive"] }
|
||||||
|
tower = "0.5.2"
|
||||||
|
tower-http = { version = "0.6.7", features = ["cors"] }
|
||||||
39
backend/migrations/1_initial.sql
Normal file
39
backend/migrations/1_initial.sql
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
CREATE TABLE IF NOT EXISTS units (
|
||||||
|
id BIGSERIAL PRIMARY KEY,
|
||||||
|
name VARCHAR(255),
|
||||||
|
short VARCHAR(255),
|
||||||
|
UNIQUE(name),
|
||||||
|
UNIQUE(short)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS food (
|
||||||
|
id BIGSERIAL PRIMARY KEY,
|
||||||
|
version BIGINT,
|
||||||
|
name VARCHAR(255),
|
||||||
|
unit_id BIGINT REFERENCES units(id),
|
||||||
|
UNIQUE(name, version)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS nutritional_kind (
|
||||||
|
id BIGSERIAL PRIMARY KEY,
|
||||||
|
name VARCHAR(255),
|
||||||
|
unit_id BIGINT REFERENCES units(id),
|
||||||
|
UNIQUE (name)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS food_base (
|
||||||
|
food_id BIGINT REFERENCES food(id),
|
||||||
|
kind_id BIGINT REFERENCES nutritional_kind(id),
|
||||||
|
value FLOAT,
|
||||||
|
PRIMARY KEY (food_id, kind_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
INSERT INTO units(name, short) VALUES('Gram', 'g');
|
||||||
|
INSERT INTO units(name, short) VALUES('Milliliter', 'ml');
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS tracking (
|
||||||
|
id BIGSERIAL PRIMARY KEY,
|
||||||
|
food_id BIGINT REFERENCES food(id),
|
||||||
|
quantity FLOAT,
|
||||||
|
ts BIGINT
|
||||||
|
);
|
||||||
312
backend/src/lib.rs
Normal file
312
backend/src/lib.rs
Normal file
@@ -0,0 +1,312 @@
|
|||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
struct SharedState {
|
||||||
|
db: sqlx::postgres::PgPool,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn app(db: sqlx::postgres::PgPool) -> axum::Router {
|
||||||
|
axum::Router::new()
|
||||||
|
.nest("/food", food::router())
|
||||||
|
.nest("/units", units::router())
|
||||||
|
.nest("/nutrition", nutrition::router())
|
||||||
|
.nest("/tracking", tracking::router())
|
||||||
|
.layer(tower::ServiceBuilder::new().layer(tower_http::cors::CorsLayer::very_permissive()))
|
||||||
|
.with_state(Arc::new(SharedState { db }))
|
||||||
|
}
|
||||||
|
|
||||||
|
mod units {
|
||||||
|
use super::SharedState;
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use axum::extract::State;
|
||||||
|
|
||||||
|
pub fn router() -> axum::Router<Arc<SharedState>> {
|
||||||
|
axum::Router::new()
|
||||||
|
.route("/list", axum::routing::get(list))
|
||||||
|
.route("/create", axum::routing::post(add))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, serde::Serialize)]
|
||||||
|
struct Unit {
|
||||||
|
id: i64,
|
||||||
|
name: String,
|
||||||
|
short: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn list(State(state): State<Arc<SharedState>>) -> axum::response::Json<Vec<Unit>> {
|
||||||
|
let result: Result<Vec<(i64, String, String)>, _> = sqlx::query_as("SELECT id, name, short FROM units").fetch_all(&state.db).await;
|
||||||
|
tracing::debug!(?result, "Query Result");
|
||||||
|
|
||||||
|
let result = result.unwrap();
|
||||||
|
|
||||||
|
axum::response::Json(result.into_iter().map(|row| Unit {
|
||||||
|
id: row.0,
|
||||||
|
name: row.1,
|
||||||
|
short: row.2,
|
||||||
|
}).collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, serde::Deserialize)]
|
||||||
|
struct AddUnitData {
|
||||||
|
name: String,
|
||||||
|
short: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn add(State(state): State<Arc<SharedState>>, axum::extract::Json(data): axum::extract::Json<AddUnitData>) -> String {
|
||||||
|
let result: Result<sqlx::postgres::PgQueryResult, sqlx::Error> = sqlx::query("INSERT INTO units(name, short) VALUES($1, $2)")
|
||||||
|
.bind(data.name)
|
||||||
|
.bind(data.short)
|
||||||
|
.execute(&state.db)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
let result = result.unwrap();
|
||||||
|
tracing::debug!(?result, "Query Result");
|
||||||
|
|
||||||
|
String::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mod food {
|
||||||
|
use super::SharedState;
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use sqlx::Row;
|
||||||
|
use axum::extract::State;
|
||||||
|
|
||||||
|
pub fn router() -> axum::Router<Arc<SharedState>> {
|
||||||
|
axum::Router::new()
|
||||||
|
.route("/list", axum::routing::get(list_food))
|
||||||
|
.route("/create", axum::routing::post(create_food))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, serde::Serialize)]
|
||||||
|
struct Food {
|
||||||
|
id: i64,
|
||||||
|
version: i64,
|
||||||
|
name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tracing::instrument(skip(state))]
|
||||||
|
async fn list_food(State(state): State<Arc<SharedState>>) -> axum::response::Json<Vec<Food>> {
|
||||||
|
tracing::debug!("List Food");
|
||||||
|
|
||||||
|
let result: Result<Vec<(i64, i64, String)>, _> =
|
||||||
|
sqlx::query_as("SELECT food.id, food.version, food.name FROM food")
|
||||||
|
.fetch_all(&state.db)
|
||||||
|
.await;
|
||||||
|
tracing::debug!(?result, "Query Result");
|
||||||
|
|
||||||
|
let result = result.unwrap();
|
||||||
|
|
||||||
|
axum::response::Json(
|
||||||
|
result
|
||||||
|
.into_iter()
|
||||||
|
.map(|row| Food {
|
||||||
|
id: row.0,
|
||||||
|
version: row.1,
|
||||||
|
name: row.2,
|
||||||
|
})
|
||||||
|
.collect(),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, serde::Deserialize)]
|
||||||
|
struct FoodCreateReqData {
|
||||||
|
name: String,
|
||||||
|
unit_id: i64,
|
||||||
|
base: Vec<FoodCreateReqDataBase>
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, serde::Deserialize)]
|
||||||
|
struct FoodCreateReqDataBase {
|
||||||
|
nutrition_id: i64,
|
||||||
|
quantity: f32,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tracing::instrument(skip(state))]
|
||||||
|
async fn create_food(
|
||||||
|
State(state): State<Arc<SharedState>>,
|
||||||
|
axum::extract::Json(create_req): axum::extract::Json<FoodCreateReqData>,
|
||||||
|
) -> String {
|
||||||
|
tracing::debug!("Creating Food");
|
||||||
|
|
||||||
|
let version = 0;
|
||||||
|
let name = create_req.name;
|
||||||
|
let unit_id = create_req.unit_id;
|
||||||
|
|
||||||
|
let mut transaction = state.db.begin().await.unwrap();
|
||||||
|
|
||||||
|
let result: Result<sqlx::postgres::PgRow, sqlx::Error> = sqlx::query("INSERT INTO food(version, name, unit_id) VALUES($1, $2, $3) RETURNING id")
|
||||||
|
.bind(version)
|
||||||
|
.bind(name)
|
||||||
|
.bind(unit_id)
|
||||||
|
.fetch_one(&mut *transaction)
|
||||||
|
.await;
|
||||||
|
tracing::debug!(?result, "Query Result");
|
||||||
|
|
||||||
|
let result = result.unwrap();
|
||||||
|
let inserted_id: i64 = result.get("id");
|
||||||
|
tracing::debug!(?inserted_id, "Inserted item");
|
||||||
|
|
||||||
|
for base_n in create_req.base {
|
||||||
|
tracing::debug!(?base_n, "Creating base nutrition entry");
|
||||||
|
|
||||||
|
let result = sqlx::query("INSERT INTO food_base(food_id, kind_id, value) VALUES($1, $2, $3)")
|
||||||
|
.bind(inserted_id)
|
||||||
|
.bind(base_n.nutrition_id)
|
||||||
|
.bind(base_n.quantity)
|
||||||
|
.execute(&mut *transaction)
|
||||||
|
.await;
|
||||||
|
tracing::debug!(?result, "Query Result");
|
||||||
|
}
|
||||||
|
|
||||||
|
transaction.commit().await.unwrap();
|
||||||
|
|
||||||
|
String::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mod nutrition {
|
||||||
|
use super::SharedState;
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use axum::extract::State;
|
||||||
|
|
||||||
|
pub fn router() -> axum::Router<Arc<SharedState>> {
|
||||||
|
axum::Router::new()
|
||||||
|
.route("/list", axum::routing::get(list_nutritional_kind))
|
||||||
|
.route("/create", axum::routing::post(create_nutritional_kind))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, serde::Serialize)]
|
||||||
|
struct NutritionalKind {
|
||||||
|
id: i64,
|
||||||
|
name: String,
|
||||||
|
unit_id: i64,
|
||||||
|
unit_name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tracing::instrument(skip(state))]
|
||||||
|
async fn list_nutritional_kind(State(state): State<Arc<SharedState>>) -> axum::response::Json<Vec<NutritionalKind>> {
|
||||||
|
tracing::debug!("Listing NutritionalKinds");
|
||||||
|
|
||||||
|
let result: Result<Vec<(i64, String, i64, String)>, _> =
|
||||||
|
sqlx::query_as("SELECT NK.id, NK.name, U.id, U.name FROM nutritional_kind NK INNER JOIN units U ON NK.unit_id = U.id")
|
||||||
|
.fetch_all(&state.db)
|
||||||
|
.await;
|
||||||
|
tracing::debug!(?result, "Query Result");
|
||||||
|
|
||||||
|
let result = result.unwrap();
|
||||||
|
|
||||||
|
axum::response::Json(result.into_iter().map(|row| {
|
||||||
|
NutritionalKind {
|
||||||
|
id: row.0,
|
||||||
|
name: row.1,
|
||||||
|
unit_id: row.2,
|
||||||
|
unit_name: row.3
|
||||||
|
}
|
||||||
|
}).collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, serde::Deserialize)]
|
||||||
|
struct NutritionalKindCreateReqData {
|
||||||
|
name: String,
|
||||||
|
unit_id: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tracing::instrument(skip(state))]
|
||||||
|
async fn create_nutritional_kind(
|
||||||
|
State(state): State<Arc<SharedState>>,
|
||||||
|
axum::extract::Json(create_req): axum::extract::Json<NutritionalKindCreateReqData>,
|
||||||
|
) -> String {
|
||||||
|
tracing::debug!("Creating NutritionalKind");
|
||||||
|
|
||||||
|
let result = sqlx::query("INSERT INTO nutritional_kind(name, unit_id) VALUES($1, $2)")
|
||||||
|
.bind(create_req.name)
|
||||||
|
.bind(create_req.unit_id)
|
||||||
|
.execute(&state.db)
|
||||||
|
.await;
|
||||||
|
tracing::debug!(?result, "Query Result");
|
||||||
|
|
||||||
|
String::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mod tracking {
|
||||||
|
use super::SharedState;
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use axum::extract::State;
|
||||||
|
|
||||||
|
pub fn router() -> axum::Router<Arc<SharedState>> {
|
||||||
|
axum::Router::new()
|
||||||
|
.route("/list", axum::routing::get(list_entries))
|
||||||
|
.route("/add", axum::routing::post(add_tracking))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, serde::Serialize)]
|
||||||
|
struct TrackingEntry {
|
||||||
|
id: i64,
|
||||||
|
food_id: i64,
|
||||||
|
food_name: String,
|
||||||
|
unit_id: i64,
|
||||||
|
unit_short: String,
|
||||||
|
quantity: f64,
|
||||||
|
timestamp: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tracing::instrument(skip(state))]
|
||||||
|
async fn list_entries(State(state): State<Arc<SharedState>>) -> axum::response::Json<Vec<TrackingEntry>> {
|
||||||
|
tracing::debug!("Listing Tracking Entries");
|
||||||
|
|
||||||
|
let result: Result<Vec<(i64, i64, String, i64, String, f64, i64)>, _> =
|
||||||
|
sqlx::query_as("
|
||||||
|
SELECT T.id, T.food_id, F.name, U.id, U.short, T.quantity, T.ts
|
||||||
|
FROM tracking T
|
||||||
|
INNER JOIN food F ON T.food_id = F.id
|
||||||
|
INNER JOIN units U ON F.unit_id = U.id
|
||||||
|
")
|
||||||
|
.fetch_all(&state.db)
|
||||||
|
.await;
|
||||||
|
tracing::debug!(?result, "Query Result");
|
||||||
|
|
||||||
|
let result = result.unwrap();
|
||||||
|
|
||||||
|
axum::response::Json(result.into_iter().map(|row| {
|
||||||
|
TrackingEntry {
|
||||||
|
id: row.0,
|
||||||
|
food_id: row.1,
|
||||||
|
food_name: row.2,
|
||||||
|
unit_id: row.3,
|
||||||
|
unit_short: row.4,
|
||||||
|
quantity: row.5,
|
||||||
|
timestamp: row.6
|
||||||
|
}
|
||||||
|
}).collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, serde::Deserialize)]
|
||||||
|
struct AddReqData {
|
||||||
|
food_id: i64,
|
||||||
|
quantity: f64,
|
||||||
|
timestamp: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tracing::instrument(skip(state))]
|
||||||
|
async fn add_tracking(
|
||||||
|
State(state): State<Arc<SharedState>>,
|
||||||
|
axum::extract::Json(data): axum::extract::Json<AddReqData>
|
||||||
|
) -> String {
|
||||||
|
tracing::debug!("Creating NutritionalKind");
|
||||||
|
|
||||||
|
let result = sqlx::query("INSERT INTO tracking(food_id, quantity, ts) VALUES($1, $2, $3)")
|
||||||
|
.bind(data.food_id)
|
||||||
|
.bind(data.quantity)
|
||||||
|
.bind(data.timestamp)
|
||||||
|
.execute(&state.db)
|
||||||
|
.await;
|
||||||
|
tracing::debug!(?result, "Query Result");
|
||||||
|
|
||||||
|
String::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
28
backend/src/main.rs
Normal file
28
backend/src/main.rs
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
use tracing_subscriber::layer::SubscriberExt;
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let tracing_reg =
|
||||||
|
tracing_subscriber::Registry::default().with(tracing_subscriber::fmt::layer());
|
||||||
|
tracing::subscriber::set_global_default(tracing_reg).unwrap();
|
||||||
|
|
||||||
|
let rt = tokio::runtime::Builder::new_current_thread()
|
||||||
|
.enable_all()
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
rt.block_on(async move {
|
||||||
|
let pool = sqlx::postgres::PgPoolOptions::new()
|
||||||
|
.max_connections(5)
|
||||||
|
.connect("postgres://postgres:testing@localhost/test")
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
sqlx::migrate!().run(&pool).await.unwrap();
|
||||||
|
|
||||||
|
let router = backend::app(pool);
|
||||||
|
|
||||||
|
let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
|
||||||
|
|
||||||
|
axum::serve(listener, router).await.unwrap();
|
||||||
|
});
|
||||||
|
}
|
||||||
20
docker-compose.yml
Normal file
20
docker-compose.yml
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
services:
|
||||||
|
pg:
|
||||||
|
pull_policy: never
|
||||||
|
image: postgres:18
|
||||||
|
environment:
|
||||||
|
POSTGRES_USER: "postgres"
|
||||||
|
POSTGRES_PASSWORD: "testing"
|
||||||
|
POSTGRES_DB: "test"
|
||||||
|
ports:
|
||||||
|
- 5432:5432
|
||||||
|
|
||||||
|
frontend:
|
||||||
|
pull_policy: never
|
||||||
|
image: node:25
|
||||||
|
network_mode: host
|
||||||
|
entrypoint: /bin/bash
|
||||||
|
command: "-c 'cd /mnt/calflow/frontend; npm install; npm run dev -- --host'"
|
||||||
|
volumes:
|
||||||
|
- ./:/mnt/calflow
|
||||||
|
|
||||||
3
example-requests/create_food.json
Normal file
3
example-requests/create_food.json
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"name": "something"
|
||||||
|
}
|
||||||
4
example-requests/create_nutrition.json
Normal file
4
example-requests/create_nutrition.json
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"name": "Calories",
|
||||||
|
"unit": "kcal"
|
||||||
|
}
|
||||||
24
frontend/.gitignore
vendored
Normal file
24
frontend/.gitignore
vendored
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
# Logs
|
||||||
|
logs
|
||||||
|
*.log
|
||||||
|
npm-debug.log*
|
||||||
|
yarn-debug.log*
|
||||||
|
yarn-error.log*
|
||||||
|
pnpm-debug.log*
|
||||||
|
lerna-debug.log*
|
||||||
|
|
||||||
|
node_modules
|
||||||
|
dist
|
||||||
|
dist-ssr
|
||||||
|
*.local
|
||||||
|
|
||||||
|
# Editor directories and files
|
||||||
|
.vscode/*
|
||||||
|
!.vscode/extensions.json
|
||||||
|
.idea
|
||||||
|
.DS_Store
|
||||||
|
*.suo
|
||||||
|
*.ntvs*
|
||||||
|
*.njsproj
|
||||||
|
*.sln
|
||||||
|
*.sw?
|
||||||
73
frontend/README.md
Normal file
73
frontend/README.md
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
# React + TypeScript + Vite
|
||||||
|
|
||||||
|
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
|
||||||
|
|
||||||
|
Currently, two official plugins are available:
|
||||||
|
|
||||||
|
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) (or [oxc](https://oxc.rs) when used in [rolldown-vite](https://vite.dev/guide/rolldown)) for Fast Refresh
|
||||||
|
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
|
||||||
|
|
||||||
|
## React Compiler
|
||||||
|
|
||||||
|
The React Compiler is not enabled on this template because of its impact on dev & build performances. To add it, see [this documentation](https://react.dev/learn/react-compiler/installation).
|
||||||
|
|
||||||
|
## Expanding the ESLint configuration
|
||||||
|
|
||||||
|
If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
|
||||||
|
|
||||||
|
```js
|
||||||
|
export default defineConfig([
|
||||||
|
globalIgnores(['dist']),
|
||||||
|
{
|
||||||
|
files: ['**/*.{ts,tsx}'],
|
||||||
|
extends: [
|
||||||
|
// Other configs...
|
||||||
|
|
||||||
|
// Remove tseslint.configs.recommended and replace with this
|
||||||
|
tseslint.configs.recommendedTypeChecked,
|
||||||
|
// Alternatively, use this for stricter rules
|
||||||
|
tseslint.configs.strictTypeChecked,
|
||||||
|
// Optionally, add this for stylistic rules
|
||||||
|
tseslint.configs.stylisticTypeChecked,
|
||||||
|
|
||||||
|
// Other configs...
|
||||||
|
],
|
||||||
|
languageOptions: {
|
||||||
|
parserOptions: {
|
||||||
|
project: ['./tsconfig.node.json', './tsconfig.app.json'],
|
||||||
|
tsconfigRootDir: import.meta.dirname,
|
||||||
|
},
|
||||||
|
// other options...
|
||||||
|
},
|
||||||
|
},
|
||||||
|
])
|
||||||
|
```
|
||||||
|
|
||||||
|
You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
|
||||||
|
|
||||||
|
```js
|
||||||
|
// eslint.config.js
|
||||||
|
import reactX from 'eslint-plugin-react-x'
|
||||||
|
import reactDom from 'eslint-plugin-react-dom'
|
||||||
|
|
||||||
|
export default defineConfig([
|
||||||
|
globalIgnores(['dist']),
|
||||||
|
{
|
||||||
|
files: ['**/*.{ts,tsx}'],
|
||||||
|
extends: [
|
||||||
|
// Other configs...
|
||||||
|
// Enable lint rules for React
|
||||||
|
reactX.configs['recommended-typescript'],
|
||||||
|
// Enable lint rules for React DOM
|
||||||
|
reactDom.configs.recommended,
|
||||||
|
],
|
||||||
|
languageOptions: {
|
||||||
|
parserOptions: {
|
||||||
|
project: ['./tsconfig.node.json', './tsconfig.app.json'],
|
||||||
|
tsconfigRootDir: import.meta.dirname,
|
||||||
|
},
|
||||||
|
// other options...
|
||||||
|
},
|
||||||
|
},
|
||||||
|
])
|
||||||
|
```
|
||||||
23
frontend/eslint.config.js
Normal file
23
frontend/eslint.config.js
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import js from '@eslint/js'
|
||||||
|
import globals from 'globals'
|
||||||
|
import reactHooks from 'eslint-plugin-react-hooks'
|
||||||
|
import reactRefresh from 'eslint-plugin-react-refresh'
|
||||||
|
import tseslint from 'typescript-eslint'
|
||||||
|
import { defineConfig, globalIgnores } from 'eslint/config'
|
||||||
|
|
||||||
|
export default defineConfig([
|
||||||
|
globalIgnores(['dist']),
|
||||||
|
{
|
||||||
|
files: ['**/*.{ts,tsx}'],
|
||||||
|
extends: [
|
||||||
|
js.configs.recommended,
|
||||||
|
tseslint.configs.recommended,
|
||||||
|
reactHooks.configs.flat.recommended,
|
||||||
|
reactRefresh.configs.vite,
|
||||||
|
],
|
||||||
|
languageOptions: {
|
||||||
|
ecmaVersion: 2020,
|
||||||
|
globals: globals.browser,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
])
|
||||||
13
frontend/index.html
Normal file
13
frontend/index.html
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<title>frontend</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="root"></div>
|
||||||
|
<script type="module" src="/src/main.tsx"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
3291
frontend/package-lock.json
generated
Normal file
3291
frontend/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
31
frontend/package.json
Normal file
31
frontend/package.json
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
{
|
||||||
|
"name": "frontend",
|
||||||
|
"private": true,
|
||||||
|
"version": "0.0.0",
|
||||||
|
"type": "module",
|
||||||
|
"scripts": {
|
||||||
|
"dev": "vite",
|
||||||
|
"build": "tsc -b && vite build",
|
||||||
|
"lint": "eslint .",
|
||||||
|
"preview": "vite preview"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"react": "^19.2.0",
|
||||||
|
"react-dom": "^19.2.0",
|
||||||
|
"react-router-dom": "^7.9.6"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@eslint/js": "^9.39.1",
|
||||||
|
"@types/node": "^24.10.1",
|
||||||
|
"@types/react": "^19.2.5",
|
||||||
|
"@types/react-dom": "^19.2.3",
|
||||||
|
"@vitejs/plugin-react": "^5.1.1",
|
||||||
|
"eslint": "^9.39.1",
|
||||||
|
"eslint-plugin-react-hooks": "^7.0.1",
|
||||||
|
"eslint-plugin-react-refresh": "^0.4.24",
|
||||||
|
"globals": "^16.5.0",
|
||||||
|
"typescript": "~5.9.3",
|
||||||
|
"typescript-eslint": "^8.46.4",
|
||||||
|
"vite": "^7.2.4"
|
||||||
|
}
|
||||||
|
}
|
||||||
1
frontend/public/vite.svg
Normal file
1
frontend/public/vite.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
42
frontend/src/App.css
Normal file
42
frontend/src/App.css
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
#root {
|
||||||
|
max-width: 1280px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 2rem;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo {
|
||||||
|
height: 6em;
|
||||||
|
padding: 1.5em;
|
||||||
|
will-change: filter;
|
||||||
|
transition: filter 300ms;
|
||||||
|
}
|
||||||
|
.logo:hover {
|
||||||
|
filter: drop-shadow(0 0 2em #646cffaa);
|
||||||
|
}
|
||||||
|
.logo.react:hover {
|
||||||
|
filter: drop-shadow(0 0 2em #61dafbaa);
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes logo-spin {
|
||||||
|
from {
|
||||||
|
transform: rotate(0deg);
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
transform: rotate(360deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion: no-preference) {
|
||||||
|
a:nth-of-type(2) .logo {
|
||||||
|
animation: logo-spin infinite 20s linear;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.card {
|
||||||
|
padding: 2em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.read-the-docs {
|
||||||
|
color: #888;
|
||||||
|
}
|
||||||
27
frontend/src/App.tsx
Normal file
27
frontend/src/App.tsx
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
import './App.css'
|
||||||
|
import { BrowserRouter, NavLink, Route, Routes } from 'react-router-dom';
|
||||||
|
import Homepage from './pages/homepage';
|
||||||
|
import Settings from './pages/settings';
|
||||||
|
import Food from './pages/food';
|
||||||
|
|
||||||
|
function App() {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<BrowserRouter>
|
||||||
|
<nav>
|
||||||
|
<NavLink to="/">Homepage</NavLink>
|
||||||
|
<NavLink to="/food">Food</NavLink>
|
||||||
|
<NavLink to="/settings">Settings</NavLink>
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
<Routes>
|
||||||
|
<Route path="/" element={<Homepage />} />
|
||||||
|
<Route path="/food" element={<Food />} />
|
||||||
|
<Route path="/settings" element={<Settings />} />
|
||||||
|
</Routes>
|
||||||
|
</BrowserRouter>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default App
|
||||||
77
frontend/src/api.ts
Normal file
77
frontend/src/api.ts
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
export async function loadNutritionalKinds() {
|
||||||
|
let resp = await fetch("/api/nutrition/list");
|
||||||
|
let content = await resp.json();
|
||||||
|
return content;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function addNutrition(name: string, unit_id: number) {
|
||||||
|
return await fetch("/api/nutrition/create", {
|
||||||
|
method: 'post',
|
||||||
|
headers: new Headers({
|
||||||
|
'Content-type': 'application/json',
|
||||||
|
}),
|
||||||
|
body: JSON.stringify({
|
||||||
|
name: name,
|
||||||
|
unit_id: unit_id,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function loadFoodItems() {
|
||||||
|
let resp = await fetch("/api/food/list");
|
||||||
|
let content = await resp.json();
|
||||||
|
return content;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function addFoodItem(name: string, unit_id: number, base: Array<{nutrition_id: number, quantity: number}>) {
|
||||||
|
return await fetch("/api/food/create", {
|
||||||
|
method: 'post',
|
||||||
|
headers: new Headers({
|
||||||
|
'Content-type': 'application/json',
|
||||||
|
}),
|
||||||
|
body: JSON.stringify({
|
||||||
|
name: name,
|
||||||
|
unit_id: unit_id,
|
||||||
|
base: base,
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function loadUnits() {
|
||||||
|
let resp = await fetch("/api/units/list");
|
||||||
|
let content = await resp.json();
|
||||||
|
return content;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function addUnit(name: string, short: string) {
|
||||||
|
return await fetch("/api/units/create", {
|
||||||
|
method: 'post',
|
||||||
|
headers: new Headers({
|
||||||
|
'Content-type': 'application/json',
|
||||||
|
}),
|
||||||
|
body: JSON.stringify({
|
||||||
|
name: name,
|
||||||
|
short: short,
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getTrackingEntries() {
|
||||||
|
let resp = await fetch("/api/tracking/list");
|
||||||
|
let content = await resp.json();
|
||||||
|
return content;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function trackFood(food_id: number, quantity: number, timestamp: number) {
|
||||||
|
return await fetch("/api/tracking/add", {
|
||||||
|
method: 'post',
|
||||||
|
headers: new Headers({
|
||||||
|
'Content-type': 'application/json',
|
||||||
|
}),
|
||||||
|
body: JSON.stringify({
|
||||||
|
food_id: food_id,
|
||||||
|
quantity: quantity,
|
||||||
|
timestamp: timestamp,
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
}
|
||||||
1
frontend/src/assets/react.svg
Normal file
1
frontend/src/assets/react.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||||
|
After Width: | Height: | Size: 4.0 KiB |
68
frontend/src/components/settings/nutrition.tsx
Normal file
68
frontend/src/components/settings/nutrition.tsx
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { addNutrition, loadNutritionalKinds, loadUnits } from "../../api";
|
||||||
|
|
||||||
|
export default function Nutrition() {
|
||||||
|
const [nutritionKinds, setNutritionKinds] = useState([]);
|
||||||
|
useEffect(() => {
|
||||||
|
let ignore = false;
|
||||||
|
|
||||||
|
loadNutritionalKinds().then((kinds) => {
|
||||||
|
setNutritionKinds(kinds);
|
||||||
|
})
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
ignore = true;
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const [units, setUnits] = useState([]);
|
||||||
|
useEffect(() => {
|
||||||
|
let ignore = false;
|
||||||
|
|
||||||
|
loadUnits().then((kinds) => {
|
||||||
|
setUnits(kinds);
|
||||||
|
if (kinds.length > 0) {
|
||||||
|
setAddUnit(kinds[0].id);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
ignore = true;
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const [addUnit, setAddUnit] = useState(0);
|
||||||
|
const [addName, setAddName] = useState("");
|
||||||
|
const submitNutrition = () => {
|
||||||
|
addNutrition(addName, addUnit)
|
||||||
|
.then(() => {
|
||||||
|
return loadNutritionalKinds();
|
||||||
|
})
|
||||||
|
.then((kinds) => {
|
||||||
|
setNutritionKinds(kinds);
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<h2>Nutrition</h2>
|
||||||
|
<ul>
|
||||||
|
{
|
||||||
|
nutritionKinds
|
||||||
|
.map((entry) => <li key={entry.id}>{entry.name} ({entry.unit_name})</li>)
|
||||||
|
}
|
||||||
|
</ul>
|
||||||
|
<div>
|
||||||
|
<input type="text" value={addName} onChange={(e) => setAddName(e.target.value)}/>
|
||||||
|
<select value={addUnit} onChange={(e) => setAddUnit(Number(e.target.value))}>
|
||||||
|
{
|
||||||
|
units.map((entry) => {
|
||||||
|
return <option value={entry.id} key={entry.id}>{entry.name} ({entry.short})</option>
|
||||||
|
})
|
||||||
|
}
|
||||||
|
</select>
|
||||||
|
<button onClick={(e) => {submitNutrition()}}>Add</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
46
frontend/src/components/settings/units.tsx
Normal file
46
frontend/src/components/settings/units.tsx
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { addUnit, loadUnits } from "../../api";
|
||||||
|
|
||||||
|
|
||||||
|
export default function Units() {
|
||||||
|
const [units, setUnits] = useState([]);
|
||||||
|
useEffect(() => {
|
||||||
|
let ignore = false;
|
||||||
|
|
||||||
|
loadUnits().then((kinds) => {
|
||||||
|
setUnits(kinds);
|
||||||
|
})
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
ignore = true;
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const submitUnit = (formData: FormData) => {
|
||||||
|
const name = formData.get("name");
|
||||||
|
const short = formData.get("short");
|
||||||
|
|
||||||
|
addUnit(name, short).then(() => {
|
||||||
|
console.log("Added unit");
|
||||||
|
// TODO
|
||||||
|
// Reload the page/list of units
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<h2>Units</h2>
|
||||||
|
<ul>
|
||||||
|
{
|
||||||
|
units
|
||||||
|
.map((entry) => <li key={entry.id}>{entry.name} ({entry.short})</li>)
|
||||||
|
}
|
||||||
|
</ul>
|
||||||
|
<form action={submitUnit}>
|
||||||
|
<input name="name" placeholder="Name" />
|
||||||
|
<input name="short" placeholder="Short" />
|
||||||
|
<button type="submit">Add</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
68
frontend/src/index.css
Normal file
68
frontend/src/index.css
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
:root {
|
||||||
|
font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
|
||||||
|
line-height: 1.5;
|
||||||
|
font-weight: 400;
|
||||||
|
|
||||||
|
color-scheme: light dark;
|
||||||
|
color: rgba(255, 255, 255, 0.87);
|
||||||
|
background-color: #242424;
|
||||||
|
|
||||||
|
font-synthesis: none;
|
||||||
|
text-rendering: optimizeLegibility;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
font-weight: 500;
|
||||||
|
color: #646cff;
|
||||||
|
text-decoration: inherit;
|
||||||
|
}
|
||||||
|
a:hover {
|
||||||
|
color: #535bf2;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
display: flex;
|
||||||
|
place-items: center;
|
||||||
|
min-width: 320px;
|
||||||
|
min-height: 100vh;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
font-size: 3.2em;
|
||||||
|
line-height: 1.1;
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
border-radius: 8px;
|
||||||
|
border: 1px solid transparent;
|
||||||
|
padding: 0.6em 1.2em;
|
||||||
|
font-size: 1em;
|
||||||
|
font-weight: 500;
|
||||||
|
font-family: inherit;
|
||||||
|
background-color: #1a1a1a;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: border-color 0.25s;
|
||||||
|
}
|
||||||
|
button:hover {
|
||||||
|
border-color: #646cff;
|
||||||
|
}
|
||||||
|
button:focus,
|
||||||
|
button:focus-visible {
|
||||||
|
outline: 4px auto -webkit-focus-ring-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-color-scheme: light) {
|
||||||
|
:root {
|
||||||
|
color: #213547;
|
||||||
|
background-color: #ffffff;
|
||||||
|
}
|
||||||
|
a:hover {
|
||||||
|
color: #747bff;
|
||||||
|
}
|
||||||
|
button {
|
||||||
|
background-color: #f9f9f9;
|
||||||
|
}
|
||||||
|
}
|
||||||
10
frontend/src/main.tsx
Normal file
10
frontend/src/main.tsx
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
import { StrictMode } from 'react'
|
||||||
|
import { createRoot } from 'react-dom/client'
|
||||||
|
import './index.css'
|
||||||
|
import App from './App.tsx'
|
||||||
|
|
||||||
|
createRoot(document.getElementById('root')!).render(
|
||||||
|
<StrictMode>
|
||||||
|
<App />
|
||||||
|
</StrictMode>,
|
||||||
|
)
|
||||||
194
frontend/src/pages/food.tsx
Normal file
194
frontend/src/pages/food.tsx
Normal file
@@ -0,0 +1,194 @@
|
|||||||
|
import { useEffect, useRef, useState } from "react";
|
||||||
|
import { addFoodItem, loadFoodItems, loadNutritionalKinds, loadUnits } from "../api";
|
||||||
|
|
||||||
|
function FoodList({ foodItems }: {foodItems: Array<any> }) {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<h2>Registered Food Items</h2>
|
||||||
|
<ul>
|
||||||
|
{
|
||||||
|
foodItems.map((entry) => <li key={entry.id}>{entry.name}</li>)
|
||||||
|
}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function AddNutrition({ nutritionKinds, onAdd }: { nutritionKinds: Array<any>, onAdd: any }) {
|
||||||
|
const add = (formData) => {
|
||||||
|
const nutrition = Number(formData.get("nutrition"));
|
||||||
|
const quantity = Number(formData.get("quantity"));
|
||||||
|
|
||||||
|
const added_nutri = nutritionKinds.find((entry) => entry.id == nutrition);
|
||||||
|
onAdd({
|
||||||
|
nutrition_name: added_nutri.name,
|
||||||
|
nutrition_id: nutrition,
|
||||||
|
quantity: quantity,
|
||||||
|
unit_name: added_nutri.unit_name
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<form action={add}>
|
||||||
|
<select name="nutrition">
|
||||||
|
{
|
||||||
|
nutritionKinds.map((entry) => {
|
||||||
|
return <option value={entry.id} key={entry.id}>{entry.name} ({entry.unit_name})</option>
|
||||||
|
})
|
||||||
|
}
|
||||||
|
</select>
|
||||||
|
<input type="number" name="quantity" />
|
||||||
|
<button type="submit">+</button>
|
||||||
|
</form>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function AddFoodIngridient({ foods }: { foods: Array<any> }) {
|
||||||
|
const add = (formData: FormData) => {
|
||||||
|
const food_id = Number(formData.get("food"));
|
||||||
|
const quantity = Number(formData.get("quantity"));
|
||||||
|
|
||||||
|
console.log("[TODO] Adding Food", food_id, quantity);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<form action={add}>
|
||||||
|
<select name="food">
|
||||||
|
{
|
||||||
|
foods.map((entry) => {
|
||||||
|
return <option value={entry.id} key={entry.id}>{entry.name}</option>
|
||||||
|
})
|
||||||
|
}
|
||||||
|
</select>
|
||||||
|
<input type="number" name="quantity" placeholder="10g" />
|
||||||
|
<button type="submit">+</button>
|
||||||
|
</form>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function AddFoodItem({ units, nutritionKinds, foods, onAdd }: { units: Array<any>, nutritionKinds: Array<any>, foods: Array<any>, onAdd: any }) {
|
||||||
|
const [addState, setAddState] = useState({
|
||||||
|
nutritions: [],
|
||||||
|
});
|
||||||
|
|
||||||
|
const submitFood = (formData: FormData) => {
|
||||||
|
const name = formData.get("name");
|
||||||
|
const unit_id = Number(formData.get("unit"));
|
||||||
|
const per_unit = Number(formData.get("per_unit"));
|
||||||
|
|
||||||
|
const nutritions = addState.nutritions.map((entry) => {
|
||||||
|
return {
|
||||||
|
nutrition_id: entry.nutrition_id,
|
||||||
|
quantity: entry.quantity / per_unit
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
addFoodItem(name, unit_id, nutritions)
|
||||||
|
.then(() => {
|
||||||
|
setAddState({
|
||||||
|
unit: 0,
|
||||||
|
name: "",
|
||||||
|
nutritions: [],
|
||||||
|
});
|
||||||
|
onAdd()
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
let formRef = useRef(null);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<h2>Add Food</h2>
|
||||||
|
<form action={submitFood} ref={formRef}>
|
||||||
|
<input name="name" placeholder="Name" />
|
||||||
|
<input name="per_unit" type="number" placeholder="Per Unit" />
|
||||||
|
<select name="unit">
|
||||||
|
{
|
||||||
|
units.map((entry) => {
|
||||||
|
return <option value={entry.id} key={entry.id}>{entry.name} ({entry.short})</option>
|
||||||
|
})
|
||||||
|
}
|
||||||
|
</select>
|
||||||
|
<ul>
|
||||||
|
{
|
||||||
|
addState.nutritions.map((entry) => {
|
||||||
|
return (<li key={entry.nutrition_id}>{entry.nutrition_name} - {entry.quantity} {entry.unit_name}</li>)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
</ul>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<p>Base Nutrition</p>
|
||||||
|
<AddNutrition nutritionKinds={nutritionKinds} onAdd={(entry) => {
|
||||||
|
setAddState({...addState, nutritions: [...addState.nutritions, entry]})
|
||||||
|
}} />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<p>Ingridients</p>
|
||||||
|
<AddFoodIngridient foods={foods} />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button onClick={(e) => {
|
||||||
|
formRef.current.dispatchEvent(new Event("submit", { cancelable: true, bubbles: true }));
|
||||||
|
}}>Add Food</button>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function Food() {
|
||||||
|
const [foodItems, setFoodItems] = useState([]);
|
||||||
|
useEffect(() => {
|
||||||
|
let ignore = false;
|
||||||
|
|
||||||
|
loadFoodItems().then((resp) => {
|
||||||
|
setFoodItems(resp);
|
||||||
|
})
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
ignore = true;
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const [nutritionKinds, setNutritionKinds] = useState([]);
|
||||||
|
useEffect(() => {
|
||||||
|
let ignore = false;
|
||||||
|
|
||||||
|
loadNutritionalKinds().then((kinds) => {
|
||||||
|
setNutritionKinds(kinds);
|
||||||
|
})
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
ignore = true;
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const [units, setUnits] = useState([]);
|
||||||
|
useEffect(() => {
|
||||||
|
let ignore = false;
|
||||||
|
|
||||||
|
loadUnits().then((kinds) => {
|
||||||
|
setUnits(kinds);
|
||||||
|
})
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
ignore = true;
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const reloadFood = () => {
|
||||||
|
loadFoodItems().then((resp) => {
|
||||||
|
setFoodItems(resp);
|
||||||
|
console.log(resp);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<h1>Food</h1>
|
||||||
|
<FoodList foodItems={foodItems} />
|
||||||
|
<AddFoodItem units={units} nutritionKinds={nutritionKinds} foods={foodItems} onAdd={reloadFood} />
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
87
frontend/src/pages/homepage.tsx
Normal file
87
frontend/src/pages/homepage.tsx
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
import { useEffect, useEffectEvent, useState } from 'react'
|
||||||
|
import '../App.css'
|
||||||
|
import { getTrackingEntries, loadFoodItems, loadNutritionalKinds, trackFood } from '../api';
|
||||||
|
|
||||||
|
function Homepage() {
|
||||||
|
const [foodItems, setFoodItems] = useState([]);
|
||||||
|
useEffect(() => {
|
||||||
|
let ignore = false;
|
||||||
|
|
||||||
|
loadFoodItems().then((resp) => {
|
||||||
|
setFoodItems(resp);
|
||||||
|
})
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
ignore = true;
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const [nutritionKinds, setNutritionKinds] = useState([]);
|
||||||
|
useEffect(() => {
|
||||||
|
let ignore = false;
|
||||||
|
|
||||||
|
loadNutritionalKinds().then((kinds) => {
|
||||||
|
setNutritionKinds(kinds);
|
||||||
|
})
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
ignore = true;
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const [trackingEntries, setTrackingEntries] = useState([]);
|
||||||
|
useEffect(() => {
|
||||||
|
getTrackingEntries().then((entries) => {
|
||||||
|
console.log(entries);
|
||||||
|
setTrackingEntries(entries);
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => {};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const submitFoodTracking = (formData: FormData) => {
|
||||||
|
console.log("Track food");
|
||||||
|
|
||||||
|
const food_id = Number(formData.get("food"));
|
||||||
|
const quantity = Number(formData.get("quantity"));
|
||||||
|
const timestamp = Math.floor(Date.now() / 1000);
|
||||||
|
|
||||||
|
console.log("Track food", food_id, quantity, timestamp);
|
||||||
|
|
||||||
|
trackFood(food_id, quantity, timestamp).then(() => {
|
||||||
|
console.log("Tracked food")
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<h1>CalFlow</h1>
|
||||||
|
<p className="read-the-docs">
|
||||||
|
Click on the Vite and React logos to learn more
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<form action={submitFoodTracking}>
|
||||||
|
<select name="food">
|
||||||
|
{
|
||||||
|
foodItems.map((entry) => {
|
||||||
|
return <option value={entry.id} key={entry.id}>{entry.name}</option>
|
||||||
|
})
|
||||||
|
}
|
||||||
|
</select>
|
||||||
|
<input name="quantity" type="number" placeholder="Quantity" />
|
||||||
|
<button type="submit">Track Now</button>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<ul>
|
||||||
|
{
|
||||||
|
trackingEntries.map((entry) => {
|
||||||
|
const date = new Date(entry.timestamp * 1000);
|
||||||
|
return <li key={entry.id}>[{date.toLocaleString()}] {entry.food_name} ({entry.quantity} {entry.unit_short})</li>
|
||||||
|
})
|
||||||
|
}
|
||||||
|
</ul>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Homepage
|
||||||
12
frontend/src/pages/settings.tsx
Normal file
12
frontend/src/pages/settings.tsx
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
import Nutrition from "../components/settings/nutrition";
|
||||||
|
import Units from "../components/settings/units";
|
||||||
|
|
||||||
|
export default function Settings() {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<h1>Settings</h1>
|
||||||
|
<Units />
|
||||||
|
<Nutrition />
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
28
frontend/tsconfig.app.json
Normal file
28
frontend/tsconfig.app.json
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
|
||||||
|
"target": "ES2022",
|
||||||
|
"useDefineForClassFields": true,
|
||||||
|
"lib": ["ES2022", "DOM", "DOM.Iterable"],
|
||||||
|
"module": "ESNext",
|
||||||
|
"types": ["vite/client"],
|
||||||
|
"skipLibCheck": true,
|
||||||
|
|
||||||
|
/* Bundler mode */
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"allowImportingTsExtensions": true,
|
||||||
|
"verbatimModuleSyntax": true,
|
||||||
|
"moduleDetection": "force",
|
||||||
|
"noEmit": true,
|
||||||
|
"jsx": "react-jsx",
|
||||||
|
|
||||||
|
/* Linting */
|
||||||
|
"strict": true,
|
||||||
|
"noUnusedLocals": true,
|
||||||
|
"noUnusedParameters": true,
|
||||||
|
"erasableSyntaxOnly": true,
|
||||||
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
"noUncheckedSideEffectImports": true
|
||||||
|
},
|
||||||
|
"include": ["src"]
|
||||||
|
}
|
||||||
7
frontend/tsconfig.json
Normal file
7
frontend/tsconfig.json
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"files": [],
|
||||||
|
"references": [
|
||||||
|
{ "path": "./tsconfig.app.json" },
|
||||||
|
{ "path": "./tsconfig.node.json" }
|
||||||
|
]
|
||||||
|
}
|
||||||
26
frontend/tsconfig.node.json
Normal file
26
frontend/tsconfig.node.json
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
|
||||||
|
"target": "ES2023",
|
||||||
|
"lib": ["ES2023"],
|
||||||
|
"module": "ESNext",
|
||||||
|
"types": ["node"],
|
||||||
|
"skipLibCheck": true,
|
||||||
|
|
||||||
|
/* Bundler mode */
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"allowImportingTsExtensions": true,
|
||||||
|
"verbatimModuleSyntax": true,
|
||||||
|
"moduleDetection": "force",
|
||||||
|
"noEmit": true,
|
||||||
|
|
||||||
|
/* Linting */
|
||||||
|
"strict": true,
|
||||||
|
"noUnusedLocals": true,
|
||||||
|
"noUnusedParameters": true,
|
||||||
|
"erasableSyntaxOnly": true,
|
||||||
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
"noUncheckedSideEffectImports": true
|
||||||
|
},
|
||||||
|
"include": ["vite.config.ts"]
|
||||||
|
}
|
||||||
16
frontend/vite.config.ts
Normal file
16
frontend/vite.config.ts
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
import { defineConfig } from 'vite'
|
||||||
|
import react from '@vitejs/plugin-react'
|
||||||
|
|
||||||
|
// https://vite.dev/config/
|
||||||
|
export default defineConfig({
|
||||||
|
plugins: [react()],
|
||||||
|
server: {
|
||||||
|
proxy: {
|
||||||
|
'/api': {
|
||||||
|
target: 'http://localhost:3000',
|
||||||
|
changeOrigin: true,
|
||||||
|
rewrite: (path) => path.replace(/^\/api/, ''),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
|
})
|
||||||
Reference in New Issue
Block a user