omair/exchange
1
0
Fork 0
mirror of https://gitlab.com/omair-personal/exchange.git synced 2026-08-19 12:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into arief/booking

Browse Source 
# Conflicts:
#	database/seeds/DatabaseSeeder.php
This commit is contained in:
jack
2018-05-19 13:03:09 +08:00
parent 3a9b949245 e539e0b388
commit 2783e874bf
13 changed files with 73 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.dockerignore
+2
View File
@@ -0,0 +1,2 @@
vendor
node_modules
Dockerfile
+3 -4
View File
@@ -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
database/seeds/DatabaseSeeder.php
+1
View File
@@ -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);
}
database/seeds/UserRoleSeeder.php
+25
View File
@@ -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);
}
}
database/seeds/UsersTableSeeder.php
+5 -6
View File
@@ -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);
}
docker-compose.yml
+15 -14
View File
@@ -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
resources/assets/js/middleware/auth.js
+5 -1
View File
@@ -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()
}
}
resources/assets/js/pages/auth/login.vue
+1
View File
@@ -55,6 +55,7 @@
<script>
import Form from 'vform'
import LoginWithGithub from '~/components/LoginWithGithub'
import store from '~/store'
export default {
middleware: 'guest',
resources/assets/js/pages/auth/register.vue
+4 -1
View File
@@ -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' })
}
}
}
}
resources/assets/js/pages/home.vue
+1 -1
View File
@@ -6,7 +6,7 @@
<script>
export default {
middleware: ['auth', 'admin'],
middleware: ['auth'],
metaInfo () {
return { title: this.$t('home') }
vendor/composer/autoload_classmap.php
Vendored
+2 -1
View File
@@ -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',
vendor/composer/autoload_static.php
Vendored
+2 -1
View File
@@ -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',
wait.sh
+7 -1
View File
@@ -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