diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index b9fb485..9665353 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -59,10 +59,14 @@ protected function validator(array $data) */ protected function create(array $data) { - return User::create([ + $user = User::create([ 'name' => $data['name'], 'email' => $data['email'], 'password' => bcrypt($data['password']), ]); + + flash()->success('Welcome to soma-tech!', 'Thank you for being a member.'); + + return $user; } } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 787d7b0..955d527 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -41,4 +41,14 @@ public function dashboard() { return view('dashboard.index'); } + + /** + * Return the about view. + * + * @return view + */ + public function about() + { + return view('about.about'); + } } diff --git a/app/Http/Controllers/VideoController.php b/app/Http/Controllers/VideoController.php index cb607e0..d8634ed 100644 --- a/app/Http/Controllers/VideoController.php +++ b/app/Http/Controllers/VideoController.php @@ -20,10 +20,10 @@ public function __construct() 'except' => [ 'index', 'show', + 'getVideosByCategory', ], ]); $this->getCategories = Categories::all(); - $this->user = auth()->user(); } /** @@ -64,7 +64,7 @@ public function store(VideoRequest $request) $link = $this->youtubeEmbedLink($request->youtube_link); $category->videos()->create([ - 'user_id' => $this->user->id, + 'user_id' => auth()->user()->id, 'youtube_link' => $link, 'title' => $request->title, 'description' => $request->description, diff --git a/app/Http/routes.php b/app/Http/routes.php index e661ce6..d9521a1 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -16,6 +16,12 @@ 'as' => 'homepage', ]); +// about page route +Route::get('about', [ + 'uses' => 'HomeController@about', + 'as' => 'aboutpage', +]); + // Authentication routes... Route::get('auth/login', [ 'uses' => 'HomeController@login', diff --git a/build/logs/clover.xml b/build/logs/clover.xml index f42f2e9..81c4370 100644 --- a/build/logs/clover.xml +++ b/build/logs/clover.xml @@ -1,6 +1,6 @@ - - + + @@ -85,7 +85,7 @@ - + @@ -96,7 +96,9 @@ - + + + @@ -208,17 +210,17 @@ - - - - - - - + + + + + + + - - + + @@ -275,62 +277,66 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -363,51 +369,51 @@ - - - - + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - + diff --git a/composer.json b/composer.json index 7698099..16d4879 100644 --- a/composer.json +++ b/composer.json @@ -8,14 +8,14 @@ "php": ">=5.5.9", "laravel/framework": "5.1.*", "laravel/socialite": "^2.0", - "laravelcollective/html": "5.1.*" + "laravelcollective/html": "5.1.*", + "satooshi/php-coveralls": "^1.0" }, "require-dev": { "fzaninotto/faker": "~1.4", "mockery/mockery": "0.9.*", "phpunit/phpunit": "~4.0", - "phpspec/phpspec": "~2.1", - "satooshi/php-coveralls": "^0.7.0" + "phpspec/phpspec": "~2.1" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 01f8b52..b02258b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "b5377a18e58c516ba2a2d78f00c165cb", - "content-hash": "e3f36b05d0f76004c681b6a3b934ce94", + "hash": "c2a069de1dec78d9c52c490168830c7d", + "content-hash": "f40f9b0a9a030a4f80a6e6aa8b16d9a0", "packages": [ { "name": "classpreloader/classpreloader", @@ -1433,6 +1433,69 @@ ], "time": "2015-11-12 16:18:56" }, + { + "name": "satooshi/php-coveralls", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/satooshi/php-coveralls.git", + "reference": "3edbdbdb4f4cfab5cb9ce83655ff81432f2221a6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/3edbdbdb4f4cfab5cb9ce83655ff81432f2221a6", + "reference": "3edbdbdb4f4cfab5cb9ce83655ff81432f2221a6", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-simplexml": "*", + "guzzle/guzzle": "^2.8|^3.0", + "php": ">=5.3.3", + "psr/log": "^1.0", + "symfony/config": "^2.4|^3.0", + "symfony/console": "^2.1|^3.0", + "symfony/stopwatch": "^2.2|^3.0", + "symfony/yaml": "^2.1|^3.0" + }, + "suggest": { + "symfony/http-kernel": "Allows Symfony integration" + }, + "bin": [ + "bin/coveralls" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.8-dev" + } + }, + "autoload": { + "psr-4": { + "Satooshi\\": "src/Satooshi/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kitamura Satoshi", + "email": "with.no.parachute@gmail.com", + "homepage": "https://www.facebook.com/satooshi.jp" + } + ], + "description": "PHP client library for Coveralls API", + "homepage": "https://github.com/satooshi/php-coveralls", + "keywords": [ + "ci", + "coverage", + "github", + "test" + ], + "time": "2015-12-28 09:07:32" + }, { "name": "swiftmailer/swiftmailer", "version": "v5.4.1", @@ -1486,6 +1549,56 @@ ], "time": "2015-06-06 14:19:39" }, + { + "name": "symfony/config", + "version": "v3.0.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/config.git", + "reference": "58680a6516a457a6c65044fe33586c4a81fdff01" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/config/zipball/58680a6516a457a6c65044fe33586c4a81fdff01", + "reference": "58680a6516a457a6c65044fe33586c4a81fdff01", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/filesystem": "~2.8|~3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Config\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Config Component", + "homepage": "https://symfony.com", + "time": "2015-12-26 13:39:53" + }, { "name": "symfony/console", "version": "v2.7.8", @@ -1770,6 +1883,55 @@ "homepage": "https://symfony.com", "time": "2015-10-30 20:15:42" }, + { + "name": "symfony/filesystem", + "version": "v3.0.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "c2e59d11dccd135dc8f00ee97f34fe1de842e70c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/c2e59d11dccd135dc8f00ee97f34fe1de842e70c", + "reference": "c2e59d11dccd135dc8f00ee97f34fe1de842e70c", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Filesystem Component", + "homepage": "https://symfony.com", + "time": "2015-12-22 10:39:06" + }, { "name": "symfony/finder", "version": "v2.7.8", @@ -2186,6 +2348,55 @@ ], "time": "2015-12-23 06:54:35" }, + { + "name": "symfony/stopwatch", + "version": "v3.0.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "6aeac8907e3e1340a0033b0a9ec075f8e6524800" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6aeac8907e3e1340a0033b0a9ec075f8e6524800", + "reference": "6aeac8907e3e1340a0033b0a9ec075f8e6524800", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Stopwatch Component", + "homepage": "https://symfony.com", + "time": "2015-10-30 23:35:59" + }, { "name": "symfony/translation", "version": "v2.7.8", @@ -2308,6 +2519,55 @@ ], "time": "2015-12-05 10:02:55" }, + { + "name": "symfony/yaml", + "version": "v3.0.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3df409958a646dad2bc5046c3fb671ee24a1a691", + "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2015-12-26 13:39:53" + }, { "name": "vlucas/phpdotenv", "version": "v1.1.1", @@ -3161,69 +3421,6 @@ ], "time": "2015-10-02 06:51:40" }, - { - "name": "satooshi/php-coveralls", - "version": "v0.7.1", - "source": { - "type": "git", - "url": "https://github.com/satooshi/php-coveralls.git", - "reference": "01793ce60f1e259592ac3cb7c3fc183209800127" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/01793ce60f1e259592ac3cb7c3fc183209800127", - "reference": "01793ce60f1e259592ac3cb7c3fc183209800127", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-simplexml": "*", - "guzzle/guzzle": "^2.8|^3.0", - "php": ">=5.3.3", - "psr/log": "^1.0", - "symfony/config": "^2.4|^3.0", - "symfony/console": "^2.1|^3.0", - "symfony/stopwatch": "^2.2|^3.0", - "symfony/yaml": "^2.1|^3.0" - }, - "suggest": { - "symfony/http-kernel": "Allows Symfony integration" - }, - "bin": [ - "bin/coveralls" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.8-dev" - } - }, - "autoload": { - "psr-4": { - "Satooshi\\": "src/Satooshi/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kitamura Satoshi", - "email": "with.no.parachute@gmail.com", - "homepage": "https://www.facebook.com/satooshi.jp" - } - ], - "description": "PHP client library for Coveralls API", - "homepage": "https://github.com/satooshi/php-coveralls", - "keywords": [ - "ci", - "coverage", - "github", - "test" - ], - "time": "2015-12-17 18:04:18" - }, { "name": "sebastian/comparator", "version": "1.2.0", @@ -3594,203 +3791,6 @@ "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", "time": "2015-06-21 13:59:46" - }, - { - "name": "symfony/config", - "version": "v3.0.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/config.git", - "reference": "58680a6516a457a6c65044fe33586c4a81fdff01" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/58680a6516a457a6c65044fe33586c4a81fdff01", - "reference": "58680a6516a457a6c65044fe33586c4a81fdff01", - "shasum": "" - }, - "require": { - "php": ">=5.5.9", - "symfony/filesystem": "~2.8|~3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Config\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Config Component", - "homepage": "https://symfony.com", - "time": "2015-12-26 13:39:53" - }, - { - "name": "symfony/filesystem", - "version": "v3.0.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/filesystem.git", - "reference": "c2e59d11dccd135dc8f00ee97f34fe1de842e70c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/c2e59d11dccd135dc8f00ee97f34fe1de842e70c", - "reference": "c2e59d11dccd135dc8f00ee97f34fe1de842e70c", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Filesystem\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Filesystem Component", - "homepage": "https://symfony.com", - "time": "2015-12-22 10:39:06" - }, - { - "name": "symfony/stopwatch", - "version": "v3.0.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "6aeac8907e3e1340a0033b0a9ec075f8e6524800" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6aeac8907e3e1340a0033b0a9ec075f8e6524800", - "reference": "6aeac8907e3e1340a0033b0a9ec075f8e6524800", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Stopwatch Component", - "homepage": "https://symfony.com", - "time": "2015-10-30 23:35:59" - }, - { - "name": "symfony/yaml", - "version": "v3.0.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/3df409958a646dad2bc5046c3fb671ee24a1a691", - "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com", - "time": "2015-12-26 13:39:53" } ], "aliases": [], diff --git a/public/css/style.css b/public/css/style.css index bfdb0dc..a14de1f 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -41,7 +41,7 @@ } .navbar-color { - background: #9ad3de; + background: #7cb342; } body,html{ @@ -50,6 +50,8 @@ body,html{ body { overflow-x:hidden; + background: url('../image/white_wall_hash.png') no-repeat left center; + background-size: cover; } .sticky-footer { min-height:100%; @@ -59,7 +61,7 @@ body { footer{ height:70px; margin-top:-70px; - background: #9ad3de; + background: #7cb342; width: 100%; } @@ -80,3 +82,16 @@ footer{ width:228px; } } + +.brand-image{ + height: 25px; + width: 35px; +} + +#username { + margin-left: 5px; +} + +#droplist { + width: auto; +} diff --git a/public/css/video.css b/public/css/video.css index 479624f..30cd4f6 100644 --- a/public/css/video.css +++ b/public/css/video.css @@ -40,7 +40,7 @@ background-color:rgba(0,0,0,0.7); } .list-scrollable { - height: 500px; + height: 400px; overflow: auto; } diff --git a/public/image/about2.jpeg b/public/image/about2.jpeg new file mode 100644 index 0000000..6dc8b59 Binary files /dev/null and b/public/image/about2.jpeg differ diff --git a/public/image/logo.jpg b/public/image/logo.jpg new file mode 100644 index 0000000..ce802a7 Binary files /dev/null and b/public/image/logo.jpg differ diff --git a/public/image/white_wall_hash.png b/public/image/white_wall_hash.png new file mode 100644 index 0000000..47ab3a4 Binary files /dev/null and b/public/image/white_wall_hash.png differ diff --git a/resources/views/about/about.blade.php b/resources/views/about/about.blade.php new file mode 100644 index 0000000..0f67548 --- /dev/null +++ b/resources/views/about/about.blade.php @@ -0,0 +1,81 @@ + + + + + + + + + +@extends('layouts.master') + +@section('title', 'About') + +@section('styles') + +@endsection + +@section('content') +
+ +
+ +
+
+

+ +

+

Upload

+

+ You didn't find a video you were looking for? + Upload your own from the dashboard so as to share with others. +

+
+
+

+ +

+

Edit

+

+ Have you made a mistake on the video details? + Do not fret. You can edit the title or description of the video you uploaded. +

+
+
+

+ +

+

Delete

+

+ Have you found a video that explains a technology better? + Delete the existing video from your collection and upload the new one. +

+
+
+ +@endsection + +@section('scripts') + +@endsection diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 8a2d41c..2a41419 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -3,8 +3,8 @@ @section('title', 'Login') @section('content') -
-
+
+
{!! csrf_field() !!} @include('partials.error') @@ -22,9 +22,9 @@
-
+
-
+
Alternatively...
-
+
@endsection @section('styles') diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 83fc470..e5b150c 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -4,7 +4,7 @@ @section('content')
-
+
{!! csrf_field() !!} @include('partials.error') @@ -32,7 +32,7 @@
-
+
Alternatively...