diff --git a/public/img/icon-members.svg b/public/img/icon-members.svg new file mode 100644 index 0000000..6259c8c --- /dev/null +++ b/public/img/icon-members.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/public/img/icon-project-summary.svg b/public/img/icon-project-summary.svg new file mode 100644 index 0000000..7245a52 --- /dev/null +++ b/public/img/icon-project-summary.svg @@ -0,0 +1,4 @@ + + + + diff --git a/public/img/logo-light.png b/public/img/logo-light.png new file mode 100644 index 0000000..5a3dcab Binary files /dev/null and b/public/img/logo-light.png differ diff --git a/resources/views/layout/core/header.blade.php b/resources/views/layout/core/header.blade.php new file mode 100644 index 0000000..9744818 --- /dev/null +++ b/resources/views/layout/core/header.blade.php @@ -0,0 +1,21 @@ +
+

+ + + +

+ + +
\ No newline at end of file diff --git a/resources/views/layout/core/layout-full.blade.php b/resources/views/layout/core/layout-full.blade.php new file mode 100644 index 0000000..a27229d --- /dev/null +++ b/resources/views/layout/core/layout-full.blade.php @@ -0,0 +1,11 @@ +
+ @include('layout.core.project-management-aside') + +
+ @include('layout.core.header') + +
+ @yield('content') +
+
+
\ No newline at end of file diff --git a/resources/views/layout/core/layout-partial.blade.php b/resources/views/layout/core/layout-partial.blade.php new file mode 100644 index 0000000..d5f9867 --- /dev/null +++ b/resources/views/layout/core/layout-partial.blade.php @@ -0,0 +1,7 @@ +
+ @include('layout.core.header') + +
+ @yield('content') +
+
\ No newline at end of file diff --git a/resources/views/layout/core/layout.blade.php b/resources/views/layout/core/layout.blade.php new file mode 100644 index 0000000..98c3952 --- /dev/null +++ b/resources/views/layout/core/layout.blade.php @@ -0,0 +1,21 @@ + + + + + + + + {{$title ?? 'Diagier'}} + @vite('resources/css/app.css') + + + + @if(Route::is('tasks.index')) + @include('layout.core.layout-full') + @else + @include('layout.core.layout-partial') + @endif + + + + \ No newline at end of file diff --git a/resources/views/layout/core/project-management-aside.blade.php b/resources/views/layout/core/project-management-aside.blade.php new file mode 100644 index 0000000..f66c3a9 --- /dev/null +++ b/resources/views/layout/core/project-management-aside.blade.php @@ -0,0 +1,28 @@ + \ No newline at end of file diff --git a/resources/views/pages/tasks/index.blade.php b/resources/views/pages/tasks/index.blade.php index 7da77c7..6ed8a80 100644 --- a/resources/views/pages/tasks/index.blade.php +++ b/resources/views/pages/tasks/index.blade.php @@ -1,82 +1,73 @@ -@extends('layout.layout') +@extends('layout.core.layout') @section('content') -
-
- -

- Tasks -

-
-
-

Tasks

-
-
-
- - - - - - - - - - - - - - - - - @foreach($tasks as $task) - - - - - - - - - - - - - @endforeach - -
IDNameDescriptionCommentsSprintPriorityStatusDeveloperProjectActions
{{ $task->id }}{{ $task->name }}{{ $task->description }}{{ $task->comments }}{{ $task->sprint->format('d/m/Y') }}{{ $task->priority }}{{ $task->status }}{{ $task->developer ? $task->developer->name : 'N/A' }}{{ $task->project ? $task->project->name : 'N/A' }} -
- @can('update', $task) - edit - @endcan -
- @csrf - @method('DELETE') - @can('delete', $task) - - @endcan -
-
-
-
-
- {{ $tasks->links() }} -
- @can('create', App\Models\Task::class) -
- Create -
- @endcan -
+
+ + +
+

Tasks

+ + + + + + + + + + + + + + + + + + @foreach($tasks as $task) + + + + + + + + + + + + + @endforeach + +
IDNameDescriptionCommentsSprintPriorityStatusDeveloperProjectActions
{{ $task->id }}{{ $task->name }}{{ $task->description }}{{ $task->comments }}{{ $task->sprint->format('d/m/Y') }}{{ $task->priority }}{{ $task->status }}{{ $task->developer ? $task->developer->name : 'N/A' }}{{ $task->project ? $task->project->name : 'N/A' }} +
+ @can('update', $task) + edit + @endcan +
+ @csrf + @method('DELETE') + @can('delete', $task) + + @endcan +
+
+
+ +
{{ $tasks->links() }}
+ + @can('create', App\Models\Task::class) +
+ Create
+ @endcan
-
-@endsection + +@endsection \ No newline at end of file diff --git a/tailwind.config.js b/tailwind.config.js index ca9f758..aec6e04 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -20,6 +20,11 @@ export default { screens: { "custom-xl": "1200px", }, + colors: { + main: { + 400: "#4EA2A5", + }, + }, }, }, plugins: [],