Page verif admin

Gruntfile.js

@@ -73,7 +73,7 @@ module.exports = function (grunt) {
 
         concat: {
             angularMaterial: {
-                src: 'bower_components/angular-material/angular-material.js',
+                src: 'bower_components/angular-material/angular-material.min.js',
                 dest: 'server/public/plugins/angular-material.js'
             },
 
@@ -87,7 +87,7 @@ module.exports = function (grunt) {
                 dest: 'server/public/plugins/angular-animate.min.js'
             },
 
-            angulararia: {
+            angularAria: {
                 src: 'bower_components/angular-aria/angular-aria.min.js',
                 dest: 'server/public/plugins/angular-aria.min.js'
             },
@@ -107,7 +107,7 @@ module.exports = function (grunt) {
                 dest: 'server/public/plugins/ng-map.min.js'
             },
 
-            angularWebsocket: {
+            angularWebSocket: {
                 src: 'bower_components/angular-websocket/angular-websocket.js',
                 dest: 'server/public/plugins/angular-websocket.js'
             },
@@ -122,7 +122,7 @@ module.exports = function (grunt) {
                 dest: 'server/public/plugins/angular-messages.min.js'
             },
 
-            angularRessource: {
+            angularResource: {
                 src: 'bower_components/angular-resource/angular-resource.min.js',
                 dest: 'server/public/plugins/angular-resource.min.js'
             },

bower.json

@@ -2,16 +2,16 @@
   "name": "claude",
   "version": "0.0.0",
   "dependencies": {
-    "angular": "1.5.0-beta.2",
-    "angular-animate": "1.5.0-beta.2",
+    "angular": "1.5.0",
+    "angular-animate": "1.5.0",
     "angular-translate": "2.9.2",
-    "angular-aria": "1.5.0-beta.2",
-    "angular-cookies": "1.5.0-beta.2",
-    "angular-messages": "1.5.0-beta.2",
-    "angular-resource": "1.5.0-beta.2",
-    "angular-route": "1.5.0-beta.2",
-    "angular-sanitize": "1.5.0-beta.2",
-    "angular-touch": "1.5.0-beta.2",
+    "angular-aria": "1.5.0",
+    "angular-cookies": "1.5.0",
+    "angular-messages": "1.5.0",
+    "angular-resource": "1.5.0",
+    "angular-route": "1.5.0",
+    "angular-sanitize": "1.5.0",
+    "angular-touch": "1.5.0",
     "angular-foundation": "0.8.0",
     "angular-material": "1.0.5",
     "angular-websocket": "1.0.14",
@@ -22,8 +22,11 @@
     "ngmap": "1.14.12"
   },
   "devDependencies": {
-    "angular-mocks": "1.5.0-beta.2",
-    "angular-scenario": "1.5.0-beta.2"
+    "angular-mocks": "1.5.0",
+    "angular-scenario": "1.5.0"
   },
-  "appPath": "public"
+  "appPath": "public",
+  "resolutions": {
+    "angular": "1.5.0"
+  }
 }

client/src/main/scala/admin/AdminController.scala

@@ -12,40 +12,33 @@ import utilities.jsonHelper
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 import scala.scalajs.js
-import scala.scalajs.js.Date
+import scala.scalajs.js.{JSON, Date}
 import scala.scalajs.js.JSConverters.JSRichGenTraversableOnce
 import scala.scalajs.js.annotation.JSExportAll
 
 @JSExportAll
 @injectable("adminController")
-class AdminController(scope: Scope, service: HttpGeneralService, timeout: Timeout, mdToast: MdToastService)
-    extends AbstractController[Scope](scope) with jsonHelper {
-
-  var salableEvents: js.Array[SalableEvent] = new js.Array[SalableEvent]
-  var ticketsWithStatus: js.Array[TicketWithStatus] = new js.Array[TicketWithStatus]
-  var pendingTickets: js.Array[PendingTicket] = new js.Array[PendingTicket]
-  var boughtBills: js.Array[TicketBill] = new js.Array[TicketBill]
-  var soldBills: js.Array[TicketBill] = new js.Array[TicketBill]
+class AdminController(adminScope: AdminScope, service: HttpGeneralService, timeout: Timeout, mdToast: MdToastService)
+    extends AbstractController[AdminScope](adminScope) with jsonHelper {
+
   val validationMessage = "Ok"
-  var currentSessions = new js.Array[Session]()
   var timeBeforeReloadCurrentSessions = 10000
+
   setInterval(() => {
     service.get(tracking.TrackingRoutes.getCurrentSessions) map { sessions =>
-      timeout(() => currentSessions = read[Seq[Session]](sessions).toJSArray)
+      timeout(() => adminScope.currentSessions = read[Seq[Session]](sessions).toJSArray)
     }
   }, timeBeforeReloadCurrentSessions)
 
 
-  def findSalableEvents(): Unit = {
-    service.get(AdminRoutes.salableEvents) map { foundSalableEvents =>
-      timeout(() => salableEvents = read[Seq[SalableEvent]](foundSalableEvents).toJSArray)
-    }
+  def findSalableEvents(): Unit = service.get(AdminRoutes.salableEvents) map { foundSalableEvents =>
+    timeout(() => adminScope.salableEvents = JSON.parse(foundSalableEvents))
   }
 
-  def findTariffsByEventId(eventId: Int): Future[js.Array[Tariff]] = {
+  def findTariffsByEventId(eventId: Int): Future[Dynamic] = {
     service.get(AdminRoutes.findTariffsByEventId(eventId)) map { tariffs =>
-      timeout( () => read[Seq[Tariff]](tariffs).toJSArray)
-      read[Seq[Tariff]](tariffs).toJSArray
+      timeout(() => ())
+      JSON.parse(tariffs)
     }
   }
 
@@ -58,35 +51,25 @@ class AdminController(scope: Scope, service: HttpGeneralService, timeout: Timeou
     }
   }
 
-  def findTicketsWithStatus(): Unit = {
-    service.get(AdminRoutes.findTicketsWithStatus) map { ticketsWithStatusFound =>
-        timeout(() => ticketsWithStatus = read[Seq[TicketWithStatus]](ticketsWithStatusFound).toJSArray)
-    }
+  def findTicketsWithStatus(): Unit = service.get(AdminRoutes.findTicketsWithStatus) map { ticketsWithStatusFound =>
+    timeout(() => adminScope.ticketsWithStatus = JSON.parse(ticketsWithStatusFound))
   }
 
-  def findPendingTickets(): Unit = {
-    service.get(AdminRoutes.findPendingTickets) map { pendingTicketsFound =>
-        timeout(() => pendingTickets = read[Seq[PendingTicket]](pendingTicketsFound).toJSArray)
-    }
+  def findPendingTickets(): Unit = service.get(AdminRoutes.findPendingTickets) map { pendingTicketsFound =>
+    timeout(() => adminScope.pendingTickets = JSON.parse(pendingTicketsFound))
   }
 
-  def findBoughtBills(): Unit = {
-    service.get(AdminRoutes.findBoughtBills) map { boughtBillsFind =>
-        timeout(() => boughtBills = read[Seq[TicketBill]](boughtBillsFind).toJSArray)
-    }
+  def findBoughtBills(): Unit = service.get(AdminRoutes.findBoughtBills) map { boughtBillsFind =>
+    timeout(() => adminScope.boughtBills = JSON.parse(boughtBillsFind))
   }
 
-  def findSoldBills(): Unit = {
-    service.get(AdminRoutes.findSoldBills) map { soldBillsFound =>
-      timeout(() => soldBills = read[Seq[TicketBill]](soldBillsFound).toJSArray)
-    }
+  def findSoldBills(): Unit = service.get(AdminRoutes.findSoldBills) map { soldBillsFound =>
+    timeout(() => adminScope.soldBills = JSON.parse(soldBillsFound))
   }
 
-  def createSalableEvent(eventId: Int): Unit = {
-    service.post(AdminRoutes.salableEvents(eventId: Int)) map { response =>
-      val toast = mdToast.simple(validationMessage)
-      mdToast.show(toast)
-    }
+  def createSalableEvent(eventId: Int): Unit = service.post(AdminRoutes.salableEvents(eventId: Int)) map { response =>
+    val toast = mdToast.simple(validationMessage)
+    mdToast.show(toast)
   }
 
   def proposeTicket(tariffId: Int, amount: Double, qrCode: String): Unit = {

client/src/main/scala/admin/AdminScope.scala

@@ -0,0 +1,15 @@
+package admin
+
+import com.greencatsoft.angularjs.core.Scope
+
+import scala.scalajs.js
+
+@js.native
+trait AdminScope extends Scope {
+  var salableEvents: js.Any = js.native
+  var ticketsWithStatus: js.Any = js.native
+  var pendingTickets: js.Any = js.native
+  var boughtBills: js.Any = js.native
+  var soldBills: js.Any = js.native
+  var currentSessions: js.Any  = js.native
+}

client/src/main/scala/admin/salableEvents.html

@@ -1,8 +1,16 @@
 <md-list>
-    <md-list-item ng-repeat="event in controller.salableEvents">
-        {{event}}
+
+    <md-list-item ng-repeat="event in salableEvents">
+
+        {{ event }}
+
         <span data-ng-init="tariffs = controller.findTariffsByEventId(event.eventId)">
-            <p data-ng-repeat="tariff in tariffs">{{tariff}}</p>
+
+            <p data-ng-repeat="tariff in tariffs">
+                {{ tariff }}
+            </p>
+
         </span>
+
     </md-list-item>
-</md-list>
+</md-list>

client/src/main/scala/chatContact/AdminChatContactController.scala

@@ -1,6 +1,6 @@
 package chatContact
 
-import com.greencatsoft.angularjs.core.{HttpService, Timeout, Window}
+import com.greencatsoft.angularjs.core.{HttpService, Timeout}
 import com.greencatsoft.angularjs.{AbstractController, injectable}
 import org.scalajs.dom
 import org.scalajs.dom.MessageEvent
@@ -17,7 +17,7 @@ class AdminChatContactController(chatContactScope: AdminChatContactScope, httpSe
 
   chatContactScope.messages = js.Array[Message]()
 
-  val webSocket = new dom.WebSocket(chatService.findWebSocketUrl() + "chat")
+  val webSocket = new dom.WebSocket(chatService.findWebSocketUrl() + "adminChat")
 
   var areWeConnected: Boolean = false
 

client/src/main/scala/chatContact/ChatContactController.scala

@@ -1,6 +1,6 @@
 package chatContact
 
-import com.greencatsoft.angularjs.core.{HttpService, Timeout, Window}
+import com.greencatsoft.angularjs.core.{HttpService, Timeout}
 import com.greencatsoft.angularjs.{AbstractController, injectable}
 import org.scalajs.dom
 import org.scalajs.dom.MessageEvent

client/src/main/scala/chatContact/contact-component.html

@@ -1,20 +1,21 @@
 <div class="contact-component float-right absolute right0 bottom0 animated column large-3 medium-5"
-     ng-mouseleave="showSmallContact = false;"
+     data-ng-mouseleave="showSmallContact = false;"
      data-ng-controller="chatContactController"
-     ng-class="{'full': full}">
+     data-ng-init="full = false"
+     data-ng-class="{'full': full}">
 
-    <div ng-if="showSmallContact || full"
+    <div data-ng-if="showSmallContact || full"
          id="ccb2"
-         ng-click="full = true; directive.track('cl,ccb2')"
-         ng-class="{'full': $parent.full}"
+         data-ng-click="full = true; directive.track('cl,ccb2')"
+         data-ng-class="{'full': $parent.full}"
          class="contact-tooltip inner-contact-tooltip tracking">
 
         <i data-ng-click="$parent.showSmallContact = false; $parent.full = false;"
            data-ng-show="$parent.full"
            class="fa fa-times close-icon">
         </i>
 
-        <div ng-click="$parent.full = true" class="column small-12 marginTop10 marginBottom10 imagesBox">
+        <div data-ng-click="$parent.full = true" class="column small-12 marginTop10 marginBottom10 imagesBox">
             <div class="center">
                 {{ 'CLAUDE_TEAM' | translate }}
             </div>
@@ -38,7 +39,7 @@
 
                     <div style="position:relative">
                         <input type="email"
-                               ng-model="emailContact"
+                               data-ng-model="emailContact"
                                id="cci2"
                                tracker="in,cci2,{{emailContact}}"
                                required
@@ -53,22 +54,22 @@
 
         </div>
 
-        <div ng-repeat="message in messages"
+        <div data-ng-repeat="message in messages"
              class="column small-8"
-             ng-class="{'float-left': message.fromClient$1, 'float-right': message.fromClient$1 == false}">
-            <div ng-class="{'messageFromUser': message.fromClient$1, 'messageFromUs': message.fromClient$1 == false}">
+             data-ng-class="{'float-left': message.fromClient$1, 'float-right': message.fromClient$1 == false}">
+            <div data-ng-class="{'messageFromUser': message.fromClient$1, 'messageFromUs': message.fromClient$1 == false}">
                 {{message.content$1}}
             </div>
         </div>
 
         <form class="column small-12 chat-form"
-              ng-click="$parent.full = true"
-              ng-submit="controller.send(message); message=''"
-              ng-class="{'paddingRight20 paddingLeft0': full}">
+              data-ng-click="$parent.full = true"
+              data-ng-submit="controller.send(message); message=''"
+              data-ng-class="{'paddingRight20 paddingLeft0': full}">
 
             <input type="text"
-                   ng-click="$parent.full = true"
-                   ng-model="message"
+                   data-ng-click="$parent.full = true"
+                   data-ng-model="message"
                    id="cci1"
                    tracker="in,cci1,{{message}}"
                    focus="{{full}}"

client/src/main/scala/cookies/CookiesDirective.scala

@@ -23,5 +23,6 @@ class CookiesDirective(timeout: Timeout, ngCookies: NgCookies) extends ElementDi
   ngCookies.get("hiddenCookies") match {
     case isHidden if isHidden.isInstanceOf[String] =>
       cookies.innerHTML = ""
+    case _ =>
   }
 }

client/src/main/scala/geolocation/GeolocationService.scala

@@ -38,8 +38,8 @@ class GeolocationService(http: HttpService, timeout: Timeout) extends Service {
     getPoint.error((error: Any) => geographicPoint = basePoint)
 
     getPoint map { response =>
-      val responseMap = response.asInstanceOf[ArrayBuffer[Pair[String, Any]]].toMap
-      if(responseMap.isDefinedAt("status")) {
+      val responseMap = response.asInstanceOf[ArrayBuffer[(String, Any)]].toMap
+      if (responseMap.isDefinedAt("status")) {
         responseMap("status") match {
           case success if success == "success" =>
             GeographicPoint(responseMap("lat").toString.toDouble, responseMap("lng").toString.toDouble)

client/src/main/scala/landingPage/landingPage.html

@@ -11,7 +11,8 @@ <h4 class="home-subtitle column padding0">
         {{ 'INTRO_TEXT' | translate }}
     </h4>
 
-    <form class="column medium-10 medium-offset-1 large-8 large-offset-2 sell-form absolute">
+    <form class="column medium-10 medium-offset-1 large-8 large-offset-2 sell-form absolute"
+          data-ng-init="focusSearch = false">
         <div class="form-container tracking" data-ng-controller="eventsController">
 
             <md-autocomplete md-search-text-change="controller.findMaybeSalableEventsContaining(ctrl.searchText)"

server/app/views/landingPage.scala.html

@@ -57,7 +57,7 @@
                 {{ 'COOKIES' | translate }}
 
                 <a href="#/cookies">
-                {{ 'COOKIES_LINK' | translate }}
+                    {{ 'COOKIES_LINK' | translate }}
                 </a>
                 <i class="fa fa-times float-right marginRight20" >
                 </i>

server/app/views/scripts.scala.html

@@ -20,7 +20,7 @@
 
 <script src="https://maps.google.com/maps/api/js"></script>
 <script src="@routes.Assets.at("plugins/jquery.min.js")"></script>
-<script src="@routes.Assets.at("scripts/angular.js")" type="text/javascript"></script>
+<script src="@routes.Assets.at("plugins/angular.min.js")" type="text/javascript"></script>
 <script src="@routes.Assets.at("scripts/librairies/youtubeApi.js")"></script>
 <script src="@routes.Assets.at("scripts/librairies/youtubeToMp4.js")"></script>
 <script src="@routes.Assets.at("scripts/librairies/colorThief.min.js")"></script>