Introduce hepek-play. Move more stuff to hepek-components. Reorganize…

… packages

build.sbt

@@ -52,10 +52,18 @@ lazy val hepekProject = (project in file("hepek"))
   )
   .dependsOn(hepekComponents)
 
+// play
+lazy val hepekPlay = (project in file("hepek-play"))
+  .settings(
+    name := "hepek-play"
+  )
+  .dependsOn(hepekComponents)
+  .enablePlugins(PlayScala)
+
 // docs
 lazy val hepekDocs = (project in file("hepek-docs"))
   .settings(
-	skip in publish := true,
+    skip in publish := true,
     hepekTarget := baseDirectory.value / "..",
     (hepek in Compile) := {
       WebKeys.assets.value
@@ -70,7 +78,7 @@ lazy val hepekDocs = (project in file("hepek-docs"))
 // tests
 lazy val hepekTests = (project in file("hepek-tests"))
   .settings(
-	skip in publish := true,
+    skip in publish := true,
     (test in Test) := {
       WebKeys.assets.value
       (hepek in Compile).value // run hepek before tests

hepek-components/src/main/scala/ba/sake/hepek/HepekAliases.scala

@@ -0,0 +1,29 @@
+package ba.sake.hepek
+
+private[hepek] trait HepekAliases {
+
+  val SiteSettings = html.SiteSettings
+  type SiteSettings = html.SiteSettings
+
+  val PageSettings = html.PageSettings
+  type PageSettings = html.PageSettings
+
+  // deps
+  val Dependency = html.Dependency
+  type Dependency = html.Dependency
+
+  val Dependencies = html.Dependencies
+  type Dependencies = html.Dependencies
+
+  val DependencyProvider = html.DependencyProvider
+
+  // grid
+  val Ratio = html.component.GridComponents.Ratio
+  type Ratio = html.component.GridComponents.Ratio
+
+  val Ratios = html.component.GridComponents.Ratios
+  type Ratios = html.component.GridComponents.Ratios
+
+  val ScreenRatios = html.component.GridComponents.ScreenRatios
+  type ScreenRatios = html.component.GridComponents.ScreenRatios
+}

hepek/src/main/scala/ba/sake/hepek/anchorjs/AnchorjsDependencies.scala → hepek-components/src/main/scala/ba/sake/hepek/anchorjs/AnchorjsDependencies.scala

@@ -1,6 +1,6 @@
 package ba.sake.hepek.anchorjs
 
-import ba.sake.hepek.html.structure._
+import ba.sake.hepek.html._
 
 /** You need to provide Anchorjs config by yourself.
   *

hepek/src/main/scala/ba/sake/hepek/bootstrap3/BootstrapBundle.scala → hepek-components/src/main/scala/ba/sake/hepek/bootstrap3/BootstrapBundle.scala

@@ -2,9 +2,8 @@ package ba.sake.hepek.bootstrap3
 
 import ba.sake.hepek.html.Bundle
 import ba.sake.hepek.bootstrap3.component.BootstrapComponentsBundle
-import ba.sake.hepek.bootstrap3.statik.BootstrapStaticPage
 
 trait BootstrapBundle extends Bundle with BootstrapComponentsBundle {
 
-  override type StaticPage = BootstrapStaticPage
+  override type HtmlPage = BootstrapPage
 }

hepek/src/main/scala/ba/sake/hepek/bootstrap3/BootstrapDependencies.scala → hepek-components/src/main/scala/ba/sake/hepek/bootstrap3/BootstrapDependencies.scala

@@ -1,6 +1,6 @@
 package ba.sake.hepek.bootstrap3
 
-import ba.sake.hepek.html.structure._
+import ba.sake.hepek.html._
 import ba.sake.hepek.jquery.JQueryDependencies
 
 trait BootstrapDependencies extends JQueryDependencies {

hepek-components/src/main/scala/ba/sake/hepek/bootstrap3/BootstrapPage.scala

@@ -0,0 +1,14 @@
+package ba.sake.hepek.bootstrap3
+
+import scalatags.Text.all._
+import ba.sake.hepek.html._
+
+trait BootstrapPage extends HtmlPage with BootstrapDependencies {
+
+  def bootstrapContainer: String = "container-fluid"
+
+  override def bodyContent: Frag =
+    div(cls := bootstrapContainer)(
+      )
+
+}

hepek/src/main/scala/ba/sake/hepek/clipboardjs/ClipboardjsDependencies.scala → hepek-components/src/main/scala/ba/sake/hepek/clipboardjs/ClipboardjsDependencies.scala

@@ -1,6 +1,6 @@
 package ba.sake.hepek.clipboardjs
 
-import ba.sake.hepek.html.structure._
+import ba.sake.hepek.html._
 
 trait ClipboardjsDependencies extends PageDependencies {
 

hepek/src/main/scala/ba/sake/hepek/html/Bundle.scala → hepek-components/src/main/scala/ba/sake/hepek/html/Bundle.scala

@@ -4,5 +4,5 @@ import ba.sake.hepek.html.component.ComponentsBundle
 
 trait Bundle extends ComponentsBundle {
 
-  type StaticPage <: structure.StaticPage
+  type HtmlPage <: ba.sake.hepek.html.HtmlPage
 }

hepek/src/main/scala/ba/sake/hepek/html/structure/ComponentSettings.scala → hepek-components/src/main/scala/ba/sake/hepek/html/ComponentSettings.scala

@@ -1,4 +1,4 @@
-package ba.sake.hepek.html.structure
+package ba.sake.hepek.html
 
 abstract class BaseComponentSettings(
     val version: String,

hepek/src/main/scala/ba/sake/hepek/html/structure/Dependencies.scala → hepek-components/src/main/scala/ba/sake/hepek/html/Dependencies.scala

@@ -1,4 +1,4 @@
-package ba.sake.hepek.html.structure
+package ba.sake.hepek.html
 
 case class Dependency(
     file: String,

hepek/src/main/scala/ba/sake/hepek/html/structure/DependencyProvider.scala → hepek-components/src/main/scala/ba/sake/hepek/html/DependencyProvider.scala

@@ -1,4 +1,4 @@
-package ba.sake.hepek.html.structure
+package ba.sake.hepek.html
 
 trait DependencyProvider {
   def depPath(dep: Dependency): String

hepek/src/main/scala/ba/sake/hepek/html/structure/StaticPage.scala → hepek-components/src/main/scala/ba/sake/hepek/html/HtmlPage.scala

@@ -1,46 +1,14 @@
-package ba.sake.hepek.html.structure
+package ba.sake.hepek.html
 
-import ba.sake.hepek.core.Renderable
-import ba.sake.hepek.path.ClassPackageRelativePath
+import scalatags.Text.all._
 
-trait StaticPage extends Renderable with ClassPackageRelativePath with PageDependencies {
-  import scalatags.Text.all._
+trait HtmlPage extends PageDependencies {
 
   def siteSettings: SiteSettings = SiteSettings()
-  def pageSettings: PageSettings = PageSettings()
-
-  def renderPretty = false
-  def renderXhtml  = false
-
-  // <head>
-  def headContent: Frag =
-    frag(
-      meta(charset := "utf-8"),
-      meta(
-        attr("http-equiv") := "X-UA-Compatible",
-        content := "ie=edge"
-      ),
-      meta(
-        name := "viewport",
-        content := "width=device-width, initial-scale=1"
-      ),
-      pageSettings.description.map { d =>
-        meta(name := "description", content := d)
-      },
-      tag("title")(
-        pageSettings.title + siteSettings.name.map(n => " - " + n).getOrElse("")
-      ),
-      siteSettings.faviconNormal.map { fav =>
-        link(rel := "shortcut icon", href := fav, tpe := "image/x-icon")
-      }
-    )
 
-  // <body>
-  def bodyContent: Frag = pageContent
-
-  def pageContent: Frag = frag()
+  def pageSettings: PageSettings = PageSettings()
 
-  override def render: String = {
+  def contents: String = {
     // inline css
     val compStyleInlines = components.flatMap { _._2.cssDependencies.inlines }
     val allStyleInlines  = compStyleInlines ++ stylesInline
@@ -64,7 +32,7 @@ trait StaticPage extends Renderable with ClassPackageRelativePath with PageDepen
     val allScriptURLs = compScriptUrls ++ scriptURLs
 
     // CONTENT
-    val rawContent = "<!DOCTYPE html>" +
+    "<!DOCTYPE html>" +
       html(lang := pageSettings.language)(
         head(
           headContent,
@@ -77,51 +45,55 @@ trait StaticPage extends Renderable with ClassPackageRelativePath with PageDepen
             allScriptInlines.map(s => script(raw(s)))
         )
       )
+  }
 
-    // optionally XHTML-ify and pretty-fy
-    if (renderXhtml || renderPretty) {
-      val document = org.jsoup.Jsoup.parse(rawContent)
-      document
-        .outputSettings()
-        .prettyPrint(renderPretty)
-      if (renderXhtml) {
-        document
-          .outputSettings()
-          .syntax(org.jsoup.nodes.Document.OutputSettings.Syntax.xml)
+  // <head>
+  def headContent: Frag =
+    frag(
+      meta(charset := "utf-8"),
+      meta(
+        attr("http-equiv") := "X-UA-Compatible",
+        content := "ie=edge"
+      ),
+      meta(
+        name := "viewport",
+        content := "width=device-width, initial-scale=1"
+      ),
+      pageSettings.description.map { d =>
+        meta(name := "description", content := d)
+      },
+      tag("title")(
+        pageSettings.title + siteSettings.name.map(n => " - " + n).getOrElse("")
+      ),
+      siteSettings.faviconNormal.map { fav =>
+        link(rel := "shortcut icon", href := fav, tpe := "image/x-icon")
       }
-      document.html
-    } else {
-      rawContent
-    }
-  }
+    )
+
+  // <body>
+  def bodyContent: Frag = pageContent
+
+  def pageContent: Frag = frag()
+
 }
 
-/* website setttings */
 case class SiteSettings(
     name: Option[String] = None,
-    indexPage: Option[StaticPage] = None,
-    mainPages: List[StaticPage] = List.empty,
     faviconNormal: Option[String] = None,
     faviconInverted: Option[String] = None
 ) {
   def withName(n: String)                      = copy(name = Some(n))
   def withName(n: Option[String])              = copy(name = n)
-  def withIndexPage(ip: StaticPage)            = copy(indexPage = Some(ip))
-  def withIndexPage(ip: Option[StaticPage])    = copy(indexPage = ip)
-  def withMainPages(mps: List[StaticPage])     = copy(mainPages = mps)
-  def withMainPages(mps: StaticPage*)          = copy(mainPages = mps.toList)
   def withFaviconNormal(fav: String)           = copy(faviconNormal = Some(fav))
   def withFaviconNormal(fav: Option[String])   = copy(faviconNormal = fav)
   def withFaviconInverted(fav: String)         = copy(faviconInverted = Some(fav))
   def withFaviconInverted(fav: Option[String]) = copy(faviconInverted = fav)
 }
 
-/* page setttings */
 case class PageSettings(
     title: String,
     label: String,
     language: String,
-    category: Option[String],
     description: Option[String]
 ) {
 
@@ -131,8 +103,6 @@ case class PageSettings(
     else copy(title = t)
   def withLabel(l: String)               = copy(label = l)
   def withLanguage(l: String)            = copy(language = l)
-  def withCategory(c: String)            = copy(category = Some(c))
-  def withCategory(c: Option[String])    = copy(category = c)
   def withDescription(d: String)         = copy(description = Some(d))
   def withDescription(d: Option[String]) = copy(description = d)
 }
@@ -142,5 +112,5 @@ object PageSettings {
   val DefaultLanguage = "en"
 
   def apply(title: String = DefaultTitle): PageSettings =
-    PageSettings(title, title, DefaultLanguage, None, None)
+    PageSettings(title, title, DefaultLanguage, None)
 }

hepek/src/main/scala/ba/sake/hepek/html/structure/PageDependencies.scala → hepek-components/src/main/scala/ba/sake/hepek/html/PageDependencies.scala

@@ -1,4 +1,4 @@
-package ba.sake.hepek.html.structure
+package ba.sake.hepek.html
 
 trait PageDependencies {
 

hepek/src/main/scala/ba/sake/hepek/jquery/JQueryDependencies.scala → hepek-components/src/main/scala/ba/sake/hepek/jquery/JQueryDependencies.scala

@@ -1,6 +1,6 @@
 package ba.sake.hepek.jquery
 
-import ba.sake.hepek.html.structure._
+import ba.sake.hepek.html._
 
 trait JQueryDependencies extends PageDependencies {
 

hepek/src/main/scala/ba/sake/hepek/katex/KatexDependencies.scala → hepek-components/src/main/scala/ba/sake/hepek/katex/KatexDependencies.scala

@@ -1,6 +1,6 @@
 package ba.sake.hepek.katex
 
-import ba.sake.hepek.html.structure._
+import ba.sake.hepek.html._
 
 trait KatexDependencies extends PageDependencies {
 

hepek/src/main/scala/ba/sake/hepek/mathjax/MathjaxDependencies.scala → hepek-components/src/main/scala/ba/sake/hepek/mathjax/MathjaxDependencies.scala

@@ -1,6 +1,6 @@
 package ba.sake.hepek.mathjax
 
-import ba.sake.hepek.html.structure._
+import ba.sake.hepek.html._
 
 trait MathjaxDependencies extends PageDependencies {
 

hepek/src/main/scala/ba/sake/hepek/pure/PureBundle.scala → hepek-components/src/main/scala/ba/sake/hepek/pure/PureBundle.scala

@@ -2,9 +2,8 @@ package ba.sake.hepek.pure
 
 import ba.sake.hepek.html.Bundle
 import ba.sake.hepek.pure.component.PureComponentsBundle
-import ba.sake.hepek.pure.statik.PureStaticPage
 
 trait PureBundle extends Bundle with PureComponentsBundle {
 
-  override type StaticPage = PureStaticPage
+  override type HtmlPage = PurePage
 }

hepek/src/main/scala/ba/sake/hepek/pure/PureDependencies.scala → hepek-components/src/main/scala/ba/sake/hepek/pure/PureDependencies.scala

@@ -1,6 +1,6 @@
 package ba.sake.hepek.pure
 
-import ba.sake.hepek.html.structure._
+import ba.sake.hepek.html._
 
 trait PureDependencies extends PageDependencies {
 

hepek-components/src/main/scala/ba/sake/hepek/pure/PurePage.scala

@@ -0,0 +1,5 @@
+package ba.sake.hepek.pure
+
+import ba.sake.hepek.html.HtmlPage
+
+trait PurePage extends HtmlPage with PureDependencies {}

hepek-docs/src/main/scala/templates/HepekDocsPage.scala

@@ -35,11 +35,14 @@ trait HepekDocsStaticPage extends StaticPage with AnchorjsDependencies {
   override def siteSettings =
     super.siteSettings
       .withName(Site.name)
-      .withIndexPage(docs.Index)
-      .withMainPages(docs.QuickStart)
       .withFaviconNormal(images.ico("favicon").ref)
       .withFaviconInverted(images.ico("favicon-small").ref)
 
+  override def staticSiteSettings =
+    super.staticSiteSettings
+      .withIndexPage(docs.Index)
+      .withMainPages(docs.QuickStart)
+
   // CSS
   override def styleURLs = super.styleURLs ++ List(
     styles.css("main").ref,

hepek-docs/src/main/scala/utils/Imports.scala

@@ -1,12 +1,12 @@
 package utils
 
 import ba.sake.hepek.Resources
-import ba.sake.hepek.bootstrap3.BootstrapBundle
+import ba.sake.hepek.bootstrap3.statik.BootstrapStaticBundle
 import ba.sake.hepek.html.component.BasicComponents
 import ba.sake.hepek.prismjs.PrismCodeHighlightComponents
 import scalatags.Text.all._
 
-object Imports extends BootstrapBundle with BasicComponents {
+object Imports extends BootstrapStaticBundle with BasicComponents {
 
   object resources extends Resources {
     override def siteRootPath = "docs"

hepek-docs/src/main/scala/utils/Site.scala

@@ -1,6 +1,6 @@
 package utils
 
-import ba.sake.hepek.html.structure.blog.BlogPostPage
+import ba.sake.hepek.html.statik.BlogPostPage
 import docs._
 
 object Site {