diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..91be243c
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+vendor
+node_modules
diff --git a/Dockerfile b/Dockerfile
index a6a73f12..dad9c2bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
-FROM php:7
-RUN apt-get update -y && apt-get install -y openssl zip unzip git zlib1g-dev
+FROM php:7.1.3
+RUN apt-get update -y && apt-get install -y openssl zip unzip git zlib1g-dev netcat mysql-client
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 RUN docker-php-ext-install pdo pdo_mysql zip
 WORKDIR /app
@@ -8,6 +8,5 @@ RUN composer install
 
 COPY wait.sh /usr/local/bin/wait.sh
 RUN chmod +x /usr/local/bin/wait.sh
-
-CMD /usr/local/bin/wait.sh && php artisan serve --host=0.0.0.0 --port=8000
+CMD /usr/local/bin/wait.sh && composer dumpautoload && php artisan migrate && php artisan db:seed && php artisan serve --host=0.0.0.0 --port=8000
 EXPOSE 8000
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index b743b223..098d40f3 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -13,6 +13,7 @@ class DatabaseSeeder extends Seeder
     {
         $this->call(UsersTableSeeder::class);
         $this->call(RolesAndPermissionsSeeder::class);
+        $this->call(UserRoleSeeder::class);
         $this->call(RateTableSeeder::class);
         $this->call(BookTableSeeder::class);     
     }
diff --git a/database/seeds/UserRoleSeeder.php b/database/seeds/UserRoleSeeder.php
new file mode 100644
index 00000000..b55e7019
--- /dev/null
+++ b/database/seeds/UserRoleSeeder.php
@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Seeder;
+use App\User;
+use App\Role;
+
+class UserRoleSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $user = User::where("email", "=" , "user@example.com")->first();
+        $admin = User::where("email", "=", "admin@example.com")->first();
+
+        $role_user = Role::where('name','=','member')->first();
+        $role_admin =  Role::where('name','=','admin')->first();
+        
+        $user->attachRole($role_user);
+        $admin->attachRole($role_admin);
+    }
+}
diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php
index 3d6a73d9..ac5c6584 100644
--- a/database/seeds/UsersTableSeeder.php
+++ b/database/seeds/UsersTableSeeder.php
@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Database\Seeder;
+use Illuminate\Database\Eloquent\Model;
 use App\User;
 
 class UsersTableSeeder extends Seeder
@@ -13,17 +14,15 @@ class UsersTableSeeder extends Seeder
     public function run()
     {
         DB::table('users')->delete();
-
+        
         $users = array(
-            ['name' => 'Ryan Chenkie', 'email' => 'ryanchenkie@gmail.com', 'password' => Hash::make('secret')],
-            ['name' => 'Chris Sevilleja', 'email' => 'chris@scotch.io', 'password' => Hash::make('secret')],
-            ['name' => 'Holly Lloyd', 'email' => 'holly@scotch.io', 'password' => Hash::make('secret')],
-            ['name' => 'Adnan Kukic', 'email' => 'adnan@scotch.io', 'password' => Hash::make('secret')],
+            ['name' => 'User', 'email' => 'user@example.com', 'password' => Hash::make('secret')],
+            ['name' => 'Admin', 'email' => 'admin@example.com', 'password' => Hash::make('secret')],
         );
 
         foreach ($users as $user)
         {
-            User::create($user);
+            $newUser = User::create($user);
         }
 
 
diff --git a/docker-compose.yml b/docker-compose.yml
index e7aa352c..48d64a54 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,18 +1,5 @@
-version: '2'
+version: '3'
 services:
-  app:
-    build: .
-    ports:
-      - "8000:8000"
-    volumes:
-      - .:/app
-    env_file: .env
-    working_dir: /app
-    command: bash -c 'sh /usr/local/bin/wait.sh && php artisan migrate && php artisan db:seed && php artisan serve --host 0.0.0.0'
-    depends_on:
-      - mysql
-    links:
-      - mysql
   mysql:
     build:
       context: ./docker/mysql
@@ -30,6 +17,20 @@ services:
     ports:
       - "3306:3306"
 
+  app:
+    build: .
+    ports:
+      - "8000:8000"
+    volumes:
+      - .:/app
+    env_file: .env
+    working_dir: /app
+    depends_on:
+      - mysql
+    links:
+      - mysql
+
+
   phpmyadmin:
     depends_on:
       - mysql
diff --git a/resources/assets/js/middleware/auth.js b/resources/assets/js/middleware/auth.js
index d1bb7af7..1302a8b7 100644
--- a/resources/assets/js/middleware/auth.js
+++ b/resources/assets/js/middleware/auth.js
@@ -3,7 +3,11 @@ import store from '~/store'
 export default async (to, from, next) => {
   if (!store.getters['auth/check']) {
     next({ name: 'login' })
-  } else {
+  } 
+  else if (store.getters['auth/user'].role == "admin"){
+    next({ name : 'admin.home' })
+  }
+  else {
     next()
   }
 }
diff --git a/resources/assets/js/pages/auth/login.vue b/resources/assets/js/pages/auth/login.vue
index aae968cf..e35dc708 100644
--- a/resources/assets/js/pages/auth/login.vue
+++ b/resources/assets/js/pages/auth/login.vue
@@ -55,6 +55,7 @@
 <script>
 import Form from 'vform'
 import LoginWithGithub from '~/components/LoginWithGithub'
+import store from '~/store'
 
 export default {
   middleware: 'guest',
diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue
index daef674b..be69fc71 100644
--- a/resources/assets/js/pages/auth/register.vue
+++ b/resources/assets/js/pages/auth/register.vue
@@ -59,6 +59,7 @@
 <script>
 import Form from 'vform'
 import LoginWithGithub from '~/components/LoginWithGithub'
+import store from '~/store'
 
 export default {
   middleware: 'guest',
@@ -98,7 +99,9 @@ export default {
       if(store.getters['auth/user'].role === 'admin'){
         this.$router.push({ name: 'admin.home' })
       }
-      this.$router.push({ name: 'home' })
+      else{
+        this.$router.push({ name: 'home' })
+      }
     }
   }
 }
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index 5592b76a..6f8a26a0 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -6,7 +6,7 @@
 
 <script>
 export default {
-  middleware: ['auth', 'admin'],
+  middleware: ['auth'],
 
   metaInfo () {
     return { title: this.$t('home') }
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 52cf85af..30abb800 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -3730,8 +3730,8 @@ return array(
     'Tests\\Feature\\RegisterTest' => $baseDir . '/tests/Feature/RegisterTest.php',
     'Tests\\Feature\\SettingsTest' => $baseDir . '/tests/Feature/SettingsTest.php',
     'Tests\\TestCase' => $baseDir . '/tests/TestCase.php',
+    'Tests\\Unit\\BookingTest\\BookingTest' => $baseDir . '/tests/Unit/BookingTest.php',
     'Tests\\Unit\\ExampleTest' => $baseDir . '/tests/Unit/ExampleTest.php',
-    'Tests\\Unit\\OrderTest\\OrderTest' => $baseDir . '/tests/Unit/BookingTest.php',
     'Text_Template' => $vendorDir . '/phpunit/php-text-template/src/Template.php',
     'TheSeer\\Tokenizer\\Exception' => $vendorDir . '/theseer/tokenizer/src/Exception.php',
     'TheSeer\\Tokenizer\\NamespaceUri' => $vendorDir . '/theseer/tokenizer/src/NamespaceUri.php',
@@ -3812,6 +3812,7 @@ return array(
     'Tymon\\JWTAuth\\Validators\\PayloadValidator' => $vendorDir . '/tymon/jwt-auth/src/Validators/PayloadValidator.php',
     'Tymon\\JWTAuth\\Validators\\TokenValidator' => $vendorDir . '/tymon/jwt-auth/src/Validators/TokenValidator.php',
     'Tymon\\JWTAuth\\Validators\\Validator' => $vendorDir . '/tymon/jwt-auth/src/Validators/Validator.php',
+    'UserRoleSeeder' => $baseDir . '/database/seeds/UserRoleSeeder.php',
     'UsersTableSeeder' => $baseDir . '/database/seeds/UsersTableSeeder.php',
     'Webmozart\\Assert\\Assert' => $vendorDir . '/webmozart/assert/src/Assert.php',
     'Whoops\\Exception\\ErrorException' => $vendorDir . '/filp/whoops/src/Whoops/Exception/ErrorException.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 48d2d858..682bbb2c 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4129,8 +4129,8 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Tests\\Feature\\RegisterTest' => __DIR__ . '/../..' . '/tests/Feature/RegisterTest.php',
         'Tests\\Feature\\SettingsTest' => __DIR__ . '/../..' . '/tests/Feature/SettingsTest.php',
         'Tests\\TestCase' => __DIR__ . '/../..' . '/tests/TestCase.php',
+        'Tests\\Unit\\BookingTest\\BookingTest' => __DIR__ . '/../..' . '/tests/Unit/BookingTest.php',
         'Tests\\Unit\\ExampleTest' => __DIR__ . '/../..' . '/tests/Unit/ExampleTest.php',
-        'Tests\\Unit\\OrderTest\\OrderTest' => __DIR__ . '/../..' . '/tests/Unit/BookingTest.php',
         'Text_Template' => __DIR__ . '/..' . '/phpunit/php-text-template/src/Template.php',
         'TheSeer\\Tokenizer\\Exception' => __DIR__ . '/..' . '/theseer/tokenizer/src/Exception.php',
         'TheSeer\\Tokenizer\\NamespaceUri' => __DIR__ . '/..' . '/theseer/tokenizer/src/NamespaceUri.php',
@@ -4211,6 +4211,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Tymon\\JWTAuth\\Validators\\PayloadValidator' => __DIR__ . '/..' . '/tymon/jwt-auth/src/Validators/PayloadValidator.php',
         'Tymon\\JWTAuth\\Validators\\TokenValidator' => __DIR__ . '/..' . '/tymon/jwt-auth/src/Validators/TokenValidator.php',
         'Tymon\\JWTAuth\\Validators\\Validator' => __DIR__ . '/..' . '/tymon/jwt-auth/src/Validators/Validator.php',
+        'UserRoleSeeder' => __DIR__ . '/../..' . '/database/seeds/UserRoleSeeder.php',
         'UsersTableSeeder' => __DIR__ . '/../..' . '/database/seeds/UsersTableSeeder.php',
         'Webmozart\\Assert\\Assert' => __DIR__ . '/..' . '/webmozart/assert/src/Assert.php',
         'Whoops\\Exception\\ErrorException' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Exception/ErrorException.php',
diff --git a/wait.sh b/wait.sh
index ee7909a3..60ec0044 100644
--- a/wait.sh
+++ b/wait.sh
@@ -1,7 +1,13 @@
 #!/bin/bash
 
+HOST="mysql"
+PORT="3306"
+USER="default"
+PASSWORD="secret"
+DATABASE="default"
+
 echo "Waiting for mysql"
-until mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -p"$MYSQL_ENV_MYSQL_ROOT_PASSWORD" &> /dev/null
+until nc -w 1 -z mysql 3306 &> /dev/null
 do
   printf "."
   sleep 1