From e7db79a9a97642d67677cd3604655edc401203bf Mon Sep 17 00:00:00 2001 From: Billy Brawner Date: Tue, 1 Sep 2015 21:49:08 -0700 Subject: [PATCH] Starting to get databases set up. --- .../Controllers/.GeneratorController.php.swp | Bin 12288 -> 0 bytes app/Http/Controllers/GeneratorController.php | 82 +++++++- app/Http/Controllers/GeneratorController.php~ | 87 ++++++++ app/Http/Controllers/PagesController.php | 97 +++++++++ .../Controllers/old-GeneratorController.php | 30 +++ app/Http/routes.php | 13 +- app/Http/routes.php~ | 7 +- config/app.php~ | 197 ++++++++++++++++++ config/database.php | 8 +- ...15_09_02_033955_create_exercises_table.php | 30 +++ public/assets/css/styles.css | 38 +++- public/assets/css/styles.css~ | 40 +++- resources/views/generate.blade.php | 2 +- resources/views/generate.blade.php~ | 4 +- resources/views/layouts/master.blade.php | 6 +- resources/views/layouts/master.blade.php~ | 1 + 16 files changed, 612 insertions(+), 30 deletions(-) delete mode 100644 app/Http/Controllers/.GeneratorController.php.swp create mode 100644 app/Http/Controllers/GeneratorController.php~ create mode 100644 app/Http/Controllers/PagesController.php create mode 100644 app/Http/Controllers/old-GeneratorController.php create mode 100644 config/app.php~ create mode 100644 database/migrations/2015_09_02_033955_create_exercises_table.php diff --git a/app/Http/Controllers/.GeneratorController.php.swp b/app/Http/Controllers/.GeneratorController.php.swp deleted file mode 100644 index 3ad43e2688e5139ea045aab37cdac5732f7df2f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&O)mpM7zgkNCkHR7FEF_1q21C535j^;AaSXSUZ!hQ)9KFGnGGUHaP<{@0Vlo; zXP*Km&u&Pi(QqaIN&Y*Xou`xC-)*u}EA4Dr!yKv#jp?-ynVD&?ukQd%=UHY!GPm9FKOfB*y_009U< z00Izz00jP@fVVw#!LP;J{jB9a`ks#dV~7p{5P$##AOHafKmY;|fB*y_0D(U!AoqxF z2YLTL#1GHk|3CNtZ#;hGyl|d4kDLe2J?ENp$*FOwoL$Z|C*Tx0{hU5dw&ou+!6QQe z0uX=z1Rwwb2tWV=5P-nH6cF6bD81UGrW>KyPomH_OeE^cuf^&xQBim@kr$_wRduah zJ+>-taIyMD@w$;ZD?6o7OXtKl$J~WF_A1(QqJ8q6C~-input('goal'); + return $goal; + } + + public function getExperience() { + } + + public function getFrequency() { + } + + public function generateWorkout () { + $goal = Goal(); + echo $goal; + } +} diff --git a/app/Http/routes.php b/app/Http/routes.php index 18ec871..88c0c92 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -11,14 +11,9 @@ | */ -Route::get('/', function () { - return view('home'); -}); +Route::get('/', 'PagesController@index'); -Route::get('/about', function () { - return view('about'); -}); +Route::get('/about', 'PagesController@about'); + +Route::get('/generate', 'PagesController@generate'); -Route::get('/generate', function () { - return view('generate'); -}); diff --git a/app/Http/routes.php~ b/app/Http/routes.php~ index 76727c3..58443d2 100644 --- a/app/Http/routes.php~ +++ b/app/Http/routes.php~ @@ -15,10 +15,9 @@ Route::get('/', function () { return view('home'); }); -Route::get('/about' function () { +Route::get('/about', function () { return view('about'); }); -Route::get('/generate' function () { - return view('generate'); -}); +Route::get('/generate', 'GeneratorController@index'); + diff --git a/config/app.php~ b/config/app.php~ new file mode 100644 index 0000000..7a4db72 --- /dev/null +++ b/config/app.php~ @@ -0,0 +1,197 @@ + env('APP_DEBUG', true), + + /* + |-------------------------------------------------------------------------- + | Application URL + |-------------------------------------------------------------------------- + | + | This URL is used by the console to properly generate URLs when using + | the Artisan command line tool. You should set this to the root of + | your application so that it is used when running Artisan tasks. + | + */ + + 'url' => 'http://localhost', + + /* + |-------------------------------------------------------------------------- + | Application Timezone + |-------------------------------------------------------------------------- + | + | Here you may specify the default timezone for your application, which + | will be used by the PHP date and date-time functions. We have gone + | ahead and set this to a sensible default for you out of the box. + | + */ + + 'timezone' => 'UTC', + + /* + |-------------------------------------------------------------------------- + | Application Locale Configuration + |-------------------------------------------------------------------------- + | + | The application locale determines the default locale that will be used + | by the translation service provider. You are free to set this value + | to any of the locales which will be supported by the application. + | + */ + + 'locale' => 'en', + + /* + |-------------------------------------------------------------------------- + | Application Fallback Locale + |-------------------------------------------------------------------------- + | + | The fallback locale determines the locale to use when the current one + | is not available. You may change the value to correspond to any of + | the language folders that are provided through your application. + | + */ + + 'fallback_locale' => 'en', + + /* + |-------------------------------------------------------------------------- + | Encryption Key + |-------------------------------------------------------------------------- + | + | This key is used by the Illuminate encrypter service and should be set + | to a random, 32 character string, otherwise these encrypted strings + | will not be safe. Please do this before deploying an application! + | + */ + + 'key' => env('APP_KEY', 'SomeRandomString'), + + 'cipher' => 'AES-256-CBC', + + /* + |-------------------------------------------------------------------------- + | Logging Configuration + |-------------------------------------------------------------------------- + | + | Here you may configure the log settings for your application. Out of + | the box, Laravel uses the Monolog PHP logging library. This gives + | you a variety of powerful log handlers / formatters to utilize. + | + | Available Settings: "single", "daily", "syslog", "errorlog" + | + */ + + 'log' => 'single', + + /* + |-------------------------------------------------------------------------- + | Autoloaded Service Providers + |-------------------------------------------------------------------------- + | + | The service providers listed here will be automatically loaded on the + | request to your application. Feel free to add your own services to + | this array to grant expanded functionality to your applications. + | + */ + + 'providers' => [ + + /* + * Laravel Framework Service Providers... + */ + Illuminate\Foundation\Providers\ArtisanServiceProvider::class, + Illuminate\Auth\AuthServiceProvider::class, + Illuminate\Broadcasting\BroadcastServiceProvider::class, + Illuminate\Bus\BusServiceProvider::class, + Illuminate\Cache\CacheServiceProvider::class, + Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class, + Illuminate\Routing\ControllerServiceProvider::class, + Illuminate\Cookie\CookieServiceProvider::class, + Illuminate\Database\DatabaseServiceProvider::class, + Illuminate\Encryption\EncryptionServiceProvider::class, + Illuminate\Filesystem\FilesystemServiceProvider::class, + Illuminate\Foundation\Providers\FoundationServiceProvider::class, + Illuminate\Hashing\HashServiceProvider::class, + Illuminate\Mail\MailServiceProvider::class, + Illuminate\Pagination\PaginationServiceProvider::class, + Illuminate\Pipeline\PipelineServiceProvider::class, + Illuminate\Queue\QueueServiceProvider::class, + Illuminate\Redis\RedisServiceProvider::class, + Illuminate\Auth\Passwords\PasswordResetServiceProvider::class, + Illuminate\Session\SessionServiceProvider::class, + Illuminate\Translation\TranslationServiceProvider::class, + Illuminate\Validation\ValidationServiceProvider::class, + Illuminate\View\ViewServiceProvider::class, + + /* + * Application Service Providers... + */ + WorkoutGenerator\Providers\AppServiceProvider::class, + WorkoutGenerator\Providers\EventServiceProvider::class, + WorkoutGenerator\Providers\RouteServiceProvider::class, + + ], + + /* + |-------------------------------------------------------------------------- + | Class Aliases + |-------------------------------------------------------------------------- + | + | This array of class aliases will be registered when this application + | is started. However, feel free to register as many as you wish as + | the aliases are "lazy" loaded so they don't hinder performance. + | + */ + + 'aliases' => [ + + 'App' => Illuminate\Support\Facades\App::class, + 'Artisan' => Illuminate\Support\Facades\Artisan::class, + 'Auth' => Illuminate\Support\Facades\Auth::class, + 'Blade' => Illuminate\Support\Facades\Blade::class, + 'Bus' => Illuminate\Support\Facades\Bus::class, + 'Cache' => Illuminate\Support\Facades\Cache::class, + 'Config' => Illuminate\Support\Facades\Config::class, + 'Cookie' => Illuminate\Support\Facades\Cookie::class, + 'Crypt' => Illuminate\Support\Facades\Crypt::class, + 'DB' => Illuminate\Support\Facades\DB::class, + 'Eloquent' => Illuminate\Database\Eloquent\Model::class, + 'Event' => Illuminate\Support\Facades\Event::class, + 'File' => Illuminate\Support\Facades\File::class, + 'Hash' => Illuminate\Support\Facades\Hash::class, + 'Input' => Illuminate\Support\Facades\Input::class, + 'Inspiring' => Illuminate\Foundation\Inspiring::class, + 'Lang' => Illuminate\Support\Facades\Lang::class, + 'Log' => Illuminate\Support\Facades\Log::class, + 'Mail' => Illuminate\Support\Facades\Mail::class, + 'Password' => Illuminate\Support\Facades\Password::class, + 'Queue' => Illuminate\Support\Facades\Queue::class, + 'Redirect' => Illuminate\Support\Facades\Redirect::class, + 'Redis' => Illuminate\Support\Facades\Redis::class, + 'Request' => Illuminate\Support\Facades\Request::class, + 'Response' => Illuminate\Support\Facades\Response::class, + 'Route' => Illuminate\Support\Facades\Route::class, + 'Schema' => Illuminate\Support\Facades\Schema::class, + 'Session' => Illuminate\Support\Facades\Session::class, + 'Storage' => Illuminate\Support\Facades\Storage::class, + 'URL' => Illuminate\Support\Facades\URL::class, + 'Validator' => Illuminate\Support\Facades\Validator::class, + 'View' => Illuminate\Support\Facades\View::class, + + ], + +]; diff --git a/config/database.php b/config/database.php index f6cf86b..e003dca 100644 --- a/config/database.php +++ b/config/database.php @@ -26,7 +26,7 @@ return [ | */ - 'default' => env('DB_CONNECTION', 'mysql'), + 'default' => env('DB_CONNECTION', 'pgsql'), /* |-------------------------------------------------------------------------- @@ -67,8 +67,8 @@ return [ 'pgsql' => [ 'driver' => 'pgsql', 'host' => env('DB_HOST', 'localhost'), - 'database' => env('DB_DATABASE', 'forge'), - 'username' => env('DB_USERNAME', 'forge'), + 'database' => env('DB_DATABASE', 'billy'), + 'username' => env('DB_USERNAME', 'billy'), 'password' => env('DB_PASSWORD', ''), 'charset' => 'utf8', 'prefix' => '', @@ -117,7 +117,7 @@ return [ 'default' => [ 'host' => '127.0.0.1', - 'port' => 6379, + 'port' => 5432, 'database' => 0, ], diff --git a/database/migrations/2015_09_02_033955_create_exercises_table.php b/database/migrations/2015_09_02_033955_create_exercises_table.php new file mode 100644 index 0000000..cde3c04 --- /dev/null +++ b/database/migrations/2015_09_02_033955_create_exercises_table.php @@ -0,0 +1,30 @@ +increments('id'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('exercises'); + } +} diff --git a/public/assets/css/styles.css b/public/assets/css/styles.css index 50c11c4..e95d549 100644 --- a/public/assets/css/styles.css +++ b/public/assets/css/styles.css @@ -6,13 +6,16 @@ body { } #top-grad { + margin:0; border-top:1px black solid; height:5px; - background:linear-gradient(grey, white); + background:linear-gradient(#777, #eff0ef); } .header { width:100%; + height:auto; + margin:0; color:#fff; font-weight:100; font-size:20px; @@ -21,11 +24,13 @@ body { #logo { margin-left:0; + display:inline-block; } #nav { float:right; margin-right:5px; + display:inline-block; } #nav ul { @@ -63,7 +68,7 @@ body { margin:20px auto; border:1px solid black; background-color:#fff; - box-shadow:0px 0px 5px #666; + box-shadow:0px 0px 5px #555; } .content h1 { @@ -84,3 +89,32 @@ fieldset { background-color:white; margin:20px; } + +@media (max-width:685px) { + #nav { + float:none; + display:block; + width:290px + margin:auto; + } + + #logo { + display:block; + width:310px; + margin:auto; + } + + #nav ul { + width:285px; + margin: 0 auto; + } + + #nav li { + padding:0; + } + + #nav a:link, a:visited { + margin:0; + padding:0; + } +} diff --git a/public/assets/css/styles.css~ b/public/assets/css/styles.css~ index 94b9403..822cf7a 100644 --- a/public/assets/css/styles.css~ +++ b/public/assets/css/styles.css~ @@ -6,13 +6,16 @@ body { } #top-grad { + margin:0; border-top:1px black solid; height:5px; - background:linear-gradient(grey, white); + background:linear-gradient(#777, #eff0ef); } .header { width:100%; + height:auto; + margin:0; color:#fff; font-weight:100; font-size:20px; @@ -21,11 +24,13 @@ body { #logo { margin-left:0; + display:inline-block; } #nav { float:right; margin-right:5px; + display:inline-block; } #nav ul { @@ -60,10 +65,10 @@ body { } .content { - margin:20px auto;; + margin:20px auto; border:1px solid black; background-color:#fff; - box-shadow:0px 0px 5px #666; + box-shadow:0px 0px 5px #777; } .content h1 { @@ -84,3 +89,32 @@ fieldset { background-color:white; margin:20px; } + +@media (max-width:685px) { + #nav { + float:none; + display:block; + width:290px + margin:auto; + } + + #logo { + display:block; + width:310px; + margin:auto; + } + + #nav ul { + width:285px; + margin: 0 auto; + } + + #nav li { + padding:0; + } + + #nav a:link, a:visited { + margin:0; + padding:0; + } +} diff --git a/resources/views/generate.blade.php b/resources/views/generate.blade.php index ac06a34..12f68a8 100644 --- a/resources/views/generate.blade.php +++ b/resources/views/generate.blade.php @@ -13,7 +13,7 @@

- diff --git a/resources/views/generate.blade.php~ b/resources/views/generate.blade.php~ index c8b9a61..12f68a8 100644 --- a/resources/views/generate.blade.php~ +++ b/resources/views/generate.blade.php~ @@ -13,7 +13,7 @@

- @@ -49,7 +49,7 @@ diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php index ac6a4df..8290f43 100644 --- a/resources/views/layouts/master.blade.php +++ b/resources/views/layouts/master.blade.php @@ -2,13 +2,15 @@ Workout Generator - @yield('title') - + @section('header')
- +