Merge remote-tracking branch 'origin/main'

# Conflicts:
#	routes/web.php
This commit is contained in:
c.girardi
2024-02-17 16:50:53 +01:00
19 changed files with 422 additions and 46 deletions

View File

@@ -1,7 +1,7 @@
@props(['messages'])
@if ($messages)
<ul {{ $attributes->merge(['class' => 'text-danger text-sm text-red-600 dark:text-red-400 space-y-1']) }}>
<ul {{ $attributes->merge(['class' => 'alert alert-danger text-sm text-red-600 dark:text-red-400 space-y-1']) }}>
@foreach ((array) $messages as $message)
<li>{{ $message }}</li>
@endforeach

View File

@@ -14,6 +14,8 @@
<tr>
<td>{{ $item->{$fields[0]} }}</td>
<td>{{ $item->{$fields[1]} }}</td>
<td> <a href="edit_record/{{ $item->id }}"><button class="btn btn-primary">Edit</button> </a> </td>
<td> <a href="delete_record/{{ $item->id }}"><button class="btn btn-danger">Delete</button> </a> </td>
</tr>
@empty
<tr>

View File

@@ -1,25 +1,4 @@
<x-app-layout>
{{-- <table class="table table-striped">--}}
{{-- <thead>--}}
{{-- <tr>--}}
{{-- <th>Word</th>--}}
{{-- <th>Translation</th>--}}
{{-- </tr>--}}
{{-- </thead>--}}
{{-- <tbody>--}}
{{-- @forelse ($words as $word)--}}
{{-- <tr>--}}
{{-- <td>{{$word->name}}</td>--}}
{{-- <td>{{$word->translation}}</td>--}}
{{-- </tr>--}}
{{-- @empty--}}
{{-- <tr>--}}
{{-- <td class="text-center" colspan="2">No words</td>--}}
{{-- </tr>--}}
{{-- @endforelse--}}
{{-- </tbody>--}}
{{-- </table>--}}
<x-slot name="header">
<h2 class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
{{ __('Table Words') }}
@@ -27,17 +6,29 @@
</x-slot>
<div class="py-12">
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8 space-y-6">
<div class="p-4 sm:p-8 bg-white dark:bg-gray-800 shadow sm:rounded-lg">
<div class="max-w-xl">
@include('words.partials.insert-word-form')
<div class="row">
<div class="col-lg-7 col-xl-8 grid-margin stretch-card">
<div class="card">
<div class="card-body">
<div class="p-4 sm:p-8 bg-white dark:bg-gray-800 shadow sm:rounded-lg">
<div class="max-w-xl">
@include('words.partials.insert-word-form')
</div>
</div>
</div>
</div>
</div>
<div class="col-lg-5 col-xl-4 grid-margin stretch-card">
<div class="card">
<div class="card-body">
<div class="p-4 sm:p-8 bg-white dark:bg-gray-800 shadow sm:rounded-lg">
<div class="max-w-xl">
@include('words.partials.upload-file')
</div>
</div>
</div>
</div>
</div>
{{--<div class="p-4 sm:p-8 bg-white dark:bg-gray-800 shadow sm:rounded-lg">--}}
{{-- <div class="max-w-xl">--}}
{{-- @include('words.partials.modify-word-form')--}}
{{-- </div>--}}
{{--</div>--}}
</div>
</div>
<x-table :items="$words" :fields="array('name','translation')" />

View File

@@ -0,0 +1,32 @@
<x-app-layout>
<section>
<header>
<h2 class="text-lg font-medium text-gray-900 dark:text-gray-100">
{{ __('Insert Word') }}
</h2>
<p class="mt-1 text-sm text-gray-600 dark:text-gray-400">
{{ __("Enter the word Italian and its dialect translation") }}
</p>
</header>
<form method="post" action="{{ route('words.update', $id) }}" class="mt-6 space-y-6">
@csrf
<div>
<x-input-label for="name" :value="__('Italian Word')" />
<x-text-input id="name" name="name" value="{{$name}}" type="text" class="mt-1 block w-full" placeholder="Italian Word" required autofocus autocomplete="name"/>
<x-input-error :messages="$errors->get('name')" class="mt-2" />
</div>
<div>
<x-input-label for="translation" :value="__('Dialect Word')" />
<x-text-input id="translation" name="translation" value="{{$translation}}" type="text" class="mt-1 block w-full" placeholder="Dialectic Word" required autofocus autocomplete="translation" />
<x-input-error :messages="$errors->get('translation')" class="mt-2" />
</div>
<div class="flex items-center gap-4">
<x-primary-button>{{ __('Submit') }}</x-primary-button>
</div>
</form>
</section>
</x-app-layout>

View File

@@ -14,19 +14,18 @@
<div>
<x-input-label for="name" :value="__('Italian Word')" />
<x-text-input id="name" name="name" type="text" class="mt-1 block w-full" placeholder="Italian Word"/>
<x-text-input id="name" name="name" type="text" class="mt-1 block w-full" placeholder="Italian Word" autofocus autocomplete="name"/>
<x-input-error :messages="$errors->get('name')" class="mt-2" />
</div>
<div>
<x-input-label for="translation" :value="__('Dialect Word')" />
<x-text-input id="translation" name="translation" type="text" class="mt-1 block w-full" placeholder="Dialectic Word"/>
<x-text-input id="translation" name="translation" type="text" class="mt-1 block w-full" placeholder="Dialectic Word" autofocus autocomplete="translation" />
<x-input-error :messages="$errors->get('translation')" class="mt-2" />
</div>
<div class="flex items-center gap-4">
<button type="submit" class="btn btn-primary me-2">Submit</button>
<x-primary-button>{{ __('Submit') }}</x-primary-button>
</div>
</form>
</section>

View File

@@ -0,0 +1,22 @@
<section>
<header>
<h2 class="text-lg font-medium text-gray-900 dark:text-gray-100">
{{ __('Upload CSV File ') }}
</h2>
<p class="mt-1 text-sm text-gray-600 dark:text-gray-400">
{{ __("Upload file to add group of word in db") }}
</p>
</header>
<form action="{{ route('store') }}" method="post" class="mt-6 space-y-6" enctype="multipart/form-data">
@csrf
<x-text-input type="file" id="filetoinsert" name="filetoinsert"/>
<x-input-error class="mt-2" :messages="$errors->get('filetoinsert')" />
<div class="flex items-center gap-4">
<br>
<x-primary-button>{{ __('Submit') }}</x-primary-button>
</div>
</form>
</section>