-
Pairgoth v0.1
+
+
+
+
+ 
+
+
+
@@ -20,11 +24,16 @@
+
+ [flag]
+
#translate($page)
-
+
-
diff --git a/view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/ApiTool.kt b/view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/ApiTool.kt
new file mode 100644
index 0000000..ec0b58d
--- /dev/null
+++ b/view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/ApiTool.kt
@@ -0,0 +1,43 @@
+package org.jeudego.pairgoth.view
+
+import com.republicate.kson.Json
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.internal.EMPTY_REQUEST
+
+class ApiTool {
+ companion object {
+ const val JSON = "application/json"
+ val apiRoot = System.getProperty("pairgoth.webapp.url").let { base ->
+ if (base.endsWith('/')) "${base}api/"
+ else "${base}/api/"
+ }
+ }
+ private val client = OkHttpClient()
+ private fun prepare(url: String) = Request.Builder().url("$apiRoot$url").header("Accept", JSON)
+ private fun Json.toRequestBody() = toString().toRequestBody(JSON.toMediaType())
+ private fun Request.Builder.process(): Json {
+ client.newCall(build()).execute().use { response ->
+ if (response.isSuccessful) {
+ when (response.body?.contentType()?.subtype) {
+ null -> throw Error("null body or content type")
+ "json" -> return Json.parse(response.body!!.string()) ?: throw Error("could not parse json")
+ else -> throw Error("unhandled content type: ${response.body!!.contentType()}")
+ }
+ } else throw Error("api call failed: ${response.code} ${response.message}")
+ }
+ }
+
+ fun get(url: String) = prepare(url).process()
+ fun post(url: String, payload: Json) = prepare(url)
+ .post(payload.toRequestBody())
+ .process()
+ fun put(url: String, payload: Json) = prepare(url)
+ .put(payload.toRequestBody())
+ .process()
+ fun delete(url: String, payload: Json? = null) = prepare(url)
+ .delete(payload?.toRequestBody() ?: EMPTY_REQUEST)
+ .process()
+}
diff --git a/view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/TranslateDirective.kt b/view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/TranslateDirective.kt
index a3af756..5dc33b5 100644
--- a/view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/TranslateDirective.kt
+++ b/view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/TranslateDirective.kt
@@ -2,7 +2,6 @@ package org.jeudego.pairgoth.view
import org.apache.velocity.Template
import org.apache.velocity.runtime.directive.Parse
-import org.jeudego.pairgoth.view.IntlTool
class TranslateDirective : Parse() {
override fun getName(): String {
@@ -11,7 +10,7 @@ class TranslateDirective : Parse() {
override fun getTemplate(path: String, encoding: String): Template? {
val template = super.getTemplate(path, encoding)
- val translator = IntlTool.translator.get()
+ val translator = TranslationTool.translator.get()
?: throw RuntimeException("no current active translator")
return translator.translate(path, template)
}
diff --git a/view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/IntlTool.kt b/view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/TranslationTool.kt
similarity index 93%
rename from view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/IntlTool.kt
rename to view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/TranslationTool.kt
index 94f7247..8da62a2 100644
--- a/view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/IntlTool.kt
+++ b/view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/TranslationTool.kt
@@ -4,7 +4,7 @@ import org.apache.velocity.tools.config.ValidScope
import org.jeudego.pairgoth.util.Translator
@ValidScope("request")
-class IntlTool {
+class TranslationTool {
fun translate(enText: String): String {
return translator.get().translate(enText)
diff --git a/view-webapp/src/main/kotlin/org/jeudego/pairgoth/web/LanguageFilter.kt b/view-webapp/src/main/kotlin/org/jeudego/pairgoth/web/LanguageFilter.kt
index c4de83b..20cce78 100644
--- a/view-webapp/src/main/kotlin/org/jeudego/pairgoth/web/LanguageFilter.kt
+++ b/view-webapp/src/main/kotlin/org/jeudego/pairgoth/web/LanguageFilter.kt
@@ -3,7 +3,7 @@ package org.jeudego.pairgoth.web
import org.jeudego.pairgoth.util.Translator
import org.jeudego.pairgoth.util.Translator.Companion.defaultLanguage
import org.jeudego.pairgoth.util.Translator.Companion.providedLanguages
-import org.jeudego.pairgoth.view.IntlTool
+import org.jeudego.pairgoth.view.TranslationTool
import javax.servlet.Filter
import javax.servlet.FilterChain
import javax.servlet.FilterConfig
@@ -25,7 +25,7 @@ class LanguageFilter : Filter {
val reqLang = request.getAttribute("lang") as String?
if (reqLang != null) {
- IntlTool.translator.set(Translator.getTranslator(reqLang))
+ TranslationTool.translator.set(Translator.getTranslator(reqLang))
chain.doFilter(request, response)
} else {
val uri = request.requestURI
diff --git a/view-webapp/src/main/sass/main.scss b/view-webapp/src/main/sass/main.scss
index 0184a27..a7a9e17 100644
--- a/view-webapp/src/main/sass/main.scss
+++ b/view-webapp/src/main/sass/main.scss
@@ -1,19 +1,38 @@
body {
- font-size : clamp(2rem, 10vw, 5rem);
+ font-size : clamp(1rem, 3vw, 3rem);
width: 100vw;
height: 100vh;
+ margin: 0;
+ padding: 0;
+}
+
+.flex {
display: flex;
- flex-flow: column nowrap;
- justify-items: stretch;
- align-items: stretch;
+ &.horz {
+ flex-flow: row nowrap;
+ align-items: center;
+ }
+ &.vert {
+ flex-flow: column nowrap;
+ align-items: stretch;
+ }
}
#header {
- height: 1.5em;
- display: flex;
- flex-flow: row nowrap;
- justify-items: center;
- align-items: stretch;
+ height: 2em;
+ width: 100%;
+ position: relative;
+ justify-content: space-between;
+ #left-header, #right-header {
+ height: 100%;
+ }
+ #logo {
+ height: 100%;
+ img {
+ display: inline-block;
+ max-height: 100%;
+ }
+ }
}
#center {
@@ -24,5 +43,9 @@ body {
}
#footer {
- height: 1.5em;
+ flex: 0;
+ height: 2em;
+ margin: 0 2em;
+ font-size: 0.8em;
+ justify-content: space-between;
}
diff --git a/view-webapp/src/main/webapp/favicon.ico b/view-webapp/src/main/webapp/favicon.ico
new file mode 100644
index 0000000..91f4684
Binary files /dev/null and b/view-webapp/src/main/webapp/favicon.ico differ
diff --git a/view-webapp/src/main/webapp/img/logo.svg b/view-webapp/src/main/webapp/img/logo.svg
new file mode 100644
index 0000000..f8bf4b4
--- /dev/null
+++ b/view-webapp/src/main/webapp/img/logo.svg
@@ -0,0 +1,18 @@
+
+
diff --git a/view-webapp/src/main/webapp/index.html b/view-webapp/src/main/webapp/index.html
index 8b13789..793aa37 100644
--- a/view-webapp/src/main/webapp/index.html
+++ b/view-webapp/src/main/webapp/index.html
@@ -1 +1,4 @@
+Known tournaments:
+
+$api.get('tour')
diff --git a/webserver/pom.xml b/webserver/pom.xml
index 39afe2e..97f8bec 100644
--- a/webserver/pom.xml
+++ b/webserver/pom.xml
@@ -61,6 +61,11 @@
http2-server
${jetty.version}
+
+ org.eclipse.jetty
+ jetty-slf4j-impl
+ ${jetty.version}
+
commons-io
commons-io
+
diff --git a/view-webapp/src/main/config/tools.xml b/view-webapp/src/main/config/tools.xml
index 6240c71..0e24740 100644
--- a/view-webapp/src/main/config/tools.xml
+++ b/view-webapp/src/main/config/tools.xml
@@ -17,7 +17,8 @@
pairgoth v0.1
+