Add MVP
This commit is contained in:
3
.dockerignore
Normal file
3
.dockerignore
Normal file
@ -0,0 +1,3 @@
|
||||
Dockerfile
|
||||
target
|
||||
database
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1,3 @@
|
||||
.env
|
||||
/target
|
||||
/database
|
||||
|
||||
1740
Cargo.lock
generated
1740
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
29
Cargo.toml
29
Cargo.toml
@ -1,10 +1,33 @@
|
||||
[package]
|
||||
name = "stl"
|
||||
description = "Studielogg - Pronounced 'stell' - aka scuffed toggl"
|
||||
description = "studielogg, pronounced 'stell', aka scuffed toggl"
|
||||
version = "0.1.0"
|
||||
authors = ["Joakim Hulthe <joakim@hulthe.net>"]
|
||||
license = "MPL-2.0"
|
||||
edition = "2018"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
dotenv = "0.13.0"
|
||||
serde = "1"
|
||||
serde_json = "1"
|
||||
serde_derive = "1"
|
||||
log = "0.4.8"
|
||||
futures = "0.3"
|
||||
chrono = { version = "0.4", features = ["serde"] }
|
||||
sled = "0.34"
|
||||
semver = "0.11"
|
||||
uuid = { version = "0.8", features = ["serde", "v4"] }
|
||||
duplicate = "0.2"
|
||||
bincode = "1"
|
||||
handlebars = "1"
|
||||
|
||||
[dependencies.rocket]
|
||||
version = "0.4"
|
||||
#git = "https://github.com/SergioBenitez/Rocket"
|
||||
#branch = "master"
|
||||
|
||||
[dependencies.rocket_contrib]
|
||||
version = "0.4"
|
||||
#git = "https://github.com/SergioBenitez/Rocket"
|
||||
#branch = "master"
|
||||
features = ["handlebars_templates"]
|
||||
|
||||
39
Dockerfile
Normal file
39
Dockerfile
Normal file
@ -0,0 +1,39 @@
|
||||
###################
|
||||
### BUILD STAGE ###
|
||||
###################
|
||||
FROM rust:1.47 as build_stage
|
||||
|
||||
# Install build dependencies
|
||||
RUN rustup update &&\
|
||||
rustup default nightly &&\
|
||||
rustup target add x86_64-unknown-linux-musl
|
||||
|
||||
# Build project
|
||||
WORKDIR /app
|
||||
COPY . .
|
||||
RUN cargo build --release --target x86_64-unknown-linux-musl
|
||||
RUN strip target/x86_64-unknown-linux-musl/release/stl
|
||||
|
||||
########################
|
||||
### PRODUCTION STAGE ###
|
||||
########################
|
||||
FROM scratch
|
||||
|
||||
# Default to staging environment
|
||||
# Override with "production" when deploying for real
|
||||
ENV ROCKET_ENV="staging"
|
||||
|
||||
ENV ROCKET_TEMPLATE_DIR="/templates"
|
||||
ENV DB_PATH="/database"
|
||||
VOLUME "/database"
|
||||
|
||||
WORKDIR /
|
||||
|
||||
# Copy static files
|
||||
COPY templates templates
|
||||
COPY static static
|
||||
|
||||
# Copy application binary
|
||||
COPY --from=build_stage /app/target/x86_64-unknown-linux-musl/release/stl stl
|
||||
|
||||
CMD ["/stl"]
|
||||
373
LICENSE
Normal file
373
LICENSE
Normal file
@ -0,0 +1,373 @@
|
||||
Mozilla Public License Version 2.0
|
||||
==================================
|
||||
|
||||
1. Definitions
|
||||
--------------
|
||||
|
||||
1.1. "Contributor"
|
||||
means each individual or legal entity that creates, contributes to
|
||||
the creation of, or owns Covered Software.
|
||||
|
||||
1.2. "Contributor Version"
|
||||
means the combination of the Contributions of others (if any) used
|
||||
by a Contributor and that particular Contributor's Contribution.
|
||||
|
||||
1.3. "Contribution"
|
||||
means Covered Software of a particular Contributor.
|
||||
|
||||
1.4. "Covered Software"
|
||||
means Source Code Form to which the initial Contributor has attached
|
||||
the notice in Exhibit A, the Executable Form of such Source Code
|
||||
Form, and Modifications of such Source Code Form, in each case
|
||||
including portions thereof.
|
||||
|
||||
1.5. "Incompatible With Secondary Licenses"
|
||||
means
|
||||
|
||||
(a) that the initial Contributor has attached the notice described
|
||||
in Exhibit B to the Covered Software; or
|
||||
|
||||
(b) that the Covered Software was made available under the terms of
|
||||
version 1.1 or earlier of the License, but not also under the
|
||||
terms of a Secondary License.
|
||||
|
||||
1.6. "Executable Form"
|
||||
means any form of the work other than Source Code Form.
|
||||
|
||||
1.7. "Larger Work"
|
||||
means a work that combines Covered Software with other material, in
|
||||
a separate file or files, that is not Covered Software.
|
||||
|
||||
1.8. "License"
|
||||
means this document.
|
||||
|
||||
1.9. "Licensable"
|
||||
means having the right to grant, to the maximum extent possible,
|
||||
whether at the time of the initial grant or subsequently, any and
|
||||
all of the rights conveyed by this License.
|
||||
|
||||
1.10. "Modifications"
|
||||
means any of the following:
|
||||
|
||||
(a) any file in Source Code Form that results from an addition to,
|
||||
deletion from, or modification of the contents of Covered
|
||||
Software; or
|
||||
|
||||
(b) any new file in Source Code Form that contains any Covered
|
||||
Software.
|
||||
|
||||
1.11. "Patent Claims" of a Contributor
|
||||
means any patent claim(s), including without limitation, method,
|
||||
process, and apparatus claims, in any patent Licensable by such
|
||||
Contributor that would be infringed, but for the grant of the
|
||||
License, by the making, using, selling, offering for sale, having
|
||||
made, import, or transfer of either its Contributions or its
|
||||
Contributor Version.
|
||||
|
||||
1.12. "Secondary License"
|
||||
means either the GNU General Public License, Version 2.0, the GNU
|
||||
Lesser General Public License, Version 2.1, the GNU Affero General
|
||||
Public License, Version 3.0, or any later versions of those
|
||||
licenses.
|
||||
|
||||
1.13. "Source Code Form"
|
||||
means the form of the work preferred for making modifications.
|
||||
|
||||
1.14. "You" (or "Your")
|
||||
means an individual or a legal entity exercising rights under this
|
||||
License. For legal entities, "You" includes any entity that
|
||||
controls, is controlled by, or is under common control with You. For
|
||||
purposes of this definition, "control" means (a) the power, direct
|
||||
or indirect, to cause the direction or management of such entity,
|
||||
whether by contract or otherwise, or (b) ownership of more than
|
||||
fifty percent (50%) of the outstanding shares or beneficial
|
||||
ownership of such entity.
|
||||
|
||||
2. License Grants and Conditions
|
||||
--------------------------------
|
||||
|
||||
2.1. Grants
|
||||
|
||||
Each Contributor hereby grants You a world-wide, royalty-free,
|
||||
non-exclusive license:
|
||||
|
||||
(a) under intellectual property rights (other than patent or trademark)
|
||||
Licensable by such Contributor to use, reproduce, make available,
|
||||
modify, display, perform, distribute, and otherwise exploit its
|
||||
Contributions, either on an unmodified basis, with Modifications, or
|
||||
as part of a Larger Work; and
|
||||
|
||||
(b) under Patent Claims of such Contributor to make, use, sell, offer
|
||||
for sale, have made, import, and otherwise transfer either its
|
||||
Contributions or its Contributor Version.
|
||||
|
||||
2.2. Effective Date
|
||||
|
||||
The licenses granted in Section 2.1 with respect to any Contribution
|
||||
become effective for each Contribution on the date the Contributor first
|
||||
distributes such Contribution.
|
||||
|
||||
2.3. Limitations on Grant Scope
|
||||
|
||||
The licenses granted in this Section 2 are the only rights granted under
|
||||
this License. No additional rights or licenses will be implied from the
|
||||
distribution or licensing of Covered Software under this License.
|
||||
Notwithstanding Section 2.1(b) above, no patent license is granted by a
|
||||
Contributor:
|
||||
|
||||
(a) for any code that a Contributor has removed from Covered Software;
|
||||
or
|
||||
|
||||
(b) for infringements caused by: (i) Your and any other third party's
|
||||
modifications of Covered Software, or (ii) the combination of its
|
||||
Contributions with other software (except as part of its Contributor
|
||||
Version); or
|
||||
|
||||
(c) under Patent Claims infringed by Covered Software in the absence of
|
||||
its Contributions.
|
||||
|
||||
This License does not grant any rights in the trademarks, service marks,
|
||||
or logos of any Contributor (except as may be necessary to comply with
|
||||
the notice requirements in Section 3.4).
|
||||
|
||||
2.4. Subsequent Licenses
|
||||
|
||||
No Contributor makes additional grants as a result of Your choice to
|
||||
distribute the Covered Software under a subsequent version of this
|
||||
License (see Section 10.2) or under the terms of a Secondary License (if
|
||||
permitted under the terms of Section 3.3).
|
||||
|
||||
2.5. Representation
|
||||
|
||||
Each Contributor represents that the Contributor believes its
|
||||
Contributions are its original creation(s) or it has sufficient rights
|
||||
to grant the rights to its Contributions conveyed by this License.
|
||||
|
||||
2.6. Fair Use
|
||||
|
||||
This License is not intended to limit any rights You have under
|
||||
applicable copyright doctrines of fair use, fair dealing, or other
|
||||
equivalents.
|
||||
|
||||
2.7. Conditions
|
||||
|
||||
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
|
||||
in Section 2.1.
|
||||
|
||||
3. Responsibilities
|
||||
-------------------
|
||||
|
||||
3.1. Distribution of Source Form
|
||||
|
||||
All distribution of Covered Software in Source Code Form, including any
|
||||
Modifications that You create or to which You contribute, must be under
|
||||
the terms of this License. You must inform recipients that the Source
|
||||
Code Form of the Covered Software is governed by the terms of this
|
||||
License, and how they can obtain a copy of this License. You may not
|
||||
attempt to alter or restrict the recipients' rights in the Source Code
|
||||
Form.
|
||||
|
||||
3.2. Distribution of Executable Form
|
||||
|
||||
If You distribute Covered Software in Executable Form then:
|
||||
|
||||
(a) such Covered Software must also be made available in Source Code
|
||||
Form, as described in Section 3.1, and You must inform recipients of
|
||||
the Executable Form how they can obtain a copy of such Source Code
|
||||
Form by reasonable means in a timely manner, at a charge no more
|
||||
than the cost of distribution to the recipient; and
|
||||
|
||||
(b) You may distribute such Executable Form under the terms of this
|
||||
License, or sublicense it under different terms, provided that the
|
||||
license for the Executable Form does not attempt to limit or alter
|
||||
the recipients' rights in the Source Code Form under this License.
|
||||
|
||||
3.3. Distribution of a Larger Work
|
||||
|
||||
You may create and distribute a Larger Work under terms of Your choice,
|
||||
provided that You also comply with the requirements of this License for
|
||||
the Covered Software. If the Larger Work is a combination of Covered
|
||||
Software with a work governed by one or more Secondary Licenses, and the
|
||||
Covered Software is not Incompatible With Secondary Licenses, this
|
||||
License permits You to additionally distribute such Covered Software
|
||||
under the terms of such Secondary License(s), so that the recipient of
|
||||
the Larger Work may, at their option, further distribute the Covered
|
||||
Software under the terms of either this License or such Secondary
|
||||
License(s).
|
||||
|
||||
3.4. Notices
|
||||
|
||||
You may not remove or alter the substance of any license notices
|
||||
(including copyright notices, patent notices, disclaimers of warranty,
|
||||
or limitations of liability) contained within the Source Code Form of
|
||||
the Covered Software, except that You may alter any license notices to
|
||||
the extent required to remedy known factual inaccuracies.
|
||||
|
||||
3.5. Application of Additional Terms
|
||||
|
||||
You may choose to offer, and to charge a fee for, warranty, support,
|
||||
indemnity or liability obligations to one or more recipients of Covered
|
||||
Software. However, You may do so only on Your own behalf, and not on
|
||||
behalf of any Contributor. You must make it absolutely clear that any
|
||||
such warranty, support, indemnity, or liability obligation is offered by
|
||||
You alone, and You hereby agree to indemnify every Contributor for any
|
||||
liability incurred by such Contributor as a result of warranty, support,
|
||||
indemnity or liability terms You offer. You may include additional
|
||||
disclaimers of warranty and limitations of liability specific to any
|
||||
jurisdiction.
|
||||
|
||||
4. Inability to Comply Due to Statute or Regulation
|
||||
---------------------------------------------------
|
||||
|
||||
If it is impossible for You to comply with any of the terms of this
|
||||
License with respect to some or all of the Covered Software due to
|
||||
statute, judicial order, or regulation then You must: (a) comply with
|
||||
the terms of this License to the maximum extent possible; and (b)
|
||||
describe the limitations and the code they affect. Such description must
|
||||
be placed in a text file included with all distributions of the Covered
|
||||
Software under this License. Except to the extent prohibited by statute
|
||||
or regulation, such description must be sufficiently detailed for a
|
||||
recipient of ordinary skill to be able to understand it.
|
||||
|
||||
5. Termination
|
||||
--------------
|
||||
|
||||
5.1. The rights granted under this License will terminate automatically
|
||||
if You fail to comply with any of its terms. However, if You become
|
||||
compliant, then the rights granted under this License from a particular
|
||||
Contributor are reinstated (a) provisionally, unless and until such
|
||||
Contributor explicitly and finally terminates Your grants, and (b) on an
|
||||
ongoing basis, if such Contributor fails to notify You of the
|
||||
non-compliance by some reasonable means prior to 60 days after You have
|
||||
come back into compliance. Moreover, Your grants from a particular
|
||||
Contributor are reinstated on an ongoing basis if such Contributor
|
||||
notifies You of the non-compliance by some reasonable means, this is the
|
||||
first time You have received notice of non-compliance with this License
|
||||
from such Contributor, and You become compliant prior to 30 days after
|
||||
Your receipt of the notice.
|
||||
|
||||
5.2. If You initiate litigation against any entity by asserting a patent
|
||||
infringement claim (excluding declaratory judgment actions,
|
||||
counter-claims, and cross-claims) alleging that a Contributor Version
|
||||
directly or indirectly infringes any patent, then the rights granted to
|
||||
You by any and all Contributors for the Covered Software under Section
|
||||
2.1 of this License shall terminate.
|
||||
|
||||
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
|
||||
end user license agreements (excluding distributors and resellers) which
|
||||
have been validly granted by You or Your distributors under this License
|
||||
prior to termination shall survive termination.
|
||||
|
||||
************************************************************************
|
||||
* *
|
||||
* 6. Disclaimer of Warranty *
|
||||
* ------------------------- *
|
||||
* *
|
||||
* Covered Software is provided under this License on an "as is" *
|
||||
* basis, without warranty of any kind, either expressed, implied, or *
|
||||
* statutory, including, without limitation, warranties that the *
|
||||
* Covered Software is free of defects, merchantable, fit for a *
|
||||
* particular purpose or non-infringing. The entire risk as to the *
|
||||
* quality and performance of the Covered Software is with You. *
|
||||
* Should any Covered Software prove defective in any respect, You *
|
||||
* (not any Contributor) assume the cost of any necessary servicing, *
|
||||
* repair, or correction. This disclaimer of warranty constitutes an *
|
||||
* essential part of this License. No use of any Covered Software is *
|
||||
* authorized under this License except under this disclaimer. *
|
||||
* *
|
||||
************************************************************************
|
||||
|
||||
************************************************************************
|
||||
* *
|
||||
* 7. Limitation of Liability *
|
||||
* -------------------------- *
|
||||
* *
|
||||
* Under no circumstances and under no legal theory, whether tort *
|
||||
* (including negligence), contract, or otherwise, shall any *
|
||||
* Contributor, or anyone who distributes Covered Software as *
|
||||
* permitted above, be liable to You for any direct, indirect, *
|
||||
* special, incidental, or consequential damages of any character *
|
||||
* including, without limitation, damages for lost profits, loss of *
|
||||
* goodwill, work stoppage, computer failure or malfunction, or any *
|
||||
* and all other commercial damages or losses, even if such party *
|
||||
* shall have been informed of the possibility of such damages. This *
|
||||
* limitation of liability shall not apply to liability for death or *
|
||||
* personal injury resulting from such party's negligence to the *
|
||||
* extent applicable law prohibits such limitation. Some *
|
||||
* jurisdictions do not allow the exclusion or limitation of *
|
||||
* incidental or consequential damages, so this exclusion and *
|
||||
* limitation may not apply to You. *
|
||||
* *
|
||||
************************************************************************
|
||||
|
||||
8. Litigation
|
||||
-------------
|
||||
|
||||
Any litigation relating to this License may be brought only in the
|
||||
courts of a jurisdiction where the defendant maintains its principal
|
||||
place of business and such litigation shall be governed by laws of that
|
||||
jurisdiction, without reference to its conflict-of-law provisions.
|
||||
Nothing in this Section shall prevent a party's ability to bring
|
||||
cross-claims or counter-claims.
|
||||
|
||||
9. Miscellaneous
|
||||
----------------
|
||||
|
||||
This License represents the complete agreement concerning the subject
|
||||
matter hereof. If any provision of this License is held to be
|
||||
unenforceable, such provision shall be reformed only to the extent
|
||||
necessary to make it enforceable. Any law or regulation which provides
|
||||
that the language of a contract shall be construed against the drafter
|
||||
shall not be used to construe this License against a Contributor.
|
||||
|
||||
10. Versions of the License
|
||||
---------------------------
|
||||
|
||||
10.1. New Versions
|
||||
|
||||
Mozilla Foundation is the license steward. Except as provided in Section
|
||||
10.3, no one other than the license steward has the right to modify or
|
||||
publish new versions of this License. Each version will be given a
|
||||
distinguishing version number.
|
||||
|
||||
10.2. Effect of New Versions
|
||||
|
||||
You may distribute the Covered Software under the terms of the version
|
||||
of the License under which You originally received the Covered Software,
|
||||
or under the terms of any subsequent version published by the license
|
||||
steward.
|
||||
|
||||
10.3. Modified Versions
|
||||
|
||||
If you create software not governed by this License, and you want to
|
||||
create a new license for such software, you may create and use a
|
||||
modified version of this License if you rename the license and remove
|
||||
any references to the name of the license steward (except to note that
|
||||
such modified license differs from this License).
|
||||
|
||||
10.4. Distributing Source Code Form that is Incompatible With Secondary
|
||||
Licenses
|
||||
|
||||
If You choose to distribute Source Code Form that is Incompatible With
|
||||
Secondary Licenses under the terms of this version of the License, the
|
||||
notice described in Exhibit B of this License must be attached.
|
||||
|
||||
Exhibit A - Source Code Form License Notice
|
||||
-------------------------------------------
|
||||
|
||||
This Source Code Form is subject to the terms of the Mozilla Public
|
||||
License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
If it is not possible or desirable to put the notice in a particular
|
||||
file, then You may include the notice in a location (such as a LICENSE
|
||||
file in a relevant directory) where a recipient would be likely to look
|
||||
for such a notice.
|
||||
|
||||
You may add additional accurate notices of copyright ownership.
|
||||
|
||||
Exhibit B - "Incompatible With Secondary Licenses" Notice
|
||||
---------------------------------------------------------
|
||||
|
||||
This Source Code Form is "Incompatible With Secondary Licenses", as
|
||||
defined by the Mozilla Public License, v. 2.0.
|
||||
16
example.env
Normal file
16
example.env
Normal file
@ -0,0 +1,16 @@
|
||||
DB_PATH=./database
|
||||
|
||||
# Tests are required to run sequentially so that the database state won't interfere
|
||||
# TODO: we don't have tests yet :)
|
||||
#RUST_TEST_THREADS=1
|
||||
|
||||
## Rocket Web Server Configuration ##
|
||||
#ROCKET_ADDRESS="localhost"
|
||||
#ROCKET_PORT=8000
|
||||
#ROCKET_WORKERS=[number of cpus * 2]
|
||||
#ROCKET_LOG="normal"
|
||||
#ROCKET_SECRET_KEY=[randomly generated at launch]
|
||||
#ROCKET_LIMITS="{ forms = 32768 }"
|
||||
ROCKET_TEMPLATE_DIR="templates"
|
||||
## =============================== ##
|
||||
|
||||
2
src/database/mod.rs
Normal file
2
src/database/mod.rs
Normal file
@ -0,0 +1,2 @@
|
||||
pub mod unversioned;
|
||||
pub mod v1;
|
||||
6
src/database/unversioned.rs
Normal file
6
src/database/unversioned.rs
Normal file
@ -0,0 +1,6 @@
|
||||
pub mod global {
|
||||
pub mod schema_version {
|
||||
pub const K: &str = "SCHEMA_VERSION";
|
||||
pub type V = (u32, u32, u32);
|
||||
}
|
||||
}
|
||||
46
src/database/v1.rs
Normal file
46
src/database/v1.rs
Normal file
@ -0,0 +1,46 @@
|
||||
pub(self) use chrono::NaiveDateTime;
|
||||
pub(self) use serde_derive::{Serialize, Deserialize};
|
||||
pub(self) use uuid::Uuid;
|
||||
|
||||
/// Stuff in the default namespace
|
||||
pub mod global {
|
||||
}
|
||||
|
||||
pub mod trees {
|
||||
pub mod categories {
|
||||
use super::super::*;
|
||||
|
||||
pub const NAME: &str = "CATEGORIES";
|
||||
|
||||
pub type K = Uuid;
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct V {
|
||||
/// The name of the category
|
||||
pub name: String,
|
||||
|
||||
/// The color of the button in the rendered view
|
||||
pub color: String,
|
||||
|
||||
/// If the session is not active, this will be None
|
||||
pub started: Option<NaiveDateTime>,
|
||||
}
|
||||
}
|
||||
|
||||
pub mod past_sessions {
|
||||
use super::super::*;
|
||||
|
||||
pub const NAME: &str = "PAST_SESSIONS";
|
||||
|
||||
pub type K = Uuid;
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct V {
|
||||
pub category: trees::categories::K,
|
||||
pub started: NaiveDateTime,
|
||||
pub ended: NaiveDateTime,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
47
src/main.rs
47
src/main.rs
@ -1,3 +1,46 @@
|
||||
fn main() {
|
||||
println!("Hello, world!");
|
||||
#![feature(decl_macro)]
|
||||
mod database;
|
||||
mod routes;
|
||||
mod status_json;
|
||||
|
||||
use std::{io, env};
|
||||
use dotenv::dotenv;
|
||||
use rocket_contrib::templates::Template;
|
||||
use rocket_contrib::serve::StaticFiles;
|
||||
use handlebars::handlebars_helper;
|
||||
|
||||
fn main() -> io::Result<()> {
|
||||
dotenv().ok();
|
||||
|
||||
let db_path = env::var("DB_PATH").expect("DB_PATH not set");
|
||||
|
||||
let sled = sled::open(db_path)?;
|
||||
|
||||
handlebars_helper!(pretty_datetime: |dt: str| {
|
||||
let date = dt.trim_end_matches(|c| c != 'T').trim_end_matches('T');
|
||||
let time = dt.trim_start_matches(|c| c != 'T').trim_start_matches('T')
|
||||
.trim_end_matches(|c| c != ':').trim_end_matches(':');
|
||||
format!("{} {}", date, time)
|
||||
});
|
||||
|
||||
let rocket = rocket::ignite()
|
||||
.attach(Template::custom(|engines| {
|
||||
engines.handlebars.register_helper("pretty_datetime", Box::new(pretty_datetime));
|
||||
}))
|
||||
.manage(sled)
|
||||
.mount("/static", StaticFiles::from("static"))
|
||||
.mount(
|
||||
"/",
|
||||
rocket::routes![
|
||||
routes::index,
|
||||
routes::history,
|
||||
routes::create_category,
|
||||
routes::toggle_category,
|
||||
],
|
||||
);
|
||||
|
||||
rocket.launch();
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
||||
126
src/routes.rs
Normal file
126
src/routes.rs
Normal file
@ -0,0 +1,126 @@
|
||||
use serde_derive::{Serialize, Deserialize};
|
||||
use rocket::{State, get, post, uri};
|
||||
use uuid::Uuid;
|
||||
use rocket_contrib::templates::Template;
|
||||
use crate::database::v1::trees::{categories, past_sessions};
|
||||
use crate::status_json::StatusJson;
|
||||
use rocket::http::Status;
|
||||
use bincode::{serialize, deserialize};
|
||||
use rocket::response::Redirect;
|
||||
use rocket::request::{FromForm, Form};
|
||||
use sled::Transactional;
|
||||
use chrono::{Duration, Utc};
|
||||
use std::collections::HashMap;
|
||||
|
||||
#[derive(FromForm)]
|
||||
pub struct NewCategory {
|
||||
name: String,
|
||||
color: String,
|
||||
}
|
||||
|
||||
#[post("/create_category", data="<category>")]
|
||||
pub fn create_category(category: Form<NewCategory>, db: State<'_, sled::Db>) -> Result<Redirect, StatusJson> {
|
||||
let category = category.into_inner();
|
||||
|
||||
let categories_tree = db.open_tree(categories::NAME)?;
|
||||
categories_tree.insert(serialize(&Uuid::new_v4())?, serialize(&categories::V {
|
||||
name: category.name,
|
||||
color: category.color,
|
||||
started: None,
|
||||
})?)?;
|
||||
|
||||
Ok(Redirect::to(uri!(index)))
|
||||
}
|
||||
|
||||
#[post("/toggle_category/<category_uuid>")]
|
||||
pub fn toggle_category(category_uuid: String, db: State<'_, sled::Db>) -> Result<Redirect, StatusJson> {
|
||||
let category_uuid = Uuid::parse_str(&category_uuid)?;
|
||||
let category_uuid_s = sled::IVec::from(serialize(&category_uuid)?);
|
||||
|
||||
let categories_tree = db.open_tree(categories::NAME)?;
|
||||
let past_sessions_tree = db.open_tree(past_sessions::NAME)?;
|
||||
|
||||
Ok((&categories_tree, &past_sessions_tree)
|
||||
.transaction(|(tx_categories, tx_past_sessions)| {
|
||||
match tx_categories.get(&category_uuid_s)? {
|
||||
None => return Ok(Err(Status::NotFound)),
|
||||
Some(data) => {
|
||||
|
||||
let mut category: categories::V = dbg!(deserialize(&data).unwrap());
|
||||
let now = Utc::now().naive_utc();
|
||||
|
||||
match category.started.take() {
|
||||
Some(started) => {
|
||||
// only save sessions longer than 5 minutes
|
||||
let duration = now - started;
|
||||
if duration > Duration::minutes(5) {
|
||||
let session_uuid = serialize(&Uuid::new_v4()).unwrap();
|
||||
let past_session = past_sessions::V {
|
||||
category: category_uuid,
|
||||
started,
|
||||
ended: now,
|
||||
};
|
||||
tx_past_sessions.insert(session_uuid, serialize(&past_session).unwrap())?;
|
||||
}
|
||||
}
|
||||
None => {
|
||||
category.started = Some(now);
|
||||
}
|
||||
}
|
||||
|
||||
tx_categories.insert(&category_uuid_s, serialize(&category).unwrap())?;
|
||||
}
|
||||
}
|
||||
|
||||
Ok(Ok(Redirect::to(uri!(index))))
|
||||
})??)
|
||||
}
|
||||
|
||||
#[get("/")]
|
||||
pub fn index(db: State<'_, sled::Db>) -> Result<Template, StatusJson> {
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
struct TemplateContext {
|
||||
categories: Vec<(Uuid, categories::V)>,
|
||||
}
|
||||
|
||||
let categories_tree = db.open_tree(categories::NAME)?;
|
||||
|
||||
let context = TemplateContext {
|
||||
categories: categories_tree.iter()
|
||||
.map(|result| result.map(|(k, v)| deserialize(&k).and_then(|k| deserialize(&v).map(|v| (k, v)))))
|
||||
.collect::<Result<Result<_, _>, _>>()??,
|
||||
};
|
||||
|
||||
Ok(Template::render("index", dbg!(&context)))
|
||||
}
|
||||
|
||||
#[get("/history")]
|
||||
pub fn history(db: State<'_, sled::Db>) -> Result<Template, StatusJson> {
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
struct TemplateContext {
|
||||
sessions: Vec<(categories::V, past_sessions::V)>,
|
||||
}
|
||||
|
||||
let categories_tree = db.open_tree(categories::NAME)?;
|
||||
let past_sessions_tree = db.open_tree(past_sessions::NAME)?;
|
||||
|
||||
let categories: HashMap<categories::K, categories::V> = categories_tree.iter()
|
||||
.map(|result| result.map(|(k, v)| deserialize(&k).and_then(|k| deserialize(&v).map(|v| (k, v)))))
|
||||
.collect::<Result<Result<_, _>, _>>()??;
|
||||
|
||||
let past_sessions: HashMap<past_sessions::K, past_sessions::V> = past_sessions_tree.iter()
|
||||
.map(|result| result.map(|(k, v)| deserialize(&k).and_then(|k| deserialize(&v).map(|v| (k, v)))))
|
||||
.collect::<Result<Result<_, _>, _>>()??;
|
||||
|
||||
|
||||
let context = TemplateContext {
|
||||
sessions: past_sessions.into_iter()
|
||||
.map(|(_, session)| {
|
||||
let category = categories.get(&session.category).unwrap().clone();
|
||||
(category, session)
|
||||
})
|
||||
.collect(),
|
||||
};
|
||||
|
||||
Ok(Template::render("history", dbg!(&context)))
|
||||
}
|
||||
86
src/status_json.rs
Normal file
86
src/status_json.rs
Normal file
@ -0,0 +1,86 @@
|
||||
use duplicate::duplicate;
|
||||
use log::{info, warn};
|
||||
use rocket::http::Status;
|
||||
use rocket::response::{Responder, Response};
|
||||
use rocket::Request;
|
||||
use rocket_contrib::json;
|
||||
use rocket_contrib::json::Json; // macro
|
||||
|
||||
/// An error message which can be serialized as JSON.
|
||||
///
|
||||
/// #### Example JSON
|
||||
/// ```json
|
||||
/// {
|
||||
/// "status": 404,
|
||||
/// "description": "Not Found"
|
||||
/// }
|
||||
/// ```
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct StatusJson {
|
||||
pub status: Status,
|
||||
pub description: String,
|
||||
}
|
||||
|
||||
impl StatusJson {
|
||||
pub fn new<S: ToString>(status: Status, description: S) -> Self {
|
||||
StatusJson {
|
||||
status,
|
||||
description: description.to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn describe<S: ToString>(mut self, description: S) -> Self {
|
||||
self.description = description.to_string();
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
impl<'r> Responder<'r> for StatusJson {
|
||||
fn respond_to(self, req: &Request) -> Result<Response<'r>, Status> {
|
||||
if self.status.code >= 400 {
|
||||
warn!(
|
||||
"Responding with status {}.\n\
|
||||
Description: {}",
|
||||
self.status, self.description,
|
||||
);
|
||||
} else {
|
||||
info!("Responding with status {}", self.status);
|
||||
}
|
||||
|
||||
let mut response = Json(json!({
|
||||
"status": self.status.code,
|
||||
"description": self.description,
|
||||
}))
|
||||
.respond_to(req)?;
|
||||
|
||||
response.set_status(self.status);
|
||||
|
||||
Ok(response)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#[duplicate(
|
||||
status_code T;
|
||||
[ Status::InternalServerError ] [ sled::Error ];
|
||||
[ Status::InternalServerError ] [ sled::transaction::TransactionError ];
|
||||
[ Status::InternalServerError ] [ bincode::Error ];
|
||||
[ Status::BadRequest ] [ uuid::Error ];
|
||||
)]
|
||||
impl From<T> for StatusJson {
|
||||
fn from(e: T) -> StatusJson {
|
||||
StatusJson {
|
||||
status: status_code,
|
||||
description: e.to_string(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<Status> for StatusJson {
|
||||
fn from(status: Status) -> StatusJson {
|
||||
StatusJson {
|
||||
description: status.reason.to_string(),
|
||||
status,
|
||||
}
|
||||
}
|
||||
}
|
||||
102
static/styles.css
Normal file
102
static/styles.css
Normal file
@ -0,0 +1,102 @@
|
||||
body {
|
||||
font-family: Ubuntu;
|
||||
}
|
||||
|
||||
.title {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
ul.category_list {
|
||||
max-width: 40em;
|
||||
list-style-type: none;
|
||||
margin: auto;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
ul.category_list > li:nth-of-type(odd) {
|
||||
background-color: #f0f0f0;
|
||||
}
|
||||
|
||||
.category_entry {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
.category_name {
|
||||
font-size: 3em;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
/*
|
||||
.category_button {
|
||||
border-radius: 1em;
|
||||
color: white;
|
||||
font-size: 2em;
|
||||
height: 2em;
|
||||
width: 2em;
|
||||
margin: 0.1em;
|
||||
font-family: 'Source Sans Pro', sans-serif;
|
||||
}
|
||||
*/
|
||||
|
||||
.category_icon {
|
||||
border-radius: 2em;
|
||||
height: 4em;
|
||||
width: 4em;
|
||||
margin-top: auto;
|
||||
margin-bottom: auto;
|
||||
margin-left: 1em;
|
||||
}
|
||||
|
||||
.category_button_container {
|
||||
margin: 0.1em;
|
||||
background-color: #c1c1c1;
|
||||
border-radius: 3.5em;
|
||||
width: 7em;
|
||||
height: 7em;
|
||||
}
|
||||
|
||||
.category_button {
|
||||
box-sizing: border-box;
|
||||
height: 60px;
|
||||
|
||||
margin: 30px;
|
||||
margin-top: 25px;
|
||||
|
||||
background-color: transparent;
|
||||
border-color: transparent transparent transparent #202020;
|
||||
transition: 100ms all ease;
|
||||
will-change: border-width;
|
||||
cursor: pointer;
|
||||
|
||||
/* play state */
|
||||
border-style: solid;
|
||||
border-width: 30px 0 30px 50px;
|
||||
}
|
||||
|
||||
.category_button_toggled {
|
||||
/* pause state */
|
||||
border-style: double;
|
||||
border-width: 0px 0 0px 50px;
|
||||
}
|
||||
|
||||
|
||||
.history_list {
|
||||
|
||||
}
|
||||
|
||||
.history_entry {
|
||||
|
||||
}
|
||||
|
||||
.history_entry_category {
|
||||
|
||||
}
|
||||
|
||||
.history_entry_started {
|
||||
|
||||
}
|
||||
|
||||
.history_entry_ended {
|
||||
|
||||
}
|
||||
29
templates/history.hbs
Normal file
29
templates/history.hbs
Normal file
@ -0,0 +1,29 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
<meta name="description" content="">
|
||||
|
||||
<link rel="icon" type="image/png" href="/static/icon.png">
|
||||
<link rel="stylesheet" href="/static/styles.css">
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu|Ubuntu+Mono&display=swap">
|
||||
|
||||
<title>stl</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h1 class="title">stl</h1>
|
||||
<div class="history_list">
|
||||
{{#each sessions}}
|
||||
<div class="history_entry">
|
||||
<span class="history_entry_category">{{this.0.name}}</span>
|
||||
<span> from </span>
|
||||
<span class="history_entry_started">{{pretty_datetime this.1.started}}</span>
|
||||
<span> to </span>
|
||||
<span class="history_entry_ended">{{pretty_datetime this.1.ended}}</span>
|
||||
</div>
|
||||
{{/each}}
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
65
templates/index.hbs
Normal file
65
templates/index.hbs
Normal file
@ -0,0 +1,65 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
<meta name="description" content="">
|
||||
|
||||
<link rel="icon" type="image/png" href="/static/icon.png">
|
||||
<link rel="stylesheet" href="/static/styles.css">
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu|Ubuntu+Mono&display=swap">
|
||||
|
||||
<title>stl</title>
|
||||
<script>
|
||||
function toggle_category(id) {
|
||||
var url = "/toggle_category/" + id;
|
||||
//var params = "lorem=ipsum&name=alpha";
|
||||
var xhr = new XMLHttpRequest();
|
||||
xhr.open("POST", url, true);
|
||||
|
||||
//Send the proper header information along with the request
|
||||
xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
|
||||
|
||||
xhr.send();
|
||||
|
||||
let toggled_class = "category_button_toggled";
|
||||
let cl = document.getElementById("button-" + id).classList;
|
||||
if(cl.contains(toggled_class)) {
|
||||
cl.remove(toggled_class);
|
||||
} else {
|
||||
cl.add(toggled_class);
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h1 class="title">stl</h1>
|
||||
|
||||
{{#each categories}}
|
||||
<form action="/toggle_category/{{this.0}}" method="post" id="{{this.0}}"></form>
|
||||
{{/each}}
|
||||
|
||||
<ul class="category_list">
|
||||
{{#each categories}}
|
||||
<li class="category_entry">
|
||||
<div class="category_icon"
|
||||
style="background-color: {{this.1.color}}"
|
||||
></div>
|
||||
<span class="category_name">{{this.1.name}}</span>
|
||||
<div class="category_button_container">
|
||||
<button
|
||||
id="button-{{this.0}}"
|
||||
onClick="toggle_category('{{this.0}}')"
|
||||
{{#if this.1.started}}
|
||||
class="category_button category_button_toggled"
|
||||
{{else}}
|
||||
class="category_button"
|
||||
{{/if}}>
|
||||
</button>
|
||||
</div>
|
||||
</li>
|
||||
{{/each}}
|
||||
</ul>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user