From d30b6ac5b9cd54326b9472b34a62d77076dd6906 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 28 Jul 2022 11:35:56 +0200 Subject: [PATCH] :sparkles: Reorganize resources directory --- .../{ => app}/emails-mjml/change-email/en.mjml | 0 .../{ => app}/emails-mjml/invite-to-team/en.mjml | 0 .../{ => app}/emails-mjml/password-recovery/en.mjml | 0 .../resources/{ => app}/emails-mjml/register/en.mjml | 0 .../resources/{ => app}/emails/change-email/en.html | 0 .../resources/{ => app}/emails/change-email/en.subj | 0 backend/resources/{ => app}/emails/change-email/en.txt | 0 backend/resources/{ => app}/emails/feedback/en.html | 0 backend/resources/{ => app}/emails/feedback/en.subj | 0 backend/resources/{ => app}/emails/feedback/en.txt | 0 .../resources/{ => app}/emails/invite-to-team/en.html | 0 .../resources/{ => app}/emails/invite-to-team/en.subj | 0 .../resources/{ => app}/emails/invite-to-team/en.txt | 0 .../{ => app}/emails/password-recovery/en.html | 0 .../{ => app}/emails/password-recovery/en.subj | 0 .../{ => app}/emails/password-recovery/en.txt | 0 backend/resources/{ => app}/emails/register/en.html | 0 backend/resources/{ => app}/emails/register/en.subj | 0 backend/resources/{ => app}/emails/register/en.txt | 0 .../resources/{ => app/templates}/api-doc-entry.tmpl | 0 backend/resources/{ => app/templates}/api-doc.css | 0 backend/resources/{ => app/templates}/api-doc.js | 0 backend/resources/{ => app/templates}/api-doc.tmpl | 10 +++++----- backend/resources/{ => app}/templates/base.tmpl | 2 +- backend/resources/{ => app}/templates/debug.tmpl | 2 +- backend/resources/{ => app}/templates/error-list.tmpl | 2 +- .../resources/{ => app}/templates/error-report.tmpl | 2 +- backend/resources/{ => app}/templates/styles.css | 0 backend/src/app/http/debug.clj | 6 +++--- backend/src/app/rpc/doc.clj | 2 +- backend/src/app/util/emails.clj | 2 +- 31 files changed, 14 insertions(+), 14 deletions(-) rename backend/resources/{ => app}/emails-mjml/change-email/en.mjml (100%) rename backend/resources/{ => app}/emails-mjml/invite-to-team/en.mjml (100%) rename backend/resources/{ => app}/emails-mjml/password-recovery/en.mjml (100%) rename backend/resources/{ => app}/emails-mjml/register/en.mjml (100%) rename backend/resources/{ => app}/emails/change-email/en.html (100%) rename backend/resources/{ => app}/emails/change-email/en.subj (100%) rename backend/resources/{ => app}/emails/change-email/en.txt (100%) rename backend/resources/{ => app}/emails/feedback/en.html (100%) rename backend/resources/{ => app}/emails/feedback/en.subj (100%) rename backend/resources/{ => app}/emails/feedback/en.txt (100%) rename backend/resources/{ => app}/emails/invite-to-team/en.html (100%) rename backend/resources/{ => app}/emails/invite-to-team/en.subj (100%) rename backend/resources/{ => app}/emails/invite-to-team/en.txt (100%) rename backend/resources/{ => app}/emails/password-recovery/en.html (100%) rename backend/resources/{ => app}/emails/password-recovery/en.subj (100%) rename backend/resources/{ => app}/emails/password-recovery/en.txt (100%) rename backend/resources/{ => app}/emails/register/en.html (100%) rename backend/resources/{ => app}/emails/register/en.subj (100%) rename backend/resources/{ => app}/emails/register/en.txt (100%) rename backend/resources/{ => app/templates}/api-doc-entry.tmpl (100%) rename backend/resources/{ => app/templates}/api-doc.css (100%) rename backend/resources/{ => app/templates}/api-doc.js (100%) rename backend/resources/{ => app/templates}/api-doc.tmpl (78%) rename backend/resources/{ => app}/templates/base.tmpl (89%) rename backend/resources/{ => app}/templates/debug.tmpl (99%) rename backend/resources/{ => app}/templates/error-list.tmpl (88%) rename backend/resources/{ => app}/templates/error-report.tmpl (98%) rename backend/resources/{ => app}/templates/styles.css (100%) diff --git a/backend/resources/emails-mjml/change-email/en.mjml b/backend/resources/app/emails-mjml/change-email/en.mjml similarity index 100% rename from backend/resources/emails-mjml/change-email/en.mjml rename to backend/resources/app/emails-mjml/change-email/en.mjml diff --git a/backend/resources/emails-mjml/invite-to-team/en.mjml b/backend/resources/app/emails-mjml/invite-to-team/en.mjml similarity index 100% rename from backend/resources/emails-mjml/invite-to-team/en.mjml rename to backend/resources/app/emails-mjml/invite-to-team/en.mjml diff --git a/backend/resources/emails-mjml/password-recovery/en.mjml b/backend/resources/app/emails-mjml/password-recovery/en.mjml similarity index 100% rename from backend/resources/emails-mjml/password-recovery/en.mjml rename to backend/resources/app/emails-mjml/password-recovery/en.mjml diff --git a/backend/resources/emails-mjml/register/en.mjml b/backend/resources/app/emails-mjml/register/en.mjml similarity index 100% rename from backend/resources/emails-mjml/register/en.mjml rename to backend/resources/app/emails-mjml/register/en.mjml diff --git a/backend/resources/emails/change-email/en.html b/backend/resources/app/emails/change-email/en.html similarity index 100% rename from backend/resources/emails/change-email/en.html rename to backend/resources/app/emails/change-email/en.html diff --git a/backend/resources/emails/change-email/en.subj b/backend/resources/app/emails/change-email/en.subj similarity index 100% rename from backend/resources/emails/change-email/en.subj rename to backend/resources/app/emails/change-email/en.subj diff --git a/backend/resources/emails/change-email/en.txt b/backend/resources/app/emails/change-email/en.txt similarity index 100% rename from backend/resources/emails/change-email/en.txt rename to backend/resources/app/emails/change-email/en.txt diff --git a/backend/resources/emails/feedback/en.html b/backend/resources/app/emails/feedback/en.html similarity index 100% rename from backend/resources/emails/feedback/en.html rename to backend/resources/app/emails/feedback/en.html diff --git a/backend/resources/emails/feedback/en.subj b/backend/resources/app/emails/feedback/en.subj similarity index 100% rename from backend/resources/emails/feedback/en.subj rename to backend/resources/app/emails/feedback/en.subj diff --git a/backend/resources/emails/feedback/en.txt b/backend/resources/app/emails/feedback/en.txt similarity index 100% rename from backend/resources/emails/feedback/en.txt rename to backend/resources/app/emails/feedback/en.txt diff --git a/backend/resources/emails/invite-to-team/en.html b/backend/resources/app/emails/invite-to-team/en.html similarity index 100% rename from backend/resources/emails/invite-to-team/en.html rename to backend/resources/app/emails/invite-to-team/en.html diff --git a/backend/resources/emails/invite-to-team/en.subj b/backend/resources/app/emails/invite-to-team/en.subj similarity index 100% rename from backend/resources/emails/invite-to-team/en.subj rename to backend/resources/app/emails/invite-to-team/en.subj diff --git a/backend/resources/emails/invite-to-team/en.txt b/backend/resources/app/emails/invite-to-team/en.txt similarity index 100% rename from backend/resources/emails/invite-to-team/en.txt rename to backend/resources/app/emails/invite-to-team/en.txt diff --git a/backend/resources/emails/password-recovery/en.html b/backend/resources/app/emails/password-recovery/en.html similarity index 100% rename from backend/resources/emails/password-recovery/en.html rename to backend/resources/app/emails/password-recovery/en.html diff --git a/backend/resources/emails/password-recovery/en.subj b/backend/resources/app/emails/password-recovery/en.subj similarity index 100% rename from backend/resources/emails/password-recovery/en.subj rename to backend/resources/app/emails/password-recovery/en.subj diff --git a/backend/resources/emails/password-recovery/en.txt b/backend/resources/app/emails/password-recovery/en.txt similarity index 100% rename from backend/resources/emails/password-recovery/en.txt rename to backend/resources/app/emails/password-recovery/en.txt diff --git a/backend/resources/emails/register/en.html b/backend/resources/app/emails/register/en.html similarity index 100% rename from backend/resources/emails/register/en.html rename to backend/resources/app/emails/register/en.html diff --git a/backend/resources/emails/register/en.subj b/backend/resources/app/emails/register/en.subj similarity index 100% rename from backend/resources/emails/register/en.subj rename to backend/resources/app/emails/register/en.subj diff --git a/backend/resources/emails/register/en.txt b/backend/resources/app/emails/register/en.txt similarity index 100% rename from backend/resources/emails/register/en.txt rename to backend/resources/app/emails/register/en.txt diff --git a/backend/resources/api-doc-entry.tmpl b/backend/resources/app/templates/api-doc-entry.tmpl similarity index 100% rename from backend/resources/api-doc-entry.tmpl rename to backend/resources/app/templates/api-doc-entry.tmpl diff --git a/backend/resources/api-doc.css b/backend/resources/app/templates/api-doc.css similarity index 100% rename from backend/resources/api-doc.css rename to backend/resources/app/templates/api-doc.css diff --git a/backend/resources/api-doc.js b/backend/resources/app/templates/api-doc.js similarity index 100% rename from backend/resources/api-doc.js rename to backend/resources/app/templates/api-doc.js diff --git a/backend/resources/api-doc.tmpl b/backend/resources/app/templates/api-doc.tmpl similarity index 78% rename from backend/resources/api-doc.tmpl rename to backend/resources/app/templates/api-doc.tmpl index c7c447b4d..4ad521a8b 100644 --- a/backend/resources/api-doc.tmpl +++ b/backend/resources/app/templates/api-doc.tmpl @@ -10,10 +10,10 @@ @@ -26,21 +26,21 @@

RPC COMMAND METHODS:

RPC QUERY METHODS:

RPC MUTATION METHODS:

diff --git a/backend/resources/templates/base.tmpl b/backend/resources/app/templates/base.tmpl similarity index 89% rename from backend/resources/templates/base.tmpl rename to backend/resources/app/templates/base.tmpl index 7f8709dd9..893b6bc06 100644 --- a/backend/resources/templates/base.tmpl +++ b/backend/resources/app/templates/base.tmpl @@ -7,7 +7,7 @@ {% block title %}{% endblock %} diff --git a/backend/resources/templates/debug.tmpl b/backend/resources/app/templates/debug.tmpl similarity index 99% rename from backend/resources/templates/debug.tmpl rename to backend/resources/app/templates/debug.tmpl index 7479dd982..e23e7b547 100644 --- a/backend/resources/templates/debug.tmpl +++ b/backend/resources/app/templates/debug.tmpl @@ -1,4 +1,4 @@ -{% extends "templates/base.tmpl" %} +{% extends "app/templates/base.tmpl" %} {% block title %} Debug Main Page diff --git a/backend/resources/templates/error-list.tmpl b/backend/resources/app/templates/error-list.tmpl similarity index 88% rename from backend/resources/templates/error-list.tmpl rename to backend/resources/app/templates/error-list.tmpl index 66835867a..d86d983d3 100644 --- a/backend/resources/templates/error-list.tmpl +++ b/backend/resources/app/templates/error-list.tmpl @@ -1,4 +1,4 @@ -{% extends "templates/base.tmpl" %} +{% extends "app/templates/base.tmpl" %} {% block title %} penpot - error list diff --git a/backend/resources/templates/error-report.tmpl b/backend/resources/app/templates/error-report.tmpl similarity index 98% rename from backend/resources/templates/error-report.tmpl rename to backend/resources/app/templates/error-report.tmpl index a3fcc158d..60905c689 100644 --- a/backend/resources/templates/error-report.tmpl +++ b/backend/resources/app/templates/error-report.tmpl @@ -1,4 +1,4 @@ -{% extends "templates/base.tmpl" %} +{% extends "app/templates/base.tmpl" %} {% block title %} penpot - error report {{id}} diff --git a/backend/resources/templates/styles.css b/backend/resources/app/templates/styles.css similarity index 100% rename from backend/resources/templates/styles.css rename to backend/resources/app/templates/styles.css diff --git a/backend/src/app/http/debug.clj b/backend/src/app/http/debug.clj index 11a29f892..21dcb50f0 100644 --- a/backend/src/app/http/debug.clj +++ b/backend/src/app/http/debug.clj @@ -66,7 +66,7 @@ :code :only-admins-allowed)) (yrs/response :status 200 :headers {"content-type" "text/html"} - :body (-> (io/resource "templates/debug.tmpl") + :body (-> (io/resource "app/templates/debug.tmpl") (tmpl/render {})))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -225,7 +225,7 @@ :trace (or (:trace report) (some-> report :error :trace)) :params (:params report)}] - (-> (io/resource "templates/error-report.tmpl") + (-> (io/resource "app/templates/error-report.tmpl") (tmpl/render params))))] (when-not (authorized? pool request) @@ -253,7 +253,7 @@ (let [items (db/exec! pool [sql:error-reports]) items (map #(update % :created-at dt/format-instant :rfc1123) items)] (yrs/response :status 200 - :body (-> (io/resource "templates/error-list.tmpl") + :body (-> (io/resource "app/templates/error-list.tmpl") (tmpl/render {:items items})) :headers {"content-type" "text/html; charset=utf-8" "x-robots-tag" "noindex"}))) diff --git a/backend/src/app/rpc/doc.clj b/backend/src/app/rpc/doc.clj index 6afec5643..499af1a05 100644 --- a/backend/src/app/rpc/doc.clj +++ b/backend/src/app/rpc/doc.clj @@ -61,7 +61,7 @@ (if (contains? cf/flags :backend-api-doc) (let [context (prepare-context methods)] (fn [_ respond _] - (respond (yrs/response 200 (-> (io/resource "api-doc.tmpl") + (respond (yrs/response 200 (-> (io/resource "app/templates/api-doc.tmpl") (tmpl/render context)))))) (fn [_ respond _] (respond (yrs/response 404))))) diff --git a/backend/src/app/util/emails.clj b/backend/src/app/util/emails.clj index dca9b732e..e0f42e49f 100644 --- a/backend/src/app/util/emails.clj +++ b/backend/src/app/util/emails.clj @@ -178,7 +178,7 @@ ;; Template Email Building ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(def ^:private email-path "emails/%(id)s/%(lang)s.%(type)s") +(def ^:private email-path "app/emails/%(id)s/%(lang)s.%(type)s") (defn- render-email-template-part [type id context]