From 83d3f6e708dcf5e9fef5415dc3ba51136fc15a6c Mon Sep 17 00:00:00 2001 From: djkato Date: Sun, 14 Jul 2024 22:29:09 +0200 Subject: [PATCH] fixes n stuff --- .env | 13 +++--- .env.example | 3 ++ Cargo.lock | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 6 deletions(-) diff --git a/.env b/.env index 6c8dcd5..310ae9c 100644 --- a/.env +++ b/.env @@ -1,14 +1,14 @@ ## COMMON VARIABLES FOR ALL APPS REQUIRED_SALEOR_VERSION="^3.13" # only sets port, the host is always 0.0.0.0 (listens to everything). Set this to docker-compose service name -APP_API_BASE_URL="http://10.100.110.27:3000" -APP_IFRAME_BASE_URL="http://10.100.110.27:3000" -APL="Redis" -APL_URL="redis://localhost:6380/2" +APP_API_BASE_URL="http://10.100.110.29:3000" +APP_IFRAME_BASE_URL="http://10.100.110.29:3000" +APL="File" +APL_URL="./temp/apl.json" LOG_LEVEL="DEBUG" ## THESE VARIABLES ARE FOR SITEMAP-GENERATOR APP -CHANNEL_SLUG="zakladny" +CHANNEL_SLUG="default-channel" SITEMAP_TARGET_FOLDER="./temp" # Available fields can be found in ./sitemap-generator/src/queries/event_subjects_updated.rs: ProductUpdate SITEMAP_PRODUCT_TEMPLATE="https://example.com/{product.category.slug}/{product.slug}" @@ -20,6 +20,8 @@ SITEMAP_COLLECTION_TEMPLATE="https://example.com/collection/{collection.slug}" SITEMAP_PAGES_TEMPLATE="https://example.com/{page.slug}" # Without trailing "/"! SITEMAP_INDEX_HOSTNAME="https://example.com" +# Will be compared against API Url. App works only for single site, so registering a different api and webhooking could rewrite the whole sitemap. This prevents that +SITEMAP_ALLOWED_HOST="http://localhost:8000/graphql/" ## THESE VARIABLES ARE FOR SIMPLE-PAYMENT-GATEWAY APP #To see all possible options, check simple-payment-gateway/src/app:PaymentMethods @@ -28,4 +30,3 @@ ACTIVE_PAYMENT_METHODS="cod,cash,transfer" LOCALE="Sk" # uses https://crates.io/crates/iso_currency CURRENCIES="EUR" -COD_EXTRA_PRICE_AS_PRODUCT_SLUG="dobierka" diff --git a/.env.example b/.env.example index 3d298d3..676fded 100644 --- a/.env.example +++ b/.env.example @@ -8,6 +8,7 @@ APL_URL="redis://localhost:6379/1" LOG_LEVEL="DEBUG" ## THESE VARIABLES ARE FOR SITEMAP-GENERATOR APP +CHANNEL_SLUG="zakladny" SITEMAP_TARGET_FOLDER="./temp" # Available fields can be found in ./sitemap-generator/src/queries/event_subjects_updated.rs: ProductUpdate SITEMAP_PRODUCT_TEMPLATE="https://example.com/{product.category.slug}/{product.slug}" @@ -19,6 +20,8 @@ SITEMAP_COLLECTION_TEMPLATE="https://example.com/collection/{collection.slug}" SITEMAP_PAGES_TEMPLATE="https://example.com/{page.slug}" # Without trailing "/"! SITEMAP_INDEX_HOSTNAME="https://example.com" +# Will be compared against API Url. App works only for single site, so registering a different api and webhooking could rewrite the whole sitemap. This prevents that +SITEMAP_ALLOWED_HOST="https://api.example.com" ## THESE VARIABLES ARE FOR SIMPLE-PAYMENT-GATEWAY APP #To see all possible options, check simple-payment-gateway/src/app:GatewayTypes diff --git a/Cargo.lock b/Cargo.lock index 804432f..f1e5107 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -89,6 +89,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "getrandom 0.2.12", "once_cell", "version_check", "zerocopy", @@ -109,6 +110,21 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "allocator-api2" version = "0.2.18" @@ -554,6 +570,27 @@ dependencies = [ "syn_derive", ] +[[package]] +name = "brotli" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + [[package]] name = "bumpalo" version = "3.15.3" @@ -2981,6 +3018,20 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "random_word" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07eed67a16dde2cc3c7f65c072acd8d5b2e53d4aab95067c320db851c7651f29" +dependencies = [ + "ahash 0.8.11", + "brotli", + "once_cell", + "paste", + "rand 0.8.5", + "unicase", +] + [[package]] name = "redis" version = "0.25.3" @@ -3415,6 +3466,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "scc" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af947d0ca10a2f3e00c7ec1b515b7c83e5cb3fa62d4c11a64301d9eec54440e9" +dependencies = [ + "sdd", +] + [[package]] name = "schannel" version = "0.1.23" @@ -3430,6 +3490,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "sdd" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d" + [[package]] name = "seahash" version = "4.1.0" @@ -3620,6 +3686,31 @@ dependencies = [ "serde", ] +[[package]] +name = "serial_test" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" +dependencies = [ + "futures", + "log", + "once_cell", + "parking_lot", + "scc", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "server_fn" version = "0.6.12" @@ -3782,11 +3873,14 @@ dependencies = [ "cynic-codegen", "dotenvy", "envy", + "rand 0.8.5", + "random_word", "rstest", "saleor-app-sdk", "serde", "serde_cbor", "serde_json", + "serial_test", "surf", "thiserror", "tinytemplate", @@ -3797,6 +3891,7 @@ dependencies = [ "tracing", "tracing-serde", "tracing-subscriber", + "tracing-test", ] [[package]] @@ -4466,6 +4561,27 @@ dependencies = [ "tracing-log", ] +[[package]] +name = "tracing-test" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "557b891436fe0d5e0e363427fc7f217abf9ccd510d5136549847bdcbcd011d68" +dependencies = [ + "tracing-core", + "tracing-subscriber", + "tracing-test-macro", +] + +[[package]] +name = "tracing-test-macro" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" +dependencies = [ + "quote", + "syn 2.0.48", +] + [[package]] name = "try-lock" version = "0.2.5"