advotracker: reorganize the project using a crate based structure
* advotracker: the framework project * crate/advotrackerdb: implementation of the database backend * crate/advotrackerd: implementation of the backend (daemon) * crate/adovtracker: implementaton of the application (CLI and GUI) Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
[package]
|
||||
name = "advotracker_db"
|
||||
version = "0.1.0"
|
||||
name = "advotrackerdb"
|
||||
version = "0.1.0-alpha1"
|
||||
authors = ["Ralf Zerres <ralf.zerres@networkx.de>"]
|
||||
description = "Advotracker crate implementing Database handling.\n"
|
||||
repository = "https://gitea.networkx.de:50443/rzerres/advotrackerdb"
|
||||
homepage = "https://gitea.networkx.de:50443/rzerres/advotrackerdb"
|
||||
readme = "README.md"
|
||||
license = "(0BSD OR MIT)"
|
||||
edition = "2018"
|
||||
@@ -15,39 +17,39 @@ panic = "abort"
|
||||
rpath = true
|
||||
|
||||
[lib]
|
||||
name = "advotracker_db"
|
||||
name = "advotrackerdb"
|
||||
path = "src/lib.rs"
|
||||
crate-type = ["dylib"]
|
||||
|
||||
[[bin]]
|
||||
name = "get-harms"
|
||||
path = "src/bin/get-harms.rs"
|
||||
advotracker_db = { Path="." }
|
||||
advotrackerdb = { Path="." }
|
||||
|
||||
[[bin]]
|
||||
name = "get-roles"
|
||||
path = "src/bin/get-roles.rs"
|
||||
advotracker_db = { Path="." }
|
||||
advotrackerdb = { Path="." }
|
||||
|
||||
[[bin]]
|
||||
name = "get-users"
|
||||
path = "src/bin/get-users.rs"
|
||||
advotracker_db = { Path="." }
|
||||
advotrackerdb = { Path="." }
|
||||
|
||||
[[bin]]
|
||||
name = "new-role"
|
||||
path = "src/bin/new-role.rs"
|
||||
advotracker_db = { Path="." }
|
||||
advotrackerdb = { Path="." }
|
||||
|
||||
[[bin]]
|
||||
name = "new-harm"
|
||||
path = "src/bin/new-harm.rs"
|
||||
advotracker_db = { Path="." }
|
||||
advotrackerdb = { Path="." }
|
||||
|
||||
[[bin]]
|
||||
name = "new-user"
|
||||
path = "src/bin/new-user.rs"
|
||||
advotracker_db = { Path="." }
|
||||
advotrackerdb = { Path="." }
|
||||
|
||||
[dependencies]
|
||||
lazy_static = "1.0"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
fn main() {
|
||||
println!("hey cargo");
|
||||
//println!("cargo:rustc-link-lib=dylib=advotracker_db.so");
|
||||
//println!("cargo:rustc-link-lib=dylib=advotrackerdb.so");
|
||||
println!("cargo:rustc-link-args=-Wl,-rpath=$ORIGIN");
|
||||
//println!("cargo:rustc-link-search=native=$ORIGIN");
|
||||
}
|
||||
|
||||
@@ -6,8 +6,10 @@
|
||||
*/
|
||||
|
||||
fn main() {
|
||||
use advotracker_db::functions::db_connection::establish_connection;
|
||||
use advotracker_db::models::harms::Harm;
|
||||
use crate::{
|
||||
functions::db_connection::establish_connection,
|
||||
models::harms::Harm,
|
||||
};
|
||||
|
||||
let connection = establish_connection();
|
||||
|
||||
|
||||
@@ -8,9 +8,11 @@
|
||||
fn main() {
|
||||
use diesel::RunQueryDsl;
|
||||
|
||||
use advotracker_db::functions::db_connection::establish_connection;
|
||||
use advotracker_db::models::roles::Role;
|
||||
use advotracker_db::schema::roles::dsl::*;
|
||||
use crate::{
|
||||
functions::db_connection::establish_connection,
|
||||
models::roles::Role,
|
||||
schema::roles::dsl::*,
|
||||
};
|
||||
|
||||
let connection = establish_connection();
|
||||
|
||||
|
||||
@@ -6,8 +6,11 @@
|
||||
*/
|
||||
|
||||
fn main() {
|
||||
use advotracker_db::functions::db_connection::establish_connection;
|
||||
use advotracker_db::models::users::User;
|
||||
|
||||
use crate::{
|
||||
functions::db_connection::establish_connection,
|
||||
models::users::User;
|
||||
};
|
||||
|
||||
let connection = establish_connection();
|
||||
|
||||
|
||||
@@ -9,8 +9,10 @@ fn main() {
|
||||
use chrono::Local;
|
||||
use std::io::{stdin, Read};
|
||||
|
||||
use advotracker_db::functions::db_connection::*;
|
||||
use advotracker_db::models::harms::Harm;
|
||||
use crate::{
|
||||
functions::db_connection::*,
|
||||
models::harms::Harm,
|
||||
};
|
||||
|
||||
let connection = establish_connection();
|
||||
|
||||
|
||||
@@ -8,8 +8,10 @@
|
||||
fn main() {
|
||||
use std::io::{stdin, Read};
|
||||
|
||||
use advotracker_db::functions::db_connection::*;
|
||||
use advotracker_db::models::roles::Role;
|
||||
use crate::{
|
||||
functions::db_connection::*,
|
||||
models::roles::Role,
|
||||
};
|
||||
|
||||
let connection = establish_connection();
|
||||
|
||||
|
||||
@@ -8,8 +8,10 @@
|
||||
fn main() {
|
||||
use std::io::{stdin, Read};
|
||||
|
||||
use advotracker_db::functions::db_connection::*;
|
||||
use advotracker_db::models::users::User;
|
||||
use crate::{
|
||||
functions::db_connection::*,
|
||||
models::users::User,
|
||||
};
|
||||
|
||||
let connection = establish_connection();
|
||||
|
||||
@@ -134,7 +136,6 @@ fn main() {
|
||||
*/
|
||||
|
||||
// Some data structure.
|
||||
//use advotracker_db::models::users::User;
|
||||
println!(
|
||||
"\nCreate new json stuct representing user: {} {}",
|
||||
first_name, last_name
|
||||
@@ -168,7 +169,7 @@ fn main() {
|
||||
/*
|
||||
let user_id = 1;
|
||||
let role_id = 1;
|
||||
use advotracker_db::functions::roles::*;
|
||||
use advotrackerdb::functions::roles::*;
|
||||
let _ = set_user_role(&connection, &user_id, &role_id);
|
||||
*/
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user