Skip to content

Commit 8cf0e64

Browse files
committed
Continued development
1. Implemented bcrypt module 2. Implemented crypto module (partially) 3. Implemented jwt-simple module 4. Fixed issues with inconsistent package paths (all node sub-projects are now under nodejs) 5. Refactored the angularjs subproject
1 parent 31ee54e commit 8cf0e64

File tree

237 files changed

+2332
-1044
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+2332
-1044
lines changed

README.md

Lines changed: 13 additions & 7 deletions

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/Animate.scala renamed to angularjs/animate/src/main/scala/com/github/ldaniels528/meansjs/angularjs/animate/Animate.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs.animate
22

33
import org.scalajs.dom.Element
44
import org.w3c.dom.events.Event

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/Angular.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/Angular.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.github.ldaniels528.meansjs.angularjs
22

33
import com.github.ldaniels528.meansjs.angularjs.Module.EnrichedModule
4-
import com.github.ldaniels528.meansjs.angularjs.core.Injector
54
import org.scalajs.dom.html.{Document, Element}
65
import org.scalajs.jquery.JQuery
76

@@ -289,10 +288,6 @@ trait AngularVersion extends js.Object {
289288
*/
290289
object Angular {
291290

292-
def apply(): Angular = js.Dynamic.global.angular
293-
.asInstanceOf[js.UndefOr[Angular]]
294-
.getOrElse(throw new RuntimeException("Could not find object angular - has the AngularJS library been loaded?"))
295-
296291
@inline
297292
implicit def element(elem: Element): JQLite = angular.element(elem)
298293

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/event/AngularEvent.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/AngularEvent.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.event
1+
package com.github.ldaniels528.meansjs.angularjs
22

33
import scala.scalajs.js
44

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/Attributes.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/Attributes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs
22

33
import scala.scalajs.js
44
import scala.scalajs.js.UndefOr

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/CacheFactory.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/CacheFactory.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs
22

33
import scala.scalajs.js
44

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/Compile.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/Compile.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
2-
3-
import com.github.ldaniels528.meansjs.angularjs.Scope
1+
package com.github.ldaniels528.meansjs.angularjs
42

53
import scala.scalajs.js
64

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/Directive.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/Directive.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.github.ldaniels528.meansjs.angularjs
22

3-
import com.github.ldaniels528.meansjs.angularjs.core.Attributes
4-
53
import scala.scalajs.js
64

75
/**

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/ExceptionHandler.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/ExceptionHandler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs
22

33
import scala.scalajs.js
44

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/Injector.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/Injector.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs
22

33
import scala.scalajs.js
44

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/Interval.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/Interval.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs
22

33
import scala.scalajs.js
44

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/JQLite.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/JQLite.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.ldaniels528.meansjs.angularjs
22

3-
import com.github.ldaniels528.meansjs.angularjs.core.Injector
43
import org.scalajs.dom._
54

65
import scala.scalajs.js

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/Location.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/Location.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs
22

33
import scala.scalajs.js
44

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/Log.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/Log.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs
22

33
import scala.scalajs.js
44

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/Parse.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/Parse.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs
22

33
import scala.scalajs.js
44

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/Provider.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/Provider.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs
22

33
import scala.scalajs.js
44

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/Q.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/Q.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
2-
3-
import com.github.ldaniels528.meansjs.angularjs.AngularPromise
1+
package com.github.ldaniels528.meansjs.angularjs
42

53
import scala.concurrent.{Future, Promise}
64
import scala.language.implicitConversions

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/Resource.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/Resource.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs
22

33
import scala.scalajs.js
44

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/Timeout.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/Timeout.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs
22

33
import scala.scalajs.js
44

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/extensions/AnchorScroll.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/extensions/AnchorScroll.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.ldaniels528.meansjs.angularjs.extensions
22

3-
import com.github.ldaniels528.meansjs.angularjs.core.Provider
3+
import com.github.ldaniels528.meansjs.angularjs.Provider
44

55
import scala.scalajs.js
66

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/extensions/Sce.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/extensions/Sce.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.ldaniels528.meansjs.angularjs.extensions
22

3-
import com.github.ldaniels528.meansjs.angularjs.core.Provider
3+
import com.github.ldaniels528.meansjs.angularjs.Provider
44

55
import scala.scalajs.js
66

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/extensions/SceDelegate.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/extensions/SceDelegate.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.ldaniels528.meansjs.angularjs.extensions
22

3-
import com.github.ldaniels528.meansjs.angularjs.core.Provider
3+
import com.github.ldaniels528.meansjs.angularjs.Provider
44

55
import scala.scalajs.js
66

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/Http.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/http/Http.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs.http
2+
3+
import com.github.ldaniels528.meansjs.angularjs.Provider
24

35
import scala.language.implicitConversions
46
import scala.scalajs.js

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/HttpConfig.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/http/HttpConfig.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs.http
22

33
import scala.scalajs.js
44
import scala.scalajs.js.Dynamic.{literal => JS}

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/HttpPromise.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/http/HttpPromise.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs.http
22

3-
import com.github.ldaniels528.meansjs.angularjs.{AngularPromise, angular}
3+
import com.github.ldaniels528.meansjs.angularjs._
44

55
import scala.concurrent.{Future, Promise}
66
import scala.language.implicitConversions

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/HttpStatus.scala renamed to angularjs/core/src/main/scala/com/github/ldaniels528/meansjs/angularjs/http/HttpStatus.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.core
1+
package com.github.ldaniels528.meansjs.angularjs.http
22

33
import scala.language.implicitConversions
44

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.github.ldaniels528.meansjs
2+
3+
import scala.concurrent.duration.FiniteDuration
4+
import scala.language.implicitConversions
5+
import scala.scalajs.js
6+
import scala.scalajs.js.annotation.JSName
7+
8+
/**
9+
* MEANS.js Package Object
10+
11+
*/
12+
package object angularjs {
13+
14+
//////////////////////////////////////////////////////////////
15+
// Globals
16+
//////////////////////////////////////////////////////////////
17+
18+
/**
19+
* Singleton "angular" instance
20+
*/
21+
@js.native
22+
@JSName("angular")
23+
object angular extends Angular
24+
25+
//////////////////////////////////////////////////////////////
26+
// Implicit Conversions
27+
//////////////////////////////////////////////////////////////
28+
29+
implicit def durationToInt(duration: FiniteDuration): Int = duration.toMillis.toInt
30+
31+
implicit def durationToLong(duration: FiniteDuration): Double = duration.toMillis
32+
33+
}

social/facebook/src/main/scala/com/github/ldaniels528/meansjs/social/facebook/FacebookService.scala renamed to angularjs/facebook/src/main/scala/com/github/ldaniels528/meansjs/angularjs/facebook/FacebookService.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package com.github.ldaniels528.meansjs.social.facebook
1+
package com.github.ldaniels528.meansjs.angularjs.facebook
22

3-
import com.github.ldaniels528.meansjs.angularjs.{Service, angular}
4-
import com.github.ldaniels528.meansjs.angularjs.core.{Q, QDefer}
5-
import com.github.ldaniels528.meansjs.social.facebook.Facebook.FB
3+
import com.github.ldaniels528.meansjs.angularjs.{Q, QDefer, Service, angular}
4+
import com.github.ldaniels528.meansjs.social.facebook._
65
import com.github.ldaniels528.meansjs.util.ScalaJsHelper._
76
import org.scalajs.dom.console
87

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/extensions/nervgh/FileItem.scala renamed to angularjs/nervgh-fileupload/src/main/scala/com/github/ldaniels528/meansjs/angularjs/fileupload/nervgh/FileItem.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.extensions.nervgh
1+
package com.github.ldaniels528.meansjs.angularjs.fileupload.nervgh
22

33
import scala.scalajs.js
44

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/extensions/FileUpload.scala renamed to angularjs/nervgh-fileupload/src/main/scala/com/github/ldaniels528/meansjs/angularjs/fileupload/nervgh/FileUpload.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.github.ldaniels528.meansjs.angularjs.extensions
1+
package com.github.ldaniels528.meansjs.angularjs.fileupload.nervgh
22

3-
import com.github.ldaniels528.meansjs.angularjs.core.HttpPromise
3+
import com.github.ldaniels528.meansjs.angularjs.http.HttpPromise
44
import org.scalajs.dom._
55

66
import scala.scalajs.js

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/extensions/nervgh/FileUploader.scala renamed to angularjs/nervgh-fileupload/src/main/scala/com/github/ldaniels528/meansjs/angularjs/fileupload/nervgh/FileUploader.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.extensions.nervgh
1+
package com.github.ldaniels528.meansjs.angularjs.fileupload.nervgh
22

33
import com.github.ldaniels528.meansjs.util.ScalaJsHelper._
44
import org.scalajs.dom.Element

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/extensions/nervgh/FileUploaderConfig.scala renamed to angularjs/nervgh-fileupload/src/main/scala/com/github/ldaniels528/meansjs/angularjs/fileupload/nervgh/FileUploaderConfig.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.extensions.nervgh
1+
package com.github.ldaniels528.meansjs.angularjs.fileupload.nervgh
22

33
import com.github.ldaniels528.meansjs.util.ScalaJsHelper._
44

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/core/TimerConversions.scala

Lines changed: 0 additions & 20 deletions
This file was deleted.

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/package.scala

Lines changed: 0 additions & 16 deletions
This file was deleted.

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/extensions/Toaster.scala renamed to angularjs/toaster/src/main/scala/com/github/ldaniels528/meansjs/angularjs/toaster/Toaster.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.extensions
1+
package com.github.ldaniels528.meansjs.angularjs.toaster
22

33
import scala.concurrent.duration.FiniteDuration
44
import scala.scalajs.js

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/extensions/Modal.scala renamed to angularjs/ui-bootstrap/src/main/scala/com/github/ldaniels528/meansjs/angularjs/uibootstrap/Modal.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package com.github.ldaniels528.meansjs.angularjs.extensions
1+
package com.github.ldaniels528.meansjs.angularjs.uibootstrap
22

3-
import com.github.ldaniels528.meansjs.angularjs.Controller
4-
import com.github.ldaniels528.meansjs.angularjs.core.QPromise
3+
import com.github.ldaniels528.meansjs.angularjs.{Controller, QPromise}
54

65
import scala.scalajs.js
76

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/extensions/Route.scala renamed to angularjs/ui-router/src/main/scala/com/github/ldaniels528/meansjs/angularjs/uirouter/Route.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package com.github.ldaniels528.meansjs.angularjs.extensions
1+
package com.github.ldaniels528.meansjs.angularjs.uirouter
22

3-
import com.github.ldaniels528.meansjs.angularjs.Scope
4-
import com.github.ldaniels528.meansjs.angularjs.core.Provider
3+
import com.github.ldaniels528.meansjs.angularjs.{Provider, Scope}
54

65
import scala.scalajs.js
76

angularjs/src/main/scala/com/github/ldaniels528/meansjs/angularjs/extensions/RouteTo.scala renamed to angularjs/ui-router/src/main/scala/com/github/ldaniels528/meansjs/angularjs/uirouter/RouteTo.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.ldaniels528.meansjs.angularjs.extensions
1+
package com.github.ldaniels528.meansjs.angularjs.uirouter
22

33
import scala.language.implicitConversions
44
import scala.scalajs.js

0 commit comments

Comments
 (0)