From ef452aaba5fcbc1ef019c0887a791a75acfc8f0e Mon Sep 17 00:00:00 2001 From: Bryce Date: Thu, 21 Mar 2024 23:27:54 -0700 Subject: [PATCH 1/2] Allows staging to use solr --- config/staging.edn | 10 ++++++---- terraform/connect-ports-cloud-staging.sh | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config/staging.edn b/config/staging.edn index 0c77e289..e4ff5c40 100644 --- a/config/staging.edn +++ b/config/staging.edn @@ -1,11 +1,14 @@ {:db {:server "database"} :datomic-url "datomic:ddb://us-east-1/integreat/integreat-staging" + :base-url "https://staging3.app.integreatconsult.com" + :solr-uri "http://solr-staging.local:8983" + :solr-impl :solr :scheme "https" :dd-env "staging" :dd-service "integreat-app" :jwt-secret "auto ap invoices are awesome" - :invoice-import-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-staging" - :requests-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-background-request-staging" + :invoice-import-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-staging" + :requests-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-background-request-staging" :invoice-email "invoices-staging@mail.app.integreatconsult.com" :import-failure-destination-email "bryce@brycecovertoperations.com" @@ -32,5 +35,4 @@ :yodlee2-proxy-port 8888 :plaid {:base-url "https://development.plaid.com" :client-id "61bfab05f7e762001b323f79" - :secret-key "637432f4c967bda8b5d77a1dc67e5c"} - } + :secret-key "637432f4c967bda8b5d77a1dc67e5c"}} diff --git a/terraform/connect-ports-cloud-staging.sh b/terraform/connect-ports-cloud-staging.sh index 730ea7af..77db7143 100755 --- a/terraform/connect-ports-cloud-staging.sh +++ b/terraform/connect-ports-cloud-staging.sh @@ -1,2 +1,2 @@ #!/bin/sh -ssh -L 2049:172.31.32.90:2049 3.213.115.86 -L 8983:solr-prod.local:8983 -L 4334:integreat-datomic.local:4334 +ssh -L 2049:172.31.32.90:2049 3.213.115.86 -L 8983:solr-staging.local:8983 -L 4334:integreat-datomic.local:4334 -L9001:integreat-app-staging.local:9000 From 71ba64b1b4c636d73b7ddc3919300d5e83cca080 Mon Sep 17 00:00:00 2001 From: Bryce Date: Thu, 21 Mar 2024 23:28:46 -0700 Subject: [PATCH 2/2] updating layout --- src/cljs/auto_ap/views/components/layouts.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cljs/auto_ap/views/components/layouts.cljs b/src/cljs/auto_ap/views/components/layouts.cljs index d4d54051..31d725f9 100644 --- a/src/cljs/auto_ap/views/components/layouts.cljs +++ b/src/cljs/auto_ap/views/components/layouts.cljs @@ -180,7 +180,7 @@ "Invoices" ]) (when (p/can? @user {:subject :payment-page}) [:a.navbar-item {:class [(active-when ap = :payments)] - :href (bidi/path-for ssr-routes/only-routes ::payment-routes/page)} + :href (bidi/path-for ssr-routes/only-routes ::payment-routes/all-page)} "Payments" ]) (when (p/can? @user {:subject :pos-page}) [:a.navbar-item {:class [(active-when ap = :pos-sales)]