-
-
Notifications
You must be signed in to change notification settings - Fork 669
Migrate the settings page to Tailwind UI and Blade UI Kit #570
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
fa4a360
Move edit password page
joedixon 129824b
Add new form components
joedixon a9b0e3f
wip
joedixon 2b768f4
Wire up settings page
joedixon e38151f
Add account removal
joedixon 83427a1
Fix tests
joedixon 0f23d32
Apply fixes from StyleCI
joedixon 1acc985
Remove sidebar
joedixon dbcd667
Add Twitter handle
joedixon 3aeb673
Apply fixes from StyleCI
joedixon a2c95a0
Convert to anonymous components
joedixon 7b732f8
Comment unused components
joedixon 1683b35
Update formatting
joedixon 27bec3a
Update component attributes
joedixon a5834e1
Enable components
joedixon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| <?php | ||
|
|
||
| use BladeUIKit\Components; | ||
|
|
||
| return [ | ||
|
|
||
| /* | ||
| |-------------------------------------------------------------------------- | ||
| | Components | ||
| |-------------------------------------------------------------------------- | ||
| | | ||
| | Below you reference all components that should be loaded for your app. | ||
| | By default all components from Blade UI Kit are loaded in. You can | ||
| | disable or overwrite any component class or alias that you want. | ||
| | | ||
| */ | ||
|
|
||
| 'components' => [ | ||
| // 'alert' => Components\Alerts\Alert::class, | ||
| 'avatar' => Components\Support\Avatar::class, | ||
| // 'carbon' => Components\DateTime\Carbon::class, | ||
| // 'checkbox' => Components\Forms\Inputs\Checkbox::class, | ||
| // 'color-picker' => Components\Forms\Inputs\ColorPicker::class, | ||
| // 'countdown' => Components\DateTime\Countdown::class, | ||
| // 'cron' => Components\Support\Cron::class, | ||
| // 'dropdown' => Components\Navigation\Dropdown::class, | ||
| // 'easy-mde' => Components\Editors\EasyMDE::class, | ||
| 'email' => Components\Forms\Inputs\Email::class, | ||
| // 'error' => Components\Forms\Error::class, | ||
| 'form' => Components\Forms\Form::class, | ||
| // 'form-button' => Components\Buttons\FormButton::class, | ||
| // 'html' => Components\Layouts\Html::class, | ||
| 'input' => Components\Forms\Inputs\Input::class, | ||
| 'label' => Components\Forms\Label::class, | ||
| // 'logout' => Components\Buttons\Logout::class, | ||
| // 'mapbox' => Components\Maps\Mapbox::class, | ||
| // 'markdown' => Components\Markdown\Markdown::class, | ||
| 'password' => Components\Forms\Inputs\Password::class, | ||
| // 'pikaday' => Components\Forms\Inputs\Pikaday::class, | ||
| // 'social-meta' => Components\Layouts\SocialMeta::class, | ||
| 'textarea' => Components\Forms\Inputs\Textarea::class, | ||
| // 'toc' => Components\Markdown\ToC::class, | ||
| // 'trix' => Components\Editors\Trix::class, | ||
| // 'unsplash' => Components\Support\Unsplash::class, | ||
| ], | ||
|
|
||
| /* | ||
| |-------------------------------------------------------------------------- | ||
| | Livewire Components | ||
| |-------------------------------------------------------------------------- | ||
| | | ||
| | Below you reference all the Livewire components that should be loaded | ||
| | for your app. By default all components from Blade UI Kit are loaded in. | ||
| | | ||
| */ | ||
|
|
||
| 'livewire' => [ | ||
| // | ||
| ], | ||
|
|
||
| /* | ||
| |-------------------------------------------------------------------------- | ||
| | Components Prefix | ||
| |-------------------------------------------------------------------------- | ||
| | | ||
| | This value will set a prefix for all Blade UI Kit components. | ||
| | By default it's empty. This is useful if you want to avoid | ||
| | collision with components from other libraries. | ||
| | | ||
| | If set with "buk", for example, you can reference components like: | ||
| | | ||
| | <x-buk-easy-mde /> | ||
| | | ||
| */ | ||
|
|
||
| 'prefix' => '', | ||
|
|
||
| /* | ||
| |-------------------------------------------------------------------------- | ||
| | Third Party Asset Libraries | ||
| |-------------------------------------------------------------------------- | ||
| | | ||
| | These settings hold reference to all third party libraries and their | ||
| | asset files served through a CDN. Individual components can require | ||
| | these asset files through their static `$assets` property. | ||
| | | ||
| */ | ||
|
|
||
| 'assets' => [ | ||
|
|
||
| 'alpine' => 'https://cdn.jsdelivr.net/gh/alpinejs/alpine@v2.3.5/dist/alpine.min.js', | ||
|
|
||
| 'easy-mde' => [ | ||
| 'https://unpkg.com/easymde/dist/easymde.min.css', | ||
| 'https://unpkg.com/easymde/dist/easymde.min.js', | ||
| ], | ||
|
|
||
| 'mapbox' => [ | ||
| 'https://api.mapbox.com/mapbox-gl-js/v1.8.1/mapbox-gl.css', | ||
| 'https://api.mapbox.com/mapbox-gl-js/v1.8.1/mapbox-gl.js', | ||
| ], | ||
|
|
||
| 'moment' => [ | ||
| 'https://cdn.jsdelivr.net/npm/moment@2.26.0/moment.min.js', | ||
| 'https://cdn.jsdelivr.net/npm/moment-timezone@0.5.31/builds/moment-timezone-with-data.min.js', | ||
| ], | ||
|
|
||
| 'pickr' => [ | ||
| 'https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/classic.min.css', | ||
| 'https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/pickr.min.js', | ||
| ], | ||
|
|
||
| 'pikaday' => [ | ||
| 'https://cdn.jsdelivr.net/npm/pikaday/css/pikaday.css', | ||
| 'https://cdn.jsdelivr.net/npm/pikaday/pikaday.js', | ||
| ], | ||
|
|
||
| 'trix' => [ | ||
| 'https://unpkg.com/trix@1.2.3/dist/trix.css', | ||
| 'https://unpkg.com/trix@1.2.3/dist/trix.js', | ||
| ], | ||
|
|
||
| ], | ||
|
|
||
| ]; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,104 +1,104 @@ | ||
| .form-group { | ||
| .standard .form-group { | ||
| @apply flex flex-col mb-4; | ||
| } | ||
|
|
||
| label { | ||
| .standard label { | ||
| @apply mb-1 text-gray-600 block uppercase text-sm; | ||
| } | ||
|
|
||
| input[type='text'], | ||
| input[type='password'], | ||
| input[type='email'], | ||
| select { | ||
| .standard input[type='text'], | ||
| .standard input[type='password'], | ||
| .standard input[type='email'], | ||
| .standard select { | ||
| @apply h-12; | ||
| } | ||
|
|
||
| input[type='text'], | ||
| input[type='password'], | ||
| input[type='email'], | ||
| textarea, | ||
| select { | ||
| .standard input[type='text'], | ||
| .standard input[type='password'], | ||
| .standard input[type='email'], | ||
| .standard textarea, | ||
| .standard select { | ||
| @apply rounded border-2 p-3 w-full; | ||
| } | ||
|
|
||
| select { | ||
| .standard select { | ||
| @apply appearance-none; | ||
| } | ||
|
|
||
| input.nav-search { | ||
| .standard input.nav-search { | ||
| @apply pl-10 pr-3 py-2; | ||
| } | ||
|
|
||
| input[type='checkbox'] { | ||
| .standard input[type='checkbox'] { | ||
| @apply mr-1; | ||
| } | ||
|
|
||
| .help-block { | ||
| .standard .help-block { | ||
| @apply text-red-500 text-sm; | ||
| } | ||
|
|
||
| /** Markdown editor **/ | ||
| .form-group .editor { | ||
| .standard .form-group .editor { | ||
| @apply rounded-t-none; | ||
| } | ||
|
|
||
| .form-group .editor-toolbar { | ||
| .standard .form-group .editor-toolbar { | ||
| @apply border-2 border-b-0 rounded rounded-b-none border-gray-300; | ||
| } | ||
|
|
||
| .form-group .CodeMirror { | ||
| .standard .form-group .CodeMirror { | ||
| @apply border-2 rounded rounded-t-none border-gray-300; | ||
| } | ||
|
|
||
| /** Choices.js **/ | ||
| .choices__input.choices__input--cloned { | ||
| .standard .choices__input.choices__input--cloned { | ||
| @apply hidden; | ||
| } | ||
|
|
||
| .choices__inner { | ||
| .standard .choices__inner { | ||
| @apply rounded border-2 border-gray-300 w-full bg-white h-12 p-2 flex items-center !important; | ||
| } | ||
|
|
||
| .choices__list--dropdown { | ||
| .standard .choices__list--dropdown { | ||
| @apply border-2 border-gray-300 !important; | ||
| } | ||
|
|
||
| .choices__list--single { | ||
| .standard .choices__list--single { | ||
| @apply p-0 !important; | ||
| } | ||
|
|
||
| .choices__item { | ||
| .standard .choices__item { | ||
| @apply text-sm bg-gray-200 text-gray-700 cursor-pointer rounded px-2 py-1 my-0 border-0 !important; | ||
| } | ||
|
|
||
| .choices__item.choices__item--choice { | ||
| .standard .choices__item.choices__item--choice { | ||
| @apply rounded-none py-2 !important; | ||
| } | ||
|
|
||
| .choices__item.choices__item--choice.choices__item--selectable { | ||
| .standard .choices__item.choices__item--choice.choices__item--selectable { | ||
| @apply bg-white rounded-none text-gray-700 p-2 !important; | ||
| } | ||
|
|
||
| .choices__item.choices__item--choice.choices__item--selectable:hover { | ||
| .standard .choices__item.choices__item--choice.choices__item--selectable:hover { | ||
| @apply bg-gray-200 !important; | ||
| } | ||
|
|
||
| .choices__item.choices__item--selectable { | ||
| .standard .choices__item.choices__item--selectable { | ||
| @apply bg-lio-500 border-lio-500 text-white !important; | ||
| } | ||
|
|
||
| .choices__list--single > .choices__item.choices__item--selectable { | ||
| .standard .choices__list--single > .choices__item.choices__item--selectable { | ||
| @apply bg-white text-gray-700 !important; | ||
| } | ||
|
|
||
| .choices__item.is-highlighted { | ||
| .standard .choices__item.is-highlighted { | ||
| @apply bg-lio-600 border-lio-600 text-white !important; | ||
| } | ||
|
|
||
| .choices[data-type*='select-one']:after { | ||
| .standard .choices[data-type*='select-one']:after { | ||
| border-color: theme('colors.gray.500') transparent transparent transparent !important; | ||
| } | ||
|
|
||
| .choices[data-type*='select-one'] .choices__input { | ||
| .standard .choices[data-type*='select-one'] .choices__input { | ||
| @apply rounded-none border-b-2 border-gray-300 !important; | ||
| } | ||
joedixon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| @props(['type' => 'button']) | ||
|
|
||
| <span class="inline-flex rounded-md shadow-sm"> | ||
| <button type="{{ $type }}" class="bg-red-600 border border-transparent rounded-md py-2 px-4 inline-flex justify-center text-sm leading-5 font-medium text-white hover:bg-red-700 focus:outline-none focus:border-red-900 focus:shadow-outline-red active:bg-red-900 transition duration-150 ease-in-out" {{ $attributes }}> | ||
| {{ $slot }} | ||
| </button> | ||
| </span> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| @props(['type' => 'button']) | ||
|
|
||
| <span class="inline-flex rounded-md shadow-sm"> | ||
| <button type="{{ $type }}" class="bg-lio-600 border border-transparent rounded-md py-2 px-4 inline-flex justify-center text-sm leading-5 font-medium text-white hover:bg-lio-700 focus:outline-none focus:border-lio-900 focus:shadow-outline-lio active:bg-lio-900 transition duration-150 ease-in-out"> | ||
| {{ $slot }} | ||
| </button> | ||
| </span> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.