drop webjars

psypuff · Jun 8, 2016 · eb81642 · eb81642
1 parent d2288fc
commit eb81642
Show file tree

Hide file tree

Showing 11 changed files with 697 additions and 6,771 deletions.
diff --git a/app/views/Index.scala.html b/app/views/Index.scala.html
@@ -9,8 +9,8 @@
         <title>{{title}}</title>
         <link rel="icon" type="image/png" href='@routes.Assets.versioned("img/favicon.png")'>
         <link rel="stylesheet" href='@routes.Assets.versioned("css/bootstrap.min.css")'>
+        <link rel="stylesheet" href='@routes.Assets.versioned("css/font-awesome.min.css")'>
         <link rel="stylesheet" href='@routes.Assets.versioned("css/app.css")'>
-        <link rel='stylesheet' href='@routes.WebJarAssets.at(WebJarAssets.locate("css/font-awesome.min.css"))'>
         <script src='@routes.Assets.versioned("lib.js")'></script>
         <script src='@routes.Assets.versioned("app.js")'></script>
     </head>
@@ -20,7 +20,7 @@
         <div class="container-fluid main">
             <div class="row">
                 <div class="col-sm-12">
-                    <div class="content" ng-view onload="initializeController()"></div>
+                    <div class="content" ng-view onload="setup()"></div>
                 </div>
             </div>
         </div>

diff --git a/build.sbt b/build.sbt
@@ -5,15 +5,15 @@ version := "0.0.1"
 scalaVersion := "2.11.6"
 
 libraryDependencies ++= Seq(
-  "org.webjars"       %% "webjars-play"  % "2.4.0-1",
-  "org.webjars"       %  "font-awesome"  % "4.5.0",
-  "org.elasticsearch" %  "elasticsearch" % "2.2.0",
+  "com.typesafe.play" %% "play"          % "2.4.6",
   "com.typesafe.play" %% "play-ws"       % "2.4.6",
-  "org.specs2"        %% "specs2-junit"  % "3.6.5",
-  "org.specs2"        %% "specs2-core"   % "3.6.5",
-  "org.specs2"        %% "specs2-mock"   % "3.6.5"
+  "org.specs2"        %% "specs2-junit"  % "3.6.5" % "test",
+  "org.specs2"        %% "specs2-core"   % "3.6.5" % "test",
+  "org.specs2"        %% "specs2-mock"   % "3.6.5" % "test"
 )
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
+doc in Compile <<= target.map(_ / "none")
+
 pipelineStages := Seq(digest, gzip)
diff --git a/conf/routes b/conf/routes
@@ -29,6 +29,5 @@ GET        /apis/hosts                       @controllers.HostsController.index
 
 
 # Map the JS resource paths
-GET        /webjars/*file                    controllers.WebJarAssets.at(file)
 GET        /assets/*file                     controllers.Assets.at(path="/public", file)
 GET        /*file                            controllers.Assets.versioned(path="/public", file: Asset)