From bbc5e6f20c79c22947dfc2fbfe824e4dc0470186 Mon Sep 17 00:00:00 2001 From: busayo Date: Wed, 16 Mar 2016 21:31:36 +0100 Subject: [PATCH 01/25] fix(composer): Remove pre-update-cmd --- composer.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 012614c..37b82f2 100644 --- a/composer.json +++ b/composer.json @@ -60,10 +60,8 @@ "php artisan optimize", "php artisan migrate --force" ], - "pre-update-cmd": [ - "php artisan clear-compiled" - ], "post-update-cmd": [ + "php artisan clear-compiled", "php artisan optimize" ] }, From cf15e8d8351481acd0bb39e2022bf663ad2d19ee Mon Sep 17 00:00:00 2001 From: Evan Humphries Date: Thu, 24 Mar 2016 10:52:23 -0400 Subject: [PATCH 02/25] readme.md typos --- readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index 6eaafb5..5de37a9 100644 --- a/readme.md +++ b/readme.md @@ -309,7 +309,7 @@ Project Structure | **config**/app.php | Configuration for service providers and facades | | **config**/auth.php | Configuration for password resets | | **config**/broadcasting.php | Configuration for broadcasting | -| **config**/cache.php | Configuration for cache generation and storagr | +| **config**/cache.php | Configuration for cache generation and storage | | **config**/cloudder.php | Configuration for cloudinary | | **config**/compile.php | Configuration for compilation | | **config**/database.php | Configuration for database drivers | @@ -317,7 +317,7 @@ Project Structure | **config**/github.php | Configuration for github API | | **config**/mail.php | Configuration for mails | | **config**/queue.php | Configuration for queue | -| **config**/services.php | Configuration for several services like mailgun et.c | +| **config**/services.php | Configuration for several services like mailgun etc. | | **config**/session.php | Configuration for sessions | | **config**/ttwitter.php | Twitter API config file | | **config**/twilio.php | Twilio API config file | @@ -340,7 +340,7 @@ Project Structure | **controllers**/WebScrapingController.php| Controller for Web Scraping. | | **controllers**/YahooController.php | Controller for Yahoo API functionality | | **controllers**/user.js | Controller for user account management. | -| **models**/User.php | Moodel for User. | +| **models**/User.php | Model for User. | | **public**/ | Static assets (fonts, css, js, img). | | **public**/**css**/main.css | Main stylesheet for your app. | | **resources/views/account**/ | Templates for *login, password reset, signup, profile*. | From a51abfe6e1895677649ae43668f9d69d3b666029 Mon Sep 17 00:00:00 2001 From: Anthony Nandaa Date: Mon, 28 Mar 2016 14:28:49 +0300 Subject: [PATCH 03/25] update env.example Update `env.example` file to include `DB_CONNECTION` settings, since the default is `pgsql`. Closes #19 --- .env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.example b/.env.example index b01d47e..a49d9e6 100644 --- a/.env.example +++ b/.env.example @@ -6,6 +6,7 @@ DB_HOST=127.0.0.1 DB_DATABASE=hackathon DB_USERNAME=homestead DB_PASSWORD=secret +DB_CONNECTION= CACHE_DRIVER=file SESSION_DRIVER=file From d74e4d48940914518aacc8e53e39128db7b16066 Mon Sep 17 00:00:00 2001 From: Anthony Nandaa Date: Wed, 6 Apr 2016 21:31:48 +0300 Subject: [PATCH 04/25] fix: update .env.example to include DB_CONNECTION Includes DB_CONNECTION=mysql, so that the end user can change it if they want. Ref: issue #19 --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index a49d9e6..924f5af 100644 --- a/.env.example +++ b/.env.example @@ -2,11 +2,11 @@ APP_ENV=local APP_DEBUG=true APP_KEY=pJJBl4hGivo0tZZZEUmuooyM3EH23jPH +DB_CONNECTION=mysql DB_HOST=127.0.0.1 DB_DATABASE=hackathon DB_USERNAME=homestead DB_PASSWORD=secret -DB_CONNECTION= CACHE_DRIVER=file SESSION_DRIVER=file From 4efa7f0d585b047f9a28a8f9be98e626b5990acb Mon Sep 17 00:00:00 2001 From: Abu Baker Siddique Date: Sun, 5 Jun 2016 20:37:57 +0600 Subject: [PATCH 05/25] This fixes remove duplicate query running from account controller. When we go to the /account route, three query run for fetch the same user. Now single query run for fetch user. --- app/Http/Controllers/AccountController.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 72fb2e1..c7f77cb 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -7,10 +7,7 @@ use Auth; use Hash; use Cloudder; -use App\User; use App\Http\Requests; -use App\Http\Controllers\Controller; - class AccountController extends Controller { @@ -19,15 +16,13 @@ class AccountController extends Controller public function __construct() { - $this->id = Auth::user()->id; - $this->user = User::findOrFail($this->id); + $this->user = Auth::user(); + $this->id = $this->user->id; } public function getAccountPage() { - $details = User::whereId($this->id)->first(); - - return view('account.dashboard')->withAccount($details); + return view('account.dashboard')->withAccount($this->user); } /** From eb5461046d0e7118c5381c4756c0677111bcb61d Mon Sep 17 00:00:00 2001 From: Abu Baker Siddique Date: Mon, 6 Jun 2016 16:58:18 +0600 Subject: [PATCH 06/25] This fix contains some refactoring of controllers. Cleanup: remove unused variables from controllers --- app/Http/Controllers/ClockworkController.php | 35 ++++++++++++------- app/Http/Controllers/ContactController.php | 6 ++-- app/Http/Controllers/FacebookController.php | 11 ++---- app/Http/Controllers/FoursquareController.php | 3 -- app/Http/Controllers/GithubController.php | 27 +++++++++----- app/Http/Controllers/LastFmController.php | 15 ++++---- app/Http/Controllers/LinkedInController.php | 10 +++--- app/Http/Controllers/LobController.php | 7 ++-- app/Http/Controllers/NytController.php | 18 +++++++--- app/Http/Controllers/OauthController.php | 16 ++++----- app/Http/Controllers/PaypalController.php | 3 -- app/Http/Controllers/SlackController.php | 4 +-- app/Http/Controllers/SteamController.php | 3 -- app/Http/Controllers/StripeController.php | 3 -- app/Http/Controllers/TumblrController.php | 3 -- app/Http/Controllers/TwilioController.php | 3 +- app/Http/Controllers/TwitterController.php | 3 +- .../Controllers/WebScrapingController.php | 9 +++-- app/Http/Controllers/YahooController.php | 8 ++--- 19 files changed, 91 insertions(+), 96 deletions(-) diff --git a/app/Http/Controllers/ClockworkController.php b/app/Http/Controllers/ClockworkController.php index 3efeeda..a6b2830 100644 --- a/app/Http/Controllers/ClockworkController.php +++ b/app/Http/Controllers/ClockworkController.php @@ -3,30 +3,38 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; - use App\Http\Requests; -use App\Http\Controllers\Controller; use MJErwin\Clockwork\ClockworkClient; use MJErwin\Clockwork\Message; class ClockworkController extends Controller { - + /** + * @var mixed + */ protected $apiKey; + + /** + * @var ClockworkClient + */ protected $client; + const MSG_NUMBER = '07700900123'; + + /** + * Initialize ClockworkController + */ public function __construct() { $this->apiKey = env('CLOCKWORK_API_KEY'); $this->client = new ClockworkClient($this->apiKey); $this->message = new Message(); - $this->message->setNumber('07700900123'); - $this->message->setContent('Check out this message!'); - + $this->message->setNumber(self::MSG_NUMBER); + $this->message->setContent(trans('texts.message.sample_body')); } + /** * Return all data to the Clockwork API dashboard - * @return mixed */ public function getPage() { @@ -35,8 +43,10 @@ public function getPage() /** * Send a Text Message + * * @param Request $request - * @return string + * + * @return \Illuminate\Http\RedirectResponse */ public function sendTextMessage(Request $request) { @@ -44,11 +54,12 @@ public function sendTextMessage(Request $request) 'telephone' => 'required' ]); - $number = $request->input('number'); - $message = 'Testing Clockwork SMS #LaravelHackathonStarter'; - $response = $this->client->sendMessage($this->message); - return redirect()->back()->with('info','Your Message has been sent successfully'); + if ($response->getMessageId()) { + return redirect()->back()->with('info', trans('texts.message.sent_success')); + } + + return redirect()->back()->with('errors', trans('texts.message.sent_failed')); } } diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php index 35c6516..352df31 100644 --- a/app/Http/Controllers/ContactController.php +++ b/app/Http/Controllers/ContactController.php @@ -3,11 +3,9 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; - use Auth; use Mail; use App\Http\Requests; -use App\Http\Controllers\Controller; class ContactController extends Controller { @@ -32,10 +30,10 @@ public function sendMessage(Request $request) Mail::send('emails.contact', ['body' => $body], function ($message) use ($name,$emailToSendTo) { $message->from('unicodeveloper@hackathon-starter.com', "From: {$name}"); - $message->to($emailToSendTo)->subject("Message From Laravel Hackathon Starter Contact Form"); + $message->to($emailToSendTo)->subject(trans('texts.contact.subject')); }); - return redirect()->route('contact')->with('info','Your Message has been dispatched successfully'); + return redirect()->route('contact')->with('info', trans('texts.contact.sent_success')); } } diff --git a/app/Http/Controllers/FacebookController.php b/app/Http/Controllers/FacebookController.php index dfc6c80..a3b6a04 100644 --- a/app/Http/Controllers/FacebookController.php +++ b/app/Http/Controllers/FacebookController.php @@ -2,15 +2,10 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; - use App\Http\Requests; -use App\Http\Controllers\Controller; use Facebook; -use App\User; use Auth; use Session; -use Illuminate\Support\Collection; class FacebookController extends Controller { @@ -22,7 +17,7 @@ class FacebookController extends Controller */ public function getPage() { - if( Session::get('provider') !== 'facebook') { + if(Session::get('provider') !== 'facebook') { Auth::logout(); Session::flush(); @@ -35,9 +30,9 @@ public function getPage() return view('api.facebook')->withDetails($userDetails); } + /** - * [getData description] - * @return [type] [description] + * @return mixed */ private function getData() { diff --git a/app/Http/Controllers/FoursquareController.php b/app/Http/Controllers/FoursquareController.php index c561dc8..096997e 100644 --- a/app/Http/Controllers/FoursquareController.php +++ b/app/Http/Controllers/FoursquareController.php @@ -2,11 +2,8 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; - use FoursquareApi; use App\Http\Requests; -use App\Http\Controllers\Controller; class FoursquareController extends Controller { diff --git a/app/Http/Controllers/GithubController.php b/app/Http/Controllers/GithubController.php index 7739440..7b59f73 100644 --- a/app/Http/Controllers/GithubController.php +++ b/app/Http/Controllers/GithubController.php @@ -2,31 +2,40 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; - use App\Http\Requests; -use App\Http\Controllers\Controller; -use GrahamCampbell\GitHub\Facades\GitHub; use GrahamCampbell\GitHub\GitHubManager; class GithubController extends Controller { + /** + * @var GitHubManager + */ protected $github; - protected $repoName; - protected $githubHandle; + const REPO_NAME = 'laravel-emoji'; + const GITHUB_HANDLE = 'unicodeveloper'; + + /** + * Initialize the Controller with necessary arguments + * + * @param GitHubManager $github + */ public function __construct(GitHubManager $github) { $this->github = $github; - $this->repoName = 'laravel-emoji'; - $this->githubHandle = 'unicodeveloper'; } + /** + * @return mixed + */ private function getRepoDetails() { - return $this->github->connection('alternative')->repos()->show($this->githubHandle, $this->repoName); + return $this->github->connection('alternative')->repos()->show(self::GITHUB_HANDLE, self::REPO_NAME); } + /** + * @return mixed + */ public function getPage() { $details = $this->getRepoDetails(); diff --git a/app/Http/Controllers/LastFmController.php b/app/Http/Controllers/LastFmController.php index 25bf9ee..9edb37c 100644 --- a/app/Http/Controllers/LastFmController.php +++ b/app/Http/Controllers/LastFmController.php @@ -2,15 +2,16 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; - -use Buzz\Browser; use App\Http\Requests; -use App\Http\Controllers\Controller; use Dandelionmood\LastFm\LastFm; class LastFmController extends Controller { + /** + * @var array + */ + protected $sampleArtist = ['artist' => 'The Pierces']; + /** * LastFm Object * @var object; @@ -48,7 +49,7 @@ public function getPage() */ private function getArtistInfo() { - $result = (array)$this->lastfm->artist_getInfo(['artist' => 'The Pierces']); + $result = (array)$this->lastfm->artist_getInfo($this->sampleArtist); return $result['artist']; } @@ -59,7 +60,7 @@ private function getArtistInfo() */ private function getTopAlbums() { - $result = (array)$this->lastfm->artist_getTopAlbums(['artist' => 'The Pierces']); + $result = (array)$this->lastfm->artist_getTopAlbums($this->sampleArtist); return $result['topalbums']->album; } @@ -70,7 +71,7 @@ private function getTopAlbums() */ private function getTopTracks() { - $result = (array)$this->lastfm->artist_getTopTracks(['artist' => 'The Pierces']); + $result = (array)$this->lastfm->artist_getTopTracks($this->sampleArtist); return $result['toptracks']->track; } diff --git a/app/Http/Controllers/LinkedInController.php b/app/Http/Controllers/LinkedInController.php index 33ff296..2928b96 100644 --- a/app/Http/Controllers/LinkedInController.php +++ b/app/Http/Controllers/LinkedInController.php @@ -2,18 +2,16 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; - use Auth; use Session; use App\Http\Requests; -use App\Http\Controllers\Controller; -use LinkedIn\LinkedIn; use GuzzleHttp\Client; class LinkedInController extends Controller { - /** + const LINKEDIN_API = 'https://api.linkedin.com/v1'; + + /** * LinkedIn API base Url * @var string */ @@ -36,7 +34,7 @@ class LinkedInController extends Controller */ public function __construct() { - $this->baseUrl = 'https://api.linkedin.com/v1'; + $this->baseUrl = self::LINKEDIN_API; $this->client = new Client(['base_uri' => $this->baseUrl]); } diff --git a/app/Http/Controllers/LobController.php b/app/Http/Controllers/LobController.php index 7a29e44..1d9a4cd 100644 --- a/app/Http/Controllers/LobController.php +++ b/app/Http/Controllers/LobController.php @@ -2,14 +2,13 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; use Lob\Lob; use App\Http\Requests; -use App\Http\Controllers\Controller; class LobController extends Controller { + const ZIPCODE = '10007'; /** * LOB API KEY * @var string @@ -33,7 +32,7 @@ public function __construct() /** * Get all delivery routes for this zip code - * @param string $zipcdode + * @param string $zipcode * @return array */ private function getRoutes($zipcode) @@ -49,7 +48,7 @@ private function getRoutes($zipcode) */ public function getPage() { - $routes = $this->getRoutes('10007'); + $routes = $this->getRoutes(self::ZIPCODE); return view('api.lob')->withRoutes($routes); } diff --git a/app/Http/Controllers/NytController.php b/app/Http/Controllers/NytController.php index 8f3e753..96a6388 100644 --- a/app/Http/Controllers/NytController.php +++ b/app/Http/Controllers/NytController.php @@ -4,11 +4,11 @@ use GuzzleHttp\Client; use App\Http\Requests; -use Illuminate\Http\Request; -use App\Http\Controllers\Controller; class NytController extends Controller { + const API_URL = 'http://api.nytimes.com/svc'; + const RELATIVE_URL = '/books/v3/lists/overview.json?api-key={apiKey}'; /** * Instance of Guzzle Client @@ -27,11 +27,19 @@ class NytController extends Controller */ public function __construct() { - $this->baseUrl = 'http://api.nytimes.com/svc'; + $this->baseUrl = self::API_URL; $this->client = new Client(['base_uri' => $this->baseUrl]); + $this->setGetResponse($this->getRelativeUrl()); + } - $relativeUrl = '/books/v3/lists/overview.json?api-key=' . env('NYT_BOOKS_API_KEY'); - $this->setGetResponse($relativeUrl); + /** + * Get relative url + * + * @return string + */ + public function getRelativeUrl() + { + return str_replace('{apiKey}', env('NYT_BOOKS_API_KEY'), self::RELATIVE_URL); } /** diff --git a/app/Http/Controllers/OauthController.php b/app/Http/Controllers/OauthController.php index c11ae71..a0612c7 100644 --- a/app/Http/Controllers/OauthController.php +++ b/app/Http/Controllers/OauthController.php @@ -3,15 +3,12 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; - use App\User; use App\Http\Requests; use Illuminate\Contracts\Auth\Guard; -use App\Http\Controllers\Controller; use Laravel\Socialite\Contracts\Factory as Socialite; use Session; - class OauthController extends Controller { protected $socialite; @@ -42,8 +39,11 @@ public function execute($request, $provider) /** * Find a user by username or create a new user - * @param - * @return + * + * @param $userData + * @param $provider + * + * @return \App\User */ public function findByProviderIdOrCreate($userData, $provider) { @@ -92,8 +92,8 @@ private function isEmailExists($email = null) /** * Check if the user's info needs updating - * @param - * @return + * @param $userData + * @param $user */ public function checkIfUserNeedsUpdating($userData, $user) { @@ -136,6 +136,4 @@ private function getSocialUser($provider) { return $this->socialite->driver($provider)->user(); } - } - diff --git a/app/Http/Controllers/PaypalController.php b/app/Http/Controllers/PaypalController.php index 3f11fbe..ca6d59a 100644 --- a/app/Http/Controllers/PaypalController.php +++ b/app/Http/Controllers/PaypalController.php @@ -2,10 +2,7 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; - use App\Http\Requests; -use App\Http\Controllers\Controller; class PaypalController extends Controller { diff --git a/app/Http/Controllers/SlackController.php b/app/Http/Controllers/SlackController.php index 1d26b6e..10afd79 100644 --- a/app/Http/Controllers/SlackController.php +++ b/app/Http/Controllers/SlackController.php @@ -3,11 +3,9 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; - use SlackUser; use SlackChat; use App\Http\Requests; -use App\Http\Controllers\Controller; class SlackController extends Controller { @@ -52,6 +50,6 @@ public function sendMessageToTeam(Request $request) SlackChat::message('#general', $message); - return redirect()->back()->with('info','Your Message has been sent successfully'); + return redirect()->back()->with('info', trans('texts.message.sent_success')); } } diff --git a/app/Http/Controllers/SteamController.php b/app/Http/Controllers/SteamController.php index a978951..3555e38 100644 --- a/app/Http/Controllers/SteamController.php +++ b/app/Http/Controllers/SteamController.php @@ -2,10 +2,7 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; - use App\Http\Requests; -use App\Http\Controllers\Controller; class SteamController extends Controller { diff --git a/app/Http/Controllers/StripeController.php b/app/Http/Controllers/StripeController.php index aeffbad..d2575ec 100644 --- a/app/Http/Controllers/StripeController.php +++ b/app/Http/Controllers/StripeController.php @@ -2,10 +2,7 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; - use App\Http\Requests; -use App\Http\Controllers\Controller; class StripeController extends Controller { diff --git a/app/Http/Controllers/TumblrController.php b/app/Http/Controllers/TumblrController.php index 25b0018..33a1114 100644 --- a/app/Http/Controllers/TumblrController.php +++ b/app/Http/Controllers/TumblrController.php @@ -2,11 +2,8 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; - use Tumblr; use App\Http\Requests; -use App\Http\Controllers\Controller; class TumblrController extends Controller { diff --git a/app/Http/Controllers/TwilioController.php b/app/Http/Controllers/TwilioController.php index 8f1ded5..45a300f 100644 --- a/app/Http/Controllers/TwilioController.php +++ b/app/Http/Controllers/TwilioController.php @@ -6,7 +6,6 @@ use Twilio; use App\Http\Requests; -use App\Http\Controllers\Controller; class TwilioController extends Controller { @@ -36,6 +35,6 @@ public function sendTextMessage(Request $request) Twilio::message($number, $message); - return redirect()->back()->with('info','Your Message has been sent successfully'); + return redirect()->back()->with('info', trans('texts.message.sent_success')); } } diff --git a/app/Http/Controllers/TwitterController.php b/app/Http/Controllers/TwitterController.php index c0844da..3fa2d86 100644 --- a/app/Http/Controllers/TwitterController.php +++ b/app/Http/Controllers/TwitterController.php @@ -7,7 +7,6 @@ use Session; use App\Http\Requests; use Illuminate\Http\Request; -use App\Http\Controllers\Controller; class TwitterController extends Controller { @@ -80,6 +79,6 @@ public function sendTweet(Request $request) Twitter::postTweet(['status' => $tweet, 'format' => 'json']); - return redirect()->back()->with('info','Your Tweet has been posted successfully'); + return redirect()->back()->with('info', trans('texts.twitter.success')); } } diff --git a/app/Http/Controllers/WebScrapingController.php b/app/Http/Controllers/WebScrapingController.php index 4900cd5..7f298ca 100644 --- a/app/Http/Controllers/WebScrapingController.php +++ b/app/Http/Controllers/WebScrapingController.php @@ -2,18 +2,17 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; - use App\Http\Requests; use Goutte\Client; -use App\Http\Controllers\Controller; class WebScrapingController extends Controller { protected $crawler; + const NEWS_URL = 'https://news.ycombinator.com/'; + /** - * [__construct description] + * Initialize controller */ public function __construct() { @@ -26,7 +25,7 @@ public function __construct() */ public function getPage() { - $links = $this->getData('https://news.ycombinator.com/'); + $links = $this->getData(self::NEWS_URL); return view('api.scraping')->withLinks($links); } diff --git a/app/Http/Controllers/YahooController.php b/app/Http/Controllers/YahooController.php index ce485f9..5366658 100644 --- a/app/Http/Controllers/YahooController.php +++ b/app/Http/Controllers/YahooController.php @@ -2,15 +2,13 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; - use GuzzleHttp\Client; use App\Http\Requests; -use App\Http\Controllers\Controller; class YahooController extends Controller { - /** + const YAHOO_API = 'https://query.yahooapis.com/v1/public/yql'; + /** * Instance of Guzzle Client * @var object */ @@ -27,7 +25,7 @@ class YahooController extends Controller */ public function __construct() { - $this->baseUrl = 'https://query.yahooapis.com/v1/public/yql'; + $this->baseUrl = self::YAHOO_API; $this->client = new Client(['base_uri' => $this->baseUrl]); $query = "SELECT * FROM weather.forecast WHERE (location = 10007)"; From 4dba23881831f37f7fedd6db8f7b403113f1fb97 Mon Sep 17 00:00:00 2001 From: Abu Baker Siddique Date: Mon, 6 Jun 2016 17:31:15 +0600 Subject: [PATCH 07/25] Language file added for common text. --- resources/lang/en/texts.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 resources/lang/en/texts.php diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php new file mode 100644 index 0000000..9ea98b3 --- /dev/null +++ b/resources/lang/en/texts.php @@ -0,0 +1,16 @@ + [ + 'sample_body' => 'Check out this message!', + 'sent_success' => 'Your Message has been sent successfully', + 'sent_failed' => 'Your Message could not be sent', + ], + 'contact' => [ + 'subject' => 'Message From Laravel Hackathon Starter Contact Form', + 'sent_success' => 'Your Message has been dispatched successfully', + ], + 'twitter' => [ + 'success' => 'Your Tweet has been posted successfully', + ] +]; \ No newline at end of file From b964792d5c63b46ecac5accb226420c8ec2852b4 Mon Sep 17 00:00:00 2001 From: Abati Adewale Date: Tue, 7 Jun 2016 13:30:51 +0100 Subject: [PATCH 08/25] route for relative urls --- app/Http/Controllers/PageController.php | 27 +++++++++++++++++++ app/Http/routes.php | 12 ++++----- .../views/layouts/partials/navbar.blade.php | 12 ++++----- 3 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 app/Http/Controllers/PageController.php diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php new file mode 100644 index 0000000..9a5f646 --- /dev/null +++ b/app/Http/Controllers/PageController.php @@ -0,0 +1,27 @@ + ['web']], function () { - Route::get('/', function () { - return view('welcome'); - }); + Route::get('/', [ + 'as' => 'home', 'uses' => 'PageController@home' + ]); - Route::get('/api', function () { - return view('apidashboard'); - }); + Route::get('/api', [ + 'as' => 'api', 'uses' => 'PageController@api' + ]); Route::group(['prefix' => 'api'], function() { Route::get('github', [ diff --git a/resources/views/layouts/partials/navbar.blade.php b/resources/views/layouts/partials/navbar.blade.php index 43d8bc4..3f0b4f3 100644 --- a/resources/views/layouts/partials/navbar.blade.php +++ b/resources/views/layouts/partials/navbar.blade.php @@ -6,20 +6,20 @@ - + Project name