Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@df-arif
df-arif committed Jun 3, 2015
2 parents 8aa7770 + 1ec9059 commit fc9986f
Show file tree
Hide file tree
Showing 8 changed files with 472 additions and 336 deletions.
10 changes: 9 additions & 1 deletion .env-dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,13 @@ DB_PASSWORD=password

CACHE_DRIVER=file
SESSION_DRIVER=file
QUEUE_DRIVER=sync

LOCAL_FILE_ROOT=app
MAIL_DRIVER=smtp
MAIL_HOST=mailtrap.io
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null

LOCAL_FILE_ROOT=app
LANDING_PAGE=/dreamfactory/dist/
18 changes: 0 additions & 18 deletions .env.example
View file

This file was deleted.

3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
/log
/public/test_report
/public/swagger
/workbench/repos
/public/dreamfactory
/workbench
composer.phar
_ide_helper.php
.env.*.php
Expand Down
7 changes: 4 additions & 3 deletions app/Http/Controllers/SplashController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ public function __construct()
*/
public function index()
{
return view( 'splash' );
return redirect(env('LANDING_PAGE', '/launchpad'));
// return view( 'splash' );
}

/**
Expand Down Expand Up @@ -105,7 +106,7 @@ public static function handleADLdapLogin( $provider )

\Auth::login( $user, \Request::has( 'remember' ) );

return redirect()->intended( '/launchpad' );
return redirect()->intended( env('LANDING_PAGE', '/launchpad') );
}
}

Expand Down Expand Up @@ -150,7 +151,7 @@ public function handleOAuthCallback( $serviceName )
}
else
{
return redirect()->intended( '/launchpad' );
return redirect()->intended( env('LANDING_PAGE', '/launchpad') );
}
}
}
2 changes: 1 addition & 1 deletion app/Http/Middleware/RedirectIfAuthenticated.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function handle($request, Closure $next)
{
if ($this->auth->check())
{
return new RedirectResponse(url('/launchpad'));
return new RedirectResponse(url(env('LANDING_PAGE', '/launchpad')));
}

return $next($request);
Expand Down
8 changes: 8 additions & 0 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
"minimum-stability": "dev",
"prefer-stable": true,
"repositories": [
{
"type": "vcs",
"url": "git@github.com:dreamfactorysoftware/dsp-admin-app.git"
},
{
"type": "vcs",
"url": "git@github.com:dreamfactorysoftware/rave.git"
Expand Down Expand Up @@ -82,6 +86,7 @@
],
"require": {
"laravel/framework": "5.0.*",
"dreamfactory/dsp-admin-app": "dev-develop as dev-master",
"dreamfactory/rave": "dev-develop as dev-master",
"dreamfactory/rave-aws": "dev-develop as dev-master",
"dreamfactory/rave-azure": "dev-develop as dev-master",
Expand Down Expand Up @@ -138,6 +143,9 @@
"extra": {
"branch-alias": {
"dev-develop": "0.0.x-dev"
},
"installer-paths": {
"public/{$name}/": ["type:dreamfactory-app"]
}
}
}
216 changes: 124 additions & 92 deletions composer.json-dist
View file
Original file line number Diff line number Diff line change
@@ -1,119 +1,151 @@
{
"name": "dreamfactory/app",
"name": "dreamfactory/dsp-laravel",
"description": "The DreamFactory RAVE(tm) Core.",
"keywords": [
"dreamfactory",
"dsp",
"rave"
"dreamfactory",
"dsp",
"rave"
],
"homepage": "https://www.dreamfactory.com/",
"license": "Apache-2.0",
"authors": [
{
"name": "Arif Islam",
"email": "arifislam@dreamfactory.com"
},
{
"name": "Jerry Ablan",
"email": "jerryablan@dreamfactory.com"
},
{
"name": "Lee Hicks",
"email": "leehicks@dreamfactory.com"
}
{
"name": "Arif Islam",
"email": "arifislam@dreamfactory.com"
},
{
"name": "Jerry Ablan",
"email": "jerryablan@dreamfactory.com"
},
{
"name": "Lee Hicks",
"email": "leehicks@dreamfactory.com"
}
],
"support": {
"email": "support@dreamfactory.com",
"issues": "https://github.com/dreamfactorysoftware/rave/issues",
"wiki": "https://github.com/dreamfactorysoftware/rave/wiki",
"source": "https://github.com/dreamfactorysoftware/rave"
"email": "support@dreamfactory.com",
"issues": "https://github.com/dreamfactorysoftware/rave/issues",
"wiki": "https://github.com/dreamfactorysoftware/rave/wiki",
"source": "https://github.com/dreamfactorysoftware/rave"
},
"minimum-stability": "dev",
"prefer-stable": true,
"repositories": [
{
"type": "vcs",
"url": "git@github.com:dreamfactorysoftware/rave.git"
},
{
"type":"vcs",
"url": "git@github.com:dreamfactorysoftware/rave-aws.git"
"repositories": [
{
"type": "vcs",
"url": "git@github.com:dreamfactorysoftware/dsp-admin-app.git"
},
{
"type": "vcs",
"url": "git@github.com:dreamfactorysoftware/rave.git"
},
{
"type": "vcs",
"url": "git@github.com:dreamfactorysoftware/rave-aws.git"
},
{
"type": "vcs",
"url": "git@github.com:dreamfactorysoftware/rave-azure.git"
},
{
"type": "vcs",
"url": "git@github.com:dreamfactorysoftware/rave-rackspace.git"
},
{
"type":"vcs",
"url": "git@github.com:dreamfactorysoftware/rave-azure.git"
"type": "vcs",
"url": "git@github.com:dreamfactorysoftware/rave-sqldb.git"
},
{
"type":"vcs",
"url": "git@github.com:dreamfactorysoftware/rave-rackspace.git"
"type": "vcs",
"url": "git@github.com:dreamfactorysoftware/rave-mongodb.git"
},
{
"type":"vcs",
"url": "git@github.com:dreamfactorysoftware/rave-sqldb.git"
"type": "vcs",
"url": "git@github.com:dreamfactorysoftware/rave-rws.git"
},
{
"type":"vcs",
"url": "git@github.com:dreamfactorysoftware/rave-mongodb.git"
"type": "vcs",
"url": "git@github.com:dreamfactorysoftware/rave-sqldb-core.git"
},
{
"type": "vcs",
"url": "git@github.com:dreamfactorysoftware/rave-user-mgmt.git"
},
{
"type": "vcs",
"url": "git@github.com:dreamfactorysoftware/dsp-oauth.git"
},
{
"type": "vcs",
"url": "git@github.com:dreamfactorysoftware/dsp-adldap.git"
},
{
"type": "pear",
"url": "http://pear.php.net"
}
],
"require": {
"laravel/framework": "5.0.*",
"dreamfactory/php-utils": "dev-develop as dev-master",
"dreamfactory/rave": "dev-develop as dev-master",
"dreamfactory/rave-aws": "dev-develop as dev-master",
"dreamfactory/rave-azure": "dev-develop as dev-master",
"dreamfactory/rave-rackspace": "dev-develop as dev-master",
"dreamfactory/rave-sqldb": "dev-develop as dev-master",
"dreamfactory/rave-mongodb": "dev-develop as dev-master",
"rhumsaa/array_column": "~1.1"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "~2.0",
"laracasts/generators": "~1.0",
"laracasts/testdummy": "~2.0",
"phpunit/phpunit": "~4.0",
"phpspec/phpspec": "~2.1"
},
"autoload": {
"classmap": [
"database"
],
"psr-4": {
"App\\": "app/",
}
},
"autoload-dev": {
"classmap": [
"tests/TestCase.php"
]
},
"scripts": {
"post-install-cmd": [
"php artisan clear-compiled",
"php artisan ide-helper:generate",
"php artisan optimize"
],
"post-update-cmd": [
"php artisan clear-compiled",
"php artisan ide-helper:generate",
"php artisan optimize"
],
"post-create-project-cmd": [
"php -r \"copy('.env-dist', '.env');\"",
"php -r \"copy('phpunit.xml-dist', 'phpunit.xml');\"",
"php artisan key:generate"
]
},
"config": {
"preferred-install": "dist"
},
"extra": {
"branch-alias": {
"dev-develop": "0.0.x-dev"
}
}
"require": {
"laravel/framework": "5.0.*",
"dreamfactory/dsp-admin-app": "dev-develop as dev-master",
"dreamfactory/rave": "dev-develop as dev-master",
"dreamfactory/rave-aws": "dev-develop as dev-master",
"dreamfactory/rave-azure": "dev-develop as dev-master",
"dreamfactory/rave-rackspace": "dev-develop as dev-master",
"dreamfactory/rave-sqldb": "dev-develop as dev-master",
"dreamfactory/rave-mongodb": "dev-develop as dev-master",
"dreamfactory/rave-rws": "dev-develop as dev-master",
"dreamfactory/rave-user-mgmt": "dev-develop as dev-master",
"dreamfactory/dsp-oauth": "dev-develop as dev-master",
"dreamfactory/dsp-adldap": "dev-develop as dev-master"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "~2.0",
"laracasts/generators": "~1.0",
"laracasts/testdummy": "~2.0",
"phpunit/phpunit": "~4.0",
"phpspec/phpspec": "~2.1"
},
"autoload": {
"classmap": [
"database"
],
"psr-4": {
"App\\": "app/"
}
},
"autoload-dev": {
"classmap": [
"tests/TestCase.php"
]
},
"scripts": {
"post-install-cmd": [
"php artisan clear-compiled",
"php artisan ide-helper:generate",
"php artisan optimize",
"php pull_migrations"
],
"post-update-cmd": [
"php artisan clear-compiled",
"php artisan ide-helper:generate",
"php artisan optimize",
"php pull_migrations"
],
"post-create-project-cmd": [
"php -r \"copy('.env-dist', '.env');\"",
"php -r \"copy('phpunit.xml-dist', 'phpunit.xml');\"",
"php artisan key:generate"
]
},
"config": {
"preferred-install": "dist"
},
"extra": {
"branch-alias": {
"dev-develop": "0.0.x-dev"
},
"installer-paths": {
"public/{$name}/": ["type:dreamfactory-app"]
}
}
}
Loading

0 comments on commit fc9986f

Please sign in to comment.