BUG fix Gruntfile, bower, AnyplaceAssets, Viewer, anyplace-core-js

dmsl · Jul 13, 2021 · faf1e65 · faf1e65
1 parent 064317b
commit faf1e65
Show file tree

Hide file tree

Showing 22 changed files with 67 additions and 1,256 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/server/.idea/misc.xml b/server/.idea/misc.xml
diff --git a/server/.idea/play2_project_settings.xml b/server/.idea/play2_project_settings.xml
diff --git a/server/.idea/play2_settings.xml b/server/.idea/play2_settings.xml
diff --git a/server/app/Anyplace.scala b/server/app/Anyplace.scala
@@ -9,10 +9,10 @@ import utils.LPLogger
 import scala.concurrent.Future
 
 @Singleton
-class Anyplace @Inject() (conf: Configuration, mdb: MongodbDatasource) (appLifecycle: ApplicationLifecycle) {
+class Anyplace @Inject() (conf: Configuration) (appLifecycle: ApplicationLifecycle) {
   // ON APPLICATION START (ctor):
   //ifxDB.getStaticInstance(conf)
-  CouchbaseDatasource.getStaticInstance(conf)
+  CouchbaseDatasource.initialize(conf)
   MongodbDatasource.initialize(conf)
   logAnalyticsInstallation()
 

diff --git a/server/app/controllers/AnyplaceAssets.scala b/server/app/controllers/AnyplaceAssets.scala
@@ -35,25 +35,29 @@
  */
 package controllers
 
+import datasources.SCHEMA
 import javax.inject.{Inject, Singleton}
 import play.api.mvc._
 
 @Singleton
-class AnyplaceAssets @Inject()(cc: ControllerComponents) extends AbstractController(cc) {
+class AnyplaceAssets @Inject()(cc: ControllerComponents,
+                               assets: Assets) extends AbstractController(cc) {
 
-  //def at(path: String, file: String): Action[AnyContent] = Action {
-  //  implicit request =>
-  //    //    Assets.at(path+"/anyplace_viewer_campus", file)
-  //    val uri = request.headers.get("referer").getOrElse("")
-  //    var viewerDir = "/anyplace_viewer/"
-  //    val campus = !uri.contains(SCHEMA.fCampusCuid)
-  //    if (campus) {
-  //      viewerDir = "/anyplace_viewer/"
-  //    } else {
-  //      viewerDir = "/anyplace_viewer_campus/"
-  //    }
-  //
-  //
-  //}
+  def at(path: String, file: String): Action[AnyContent] = Action.async {
+    implicit request =>
+      //    Assets.at(path+"/anyplace_viewer_campus", file)
+      val uri = request.headers.get("referer").getOrElse("")
+      var viewerDir = "/anyplace_viewer/"
+      val campus = !uri.contains(SCHEMA.fCampusCuid)
+      if (campus) {
+        viewerDir = "/anyplace_viewer/"
+      } else {
+        viewerDir = "/anyplace_viewer_campus/"
+      }
+     // assets.a
+      //play.api.controllers.AnyplaceAssets.super.at
+      assets.at(path + viewerDir, file).apply(request)
+        //.apply(request)
+  }
 
 }
diff --git a/server/app/controllers/ApplicationAnyplace.scala b/server/app/controllers/ApplicationAnyplace.scala
@@ -39,7 +39,6 @@ import javax.inject.{Inject, Singleton}
 import play.api.Configuration
 import play.api.libs.json.{JsValue, Json}
 import play.api.mvc.{AbstractController, ControllerComponents}
-import utils.AnyResponseHelper
 
 @Singleton
 class ApplicationAnyplace @Inject()(cc: ControllerComponents,
@@ -55,6 +54,7 @@ class ApplicationAnyplace @Inject()(cc: ControllerComponents,
     val address = conf.get[String]("server.address")
     val port = conf.get[String]("server.port")
 
+
     var variant=""
     if (address.contains("dev")) {
       variant = "beta"
@@ -65,6 +65,7 @@ class ApplicationAnyplace @Inject()(cc: ControllerComponents,
 
     val res: JsValue = Json.obj(
       "version" -> version,
+      "address" -> address,
       "port"-> port,
       "variant" -> variant)
 

diff --git a/server/app/datasources/CouchbaseDatasource.scala b/server/app/datasources/CouchbaseDatasource.scala
@@ -62,7 +62,7 @@ object CouchbaseDatasource {
   private var sInstance: CouchbaseDatasource = null
   private val sLockInstance: AnyRef = new AnyRef()
 
-  def getStaticInstance(conf: Configuration): CouchbaseDatasource = {
+  def initialize(conf: Configuration): CouchbaseDatasource = {
     sLockInstance.synchronized {
       if (sInstance == null) {
         // It either users clusterNodes or hostname

diff --git a/server/app/datasources/ProxyDataSource.scala b/server/app/datasources/ProxyDataSource.scala
@@ -72,8 +72,8 @@ class ProxyDataSource @Inject() (conf: Configuration) extends IDatasource {
 
   def getIDatasource: IDatasource = getInstance()
 
-  private def initCouchbase() : Unit = {
-    this.mCouchbase = CouchbaseDatasource.getStaticInstance(conf)
+  private def initCouchbase(): Unit = {
+    this.mCouchbase = CouchbaseDatasource.initialize(conf)
   }
 
   private def initMongodb(): Unit = {

diff --git a/server/build.sbt b/server/build.sbt
@@ -1,8 +1,8 @@
 // TODO:PM
 //import com.typesafe.config._
 //val conf = ConfigFactory.parseFile(new File("conf/reference.conf")).resolve()
-//name :=  conf.getString("application.name")
-//version := conf.getString("application.version")
+//name :=  conf.get[String]("application.name")
+//version := conf.get[String]("application.version")
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)

diff --git a/server/conf/routes b/server/conf/routes
@@ -148,7 +148,7 @@ GET         /architect
 
 # VIEWER:
 GET /viewer/index.html                                                              controllers.WebAppController.serveViewer(file="index.html")
-#GET /viewer/*file                                                                   controllers.AnyplaceAssets.at(path="/public", file)
+GET /viewer/*file                                                                   controllers.AnyplaceAssets.at(path="/public", file)
 GET /viewer/                                                                        controllers.WebAppController.serveViewer(file="index.html")
 GET /viewer                                                                         controllers.WebAppController.AddTrailingSlash()
 

diff --git a/server/public/anyplace_architect/Gruntfile.js b/server/public/anyplace_architect/Gruntfile.js
@@ -7,8 +7,8 @@ module.exports = function (grunt) {
     concat: {
       js: {
         src: [
-          'app.js',
-          '../shared/js/*.js',
+          '../shared/js/*.js',                  // FIRST
+          'app.js',                             // SECOND
           '../shared/js/anyplace-core-js/*.js',
           'scripts/*.js',
           'controllers/*.js'

diff --git a/server/public/anyplace_viewer/Gruntfile.js b/server/public/anyplace_viewer/Gruntfile.js
@@ -7,9 +7,9 @@ module.exports = function (grunt) {
     concat: {
       js: {
         src: [
-          '../shared/js/*.js',
+          '../shared/js/*.js',                  // FIRST
+          'app.js',                             // SECOND
           '../shared/js/anyplace-core-js/*.js',
-          'app.js',
           'scripts/*.js',
           'controllers/*.js'
         ],

diff --git a/server/public/anyplace_viewer/bower.json b/server/public/anyplace_viewer/bower.json
@@ -31,13 +31,11 @@
     "fontawesome": "~4.3.0",
     "jqueryui-touch-punch": "*",
     "select2": "~3.5.2",
-    "angular-aria": "1.7.2",
+    "angular-aria": "1.5.8",
     "angular-animate": "1.5.8",
     "angular-material": "^1.1.4"
   },
   "resolutions": {
-    "angular": "~1.3.20",
-    "angular-animate": "1.5.8",
-    "angular-aria": "1.5.8"
+    "angular": "~1.3.20"
   }
 }
diff --git a/server/public/anyplace_viewer_campus/Gruntfile.js b/server/public/anyplace_viewer_campus/Gruntfile.js
@@ -7,8 +7,8 @@ module.exports = function (grunt) {
     concat: {
       js: {
         src: [
-          'app.js',
-          '../shared/js/*.js',
+          '../shared/js/*.js',                  // FIRST
+          'app.js',                             // SECOND
           '../shared/js/anyplace-core-js/*.js',
           'scripts/*.js',
           'controllers/*.js'

diff --git a/server/public/anyplace_viewer_campus/bower.json b/server/public/anyplace_viewer_campus/bower.json
@@ -30,7 +30,7 @@
     "fontawesome": "~4.3.0",
     "jqueryui-touch-punch": "*",
     "select2": "~3.5.2",
-    "angular-aria": "1.7.2",
+    "angular-aria": "1.5.8",
     "angular-animate": "1.7.2",
     "angular-material": "^1.1.4"
   },