Merge pull request #12 from blogify-dev/dev

Merge dev into master for PRX2

.gitignore

@@ -8,3 +8,4 @@
 *.iws
 /gradlew.bat
 /gradlew
+/resources/frontend/

README.md

@@ -6,7 +6,7 @@ All-in-one blogging engine powered by Ktor and Angular.
 
 Blogify uses `Ktor` on the backend and `Angular` on the frontend.
 
-It uses `PostgreSQL` as a databse.
+It uses `PostgreSQL` as a database.
 
 ## Performance
 
@@ -16,7 +16,7 @@ Currently, our own (very basic) testing shows that the server can handle upwards
 
 ## Building and deploying
 
-The default deploy configuration runs the backend and the databse as `docker-compose` services. A functioning, local, test deployment can be achieved by running the `localTestDeploy` gradle task.
+The default deploy configuration runs the backend and the database as `docker-compose` services. A functioning, local, test deployment can be achieved by running the `localTestDeploy` gradle task.
 
 ## Core team
 
@@ -38,7 +38,7 @@ The default deploy configuration runs the backend and the databse as `docker-com
 
 This project is in a very early, pre-alpha stage.
 
-Any versions indicated in the startup message starting with `PRX` are not safe to use, not tested and are not guranteed to retain data safely.
+Any versions indicated in the startup message starting with `PRX` are not safe to use, not tested and are not guaranteed to retain data safely.
 
 ## Contributing
 

build.gradle.kts

@@ -26,6 +26,7 @@ application {
 repositories {
     mavenLocal()
     jcenter()
+    maven { url = uri("https://dl.bintray.com/kittinunf/maven") }
     maven { url = uri("https://kotlin.bintray.com/ktor") }
 }
 
@@ -62,6 +63,12 @@ dependencies {
     // Kolor
 
     compile("com.andreapivetta.kolor:kolor:0.0.2")
+
+    // Result
+
+    compile("com.github.kittinunf.result:result:2.2.0")
+    compile("com.github.kittinunf.result:result-coroutines:2.2.0")
+
 }
 
 kotlin.sourceSets["main"].kotlin.srcDirs("src")
@@ -93,7 +100,17 @@ dockerCompose {
     stopContainers  = true
 }
 
+tasks.register("buildAngularProd", Exec::class) {
+    workingDir = File("src/blogify/frontend")
+    commandLine = listOf("npm", "run", "build")
+}
+
+// blogifyDeploy : this builds angular app, packs the jar and runs the docker-compose config
+tasks.register("blogifyDeploy", GradleBuild::class) {
+    tasks = mutableListOf("buildAngularProd", "shadowJar", "composeUp")
+}
+
 // Local test deploy : this packs the jar and runs the docker-compose config
 tasks.register("localTestDeploy", GradleBuild::class) {
     tasks = mutableListOf("shadowJar", "composeUp")
-}
+}

resources/application.conf

@@ -5,6 +5,6 @@ ktor {
         port = ${?PORT}
     }
     application {
-        modules = [blgoify.backend.ApplicationKt.mainModule]
+        modules = [blogify.backend.ApplicationKt.mainModule]
     }
 }

resources/logback.xml

@@ -1,7 +1,7 @@
 <configuration>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{12} - %msg%n</pattern>
         </encoder>
     </appender>
     <root level="trace">