Merge pull request #2 from Raccoon254/changes

Changes
Raccoon254 · May 17, 2024 · 451709a · 451709a
2 parents 0f9ce1c + e067345
commit 451709a
Show file tree

Hide file tree

Showing 16 changed files with 123 additions and 28 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/app/.DS_Store b/app/.DS_Store
diff --git a/app/Http/Controllers/PagesController.php b/app/Http/Controllers/PagesController.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\View\View;
+
+class PagesController extends Controller
+{
+    public function dashboard(): View
+    {
+        return view('dashboard');
+    }
+}
diff --git a/app/Http/Controllers/StaticPageController.php b/app/Http/Controllers/StaticPageController.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\View\View;
+
+class StaticPageController extends Controller
+{
+    public function welcome(): View
+    {
+        $process_steps = [
+            [
+                'icon' => 'fa-solid avatar fa-pen-nib',
+                'color' => 'text-blue-500',
+                'title' => 'Place Your Order',
+                'text' => 'Submit your assignment details, including the topic, instructions, and due date.'
+            ],
+            [
+                'icon' => 'fas fa-user-graduate',
+                'color' => 'text-green-500',
+                'title' => 'Hire a Writer',
+                'text' => 'Our expert writers will review your order and start working on it immediately.'
+            ],
+            [
+                'icon' => 'fas fa-check-circle',
+                'color' => 'text-yellow-500',
+                'title' => 'Get Your Assignment',
+                'text' => 'Receive your high-quality assignment before the due date, reviewed and ready for submission.'
+            ]
+        ];
+        return view('welcome')->with('process_steps', $process_steps);
+    }
+}
+
diff --git a/database/.DS_Store b/database/.DS_Store
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
         "alpinejs": "^3.4.2",
         "autoprefixer": "^10.4.2",
         "axios": "^1.6.4",
+        "daisyui": "^4.11.1",
         "laravel-vite-plugin": "^1.0",
         "postcss": "^8.4.31",
         "tailwindcss": "^3.1.0",

diff --git a/public/.DS_Store b/public/.DS_Store
diff --git a/public/images/.DS_Store b/public/images/.DS_Store
diff --git a/resources/.DS_Store b/resources/.DS_Store
diff --git a/resources/css/app.css b/resources/css/app.css
@@ -1,3 +1,7 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
+
+.center{
+    @apply flex items-center justify-center;
+}
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
@@ -10,6 +10,7 @@
     <link rel="preconnect" href="https://fonts.bunny.net">
     <link href="https://fonts.bunny.net/css?family=figtree:400,600&display=swap" rel="stylesheet"/>
     @vite(['resources/css/app.css', 'resources/js/app.js'])
+    <script src="https://kit.fontawesome.com/af6aba113a.js" crossorigin="anonymous"></script>
 </head>
 <body class="font-sans antialiased">
 <div class="bg-gray-50">
@@ -18,9 +19,15 @@
             <div class="text-center md:text-left">
                 <h1 class="text-4xl font-bold text-black/90 mb-4">Welcome to Scholarspace</h1>
                 <p class="text-lg text-black/50 mb-8">Your trusted platform for assignment help.</p>
-                <div class="flex justify-center md:justify-start">
-                    <a href="#" class="bg-blue-500 hover:bg-blue-600 font-semibold py-2 px-4 rounded-md mr-4">Login</a>
-                    <a href="#" class="bg-green-500 hover:bg-green-600 font-semibold py-2 px-4 rounded-md">Register</a>
+                <div class="flex justify-center text-black/90 md:justify-start">
+                    <a href="{{ route('login') }}"
+                       class="bg-blue-500 hover:bg-blue-600 font-semibold py-2 px-4 rounded-md mr-4">
+                        Login
+                    </a>
+                    <a href="{{ route('register') }}"
+                       class="bg-green-500 hover:bg-green-600 font-semibold py-2 px-4 rounded-md">
+                        Register
+                    </a>
                 </div>
             </div>
             <div class="mt-8 md:mt-0">
@@ -35,24 +42,13 @@
             <p class="text-lg text-black/50">Our simple and efficient process for getting your assignments done.</p>
         </div>
         <div class="grid grid-cols-1 md:grid-cols-3 gap-8">
-            <div class="bg-white rounded-lg shadow-md p-6">
-                <i class="fas fa-edit fa-3x text-blue-500 mb-4"></i>
-                <h3 class="text-xl font-bold text-black/90 mb-2">Place Your Order</h3>
-                <p class="text-black/50">Submit your assignment details, including the topic, instructions, and due
-                    date.</p>
-            </div>
-            <div class="bg-white rounded-lg shadow-md p-6">
-                <i class="fas fa-user-graduate fa-3x text-green-500 mb-4"></i>
-                <h3 class="text-xl font-bold text-black/90 mb-2">Hire a Writer</h3>
-                <p class="text-black/50">Our expert writers will review your order and start working on it
-                    immediately.</p>
-            </div>
-            <div class="bg-white rounded-lg shadow-md p-6">
-                <i class="fas fa-check-circle fa-3x text-yellow-500 mb-4"></i>
-                <h3 class="text-xl font-bold text-black/90 mb-2">Get Your Assignment</h3>
-                <p class="text-black/50">Receive your high-quality assignment before the due date, reviewed and ready
-                    for submission.</p>
-            </div>
+            @foreach($process_steps as $item)
+                <div class="bg-white rounded-lg shadow-md p-6">
+                    <i class="{{ $item['icon'] }} fa-3x {{ $item['color'] }} mb-4"></i>
+                    <h3 class="text-xl font-bold text-black/90 mb-2">{{ $item['title'] }}</h3>
+                    <p class="text-black/50">{{ $item['text'] }}</p>
+                </div>
+            @endforeach
         </div>
     </div>
 

diff --git a/routes/web.php b/routes/web.php
@@ -2,14 +2,12 @@
 
 use App\Http\Controllers\ProfileController;
 use Illuminate\Support\Facades\Route;
+use App\Http\Controllers\StaticPageController;
+use App\Http\Controllers\PagesController;
 
-Route::get('/', function () {
-    return view('welcome');
-});
+Route::get('/', [StaticPageController::class, 'welcome'])->name('home');
 
-Route::get('/dashboard', function () {
-    return view('dashboard');
-})->middleware(['auth', 'verified'])->name('dashboard');
+Route::get('/dashboard', [PagesController::class, 'dashboard'])->middleware(['auth', 'verified'])->name('dashboard');
 
 Route::middleware('auth')->group(function () {
     Route::get('/profile', [ProfileController::class, 'edit'])->name('profile.edit');

diff --git a/storage/.DS_Store b/storage/.DS_Store
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -1,5 +1,6 @@
 import defaultTheme from 'tailwindcss/defaultTheme';
 import forms from '@tailwindcss/forms';
+import daisyui from 'daisyui';
 
 /** @type {import('tailwindcss').Config} */
 export default {
@@ -17,5 +18,8 @@ export default {
         },
     },
 
-    plugins: [forms],
+    plugins: [
+        forms,
+        daisyui,
+    ],
 };
diff --git a/tests/.DS_Store b/tests/.DS_Store