Skip to content

Remove tailwind UI check #812

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.

Sign up for GitHub

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 8 commits into from
Jan 14, 2022
Merged

Remove tailwind UI check #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
859032c
Remove tailwind ui check
joedixon Jan 13, 2022
6566283
Refactor login page
joedixon Jan 13, 2022
af600e7
Refactor register page
joedixon Jan 13, 2022
df5f819
Refactor verify page
joedixon Jan 13, 2022
02ae305
Refactor password reset page
joedixon Jan 13, 2022
c9c0186
Refactor password reset page
joedixon Jan 13, 2022
f1bf607
Update formatting
joedixon Jan 13, 2022
c671b68
Update tests
joedixon Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion resources/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

@import 'articles.css';
@import 'buttons.css';
@import 'forms.css';
@import 'labels.css';
@import 'modal.css';
@import 'replies.css';
Expand Down
104 changes: 0 additions & 104 deletions resources/css/forms.css
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion resources/views/articles/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@title('Write your article')

@extends('layouts.default', ['isTailwindUi' => true])
@extends('layouts.default')

@section('subnav')
<div class="bg-white border-b">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/articles/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@title('Edit your article')

@extends('layouts.default', ['isTailwindUi' => true])
@extends('layouts.default')

@section('subnav')
<div class="bg-white border-b">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/articles/overview.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@title('Community Articles')
@canonical($canonical)

@extends('layouts.default', ['isTailwindUi' => true])
@extends('layouts.default')

@section('content')
<div class="bg-white pt-5 lg:pt-2">
Expand Down
86 changes: 54 additions & 32 deletions resources/views/auth/login.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,62 @@
@title('Login')
@title('Sign in to your account')

@extends('layouts.small')

@section('small-content')
<form action="{{ route('login.post') }}" method="POST" class="w-full">
@csrf

@formGroup('username')
<label for="username">Username</label>
<input type="text" id="username" name="username" required class="form-control" />
@error('username')
@endFormGroup

@formGroup('password')
<label for="password">Password</label>
<input type="password" id="password" name="password" required class="form-control" />
@error('password')
@endFormGroup

<div class="form-group">
<label>
<input name="remember" type="checkbox" value="1">
Remember login
</label>
<x-buk-form action="{{ route('login.post') }}" method="POST" class="space-y-6">
<div>
<x-forms.label for="username" />

<x-forms.inputs.input name="username" id="username" required />
</div>

<button type="submit" class="w-full button button-primary mb-4">Login</button>
<a href="{{ route('login.github') }}" class="button button-dark mb-4">
<span class="flex items-center justify-center">
<x-icon-github class="inline h-4 w-4 mr-2" />
Github
</span>
</a>
</form>
@endsection
<div>
<x-forms.label for="password" />

<x-forms.inputs.password name="password" id="password" required />
</div>

<div class="flex items-center justify-between">
<x-forms.inputs.checkbox name="remember" id="remember">
Remember me
</x-forms.inputs.checkbox>

<div class="text-sm">
<a href="{{ route('password.forgot') }}" class="font-medium text-lio-600 hover:text-lio-500">
Forgot your password?
</a>
</div>
</div>

@section('small-content-after')
<a href="{{ route('password.forgot') }}" class="block text-center text-lio-700">Forgot your password?</a>
<div class="w-full">
<x-buttons.primary-button type="submit" fullWidth>
Sign in
</x-buttons.primary-button>
</div>
</x-buk-form>

<div class="mt-6">
<div class="relative">
<div class="absolute inset-0 flex items-center">
<div class="w-full border-t border-gray-300"></div>
</div>

<div class="relative flex justify-center text-sm">
<span class="px-2 bg-white text-gray-500">
Or continue with
</span>
</div>
</div>

<div class="mt-6">
<div>
<x-buttons.secondary-button href="{{ route('login.github') }}" fullWidth>
<span class="flex items-center gap-x-2">
<x-icon-github class="h-5 w-5 text-gray-500" />
<span>Sign in with GitHub</span>
</span>
</x-buttons.secondary-button>
</div>
</div>
</div>
@endsection
18 changes: 9 additions & 9 deletions resources/views/auth/passwords/email.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
@section('small-content')
<p class="mb-4">{{ Session::get('status', 'Please fill in your email address below.') }}</p>

<form action="{{ route('password.forgot.post') }}" method="POST" class="w-full">
@csrf
<x-buk-form action="{{ route('password.forgot.post') }}" method="POST" class="space-y-6">
<div>
<x-forms.label for="email" />

@formGroup('email')
<label for="email" name="email">Email</label>
<input type="email" id="email" name="email" class="form-control" required />
@error('email')
@endFormGroup
<x-forms.inputs.email name="email" id="email" required />
</div>

<button type="submit" class="w-full button button-primary">Send Password Reset Link</button>
</form>
<x-buttons.primary-button type="submit" fullWidth>
Send Password Reset Link
</x-buttons.primary-button>
</x-buk-form>
@endsection
40 changes: 21 additions & 19 deletions resources/views/auth/passwords/reset.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,29 @@
@extends('layouts.small')

@section('small-content')
<form action="{{ route('password.reset.post') }}" method="POST" class="w-full">
@csrf
<x-buk-form action="{{ route('password.reset.post') }}" method="POST" class="space-y-6">
<input type="hidden" name="token" value="{{ $token }}" />

@formGroup('email')
<label for="email">Email</label>
<input type="email" id="email" name="email" class="form-control" required />
@error('email')
@endFormGroup

@formGroup('password')
<label for="password">Password</label>
<input type="password" id="password" name="password" class="form-control" required />
@error('password')
@endFormGroup

<div class="form-group">
<label for="password_confirmation">Password Confirmation</label>
<input type="password" id="password_confirmation" name="password_confirmation" class="form-control" required />
<div>
<x-forms.label for="email" />

<x-forms.inputs.email name="email" id="email" required />
</div>

<div>
<x-forms.label for="password" />

<x-forms.inputs.password name="password" id="password" required />
</div>

<div>
<x-forms.label for="password_confirmation" />

<x-forms.inputs.password name="password_confirmation" id="password_confirmation" required />
</div>

<input type="submit" class="w-full button button-primary" value="Reset Password"/>
</form>
<x-buttons.primary-button type="submit" fullWidth>
Reset Password
</x-buttons.primary-button>
</x-buk-form>
@endsection
Loading