Skip to content

Commit

Permalink
Change welcome message
Browse files Browse the repository at this point in the history
  • Loading branch information
msalom28 committed Apr 28, 2015
1 parent 63e64bd commit 0e0ee42
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 12 deletions.
Binary file not shown.
2 changes: 2 additions & 0 deletions app/Commands/RegisterUserCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ public function handle()

Auth::login($user);

$user->updateOnlineStatus(1);

return $user;
}
}
2 changes: 1 addition & 1 deletion config/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
|
*/

'default' => 'mysql',
'default' => 'sqlite',

/*
|--------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions database/seeds/DatabaseSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ public function run()
*/
public function cleanDatabase()
{
DB::statement('SET FOREIGN_KEY_CHECKS=0');
// DB::statement('SET FOREIGN_KEY_CHECKS=0');

foreach ($this->tables as $table) {

DB::table($table)->truncate();
}

DB::statement('SET FOREIGN_KEY_CHECKS=1');
// DB::statement('SET FOREIGN_KEY_CHECKS=1');

}

Expand Down
2 changes: 1 addition & 1 deletion public/css/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Larasocial

Larasocial is a simple but rich web application build on top of the Laravel framework. Inside you will find features such as friend requesting, chat between users, private messaging and more.
Larasocial is a simple but rich web application build on top of the Laravel framework. Inside you will find features such as friend requesting, chat between users, private messaging and more. To view the app online go to [http://larasocial.info](http://larasocial.info)

### License

Expand Down
8 changes: 6 additions & 2 deletions resources/assets/sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ list-group-item.active>.badge, .nav-pills>.active>a>.badge {
border-radius: 0px;
border-color: $primary-color;
position: fixed;
z-index: 100;
width: 100%;
z-index: 104;
width: 103%;

a{
color: white;
Expand All @@ -210,6 +210,10 @@ list-group-item.active>.badge, .nav-pills>.active>a>.badge {
color: white;
}

.dropdown-menu{
z-index: 104;
}


/*Footer*/

Expand Down
4 changes: 2 additions & 2 deletions resources/views/registration/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div>
<div class="modal-body">
<p><strong>Please note that this app is a prototype</strong> it was intended for demonstration purposes only.</p>
<p>If you would like take a look inside, We have generated 2 random demo accounts so you can interact and explore some of the app features like: friend requesting, private messaging, chat, etc. Just be sure to login with different browsers for each dugh!</p>
<p>If you would like to take a look inside, you can create a new profile or choose from one of the 2 random demo accounts stored in our system. To interact and explore some of the app features such as: friend requesting, private messaging, chat, etc. Just be sure to login with different browsers for each profile.</p>

@foreach($randomLogins as $randomLogin)

Expand Down Expand Up @@ -162,7 +162,7 @@
<div id="main-title" class="row text-center">
<h1>Larasocial</h2>
<h2>A Social network app built with Laravel</h3>
<a href="#"><i class="fa fa-github fa-2x"></i></a> <a href="#" data-toggle="modal" data-target="#welcomeModal"><i class="fa fa-info-circle fa-2x"></i></a>
<a href="https://github.com/msalom28/Larasocial"><i class="fa fa-github fa-2x"></i></a> <a href="#" data-toggle="modal" data-target="#welcomeModal"><i class="fa fa-info-circle fa-2x"></i></a>

<img src="/images/larasocial-main.png" class="img-responsive" alt="Larasocial image">
</div>
Expand Down
3 changes: 0 additions & 3 deletions resources/views/users/partials/userid.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,5 @@
var chatStatus = <?php echo Auth::user()->chatstatus; ?>;
var userFirstname = <?php echo json_encode(Auth::user()->firstname); ?>;
var userProfileImage = <?php echo json_encode(Auth::user()->profileimage); ?>;
console.log(chatStatus);
console.log(userId);
console.log(userFirstname);
</script>
@endif
Binary file modified storage/database.sqlite
Binary file not shown.

0 comments on commit 0e0ee42

Please sign in to comment.