Finish rename

Cargo.lock

@@ -2735,12 +2735,12 @@ dependencies = [
  "opentelemetry 0.14.0",
  "opentelemetry-jaeger",
  "predicates",
+ "pslink-shared",
  "qrcode",
  "rand 0.8.4",
  "reqwest",
  "rpassword",
  "serde",
- "shared",
  "sqlx",
  "tempdir",
  "test_bin",
@@ -2754,21 +2754,32 @@ dependencies = [
 
 [[package]]
 name = "pslink-app"
-version = "0.4.0"
+version = "0.4.1-alpha.0"
 dependencies = [
  "enum-map",
  "fluent 0.15.0",
  "image",
+ "pslink-shared",
  "qrcode",
  "seed",
  "serde",
- "shared",
  "strum",
  "strum_macros",
  "unic-langid",
  "web-sys",
 ]
 
+[[package]]
+name = "pslink-shared"
+version = "0.4.1-alpha.0"
+dependencies = [
+ "chrono",
+ "enum-map",
+ "serde",
+ "strum",
+ "strum_macros",
+]
+
 [[package]]
 name = "publicsuffix"
 version = "1.5.6"
@@ -3457,17 +3468,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "shared"
-version = "0.4.0"
-dependencies = [
- "chrono",
- "enum-map",
- "serde",
- "strum",
- "strum_macros",
-]
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.0"

app/Cargo.toml

@@ -26,7 +26,7 @@ enum-map = "1"
 qrcode = "0.12"
 image = "0.23"
 
-shared = { path = "../shared" }
+pslink-shared = { path = "../shared" }
 
 [dependencies.web-sys]
 version = "0.3"

pslink/Cargo.toml

@@ -37,7 +37,7 @@ tracing-opentelemetry = "0.12"
 async-trait = "0.1"
 enum-map = {version="1", features = ["serde"]}
 
-shared = { path = "../shared" }
+pslink-shared = { path = "../shared" }
 
 [dependencies.chrono]
 features = ["serde"]

pslink/src/bin/pslink/cli.rs

@@ -3,7 +3,7 @@ use clap::{
     ArgMatches, SubCommand,
 };
 use dotenv::dotenv;
-use shared::datatypes::{Secret, User};
+use pslink_shared::datatypes::{Secret, User};
 use sqlx::{migrate::Migrator, Pool, Sqlite};
 use std::{
     fs::File,

pslink/src/bin/pslink/views.rs

@@ -13,8 +13,7 @@ use fluent_langneg::{
 use fluent_templates::LanguageIdentifier;
 use image::{DynamicImage, ImageOutputFormat, Luma};
 use pslink::queries::{authenticate, RoleGuard};
-use qrcode::QrCode;
+use pslink_shared::{
-use shared::{
     apirequests::{
         general::{Message, Status},
         links::{LinkDelta, LinkRequestForm},
@@ -22,6 +21,7 @@ use shared::{
     },
     datatypes::Lang,
 };
+use qrcode::QrCode;
 use tracing::{error, info, instrument, warn};
 
 use pslink::queries;

pslink/src/lib.rs

@@ -2,8 +2,8 @@ pub mod models;
 pub mod queries;
 
 use actix_web::HttpResponse;
+use pslink_shared::datatypes::Secret;
 use qrcode::types::QrError;
-use shared::datatypes::Secret;
 use sqlx::{Pool, Sqlite};
 use std::{fmt::Display, path::PathBuf, str::FromStr};
 use thiserror::Error;

pslink/src/models.rs

@@ -7,7 +7,7 @@ use async_trait::async_trait;
 use dotenv::dotenv;
 use serde::{Deserialize, Serialize};
 
-use shared::{
+use pslink_shared::{
     apirequests::{links::LinkDelta, users::Role},
     datatypes::{Count, Lang, Link, User},
 };

pslink/src/queries.rs

@@ -2,8 +2,7 @@ use std::str::FromStr;
 
 use actix_identity::Identity;
 use enum_map::EnumMap;
-use serde::Serialize;
+use pslink_shared::{
-use shared::{
     apirequests::{
         general::{EditMode, Filter, Operation, Ordering},
         links::{LinkDelta, LinkOverviewColumns, LinkRequestForm},
@@ -11,6 +10,7 @@ use shared::{
     },
     datatypes::{Count, FullLink, Lang, Link, Secret, User},
 };
+use serde::Serialize;
 use sqlx::Row;
 use tracing::{info, instrument, warn};