dunno what

zalsader · Oct 1, 2015 · 6c8d99b · 6c8d99b
2 parents f18e549 + f51df06
commit 6c8d99b
Show file tree

Hide file tree

Showing 18 changed files with 55 additions and 25 deletions.
diff --git a/app/Http/routes.php b/app/Http/routes.php
@@ -12,12 +12,22 @@
 */
 
 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,12 +11,16 @@ 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,6 +10,7 @@ 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"),
@@ -40,6 +41,11 @@ public function run()
             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/favicon.ico b/public/favicon.ico
diff --git a/public/images/hints/.gitignore b/public/images/hints/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/public/images/questions/.gitignore b/public/images/questions/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/public/index.php b/public/index.php
diff --git a/public/robots.txt b/public/robots.txt
diff --git a/readme.md b/readme.md
@@ -1,27 +1,7 @@
-## Laravel PHP Framework
+# Think Like A Programmer Platform
 
-[![Build Status](https://travis-ci.org/laravel/framework.svg)](https://travis-ci.org/laravel/framework)
-[![Total Downloads](https://poser.pugx.org/laravel/framework/d/total.svg)](https://packagist.org/packages/laravel/framework)
-[![Latest Stable Version](https://poser.pugx.org/laravel/framework/v/stable.svg)](https://packagist.org/packages/laravel/framework)
-[![Latest Unstable Version](https://poser.pugx.org/laravel/framework/v/unstable.svg)](https://packagist.org/packages/laravel/framework)
-[![License](https://poser.pugx.org/laravel/framework/license.svg)](https://packagist.org/packages/laravel/framework)
+Think like a programmer is a pseudocode contest based on [Blockly](https://developers.google.com/blockly/), mainly [turtle](https://blockly-games.appspot.com/turtle).
 
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable, creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as authentication, routing, sessions, queueing, and caching.
+The platform is ready for use, but some more features will follow.
 
-Laravel is accessible, yet powerful, providing powerful tools needed for large, robust applications. A superb inversion of control container, expressive migration system, and tightly integrated unit testing support give you the tools you need to build any application with which you are tasked.
-
-## Official Documentation
-
-Documentation for the framework can be found on the [Laravel website](http://laravel.com/docs).
-
-## Contributing
-
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](http://laravel.com/docs/contributions).
-
-## Security Vulnerabilities
-
-If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell at taylor@laravel.com. All security vulnerabilities will be promptly addressed.
-
-### License
-
-The Laravel framework is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
+![ThinkLikeAProgrammer](http://tlap.zalsader.koding.io/images/TLAP.jpg)
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
@@ -27,7 +27,11 @@
             <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/register.blade.php b/resources/views/auth/register.blade.php
@@ -2,7 +2,11 @@
 
     @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,16 +5,34 @@
 	<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>
-  </center>
+  </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>
diff --git a/storage/app/.gitignore b/storage/app/.gitignore
diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore
diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore
diff --git a/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore
diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore
diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore