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

making routes real

Browse Source
This commit is contained in:
Bryce Covert
2020-09-23 11:47:18 -07:00
parent 277a0aaf98
commit 4ab492d759
3 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/clj/auto_ap/handler.clj
View File

@@ -19,7 +19,9 @@
[ring.middleware.params :refer [wrap-params]] [ring.middleware.params :refer [wrap-params]]
[ring.middleware.reload :refer [wrap-reload]] [ring.middleware.reload :refer [wrap-reload]]
[ring.util.response :as response] [ring.util.response :as response]
[unilog.context :as lc])) [unilog.context :as lc]
[auto-ap.client-routes :as client-routes]
[bidi.bidi :as bidi]))
(when (:aws-access-key-id env) (when (:aws-access-key-id env)
(defcredential (:aws-access-key-id env) (:aws-secret-access-key env) (:aws-region env))) (defcredential (:aws-access-key-id env) (:aws-secret-access-key env) (:aws-region env)))
@@ -33,7 +35,11 @@
(defroutes static-routes (defroutes static-routes
(GET "/" [] (response/resource-response "index.html" {:root "public"})) (GET "/" [] (response/resource-response "index.html" {:root "public"}))
(route/resources "/") (route/resources "/")
(routes (ANY "*" [] (response/resource-response "index.html" {:root "public"})))) (routes (ANY "*" {:keys [path] :as r}
(if (bidi/match-route client-routes/routes (:uri r))
(response/resource-response "index.html" {:root "public"})
{:status 404
:body "Not found"}))))
(defroutes health-check (defroutes health-check
(GET "/health-check" [] (GET "/health-check" []

34
src/cljc/auto_ap/client_routes.cljc Normal file
View File

@@ -0,0 +1,34 @@
(ns auto-ap.client-routes
(:require [bidi.bidi :as bidi]))
(def routes ["/" {"" :index
"login/" :login
"needs-activation/" :needs-activation
"needs-activation" :needs-activation
"payments/" :payments
"admin/" {"" :admin
"clients" :admin-clients
"users" :admin-users
"rules" :admin-rules
"accounts" :admin-accounts
"reminders" :admin-reminders
"vendors" :admin-vendors
"excel-import" :admin-excel-import
"yodlee" :admin-yodlee}
"invoices/" {"" :invoices
"import" :import-invoices
"unpaid" :unpaid-invoices
"paid" :paid-invoices
"voided" :voided-invoices
"new" :new-invoice}
"sales-orders/" {"" :sales-orders}
"transactions/" {"" :transactions
"unapproved" :unapproved-transactions
"approved" :approved-transactions
"requires-feedback" :requires-feedback-transactions
"excluded" :excluded-transactions}
"ledger/" {"" :ledger
"profit-and-loss" :profit-and-loss
"balance-sheet" :balance-sheet
"external-import" :external-import-ledger}}])

34
src/cljs/auto_ap/routes.cljs
View File

@@ -1,34 +1,4 @@
(ns auto-ap.routes (ns auto-ap.routes
(:require [bidi.bidi :as bidi])) (:require [auto-ap.client-routes :as client-routes]))
(def routes ["/" {"" :index (def routes client-routes/routes)
"login/" :login
"needs-activation/" :needs-activation
"needs-activation" :needs-activation
"payments/" :payments
"admin/" {"" :admin
"clients" :admin-clients
"users" :admin-users
"rules" :admin-rules
"accounts" :admin-accounts
"reminders" :admin-reminders
"vendors" :admin-vendors
"excel-import" :admin-excel-import
"yodlee" :admin-yodlee}
"invoices/" {"" :invoices
"import" :import-invoices
"unpaid" :unpaid-invoices
"paid" :paid-invoices
"voided" :voided-invoices
"new" :new-invoice}
"sales-orders/" {"" :sales-orders}
"transactions/" {"" :transactions
"unapproved" :unapproved-transactions
"approved" :approved-transactions
"requires-feedback" :requires-feedback-transactions
"excluded" :excluded-transactions}
"ledger/" {"" :ledger
"profit-and-loss" :profit-and-loss
"balance-sheet" :balance-sheet
"external-import" :external-import-ledger}}])