Skip to content

Commit

Permalink
🎨 updated components views
Browse files Browse the repository at this point in the history
  • Loading branch information
afariasfermin committed Sep 25, 2022
1 parent a8d6166 commit 5888158
Show file tree
Hide file tree
Showing 19 changed files with 1,029 additions and 141 deletions.
4 changes: 2 additions & 2 deletions resources/views/auth/confirm-password.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<x-guest-layout>
<x-jet-authentication-card>
<x-slot name="logo">
<x-jet-authentication-card-logo />
<x-jet-authentication-card-logo class="w-16 h-16" />
</x-slot>

<div class="mb-4 text-sm text-gray-600">
Expand All @@ -15,7 +15,7 @@

<div>
<x-jet-label for="password" value="{{ __('Password') }}" />
<x-jet-input id="password" class="block mt-1 w-full" type="password" name="password" required autocomplete="current-password" autofocus />
<x-jet-input id="password" class="block w-full mt-1" type="password" name="password" required autocomplete="current-password" autofocus />
</div>

<div class="flex justify-end mt-4">
Expand Down
6 changes: 3 additions & 3 deletions resources/views/auth/forgot-password.blade.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<x-guest-layout>
<x-jet-authentication-card>
<x-slot name="logo">
<x-jet-authentication-card-logo />
<x-jet-authentication-card-logo class="w-16 h-16" />
</x-slot>

<div class="mb-4 text-sm text-gray-600">
{{ __('Forgot your password? No problem. Just let us know your email address and we will email you a password reset link that will allow you to choose a new one.') }}
</div>

@if (session('status'))
<div class="mb-4 font-medium text-sm text-green-600">
<div class="mb-4 text-sm font-medium text-green-600">
{{ session('status') }}
</div>
@endif
Expand All @@ -21,7 +21,7 @@

<div class="block">
<x-jet-label for="email" value="{{ __('Email') }}" />
<x-jet-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autofocus />
<x-jet-input id="email" class="block w-full mt-1" type="email" name="email" :value="old('email')" required autofocus />
</div>

<div class="flex items-center justify-end mt-4">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/auth/login.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<x-guest-layout>
<x-jet-authentication-card>
<x-slot name="logo">
<x-jet-authentication-card-logo />
<x-jet-authentication-card-logo class="w-16 h-16" />
</x-slot>

<x-jet-validation-errors class="mb-4" />
Expand Down
16 changes: 8 additions & 8 deletions resources/views/auth/register.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<x-guest-layout>
<x-jet-authentication-card>
<x-slot name="logo">
<x-jet-authentication-card-logo />
<x-jet-authentication-card-logo class="w-16 h-16" />
</x-slot>

<x-jet-validation-errors class="mb-4" />
Expand All @@ -11,22 +11,22 @@

<div>
<x-jet-label for="name" value="{{ __('Name') }}" />
<x-jet-input id="name" class="block mt-1 w-full" type="text" name="name" :value="old('name')" required autofocus autocomplete="name" />
<x-jet-input id="name" class="block w-full mt-1" type="text" name="name" :value="old('name')" required autofocus autocomplete="name" />
</div>

<div class="mt-4">
<x-jet-label for="email" value="{{ __('Email') }}" />
<x-jet-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required />
<x-jet-input id="email" class="block w-full mt-1" type="email" name="email" :value="old('email')" required />
</div>

<div class="mt-4">
<x-jet-label for="password" value="{{ __('Password') }}" />
<x-jet-input id="password" class="block mt-1 w-full" type="password" name="password" required autocomplete="new-password" />
<x-jet-input id="password" class="block w-full mt-1" type="password" name="password" required autocomplete="new-password" />
</div>

<div class="mt-4">
<x-jet-label for="password_confirmation" value="{{ __('Confirm Password') }}" />
<x-jet-input id="password_confirmation" class="block mt-1 w-full" type="password" name="password_confirmation" required autocomplete="new-password" />
<x-jet-input id="password_confirmation" class="block w-full mt-1" type="password" name="password_confirmation" required autocomplete="new-password" />
</div>

@if (Laravel\Jetstream\Jetstream::hasTermsAndPrivacyPolicyFeature())
Expand All @@ -37,8 +37,8 @@

<div class="ml-2">
{!! __('I agree to the :terms_of_service and :privacy_policy', [
'terms_of_service' => '<a target="_blank" href="'.route('terms.show').'" class="underline text-sm text-gray-600 hover:text-gray-900">'.__('Terms of Service').'</a>',
'privacy_policy' => '<a target="_blank" href="'.route('policy.show').'" class="underline text-sm text-gray-600 hover:text-gray-900">'.__('Privacy Policy').'</a>',
'terms_of_service' => '<a target="_blank" href="'.route('terms.show').'" class="text-sm text-gray-600 underline hover:text-gray-900">'.__('Terms of Service').'</a>',
'privacy_policy' => '<a target="_blank" href="'.route('policy.show').'" class="text-sm text-gray-600 underline hover:text-gray-900">'.__('Privacy Policy').'</a>',
]) !!}
</div>
</div>
Expand All @@ -47,7 +47,7 @@
@endif

<div class="flex items-center justify-end mt-4">
<a class="underline text-sm text-gray-600 hover:text-gray-900" href="{{ route('login') }}">
<a class="text-sm text-gray-600 underline hover:text-gray-900" href="{{ route('login') }}">
{{ __('Already registered?') }}
</a>

Expand Down
8 changes: 4 additions & 4 deletions resources/views/auth/reset-password.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<x-guest-layout>
<x-jet-authentication-card>
<x-slot name="logo">
<x-jet-authentication-card-logo />
<x-jet-authentication-card-logo class="w-16 h-16" />
</x-slot>

<x-jet-validation-errors class="mb-4" />
Expand All @@ -13,17 +13,17 @@

<div class="block">
<x-jet-label for="email" value="{{ __('Email') }}" />
<x-jet-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email', $request->email)" required autofocus />
<x-jet-input id="email" class="block w-full mt-1" type="email" name="email" :value="old('email', $request->email)" required autofocus />
</div>

<div class="mt-4">
<x-jet-label for="password" value="{{ __('Password') }}" />
<x-jet-input id="password" class="block mt-1 w-full" type="password" name="password" required autocomplete="new-password" />
<x-jet-input id="password" class="block w-full mt-1" type="password" name="password" required autocomplete="new-password" />
</div>

<div class="mt-4">
<x-jet-label for="password_confirmation" value="{{ __('Confirm Password') }}" />
<x-jet-input id="password_confirmation" class="block mt-1 w-full" type="password" name="password_confirmation" required autocomplete="new-password" />
<x-jet-input id="password_confirmation" class="block w-full mt-1" type="password" name="password_confirmation" required autocomplete="new-password" />
</div>

<div class="flex items-center justify-end mt-4">
Expand Down
10 changes: 5 additions & 5 deletions resources/views/auth/two-factor-challenge.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<x-guest-layout>
<x-jet-authentication-card>
<x-slot name="logo">
<x-jet-authentication-card-logo />
<x-jet-authentication-card-logo class="w-16 h-16" />
</x-slot>

<div x-data="{ recovery: false }">
Expand All @@ -20,16 +20,16 @@

<div class="mt-4" x-show="! recovery">
<x-jet-label for="code" value="{{ __('Code') }}" />
<x-jet-input id="code" class="block mt-1 w-full" type="text" inputmode="numeric" name="code" autofocus x-ref="code" autocomplete="one-time-code" />
<x-jet-input id="code" class="block w-full mt-1" type="text" inputmode="numeric" name="code" autofocus x-ref="code" autocomplete="one-time-code" />
</div>

<div class="mt-4" x-show="recovery">
<x-jet-label for="recovery_code" value="{{ __('Recovery Code') }}" />
<x-jet-input id="recovery_code" class="block mt-1 w-full" type="text" name="recovery_code" x-ref="recovery_code" autocomplete="one-time-code" />
<x-jet-input id="recovery_code" class="block w-full mt-1" type="text" name="recovery_code" x-ref="recovery_code" autocomplete="one-time-code" />
</div>

<div class="flex items-center justify-end mt-4">
<button type="button" class="text-sm text-gray-600 hover:text-gray-900 underline cursor-pointer"
<button type="button" class="text-sm text-gray-600 underline cursor-pointer hover:text-gray-900"
x-show="! recovery"
x-on:click="
recovery = true;
Expand All @@ -38,7 +38,7 @@
{{ __('Use a recovery code') }}
</button>

<button type="button" class="text-sm text-gray-600 hover:text-gray-900 underline cursor-pointer"
<button type="button" class="text-sm text-gray-600 underline cursor-pointer hover:text-gray-900"
x-show="recovery"
x-on:click="
recovery = false;
Expand Down
8 changes: 4 additions & 4 deletions resources/views/auth/verify-email.blade.php
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<x-guest-layout>
<x-jet-authentication-card>
<x-slot name="logo">
<x-jet-authentication-card-logo />
<x-jet-authentication-card-logo class="w-16 h-16" />
</x-slot>

<div class="mb-4 text-sm text-gray-600">
{{ __('Thanks for signing up! Before getting started, could you verify your email address by clicking on the link we just emailed to you? If you didn\'t receive the email, we will gladly send you another.') }}
</div>

@if (session('status') == 'verification-link-sent')
<div class="mb-4 font-medium text-sm text-green-600">
<div class="mb-4 text-sm font-medium text-green-600">
{{ __('A new verification link has been sent to the email address you provided during registration.') }}
</div>
@endif

<div class="mt-4 flex items-center justify-between">
<div class="flex items-center justify-between mt-4">
<form method="POST" action="{{ route('verification.send') }}">
@csrf

Expand All @@ -28,7 +28,7 @@
<form method="POST" action="{{ route('logout') }}">
@csrf

<button type="submit" class="underline text-sm text-gray-600 hover:text-gray-900">
<button type="submit" class="text-sm text-gray-600 underline hover:text-gray-900">
{{ __('Logout') }}
</button>
</form>
Expand Down
4 changes: 1 addition & 3 deletions resources/views/components/application-footer.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
<!-- Logo -->
<div class="flex items-center flex-shrink-0">
<a href="{{ route('dashboard') }}">
<img class="block w-auto h-7" src="{{ asset('svg/droneraising-isologotipo.svg') }}" alt="application-logo">
<x-jet-application-mark class="block w-auto h-9" />
</a>
</div>

<p class="mb-1 text-xs text-gray-700 md:mb-0 dark:text-slate-400">
Made with <i class="text-red-400 fas fa-heart fa-fw" title="Love"></i> by the <a class="hover:text-blue-400 focus:outline-none hover:underline" href="https://solar.droneraising.com" target="_blank">droneraising</a> team.
</p>

<span class="text-xs text-gray-600 dark:text-slate-400">
<i class="text-gray-400 far fa-copyright fa-fw"></i> {{ Carbon::now()->year }} <a class="hover:text-blue-400 focus:outline-none hover:underline" href="https://solar.droneraising.com" target="_blank">droneraising</a>
</span>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/inspections/show.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</div>
@endif

<div x-data="{ tab: '#overview' }">
<div x-data="{ tab: '#map' }">
<nav class="bg-gray-200 border-b-2 border-gray-300 dark:bg-slate-800 dark:border-slate-600">
<div class="px-4 max-w-7xl sm:px-6 lg:px-8">
<div class="flex justify-between h-full md:h-16">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/layouts/app.blade.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<!DOCTYPE html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" class="dark">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="csrf-token" content="{{ csrf_token() }}">

<title>{{ config('app.name', 'droneraising') }}</title>
<title>{{ config('app.name', 'simplemap.io') }}</title>

<!-- Fonts -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layouts/guest.blade.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" class="dark">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
Expand Down
80 changes: 11 additions & 69 deletions resources/views/livewire/asset-management.blade.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<div>
<div x-data="{ tab: '#types' }" class="flex flex-col w-full py-2">
<div class="flex flex-col items-center justify-start md:flex-row">
<button @click="tab = '#types'" :class="{'bg-slate-100 text-slate-900 font-semibold': tab === '#types'}" class="w-full px-4 py-2 mx-2 mb-4 font-medium rounded-md shadow-sm md:mb-0 md:w-auto md:mr-2 md:ml-0 bg-slate-50 text-slate-600">
<i class="mr-2 fa-solid fa-screwdriver-wrench fa-fw"></i> {{ __('Equipment types') }}
</button>
<button @click="tab = '#equipments'" :class="{'bg-slate-100 text-slate-900 font-semibold': tab === '#equipments'}" class="w-full px-4 py-2 mx-2 mb-4 font-medium rounded-md shadow-sm md:w-auto md:mb-0 md:mx-2 bg-slate-50 text-slate-600">
<i class="mr-2 fa-solid fa-warehouse fa-fw"></i> {{ __('Equipments') }}
</button>
<div class="flex flex-col items-center justify-start space-x-2 border-b dark:border-slate-700 border-slate-100 md:flex-row">
<div class="flex flex-col items-center justify-center w-full p-2" :class="{'border-b-2 border-blue-500': tab === '#types'}">
<button @click="tab = '#types'" :class="{'dark:text-slate-200 text-slate-700 font-bold': tab === '#types'}" class="w-full px-4 py-2 font-medium rounded-lg hover:shadow-sm hover:shadow-slate-200 dark:hover:shadow-slate-700 hover:bg-slate-50 dark:hover:bg-slate-600/25 dark:text-slate-500 text-slate-600">
<i class="mr-2 fa-solid fa-gear fa-fw text-slate-400"></i> {{ __('Equipment types') }}
</button>
</div>
<div class="flex flex-col items-center justify-center w-full p-2" :class="{'border-b-2 border-blue-500': tab === '#equipments'}">
<button @click="tab = '#equipments'" :class="{'dark:text-slate-200 text-slate-700 font-bold': tab === '#equipments'}" class="w-full px-4 py-2 font-medium rounded-lg hover:shadow-sm hover:shadow-slate-200 dark:hover:shadow-slate-700 hover:bg-slate-50 dark:hover:bg-slate-600/25 dark:text-slate-500 text-slate-600">
<i class="mr-2 fa-solid fa-toolbox fa-fw text-slate-400"></i> {{ __('Equipments') }}
</button>
</div>
</div>

<div class="w-full mt-4" x-show="tab === '#types'" @cloak>
Expand All @@ -33,66 +37,4 @@
<livewire:equipment-management :site="$site">
</div>
</div>

{{-- <x-jet-action-message class="p-4 my-2 bg-blue-500 border-2 border-blue-400 rounded-lg shadow-sm" on="imported">
<p class="inline-flex items-center text-base text-blue-200">
<i class="p-1 mr-2 text-blue-200 bg-blue-400 border border-blue-400 rounded-md shadow-sm fa-solid fa-info fa-fw"></i> {{ __('The files were imported successfully') }}
</p>
</x-jet-action-message>
<x-jet-action-message class="p-4 my-2 border-2 rounded-lg shadow-sm bg-rose-500 border-rose-400" on="error">
<p class="inline-flex items-center text-base text-rose-200">
<i class="p-1 mr-2 border rounded-md shadow-sm text-rose-200 bg-rose-400 border-rose-400 fa-solid fa-exclamation fa-fw"></i> {{ __('An unexpected error has occurred') }}
</p>
</x-jet-action-message> --}}

{{-- <livewire:panel-table :panels="$panels"> --}}

{{-- Import CSV data modal --}}
{{-- <x-jet-dialog-modal wire:model="showImportModal">
<x-slot name="title">{{ __('Upload CSV file') }}</x-slot>
<x-slot name="content">
<p class="text-base text-slate-900">
{{ __('You can choose a resource to import them into and match up headings from the CSV to the appropriate fields of the resource.') }}
</p>
<div class="hidden mt-4 md:block">
<h3 class="font-semibold text-slate-900">{{ __('CSV example') }}</h3>
<p class="text-slate-700">
{{ __('We will use the following file ') }} <code class="p-1 font-semibold text-blue-600 bg-blue-200 rounded-md shadow-sm">file.csv</code> {{ __(' containing the following data:') }}
<div class="w-full p-4 my-4 text-xs text-indigo-200 bg-indigo-600 border-2 border-indigo-400 rounded-md shadow-sm">
<code class="flex m-0 text-left">
panel_id,panel_serial,panel_zone,panel_sub_zone,panel_string
80,N/A,20,20B,17
63,01060630000,20,N/A,01
75,01060750000,20,20B,17
51,03024510000,20,03,024
</code>
</div>
</p>
</div>
@error('file') <span class="p-4 my-3 border-2 rounded-md shadow-sm bg-rose-500 text-rose-200 border-rose-400">{{ $message }}</span> @enderror
<div class="inline-flex w-full my-4">
<div class="inline-flex items-center justify-center w-1/6 px-4 py-3 font-semibold tracking-widest transition bg-white border-2 border-r rounded-l-lg shadow-sm cursor-pointer text-slate-900 border-slate-200 hover:text-slate-800 focus:outline-none focus:border-blue-300 focus:ring focus:ring-blue-200 active:text-slate-800 active:bg-slate-50 disabled:opacity-25">
<i class="mr-2 cursor-pointer fas fa-folder-open fa-fw fa-lg text-slate-500"></i>
<input wire:model="file" id="file" name="file" class="absolute w-1/6 opacity-0 cursor-pointer pin-x pin-y" type="file" accept="text/csv">
</div>
<input wire:model="filename" class="w-5/6 px-4 py-3 text-gray-600 border-2 border-l rounded-r-lg shadow-sm bg-slate-50 border-slate-200 focus:border-blue-300 focus:ring focus:ring-blue-200 focus:ring-opacity-50" type="text" readonly disabled>
</div>
</x-slot>
<x-slot name="footer">
<div class="inline-flex items-center">
<x-jet-secondary-button wire:click="$toggle('showImportModal')" wire:loading.attr="disabled">
{{ __('Nevermind') }}
</x-jet-secondary-button>
<x-jet-button class="ml-2" wire:click="import" wire:loading.attr="disabled">
<i class="mr-2 text-blue-300 fa-solid fa-cloud-arrow-up fa-fw"></i> {{ __('Upload file') }}
</x-jet-button>
</div>
</x-slot>
</x-jet-dialog-modal> --}}
</div>
4 changes: 2 additions & 2 deletions resources/views/livewire/contact-form-dialog-modal.blade.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div>
<div class="ml-2">
<span class="inline-flex rounded-md">
<button wire:click="$toggle('confirmingContactFormSubmission')" type="button" class="inline-flex items-center px-3 py-2 mr-2 text-sm font-medium leading-4 text-gray-500 transition duration-150 ease-in-out bg-white border border-transparent rounded-md dark:text-slate-400 dark:bg-slate-900 hover:text-gray-700 dark:hover:bg-slate-800 dark:hover:text-white focus:outline-none">
<button wire:click="$toggle('confirmingContactFormSubmission')" type="button" class="inline-flex items-center px-3 py-2 text-sm font-medium leading-4 text-gray-500 transition duration-150 ease-in-out bg-white border border-transparent rounded-md dark:text-slate-400 dark:bg-slate-900 hover:text-gray-700 dark:hover:bg-slate-800 dark:hover:text-white focus:outline-none">
<i class="fas fa-headset fa-fw fa-lg"></i>
</button>
</span>
Expand Down
Loading

0 comments on commit 5888158

Please sign in to comment.