diff --git a/app/controllers/UserController.php b/app/controllers/UserController.php index b949be1..8d7ef4d 100644 --- a/app/controllers/UserController.php +++ b/app/controllers/UserController.php @@ -5,14 +5,14 @@ class UserController extends \BaseController { public function create() { - return View::make('mentors.create'); + return View::make('users.create'); } public function store() { $rules = array( - 'firstname' => 'required|min:3', - 'lastname' => 'required|min:3', + 'first' => 'required|min:3', + 'last' => 'required|min:3', 'email' => 'required|email', 'password' => 'required|alphaNum|min:3' ); @@ -26,22 +26,20 @@ class UserController extends \BaseController ->withInput(Input::except('password')); } else { + $user = User::firstOrCreate( + array('first' => Input::get('first'), + 'last' => Input::get('last'), + 'email' => Input::get('email'), + 'password' => Hash::make(\Input::get('password')))); - //note-to-self: convert to use firstOrCreate(array()) - $firstname = Input::get('firstname'); - $lastname = Input::get('lastname'); - $email = Input::get('email'); - $password = Input::get('password'); - $user = new User; - $user->firstname = $firstname; - $user->lastname = $lastname; - $user->email = $email; - $user->password = Hash::make($password); if($user->save()) { - return Redirect::to('users/group')->with('success', 'You have successfully registered'); + $user_id = $user->id; + + return Redirect::to('users/group')->with('success', 'You have successfully registered') + ->with('id', $user_id); }else { return \Redirect::to('users/create')->with('errors', 'Something terrible happened'); @@ -56,7 +54,7 @@ class UserController extends \BaseController */ public function chooseGroup() { - return View::make('mentors.group')->with('id', array()); + return View::make('users.group')->with('id', array()); } /** @@ -68,7 +66,7 @@ class UserController extends \BaseController { $user = User::find($id); - return View::make('mentors.complete', array('user' => $user)); + return View::make('users.complete', array('user' => $user)); } /** @@ -91,7 +89,7 @@ class UserController extends \BaseController { $user = User::find($id); - return View::make('mentors.profile', array('user' => $user)); + return View::make('users.profile', array('user' => $user)); } @@ -103,7 +101,7 @@ class UserController extends \BaseController public function edit($id) { $user = User::find($id); - return View::make('mentors.edit', array('user' => $user)); + return View::make('users.edit', array('user' => $user)); } diff --git a/app/database/migrations/2014_06_24_025956_create_user_table.php b/app/database/migrations/2014_06_24_025956_create_user_table.php deleted file mode 100644 index 31b5001..0000000 --- a/app/database/migrations/2014_06_24_025956_create_user_table.php +++ /dev/null @@ -1,36 +0,0 @@ -increments('id'); - $table->string('firstname', 32); - $table->string('lastname', 32); - $table->string('email', 32); - $table->string('password', 64); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('users'); - } - -} diff --git a/app/database/migrations/2014_06_24_031127_alter_user_table_add_token.php b/app/database/migrations/2014_06_24_031127_alter_user_table_add_token.php deleted file mode 100644 index 12a8131..0000000 --- a/app/database/migrations/2014_06_24_031127_alter_user_table_add_token.php +++ /dev/null @@ -1,34 +0,0 @@ -string('remember_token', 100)->after('password')->nullable(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - DB::table('users', function(Blueprint $table) - { - $table->dropColumn('remember_token'); - }); - } - -} diff --git a/app/database/migrations/2014_06_24_040438_make_user_email_unique.php b/app/database/migrations/2014_06_24_040438_make_user_email_unique.php deleted file mode 100644 index 65e10bb..0000000 --- a/app/database/migrations/2014_06_24_040438_make_user_email_unique.php +++ /dev/null @@ -1,34 +0,0 @@ -unique('email'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - DB::table('users', function(Blueprint $table) - { - $table->dropUnique('email'); - }); - } - -} diff --git a/app/database/migrations/2014_06_24_042016_create_password_reminders_table.php b/app/database/migrations/2014_06_24_042016_create_password_reminders_table.php deleted file mode 100644 index dfbcf83..0000000 --- a/app/database/migrations/2014_06_24_042016_create_password_reminders_table.php +++ /dev/null @@ -1,33 +0,0 @@ -string('email')->index(); - $table->string('token')->index(); - $table->timestamp('created_at'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('password_reminders'); - } - -} diff --git a/app/database/migrations/2014_06_26_051519_create_mentors_table.php b/app/database/migrations/2014_06_26_051519_create_mentors_table.php deleted file mode 100644 index 73144a4..0000000 --- a/app/database/migrations/2014_06_26_051519_create_mentors_table.php +++ /dev/null @@ -1,31 +0,0 @@ -increments('id'); - }) - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('mentors'); - } - -} diff --git a/app/database/migrations/2014_06_26_051534_create_mentees_table.php b/app/database/migrations/2014_06_26_051534_create_mentees_table.php deleted file mode 100644 index 1d364b1..0000000 --- a/app/database/migrations/2014_06_26_051534_create_mentees_table.php +++ /dev/null @@ -1,31 +0,0 @@ -increments('id'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('mentees'); - } - -} diff --git a/app/database/migrations/2014_06_26_234302_create_mc_user_table.php b/app/database/migrations/2014_06_26_234302_create_mc_user_table.php new file mode 100644 index 0000000..d788b0d --- /dev/null +++ b/app/database/migrations/2014_06_26_234302_create_mc_user_table.php @@ -0,0 +1,38 @@ +increments('id'); + $table->string('first', 32); + $table->string('last', 32); + $table->string('email', 100); + $table->unique('email'); + $table->string('password', 64); + $table->string('remember_token', 100)->nullable(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('users'); + } + +} diff --git a/app/database/migrations/2014_06_26_235750_create_mc_role_table.php b/app/database/migrations/2014_06_26_235750_create_mc_role_table.php new file mode 100644 index 0000000..80c2d56 --- /dev/null +++ b/app/database/migrations/2014_06_26_235750_create_mc_role_table.php @@ -0,0 +1,33 @@ +increments('id'); + $table->string('name', 32); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('roles'); + } + +} diff --git a/app/database/migrations/2014_06_27_002502_create_password_reminders_table.php b/app/database/migrations/2014_06_27_002502_create_password_reminders_table.php new file mode 100644 index 0000000..dfbcf83 --- /dev/null +++ b/app/database/migrations/2014_06_27_002502_create_password_reminders_table.php @@ -0,0 +1,33 @@ +string('email')->index(); + $table->string('token')->index(); + $table->timestamp('created_at'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('password_reminders'); + } + +} diff --git a/app/database/migrations/2014_06_27_003343_create_user_xref_role_table.php b/app/database/migrations/2014_06_27_003343_create_user_xref_role_table.php new file mode 100644 index 0000000..4eebe22 --- /dev/null +++ b/app/database/migrations/2014_06_27_003343_create_user_xref_role_table.php @@ -0,0 +1,34 @@ +increments('id'); + $table->integer('user_id'); + $table->integer('role_id'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('user_xref_role'); + } + +} diff --git a/app/database/seeds/DatabaseSeeder.php b/app/database/seeds/DatabaseSeeder.php index e550b19..ffc5700 100755 --- a/app/database/seeds/DatabaseSeeder.php +++ b/app/database/seeds/DatabaseSeeder.php @@ -12,6 +12,7 @@ class DatabaseSeeder extends Seeder { Eloquent::unguard(); $this->call('UserTableSeeder'); + $this->call('RoleTableSeeder'); } } diff --git a/app/database/seeds/RoleTableSeeder.php b/app/database/seeds/RoleTableSeeder.php new file mode 100644 index 0000000..28db8e0 --- /dev/null +++ b/app/database/seeds/RoleTableSeeder.php @@ -0,0 +1,17 @@ +delete(); + + Role::create(array( + 'name' => 'Mentor' + )); + + Role::create(array( + 'name' => 'Mentee' + )); + } +} \ No newline at end of file diff --git a/app/database/seeds/UserTableSeeder.php b/app/database/seeds/UserTableSeeder.php index e7b187a..53b0b94 100644 --- a/app/database/seeds/UserTableSeeder.php +++ b/app/database/seeds/UserTableSeeder.php @@ -7,8 +7,8 @@ class UserTableSeeder extends \Seeder DB::table('users')->delete(); User::create(array( - 'firstname' => 'Elisha', - 'lastname' => 'Chirchir', + 'first' => 'Elisha', + 'last' => 'Chirchir', 'email' => 'elisha.java@gmail.com', 'password' => Hash::make('admin') )); diff --git a/app/models/Role.php b/app/models/Role.php new file mode 100644 index 0000000..48059e9 --- /dev/null +++ b/app/models/Role.php @@ -0,0 +1,12 @@ + - - - - Mentconnect Inc - Profile - - {{HTML::style('css/mentconnect.css')}} - - -
- -
- -
- {{ Form::open(array('url' => 'users/store', 'class' => 'form-horizontal')) }} - -
-
-

Complete Your Profile

-
- -
- -
- -
- - {{Form::text('firstname', \Input::old('firstname'), array('class' => 'form-control form-control-bordered', 'tabindex' => '1'))}} {{$errors->first('firstname')}} -
-
- - - {{ Form::text('lastname', \Input::old('lastname'), array('class' => 'form-control form-control-bordered', 'tabindex' => '2')) }} {{$errors->first('lastname')}} -
-
- - - {{ Form::email('email', \Input::old('email'), array('class' => 'form-control form-control-bordered', - 'tabindex' => '3')) }} {{$errors->first('email') }} -
- -
- - - {{ Form::text('title', \Input::old('title'), array('class' => 'form-control form-control-bordered', - 'tabindex' => '4')) }} {{$errors->first('email') }} -
- -
- - - {{ Form::text('location', \Input::old('location'), array('class' => 'form-control form-control-bordered', - 'tabindex' => '5')) }} {{$errors->first('location') }} -
- -
-
- {{Form::submit('Complete!', array('class' => 'btn btn-success btn-large submit-button'))}} -

-
-
-
- -
- -
-
-
- {{ Form::close() }} -
- -
-
- - - - \ No newline at end of file diff --git a/app/views/mentors/create.blade.php b/app/views/mentors/create.blade.php deleted file mode 100644 index d3b0290..0000000 --- a/app/views/mentors/create.blade.php +++ /dev/null @@ -1,114 +0,0 @@ - - - - - Mentconnect Inc - - {{HTML::style('css/mentconnect.css')}} - - -
- -
- -
- {{ Form::open(array('url' => 'users/store', 'class' => 'form-horizontal')) }} - -
-
-

Sign Up For A Mentconnect Account

-
- -
-
-

Be part of the change!

-

Learn from experts who care to share. When you are ready, be free to give back by sharing your skills with others.

- -
- -
- -
- - {{Form::text('firstname', \Input::old('firstname'), array('class' => 'form-control form-control-bordered', 'tabindex' => '1'))}} {{$errors->first('firstname')}} -
-
- - - {{ Form::text('lastname', \Input::old('lastname'), array('class' => 'form-control form-control-bordered', 'tabindex' => '2')) }} {{$errors->first('lastname')}} -
-
- - - {{ Form::email('email', \Input::old('email'), array('class' => 'form-control form-control-bordered', - 'tabindex' => '3')) }} {{$errors->first('email') }} -
-
- - - {{Form::password('password', array('class' => 'form-control form-control-bordered', 'tabindex' => '4'))}} {{$errors->first('password') }} - -
- -
-
- {{Form::submit('Sign Me Up!', array('class' => 'btn btn-success btn-large submit-button'))}} -

-
-
- By clicking "Sign Me Up" you agree to our - {{HTML::link('tos', 'Terms of Service') }} and {{HTML::link('privacy', 'Privacy Policy.')}} - -
-
-
-
-
- {{ Form::close() }} -
- -
-
- - - - \ No newline at end of file diff --git a/app/views/mentors/group.blade.php b/app/views/mentors/group.blade.php deleted file mode 100644 index 4537233..0000000 --- a/app/views/mentors/group.blade.php +++ /dev/null @@ -1,99 +0,0 @@ - - - - - Mentconnect Inc - Profile - - {{HTML::style('css/mentconnect.css')}} - - -
- -
- -
- -
-
-

Complete Your Profile

-
- -
-
-

Please use the buttons below to select your category; if you would like to be a Mentor - to someone who is new to your area of expertise, select the Be a Mentor button - and if you would like to find a mentor who will help you through your learning curve, - then select the Be a Mentee button to complete your profile respectively. - Welcome to Mentconnect!

-

-
-
- -
-
-
-
- -

- {{ HTML::link('mentors/create', 'Become a Mentor', array('class' => 'btn btn-large btn-primary proxima-bold')) }} -

-
- -
- -

- {{ HTML::link('mentees/create', 'Become a Mentee', array('class' => 'btn btn-large btn-primary proxima-bold')) }} -

-
-
-
- -
-
- -
-
-

- - - - \ No newline at end of file diff --git a/app/views/mentors/index.blade.php b/app/views/mentors/index.blade.php deleted file mode 100644 index d6fff4e..0000000 --- a/app/views/mentors/index.blade.php +++ /dev/null @@ -1,118 +0,0 @@ - - - - - Laravel PHP Framework - - {{HTML::style('css/mentconnect.css')}} - - -
- - -
-
-
-

Get Matched With a Mentor - or Be a Mentor To Someone Today.

- -

- Learning to program can be a daunting task - especially if you have no one to help you. It doesn't have to be that way. - That is why I started mentconnect. -

- -

- {{ HTML::link('register', 'Join Now', array('class' => 'btn btn-large btn-primary proxima-bold')) }} -

-
- -
- -
-
-
-
- -
-
-
-

Rethinking the learning process had to be done.

-

- Cut down on the amount of time you waste looking in the wrong places. - Get your questions answered by the right mentor at the right time. - Above all, get the correct advice when you need it most and finally Learn. Having a mentor go through the journey with you is the difference between success and failure - most of the time. -

- -
-
-
-
-

Get Matched

-

- Once you register, we automatically match you with a mentor (if you are looking for one) and if no mentor is available, we add your account to the queue in the order your account was created. -

-
- -
-
-

Learn To Code

-

- Once you are matched with an experienced mentor, you will start learning with their guidance. Get your questions answered. Contact them when you need help and save yourself a lot of time learning. -

-
- -
-
-

Be a Mentor

-

- When you have learned what you need, you get an opportunity to be .. you guessed it, a mentor to someone else. This is simply a way of giving back to the community and continue learning new skills. -

-
-
-
-
-
- - - - diff --git a/app/views/mentors/profile.blade.php b/app/views/mentors/profile.blade.php deleted file mode 100644 index e09ca46..0000000 --- a/app/views/mentors/profile.blade.php +++ /dev/null @@ -1,55 +0,0 @@ - - - - - Laravel PHP Framework - - {{HTML::style('css/mentconnect.css')}} - - -
- -
- - - - \ No newline at end of file diff --git a/app/views/users/complete.blade.php b/app/views/users/complete.blade.php new file mode 100644 index 0000000..1ade172 --- /dev/null +++ b/app/views/users/complete.blade.php @@ -0,0 +1,116 @@ + + + + + Mentconnect Inc - Profile + + {{HTML::style('css/mentconnect.css')}} + + +
+ +
+ +
+ {{ Form::open(array('url' => 'users/store', 'class' => 'form-horizontal')) }} + +
+
+

Complete Your Profile

+
+ +
+ +
+ +
+ + {{Form::text('firstname', \Input::old('firstname'), array('class' => 'form-control form-control-bordered', 'tabindex' => '1'))}} {{$errors->first('firstname')}} +
+
+ + + {{ Form::text('lastname', \Input::old('lastname'), array('class' => 'form-control form-control-bordered', 'tabindex' => '2')) }} {{$errors->first('lastname')}} +
+
+ + + {{ Form::email('email', \Input::old('email'), array('class' => 'form-control form-control-bordered', + 'tabindex' => '3')) }} {{$errors->first('email') }} +
+ +
+ + + {{ Form::text('title', \Input::old('title'), array('class' => 'form-control form-control-bordered', + 'tabindex' => '4')) }} {{$errors->first('email') }} +
+ +
+ + + {{ Form::text('location', \Input::old('location'), array('class' => 'form-control form-control-bordered', + 'tabindex' => '5')) }} {{$errors->first('location') }} +
+ +
+
+ {{Form::submit('Complete!', array('class' => 'btn btn-success btn-large submit-button'))}} +

+
+
+
+ +
+ +
+
+
+ {{ Form::close() }} +
+ +
+
+ + + + \ No newline at end of file diff --git a/app/views/users/create.blade.php b/app/views/users/create.blade.php new file mode 100644 index 0000000..be4ce52 --- /dev/null +++ b/app/views/users/create.blade.php @@ -0,0 +1,114 @@ + + + + + Mentconnect Inc + + {{HTML::style('css/mentconnect.css')}} + + +
+ +
+ +
+ {{ Form::open(array('url' => 'users/store', 'class' => 'form-horizontal')) }} + +
+
+

Sign Up For A Mentconnect Account

+
+ +
+
+

Be part of the change!

+

Learn from experts who care to share. When you are ready, be free to give back by sharing your skills with others.

+ +
+ +
+ +
+ + {{Form::text('first', \Input::old('first'), array('class' => 'form-control form-control-bordered', 'tabindex' => '1'))}} {{$errors->first('first')}} +
+
+ + + {{ Form::text('last', \Input::old('last'), array('class' => 'form-control form-control-bordered', 'tabindex' => '2')) }} {{$errors->first('last')}} +
+
+ + + {{ Form::email('email', \Input::old('email'), array('class' => 'form-control form-control-bordered', + 'tabindex' => '3')) }} {{$errors->first('email') }} +
+
+ + + {{Form::password('password', array('class' => 'form-control form-control-bordered', 'tabindex' => '4'))}} {{$errors->first('password') }} + +
+ +
+
+ {{Form::submit('Sign Me Up!', array('class' => 'btn btn-success btn-large submit-button'))}} +

+
+
+ By clicking "Sign Me Up" you agree to our + {{HTML::link('tos', 'Terms of Service') }} and {{HTML::link('privacy', 'Privacy Policy.')}} + +
+
+
+
+
+ {{ Form::close() }} +
+ +
+
+ + + + \ No newline at end of file diff --git a/app/views/users/group.blade.php b/app/views/users/group.blade.php new file mode 100644 index 0000000..4537233 --- /dev/null +++ b/app/views/users/group.blade.php @@ -0,0 +1,99 @@ + + + + + Mentconnect Inc - Profile + + {{HTML::style('css/mentconnect.css')}} + + +
+ +
+ +
+ +
+
+

Complete Your Profile

+
+ +
+
+

Please use the buttons below to select your category; if you would like to be a Mentor + to someone who is new to your area of expertise, select the Be a Mentor button + and if you would like to find a mentor who will help you through your learning curve, + then select the Be a Mentee button to complete your profile respectively. + Welcome to Mentconnect!

+

+
+
+ +
+
+
+
+ +

+ {{ HTML::link('mentors/create', 'Become a Mentor', array('class' => 'btn btn-large btn-primary proxima-bold')) }} +

+
+ +
+ +

+ {{ HTML::link('mentees/create', 'Become a Mentee', array('class' => 'btn btn-large btn-primary proxima-bold')) }} +

+
+
+
+ +
+
+ +
+
+

+ + + + \ No newline at end of file diff --git a/app/views/users/index.blade.php b/app/views/users/index.blade.php new file mode 100644 index 0000000..d6fff4e --- /dev/null +++ b/app/views/users/index.blade.php @@ -0,0 +1,118 @@ + + + + + Laravel PHP Framework + + {{HTML::style('css/mentconnect.css')}} + + +
+ + +
+
+
+

Get Matched With a Mentor + or Be a Mentor To Someone Today.

+ +

+ Learning to program can be a daunting task + especially if you have no one to help you. It doesn't have to be that way. + That is why I started mentconnect. +

+ +

+ {{ HTML::link('register', 'Join Now', array('class' => 'btn btn-large btn-primary proxima-bold')) }} +

+
+ +
+ +
+
+
+
+ +
+
+
+

Rethinking the learning process had to be done.

+

+ Cut down on the amount of time you waste looking in the wrong places. + Get your questions answered by the right mentor at the right time. + Above all, get the correct advice when you need it most and finally Learn. Having a mentor go through the journey with you is the difference between success and failure - most of the time. +

+ +
+
+
+
+

Get Matched

+

+ Once you register, we automatically match you with a mentor (if you are looking for one) and if no mentor is available, we add your account to the queue in the order your account was created. +

+
+ +
+
+

Learn To Code

+

+ Once you are matched with an experienced mentor, you will start learning with their guidance. Get your questions answered. Contact them when you need help and save yourself a lot of time learning. +

+
+ +
+
+

Be a Mentor

+

+ When you have learned what you need, you get an opportunity to be .. you guessed it, a mentor to someone else. This is simply a way of giving back to the community and continue learning new skills. +

+
+
+
+
+
+ + + + diff --git a/app/views/users/profile.blade.php b/app/views/users/profile.blade.php new file mode 100644 index 0000000..e09ca46 --- /dev/null +++ b/app/views/users/profile.blade.php @@ -0,0 +1,55 @@ + + + + + Laravel PHP Framework + + {{HTML::style('css/mentconnect.css')}} + + +
+ +
+ + + + \ No newline at end of file diff --git a/vendor/autoload.php b/vendor/autoload.php index e5ebf81..ce01ac6 100755 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInitcc44ad94c42a7f79fc06f2339ab26405::getLoader(); +return ComposerAutoloaderInit58ede9d7d52a7453cb838add7f15cf28::getLoader(); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 54554f4..61f049b 100755 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( - 'AlterUserTableAddToken' => $baseDir . '/app/database/migrations/2014_06_24_031127_alter_user_table_add_token.php', 'BaseController' => $baseDir . '/app/controllers/BaseController.php', 'Boris\\Boris' => $vendorDir . '/d11wtq/boris/lib/Boris/Boris.php', 'Boris\\CLIOptionsHandler' => $vendorDir . '/d11wtq/boris/lib/Boris/CLIOptionsHandler.php', @@ -29,10 +28,10 @@ return array( 'ClassPreloader\\Parser\\DirVisitor' => $vendorDir . '/classpreloader/classpreloader/src/ClassPreloader/Parser/DirVisitor.php', 'ClassPreloader\\Parser\\FileVisitor' => $vendorDir . '/classpreloader/classpreloader/src/ClassPreloader/Parser/FileVisitor.php', 'ClassPreloader\\Parser\\NodeTraverser' => $vendorDir . '/classpreloader/classpreloader/src/ClassPreloader/Parser/NodeTraverser.php', - 'CreateMenteesTable' => $baseDir . '/app/database/migrations/2014_06_26_051534_create_mentees_table.php', - 'CreateMentorsTable' => $baseDir . '/app/database/migrations/2014_06_26_051519_create_mentors_table.php', - 'CreatePasswordRemindersTable' => $baseDir . '/app/database/migrations/2014_06_24_042016_create_password_reminders_table.php', - 'CreateUserTable' => $baseDir . '/app/database/migrations/2014_06_24_025956_create_user_table.php', + 'CreateMcRoleTable' => $baseDir . '/app/database/migrations/2014_06_26_235750_create_mc_role_table.php', + 'CreateMcUserTable' => $baseDir . '/app/database/migrations/2014_06_26_234302_create_mc_user_table.php', + 'CreatePasswordRemindersTable' => $baseDir . '/app/database/migrations/2014_06_27_002502_create_password_reminders_table.php', + 'CreateUserXrefRoleTable' => $baseDir . '/app/database/migrations/2014_06_27_003343_create_user_xref_role_table.php', 'Crypt_AES' => $vendorDir . '/phpseclib/phpseclib/phpseclib/Crypt/AES.php', 'Crypt_Base' => $vendorDir . '/phpseclib/phpseclib/phpseclib/Crypt/Base.php', 'Crypt_Blowfish' => $vendorDir . '/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php', @@ -405,7 +404,6 @@ return array( 'Jeremeamia\\SuperClosure\\SerializableClosure' => $vendorDir . '/jeremeamia/SuperClosure/src/Jeremeamia/SuperClosure/SerializableClosure.php', 'Jeremeamia\\SuperClosure\\Visitor\\ClosureFinderVisitor' => $vendorDir . '/jeremeamia/SuperClosure/src/Jeremeamia/SuperClosure/Visitor/ClosureFinderVisitor.php', 'Jeremeamia\\SuperClosure\\Visitor\\MagicConstantVisitor' => $vendorDir . '/jeremeamia/SuperClosure/src/Jeremeamia/SuperClosure/Visitor/MagicConstantVisitor.php', - 'MakeUserEmailUnique' => $baseDir . '/app/database/migrations/2014_06_24_040438_make_user_email_unique.php', 'Math_BigInteger' => $vendorDir . '/phpseclib/phpseclib/phpseclib/Math/BigInteger.php', 'Monolog\\ErrorHandler' => $vendorDir . '/monolog/monolog/src/Monolog/ErrorHandler.php', 'Monolog\\Formatter\\ChromePHPFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php', @@ -935,6 +933,8 @@ return array( 'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php', 'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php', 'RemindersController' => $baseDir . '/app/controllers/RemindersController.php', + 'Role' => $baseDir . '/app/models/Role.php', + 'RoleTableSeeder' => $baseDir . '/app/database/seeds/RoleTableSeeder.php', 'SessionController' => $baseDir . '/app/controllers/SessionController.php', 'SessionHandlerInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php', 'Stack\\Builder' => $vendorDir . '/stack/builder/src/Stack/Builder.php', @@ -1522,6 +1522,7 @@ return array( 'User' => $baseDir . '/app/models/User.php', 'UserController' => $baseDir . '/app/controllers/UserController.php', 'UserTableSeeder' => $baseDir . '/app/database/seeds/UserTableSeeder.php', + 'UserXrefROle' => $baseDir . '/app/models/UserXrefRole.php', 'Whoops\\Exception\\ErrorException' => $vendorDir . '/filp/whoops/src/Whoops/Exception/ErrorException.php', 'Whoops\\Exception\\Frame' => $vendorDir . '/filp/whoops/src/Whoops/Exception/Frame.php', 'Whoops\\Exception\\FrameCollection' => $vendorDir . '/filp/whoops/src/Whoops/Exception/FrameCollection.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 1c4e562..5e86d60 100755 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitcc44ad94c42a7f79fc06f2339ab26405 +class ComposerAutoloaderInit58ede9d7d52a7453cb838add7f15cf28 { private static $loader; @@ -19,9 +19,9 @@ class ComposerAutoloaderInitcc44ad94c42a7f79fc06f2339ab26405 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitcc44ad94c42a7f79fc06f2339ab26405', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit58ede9d7d52a7453cb838add7f15cf28', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitcc44ad94c42a7f79fc06f2339ab26405', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit58ede9d7d52a7453cb838add7f15cf28', 'loadClassLoader')); $vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); @@ -49,14 +49,14 @@ class ComposerAutoloaderInitcc44ad94c42a7f79fc06f2339ab26405 $includeFiles = require __DIR__ . '/autoload_files.php'; foreach ($includeFiles as $file) { - composerRequirecc44ad94c42a7f79fc06f2339ab26405($file); + composerRequire58ede9d7d52a7453cb838add7f15cf28($file); } return $loader; } } -function composerRequirecc44ad94c42a7f79fc06f2339ab26405($file) +function composerRequire58ede9d7d52a7453cb838add7f15cf28($file) { require $file; }