From a3548e0af6439002638c4f8d5848fd00ce28a90f Mon Sep 17 00:00:00 2001 From: Mariusz Pacek Date: Tue, 16 Dec 2014 00:55:32 +0100 Subject: [PATCH] edycja charta usuwanie labeli, wysylanie maila --- .idea_modules/play-slick-quickstart-build.iml | 3 +- .idea_modules/play-slick-quickstart.iml | 5 +- app/controllers/Application.scala | 21 +- app/controllers/Mail.scala | 10 - app/views/createRoom.scala.html | 344 +++++++++++------- build.sbt | 13 +- conf/application.conf | 10 +- conf/play.plugins | 1 + project/build.properties | 3 - project/plugins.sbt | 1 + 10 files changed, 250 insertions(+), 161 deletions(-) delete mode 100644 app/controllers/Mail.scala create mode 100644 conf/play.plugins diff --git a/.idea_modules/play-slick-quickstart-build.iml b/.idea_modules/play-slick-quickstart-build.iml index 376dd04..456a77f 100644 --- a/.idea_modules/play-slick-quickstart-build.iml +++ b/.idea_modules/play-slick-quickstart-build.iml @@ -157,5 +157,4 @@ - - + \ No newline at end of file diff --git a/.idea_modules/play-slick-quickstart.iml b/.idea_modules/play-slick-quickstart.iml index 8774f0b..e12fd9c 100644 --- a/.idea_modules/play-slick-quickstart.iml +++ b/.idea_modules/play-slick-quickstart.iml @@ -1,6 +1,5 @@ - @@ -126,6 +125,6 @@ + - - + \ No newline at end of file diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala index d5f1bb9..620c309 100644 --- a/app/controllers/Application.scala +++ b/app/controllers/Application.scala @@ -3,17 +3,19 @@ package controllers import models._ import org.apache.commons.codec.DecoderException import org.h2.jdbc.JdbcSQLException -import play.api._ -import play.api.db.slick._ -import play.api.db.slick.Config.driver.simple._ -import play.api.data._ -import play.api.data.Forms._ -import play.api.mvc._ import play.api.Play.current - +import play.api._ +import play.api.data.Forms._ +import play.api.data._ +import play.api.db.slick.Config.driver.simple._ +import play.api.db.slick._ +import play.api.libs._ import play.api.libs.json.Json import play.api.libs.json.Json._ -import play.api.libs._ +import play.api.mvc._ +import com.feth.play.module.mail.Mailer; +import com.feth.play.module.mail.Mailer.Mail.Attachment; +import com.feth.play.module.mail.Mailer.Mail.Body; object Application extends Controller with Secured { @@ -95,8 +97,10 @@ object Application extends Controller with Secured { registerForm.bindFromRequest().fold( error => BadRequest(views.html.register(error)), u => { + try { user.insert(UserData(0, u.email, Crypto.encryptAES(u.password))) + Mailer.getDefaultMailer().sendMail("Hello in Meeter " + u.email,"You are now register in Meeter!",u.email); val uri = rs.request.session.get("url") if (uri.isDefined) { rs.request.session.-("url") @@ -168,6 +172,7 @@ object Application extends Controller with Secured { room => { try { val roomId = (roomT returning roomT.map(_.id)) += RoomT(0, room.roomName,room.message, us.userId, room.perm, room.labelType, room.dateFrom, room.dateTo, room.maxValue, room.Labels, room.endDay) + survey.insert(SurveyRoom(0, roomId, us.userId, "0")) Redirect(routes.Application.room(Crypto.encryptAES(roomId.toString))) } catch { diff --git a/app/controllers/Mail.scala b/app/controllers/Mail.scala deleted file mode 100644 index 9ea1e0e..0000000 --- a/app/controllers/Mail.scala +++ /dev/null @@ -1,10 +0,0 @@ -package controllers - -/** - * Created by mar on 13.12.14. - */ -object Mail { - - - -} diff --git a/app/views/createRoom.scala.html b/app/views/createRoom.scala.html index aa2767d..f2bc975 100644 --- a/app/views/createRoom.scala.html +++ b/app/views/createRoom.scala.html @@ -1,129 +1,152 @@ @(user: UserData, permission: List[String], form: Form[CreateRoom]) - @main("Create meeting", user.name) { -
-
-
-
+@main("Create meeting", user.name) { +
+
+
+ - - Create room - @if(form.hasGlobalErrors) { + + Create room + @if(form.hasGlobalErrors) { - @for(error <- form.globalErrors) { - - - } - - } - -
- - -
- - -

Name of your room

-
-
-
- - -
- -
-
- -
- - -
- -
-
- - -
- - -
- -
-
- - -
- - -
- - -

Survey start day

-
-
- - -
- - -
- - -

Survey end date

-
-
- -
- - -
- -

Y max value

-
-
- - -
-
- -
-
-
- - -
- - -

Time of survey to end

-
-
- + @for(error <- form.globalErrors) { + + + } + + } + +
+ + +
+ + +

Name of your room

+
+
+
+ + +
+ +
+
+ +
+ + +
+ +
+
+ + +
+ + +
+ +
+
+ + +
+ + +
+ + +

Survey start day

+
+
+ + +
+ + +
+ + +

Survey end date

+
+
+ +
+ + +
+ + +

Y max value

+
+
+ + +
+ + +
+ + +

Time of survey to end

+
+
+ +
+
+ +
+
+ + +
Preview: - - - - - + + + +
+ +
+ + + +
+
+ diff --git a/build.sbt b/build.sbt index f0a9e0e..1c9a96b 100644 --- a/build.sbt +++ b/build.sbt @@ -1,14 +1,25 @@ +import java.io.File +import play.PlayImport.PlayKeys._ +import play.PlayScala +import play.twirl.sbt.Import.TwirlKeys +import play.PlayJava name := """play-slick-quickstart""" version := "1.0-SNAPSHOT" scalaVersion := "2.10.4" +resolvers += Resolver.file("LocalIvy", file(Path.userHome + File.separator + ".ivy2" + File.separator + "local"))(Resolver.ivyStylePatterns) + libraryDependencies ++= Seq( "org.webjars" %% "webjars-play" % "2.2.2", - "com.typesafe.play" %% "play-slick" % "0.7.0" + "com.typesafe.play" %% "play-slick" % "0.7.0", + "com.feth" % "play-easymail_2.10" % "0.6.7", + javaCore ) + + resolvers ++= Seq( "play-easymail (release)" at "http://joscha.github.io/play-easymail/repo/releases/", "play-easymail (snapshot)" at "http://joscha.github.io/play-easymail/repo/snapshots/" diff --git a/conf/application.conf b/conf/application.conf index 0abe1fd..7b9bc6c 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -72,4 +72,12 @@ play { } } } -} \ No newline at end of file +} + +#email setup +smtp.host = smtp.gmail.com +smtp.port = 465 +smtp.ssl = true +smtp.tls = no +smtp.user = "sinu0o@gmail.com" +smtp.password = "Sjv33dll@" \ No newline at end of file diff --git a/conf/play.plugins b/conf/play.plugins new file mode 100644 index 0000000..84e64c8 --- /dev/null +++ b/conf/play.plugins @@ -0,0 +1 @@ +1500:com.typesafe.plugin.CommonsMailerPlugin diff --git a/project/build.properties b/project/build.properties index b0ab1b0..be6c454 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1 @@ -#Activator-generated Properties -#Sat Nov 08 21:51:01 CET 2014 -template.uuid=ef686be7-0b69-470c-b2a3-fea9fa1868ab sbt.version=0.13.5 diff --git a/project/plugins.sbt b/project/plugins.sbt index 09d5249..6cff58d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,5 +6,6 @@ resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/release resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots" + // Use the Play sbt plugin for Play projects addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.0") \ No newline at end of file