app/Http/Controllers/HabitController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Requests\HabitsRequest;
 use App\Models\Habit;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -21,20 +20,12 @@ public function create()
         return view('habits.create');
     }
 
-    public function store(HabitsRequest $request)
+    public function store(Request $request)
     {
-        dd($request);
     }
 
     public function show($id)
     {
-        $habit = Habit::find($id);
-
-        return view('habits.show', [
-            'habit' => $habit,
-            'entries' => $habit->habitEntries->sortByDesc('date')
-        ]);
-
     }
 
     public function edit($id)

app/Http/Requests/HabitsRequest.php

@@ -9,8 +9,7 @@ class HabitsRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'name' => ['required', 'string'],
+            'name' => ['required'],
-            ''
         ];
     }
 

app/Models/Habit.php

@@ -13,15 +13,7 @@ class Habit extends Model
 
     protected $fillable = [
         'name',
-        'user_id',
+        'user_id'
-        'type',
-        'value',
-        'suffix',
-        'schedule_value',
-        'schedule_unit',
-        'goal_type',
-        'goal_value',
-        'goal_unit'
     ];
 
     public function habitEntries(): HasMany {

app/Models/HabitEntry.php

@@ -12,8 +12,7 @@ class HabitEntry extends Model
     use HasFactory;
 
     protected $fillable = [
-        'date',
+        'date'
-        'note'
     ];
 
     public function habit(): BelongsTo

database/factories/HabitEntryFactory.php

@@ -12,8 +12,7 @@ class HabitEntryFactory extends Factory
     public function definition()
     {
         return [
-            'date' => $this->faker->dateTimeThisYear(),
+            'date' => $this->faker->dateTimeThisYear()
-            'note' => $this->faker->sentence
         ];
     }
 }

database/migrations/2023_05_14_125243_create_habits_table.php

@@ -13,20 +13,6 @@ public function up()
             $table->foreignId('user_id')->constrained();
             $table->string('name')->default("");
 
-            // Type
-            $table->string('type')->default("todo");          // To do, value
-            $table->float('value')->nullable();                     // Amount of suffix
-            $table->string('suffix')->nullable();                   // Habit action
-
-            // Schedule
-            $table->integer('schedule_value')->default("1");  // How many schedule_units?
-            $table->string('schedule_unit')->default("day");  // Days, weeks, months
-
-            // Goal
-            $table->string('goal_type')->default('none');     // None, schedule, custom
-            $table->integer('goal_value')->nullable();              // Every how many goal_units?
-            $table->string('goal_unit')->nullable();                // Days, weeks, months
-
             $table->timestamps();
         });
     }

database/migrations/2023_05_14_131716_create_habit_entries_table.php

@@ -11,8 +11,7 @@ public function up()
             $table->id();
 
             $table->foreignId('habit_id')->constrained();
-            $table->date('date')->default(now());
+            $table->date('date');
-            $table->string('note')->default("");
 
             $table->timestamps();
         });

database/seeders/DatabaseSeeder.php

@@ -25,7 +25,7 @@ public function run(): void
 
         Habit::factory()
             ->count(5)
-            ->has(HabitEntry::factory()->count(50))
+            ->has(HabitEntry::factory()->count(70))
             ->create();
 
     }

resources/views/habits/create.blade.php

@@ -1,18 +1,17 @@
 <x-app-layout>
     <x-slot name="header">
         <h2 class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
-            {{ __('create new habit') }}
+            {{ __('Create New Habit') }}
         </h2>
     </x-slot>
 
     <div class="py-12">
         <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
             <div class="bg-white dark:bg-gray-800 overflow-hidden shadow-md sm:rounded-lg">
-
                 <div class="p-6 text-gray-900 dark:text-gray-100">
+
                     <div class="w-1/2">
                         <form action="{{route('habits.store') }}" method="post">
-                            @csrf
 
                             <!-- Name -->
                             <div>
@@ -25,32 +24,30 @@
 
                             <!-- Type -->
                             <div class="mt-6">
-                                <x-input-label for="habit_type" value="Habit Type"></x-input-label>
+                                <x-input-label value="Habit Type"></x-input-label>
                                 <div class="flex items-center mb-1">
                                     <!-- Radio button 1 -->
-                                    <input id="habit-type-1" type="radio" value="todo" name="type"
+                                    <input id="habit-type-1" type="radio" value="todo" name="habit-type"
                                            onclick="toggleHabitValueSuffix(true)"
                                            class="w-4 h-4 text-blue-600 bg-gray-50 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
                                     <label for="habit-type-1" class="ml-2">Todo / done</label>
                                 </div>
                                 <div class="flex items-center mb-1">
-                                    <input id="habit-type-2" type="radio" value="value" name="type"
+                                    <input id="habit-type-2" type="radio" value="value" name="habit-type"
                                            onclick="toggleHabitValueSuffix(false)"
                                            class="w-4 h-4 text-blue-600 bg-gray-50 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
                                     <label for="habit-type-2" class="ml-2 ">Value / suffix</label>
                                 </div>
 
                                 <!-- Value / Suffix -->
-                                <x-input-label for="value" value="Value and suffix" class="mt-4"
+                                <x-input-label for="suffix" value="Value and suffix" class="mt-4" id="habit-suffix-label"/>
-                                               id="habit-suffix-label"/>
 
                                 <x-text-input id="habit-value-amount" class="inline-block mt-1" type="number"
                                               placeholder="Numeric value" min="0"
-                                              name="value" disabled/>
+                                              name="habit-value-amount" disabled/>
-                                <x-input-error :messages="$errors->get('value')" class="mt-2"/>
 
                                 <x-text-input id="habit-suffix-name" class="inline-block mt-1 disabled:opacity-50"
-                                              type="text" name="suffix" disabled
+                                              type="text" name="habit-suffix-name" disabled
                                               placeholder="Suffix"
                                               :value="old('suffix')" required autofocus autocomplete="suffix"/>
                                 <x-input-error :messages="$errors->get('suffix')" class="mt-2"/>
@@ -59,10 +56,10 @@ class="w-4 h-4 text-blue-600 bg-gray-50 border-gray-300 focus:ring-blue-500 dark
 
                             <!-- Schedule -->
                             <div class="mt-6">
-                                <x-input-label for="schedule-value" value="Schedule"></x-input-label>
+                                <x-input-label for="schedule-unit" value="Schedule"></x-input-label>
-                                <x-text-input id="schedule-value" class="inline-block mt-1" type="number"
+                                <x-text-input id="schedule-amount" class="inline-block mt-1" type="number"
                                               placeholder="Numeric value" min="0"
-                                              name="schedule-value"/>
+                                              name="schedule-amount"/>
 
                                 <select name="schedule-unit" id="schedule-unit"
                                         class="inline-block w-1/2 border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm">
@@ -77,23 +74,22 @@ class="inline-block w-1/2 border-gray-300 dark:border-gray-700 dark:bg-gray-900
                             <div class="mt-6">
                                 <x-input-label value="Goal Type"></x-input-label>
                                 <div class="text-sm my-3">
-                                    Adding a goal changes the display mode from the value and suffix to a calculated
+                                    Adding a goal changes the display mode from the value and suffix to a calculated percentage.
-                                    percentage.
                                 </div>
                                 <div class="flex items-center mb-1">
-                                    <input id="goal-type-1" type="radio" value="none" name="goal_type"
+                                    <input id="goal-type-1" type="radio" value="none" name="goal-type"
                                            onclick="toggleGoalSchedule(true)"
                                            class="w-4 h-4 text-blue-600 bg-gray-50 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
                                     <label for="goal-type-1" class="ml-2">No goal</label>
                                 </div>
                                 <div class="flex items-center mb-1">
-                                    <input id="goal-type-2" type="radio" value="schedule" name="goal_type"
+                                    <input id="goal-type-2" type="radio" value="schedule" name="goal-type"
                                            checked="checked" onclick="toggleGoalSchedule(true)"
                                            class="w-4 h-4 text-blue-600 bg-gray-50 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
                                     <label for="goal-type-2" class="ml-2 ">Same as schedule</label>
                                 </div>
                                 <div class="flex items-center mb-1">
-                                    <input id="goal-type-3" type="radio" value="custom" name="goal_type"
+                                    <input id="goal-type-3" type="radio" value="custom" name="goal-type"
                                            onclick="toggleGoalSchedule(false)"
                                            class="w-4 h-4 text-blue-600 bg-gray-50 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
                                     <label for="goal-type-3" class="ml-2 ">Custom schedule</label>
@@ -106,9 +102,9 @@ class="w-4 h-4 text-blue-600 bg-gray-50 border-gray-300 focus:ring-blue-500 dark
 
                                 <x-text-input id="goal-schedule-amount" class="inline-block mt-1" type="number"
                                               placeholder="Numeric value" min="0" disabled
-                                              name="goal_value"/>
+                                              name="goal-schedule-amount"/>
 
-                                <select name="goal_unit" id="goal-schedule-unit"
+                                <select name="goal-schedule-unit" id="goal-schedule-unit"
                                         disabled
                                         class="inline-block w-1/2 border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm disabled:opacity-50">
                                     <option value="day">Days</option>
@@ -119,12 +115,6 @@ class="inline-block w-1/2 border-gray-300 dark:border-gray-700 dark:bg-gray-900
 
                             <!-- Priority -->
 
-                            <hr class="my-4">
-                            <!-- Submit -->
-                            <div class="mt-4">
-                                <x-primary-button>Create habit</x-primary-button>
-                            </div>
-
                         </form>
                     </div>
 

resources/views/habits/index.blade.php

@@ -17,7 +17,6 @@
                     <br>
 
                     {{--                    Table--}}
-
                     <table class="table-auto text-left text-gray-500 dark:text-gray-400">
                         <thead class="text-gray-900 bg-gray-100 dark:bg-gray-700 dark:text-gray-200">
                         <tr>
@@ -25,10 +24,10 @@
                                 Habits
                             </th>
                             <th scope="col" class="px-6 py-2">
-                                {{--                                Edit--}}
+{{--                                Edit--}}
                             </th>
                             <th scope="col" class="px-6 py-2">
-                                {{--                                Delete--}}
+{{--                                Delete--}}
                             </th>
                             <th>
 
@@ -44,7 +43,8 @@
                                 <td class="px-4 py-2">
                                     <form action="{{route('habits.show', $habit)}}" method="get">
                                         @csrf
-                                        <x-secondary-button type="submit">View</x-secondary-button>
+                                        <x-secondary-button>View</x-secondary-button>
+
                                     </form>
                                 </td>
                                 <td class="px-4 py-2">
@@ -64,10 +64,7 @@
                         </tbody>
                     </table>
                 </div>
-            </div>
+
-        </div>
-    </div>
-</x-app-layout>
 
 
                 {{--                    <div class="w-auto inline-block">--}}
@@ -103,3 +100,8 @@
                 {{--                    </div>--}}
 
 
+            </div>
+        </div>
+    </div>
+    </div>
+</x-app-layout>

resources/views/habits/show.blade.php

@@ -1,49 +0,0 @@
-<x-app-layout>
-    <x-slot name="header">
-        <h2 class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
-            {{ __('Habit Details') }}
-        </h2>
-    </x-slot>
-
-    <div class="py-6">
-        <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
-            <div class="bg-white dark:bg-gray-800 overflow-hidden shadow-md sm:rounded-lg">
-                <div class="p-6 text-gray-900 dark:text-gray-100">
-                    {{ $habit->name }}
-                </div>
-            </div>
-        </div>
-
-        <div class="py-6">
-            <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
-                <div class="bg-white dark:bg-gray-800 overflow-hidden shadow-md sm:rounded-lg">
-                    <div class="p-6 text-gray-900 dark:text-gray-100">
-                        <table class="table-auto text-left text-gray-700 dark:text-gray-400">
-                            <thead class="text-gray-900 bg-gray-100 dark:bg-gray-700 dark:text-gray-200">
-                            <tr>
-                                <th scope="col" class="px-4 py-2">
-                                    Date
-                                </th>
-                                <th scope="col" class="px-6 py-2">
-                                    Note
-                                </th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            @foreach($entries as $entry)
-                                <tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700 even:bg-gray-50 hover:bg-gray-100 dark:hover:bg-gray-600">
-                                    <td class="text-left px-4 py-2">
-                                        {{$entry->date}}
-                                    </td>
-                                    <td class="px-4 py-2">
-                                        {{$entry->note}}
-                                    </td>
-                                </tr>
-                            @endforeach
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-</x-app-layout>

resources/views/layouts/navigation.blade.php

@@ -18,7 +18,7 @@
                 </div>
 
                 <div class="hidden space-x-8 sm:-my-px sm:ml-10 sm:flex">
-                    <x-nav-link :href="route('habits.index')" :active="request()->routeIs('habits.*')">
+                    <x-nav-link :href="route('habits.index')" :active="request()->routeIs('habits.index')">
                         {{ __('Habits') }}
                     </x-nav-link>
                 </div>