Skip to content

Commit

Permalink
sentinel
Browse files Browse the repository at this point in the history 
Signed-off-by: Suhayb El Wardany <[email protected]>
  • Loading branch information
@suwardany
suwardany committed Jun 14, 2014
1 parent 67f3797 commit 717fca9
Show file tree
Hide file tree
Showing 24 changed files with 22 additions and 40 deletions.
2 changes: 1 addition & 1 deletion app/commands/DemoInstallCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function fire()
{
$this->call('migrate');
$this->call('migrate:reset');
$this->call('migrate', ['--package' => 'cartalyst/sentry', '--seed' => true]);
$this->call('migrate', ['--package' => 'cartalyst/sentinel', '--seed' => true]);

if (file_exists($path = $this->laravel['path.storage'].'/logs/laravel.log'))
{
Expand Down
2 changes: 1 addition & 1 deletion app/config/session.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
|
*/

'cookie' => 'demo_sentry_session',
'cookie' => 'demo_sentinel_session',

/*
|--------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions app/controllers/AuthController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class AuthController extends BaseController {
*/
public function login()
{
return View::make('sentry.login');
return View::make('sentinel.login');
}

/**
Expand Down Expand Up @@ -68,7 +68,7 @@ public function processLogin()
*/
public function register()
{
return View::make('sentry.register');
return View::make('sentinel.register');
}

/**
Expand Down Expand Up @@ -99,7 +99,7 @@ public function processRegistration()

$code = $activation->code;

$sent = Mail::send('sentry.emails.activate', compact('user', 'code'), function($m) use ($user)
$sent = Mail::send('sentinel.emails.activate', compact('user', 'code'), function($m) use ($user)
{
$m->to($user->email)->subject('Activate Your Account');
});
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/GroupsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function index()
{
$groups = $this->groups->paginate();

return View::make('sentry.groups.index', compact('groups'));
return View::make('sentinel.groups.index', compact('groups'));
}

/**
Expand Down Expand Up @@ -114,7 +114,7 @@ protected function showForm($mode, $id = null)
$group = $this->groups;
}

return View::make('sentry.groups.form', compact('mode', 'group'));
return View::make('sentinel.groups.form', compact('mode', 'group'));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/UsersController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function index()
{
$users = $this->users->createModel()->paginate();

return View::make('sentry.users.index', compact('users'));
return View::make('sentinel.users.index', compact('users'));
}

/**
Expand Down Expand Up @@ -114,7 +114,7 @@ protected function showForm($mode, $id = null)
$user = $this->users->createModel();
}

return View::make('sentry.users.form', compact('mode', 'user'));
return View::make('sentinel.users.form', compact('mode', 'user'));
}

/**
Expand Down
20 changes: 10 additions & 10 deletions app/routes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
return Redirect::to('account');
}

return View::make('sentry/index');
return View::make('sentinel.index');
});

Route::get('login', 'AuthController@login');
Expand All @@ -59,7 +59,7 @@

Route::get('wait', function()
{
return View::make('sentry.wait');
return View::make('sentinel.wait');
});

Route::get('activate/{id}/{code}', function($id, $code)
Expand Down Expand Up @@ -91,7 +91,7 @@

$code = $activation->code;

$sent = Mail::send('sentry.emails.activate', compact('user', 'code'), function($m) use ($user)
$sent = Mail::send('sentinel.emails.activate', compact('user', 'code'), function($m) use ($user)
{
$m->to($user->email)->subject('Activate Your Account');
});
Expand All @@ -115,7 +115,7 @@

Route::get('reset', function()
{
return View::make('sentry.reset.begin');
return View::make('sentinel.reset.begin');
});

Route::post('reset', function()
Expand Down Expand Up @@ -148,7 +148,7 @@

$code = $reminder->code;

$sent = Mail::send('sentry.emails.reminder', compact('user', 'code'), function($m) use ($user)
$sent = Mail::send('sentinel.emails.reminder', compact('user', 'code'), function($m) use ($user)
{
$m->to($user->email)->subject('Activate Your Account');
});
Expand All @@ -166,7 +166,7 @@
{
$user = Sentinel::findById($id);

return View::make('sentry.reset.complete');
return View::make('sentinel.reset.complete');

})->where('id', '\d+');

Expand Down Expand Up @@ -213,7 +213,7 @@

$persistence = Sentinel::getPersistence();

return View::make('sentry.account.home', compact('user', 'persistence'));
return View::make('sentinel.account.home', compact('user', 'persistence'));
});

Route::get('kill/{code}', function($code)
Expand Down Expand Up @@ -242,7 +242,7 @@

Session::reflash();

return View::make('sentry.swipe.register', compact('login', 'code'));
return View::make('sentinel.swipe.register', compact('login', 'code'));
});

Route::get('registered', function()
Expand Down Expand Up @@ -285,7 +285,7 @@

Session::reflash();

return View::make('sentry.swipe.sms.register');
return View::make('sentinel.swipe.sms.register');
});

Route::post('register', function()
Expand Down Expand Up @@ -351,7 +351,7 @@

Session::reflash();

return View::make('sentry.swipe.sms.code');
return View::make('sentinel.swipe.sms.code');
});

Route::post('code', function()
Expand Down
0 app/views/sentry/account/home.blade.php → app/views/sentinel/account/home.blade.php
View file
File renamed without changes.
0 app/views/sentry/emails/activate.blade.php → app/views/sentinel/emails/activate.blade.php
View file
File renamed without changes.
0 app/views/sentry/emails/reminder.blade.php → app/views/sentinel/emails/reminder.blade.php
View file
File renamed without changes.
0 app/views/sentry/groups/form.blade.php → app/views/sentinel/groups/form.blade.php
View file
File renamed without changes.
0 app/views/sentry/groups/index.blade.php → app/views/sentinel/groups/index.blade.php
View file
File renamed without changes.
20 changes: 1 addition & 19 deletions app/views/sentry/index.blade.php → app/views/sentinel/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@
<p class="lead">This demo provides you a solid foundation of controllers and views for your next Application.</p>

<p>
<a href="https://github.com/cartalyst/demo-sentry" class="btn btn-lg btn-default"><i class="fa fa-github"></i> Github</a>
<button class="btn btn-default btn-lg" data-toggle="modal" data-target="#modal">
<i class="fa fa-heart"></i> Consider this
</button>

<a href="https://github.com/cartalyst/demo-sentinel" class="btn btn-lg btn-default"><i class="fa fa-github"></i> Github</a>
</p>
<hr>
<h2>What's new</h2>
Expand All @@ -35,18 +31,4 @@

</div>

<!-- Modal -->
<div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
<p class="lead">Don’t be a mooch! Put in a pull request, help with documentation, or support the cause by subscribing to <a href="https://cartalyst.com">Cartalyst</a>.</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default btn-block" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>

@stop
0 app/views/sentry/login.blade.php → app/views/sentinel/login.blade.php
View file
File renamed without changes.
0 app/views/sentry/register.blade.php → app/views/sentinel/register.blade.php
View file
File renamed without changes.
0 app/views/sentry/reset/begin.blade.php → app/views/sentinel/reset/begin.blade.php
View file
File renamed without changes.
0 app/views/sentry/reset/complete.blade.php → app/views/sentinel/reset/complete.blade.php
View file
File renamed without changes.
0 app/views/sentry/swipe/register.blade.php → app/views/sentinel/swipe/register.blade.php
View file
File renamed without changes.
0 app/views/sentry/swipe/sms/code.blade.php → app/views/sentinel/swipe/sms/code.blade.php
View file
File renamed without changes.
0 ...views/sentry/swipe/sms/register.blade.php → ...ews/sentinel/swipe/sms/register.blade.php
View file
File renamed without changes.
0 app/views/sentry/users/form.blade.php → app/views/sentinel/users/form.blade.php
View file
File renamed without changes.
0 app/views/sentry/users/index.blade.php → app/views/sentinel/users/index.blade.php
View file
File renamed without changes.
0 app/views/sentry/wait.blade.php → app/views/sentinel/wait.blade.php
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion app/views/template.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
@endif

<ul class="nav navbar-nav navbar-right">
<li><a href="https://cartalyst.com/manual/sentry">Manual</a></li>
<li><a href="https://cartalyst.com/manual/sentinel">Manual</a></li>
</ul>

</div>
Expand Down
2 changes: 1 addition & 1 deletion readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This is a basic demo showing some of the functionality of Sentinel on Laravel 4.
##### 1. Clone this repo:

```
git clone [email protected]:cartalyst/demo-sentry.git
git clone [email protected]:cartalyst/demo-sentinel.git
```

##### 2. Setup your virtual host.
Expand Down

0 comments on commit 717fca9

Please sign in to comment.