Added picture to readme

zalsader · Oct 1, 2015 · 7e46448 · 7e46448
1 parent 6c8d99b
commit 7e46448
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 78 deletions.
diff --git a/app/Http/routes.php b/app/Http/routes.php
@@ -12,22 +12,13 @@
 */
 
 Route::get('/','HomeController@home');
-<<<<<<< HEAD
-Route::get('/leaderboard','HomeController@leaderboard');
-Route::get('login','Auth\AuthController@getLogin');
-Route::post('login','Auth\AuthController@postLogin');
-Route::get('signup','Auth\AuthController@getRegister');
-Route::post('signup','Auth\AuthController@postRegister');
-Route::get('logout', 'Auth\AuthController@getLogout');
-=======
 
 Route::get('/leaderboard','HomeController@leaderboard');
 Route::get('login', ['as' => 'loginGet', 'uses' => 'Auth\AuthController@getLogin']);
 Route::post('login', ['as' => 'loginPost', 'uses' => 'Auth\AuthController@postLogin']);
 Route::get('signup', ['as' => 'signupGet', 'uses' => 'Auth\AuthController@getRegister']);
 Route::post('signup', ['as' => 'signupPost', 'uses' => 'Auth\AuthController@postRegister']);
 Route::get('logout', ['as' => 'logoutGet', 'uses' => 'Auth\AuthController@getLogout']);
->>>>>>> f51df067d73761c5c532bd60fdfbde5838cfeb66
 Route::group(['middleware' => 'auth'], function($router){
     $router->resource('profile','ProfileController');
     Route::group(['as' => 'Submission::', 'prefix' => 'question/{questionId}'], function($r){

diff --git a/database/seeds/LevelTableSeeder.php b/database/seeds/LevelTableSeeder.php
@@ -11,16 +11,7 @@ public function run()
         DB::table('levels')->truncate();
 
         Level::insert([
-<<<<<<< HEAD
-            ['name' => 'Level 1', 'mark' => 5.0],
-            ['name' => 'Level 2', 'mark' => 10.0],
-            ['name' => 'Level 3', 'mark' => 15.0],
-            ['name' => 'Level 4', 'mark' => 20.0],
-            ['name' => 'Level 5', 'mark' => 25.0],
-            ['name' => 'Bonus Level', 'mark' => 30.0],
-=======
             // Your Levels here..
->>>>>>> f51df067d73761c5c532bd60fdfbde5838cfeb66
         ]);
     }
 

diff --git a/database/seeds/QuestionTableSeeder.php b/database/seeds/QuestionTableSeeder.php
@@ -10,42 +10,9 @@ public function run()
     {
         DB::table('questions')->truncate();
 
-<<<<<<< HEAD
-        Question::insert(array(
-            array("level_id"=>1,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#2iq6us","name"=>"Square","description"=>"simple square","hint_image"=>"","hint_text"=>"keep turning left and right","hint_penalty"=>0.2,"image"=>"q1.jpg"),
-            array("level_id"=>1,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#64e79o","name"=>"Diamond","description"=>"Diamond","hint_image"=>"","hint_text"=>"There will be a total of six turns","hint_penalty"=>0.2,"image"=>"q2.jpg"),
-            array("level_id"=>1,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#w6o5pg","name"=>"Circle","description"=>"Circle","hint_image"=>"","hint_text"=>"Click on ","hint_penalty"=>0.4,"image"=>"q3.jpg"),
-            array("level_id"=>1,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#7w2yzk","name"=>"Tennis Ball","description"=>"Beautiful Tennis Ball","hint_image"=>"","hint_text"=>"in the circle draw 2 arcs, one by moving left & the other by moving right!","hint_penalty"=>0.2,"image"=>"q4.jpg"),
-            array("level_id"=>1,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#9dptof","name"=>"Ninja Star 1","description"=>"Ninja Star","hint_image"=>"","hint_text"=>"draw 2 arcs one with moving right & another with moving left (70 degrees) -> repeat it six times","hint_penalty"=>0.4,"image"=>"q5.jpg"),
-            array("level_id"=>2,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#26tuzs","name"=>"Q-mark","description"=>"? mark","hint_image"=>"","hint_text"=>"draw small arc to the left & big arc to the right","hint_penalty"=>0.1,"image"=>"q6.jpg"),
-            array("level_id"=>2,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#58aivu","name"=>"I'm Smart","description"=>"Triangle with text","hint_image"=>"","hint_text"=>"use 'set width' and use 'print ","hint_penalty"=>0.2,"image"=>"q7.jpg"),
-            array("level_id"=>2,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#3bhru8","name"=>"Nested Circles","description"=>"Circles are Getting Smaller around a center point","hint_image"=>"","hint_text"=>"Decrease the radius from ","hint_penalty"=>0.2,"image"=>"q8.jpg"),
-            array("level_id"=>2,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#ybu8it","name"=>"Nested Circles","description"=>"Circles Getting Smaller around a center point with Color fading","hint_image"=>"","hint_text"=>"Use a loop from 100 to 0 with a step of 10","hint_penalty"=>0.2,"image"=>"q9.jpg"),
-            array("level_id"=>2,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#7xanrw","name"=>"Gears","description"=>"Gear Like","hint_image"=>"","hint_text"=>"in a loop of 9 times you have to loop 10 times","hint_penalty"=>0.2,"image"=>"q10.jpg"),
-            array("level_id"=>2,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#9dptof","name"=>"Rose","description"=>"Rose Like","hint_image"=>"","hint_text"=>"the length is ","hint_penalty"=>0.4,"image"=>"q11.jpg"),
-            array("level_id"=>2,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#n9ovnw","name"=>"Polygons","description"=>"Square with something inside it","hint_image"=>"h12.jpg","hint_text"=>"This piece of code might be useful:","hint_penalty"=>0.4,"image"=>"q12.jpg"),
-            array("level_id"=>3,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#38kfvv","name"=>"Stairs ","description"=>"Randomly Colored Stairs ","hint_image"=>"h13.png","hint_text"=>"This piece of code might be useful:","hint_penalty"=>0.4,"image"=>"q13.jpg"),
-            array("level_id"=>3,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#64exog","name"=>"Waves","description"=>"Circles getting bigger in the 4 directions","hint_image"=>"","hint_text"=>"Use a loop from 1 to 100 by a step of 5, repeat this loop 4 times","hint_penalty"=>0.2,"image"=>"q14.jpg"),
-            array("level_id"=>3,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#2t4p9d","name"=>"Multiple Circles","description"=>"Circles Getting bigger and bigger … etc","hint_image"=>"","hint_text"=>"60 degrees between each circle, 10 circles exist ","hint_penalty"=>0.2,"image"=>"q15.jpg"),
-            array("level_id"=>3,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#4rq476","name"=>"Triangle-Circle ","description"=>"Tringle with a circle inside","hint_image"=>"h16.png","hint_text"=>"This piece of code might be useful:","hint_penalty"=>0.2,"image"=>"q16.jpg"),
-            array("level_id"=>3,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#69w9b6","name"=>"Pyramid","description"=>"Tringles Getting Thinner and Taller","hint_image"=>"","hint_text"=>"in a loop reduce base length by suitable value each time","hint_penalty"=>0.2,"image"=>"q17.jpg"),
-            array("level_id"=>4,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#2g6rnu","name"=>"Cloudy","description"=>"Clouds ","hint_image"=>"","hint_text"=>"Draw arcs with different radiuses and angles, no loops at all.","hint_penalty"=>0.1,"image"=>"q18.jpg"),
-            array("level_id"=>4,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#39eo5x","name"=>"Decoration","description"=>"Arcs forming a circle while using Tringles ","hint_image"=>"h19.png","hint_text"=>"This piece of code might be useful:","hint_penalty"=>0.4,"image"=>"q19.jpg"),
-            array("level_id"=>4,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#5xrz5w","name"=>"Ninja Star'","description"=>"Ninja Star X-times","hint_image"=>"h20.png","hint_text"=>"This piece of code might be useful:","hint_penalty"=>0.3,"image"=>"q20.jpg"),
-            array("level_id"=>4,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#2d2n9m","name"=>"Rose Petal","description"=>"your answer won't be accepted but if the tappered angle is dynamic and the shape remains balanced whenever  the length is changed  - ask for help!","hint_image"=>"h21.png","hint_text"=>"This piece of code might be useful:","hint_penalty"=>0.4,"image"=>"q21.jpg"),
-            array("level_id"=>5,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#vsgqiw","name"=>"Gears","description"=>"A stupid Polygon","hint_image"=>"h22.png","hint_text"=>"This piece of code might be useful:","hint_penalty"=>0.4,"image"=>"q22.jpg"),
-            array("level_id"=>5,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#7wz8yq","name"=>"Ballon","description"=>"A beautiful Ballon - you will like it :)","hint_image"=>"","hint_text"=>"set color to blend (white to orange) with a ratio of (length / 50 )","hint_penalty"=>0.2,"image"=>"q23.jpg"),
-            array("level_id"=>5,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#6y694x","name"=>"Rose","description"=>"Flower with Color Fade, it's beautiful ","hint_image"=>"h24.png","hint_text"=>"This piece of code might be useful:","hint_penalty"=>0.2,"image"=>"q24.jpg"),
-            array("level_id"=>5,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#67eu5a","name"=>"Star","description"=>"Diamonds forming a star and going smaller  and Other Functions","hint_image"=>"h25.png","hint_text"=>"This piece of code might be useful:","hint_penalty"=>0.2,"image"=>"q25.jpg"),
-            array("level_id"=>5,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#63jckw","name"=>"Vortex","description"=>"Some Hard Shape Rotating","hint_image"=>"h26.png","hint_text"=>"Repeat this.","hint_penalty"=>0.2,"image"=>"q26.jpg"),
-            array("level_id"=>5,"link"=>"https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html#77dtgy","name"=>"Circles","description"=>"Circles, Circles everywhere!!!!","hint_image"=>"","hint_text"=>"Help Yourself by yourself :P we will give you 5 additional points if you solved this, go on!","hint_penalty"=>0.2,"image"=>"q27.jpg"),
-            array("level_id"=>6,"link"=>"https://translate.google.com/#en/ar/This%20Question%20is%20Optional","name"=>"Think Like A Programmer","description"=>"This Question Is OPTIONAL ","hint_image"=>"","hint_text"=>"","hint_penalty"=>null,"image"=>"q28.jpg")
-        ));
-=======
         Question::insert([
             // Your Questions here..
         ]);
->>>>>>> f51df067d73761c5c532bd60fdfbde5838cfeb66
     }
 
 }
diff --git a/public/images/SBLogo.png b/public/images/SBLogo.png
diff --git a/public/images/TLAP.jpg b/public/images/TLAP.jpg
diff --git a/public/images/cs.jpg b/public/images/cs.jpg
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
@@ -27,11 +27,7 @@
             <br>
             <br>
             <h4>Welcome {{\Auth::user()->name}}!</h4>
-<<<<<<< HEAD
-            <a href="{{url('logout')}}" class="btn btn-danger">log out</a>
-=======
             <a href="{{route('logoutGet')}}" class="btn btn-danger">log out</a>
->>>>>>> f51df067d73761c5c532bd60fdfbde5838cfeb66
         </div>
         </div>
         <hr class="clear">

diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -19,22 +19,28 @@
 					</tr>
 				@endif
 			</table>
-	    <div class="input-group col-xs-4">
+			<div class="form-group">
+	        <div class="input-group col-xs-12 col-md-4 col-md-offset-4">
 			  <span class="input-group-addon" id="basic-addon1" style="width:140px">Email</span>
 			  <input name="email" type="text" class="form-control" placeholder="e.g.: ex@example.com" aria-describedby="basic-addon1" value="{{old('email')}}">
 			</div>
-			<br>
-			<div class="input-group col-xs-4">
+			</div>
+			<div class="form-group">
+			<div class="input-group col-xs-12 col-md-4 col-md-offset-4">
 			  <span class="input-group-addon" id="basic-addon1" style="width:140px">Password</span>
 			  <input name = "password" type="password" class="form-control" aria-describedby="basic-addon1">
 			</div>
-			<br>
-			<button type="submit" class="col-xs-4 col-xs-offset-4 btn btn-info">Sign in</button>
+			</div>
+			<div class="form-group">
+			<button type="submit" class="col-xs-12 col-md-4 col-md-offset-4 btn btn-info">Sign in</button>
+			</div>
 		</form>
-		<br><br><br>
-		<p class="col-xs-4 col-lg-offset-4">Don't have account? then
-		<a href="{{url('signup')}}">sign up</a>
-    <br/>
+		<br>
+		<div class="row">
+		<p class="col-xs-12 col-md-4 col-md-offset-4">Don't have account? then
+		<a href="{{route('signupGet')}}">sign up</a>
+		</div>
+    <br>
     <br>
     <br>
     @stop
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
@@ -2,11 +2,7 @@
 
     @section('content')
 
-<<<<<<< HEAD:resources/views/auth/register.blade.php
-		<form action="{{url('signup')}}" method="POST">
-=======
 		<form action="{{route('signupPost')}}" method="POST">
->>>>>>> f51df067d73761c5c532bd60fdfbde5838cfeb66:resources/views/auth/register.blade.php
 			{!! csrf_field() !!}
 			<table class="table" style="width:50%; margin:0 auto">
 				@if(count($errors)>0)

diff --git a/resources/views/embrace.blade.php b/resources/views/embrace.blade.php
@@ -5,34 +5,24 @@
 	<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" media="all" rel="stylesheet" />
 </head>
 <body>
-<<<<<<< HEAD
-	<center>
-		<a href="{{url('/')}}"><img src="{{url('images/TLAP.jpg')}}" width="350px"></a>
-=======
 	<div class="container">
 		<div class="row">
 		<div class="col-xs-offset-4">
 		<a href="{{url('/')}}"><img src="{{url('images/TLAP.jpg')}}" width="350px"></a>
 		</div>
 		</div>
->>>>>>> f51df067d73761c5c532bd60fdfbde5838cfeb66
 
     @yield('content')
 
   <br>
   <br>
   </div>
   <hr>
-<<<<<<< HEAD
-  <a href="https://www.facebook.com/ieeenajah"><img src="{{url('images/SBLogo.png')}}" width="150px" class="col-lg-offset-4"></a>
-  <a href="https://www.facebook.com/ieeenajah"><img src="{{url('images/cs.jpg')}}" width="150px" class="col-lg-offset-1"></a>
-=======
   <div class="container">
   <div class="row">
   <a href="https://www.facebook.com/ieeenajah"><img src="{{url('images/SBLogo.png')}}" width="150px" class="col-xs-offset- col-sm-offset-4"></a>
   <a href="https://www.facebook.com/ieeenajah"><img src="{{url('images/cs.jpg')}}" width="150px" class="col-xs-offset-1"></a>
   </div>
   </div>
->>>>>>> f51df067d73761c5c532bd60fdfbde5838cfeb66
 </body>
 </html>