From cdfe1d14ef0434bfc93e24362c068e35ccb682af Mon Sep 17 00:00:00 2001 From: Hubert Van De Walle Date: Sat, 18 Jul 2020 17:21:52 +0200 Subject: [PATCH] Rename templates to get syntax highlighting --- resources/templates/{__base__.html => __base__.twig} | 0 resources/templates/{__macros__.html => __macros__.twig} | 0 resources/templates/{_uuid.html => _uuid.twig} | 0 resources/templates/components/{alert.html => alert.twig} | 0 resources/templates/components/{forms.html => forms.twig} | 0 .../templates/components/{navbar.html => navbar.twig} | 0 resources/templates/{error.html => error.twig} | 0 resources/templates/{index.html => index.twig} | 0 resources/templates/{list.html => list.twig} | 0 resources/templates/{login.html => login.twig} | 0 resources/templates/{new.html => new.twig} | 0 resources/templates/{register.html => register.twig} | 0 src/factories/TemplateProviderFactory.kt | 8 +++++++- 13 files changed, 7 insertions(+), 1 deletion(-) rename resources/templates/{__base__.html => __base__.twig} (100%) rename resources/templates/{__macros__.html => __macros__.twig} (100%) rename resources/templates/{_uuid.html => _uuid.twig} (100%) rename resources/templates/components/{alert.html => alert.twig} (100%) rename resources/templates/components/{forms.html => forms.twig} (100%) rename resources/templates/components/{navbar.html => navbar.twig} (100%) rename resources/templates/{error.html => error.twig} (100%) rename resources/templates/{index.html => index.twig} (100%) rename resources/templates/{list.html => list.twig} (100%) rename resources/templates/{login.html => login.twig} (100%) rename resources/templates/{new.html => new.twig} (100%) rename resources/templates/{register.html => register.twig} (100%) diff --git a/resources/templates/__base__.html b/resources/templates/__base__.twig similarity index 100% rename from resources/templates/__base__.html rename to resources/templates/__base__.twig diff --git a/resources/templates/__macros__.html b/resources/templates/__macros__.twig similarity index 100% rename from resources/templates/__macros__.html rename to resources/templates/__macros__.twig diff --git a/resources/templates/_uuid.html b/resources/templates/_uuid.twig similarity index 100% rename from resources/templates/_uuid.html rename to resources/templates/_uuid.twig diff --git a/resources/templates/components/alert.html b/resources/templates/components/alert.twig similarity index 100% rename from resources/templates/components/alert.html rename to resources/templates/components/alert.twig diff --git a/resources/templates/components/forms.html b/resources/templates/components/forms.twig similarity index 100% rename from resources/templates/components/forms.html rename to resources/templates/components/forms.twig diff --git a/resources/templates/components/navbar.html b/resources/templates/components/navbar.twig similarity index 100% rename from resources/templates/components/navbar.html rename to resources/templates/components/navbar.twig diff --git a/resources/templates/error.html b/resources/templates/error.twig similarity index 100% rename from resources/templates/error.html rename to resources/templates/error.twig diff --git a/resources/templates/index.html b/resources/templates/index.twig similarity index 100% rename from resources/templates/index.html rename to resources/templates/index.twig diff --git a/resources/templates/list.html b/resources/templates/list.twig similarity index 100% rename from resources/templates/list.html rename to resources/templates/list.twig diff --git a/resources/templates/login.html b/resources/templates/login.twig similarity index 100% rename from resources/templates/login.html rename to resources/templates/login.twig diff --git a/resources/templates/new.html b/resources/templates/new.twig similarity index 100% rename from resources/templates/new.html rename to resources/templates/new.twig diff --git a/resources/templates/register.html b/resources/templates/register.twig similarity index 100% rename from resources/templates/register.html rename to resources/templates/register.twig diff --git a/src/factories/TemplateProviderFactory.kt b/src/factories/TemplateProviderFactory.kt index 6c39c9f..0e0d7a5 100644 --- a/src/factories/TemplateProviderFactory.kt +++ b/src/factories/TemplateProviderFactory.kt @@ -4,7 +4,13 @@ import com.soywiz.korte.TemplateProvider class ResourceTemplateProvider : TemplateProvider { override suspend fun get(template: String): String? { - val resource = "/templates/$template" + + val tmp = when { + template.endsWith(".html") -> template.substringBefore(".html") + else -> template + } + + val resource = "/templates/${tmp}.twig" return this.javaClass.getResource(resource)?.readText() } }