move files

Calciumdibromid · Jan 16, 2022 · fab65fa · fab65fa
1 parent 00bd9dd
commit fab65fa
Show file tree

Hide file tree

Showing 734 changed files with 216 additions and 186 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,145 +1,8 @@
-
-# Created by https://www.toptal.com/developers/gitignore/api/node,yarn
-# Edit at https://www.toptal.com/developers/gitignore?templates=node,yarn
-
-### Node ###
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
 # dotenv environment variables file
 .env
 .env.test
 .env*.local
 
-# build output
-dist
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and not Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-# Stores VSCode versions used for testing VSCode extensions
-.vscode-test
-
-### yarn ###
-# https://yarnpkg.com/advanced/qa#which-files-should-be-gitignored
-
-.yarn/*
-!.yarn/releases
-!.yarn/plugins
-!.yarn/sdks
-!.yarn/versions
-
-# if you are NOT using Zero-installs, then:
-# comment the following lines
-!.yarn/cache
-
-# and uncomment the following lines
-# .pnp.*
-
-# End of https://www.toptal.com/developers/gitignore/api/node,yarn
-
-# Angular
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
-# compiled output
-/dist
-/tmp
-/out-tsc
-# Only exists if Bazel was run
-/bazel-out
-
-# dependencies
-/node_modules
-
-# profiling files
-chrome-profiler-events*.json
-speed-measure-plugin*.json
-
 # IDEs and editors
 /.idea
 .project
@@ -157,16 +20,6 @@ speed-measure-plugin*.json
 !.vscode/extensions.json
 .history/*
 
-# misc
-/.sass-cache
-/connect.lock
-/coverage
-/libpeerconnection.log
-npm-debug.log
-yarn-error.log
-testem.log
-/typings
-
 # System Files
 .DS_Store
 Thumbs.db

diff --git a/ghs_symbols/ghs01.png → assets/ghs_symbols/ghs01.png b/ghs_symbols/ghs01.png → assets/ghs_symbols/ghs01.png
diff --git a/ghs_symbols/ghs02.png → assets/ghs_symbols/ghs02.png b/ghs_symbols/ghs02.png → assets/ghs_symbols/ghs02.png
diff --git a/ghs_symbols/ghs03.png → assets/ghs_symbols/ghs03.png b/ghs_symbols/ghs03.png → assets/ghs_symbols/ghs03.png
diff --git a/ghs_symbols/ghs04.png → assets/ghs_symbols/ghs04.png b/ghs_symbols/ghs04.png → assets/ghs_symbols/ghs04.png
diff --git a/ghs_symbols/ghs05.png → assets/ghs_symbols/ghs05.png b/ghs_symbols/ghs05.png → assets/ghs_symbols/ghs05.png
diff --git a/ghs_symbols/ghs06.png → assets/ghs_symbols/ghs06.png b/ghs_symbols/ghs06.png → assets/ghs_symbols/ghs06.png
diff --git a/ghs_symbols/ghs07.png → assets/ghs_symbols/ghs07.png b/ghs_symbols/ghs07.png → assets/ghs_symbols/ghs07.png
diff --git a/ghs_symbols/ghs08.png → assets/ghs_symbols/ghs08.png b/ghs_symbols/ghs08.png → assets/ghs_symbols/ghs08.png
diff --git a/ghs_symbols/ghs09.png → assets/ghs_symbols/ghs09.png b/ghs_symbols/ghs09.png → assets/ghs_symbols/ghs09.png
diff --git a/templates/first.html → assets/templates/first.html b/templates/first.html → assets/templates/first.html
diff --git a/templates/second.html → assets/templates/second.html b/templates/second.html → assets/templates/second.html
diff --git a/templates/styles.css → assets/templates/styles.css b/templates/styles.css → assets/templates/styles.css
diff --git a/translations/de_by.json → assets/translations/de_by.json b/translations/de_by.json → assets/translations/de_by.json
diff --git a/translations/de_de.json → assets/translations/de_de.json b/translations/de_de.json → assets/translations/de_de.json
diff --git a/translations/en_us.json → assets/translations/en_us.json b/translations/en_us.json → assets/translations/en_us.json
diff --git a/translations/hr_hr.json → assets/translations/hr_hr.json b/translations/hr_hr.json → assets/translations/hr_hr.json
diff --git a/translations/ru_ru.json → assets/translations/ru_ru.json b/translations/ru_ru.json → assets/translations/ru_ru.json
diff --git a/library/Cargo.toml b/library/Cargo.toml
@@ -0,0 +1,8 @@
+[workspace]
+members = [
+    "config",
+    "load_save",
+    "logger",
+    "search",
+    "types",
+]
diff --git a/src-tauri/cabr2_config/Cargo.toml → library/config/Cargo.toml b/src-tauri/cabr2_config/Cargo.toml → library/config/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "cabr2_config"
+name = "config"
 version = "0.4.0"
 authors = [
   "crapStone <crapstone01@gmail.com>",
@@ -11,7 +11,6 @@ edition = "2018"
 
 [dependencies]
 base64 = "0.13.0"
-cabr2_types = { path = "../cabr2_types/" }
 directories-next = "2.0.0"
 lazy_static = "1.4.0"
 log = "0.4.14"
@@ -21,10 +20,11 @@ tauri = { version = "1.0.0-beta.8", default-features = false, optional = true }
 thiserror = "1.0.29"
 tokio = { version = "1.11.0", features = ["fs", "io-util"] }
 toml = { version = "0.5.8", features = ["preserve_order"] }
+types = { path = "../types/" }
 warp = { version = "0.3.1", optional = true }
 
 [features]
 portable = []
 tauri_plugin = ["tauri"]
-webserver = ["warp", "cabr2_types/webserver"]
+webserver = ["warp", "types/webserver"]
 default = []
diff --git a/src-tauri/cabr2_config/src/error.rs → library/config/src/error.rs b/src-tauri/cabr2_config/src/error.rs → library/config/src/error.rs
diff --git a/src-tauri/cabr2_config/src/handler.rs → library/config/src/handler.rs b/src-tauri/cabr2_config/src/handler.rs → library/config/src/handler.rs
diff --git a/src-tauri/cabr2_config/src/lib.rs → library/config/src/lib.rs b/src-tauri/cabr2_config/src/lib.rs → library/config/src/lib.rs
diff --git a/src-tauri/cabr2_config/src/plugin.rs → library/config/src/plugin.rs b/src-tauri/cabr2_config/src/plugin.rs → library/config/src/plugin.rs
diff --git a/src-tauri/cabr2_config/src/types.rs → library/config/src/types.rs b/src-tauri/cabr2_config/src/types.rs → library/config/src/types.rs
diff --git a/src-tauri/cabr2_config/src/webserver.rs → library/config/src/webserver.rs b/src-tauri/cabr2_config/src/webserver.rs → library/config/src/webserver.rs
diff --git a/src-tauri/cabr2_load_save/Cargo.toml → library/load_save/Cargo.toml b/src-tauri/cabr2_load_save/Cargo.toml → library/load_save/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "cabr2_load_save"
+name = "load_save"
 version = "0.4.0"
 authors = [
   "crapStone <crapstone01@gmail.com>",
@@ -11,10 +11,9 @@ edition = "2018"
 
 [dependencies]
 async-trait = "0.1.51"
-cabr2_config = { path = "../cabr2_config/", optional = true }
-cabr2_types = { path = "../cabr2_types/" }
 cfg-if = "1.0.0"
 chrono = { version = "0.4.19", optional = true }
+config = { path = "../config/", optional = true }
 handlebars = { version = "4.1.3", optional = true }
 lazy_static = "1.4.0"
 log = "0.4.14"
@@ -26,15 +25,16 @@ serde_json = { version = "1.0.68", optional = true }
 tauri = { version = "1.0.0-beta.8", default-features = false, optional = true }
 thiserror = "1.0.29"
 tokio = { version = "1.11.0", features = ["fs"], optional = true }
+types = { path = "../types/" }
 uuid = { version = "0.8.2", features = ["serde", "v4"], optional = true }
 warp = { version = "0.3.1", features = [], optional = true }
 wkhtmltopdf = { version = "0.4.0", optional = true }
 
 [features]
 beryllium = ["chrono", "quick-xml", "regex"]
 cabr2 = ["serde_json"]
-pdf = ["cabr2_config", "tokio", "chrono", "handlebars", "lopdf", "serde_json", "wkhtmltopdf"]
+pdf = ["config", "tokio", "chrono", "handlebars", "lopdf", "serde_json", "wkhtmltopdf"]
 tauri_plugin = ["tauri", "serde_json", "tokio"]
-webserver = ["tokio", "uuid", "warp", "cabr2_types/webserver"]
+webserver = ["tokio", "uuid", "warp", "types/webserver"]
 wasm = []
 default = []
diff --git a/...auri/cabr2_load_save/src/beryllium/mod.rs → library/load_save/src/beryllium/mod.rs b/...auri/cabr2_load_save/src/beryllium/mod.rs → library/load_save/src/beryllium/mod.rs
diff --git a/...ri/cabr2_load_save/src/beryllium/types.rs → library/load_save/src/beryllium/types.rs b/...ri/cabr2_load_save/src/beryllium/types.rs → library/load_save/src/beryllium/types.rs
diff --git a/src-tauri/cabr2_load_save/src/cabr2/mod.rs → library/load_save/src/cabr2/mod.rs b/src-tauri/cabr2_load_save/src/cabr2/mod.rs → library/load_save/src/cabr2/mod.rs
diff --git a/src-tauri/cabr2_load_save/src/error.rs → library/load_save/src/error.rs b/src-tauri/cabr2_load_save/src/error.rs → library/load_save/src/error.rs
diff --git a/src-tauri/cabr2_load_save/src/handler.rs → library/load_save/src/handler.rs b/src-tauri/cabr2_load_save/src/handler.rs → library/load_save/src/handler.rs
diff --git a/src-tauri/cabr2_load_save/src/lib.rs → library/load_save/src/lib.rs b/src-tauri/cabr2_load_save/src/lib.rs → library/load_save/src/lib.rs
diff --git a/src-tauri/cabr2_load_save/src/pdf/merge.rs → library/load_save/src/pdf/merge.rs b/src-tauri/cabr2_load_save/src/pdf/merge.rs → library/load_save/src/pdf/merge.rs
diff --git a/src-tauri/cabr2_load_save/src/pdf/mod.rs → library/load_save/src/pdf/mod.rs b/src-tauri/cabr2_load_save/src/pdf/mod.rs → library/load_save/src/pdf/mod.rs
diff --git a/src-tauri/cabr2_load_save/src/pdf/types.rs → library/load_save/src/pdf/types.rs b/src-tauri/cabr2_load_save/src/pdf/types.rs → library/load_save/src/pdf/types.rs
diff --git a/src-tauri/cabr2_load_save/src/plugin.rs → library/load_save/src/plugin.rs b/src-tauri/cabr2_load_save/src/plugin.rs → library/load_save/src/plugin.rs
diff --git a/src-tauri/cabr2_load_save/src/types.rs → library/load_save/src/types.rs b/src-tauri/cabr2_load_save/src/types.rs → library/load_save/src/types.rs
diff --git a/src-tauri/cabr2_load_save/src/wasm.rs → library/load_save/src/wasm.rs b/src-tauri/cabr2_load_save/src/wasm.rs → library/load_save/src/wasm.rs
diff --git a/src-tauri/cabr2_load_save/src/webserver.rs → library/load_save/src/webserver.rs b/src-tauri/cabr2_load_save/src/webserver.rs → library/load_save/src/webserver.rs
diff --git a/src-tauri/cabr2_logger/Cargo.toml → library/logger/Cargo.toml b/src-tauri/cabr2_logger/Cargo.toml → library/logger/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "cabr2_logger"
+name = "logger"
 version = "0.4.0"
 authors = [
   "crapStone <crapstone01@gmail.com>",
@@ -10,15 +10,15 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cabr2_config = { path = "../cabr2_config/" }
-cabr2_types = { path = "../cabr2_types/" }
 chrono = "0.4.19"
+config = { path = "../config/" }
 fern = "0.6.0"
 log = "0.4.14"
 serde = { version = "1.0.130", features = ["derive"], optional = true }
 serde_json = { version = "1.0.68", optional = true }
 tauri = { version = "1.0.0-beta.8", default-features = false, optional = true }
 tokio = "1.11.0"
+types = { path = "../types/" }
 
 [features]
 tauri_plugin = ["serde", "serde_json", "tauri"]

diff --git a/src-tauri/cabr2_logger/src/lib.rs → library/logger/src/lib.rs b/src-tauri/cabr2_logger/src/lib.rs → library/logger/src/lib.rs
diff --git a/src-tauri/cabr2_logger/src/plugin.rs → library/logger/src/plugin.rs b/src-tauri/cabr2_logger/src/plugin.rs → library/logger/src/plugin.rs
diff --git a/src-tauri/cabr2_search/.gitignore → library/search/.gitignore b/src-tauri/cabr2_search/.gitignore → library/search/.gitignore
diff --git a/src-tauri/cabr2_search/Cargo.toml → library/search/Cargo.toml b/src-tauri/cabr2_search/Cargo.toml → library/search/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "cabr2_search"
+name = "search"
 version = "0.4.0"
 authors = [
   "crapStone <crapstone01@gmail.com>",
@@ -11,7 +11,6 @@ edition = "2018"
 
 [dependencies]
 async-trait = "0.1.50"
-cabr2_types = { path = "../cabr2_types/" }
 cfg-if = "1.0.0"
 chrono = "0.4.19"
 futures = { version = "0.3.17", optional = true }
@@ -25,13 +24,14 @@ structopt = { version = "0.3.23", optional = true }
 tauri = { version = "1.0.0-beta.8", default-features = false, optional = true }
 thiserror = "1.0.29"
 tokio = { version = "1.11.0", features = ["sync"], default-features = false, optional = true }
+types = { path = "../types/" }
 warp = { version = "0.3.1", optional = true }
 
 [features]
 gestis = [ "roxmltree", "reqwest" ]
 gestis_helper = [ "gestis" ]
 tauri_plugin = [ "tauri", "tokio" ]
-webserver = [ "warp", "tokio", "cabr2_types/webserver" ]
+webserver = [ "warp", "tokio", "types/webserver" ]
 wasm = [ "chrono/wasmbind" ]
 default = []
 

diff --git a/src-tauri/cabr2_search/README.md → library/search/README.md b/src-tauri/cabr2_search/README.md → library/search/README.md
diff --git a/...uri/cabr2_search/contrib/gestis/helper.rs → library/search/contrib/gestis/helper.rs b/...uri/cabr2_search/contrib/gestis/helper.rs → library/search/contrib/gestis/helper.rs
diff --git a/...uri/cabr2_search/contrib/gestis_helper.sh → library/search/contrib/gestis_helper.sh b/...uri/cabr2_search/contrib/gestis_helper.sh → library/search/contrib/gestis_helper.sh
diff --git a/src-tauri/cabr2_search/src/error.rs → library/search/src/error.rs b/src-tauri/cabr2_search/src/error.rs → library/search/src/error.rs
diff --git a/src-tauri/cabr2_search/src/gestis/mod.rs → library/search/src/gestis/mod.rs b/src-tauri/cabr2_search/src/gestis/mod.rs → library/search/src/gestis/mod.rs
diff --git a/src-tauri/cabr2_search/src/gestis/types.rs → library/search/src/gestis/types.rs b/src-tauri/cabr2_search/src/gestis/types.rs → library/search/src/gestis/types.rs
diff --git a/...uri/cabr2_search/src/gestis/xml_parser.rs → library/search/src/gestis/xml_parser.rs b/...uri/cabr2_search/src/gestis/xml_parser.rs → library/search/src/gestis/xml_parser.rs
diff --git a/src-tauri/cabr2_search/src/handler.rs → library/search/src/handler.rs b/src-tauri/cabr2_search/src/handler.rs → library/search/src/handler.rs
diff --git a/src-tauri/cabr2_search/src/lib.rs → library/search/src/lib.rs b/src-tauri/cabr2_search/src/lib.rs → library/search/src/lib.rs
diff --git a/src-tauri/cabr2_search/src/plugin.rs → library/search/src/plugin.rs b/src-tauri/cabr2_search/src/plugin.rs → library/search/src/plugin.rs
diff --git a/src-tauri/cabr2_search/src/types.rs → library/search/src/types.rs b/src-tauri/cabr2_search/src/types.rs → library/search/src/types.rs
diff --git a/src-tauri/cabr2_search/src/wasm.rs → library/search/src/wasm.rs b/src-tauri/cabr2_search/src/wasm.rs → library/search/src/wasm.rs
diff --git a/src-tauri/cabr2_search/src/webserver.rs → library/search/src/webserver.rs b/src-tauri/cabr2_search/src/webserver.rs → library/search/src/webserver.rs
diff --git a/...ri/cabr2_search/tests/assets/calcium.json → library/search/tests/assets/calcium.json b/...ri/cabr2_search/tests/assets/calcium.json → library/search/tests/assets/calcium.json
diff --git a/...2_search/tests/assets/cobaltdinitrat.json → ...y/search/tests/assets/cobaltdinitrat.json b/...2_search/tests/assets/cobaltdinitrat.json → ...y/search/tests/assets/cobaltdinitrat.json
diff --git a/src-tauri/cabr2_types/Cargo.toml → library/types/Cargo.toml b/src-tauri/cabr2_types/Cargo.toml → library/types/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "cabr2_types"
+name = "types"
 version = "0.4.0"
 authors = [
   "crapStone <crapstone01@gmail.com>",

diff --git a/src-tauri/cabr2_types/src/lib.rs → library/types/src/lib.rs b/src-tauri/cabr2_types/src/lib.rs → library/types/src/lib.rs
diff --git a/src-tauri/cabr2_types/src/logging.rs → library/types/src/logging.rs b/src-tauri/cabr2_types/src/logging.rs → library/types/src/logging.rs
diff --git a/src-tauri/cabr2_types/src/webserver.rs → library/types/src/webserver.rs b/src-tauri/cabr2_types/src/webserver.rs → library/types/src/webserver.rs
diff --git a/.eslintrc.json → tauri-app/.eslintrc.json b/.eslintrc.json → tauri-app/.eslintrc.json