Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions app/Http/Controllers/Auth/AuthController.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function showLoginForm()
*
* @return Response
*/
public function showRegistrationForm($role = NULL)
public function showRegistrationForm($role = null)
{
$role = empty($role) ? $this->getDefaultRole() : $role;

Expand All @@ -86,9 +86,9 @@ public function showRegistrationForm($role = NULL)
protected function validator(array $data)
{
return Validator::make($data, [
'name' => 'required|max:255',
'email' => 'required|email|max:255|unique:users',
'password' => 'required|min:6',
'name' => 'required|max:255',
'email' => 'required|email|max:255|unique:users',
'password' => 'required|min:6',
'g-recaptcha-response' => 'required|recaptcha',
]);
}
Expand All @@ -102,7 +102,6 @@ protected function validator(array $data)
*/
protected function create(array $data)
{

$role = empty($data['role']) ? $this->getDefaultRole() : $data['role'];

if (!$this->isValidRole($role)) {
Expand Down Expand Up @@ -139,15 +138,14 @@ public function redirectToProvider($provider)
public function handleProviderCallback($provider)
{
$user = Socialite::driver($provider)->user();
return $this->theme->of('public::user.social', compact('user'))->render();

return $this->theme->of('public::user.social', compact('user'))->render();
}

/**
* Get the default role for a user
* Get the default role for a user.
*
* @return string
*
**/
public function getDefaultRole()
{
Expand All @@ -157,8 +155,7 @@ public function getDefaultRole()
/**
* Validate a given role.
*
* @return boolean
*
* @return bool
**/
public function isValidRole($role)
{
Expand Down
3 changes: 0 additions & 3 deletions app/Http/Controllers/PublicController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@

use Page;

/**
*
*/
class PublicController extends Controller
{
/**
Expand Down
2 changes: 0 additions & 2 deletions app/Http/Controllers/WebCurdController.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,5 @@ public function __get($name)
if (array_key_exists($name, $this->response)) {
return $this->response[$name];
}

return;
}
}
2 changes: 1 addition & 1 deletion config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
'View' => Illuminate\Support\Facades\View::class,

'AuthenticateUser' => App\AuthenticateUser::class,
'Socialite' => Laravel\Socialite\Facades\Socialite::class,
'Socialite' => Laravel\Socialite\Facades\Socialite::class,

'Captcha' => Litepie\Support\Facades\Captcha::class,
'Form' => Litepie\Support\Facades\Form::class,
Expand Down
12 changes: 6 additions & 6 deletions config/imagecache.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
|
| Enter the routes name to enable dynamic imagecache manipulation.
| This handle will define the first part of the URI:
|
|
| {route}/{template}/{filename}
|
|
| Examples: "images", "img/cache"
|
*/
Expand All @@ -23,9 +23,9 @@
| Storage paths
|--------------------------------------------------------------------------
|
| The following paths will be searched for the image filename, submited
| by URI.
|
| The following paths will be searched for the image filename, submited
| by URI.
|
| Define as many directories as you like.
|
*/
Expand All @@ -41,7 +41,7 @@
|--------------------------------------------------------------------------
|
| Here you may specify your own manipulation filter templates.
| The keys of this array will define which templates
| The keys of this array will define which templates
| are available in the URI:
|
| {route}/{template}/{filename}
Expand Down
10 changes: 5 additions & 5 deletions config/user.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
| User's roles on public side
|--------------------------------------------------------------------------
|
| This array contains the roles which a user can be assigned while creating a
| This array contains the roles which a user can be assigned while creating a
| user form public side, donot include admin or superuser role in thia array.
|
*/
Expand All @@ -38,7 +38,7 @@
| Superuser role
|--------------------------------------------------------------------------
|
| Super user role name for a user, a super user can perform all functionalities
| Super user role name for a user, a super user can perform all functionalities
| on the website.
|
*/
Expand Down Expand Up @@ -130,9 +130,9 @@
'dates' => ['deleted_at'],
'appends' => ['eid'],
'fillable' => ['reporting_id', 'name', 'email', 'sex', 'dob', 'designation', 'mobile', 'phone',
'address', 'permissions', 'street', 'city', 'district', 'state', 'country', 'web'],
'listfields' => ['id', 'reporting_id', 'name', 'email', 'sex', 'dob', 'designation', 'mobile', 'phone',
'address', 'street', 'city', 'district', 'state', 'country', 'web'],
'address', 'permissions', 'street', 'city', 'district', 'state', 'country', 'web', ],
'listfields' => ['id', 'reporting_id', 'name', 'email', 'sex', 'dob', 'designation', 'mobile', 'phone',
'address', 'street', 'city', 'district', 'state', 'country', 'web', ],
'uploadfolder' => '/uploads/users',
'uploadable' => [
'single' => ['photo'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public function up()
Schema::create('calendars', function ($table) {
$table->increments('id');
$table->string('category_id', 255)->nullable();
$table->enum('status', ['Draft','Both','Calendar'])->nullable();
$table->enum('status', ['Draft', 'Both', 'Calendar'])->nullable();
$table->dateTime('start')->nullable();
$table->dateTime('end')->nullable();
$table->string('location', 255)->nullable();
Expand All @@ -45,4 +45,4 @@ public function down()
{
Schema::drop('calendars');
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ public function up()
*/
Schema::create('messages', function ($table) {
$table->increments('id');
$table->enum('status', ['Draft','Inbox','Sent','Trash','Junk','Important','Promosions','Social'])
$table->enum('status', ['Draft', 'Inbox', 'Sent', 'Trash', 'Junk', 'Important', 'Promosions', 'Social'])
->nullable();
$table->enum('star', ['Yes','No'])->nullable();
$table->enum('star', ['Yes', 'No'])->nullable();
$table->integer('from')->nullable();
$table->integer('to')->nullable();
$table->string('subject', 255)->nullable();
$table->text('message')->nullable();
$table->tinyInteger('read')->nullable();
$table->enum('type', ['System','Admin','User'])->nullable();
$table->enum('type', ['System', 'Admin', 'User'])->nullable();
$table->string('slug', 100)->nullable();
$table->integer('user_id')->nullable();
$table->string('upload_folder', 100)->nullable();
Expand All @@ -45,4 +45,4 @@ public function down()
{
Schema::drop('messages');
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ public function down()
{
Schema::drop('tasks');
}
}
}