Add readme file

msalom28 · Apr 25, 2015 · 3c3b1a7 · 3c3b1a7
1 parent 12fbaeb
commit 3c3b1a7
Show file tree

Hide file tree

Showing 14 changed files with 77 additions and 32 deletions.
diff --git a/.sass-cache/d9b885ff6b56267e4f2b8573fca9e47b444b1d39/main.scssc b/.sass-cache/d9b885ff6b56267e4f2b8573fca9e47b444b1d39/main.scssc
diff --git a/app/Http/Controllers/RegistrationController.php b/app/Http/Controllers/RegistrationController.php
@@ -5,6 +5,7 @@
 use App\Commands\RegisterUserCommand;
 use App;
 use Carbon\Carbon;
+use App\User;
 
 use Illuminate\Http\Request;
 
@@ -25,7 +26,20 @@ public function __construct()
 	 */
 	public function create()
 	{
-		return view('registration.index');
+		$loginIdsRange = range(1, 30);
+
+		shuffle($loginIdsRange);
+
+		$loginIds = array_slice($loginIdsRange, 0, 2);
+
+		$randomLogins = [];
+
+		foreach ($loginIds as $loginId) {
+
+			$randomLogins[] = User::find($loginId);
+		}
+
+		return view('registration.index', compact('randomLogins'));
 	}
 
 	/**

diff --git a/main.js b/main.js
@@ -213,7 +213,7 @@
 
 					case 'message-response-form':
 
-			        $('.center-alert').html(data.message).fadeIn(300).delay(2500).fadeOut(300);			       
+			        // $('.center-alert').html(data.message).fadeIn(300).delay(2500).fadeOut(300);			       
 
 			        $('.message-response-list').prepend('<div class="media listed-object-close">'+
 						'<div class="pull-left"><a href="#"><img class="media-object avatar small-avatar"'+ 
@@ -333,7 +333,7 @@
 					//Enable if you want the center alert to show
 			        // $('.center-alert').html(data.message).fadeIn(300).delay(2500).fadeOut(300);
 
-					button.attr('disabled', 'disabled').text('Request sent');
+					button.attr('disabled', 'disabled').text('Requested');
 
 					break;
 

diff --git a/phpunit.xml b/phpunit.xml
@@ -12,7 +12,7 @@
     <testsuites>
         <testsuite name="Application Test Suite">
             <directory>./tests/functional/</directory>
-<!--             <directory>./tests/commands/TestCreateFeedCommand.php</directory>
+            <directory>./tests/commands/TestCreateFeedCommand.php</directory>
             <directory>./tests/commands/TestCreateFriendRequestCommand.php</directory>
             <directory>./tests/commands/TestLoginUserCommand.php</directory>
             <directory>./tests/commands/TestLogoutUserCommand.php</directory>
@@ -33,7 +33,7 @@
             <directory>./tests/repositories/TestFeedRepository.php</directory>
             <directory>./tests/repositories/TestFriendRepository.php</directory>
             <directory>./tests/repositories/TestUserRepository.php</directory> 
-            <directory>./tests/repositories/TestMessageRepository.php</directory>  -->               
+            <directory>./tests/repositories/TestMessageRepository.php</directory>                
         </testsuite>
     </testsuites>
     <php>

diff --git a/public/css/main.css b/public/css/main.css