diff --git a/app/Http/Controllers/TableEditController.php b/app/Http/Controllers/TableEditController.php index db55166..04b1b1b 100644 --- a/app/Http/Controllers/TableEditController.php +++ b/app/Http/Controllers/TableEditController.php @@ -101,6 +101,18 @@ class TableEditController extends Controller ]); } + /** @noinspection PhpUnusedPrivateMethodInspection */ + private function manageColumns(Changeset $changeset) + { + $columns = $changeset->fetchAndTransformColumns(); + + return view('table.propose.manage-columns', [ + 'changeset' => $changeset, + 'table' => $changeset->table, + 'columns' => collect($columns), + ]); + } + public function draftUpdate(Request $request, User $user, string $table) { /** @var Table $tableModel */ diff --git a/public/fonts/fa-dtbl-1-preview.html b/public/fonts/fa-dtbl-1-preview.html index e4b50f5..854890b 100644 --- a/public/fonts/fa-dtbl-1-preview.html +++ b/public/fonts/fa-dtbl-1-preview.html @@ -163,6 +163,8 @@ [data-icon]:before, .fa-address-card-o:before, .fa-calendar:before, +.fa-chevron-down:before, +.fa-chevron-up:before, .fa-code-fork:before, .fa-comment:before, .fa-download:before, @@ -214,41 +216,43 @@ .fa-address-card-o:before { content: "\f100"; } .fa-calendar:before { content: "\f101"; } -.fa-code-fork:before { content: "\f102"; } -.fa-comment:before { content: "\f103"; } -.fa-download:before { content: "\f104"; } -.fa-exclamation-triangle:before { content: "\f105"; } -.fa-eye:before { content: "\f106"; } -.fa-facebook-square:before { content: "\f107"; } -.fa-floppy-o:before { content: "\f108"; } -.fa-github:before { content: "\f109"; } -.fa-globe:before { content: "\f10a"; } -.fa-google:before { content: "\f10b"; } -.fa-history:before { content: "\f10c"; } -.fa-home:before { content: "\f10d"; } -.fa-hourglass:before { content: "\f10e"; } -.fa-inbox:before { content: "\f10f"; } -.fa-key-modern:before { content: "\f110"; } -.fa-link:before { content: "\f111"; } -.fa-moon-o:before { content: "\f112"; } -.fa-pencil:before { content: "\f113"; } -.fa-plus:before { content: "\f114"; } -.fa-question-circle:before { content: "\f115"; } -.fa-sign-in:before { content: "\f116"; } -.fa-sign-out:before { content: "\f117"; } -.fa-star:before { content: "\f118"; } -.fa-star-o:before { content: "\f119"; } -.fa-sun-o:before { content: "\f11a"; } -.fa-table:before { content: "\f11b"; } -.fa-th-list:before { content: "\f11c"; } -.fa-times:before { content: "\f11d"; } -.fa-trash-o:before { content: "\f11e"; } -.fa-undo:before { content: "\f11f"; } -.fa-user:before { content: "\f120"; } -.fa-user-circle-o:before { content: "\f121"; } -.fa-user-plus:before { content: "\f122"; } -.fa-users:before { content: "\f123"; } -.fa-wrench:before { content: "\f124"; } +.fa-chevron-down:before { content: "\f102"; } +.fa-chevron-up:before { content: "\f103"; } +.fa-code-fork:before { content: "\f104"; } +.fa-comment:before { content: "\f105"; } +.fa-download:before { content: "\f106"; } +.fa-exclamation-triangle:before { content: "\f107"; } +.fa-eye:before { content: "\f108"; } +.fa-facebook-square:before { content: "\f109"; } +.fa-floppy-o:before { content: "\f10a"; } +.fa-github:before { content: "\f10b"; } +.fa-globe:before { content: "\f10c"; } +.fa-google:before { content: "\f10d"; } +.fa-history:before { content: "\f10e"; } +.fa-home:before { content: "\f10f"; } +.fa-hourglass:before { content: "\f110"; } +.fa-inbox:before { content: "\f111"; } +.fa-key-modern:before { content: "\f112"; } +.fa-link:before { content: "\f113"; } +.fa-moon-o:before { content: "\f114"; } +.fa-pencil:before { content: "\f115"; } +.fa-plus:before { content: "\f116"; } +.fa-question-circle:before { content: "\f117"; } +.fa-sign-in:before { content: "\f118"; } +.fa-sign-out:before { content: "\f119"; } +.fa-star:before { content: "\f11a"; } +.fa-star-o:before { content: "\f11b"; } +.fa-sun-o:before { content: "\f11c"; } +.fa-table:before { content: "\f11d"; } +.fa-th-list:before { content: "\f11e"; } +.fa-times:before { content: "\f11f"; } +.fa-trash-o:before { content: "\f120"; } +.fa-undo:before { content: "\f121"; } +.fa-user:before { content: "\f122"; } +.fa-user-circle-o:before { content: "\f123"; } +.fa-user-plus:before { content: "\f124"; } +.fa-users:before { content: "\f125"; } +.fa-wrench:before { content: "\f126"; } @@ -264,7 +268,7 @@
-

fa-dtbl-1 contains 37 glyphs:

+

fa-dtbl-1 contains 39 glyphs:

Toggle Preview Characters
@@ -296,6 +300,32 @@
+
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+
PpPpPpPpPpPpPpPpPpPp @@ -305,7 +335,7 @@
- +
@@ -318,7 +348,7 @@
- +
@@ -331,7 +361,7 @@
- +
@@ -345,7 +375,7 @@
- +
@@ -358,7 +388,7 @@
- +
@@ -371,7 +401,7 @@
- +
@@ -385,7 +415,7 @@
- +
@@ -398,7 +428,7 @@
- +
@@ -411,7 +441,7 @@
- +
@@ -424,7 +454,7 @@
- +
@@ -437,7 +467,7 @@
- +
@@ -450,7 +480,7 @@
- +
@@ -463,7 +493,7 @@
- +
@@ -476,7 +506,7 @@
- +
@@ -489,7 +519,7 @@
- +
@@ -502,7 +532,7 @@
- +
@@ -515,7 +545,7 @@
- +
@@ -528,7 +558,7 @@
- +
@@ -541,7 +571,7 @@
- +
@@ -554,7 +584,7 @@
- +
@@ -567,7 +597,7 @@
- +
@@ -580,7 +610,7 @@
- +
@@ -593,7 +623,7 @@
- +
@@ -606,7 +636,7 @@
- +
@@ -619,7 +649,7 @@
- +
@@ -632,7 +662,7 @@
- +
@@ -645,7 +675,7 @@
- +
@@ -659,7 +689,7 @@
- +
@@ -672,7 +702,7 @@
- +
@@ -685,7 +715,7 @@
- +
@@ -698,7 +728,7 @@
- +
@@ -711,7 +741,7 @@
- +
@@ -724,7 +754,7 @@
- +
@@ -737,7 +767,7 @@
- +
@@ -750,7 +780,7 @@
- +
diff --git a/public/fonts/fa-dtbl-1.css b/public/fonts/fa-dtbl-1.css index d94bdfb..8fc47b6 100644 --- a/public/fonts/fa-dtbl-1.css +++ b/public/fonts/fa-dtbl-1.css @@ -40,38 +40,40 @@ .fa-address-card-o::before, .fa-vcard-o::before { content: "\f100"; } .fa-calendar::before { content: "\f101"; } -.fa-code-fork::before { content: "\f102"; } -.fa-comment::before { content: "\f103"; } -.fa-download::before { content: "\f104"; } -.fa-exclamation-triangle::before, .fa-warning::before { content: "\f105"; } -.fa-eye::before { content: "\f106"; } -.fa-facebook-square::before { content: "\f107"; } -.fa-floppy-o::before, .fa-save::before { content: "\f108"; } -.fa-github::before { content: "\f109"; } -.fa-globe::before { content: "\f10a"; } -.fa-google::before { content: "\f10b"; } -.fa-history::before { content: "\f10c"; } -.fa-home::before { content: "\f10d"; } -.fa-hourglass::before { content: "\f10e"; } -.fa-inbox::before { content: "\f10f"; } -.fa-key-modern::before { content: "\f110"; } -.fa-link::before { content: "\f111"; } -.fa-moon-o::before { content: "\f112"; } -.fa-pencil::before { content: "\f113"; } -.fa-plus::before { content: "\f114"; } -.fa-question-circle::before { content: "\f115"; } -.fa-sign-in::before { content: "\f116"; } -.fa-sign-out::before { content: "\f117"; } -.fa-star::before { content: "\f118"; } -.fa-star-o::before { content: "\f119"; } -.fa-sun-o::before { content: "\f11a"; } -.fa-table::before { content: "\f11b"; } -.fa-th-list::before { content: "\f11c"; } -.fa-times::before, .fa-close::before { content: "\f11d"; } -.fa-trash-o::before { content: "\f11e"; } -.fa-undo::before { content: "\f11f"; } -.fa-user::before { content: "\f120"; } -.fa-user-circle-o::before { content: "\f121"; } -.fa-user-plus::before { content: "\f122"; } -.fa-users::before { content: "\f123"; } -.fa-wrench::before { content: "\f124"; } +.fa-chevron-down::before { content: "\f102"; } +.fa-chevron-up::before { content: "\f103"; } +.fa-code-fork::before { content: "\f104"; } +.fa-comment::before { content: "\f105"; } +.fa-download::before { content: "\f106"; } +.fa-exclamation-triangle::before, .fa-warning::before { content: "\f107"; } +.fa-eye::before { content: "\f108"; } +.fa-facebook-square::before { content: "\f109"; } +.fa-floppy-o::before, .fa-save::before { content: "\f10a"; } +.fa-github::before { content: "\f10b"; } +.fa-globe::before { content: "\f10c"; } +.fa-google::before { content: "\f10d"; } +.fa-history::before { content: "\f10e"; } +.fa-home::before { content: "\f10f"; } +.fa-hourglass::before { content: "\f110"; } +.fa-inbox::before { content: "\f111"; } +.fa-key-modern::before { content: "\f112"; } +.fa-link::before { content: "\f113"; } +.fa-moon-o::before { content: "\f114"; } +.fa-pencil::before { content: "\f115"; } +.fa-plus::before { content: "\f116"; } +.fa-question-circle::before { content: "\f117"; } +.fa-sign-in::before { content: "\f118"; } +.fa-sign-out::before { content: "\f119"; } +.fa-star::before { content: "\f11a"; } +.fa-star-o::before { content: "\f11b"; } +.fa-sun-o::before { content: "\f11c"; } +.fa-table::before { content: "\f11d"; } +.fa-th-list::before { content: "\f11e"; } +.fa-times::before, .fa-close::before { content: "\f11f"; } +.fa-trash-o::before { content: "\f120"; } +.fa-undo::before { content: "\f121"; } +.fa-user::before { content: "\f122"; } +.fa-user-circle-o::before { content: "\f123"; } +.fa-user-plus::before { content: "\f124"; } +.fa-users::before { content: "\f125"; } +.fa-wrench::before { content: "\f126"; } diff --git a/public/fonts/fa-dtbl-1.eot b/public/fonts/fa-dtbl-1.eot index 004abee..350ec28 100644 Binary files a/public/fonts/fa-dtbl-1.eot and b/public/fonts/fa-dtbl-1.eot differ diff --git a/public/fonts/fa-dtbl-1.svg b/public/fonts/fa-dtbl-1.svg index a44d639..44d10b0 100644 --- a/public/fonts/fa-dtbl-1.svg +++ b/public/fonts/fa-dtbl-1.svg @@ -1,11 +1,11 @@ -Created by FontForge 20170805 at Mon Aug 6 21:53:26 2018 +Created by FontForge 20170805 at Tue Aug 7 22:29:58 2018 By ondra The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/OFL). Fork Awesome is a fork based of off Font Awesome 4.7.0 by Dave Gandy. More info on licenses at https://forkawesome.github.io @@ -22,7 +22,7 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/ bbox="-0.14014 -256.168 2048 1536.01" underline-thickness="89.6" underline-position="-179.2" - unicode-range="U+0020-F124" + unicode-range="U+0020-F126" /> - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/fonts/fa-dtbl-1.ttf b/public/fonts/fa-dtbl-1.ttf index 0ccc709..870396a 100644 Binary files a/public/fonts/fa-dtbl-1.ttf and b/public/fonts/fa-dtbl-1.ttf differ diff --git a/public/fonts/fa-dtbl-1.woff2 b/public/fonts/fa-dtbl-1.woff2 index b993e1a..9701374 100644 Binary files a/public/fonts/fa-dtbl-1.woff2 and b/public/fonts/fa-dtbl-1.woff2 differ diff --git a/resources/assets/fa-config/fontcustom.yml b/resources/assets/fa-config/fontcustom.yml new file mode 100644 index 0000000..58cbe5d --- /dev/null +++ b/resources/assets/fa-config/fontcustom.yml @@ -0,0 +1,18 @@ +font_name: fa-dtbl-1 +css_selector: '.fa-{{glyph}}' +preprocessor_path: '' +autowidth: true +no_hash: true +force: false +debug: false +quiet: false +copyright: >- + The Fork Awesome font is licensed under the SIL OFL 1.1 + (http://scripts.sil.org/OFL). Fork Awesome is a fork based of off Font Awesome + 4.7.0 by Dave Gandy. More info on licenses at https://forkawesome.github.io +font_em: 1792 +font_ascent: 1536 +font_descent: 256 +input: + vectors: svg +fonts_path_relative_to_css: ./ diff --git a/resources/assets/fa-config/wanted.ini b/resources/assets/fa-config/wanted.ini new file mode 100644 index 0000000..e623566 --- /dev/null +++ b/resources/assets/fa-config/wanted.ini @@ -0,0 +1,86 @@ +# used +home # My profile link +sign-out # logout menu button +sign-in # login form +user-plus # register icon +user-circle-o # profile header, menu +vcard-o # handle icon +users # public page users list +user # single user +key-modern # account setup link + +github # social login +facebook-square # social login +google # social login + +inbox # button for the list of proposals + +th-list # nbr of table rows +comment # comments button +code-fork # fork, or number of forks +pencil # edit / propose change button + +save # form save btn +link # user homepage link icon +globe # form-group for URLs + +question-circle # form help bubble +calendar # user join date + +table # icon in table list +star-o # table fab btn +star # table fav btn, active +history # nbr of revisions icon + +eye # visit count + +download # export buttons +wrench # Table options + +trash-o +plus +warning +undo + +close +hourglass + +sun-o +moon-o + +chevron-up +chevron-down + + +# Unused +; sliders +; +; +; check +; trash-o +; trash +; close +; +; eye +; eye-slash +; filter +; flag +; search +; +; legal +; rss +; reply +; +; bell +; bell-o +; +; download +; cloud-upload +; share-alt +; +; sort +; sort-asc +; sort-desc +; quote-left +; +; clock-o diff --git a/resources/assets/js/components/ColumnEditorAdvanced.vue b/resources/assets/js/components/ColumnEditorAdvanced.vue new file mode 100644 index 0000000..747f1d0 --- /dev/null +++ b/resources/assets/js/components/ColumnEditorAdvanced.vue @@ -0,0 +1,104 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeTitle
+ + + + + + + + + + + + + + + + + +
+
+ + + + + diff --git a/resources/assets/js/vue-init.js b/resources/assets/js/vue-init.js index a137623..9e870b4 100644 --- a/resources/assets/js/vue-init.js +++ b/resources/assets/js/vue-init.js @@ -1,8 +1,9 @@ window.Vue = require('vue') -const ColumnEditorCtor = Vue.component('column-editor', require('./components/ColumnEditor.vue')) -const RowsEditorCtor = Vue.component('rows-editor', require('./components/RowsEditor.vue')) -const IconCtor = Vue.component('v-icon', require('./components/Icon.vue')) +const ColumnEditor = Vue.component('column-editor', require('./components/ColumnEditor.vue')) +const ColumnEditorAdvanced = Vue.component('column-editor', require('./components/ColumnEditorAdvanced.vue')) +const RowsEditor = Vue.component('rows-editor', require('./components/RowsEditor.vue')) +const Icon = Vue.component('v-icon', require('./components/Icon.vue')) // const app = new Vue({ // el: '#app' @@ -10,18 +11,15 @@ const IconCtor = Vue.component('v-icon', require('./components/Icon.vue')) window.app = { ColumnEditor: function (selector, data) { - new ColumnEditorCtor({ - propsData: data - }).$mount(selector) + new ColumnEditor({ propsData: data }).$mount(selector) + }, + ColumnEditorAdvanced: function (selector, data) { + new ColumnEditorAdvanced({ propsData: data }).$mount(selector) }, RowsEditor: function (selector, data) { - new RowsEditorCtor({ - propsData: data - }).$mount(selector) + new RowsEditor({ propsData: data }).$mount(selector) }, Icon: function (selector, data) { - new IconCtor({ - propsData: data - }).$mount(selector) + new Icon({ propsData: data }).$mount(selector) } } diff --git a/resources/views/table/propose/manage-columns.blade.php b/resources/views/table/propose/manage-columns.blade.php index ca34a41..74705ed 100644 --- a/resources/views/table/propose/manage-columns.blade.php +++ b/resources/views/table/propose/manage-columns.blade.php @@ -1,6 +1,25 @@ -@php($tab='manage-columns') +@php + $tab = 'manage-columns'; + /** @var \App\Tables\Column[] $columns */ + /** @var \App\Tables\Changeset $changeset */ + /** @var \App\Models\Table $table */ +@endphp + @extends('table.propose.layout') @section('tab-content') - ... +
@stop + +@push('scripts') + +@endpush