From 2ee799fbda92e0b973e0a33503f2f9350302f222 Mon Sep 17 00:00:00 2001 From: KOH Date: Sun, 28 Jun 2015 13:06:15 +0900 Subject: [PATCH 1/5] hoge --- hamada/iOS-client/My1DayApp/Base.lproj/Main.storyboard | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hamada/iOS-client/My1DayApp/Base.lproj/Main.storyboard b/hamada/iOS-client/My1DayApp/Base.lproj/Main.storyboard index 90d0cb7..05d429f 100644 --- a/hamada/iOS-client/My1DayApp/Base.lproj/Main.storyboard +++ b/hamada/iOS-client/My1DayApp/Base.lproj/Main.storyboard @@ -1,7 +1,7 @@ - + - + @@ -18,15 +18,15 @@ - - - + + + From a99213a11df727290000e836d8bda2e82f8ad83a Mon Sep 17 00:00:00 2001 From: KOH Date: Sun, 28 Jun 2015 13:07:26 +0900 Subject: [PATCH 2/5] hoge --- hamada/web-client/web/index.html | 4 ++-- hamada/web-server/log/api.log | 0 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 hamada/web-server/log/api.log diff --git a/hamada/web-client/web/index.html b/hamada/web-client/web/index.html index 2a25266..dc325a4 100644 --- a/hamada/web-client/web/index.html +++ b/hamada/web-client/web/index.html @@ -52,11 +52,11 @@

- +
diff --git a/hamada/web-server/log/api.log b/hamada/web-server/log/api.log old mode 100644 new mode 100755 From a3e34a328187cd717f341b6b69b6f0f4d2e59bd3 Mon Sep 17 00:00:00 2001 From: KOH Date: Sun, 28 Jun 2015 13:36:40 +0900 Subject: [PATCH 3/5] hamada mission 1-1 --- hamada/iOS-client/My1DayApp/Base.lproj/Main.storyboard | 9 ++++++++- hamada/iOS-client/My1DayApp/Message.swift | 7 ++++++- hamada/iOS-client/My1DayApp/MessageTableViewCell.swift | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/hamada/iOS-client/My1DayApp/Base.lproj/Main.storyboard b/hamada/iOS-client/My1DayApp/Base.lproj/Main.storyboard index 05d429f..d38cf23 100644 --- a/hamada/iOS-client/My1DayApp/Base.lproj/Main.storyboard +++ b/hamada/iOS-client/My1DayApp/Base.lproj/Main.storyboard @@ -19,7 +19,7 @@ + diff --git a/hamada/iOS-client/My1DayApp/Message.swift b/hamada/iOS-client/My1DayApp/Message.swift index 0956954..eb90160 100644 --- a/hamada/iOS-client/My1DayApp/Message.swift +++ b/hamada/iOS-client/My1DayApp/Message.swift @@ -13,19 +13,24 @@ class Message { let body: String! let icon: UIImage? // Mission1-1. created_at 用のインスタンス変数を追加 + let date: String! + init?(dictionary: [String: AnyObject]) { // Mission1-1 Dictionary から key:created_at の値を取得 - if let identifier = dictionary["id"] as? Int, body = dictionary["body"] as? String, icon = dictionary["icon"] as? String{ + + if let identifier = dictionary["id"] as? Int, body = dictionary["body"] as? String, icon = dictionary["icon"] as? String, date = dictionary["created_at"] as? String{ self.identifier = identifier self.body = body self.icon = ImageHelper.imageWithBase64EncodedString(icon) // Mission1-1 Dictionary から取得した値を created_at 用のインスタンス変数に追加 + self.date = date } else { self.identifier = nil self.body = nil self.icon = nil // Mission1-1 インスタンス変数を nil で初期化 + self.date = nil return nil } } diff --git a/hamada/iOS-client/My1DayApp/MessageTableViewCell.swift b/hamada/iOS-client/My1DayApp/MessageTableViewCell.swift index 74692f2..43f8716 100644 --- a/hamada/iOS-client/My1DayApp/MessageTableViewCell.swift +++ b/hamada/iOS-client/My1DayApp/MessageTableViewCell.swift @@ -12,6 +12,7 @@ class MessageTableViewCell: UITableViewCell { @IBOutlet weak private var iconImageView: UIImageView! @IBOutlet weak private var messageLabel: UILabel! // Mission1-1 UILabel のインスタンス変数を追加 + @IBOutlet weak var dateLabel: UILabel! override func prepareForReuse() { self.iconImageView.image = nil @@ -23,5 +24,6 @@ class MessageTableViewCell: UITableViewCell { self.iconImageView.image = message.icon self.messageLabel.text = message.body // Mission1-1 UILabel のインスタンス変数に created_at の値を代入 + self.dateLabel.text = message.date } } From 48ec97c4ca6a1296da3fd1b5746a6516d40d9130 Mon Sep 17 00:00:00 2001 From: KOH Date: Sun, 28 Jun 2015 14:39:01 +0900 Subject: [PATCH 4/5] mission1-2 --- .../My1DayApp/Base.lproj/Main.storyboard | 43 ++++++++++++------- hamada/iOS-client/My1DayApp/Message.swift | 7 ++- .../My1DayApp/MessageTableViewCell.swift | 3 ++ .../My1DayApp/PostViewController.swift | 7 ++- 4 files changed, 43 insertions(+), 17 deletions(-) diff --git a/hamada/iOS-client/My1DayApp/Base.lproj/Main.storyboard b/hamada/iOS-client/My1DayApp/Base.lproj/Main.storyboard index d38cf23..d079ab7 100644 --- a/hamada/iOS-client/My1DayApp/Base.lproj/Main.storyboard +++ b/hamada/iOS-client/My1DayApp/Base.lproj/Main.storyboard @@ -8,29 +8,35 @@ - + - + - + + @@ -39,6 +45,7 @@ + @@ -77,15 +84,20 @@ - - + + + + + + + + + + - - - @@ -127,6 +139,7 @@ + diff --git a/hamada/iOS-client/My1DayApp/Message.swift b/hamada/iOS-client/My1DayApp/Message.swift index eb90160..167a83b 100644 --- a/hamada/iOS-client/My1DayApp/Message.swift +++ b/hamada/iOS-client/My1DayApp/Message.swift @@ -14,23 +14,28 @@ class Message { let icon: UIImage? // Mission1-1. created_at 用のインスタンス変数を追加 let date: String! + let userName : String! init?(dictionary: [String: AnyObject]) { // Mission1-1 Dictionary から key:created_at の値を取得 - if let identifier = dictionary["id"] as? Int, body = dictionary["body"] as? String, icon = dictionary["icon"] as? String, date = dictionary["created_at"] as? String{ + if let identifier = dictionary["id"] as? Int, body = dictionary["body"] as? String, icon = dictionary["icon"] as? String, date = dictionary["created_at"] as? String, + userName = dictionary["username"] as? String + { self.identifier = identifier self.body = body self.icon = ImageHelper.imageWithBase64EncodedString(icon) // Mission1-1 Dictionary から取得した値を created_at 用のインスタンス変数に追加 self.date = date + self.userName = userName } else { self.identifier = nil self.body = nil self.icon = nil // Mission1-1 インスタンス変数を nil で初期化 self.date = nil + self.userName = nil return nil } } diff --git a/hamada/iOS-client/My1DayApp/MessageTableViewCell.swift b/hamada/iOS-client/My1DayApp/MessageTableViewCell.swift index 43f8716..162ea6a 100644 --- a/hamada/iOS-client/My1DayApp/MessageTableViewCell.swift +++ b/hamada/iOS-client/My1DayApp/MessageTableViewCell.swift @@ -14,6 +14,8 @@ class MessageTableViewCell: UITableViewCell { // Mission1-1 UILabel のインスタンス変数を追加 @IBOutlet weak var dateLabel: UILabel! + @IBOutlet weak var userNameLabel: UILabel! + override func prepareForReuse() { self.iconImageView.image = nil self.messageLabel.text = nil @@ -25,5 +27,6 @@ class MessageTableViewCell: UITableViewCell { self.messageLabel.text = message.body // Mission1-1 UILabel のインスタンス変数に created_at の値を代入 self.dateLabel.text = message.date + self.userNameLabel.text = message.userName } } diff --git a/hamada/iOS-client/My1DayApp/PostViewController.swift b/hamada/iOS-client/My1DayApp/PostViewController.swift index cebd98b..cd3928b 100644 --- a/hamada/iOS-client/My1DayApp/PostViewController.swift +++ b/hamada/iOS-client/My1DayApp/PostViewController.swift @@ -16,6 +16,10 @@ class PostViewController: UIViewController { @IBOutlet weak private var messageTextView: UITextView! weak var delegate: PostViewControllerDelagate? // Mission1-2 Storyboard から UITextField のインスタンス変数を追加 + + @IBOutlet weak var userNameView: UITextField! + + override func viewDidLoad() { super.viewDidLoad() @@ -34,9 +38,10 @@ class PostViewController: UIViewController { let message = self.messageTextView.text ?? "" // Mission1-2 UITextField のインスタンス変数から値を取得 + let userName = self.userNameView.text ?? "" // Mission1-2 posetMessage の第2引数に 任意の値を渡す - APIRequest.postMessage(message, username: "名前はまだない") { + APIRequest.postMessage(message, username:userName) { [weak self] (data, response, error) -> Void in self?.delegate?.postViewController(self!, didTouchUpCloseButton: sender) From 690e51efc6d7e5bc4950d9da3c982e12241b2be4 Mon Sep 17 00:00:00 2001 From: KOH Date: Sun, 28 Jun 2015 14:58:31 +0900 Subject: [PATCH 5/5] mission2-1 --- hamada/iOS-client/My1DayApp/MessageTableViewCell.swift | 3 ++- hamada/web-server/app.php | 8 ++++++++ hamada/web-server/log/api.log | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/hamada/iOS-client/My1DayApp/MessageTableViewCell.swift b/hamada/iOS-client/My1DayApp/MessageTableViewCell.swift index 162ea6a..70186ad 100644 --- a/hamada/iOS-client/My1DayApp/MessageTableViewCell.swift +++ b/hamada/iOS-client/My1DayApp/MessageTableViewCell.swift @@ -26,7 +26,8 @@ class MessageTableViewCell: UITableViewCell { self.iconImageView.image = message.icon self.messageLabel.text = message.body // Mission1-1 UILabel のインスタンス変数に created_at の値を代入 - self.dateLabel.text = message.date + if message.userName == "bot" {self.dateLabel.text = ""} + else {self.dateLabel.text = message.date} self.userNameLabel.text = message.userName } } diff --git a/hamada/web-server/app.php b/hamada/web-server/app.php index 416da75..75e43a0 100644 --- a/hamada/web-server/app.php +++ b/hamada/web-server/app.php @@ -24,6 +24,14 @@ $username = isset($data['username']) ? $data['username'] : ''; $body = isset($data['body']) ? $data['body'] : ''; + if($body == "uranai"){ + $result = mt_rand(0,2); + if($result == 0) $body = "凶"; + if($result == 1) $body = "吉"; + if($result == 2) $body = "大吉"; + $username = bot; + } + $createdMessage = $app->createMessage($username, $body, base64_encode(file_get_contents($app['icon_image_path']))); return $app->json($createdMessage); diff --git a/hamada/web-server/log/api.log b/hamada/web-server/log/api.log index e69de29..b2152a1 100755 --- a/hamada/web-server/log/api.log +++ b/hamada/web-server/log/api.log @@ -0,0 +1,3 @@ +[2015-06-28 05:50:28] api.ERROR: exception 'Symfony\Component\Debug\Exception\ContextErrorException' with message 'Warning: mt_rand() expects exactly 2 parameters, 1 given' in /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/app.php:28 Stack trace: #0 [internal function]: Symfony\Component\Debug\ErrorHandler->handleError(2, 'mt_rand() expec...', '/Users/KOH/Prog...', 28, Array) #1 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/app.php(28): mt_rand(Array) #2 [internal function]: {closure}(Object(Symfony\Component\HttpFoundation\Request)) #3 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/vendor/symfony/http-kernel/HttpKernel.php(147): call_user_func_array(Object(Closure), Array) #4 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/vendor/symfony/http-kernel/HttpKernel.php(68): Symfony\Component\HttpKernel\HttpKernel->handleRaw(Object(Symfony\Component\HttpFoundation\Request), 1) #5 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/vendor/silex/silex/src/Silex/Application.php(581): Symfony\Component\HttpKernel\HttpKernel->handle(Object(Symfony\Component\HttpFoundation\Request), 1, true) #6 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/vendor/silex/silex/src/Silex/Application.php(558): Silex\Application->handle(Object(Symfony\Component\HttpFoundation\Request)) #7 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/web/index.php(12): Silex\Application->run() #8 {main} [] [] +[2015-06-28 05:50:44] api.ERROR: exception 'Symfony\Component\Debug\Exception\ContextErrorException' with message 'Warning: mt_rand() expects exactly 2 parameters, 1 given' in /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/app.php:28 Stack trace: #0 [internal function]: Symfony\Component\Debug\ErrorHandler->handleError(2, 'mt_rand() expec...', '/Users/KOH/Prog...', 28, Array) #1 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/app.php(28): mt_rand(Array) #2 [internal function]: {closure}(Object(Symfony\Component\HttpFoundation\Request)) #3 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/vendor/symfony/http-kernel/HttpKernel.php(147): call_user_func_array(Object(Closure), Array) #4 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/vendor/symfony/http-kernel/HttpKernel.php(68): Symfony\Component\HttpKernel\HttpKernel->handleRaw(Object(Symfony\Component\HttpFoundation\Request), 1) #5 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/vendor/silex/silex/src/Silex/Application.php(581): Symfony\Component\HttpKernel\HttpKernel->handle(Object(Symfony\Component\HttpFoundation\Request), 1, true) #6 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/vendor/silex/silex/src/Silex/Application.php(558): Silex\Application->handle(Object(Symfony\Component\HttpFoundation\Request)) #7 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/web/index.php(12): Silex\Application->run() #8 {main} [] [] +[2015-06-28 05:51:16] api.ERROR: exception 'Symfony\Component\Debug\Exception\ContextErrorException' with message 'Warning: mt_rand() expects exactly 2 parameters, 1 given' in /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/app.php:28 Stack trace: #0 [internal function]: Symfony\Component\Debug\ErrorHandler->handleError(2, 'mt_rand() expec...', '/Users/KOH/Prog...', 28, Array) #1 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/app.php(28): mt_rand(Array) #2 [internal function]: {closure}(Object(Symfony\Component\HttpFoundation\Request)) #3 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/vendor/symfony/http-kernel/HttpKernel.php(147): call_user_func_array(Object(Closure), Array) #4 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/vendor/symfony/http-kernel/HttpKernel.php(68): Symfony\Component\HttpKernel\HttpKernel->handleRaw(Object(Symfony\Component\HttpFoundation\Request), 1) #5 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/vendor/silex/silex/src/Silex/Application.php(581): Symfony\Component\HttpKernel\HttpKernel->handle(Object(Symfony\Component\HttpFoundation\Request), 1, true) #6 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/vendor/silex/silex/src/Silex/Application.php(558): Silex\Application->handle(Object(Symfony\Component\HttpFoundation\Request)) #7 /Users/KOH/Program/KOH-GitHub/VG1day/vg-1day-2015-6-28/hamada/web-server/web/index.php(12): Silex\Application->run() #8 {main} [] []