535 composer.lock
View file

Large diffs are not rendered by default.

1 database/migrations/2017_09_08_134400_create_users_table.php
View file
@@ -25,6 +25,7 @@ public function up()
$table->string('phone', 25)->nullable();
$table->string('two_factor_reset_code', 100)->nullable();
$table->integer('current_team_id')->nullable();
$table->boolean('outfitter')->default(false);
$table->string('stripe_id')->nullable();
$table->string('current_billing_plan')->nullable();
$table->string('card_brand')->nullable();
1 database/migrations/2017_09_08_134433_create_teams_table.php
View file
@@ -18,6 +18,7 @@ public function up()
$table->string('name');
$table->string('slug')->nullable()->unique();
$table->text('photo_url')->nullable();
$table->string('website')->nullable();
$table->string('stripe_id')->nullable();
$table->string('current_billing_plan')->nullable();
$table->string('card_brand')->nullable();
11 database/migrations/2017_09_08_191810_create_fly_fishing_tables.php
View file
@@ -1,14 +1,13 @@
<?php

use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;

class CreateFlyFishingTables extends Migration
{

private $tables = [
'assets',
'uploads',
'fisheries',
'fishery_fish_species',
'fishery_hatch',
@@ -55,9 +54,10 @@ public function up()
Schema::create('maps', function ($table) {
$table->increments('id');
$table->string('title');
$table->text('description');
$table->text('description')->nullable();
$table->decimal('lat', 10, 7);
$table->decimal('lng', 11, 8);
$table->integer('zoom');
$table->string('uri');
$table->timestamps();
});
@@ -88,9 +88,10 @@ public function up()
$table->timestamps();
});

Schema::create('assets', function ($table) {
Schema::create('uploads', function ($table) {
$asset_type = array('image', 'video', 'link', 'document', 'other');
$table->increments('id');
$table->string('uuid');
$table->enum('type', $asset_type);
$table->integer('user_id')->unsigned();
$table->integer('privacy_id')->unsigned()->default(2);
@@ -179,7 +180,7 @@ public function up()
$table->integer('fish_species_id')->unsigned();
});

Schema::create('fishery_hatch', function ($table) {
Schema::create('fishery_hatches', function ($table) {
$table->integer('fishery_id')->unsigned();
$table->integer('hatch_id')->unsigned();
});
1 database/migrations/2017_09_08_211207_create_publications_table.php
View file
@@ -15,6 +15,7 @@ public function up()
{
Schema::create('publications', function (Blueprint $table) {
$table->increments('id');
$table->string('type');
$table->timestamps();
});
}
2 database/migrations/2017_09_10_212621_add_outfitter_fields_to_users.php
View file
@@ -14,7 +14,7 @@ class AddOutfitterFieldsToUsers extends Migration
public function up()
{
Schema::table('users', function (Blueprint $table) {
$table->boolean('outfitter')->after('current_team_id')->default(false);

});
}

6 database/seeds/DatabaseSeeder.php
View file
@@ -7,7 +7,6 @@
class DatabaseSeeder extends Seeder
{
private $tables = [
'assets',
'fisheries',
'fishery_fish_species',
'fishery_hatch',
@@ -24,6 +23,7 @@ class DatabaseSeeder extends Seeder
'reports',
'buddy_user',
'roles',
'uploads',
'water_data',
'weather'
];
@@ -67,8 +67,8 @@ public function run()
$this->call(HatchesTableSeeder::class);
$this->command->info('Hatches table seeded!');

$this->call(AssetsTableSeeder::class);
$this->command->info('Asset table seeded!');
$this->call(UploadsTableSeeder::class);
$this->command->info('Uploads table seeded!');

$this->call(PreyTableSeeder::class);
$this->command->info('Prey table seeded!');
6 database/seeds/AssetsTableSeeder.php → database/seeds/UploadsTableSeeder.php
View file
@@ -1,11 +1,11 @@
<?php

use App\Asset;
use App\Upload;
use App\Privacy;
use App\User;
use Faker\Factory as Faker;

class AssetsTableSeeder extends DatabaseSeeder
class UploadsTableSeeder extends DatabaseSeeder
{

public function run()
@@ -16,7 +16,7 @@ public function run()
$userIds = User::pluck('id')->all();

foreach (range(1, 30) as $index) {
Asset::create([
Upload::create([
'type' => $faker->numberBetween($min = 1, $max = 4),
'user_id' => $faker->randomElement($userIds),
'uri' => $faker->url,
3 package.json
View file
@@ -19,6 +19,7 @@
"sweetalert": "^1.1.3",
"underscore": "^1.8.3",
"urijs": "^1.17.0",
"vue": "2.*"
"vue": "2.*",
"vue-wysiwyg": "^1.2.5"
}
}
104 public/css/app.css
View file
@@ -1,9 +1,99 @@
/*!

.editr {
border: 1px solid #e4e4e4;
width: 100%;
}
.editr--toolbar {
background: #f6f6f6;
border-bottom: 1px solid #e4e4e4;
position: relative;
display: -ms-flexbox;
display: flex;
height: 32px;
}
.editr--toolbar a {
display: inline-block;
width: 8vw;
max-width: 32px;
height: 32px;
color: #333;
fill: #333;
cursor: pointer;
text-align: center;
line-height: 1;
}
.editr--toolbar a:hover {
background: rgba(0,0,0,0.1);
}
.editr--toolbar a:active {
background: rgba(0,0,0,0.2);
}
.editr--toolbar a svg {
width: 16px;
height: 16px;
margin: 8px auto;
}
.editr--toolbar a svg path {
fill: inherit;
}
.editr--toolbar a.vw-btn-separator {
width: 1px;
margin: 0 10px;
}
.editr--toolbar a.vw-btn-separator:hover {
background: initial;
cursor: default;
}
.editr--toolbar a.vw-btn-separator i {
border-left: 1px solid rgba(0,0,0,0.1);
height: 100%;
position: absolute;
width: 1px;
}
.editr--toolbar .dashboard {
width: 100%;
position: absolute;
top: 32px;
left: 0;
text-align: left;
padding: 0.5rem 1rem;
background: rgba(255,255,255,0.95);
border: 1px solid #f6f6f6;
}
.editr--content {
min-height: 150px;
padding: 0.75rem 0.5rem;
line-height: 1.33;
font-family: inherit;
color: inherit;
}
.editr--content[contenteditable=true]:empty:before {
content: attr(placeholder);
color: rgba(0,0,0,0.3);
display: block; /* For Firefox */
}
.editr--content img {
max-width: 100%;
}
.editr--content table {
width: 100%;
}
.editr--content table th {
text-align: left;
}
.editr--content:focus {
outline: 0;
}
.editr--content ul li,
.editr--content ol li {
list-style-position: inside;
}/*!
* Bootstrap v3.3.7 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */

html {
font-family: sans-serif;
-ms-text-size-adjust: 100%;
@@ -7894,7 +7984,7 @@ footer img {
padding: 0.5% 0;
margin: 0.5% 0;
}
@media (max-width: 759px) {
@media (max-width: 990px) {
.navbar-nav .dropdown-menu:before {
content: none;
}
@@ -7969,3 +8059,13 @@ header.site-header {
background-color: #3097d1;
opacity: 1;
}
.wysiwyg {
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
}
.wysiwyg:focus,
.editr:focus {
border-color: #98cbe8;
outline: 0;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(152, 203, 232, 0.6);
}
467 public/js/app.js
View file

Large diffs are not rendered by default.

4 resources/assets/js/app.js
View file
@@ -15,7 +15,11 @@
*/

require('spark-bootstrap');
import wysiwyg from "vue-wysiwyg";

Vue.use(wysiwyg, {
// options
})
require('./components/bootstrap');
Vue.config.silent = true
var app = new Vue({
11 resources/assets/js/components/Editor.vue
View file
@@ -0,0 +1,11 @@
<template>
<wysiwyg rows="3" class="wysiwyg" v-model="myHTML" />
</template>

<script>
export default {
mounted() {
console.log('Editor Component mounted.')
}
}
</script>
23 resources/assets/js/components/Example.vue
View file

This file was deleted.

59 resources/assets/js/components/New-Blog.vue
View file
@@ -0,0 +1,59 @@
<template>
<div class="container">
<div class="row">
<div class="col-md-8">
<div class="panel panel-default">
<div class="panel-heading">New Blog Post</div>

<div class="panel-body">
<form class="form-horizontal" role="form">
<div class="form-group">
<div class="col-md-12">
<input class="form-control" type="text" placeholder="Post Title" size="140" style="width:100%">
</div>
</div>
<div class="form-group">
<div class="col-md-12">
<editor></editor>
</div>
</div>
<div class="form-group">
<div class="col-md-2">
<button class="btn btn-primary">
Save Draft
</button>
</div>
<div class="col-md-2">
<button class="btn btn-warning">
Publish
</button>
</div>
<div class="col-md-2 col-md-offset-6">
<button class="btn btn-danger">
Delete
</button>
</div>
</div>
</form>
</div>
</div>
</div>
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">Recent posts</div>
<div class="panel-body">
I'm an example sidebar
</div>
</div>
</div>
</div>
</div>
</template>

<script>
export default {
mounted() {
console.log('Component mounted.')
}
}
</script>
3 resources/assets/js/components/bootstrap.js
View file
@@ -10,5 +10,6 @@
*/

require('./../spark-components/bootstrap');
require('./example')
require('./home');
Vue.component('new-blog', require('./New-Blog.vue'));
Vue.component('editor', require('./Editor.vue'));
16 resources/assets/less/app.less
View file
@@ -2,7 +2,7 @@

// @import "./spark/spark";
@import "./../../../vendor/laravel/spark/resources/assets/less/spark";

@import "./../../../node_modules/vue-wysiwyg/dist/vueWysiwyg.css";

html {
}
@@ -568,7 +568,7 @@ footer img {
margin : 0.5% 0;
}

@media (max-width : 759px) {
@media (max-width : 990px) {
.navbar-nav .dropdown-menu:before {
content : none;
}
@@ -634,4 +634,14 @@ header.site-header {
color: white;
background-color: #3097d1;
opacity: 1;
}
}
.wysiwyg {
border-bottom-left-radius:4px;
border-bottom-right-radius:4px;
}
.wysiwyg:focus, .editr:focus {
border-color: #98cbe8;
outline: 0;
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(152, 203, 232, 0.6);
}

208 resources/views/dashboard.blade.php
View file
@@ -0,0 +1,208 @@
@extends('layouts/default')

{{-- Page title --}}
@section('title')
Hatchmaster!
@parent
@stop
{{-- content --}}
@section('content')
<div class="container">
{{--<div class="row">--}}
{{--<div class="col-md-12 col-md-offset-0" style="padding-top:25px;">--}}
{{--<ul class="nav nav-tabs" style="border-bottom:none;">--}}
{{--<li class="active"><a href="#latest" data-toggle="tab">Latest</a></li>--}}
{{--<li><a href="#fish" data-toggle="tab">Fish</a>--}}
{{--</li>--}}
{{--<li><a href="#fisheries" data-toggle="tab">Fisheries</a>--}}
{{--</li>--}}
{{--<li><a href="#hatches" data-toggle="tab">Hatches</a>--}}
{{--</li>--}}
{{--<li><a href="#flies" data-toggle="tab">Flies</a>--}}
{{--</li>--}}
{{--<li><a href="#flyboxes" data-toggle="tab">Fly Boxes</a>--}}
{{--</li>--}}
{{--</ul>--}}
{{--<div class="panel with-nav-tabs panel-default panel-body">--}}
{{--<div class="tab-content">--}}
{{--<div class="tab-pane fade in out active" id="latest">--}}
{{--<article class="article">--}}
{{--<h2>Latest Posts:</h2>--}}

{{--<p>The most recent content additions</p>--}}
{{--</article>--}}
{{--</div>--}}
{{--<div class="tab-pane fade in out" id="fish">--}}
{{--<article class="article">--}}
{{--<h2>New Fish Species:</h2>--}}

{{--<p>Add a fish!</p>--}}
{{--</article>--}}
{{--<article class="article">--}}
{{--<h2>Edit Fish Species:</h2>--}}

{{--<p>--}}
{{--<em><strong>from the list below</strong></em>--}}
{{--</p>--}}
{{--</article>--}}
{{--</div>--}}
{{--<div class="tab-pane fade in out" id="fisheries">--}}
{{--<article class="article">--}}
{{--<h2>New Fishery:</h2>--}}

{{--<p>Add a fishery!</p>--}}
{{--</article>--}}
{{--<article class="article">--}}
{{--<h2>Edit Fisheries:</h2>--}}

{{--<p>--}}
{{--<em><strong>from the list below</strong></em>--}}
{{--</p>--}}
{{--</article>--}}
{{--</div>--}}
{{--<div class="tab-pane fade in out" id="hatches">--}}
{{--<article class="article">--}}
{{--<h2>New Hatch:</h2>--}}

{{--<p>Add a hatch!</p>--}}
{{--</article>--}}
{{--<article class="article">--}}
{{--<h2>Edit Hatches:</h2>--}}

{{--<p>--}}
{{--<em><strong>from the list below</strong></em>--}}
{{--</p>--}}
{{--</article>--}}
{{--</div>--}}
{{--<div class="tab-pane fade in out" id="flies">--}}
{{--<article class="article">--}}
{{--<h2>New Fly Pattern:</h2>--}}

{{--<p>Add a fly pattern.</p>--}}
{{--</article>--}}
{{--<article class="article">--}}
{{--<h2>Edit Fly Patterns:</h2>--}}

{{--<p>--}}
{{--<em><strong>from the list below</strong></em>--}}
{{--</p>--}}
{{--</article>--}}
{{--</div>--}}
{{--<div class="tab-pane fade in out" id="flyboxes">--}}
{{--<article class="article">--}}
{{--<h2>Build a New Fly Box:</h2>--}}

{{--<p>Add a fly box.</p>--}}
{{--</article>--}}
{{--<article class="article">--}}
{{--<h2>Edit Fly Boxes:</h2>--}}

{{--<p>--}}
{{--<em><strong>from the list below</strong></em>--}}
{{--</p>--}}
{{--</article>--}}
{{--</div>--}}
{{--</div>--}}
{{--</div>--}}
{{--</div>--}}
{{--</div>--}}
<div class="row">
<new-blog></new-blog>
</div>
<div class="row">
<div class="col-md-4 col-md-offset-0">
<div class="panel panel-default">
<div class="panel-heading">Announcement</div>
<div class="panel-body">
<article class="article">

<h2>Hobo Fly Fishing App: official release in Q4 2017</h2>

<h3><em>The</em> premium app for hardcore fly anglers</h3>

<h3>Cultivate knowledge.</h3>

<p>There is a lot of mythology in the sport of fly fishing. A lot of it is considered
<em>accepted wisdom</em>, but there is very little
crunch-able data available. We are building a data collection and reporting service for
fly fishers who want facts, not fables. Take
control of your fly fishing and catch more fish!</p>

</article>
</div>
</div>
</div>
<div class="col-md-4 col-md-offset-0">
<div class="panel panel-default">
<div class="panel-heading">Our App Does Stuff Like...</div>
<div class="panel-body">
<article class="article">
<h2>Fly Fishing Tools </h2>
<h4>For your mobile devices</h4>
<p>Use real data, not unreliable memories, to improve your success on the water.</p>
<p>Track your success on-stream with offline fisheries maps and
automatically correlate GPS information with weather, hydrology, hatch activity, and
other custom data that you and others collect <em>without interrupting your cast.</em>
Keep it a secret, share with a few buddies, or share it with the world. It is up to you.</p>

<p>Shoot some video of your buddy catching a mean fish deep in the backcountry
and we can have it posted to your private fly fishing journal
before you get home. Stuff like that, we're working on it now.</p>
</article>
</div>
</div>
</div>
<div class="col-md-4 col-md-offset-0">
<div class="panel panel-default">
<div class="panel-heading">Get Real</div>
<div class="panel-body">
<article class="article">
<h2>We will never...</h2>
<p>...have a hundred names on our <strong>"Pro Staff."</strong>
</p>
<h3>We don't want them.
</h3>
<p>
90% are meaningless headshots next to the name of some random clown they met at the bar.

</p>
<p>This is not how we roll, dude.
</p>
<img src="{{asset('assets/images/the-dude-1.jpg') }}"
alt="Yeah, well, that's just, like, your opinion, man."
title="Yeah, well, that's just, like, your opinion, man."
>
</article>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 col-md-offset-0">
<section class="jumbotron">
<h2>Here's the deal</h2>
<article class="article">
<h3>This should be fun</h3>

<p>Don't be fooled by the goofy 'free advice' some other places claim to give away.
You know there's no free lunch and, like us, you are probably tired of sporty slick
salesman lying to you. We make a couple bucks when we book a trip,
and we earn it by providing you better tools and sharp intelligence for all
the destinations we list.
</p>
<div class="container">
<img src="{{ asset('assets/images/gourley/20150712_082521.png') }}"
alt="This guy knows what he is doing."
title="This guy knows what he is doing." >
</div>
<h4>Learn the terrain.</h4>
<p>We can give you a little help getting started on new water, no guide required.
If you are the type who likes to cut trail and learn the quirks of a fishery by
exploring with your buddies, give us a jingle and we'll get you on the right track.
</p>
</article>
</section>
</div>
</div>
</div>
@stop
20 resources/views/layouts/default.blade.php
View file
@@ -80,28 +80,12 @@
</div>
<div class="collapse navbar-collapse" id="collapse">
<ul class="nav navbar-nav navbar-right">
<li {!! (Request::is('/') ? 'class="active"' : '') !!}><a href="{{ route('home') }}"> Home</a>
</li>

<li {!! (Request::is('blog') || Request::is('blogitem/*') ? 'class="active"' : '') !!}><a href="{{ URL::to('blog') }}"> Blog</a>
</li>
<li {!! (Request::is('contact') ? 'class="active"' : '') !!}><a href="{{ URL::to('contact') }}">Contact</a>
</li>
<li {{ (Request::is('tools') ? 'class=active' : '') }}><a href="{{ URL::to('tools') }}">Tools</a>
</li>
{{--based on anyone login or not display menu items--}}

@if(Auth::guest())
{{--<li><a href="{{ URL::to('register') }}">Register</a>--}}
{{--</li>--}}
{{--<li><a href="{{ URL::to('login') }}">Login</a>--}}
{{--</li>--}}
@else
@if(Auth::getUser()->inRole('admin'))
<li{{ (Request::is('admin') ? 'class=active' : '') }}><a href="{{ URL::to('admin') }}">Admin</a></li>
@endif
<li {{ (Request::is('my-account') ? 'class=active' : '') }}><a href="{{ URL::to('my-account') }}">Profile</a>
<li><a href="{{ URL::to('login') }}">Login</a>
</li>
@else
<li><a href="{{ URL::to('logout') }}">Logout</a>
</li>
@endif
8 resources/views/vendor/spark/auth/login.blade.php
View file
@@ -48,9 +48,15 @@
<button type="submit" class="btn btn-primary">
<i class="fa m-r-xs fa-sign-in"></i>Login
</button>

<a class="btn btn-link" href="{{ url('/password/reset') }}">Forgot Your Password?</a>
</div>

<div class="col-md-8 col-md-offset-4">
<button type="submit" class="btn btn-primary invisible">
<i class="fa m-r-xs fa-sign-in"></i>Login
</button>
<a class=" btn btn-link" href="{{ url('/register') }}">Create A New Account</a>
</div>
</div>
</form>
</div>
4 resources/views/vendor/spark/nav/brand.blade.php
View file
@@ -1,3 +1,3 @@
<a class="navbar-brand" href="/home">
<img src="/img/mono-logo.png" style="height: 32px;">
<a class="navbar-brand" href="/">
<img src="{{ asset('/assets/images//tits.png') }}" style="height: 32px;">
</a>
4 routes/web.php
View file
@@ -11,13 +11,13 @@
|
*/

Route::view('/', 'index')->name('home');
Route::view('/', 'index')->name('home')->middleware(['guest']);

Route::view('/contact', 'contact')->name('contact');

Route::view('/terms', 'terms')->name('terms');
Route::view('/privacy','privacy')->name('privacy');
Route::view('/tools', 'tools')->name('tools');
Route::view('/dashboard', 'dashboard')->name('dashboard');
Route::view('blog', 'blog-placeholder');

Route::post('contact',array('as' => 'contact','uses' => 'ContactFormController@create'));
30 yarn.lock
View file
@@ -1555,6 +1555,10 @@ de-indent@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"

debounce@latest:
version "1.0.2"
resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.0.2.tgz#503cc674d8d7f737099664fb75ddbd36b9626dc6"

debug@2.2.0, debug@~2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
@@ -1763,6 +1767,10 @@ download@^4.0.0, download@^4.1.2:
vinyl-fs "^2.2.0"
ware "^1.2.0"

dropzone@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-5.1.1.tgz#9f5b02fc4aa84e6466e046ba770bc82776ea49de"

duplexer2@0.0.2:
version "0.0.2"
resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
@@ -5901,7 +5909,23 @@ vue-template-es2015-compiler@^1.2.2:
version "1.5.3"
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545"

vue@2.*:
vue-wysiwyg@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/vue-wysiwyg/-/vue-wysiwyg-1.2.5.tgz#4b51a9c1e6896631163346294e3abe5bdf621a34"
dependencies:
debounce latest
vue latest
vue2-dropzone latest
wolfy87-eventemitter "^5.1.0"

vue2-dropzone@latest:
version "2.3.5"
resolved "https://registry.yarnpkg.com/vue2-dropzone/-/vue2-dropzone-2.3.5.tgz#a567c873b42c36e4dfd7e1941bba4c65553a471e"
dependencies:
dropzone "^5.1.1"
vue "^2.0.0"

vue@2.*, vue@^2.0.0, vue@latest:
version "2.4.2"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.2.tgz#a9855261f191c978cc0dc1150531b8d08149b58c"

@@ -6074,6 +6098,10 @@ window-size@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"

wolfy87-eventemitter@^5.1.0:
version "5.2.2"
resolved "https://registry.yarnpkg.com/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.2.tgz#9cb8e58f6d53814602b91128dd81cad090197a4d"

wordwrap@0.0.2:
version "0.0.2"
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"