@yield('content')
+
+
+ {{ $slot }}
+
+
@auth
-
+
My Files
-
+
Logout
@endauth
@guest
-
+
Login
@endguest
diff --git a/resources/views/components/paginator.blade.php b/resources/views/components/paginator.blade.php
new file mode 100644
index 0000000..34ba621
--- /dev/null
+++ b/resources/views/components/paginator.blade.php
@@ -0,0 +1,5 @@
+
+ @if(!isset($sortable) || $sortable == true)
+
+ {{$label}}
+
+ @include('components.partials.sort-icon', ['field' => $field])
+ @else
+ {{$label}}
+ @endif
+
diff --git a/resources/views/files/index.blade.php b/resources/views/files/index.blade.php
index b6898d2..6bec956 100644
--- a/resources/views/files/index.blade.php
+++ b/resources/views/files/index.blade.php
@@ -1,43 +1,11 @@
-@extends('layouts.app')
-
-@section('title', 'Files list')
-
-@section('content')
-
+
+
+
+ Upload
+
+
+
+
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 10c2ce0..db16e86 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -1,67 +1,68 @@
-@extends('layouts.app')
-@section('title', 'Index')
-
-@section('content')
-
+
diff --git a/resources/views/components/partials/limit-selector.blade.php b/resources/views/components/partials/limit-selector.blade.php
new file mode 100644
index 0000000..20e29c3
--- /dev/null
+++ b/resources/views/components/partials/limit-selector.blade.php
@@ -0,0 +1,10 @@
+
+ {{ $paginator->links() }}
+
+
+
+
+
diff --git a/resources/views/components/partials/search-bar.blade.php b/resources/views/components/partials/search-bar.blade.php
new file mode 100644
index 0000000..b4f5274
--- /dev/null
+++ b/resources/views/components/partials/search-bar.blade.php
@@ -0,0 +1,18 @@
+
+ @if(!empty($buttons))
+
diff --git a/resources/views/components/partials/sort-icon.blade.php b/resources/views/components/partials/sort-icon.blade.php
new file mode 100644
index 0000000..f583618
--- /dev/null
+++ b/resources/views/components/partials/sort-icon.blade.php
@@ -0,0 +1,7 @@
+@if ($sortField !== $field)
+
+@elseif ($sortAsc)
+
+@else
+
+@endif
diff --git a/resources/views/components/partials/table-th.blade.php b/resources/views/components/partials/table-th.blade.php
new file mode 100644
index 0000000..09ecfb0
--- /dev/null
+++ b/resources/views/components/partials/table-th.blade.php
@@ -0,0 +1,11 @@
+
+
+ {{ $buttons }}
+
+ @endif
+
+
+
+
+ @if(!empty($search))
+
+ Reset
+
+ @endif
+
-
-@endsection
-
-@push('scripts')
-
-@endpush
+
-
- My Files
- Upload New -
-
-
-
- @if(Session::has('status'))
-
-
- {{ Session::get('status') }}
-
- @endif
-
-
-
-
-
- | ID | -File | -Created At | -Actions | -
|---|
-
- }})
-
-
-
-
+
-
Hello There
-
- I'm Zack, I'm a {{Carbon\Carbon::create(1997, 7 , 24)->diffInYears(Carbon\Carbon::now())}} year old Full-Stack Web Developer, Java Developer and Hobbyist Photographer from the Tampa Bay Area.
- I like to solve problems and take pictures. This is my website / portfolio / dumping ground.
- Nice to meet you.
-
-
+
- GitHub
- StackOverflow
- Keybase
- LinkedIn
+
+
-
+
+
+
+
+
Hello There
+
+ I'm Zack, I'm a {{Carbon\Carbon::create(1997, 7 , 24)->diffInYears(Carbon\Carbon::now())}} year old Full-Stack Web Developer, Java Developer and Hobbyist Photographer from the Tampa Bay Area.
+ I like to solve problems and take pictures. This is my website / portfolio / dumping ground.
+ Nice to meet you.
+
+
-
-
-
-
-
+
-
+
+
- Zachary Craig - @yield('title')
+
+
-
+
+ @yield('title') - {{ config('app.name', 'Laravel') }}
+
+
+
+
+
+
+
+ @livewireStyles
@stack('styles')
+# Imports SQL dump into specified database from config
+#
+
+source db_import_config
+
+function run_command(){
+ echo "[EXEC] $1"
+ eval $1
+}
+
+run_command "mysql -u $MYSQL_USERNAME --host='$MYSQL_HOST' --password='$MYSQL_PASSWORD' --execute=\"DROP DATABASE \\\`$MYSQL_DATABASE\\\`; CREATE DATABASE \\\`$MYSQL_DATABASE\\\`;\""
+run_command "pv $1 | mysql -u $MYSQL_USERNAME --host='$MYSQL_HOST' --password='$MYSQL_PASSWORD' $MYSQL_DATABASE";
+run_command "cd .. && php artisan migrate && cd -"
+run_command "pv post_import.sql | mysql -u $MYSQL_USERNAME --host='$MYSQL_HOST' --password='$MYSQL_PASSWORD' $MYSQL_DATABASE"
diff --git a/scripts/db_import_config.example b/scripts/db_import_config.example
new file mode 100644
index 0000000..62f7539
--- /dev/null
+++ b/scripts/db_import_config.example
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+#
+# This file is for configuring the MySQL Server you want to IMPORT the file into
+# Requires MySQL Client installed on machine script is run on
+#
+
+MYSQL_HOST='mysql'
+MYSQL_USERNAME='root'
+MYSQL_PASSWORD='root'
+MYSQL_DATABASE='default'
diff --git a/webpack.mix.js b/webpack.mix.js
index f5a7c7a..e292d8a 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -15,7 +15,6 @@ require('laravel-mix-purgecss');
mix.js('resources/js/app.js', 'public/js')
.sass('resources/sass/app.scss', 'public/css')
.sass("resources/sass/login.scss", 'public/css')
- .js("resources/js/files.js", 'public/js')
.extract(['vue', 'lodash', 'axios'])
.tailwind()
.purgeCss()
diff --git a/yapi b/yapi
index 96e83d6..c84851a 160000
--- a/yapi
+++ b/yapi
@@ -1 +1 @@
-Subproject commit 96e83d6d231e70df3409dfadde2d5b91f6bcf1f0
+Subproject commit c84851abf997599417d9ecc286332e07aeadcd45
diff --git a/yarn.lock b/yarn.lock
index 36aa5a7..f1c2dec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1245,6 +1245,11 @@ boolbase@^1.0.0, boolbase@~1.0.0:
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
+bootstrap@^4.0.0:
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
+ integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
+
brace-expansion@^1.1.7:
version "1.1.11"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
Open Source Projects
-Pretty much everything I do nowadays is for a company and not public, but here's a small collection of things I maintain or created at one point in time, in no particular order.
-
-
- A maintained fork of michaelbonds/ship-station
- Designed to programmatically access the ShipStation REST API via PHP with Guzzle - - - - -
-
- A highly configurable logging system for the Bukkit API, largely unnecessary now that log4j is bundled with spigot and bukkit, but it was pretty useful back in the day :)
-
-
-
-
-
- An extensible Java IRC bot with a node-based permissions system, meant for basic channel administration and utilities, featuring a full plugin system with runtime classloading
-
-
-
-
+
-@endsection
+ @push('scripts')
+
+ @endpush
+
+
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 0ba452b..a9bb4a1 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -1,28 +1,39 @@
-
+
- - Designed to programmatically access the ShipStation REST API via PHP with Guzzle - - - - -
+
-Open Source Projects
+Pretty much everything I do nowadays is for a company and not public, but here's a small collection of things I maintain or created at one point in time, in no particular order.
+
+
+ A maintained fork of michaelbonds/ship-station
+ Designed to programmatically access the ShipStation REST API via PHP with Guzzle + + + + +
+
+ A highly configurable logging system for the Bukkit API, largely unnecessary now that log4j is bundled with spigot and bukkit, but it was pretty useful back in the day :)
+
+
+
+
+
+ An extensible Java IRC bot with a node-based permissions system, meant for basic channel administration and utilities, featuring a full plugin system with runtime classloading
+
+
+
+
+
+ Designed to programmatically access the ShipStation REST API via PHP with Guzzle + + + + +
- @include('components.header')
+
-
+
-
+
+@livewireScripts
@stack('scripts')
diff --git a/resources/views/livewire/files/table.blade.php b/resources/views/livewire/files/table.blade.php
new file mode 100644
index 0000000..73abe28
--- /dev/null
+++ b/resources/views/livewire/files/table.blade.php
@@ -0,0 +1,40 @@
+
+
diff --git a/routes/web.php b/routes/web.php
index 6a83e0d..7debcb9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -25,18 +25,20 @@
//let you logout.
Route::get('logout', ['as' => 'logout', 'uses' => 'Auth\LoginController@logout']);
-
-Route::get('/files', 'FileController@index')->name("file.index")->middleware('auth');
-Route::post('/ajax/files', 'FileController@ajaxIndex')->name("file.ajax.index")->middleware('auth');
-Route::get('/files/new', 'FileController@create')->name("file.create")->middleware('auth');
-Route::put('/files', 'FileController@store')->name('file.store')->middleware('auth');
-Route::get('/files/{file_name}', 'FileController@show')->name("file.show");
-//same thing as above, for backwards compat, moved permanently, for search indexers, I guess...
-Route::get('/uploads/{file_name}', function ($file_name){
- return redirect(route('file.show', ['file_name' => $file_name]), 301);
+Route::middleware(['auth'])->group(function(){
+ Route::get('/files', 'FileController@index')->name("file.index")->middleware('auth');
+ Route::post('/ajax/files', 'FileController@ajaxIndex')->name("file.ajax.index")->middleware('auth');
+ Route::get('/files/new', 'FileController@create')->name("file.create")->middleware('auth');
+ Route::put('/files', 'FileController@store')->name('file.store')->middleware('auth');
+ Route::get('/files/{filename}', 'FileController@show')->name("file.show")->where('filename', '.*');;
+ //same thing as above, for backwards compat, moved permanently, for search indexers, I guess...
+ Route::get('/uploads/{file_name}', function ($file_name){
+ return redirect(route('file.show', ['file_name' => $file_name]), 301);
+ });
+ Route::delete('/files/{file_id}', 'FileController@destroy')->name("file.delete")->middleware('auth');
+ Route::get('/files/{file_id}/delete', 'FileController@requestDestroy')->name("file.request.delete")->middleware('auth');
+
+ Route::get('/lookup/{phone_number}', 'TwilioController@lookup')->middleware('auth');
+ Route::get('/lookup/{phone_number}/raw', 'TwilioController@lookupRaw')->middleware('auth');
});
-Route::delete('/files/{file_id}', 'FileController@destroy')->name("file.delete")->middleware('auth');
-Route::get('/files/{file_id}/delete', 'FileController@requestDestroy')->name("file.request.delete")->middleware('auth');
-Route::get('/lookup/{phone_number}', 'TwilioController@lookup')->middleware('auth');
-Route::get('/lookup/{phone_number}/raw', 'TwilioController@lookupRaw')->middleware('auth');
diff --git a/scripts/db_dump b/scripts/db_dump
new file mode 100755
index 0000000..955cec0
--- /dev/null
+++ b/scripts/db_dump
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+source db_dump_config
+
+function run_command(){
+ echo "[EXEC] $1"
+ eval $1
+}
+
+run_command "ssh $DB_SERVER \"mysqldump -u $MYSQL_USERNAME --password='$MYSQL_PASSWORD' $1 > $FILENAME\""
+run_command "rsync $DB_SERVER:~/$FILENAME ."
+# swap out definer lines for views so we don't have errors about undefined users
+run_command "sed -i 's/\`scott\`@\`192.168.1.\%\`/\`root\`@\`localhost\`/g' $FILENAME"
+run_command "ssh $DB_SERVER 'rm $FILENAME'"
+
+
+
diff --git a/scripts/db_dump_config.example b/scripts/db_dump_config.example
new file mode 100644
index 0000000..cd70077
--- /dev/null
+++ b/scripts/db_dump_config.example
@@ -0,0 +1,5 @@
+#!/bin/bash
+DB_SERVER='admin@10.31.1.80'
+MYSQL_USERNAME='username'
+MYSQL_PASSWORD='password'
+FILENAME="$MYSQL_DATABASE.dmp"
diff --git a/scripts/db_export b/scripts/db_export
new file mode 100755
index 0000000..d9b268f
--- /dev/null
+++ b/scripts/db_export
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd ~/Environments/readings/scripts/
+./db_dump uem
diff --git a/scripts/db_import b/scripts/db_import
new file mode 100755
index 0000000..c25af8b
--- /dev/null
+++ b/scripts/db_import
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+#
+# Usage: ./db_import
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | + | |||
|---|---|---|---|
| {{ $file->original_filename }} | +{{ $file->mime }} | +{{ $file->created_at }} | +view | +