Release first version
This commit is contained in:
parent
38e2285ad3
commit
d8aa433055
@ -10,19 +10,18 @@
|
|||||||
<cargoProject FILE="$PROJECT_DIR$/bookkeeper/Cargo.toml" />
|
<cargoProject FILE="$PROJECT_DIR$/bookkeeper/Cargo.toml" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="76b3b902-7a5c-4bcd-9c1b-8241d748fb44" name="更改" comment="Update some settings">
|
<list default="true" id="76b3b902-7a5c-4bcd-9c1b-8241d748fb44" name="更改" comment="Modify Tx and Delete Tx">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
|
<change afterPath="$PROJECT_DIR$/bookkeeper/.cargo/config.toml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/bookkeeper/src/main.rs" beforeDir="false" afterPath="$PROJECT_DIR$/bookkeeper/src/main.rs" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/bookkeeper/src/main.rs" beforeDir="false" afterPath="$PROJECT_DIR$/bookkeeper/src/main.rs" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/bookkeeper/templates/index.html.j2" beforeDir="false" afterPath="$PROJECT_DIR$/bookkeeper/templates/index.html.j2" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/bookkeeper/templates/base.html.j2" beforeDir="false" afterPath="$PROJECT_DIR$/bookkeeper/templates/base.html.j2" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/bookkeeper/templates/tx.html.j2" beforeDir="false" afterPath="$PROJECT_DIR$/bookkeeper/templates/tx.html.j2" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ExecutionTargetManager" SELECTED_TARGET="RsBuildProfile:dev" />
|
<component name="ExecutionTargetManager" SELECTED_TARGET="RsBuildProfile:release" />
|
||||||
<component name="FileTemplateManagerImpl">
|
<component name="FileTemplateManagerImpl">
|
||||||
<option name="RECENT_TEMPLATES">
|
<option name="RECENT_TEMPLATES">
|
||||||
<list>
|
<list>
|
||||||
@ -82,7 +81,7 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="RunManager" selected="Cargo.Run bookkeeper">
|
<component name="RunManager" selected="Cargo.Run bookkeeper">
|
||||||
<configuration name="Run bookkeeper" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
|
<configuration name="Run bookkeeper" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
|
||||||
<option name="buildProfileId" value="dev" />
|
<option name="buildProfileId" value="release" />
|
||||||
<option name="command" value="run --package bookkeeper --bin bookkeeper" />
|
<option name="command" value="run --package bookkeeper --bin bookkeeper" />
|
||||||
<option name="workingDirectory" value="file://$PROJECT_DIR$/bookkeeper" />
|
<option name="workingDirectory" value="file://$PROJECT_DIR$/bookkeeper" />
|
||||||
<envs />
|
<envs />
|
||||||
@ -151,7 +150,7 @@
|
|||||||
<workItem from="1735392290940" duration="620000" />
|
<workItem from="1735392290940" duration="620000" />
|
||||||
<workItem from="1735392928494" duration="12910000" />
|
<workItem from="1735392928494" duration="12910000" />
|
||||||
<workItem from="1735470376833" duration="16014000" />
|
<workItem from="1735470376833" duration="16014000" />
|
||||||
<workItem from="1735553493290" duration="4033000" />
|
<workItem from="1735553493290" duration="6862000" />
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00001" summary="Add bookkeeper">
|
<task id="LOCAL-00001" summary="Add bookkeeper">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
@ -209,7 +208,15 @@
|
|||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1735486582714</updated>
|
<updated>1735486582714</updated>
|
||||||
</task>
|
</task>
|
||||||
<option name="localTasksCounter" value="8" />
|
<task id="LOCAL-00008" summary="Modify Tx and Delete Tx">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1735562546317</created>
|
||||||
|
<option name="number" value="00008" />
|
||||||
|
<option name="presentableId" value="LOCAL-00008" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1735562546317</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="9" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TypeScriptGeneratedFilesManager">
|
<component name="TypeScriptGeneratedFilesManager">
|
||||||
@ -234,7 +241,8 @@
|
|||||||
<MESSAGE value="Refine data structure and index page" />
|
<MESSAGE value="Refine data structure and index page" />
|
||||||
<MESSAGE value="Implement add transaction" />
|
<MESSAGE value="Implement add transaction" />
|
||||||
<MESSAGE value="Update some settings" />
|
<MESSAGE value="Update some settings" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="Update some settings" />
|
<MESSAGE value="Modify Tx and Delete Tx" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="Modify Tx and Delete Tx" />
|
||||||
</component>
|
</component>
|
||||||
<component name="XSLT-Support.FileAssociations.UIState">
|
<component name="XSLT-Support.FileAssociations.UIState">
|
||||||
<expand />
|
<expand />
|
||||||
|
|||||||
2
bookkeeper/.cargo/config.toml
Normal file
2
bookkeeper/.cargo/config.toml
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
[target.'cfg(all(windows, target_env = "msvc"))']
|
||||||
|
rustflags = ["-C", "target-feature=+crt-static"]
|
||||||
@ -21,6 +21,7 @@ use std::str::FromStr;
|
|||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use rocket::http::Status;
|
use rocket::http::Status;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
use rocket::fs::FileServer;
|
||||||
|
|
||||||
#[derive(sea_orm_rocket::Database, Debug)]
|
#[derive(sea_orm_rocket::Database, Debug)]
|
||||||
#[database("bookkeeper")]
|
#[database("bookkeeper")]
|
||||||
@ -118,10 +119,8 @@ async fn get_tx(conn: Connection<'_, Db>, id: i32) -> Result<Template, Status> {
|
|||||||
|
|
||||||
#[post("/tx/<id>", data = "<data>")]
|
#[post("/tx/<id>", data = "<data>")]
|
||||||
async fn post_tx(data: Form<TransModel<'_>>, conn: Connection<'_, Db>, id: i32) -> Result<Redirect, Status> {
|
async fn post_tx(data: Form<TransModel<'_>>, conn: Connection<'_, Db>, id: i32) -> Result<Redirect, Status> {
|
||||||
dbg!(&data);
|
|
||||||
let mut record = translate(data);
|
let mut record = translate(data);
|
||||||
record.id = Set(id);
|
record.id = Set(id);
|
||||||
dbg!(&record);
|
|
||||||
match record.update(conn.into_inner()).await {
|
match record.update(conn.into_inner()).await {
|
||||||
Err(_) => { Err(Status::NotFound) },
|
Err(_) => { Err(Status::NotFound) },
|
||||||
Ok(_) => { Ok(Redirect::to("/")) },
|
Ok(_) => { Ok(Redirect::to("/")) },
|
||||||
@ -212,10 +211,10 @@ async fn run_migrations(rocket: Rocket<Build>) -> fairing::Result {
|
|||||||
|
|
||||||
#[launch]
|
#[launch]
|
||||||
async fn rocket() -> _ {
|
async fn rocket() -> _ {
|
||||||
println!("Loading templates from {:?}", std::env::current_dir().unwrap());
|
|
||||||
rocket::build()
|
rocket::build()
|
||||||
.attach(Db::init())
|
.attach(Db::init())
|
||||||
.attach(AdHoc::try_on_ignite("Migrations", run_migrations))
|
.attach(AdHoc::try_on_ignite("Migrations", run_migrations))
|
||||||
.attach(Template::fairing())
|
.attach(Template::fairing())
|
||||||
.mount("/", routes![index, add, get_add, get_tx, post_tx, delete_tx])
|
.mount("/", routes![index, add, get_add, get_tx, post_tx, delete_tx])
|
||||||
}
|
.mount("/static", FileServer::from("static"))
|
||||||
|
}
|
||||||
3
bookkeeper/static/bulma.min.css
vendored
Normal file
3
bookkeeper/static/bulma.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -4,7 +4,7 @@
|
|||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>{% block title %}Skeleton App{% endblock title %}</title>
|
<title>{% block title %}Skeleton App{% endblock title %}</title>
|
||||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.2/css/bulma.min.css">
|
<link rel="stylesheet" href="/static/bulma.min.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
{% block content %}{% endblock content %}
|
{% block content %}{% endblock content %}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user