notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into ssr-invoices

Browse Source
This commit is contained in:
Bryce
2024-03-22 20:56:25 -07:00
parent 9d2b4ba646 71ba64b1b4
commit 48a3894fdb
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/staging.edn
View File

@@ -1,11 +1,14 @@
{:db {:server "database"} {:db {:server "database"}
:datomic-url "datomic:ddb://us-east-1/integreat/integreat-staging" :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" :scheme "https"
:dd-env "staging" :dd-env "staging"
:dd-service "integreat-app" :dd-service "integreat-app"
:jwt-secret "auto ap invoices are awesome" :jwt-secret "auto ap invoices are awesome"
:invoice-import-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-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" :requests-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-background-request-staging"
:invoice-email "invoices-staging@mail.app.integreatconsult.com" :invoice-email "invoices-staging@mail.app.integreatconsult.com"
:import-failure-destination-email "bryce@brycecovertoperations.com" :import-failure-destination-email "bryce@brycecovertoperations.com"
@@ -32,5 +35,4 @@
:yodlee2-proxy-port 8888 :yodlee2-proxy-port 8888
:plaid {:base-url "https://development.plaid.com" :plaid {:base-url "https://development.plaid.com"
:client-id "61bfab05f7e762001b323f79" :client-id "61bfab05f7e762001b323f79"
:secret-key "637432f4c967bda8b5d77a1dc67e5c"} :secret-key "637432f4c967bda8b5d77a1dc67e5c"}}
}

2
src/cljs/auto_ap/views/components/layouts.cljs
View File

@@ -180,7 +180,7 @@
"Invoices" ]) "Invoices" ])
(when (p/can? @user {:subject :payment-page}) (when (p/can? @user {:subject :payment-page})
[:a.navbar-item {:class [(active-when ap = :payments)] [: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" ]) "Payments" ])
(when (p/can? @user {:subject :pos-page}) (when (p/can? @user {:subject :pos-page})
[:a.navbar-item {:class [(active-when ap = :pos-sales)] [:a.navbar-item {:class [(active-when ap = :pos-sales)]

2
terraform/connect-ports-cloud-staging.sh
View File

@@ -1,2 +1,2 @@
#!/bin/sh #!/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