From 265f1e31db817403027bab1eea3c167edaadc066 Mon Sep 17 00:00:00 2001 From: Tom Longridge Date: Sun, 2 Jun 2019 12:16:19 +0100 Subject: [PATCH] Added list.js search for boards --- README.md | 2 +- app/Http/Controllers/BoardController.php | 2 +- composer.json | 1 + composer.lock | 65 +++++++++++++++++++++++- package-lock.json | 13 +++++ package.json | 1 + resources/js/app.js | 1 + resources/sass/app.scss | 13 ++++- resources/views/boards/create.blade.php | 4 +- resources/views/boards/edit.blade.php | 4 +- resources/views/boards/list.blade.php | 50 +++++++++++++++--- resources/views/boards/show.blade.php | 3 +- resources/views/layouts/app.blade.php | 13 +++-- resources/views/macros/tower.blade.php | 9 ++++ resources/views/notices/edit.blade.php | 4 +- resources/views/notices/show.blade.php | 4 +- resources/views/users/edit.blade.php | 4 +- resources/views/welcome.blade.php | 4 +- routes/web.php | 24 ++++----- webpack.mix.js | 2 +- 20 files changed, 171 insertions(+), 52 deletions(-) create mode 100644 resources/views/macros/tower.blade.php diff --git a/README.md b/README.md index 8fc9c15..9d9d83c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ 0. ~~Board Owner Permissions~~ 0. ~~Subscribe/Unsubscribe to Board~~ 0. ~~Notifications to Subscribers~~ -0. Associations/Guilds/Branches/Districts +0. ~~Associations/Guilds/Branches/Districts~~ 0. Browse/Search Boards 0. Committee Page 0. Contact Page diff --git a/app/Http/Controllers/BoardController.php b/app/Http/Controllers/BoardController.php index 5791e2a..ac08643 100644 --- a/app/Http/Controllers/BoardController.php +++ b/app/Http/Controllers/BoardController.php @@ -20,7 +20,7 @@ public function __construct() */ public function index() { - $boards = Board::all(); + $boards = Board::orderBy('name')->get(); return view('boards.list', compact('boards')); } diff --git a/composer.json b/composer.json index d0de564..40f9282 100644 --- a/composer.json +++ b/composer.json @@ -9,6 +9,7 @@ "license": "MIT", "require": { "php": "^7.1.3", + "bensampo/laravel-enum": "^1.19", "fideloper/proxy": "^4.0", "laravel/framework": "5.8.*", "laravel/tinker": "^1.0" diff --git a/composer.lock b/composer.lock index 80b32bd..96d6aa7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,71 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c4cdc889134fda72de60ac64cf1cc598", + "content-hash": "348ec37b7afedc8b867ed2554134baf2", "packages": [ + { + "name": "bensampo/laravel-enum", + "version": "1.19", + "source": { + "type": "git", + "url": "https://github.com/BenSampo/laravel-enum.git", + "reference": "272377a29c85f20d66b4bcd2605474e7474a0d51" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/BenSampo/laravel-enum/zipball/272377a29c85f20d66b4bcd2605474e7474a0d51", + "reference": "272377a29c85f20d66b4bcd2605474e7474a0d51", + "shasum": "" + }, + "require": { + "illuminate/support": "5.4.*|5.5.*|5.6.*|5.7.*|5.8.*", + "php": "~7.1" + }, + "require-dev": { + "laravel/framework": "5.8.*", + "orchestra/testbench": "3.8.*", + "phpstan/phpstan": "^0.11.6", + "phpunit/phpunit": "7.5.*", + "squizlabs/php_codesniffer": "^3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + }, + "laravel": { + "providers": [ + "BenSampo\\Enum\\EnumServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "BenSampo\\Enum\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ben Sampson", + "homepage": "https://sampo.co.uk", + "role": "Developer" + } + ], + "description": "Simple, extensible and powerful enumeration implementation for Laravel.", + "homepage": "https://github.com/bensampo/laravel-enum", + "keywords": [ + "bensampo", + "enum", + "laravel", + "package", + "validation" + ], + "time": "2019-05-10T20:42:30+00:00" + }, { "name": "dnoegel/php-xdg-base-dir", "version": "0.1", diff --git a/package-lock.json b/package-lock.json index 2107644..f0f5f52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6234,6 +6234,14 @@ "integrity": "sha512-XCpr5bElgDI65vVgstP8TWjv6/QKWm9GU5UG0Pr5sLQ3QLo8NVKsioe+Jed5/3vFOe3IQuqE7DKwTvKQkjTHvg==", "dev": true }, + "list.js": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/list.js/-/list.js-1.5.0.tgz", + "integrity": "sha1-pMv8goHd78Av2y0wyHSL+uJfvNo=", + "requires": { + "string-natural-compare": "^2.0.2" + } + }, "load-json-file": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", @@ -9828,6 +9836,11 @@ "limiter": "^1.0.5" } }, + "string-natural-compare": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-2.0.3.tgz", + "integrity": "sha512-4Kcl12rNjc+6EKhY8QyDVuQTAlMWwRiNbsxnVwBUKFr7dYPQuXVrtNU4sEkjF9LHY0AY6uVbB3ktbkIH4LC+BQ==" + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", diff --git a/package.json b/package.json index ddd9f6d..51554d8 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "vue-template-compiler": "^2.6.10" }, "dependencies": { + "list.js": "^1.5.0", "selectize": "^0.12.6" } } diff --git a/resources/js/app.js b/resources/js/app.js index f97f329..4b58a48 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -6,6 +6,7 @@ require('./bootstrap'); require('selectize'); +window.List = require('list.js'); window.Vue = require('vue'); diff --git a/resources/sass/app.scss b/resources/sass/app.scss index 3a7c228..92ae84a 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -30,8 +30,11 @@ body { } #sidebar-wrapper .sidebar-heading { - padding: 0.875rem 1.25rem; + padding: 1.875rem 1.25rem; font-size: 1.2rem; + height:80px; + text-align: center; + vertical-align: middle; } #sidebar-wrapper .list-group { @@ -61,6 +64,14 @@ body { } } +.navbar { + height: 80px; +} + +#app { + padding-top: 20px; +} + .selectize-control.tb-dropdown { width: 100%; diff --git a/resources/views/boards/create.blade.php b/resources/views/boards/create.blade.php index 4b0efb4..9887eaf 100644 --- a/resources/views/boards/create.blade.php +++ b/resources/views/boards/create.blade.php @@ -1,9 +1,7 @@ -@extends('layouts.app') +@extends('layouts.app', ['title' => 'Create Board']) @section('content') -

Create Board

-
@csrf diff --git a/resources/views/boards/edit.blade.php b/resources/views/boards/edit.blade.php index a298693..3823299 100644 --- a/resources/views/boards/edit.blade.php +++ b/resources/views/boards/edit.blade.php @@ -1,9 +1,7 @@ -@extends('layouts.app') +@extends('layouts.app', ['title' => 'Edit Board']) @section('content') -

Edit Board

-
@method('PATCH') diff --git a/resources/views/boards/list.blade.php b/resources/views/boards/list.blade.php index 17bad34..43e7858 100644 --- a/resources/views/boards/list.blade.php +++ b/resources/views/boards/list.blade.php @@ -1,17 +1,53 @@ -@extends('layouts.app') +@extends('layouts.app', ['title' => 'Boards']) @section('content') -

Boards

+
- +

Search

+ + Tower + Guild + +

Boards

+
    + @foreach($boards as $board) +
  • + + @if($board->tower) + @include('macros.tower', ['tower' => $board->tower, 'url' => route('boards.show', ['board' => $board->id])]) + @elseif($board->guild) + {{ $board->guild->name }} + @else + {{ $board->name }} + @endif + +
    • + @endforeach +
+ +
@auth Create @endauth @endsection + +@section('pagescripts') + + + +@endsection diff --git a/resources/views/boards/show.blade.php b/resources/views/boards/show.blade.php index 754bacc..fb76ea3 100644 --- a/resources/views/boards/show.blade.php +++ b/resources/views/boards/show.blade.php @@ -1,8 +1,7 @@ -@extends('layouts.app') +@extends('layouts.app', ['title' => $board->name]) @section('content') -

{{ $board->name }}

@if($board->tower)

{!! $board->tower->getNameHTML() !!}

@if($board->guild) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index e469f89..2e30e4c 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -6,7 +6,7 @@ - {{ config('app.name') }} + {{ config('app.name') }}: {{ isset($title) ? $title : '' }} @@ -18,10 +18,10 @@ @@ -29,6 +29,9 @@