diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..fb88952 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,25 @@ +language: scala + +dist: trusty + +scala: +- 2.12.10 + +# These directories are cached to S3 at the end of the build +cache: + directories: + - $HOME/.ivy2/cache + - $HOME/.sbt/ + - $HOME/.sbt/boot/ + - $HOME/.sbt/launchers + +jdk: + - oraclejdk8 + +script: + ## This runs the template with the default parameters, and runs test within the templated app. + - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M test + + # Tricks to avoid unnecessary cache updates + - find $HOME/.sbt -name "*.lock" | xargs rm + - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm diff --git a/README.markdown b/README.markdown new file mode 100644 index 0000000..0157809 --- /dev/null +++ b/README.markdown @@ -0,0 +1,12 @@ +A [Giter8][g8] template for ...! + +Template license +---------------- +Written in by +[other author/contributor lines as appropriate] + +To the extent possible under law, the author(s) have dedicated all copyright and related +and neighboring rights to this template to the public domain worldwide. +This template is distributed without any warranty. See . + +[g8]: http://www.foundweekends.org/giter8/ diff --git a/build.sbt b/build.sbt index 4ea9582..0edb3e6 100644 --- a/build.sbt +++ b/build.sbt @@ -1,70 +1,13 @@ -import com.typesafe.sbt.SbtScalariform._ - -import scalariform.formatter.preferences._ - -name := "play-silhouette-seed" - -version := "6.0.0" - -scalaVersion := "2.12.8" - -resolvers += Resolver.jcenterRepo - -resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/" - -libraryDependencies ++= Seq( - "com.mohiva" %% "play-silhouette" % "6.1.0", - "com.mohiva" %% "play-silhouette-password-bcrypt" % "6.1.0", - "com.mohiva" %% "play-silhouette-persistence" % "6.1.0", - "com.mohiva" %% "play-silhouette-crypto-jca" % "6.1.0", - "com.mohiva" %% "play-silhouette-totp" % "6.1.0", - "org.webjars" %% "webjars-play" % "2.7.0", - "org.webjars" % "bootstrap" % "3.3.7-1" exclude("org.webjars", "jquery"), - "org.webjars" % "jquery" % "3.2.1", - "net.codingwell" %% "scala-guice" % "4.1.0", - "com.iheart" %% "ficus" % "1.4.3", - "com.typesafe.play" %% "play-mailer" % "7.0.0", - "com.typesafe.play" %% "play-mailer-guice" % "7.0.0", - "com.enragedginger" %% "akka-quartz-scheduler" % "1.6.1-akka-2.5.x", - "com.adrianhurt" %% "play-bootstrap" % "1.5-P27-B3-SNAPSHOT", - "com.mohiva" %% "play-silhouette-testkit" % "6.1.0" % "test", - specs2 % Test, - ehcache, - guice, - filters -) - -lazy val root = (project in file(".")).enablePlugins(PlayScala) - -routesImport += "utils.route.Binders._" - -// https://github.com/playframework/twirl/issues/105 -TwirlKeys.templateImports := Seq() - -scalacOptions ++= Seq( - "-deprecation", // Emit warning and location for usages of deprecated APIs. - "-feature", // Emit warning and location for usages of features that should be imported explicitly. - "-unchecked", // Enable additional warnings where generated code depends on assumptions. - "-Xfatal-warnings", // Fail the compilation if there are any warnings. - //"-Xlint", // Enable recommended additional warnings. - "-Ywarn-adapted-args", // Warn if an argument list is modified to match the receiver. - "-Ywarn-dead-code", // Warn when dead code is identified. - "-Ywarn-inaccessible", // Warn about inaccessible types in method signatures. - "-Ywarn-nullary-override", // Warn when non-nullary overrides nullary, e.g. def foo() over def foo. - "-Ywarn-numeric-widen", // Warn when numerics are widened. - // Play has a lot of issues with unused imports and unsued params - // https://github.com/playframework/playframework/issues/6690 - // https://github.com/playframework/twirl/issues/105 - "-Xlint:-unused,_" -) - -//******************************************************** -// Scalariform settings -//******************************************************** - -scalariformAutoformat := true - -ScalariformKeys.preferences := ScalariformKeys.preferences.value - .setPreference(FormatXml, false) - .setPreference(DoubleIndentConstructorArguments, false) - .setPreference(DanglingCloseParenthesis, Preserve) +// This build is for this Giter8 template. +// To test the template run `g8` or `g8Test` from the sbt session. +// See http://www.foundweekends.org/giter8/testing.html#Using+the+Giter8Plugin for more details. +lazy val root = (project in file(".")) + .enablePlugins(ScriptedPlugin) + .settings( + name := "play-silhouette-seed", + test in Test := { + val _ = (g8Test in Test).toTask("").value + }, + scriptedLaunchOpts ++= List("-Xms1024m", "-Xmx1024m", "-XX:ReservedCodeCacheSize=128m", "-Xss2m", "-Dfile.encoding=UTF-8"), + resolvers += Resolver.url("typesafe", url("http://repo.typesafe.com/typesafe/ivy-releases/"))(Resolver.ivyStylePatterns) + ) diff --git a/project/build.properties b/project/build.properties index 8522443..5a9ed92 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.2 +sbt.version=1.3.4 diff --git a/project/plugins.sbt b/project/plugins.sbt index b4fad31..69ca7f5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,2 @@ -// Comment to get more information during initialization -logLevel := Level.Warn - -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.2") - -addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2") +addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.12.0") +libraryDependencies += { "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value } diff --git a/CONTRIBUTING.md b/src/main/g8/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to src/main/g8/CONTRIBUTING.md diff --git a/src/main/g8/LICENSE b/src/main/g8/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/src/main/g8/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/Procfile b/src/main/g8/Procfile similarity index 100% rename from Procfile rename to src/main/g8/Procfile diff --git a/README.md b/src/main/g8/README.md similarity index 100% rename from README.md rename to src/main/g8/README.md diff --git a/app.json b/src/main/g8/app.json similarity index 100% rename from app.json rename to src/main/g8/app.json diff --git a/app/controllers/AbstractAuthController.scala b/src/main/g8/app/controllers/AbstractAuthController.scala similarity index 100% rename from app/controllers/AbstractAuthController.scala rename to src/main/g8/app/controllers/AbstractAuthController.scala diff --git a/app/controllers/ActivateAccountController.scala b/src/main/g8/app/controllers/ActivateAccountController.scala similarity index 100% rename from app/controllers/ActivateAccountController.scala rename to src/main/g8/app/controllers/ActivateAccountController.scala diff --git a/app/controllers/ApplicationController.scala b/src/main/g8/app/controllers/ApplicationController.scala similarity index 100% rename from app/controllers/ApplicationController.scala rename to src/main/g8/app/controllers/ApplicationController.scala diff --git a/app/controllers/ChangePasswordController.scala b/src/main/g8/app/controllers/ChangePasswordController.scala similarity index 100% rename from app/controllers/ChangePasswordController.scala rename to src/main/g8/app/controllers/ChangePasswordController.scala diff --git a/app/controllers/ForgotPasswordController.scala b/src/main/g8/app/controllers/ForgotPasswordController.scala similarity index 100% rename from app/controllers/ForgotPasswordController.scala rename to src/main/g8/app/controllers/ForgotPasswordController.scala diff --git a/app/controllers/ResetPasswordController.scala b/src/main/g8/app/controllers/ResetPasswordController.scala similarity index 100% rename from app/controllers/ResetPasswordController.scala rename to src/main/g8/app/controllers/ResetPasswordController.scala diff --git a/app/controllers/SignInController.scala b/src/main/g8/app/controllers/SignInController.scala similarity index 100% rename from app/controllers/SignInController.scala rename to src/main/g8/app/controllers/SignInController.scala diff --git a/app/controllers/SignUpController.scala b/src/main/g8/app/controllers/SignUpController.scala similarity index 100% rename from app/controllers/SignUpController.scala rename to src/main/g8/app/controllers/SignUpController.scala diff --git a/app/controllers/SocialAuthController.scala b/src/main/g8/app/controllers/SocialAuthController.scala similarity index 100% rename from app/controllers/SocialAuthController.scala rename to src/main/g8/app/controllers/SocialAuthController.scala diff --git a/app/controllers/TotpController.scala b/src/main/g8/app/controllers/TotpController.scala similarity index 100% rename from app/controllers/TotpController.scala rename to src/main/g8/app/controllers/TotpController.scala diff --git a/app/controllers/TotpRecoveryController.scala b/src/main/g8/app/controllers/TotpRecoveryController.scala similarity index 100% rename from app/controllers/TotpRecoveryController.scala rename to src/main/g8/app/controllers/TotpRecoveryController.scala diff --git a/app/forms/ChangePasswordForm.scala b/src/main/g8/app/forms/ChangePasswordForm.scala similarity index 100% rename from app/forms/ChangePasswordForm.scala rename to src/main/g8/app/forms/ChangePasswordForm.scala diff --git a/app/forms/ForgotPasswordForm.scala b/src/main/g8/app/forms/ForgotPasswordForm.scala similarity index 100% rename from app/forms/ForgotPasswordForm.scala rename to src/main/g8/app/forms/ForgotPasswordForm.scala diff --git a/app/forms/ResetPasswordForm.scala b/src/main/g8/app/forms/ResetPasswordForm.scala similarity index 100% rename from app/forms/ResetPasswordForm.scala rename to src/main/g8/app/forms/ResetPasswordForm.scala diff --git a/app/forms/SignInForm.scala b/src/main/g8/app/forms/SignInForm.scala similarity index 100% rename from app/forms/SignInForm.scala rename to src/main/g8/app/forms/SignInForm.scala diff --git a/app/forms/SignUpForm.scala b/src/main/g8/app/forms/SignUpForm.scala similarity index 100% rename from app/forms/SignUpForm.scala rename to src/main/g8/app/forms/SignUpForm.scala diff --git a/app/forms/TotpForm.scala b/src/main/g8/app/forms/TotpForm.scala similarity index 100% rename from app/forms/TotpForm.scala rename to src/main/g8/app/forms/TotpForm.scala diff --git a/app/forms/TotpRecoveryForm.scala b/src/main/g8/app/forms/TotpRecoveryForm.scala similarity index 100% rename from app/forms/TotpRecoveryForm.scala rename to src/main/g8/app/forms/TotpRecoveryForm.scala diff --git a/app/forms/TotpSetupForm.scala b/src/main/g8/app/forms/TotpSetupForm.scala similarity index 100% rename from app/forms/TotpSetupForm.scala rename to src/main/g8/app/forms/TotpSetupForm.scala diff --git a/app/jobs/AuthTokenCleaner.scala b/src/main/g8/app/jobs/AuthTokenCleaner.scala similarity index 100% rename from app/jobs/AuthTokenCleaner.scala rename to src/main/g8/app/jobs/AuthTokenCleaner.scala diff --git a/app/jobs/Scheduler.scala b/src/main/g8/app/jobs/Scheduler.scala similarity index 100% rename from app/jobs/Scheduler.scala rename to src/main/g8/app/jobs/Scheduler.scala diff --git a/app/models/AuthToken.scala b/src/main/g8/app/models/AuthToken.scala similarity index 100% rename from app/models/AuthToken.scala rename to src/main/g8/app/models/AuthToken.scala diff --git a/app/models/User.scala b/src/main/g8/app/models/User.scala similarity index 100% rename from app/models/User.scala rename to src/main/g8/app/models/User.scala diff --git a/app/models/daos/AuthTokenDAO.scala b/src/main/g8/app/models/daos/AuthTokenDAO.scala similarity index 100% rename from app/models/daos/AuthTokenDAO.scala rename to src/main/g8/app/models/daos/AuthTokenDAO.scala diff --git a/app/models/daos/AuthTokenDAOImpl.scala b/src/main/g8/app/models/daos/AuthTokenDAOImpl.scala similarity index 100% rename from app/models/daos/AuthTokenDAOImpl.scala rename to src/main/g8/app/models/daos/AuthTokenDAOImpl.scala diff --git a/app/models/daos/UserDAO.scala b/src/main/g8/app/models/daos/UserDAO.scala similarity index 100% rename from app/models/daos/UserDAO.scala rename to src/main/g8/app/models/daos/UserDAO.scala diff --git a/app/models/daos/UserDAOImpl.scala b/src/main/g8/app/models/daos/UserDAOImpl.scala similarity index 100% rename from app/models/daos/UserDAOImpl.scala rename to src/main/g8/app/models/daos/UserDAOImpl.scala diff --git a/app/models/services/AuthTokenService.scala b/src/main/g8/app/models/services/AuthTokenService.scala similarity index 100% rename from app/models/services/AuthTokenService.scala rename to src/main/g8/app/models/services/AuthTokenService.scala diff --git a/app/models/services/AuthTokenServiceImpl.scala b/src/main/g8/app/models/services/AuthTokenServiceImpl.scala similarity index 100% rename from app/models/services/AuthTokenServiceImpl.scala rename to src/main/g8/app/models/services/AuthTokenServiceImpl.scala diff --git a/app/models/services/UserService.scala b/src/main/g8/app/models/services/UserService.scala similarity index 100% rename from app/models/services/UserService.scala rename to src/main/g8/app/models/services/UserService.scala diff --git a/app/models/services/UserServiceImpl.scala b/src/main/g8/app/models/services/UserServiceImpl.scala similarity index 100% rename from app/models/services/UserServiceImpl.scala rename to src/main/g8/app/models/services/UserServiceImpl.scala diff --git a/app/modules/BaseModule.scala b/src/main/g8/app/modules/BaseModule.scala similarity index 100% rename from app/modules/BaseModule.scala rename to src/main/g8/app/modules/BaseModule.scala diff --git a/app/modules/JobModule.scala b/src/main/g8/app/modules/JobModule.scala similarity index 100% rename from app/modules/JobModule.scala rename to src/main/g8/app/modules/JobModule.scala diff --git a/app/modules/SilhouetteModule.scala b/src/main/g8/app/modules/SilhouetteModule.scala similarity index 100% rename from app/modules/SilhouetteModule.scala rename to src/main/g8/app/modules/SilhouetteModule.scala diff --git a/app/utils/Filters.scala b/src/main/g8/app/utils/Filters.scala similarity index 100% rename from app/utils/Filters.scala rename to src/main/g8/app/utils/Filters.scala diff --git a/app/utils/Logger.scala b/src/main/g8/app/utils/Logger.scala similarity index 100% rename from app/utils/Logger.scala rename to src/main/g8/app/utils/Logger.scala diff --git a/app/utils/auth/CustomSecuredErrorHandler.scala b/src/main/g8/app/utils/auth/CustomSecuredErrorHandler.scala similarity index 100% rename from app/utils/auth/CustomSecuredErrorHandler.scala rename to src/main/g8/app/utils/auth/CustomSecuredErrorHandler.scala diff --git a/app/utils/auth/CustomUnsecuredErrorHandler.scala b/src/main/g8/app/utils/auth/CustomUnsecuredErrorHandler.scala similarity index 100% rename from app/utils/auth/CustomUnsecuredErrorHandler.scala rename to src/main/g8/app/utils/auth/CustomUnsecuredErrorHandler.scala diff --git a/app/utils/auth/Env.scala b/src/main/g8/app/utils/auth/Env.scala similarity index 100% rename from app/utils/auth/Env.scala rename to src/main/g8/app/utils/auth/Env.scala diff --git a/app/utils/auth/WithProvider.scala b/src/main/g8/app/utils/auth/WithProvider.scala similarity index 100% rename from app/utils/auth/WithProvider.scala rename to src/main/g8/app/utils/auth/WithProvider.scala diff --git a/app/utils/route/Binders.scala b/src/main/g8/app/utils/route/Binders.scala similarity index 100% rename from app/utils/route/Binders.scala rename to src/main/g8/app/utils/route/Binders.scala diff --git a/app/views/activateAccount.scala.html b/src/main/g8/app/views/activateAccount.scala.html similarity index 100% rename from app/views/activateAccount.scala.html rename to src/main/g8/app/views/activateAccount.scala.html diff --git a/app/views/changePassword.scala.html b/src/main/g8/app/views/changePassword.scala.html similarity index 100% rename from app/views/changePassword.scala.html rename to src/main/g8/app/views/changePassword.scala.html diff --git a/app/views/emails/activateAccount.scala.html b/src/main/g8/app/views/emails/activateAccount.scala.html similarity index 100% rename from app/views/emails/activateAccount.scala.html rename to src/main/g8/app/views/emails/activateAccount.scala.html diff --git a/app/views/emails/activateAccount.scala.txt b/src/main/g8/app/views/emails/activateAccount.scala.txt similarity index 100% rename from app/views/emails/activateAccount.scala.txt rename to src/main/g8/app/views/emails/activateAccount.scala.txt diff --git a/app/views/emails/alreadySignedUp.scala.html b/src/main/g8/app/views/emails/alreadySignedUp.scala.html similarity index 100% rename from app/views/emails/alreadySignedUp.scala.html rename to src/main/g8/app/views/emails/alreadySignedUp.scala.html diff --git a/app/views/emails/alreadySignedUp.scala.txt b/src/main/g8/app/views/emails/alreadySignedUp.scala.txt similarity index 100% rename from app/views/emails/alreadySignedUp.scala.txt rename to src/main/g8/app/views/emails/alreadySignedUp.scala.txt diff --git a/app/views/emails/resetPassword.scala.html b/src/main/g8/app/views/emails/resetPassword.scala.html similarity index 100% rename from app/views/emails/resetPassword.scala.html rename to src/main/g8/app/views/emails/resetPassword.scala.html diff --git a/app/views/emails/resetPassword.scala.txt b/src/main/g8/app/views/emails/resetPassword.scala.txt similarity index 100% rename from app/views/emails/resetPassword.scala.txt rename to src/main/g8/app/views/emails/resetPassword.scala.txt diff --git a/app/views/emails/signUp.scala.html b/src/main/g8/app/views/emails/signUp.scala.html similarity index 100% rename from app/views/emails/signUp.scala.html rename to src/main/g8/app/views/emails/signUp.scala.html diff --git a/app/views/emails/signUp.scala.txt b/src/main/g8/app/views/emails/signUp.scala.txt similarity index 100% rename from app/views/emails/signUp.scala.txt rename to src/main/g8/app/views/emails/signUp.scala.txt diff --git a/app/views/forgotPassword.scala.html b/src/main/g8/app/views/forgotPassword.scala.html similarity index 100% rename from app/views/forgotPassword.scala.html rename to src/main/g8/app/views/forgotPassword.scala.html diff --git a/app/views/home.scala.html b/src/main/g8/app/views/home.scala.html similarity index 100% rename from app/views/home.scala.html rename to src/main/g8/app/views/home.scala.html diff --git a/app/views/main.scala.html b/src/main/g8/app/views/main.scala.html similarity index 100% rename from app/views/main.scala.html rename to src/main/g8/app/views/main.scala.html diff --git a/app/views/passwordStrength.scala.html b/src/main/g8/app/views/passwordStrength.scala.html similarity index 100% rename from app/views/passwordStrength.scala.html rename to src/main/g8/app/views/passwordStrength.scala.html diff --git a/app/views/resetPassword.scala.html b/src/main/g8/app/views/resetPassword.scala.html similarity index 100% rename from app/views/resetPassword.scala.html rename to src/main/g8/app/views/resetPassword.scala.html diff --git a/app/views/signIn.scala.html b/src/main/g8/app/views/signIn.scala.html similarity index 100% rename from app/views/signIn.scala.html rename to src/main/g8/app/views/signIn.scala.html diff --git a/app/views/signUp.scala.html b/src/main/g8/app/views/signUp.scala.html similarity index 100% rename from app/views/signUp.scala.html rename to src/main/g8/app/views/signUp.scala.html diff --git a/app/views/totp.scala.html b/src/main/g8/app/views/totp.scala.html similarity index 100% rename from app/views/totp.scala.html rename to src/main/g8/app/views/totp.scala.html diff --git a/app/views/totpRecovery.scala.html b/src/main/g8/app/views/totpRecovery.scala.html similarity index 100% rename from app/views/totpRecovery.scala.html rename to src/main/g8/app/views/totpRecovery.scala.html diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt new file mode 100644 index 0000000..4ea9582 --- /dev/null +++ b/src/main/g8/build.sbt @@ -0,0 +1,70 @@ +import com.typesafe.sbt.SbtScalariform._ + +import scalariform.formatter.preferences._ + +name := "play-silhouette-seed" + +version := "6.0.0" + +scalaVersion := "2.12.8" + +resolvers += Resolver.jcenterRepo + +resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/" + +libraryDependencies ++= Seq( + "com.mohiva" %% "play-silhouette" % "6.1.0", + "com.mohiva" %% "play-silhouette-password-bcrypt" % "6.1.0", + "com.mohiva" %% "play-silhouette-persistence" % "6.1.0", + "com.mohiva" %% "play-silhouette-crypto-jca" % "6.1.0", + "com.mohiva" %% "play-silhouette-totp" % "6.1.0", + "org.webjars" %% "webjars-play" % "2.7.0", + "org.webjars" % "bootstrap" % "3.3.7-1" exclude("org.webjars", "jquery"), + "org.webjars" % "jquery" % "3.2.1", + "net.codingwell" %% "scala-guice" % "4.1.0", + "com.iheart" %% "ficus" % "1.4.3", + "com.typesafe.play" %% "play-mailer" % "7.0.0", + "com.typesafe.play" %% "play-mailer-guice" % "7.0.0", + "com.enragedginger" %% "akka-quartz-scheduler" % "1.6.1-akka-2.5.x", + "com.adrianhurt" %% "play-bootstrap" % "1.5-P27-B3-SNAPSHOT", + "com.mohiva" %% "play-silhouette-testkit" % "6.1.0" % "test", + specs2 % Test, + ehcache, + guice, + filters +) + +lazy val root = (project in file(".")).enablePlugins(PlayScala) + +routesImport += "utils.route.Binders._" + +// https://github.com/playframework/twirl/issues/105 +TwirlKeys.templateImports := Seq() + +scalacOptions ++= Seq( + "-deprecation", // Emit warning and location for usages of deprecated APIs. + "-feature", // Emit warning and location for usages of features that should be imported explicitly. + "-unchecked", // Enable additional warnings where generated code depends on assumptions. + "-Xfatal-warnings", // Fail the compilation if there are any warnings. + //"-Xlint", // Enable recommended additional warnings. + "-Ywarn-adapted-args", // Warn if an argument list is modified to match the receiver. + "-Ywarn-dead-code", // Warn when dead code is identified. + "-Ywarn-inaccessible", // Warn about inaccessible types in method signatures. + "-Ywarn-nullary-override", // Warn when non-nullary overrides nullary, e.g. def foo() over def foo. + "-Ywarn-numeric-widen", // Warn when numerics are widened. + // Play has a lot of issues with unused imports and unsued params + // https://github.com/playframework/playframework/issues/6690 + // https://github.com/playframework/twirl/issues/105 + "-Xlint:-unused,_" +) + +//******************************************************** +// Scalariform settings +//******************************************************** + +scalariformAutoformat := true + +ScalariformKeys.preferences := ScalariformKeys.preferences.value + .setPreference(FormatXml, false) + .setPreference(DoubleIndentConstructorArguments, false) + .setPreference(DanglingCloseParenthesis, Preserve) diff --git a/conf/application.conf b/src/main/g8/conf/application.conf similarity index 100% rename from conf/application.conf rename to src/main/g8/conf/application.conf diff --git a/conf/application.prod.conf b/src/main/g8/conf/application.prod.conf similarity index 100% rename from conf/application.prod.conf rename to src/main/g8/conf/application.prod.conf diff --git a/conf/messages b/src/main/g8/conf/messages similarity index 100% rename from conf/messages rename to src/main/g8/conf/messages diff --git a/conf/routes b/src/main/g8/conf/routes similarity index 100% rename from conf/routes rename to src/main/g8/conf/routes diff --git a/conf/silhouette.conf b/src/main/g8/conf/silhouette.conf similarity index 100% rename from conf/silhouette.conf rename to src/main/g8/conf/silhouette.conf diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties new file mode 100644 index 0000000..4a077d2 --- /dev/null +++ b/src/main/g8/default.properties @@ -0,0 +1,3 @@ +name=My Something Project +description=Say something about this template. +verbatim = scripts/sbt Procfile *.conf *.scala *.scala.html *.js *.png diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties new file mode 100644 index 0000000..8522443 --- /dev/null +++ b/src/main/g8/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.3.2 diff --git a/src/main/g8/project/plugins.sbt b/src/main/g8/project/plugins.sbt new file mode 100644 index 0000000..b4fad31 --- /dev/null +++ b/src/main/g8/project/plugins.sbt @@ -0,0 +1,6 @@ +// Comment to get more information during initialization +logLevel := Level.Warn + +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.2") + +addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2") diff --git a/public/images/favicon.png b/src/main/g8/public/images/favicon.png similarity index 100% rename from public/images/favicon.png rename to src/main/g8/public/images/favicon.png diff --git a/public/images/providers/facebook.png b/src/main/g8/public/images/providers/facebook.png similarity index 100% rename from public/images/providers/facebook.png rename to src/main/g8/public/images/providers/facebook.png diff --git a/public/images/providers/google.png b/src/main/g8/public/images/providers/google.png similarity index 100% rename from public/images/providers/google.png rename to src/main/g8/public/images/providers/google.png diff --git a/public/images/providers/twitter.png b/src/main/g8/public/images/providers/twitter.png similarity index 100% rename from public/images/providers/twitter.png rename to src/main/g8/public/images/providers/twitter.png diff --git a/public/images/providers/vk.png b/src/main/g8/public/images/providers/vk.png similarity index 100% rename from public/images/providers/vk.png rename to src/main/g8/public/images/providers/vk.png diff --git a/public/images/providers/xing.png b/src/main/g8/public/images/providers/xing.png similarity index 100% rename from public/images/providers/xing.png rename to src/main/g8/public/images/providers/xing.png diff --git a/public/images/providers/yahoo.png b/src/main/g8/public/images/providers/yahoo.png similarity index 100% rename from public/images/providers/yahoo.png rename to src/main/g8/public/images/providers/yahoo.png diff --git a/public/images/silhouette.png b/src/main/g8/public/images/silhouette.png similarity index 100% rename from public/images/silhouette.png rename to src/main/g8/public/images/silhouette.png diff --git a/public/javascripts/zxcvbnShim.js b/src/main/g8/public/javascripts/zxcvbnShim.js similarity index 100% rename from public/javascripts/zxcvbnShim.js rename to src/main/g8/public/javascripts/zxcvbnShim.js diff --git a/public/styles/main.css b/src/main/g8/public/styles/main.css similarity index 100% rename from public/styles/main.css rename to src/main/g8/public/styles/main.css diff --git a/scripts/reformat b/src/main/g8/scripts/reformat similarity index 100% rename from scripts/reformat rename to src/main/g8/scripts/reformat diff --git a/scripts/sbt b/src/main/g8/scripts/sbt similarity index 100% rename from scripts/sbt rename to src/main/g8/scripts/sbt diff --git a/test/controllers/ApplicationControllerSpec.scala b/src/main/g8/test/controllers/ApplicationControllerSpec.scala similarity index 100% rename from test/controllers/ApplicationControllerSpec.scala rename to src/main/g8/test/controllers/ApplicationControllerSpec.scala diff --git a/tutorial/index.html b/src/main/g8/tutorial/index.html similarity index 100% rename from tutorial/index.html rename to src/main/g8/tutorial/index.html