9 files changed, 43 insertions, 23 deletions
diff --git a/src/CamilStaps/BotleaguesApi/Bot.php b/src/CamilStaps/BotleaguesApi/Database/Bot.php
index 04fa2c7..f0be0fc 100644
--- a/src/CamilStaps/BotleaguesApi/Bot.php
+++ b/src/CamilStaps/BotleaguesApi/Database/Bot.php
@@ -1,7 +1,5 @@
 <?php
-namespace CamilStaps\BotleaguesApi;
-
-use Illuminate\Database\Eloquent\Model;
+namespace CamilStaps\BotleaguesApi\Database;
 
 class Bot extends Model {
 	
diff --git a/src/CamilStaps/BotleaguesApi/Competition.php b/src/CamilStaps/BotleaguesApi/Database/Competition.php
index a8da665..c355c08 100644
--- a/src/CamilStaps/BotleaguesApi/Competition.php
+++ b/src/CamilStaps/BotleaguesApi/Database/Competition.php
@@ -1,7 +1,5 @@
 <?php
-namespace CamilStaps\BotleaguesApi;
-
-use Illuminate\Database\Eloquent\Model;
+namespace CamilStaps\BotleaguesApi\Database;
 
 class Competition extends Model {
     
diff --git a/src/CamilStaps/BotleaguesApi/CompetitionType.php b/src/CamilStaps/BotleaguesApi/Database/CompetitionType.php
index b9fb426..0107ffe 100644
--- a/src/CamilStaps/BotleaguesApi/CompetitionType.php
+++ b/src/CamilStaps/BotleaguesApi/Database/CompetitionType.php
@@ -1,7 +1,5 @@
 <?php
-namespace CamilStaps\BotleaguesApi;
-
-use Illuminate\Database\Eloquent\Model;
+namespace CamilStaps\BotleaguesApi\Database;
 
 class CompetitionType extends Model {
     
diff --git a/src/CamilStaps/BotleaguesApi/Game.php b/src/CamilStaps/BotleaguesApi/Database/Game.php
index 3823ab2..a8b0649 100644
--- a/src/CamilStaps/BotleaguesApi/Game.php
+++ b/src/CamilStaps/BotleaguesApi/Database/Game.php
@@ -1,7 +1,5 @@
 <?php
-namespace CamilStaps\BotleaguesApi;
-
-use Illuminate\Database\Eloquent\Model;
+namespace CamilStaps\BotleaguesApi\Database;
 
 class Game extends Model {
     
diff --git a/src/CamilStaps/BotleaguesApi/Database/Model.php b/src/CamilStaps/BotleaguesApi/Database/Model.php
new file mode 100644
index 0000000..27bd1fc
--- /dev/null
+++ b/src/CamilStaps/BotleaguesApi/Database/Model.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: camilstaps
+ * Date: 14-5-15
+ * Time: 10:47
+ */
+
+namespace CamilStaps\BotleaguesApi\Database;
+
+use Carbon\Carbon;
+
+
+class Model extends \Illuminate\Database\Eloquent\Model {
+
+    protected $date_format = Carbon::RFC2822;
+
+    protected function formatDate($date) {
+        return Carbon::parse($date)->format($this->date_format);
+    }
+
+    public function getCreatedAtAttribute($attr) {
+        return $this->formatDate($attr);
+    }
+
+    public function getUpdatedAtAttribute($attr) {
+        return $this->formatDate($attr);
+    }
+
+}
+\ No newline at end of file
diff --git a/src/CamilStaps/BotleaguesApi/Participant.php b/src/CamilStaps/BotleaguesApi/Database/Participant.php
index 65e1261..584d00c 100644
--- a/src/CamilStaps/BotleaguesApi/Participant.php
+++ b/src/CamilStaps/BotleaguesApi/Database/Participant.php
@@ -1,7 +1,5 @@
 <?php
-namespace CamilStaps\BotleaguesApi;
-
-use Illuminate\Database\Eloquent\Model;
+namespace CamilStaps\BotleaguesApi\Database;
 
 class Participant extends Model {
     
diff --git a/src/CamilStaps/BotleaguesApi/PasswordReminder.php b/src/CamilStaps/BotleaguesApi/Database/PasswordReminder.php
index a129dc8..40bc578 100644
--- a/src/CamilStaps/BotleaguesApi/PasswordReminder.php
+++ b/src/CamilStaps/BotleaguesApi/Database/PasswordReminder.php
@@ -6,10 +6,8 @@
  * Time: 13:12
  */
 
-namespace CamilStaps\BotleaguesApi;
+namespace CamilStaps\BotleaguesApi\Database;
 
-
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Mail;
 
 class PasswordReminder extends Model {
diff --git a/src/CamilStaps/BotleaguesApi/User.php b/src/CamilStaps/BotleaguesApi/Database/User.php
index 560f737..383cc38 100644
--- a/src/CamilStaps/BotleaguesApi/User.php
+++ b/src/CamilStaps/BotleaguesApi/Database/User.php
@@ -1,9 +1,8 @@
 <?php
-namespace CamilStaps\BotleaguesApi;
+namespace CamilStaps\BotleaguesApi\Database;
 
 use Illuminate\Auth\Reminders\RemindableInterface;
 use Illuminate\Auth\UserInterface;
-use Illuminate\Database\Eloquent\Model;
 
 class User extends Model implements UserInterface, RemindableInterface {
 	
diff --git a/src/CamilStaps/BotleaguesApi/UserToken.php b/src/CamilStaps/BotleaguesApi/Database/UserToken.php
index 9909f6a..92b03b8 100644
--- a/src/CamilStaps/BotleaguesApi/UserToken.php
+++ b/src/CamilStaps/BotleaguesApi/Database/UserToken.php
@@ -1,13 +1,12 @@
 <?php
-namespace CamilStaps\BotleaguesApi;
-
-use Illuminate\Database\Eloquent\Model;
+namespace CamilStaps\BotleaguesApi\Database;
 
 class UserToken extends Model {
     
     protected $table = 'user_tokens';
     protected $hidden = ['token'];
     protected $fillable = ['userId', 'token', 'valid_till'];
+    protected $dates = ['created_at', 'updated_at', 'valid_till'];
 
     /**
      * Override the parent's save() function to automatically update the valid_till timestamp
@@ -18,4 +17,8 @@ class UserToken extends Model {
         return parent::save($options);
     }
 
+    public function getValidTillAttribute($attr) {
+        return $this->formatDate($attr);
+    }
+
 }
 \ No newline at end of file