From 21144d954e3ada6a4bad8acd2f4ea98c83dae25d Mon Sep 17 00:00:00 2001 From: Adam <24621027+adoyle0@users.noreply.github.com> Date: Sun, 21 Jul 2024 01:08:54 -0400 Subject: [PATCH] use lib --- Cargo.lock | 1 + client/Cargo.toml | 2 ++ server/src/main.rs | 6 ++---- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1911b32..15c7943 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -285,6 +285,7 @@ dependencies = [ "leptos-use", "leptos_meta", "leptos_router", + "libcards", "log", "serde-lite", "wasm-bindgen", diff --git a/client/Cargo.toml b/client/Cargo.toml index 86e2241..b492a52 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -25,3 +25,5 @@ serde-lite = "0.5.0" wasm-bindgen = "=0.2.92" wasm-bindgen-test = "0.3" web-sys = { version = "0.3", features = ["Document", "Window"] } + +libcards = { workspace = true } diff --git a/server/src/main.rs b/server/src/main.rs index a9d1346..c12bda3 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -1,6 +1,7 @@ use anyhow::{Context, Result}; use axum::{response::Html, routing::get, Router}; use axum_extra::response::Css; +use libcards::*; use std::{ // collections::HashSet, fs, @@ -10,8 +11,6 @@ use std::{ use tokio::sync::broadcast; use tower_http::services::ServeDir; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; - -use libcards::*; pub mod api; use crate::api::*; @@ -26,8 +25,7 @@ fn load_json(path: &str) -> Result<Vec<CAHCardSet>> { } // this is still around just for reference -#[allow(dead_code)] -fn test() -> Result<()> { +fn _test() -> Result<()> { // choose decks let cards_input_path: &str = "../data/cah-cards-full.json";