implemented homepage fixes

zainforbjs · zainforbjs · commit e6ce8804107b · 2025-05-27T21:48:12.000+05:00
diff --git a/app/controllers/web/BlogController.cfc b/app/controllers/web/BlogController.cfc
@@ -1215,7 +1215,18 @@ component extends="app.Controllers.Controller" {
                 }
             }
         } catch (any e) {
-            local.exception = e;
+    model("Log").log(
+        category = "wheels.blog.tags",
+        level = "ERROR",
+        message = "Failed to save blog tags for blogId: #blogId#",
+        details = {
+            "blog_id": blogId,
+            "error_message": e.message,
+            "error_detail": e.detail,
+            "error_type": e.type
+        },
+        userId = GetSignedInUserId()
+    );
         }
     }
 
diff --git a/app/controllers/web/HomeController.cfc b/app/controllers/web/HomeController.cfc
@@ -33,6 +33,8 @@ component extends="app.Controllers.Controller" {
             perPage = 3
         );
         settings = model("Setting").findAll();
+        blogs = model('Blog').getTenLatest(); // Get blog list
+        features = getAllFeatures();
         renderView();
     }
 
diff --git a/app/models/Blog.cfc b/app/models/Blog.cfc
@@ -53,7 +53,7 @@ component extends="app.Models.Model" {
             where='statusid <> 1', 
             include="User", 
             maxRows=10,
-            order="postDate DESC"
+            order="random"
         );
         return blogs;
     }
diff --git a/app/views/web/BlogController/index.cfm b/app/views/web/BlogController/index.cfm
@@ -13,15 +13,14 @@
             <div class="pt-5">
                 <div class="row">
                     <div class="col-lg-4 col-12">
-                        <input id="blogSearchInput" placeholder="Search" type="text" hx-get="/blog/Search" hx-trigger="keyup changed delay:500ms" hx-target="#blogsContainer" hx-swap="innerHTML" name="searchTerm" class="fs-14 flex-grow-1 form-control form-check-input-primary py-2 px-3 rounded-18">
+                        <input id="blogSearchInput" placeholder="Search articles..." type="text" hx-get="/blog/Search" hx-trigger="keyup changed delay:500ms" hx-target="#blogsContainer" hx-swap="innerHTML" name="searchTerm" class="fs-14 flex-grow-1 form-control form-check-input-primary py-2 px-3 rounded-18">
                     </div>
                     <div class="col-lg-5 mt-lg-0 mt-3 offset-lg-3 col-12">
                         <div class="d-flex blogs align-items-center justify-content-end gap-3 flex-wrap">
 
                             <cfif isEditor>
                                 <a href="/blog/create"
-                                    class="bg--primary text-white text-center d-none py-2 fs-16 rounded-3 col-4">Create
-                                    Blog</a>
+                                    class="bg--primary text-white text-center d-none py-2 fs-16 rounded-3 col-4">Create New Article</a>
                             </cfif>
 
                             <button onclick="handleBlogFilter('All', this)" hx-swap="innerHTML"
diff --git a/app/views/web/HomeController/index.cfm b/app/views/web/HomeController/index.cfm
@@ -36,33 +36,48 @@
 
     <!-- Cards -->
     <div class="container pb-5">
-        <div class="row gy-3 gy-sm-5 gx-sm-5" id="features-container" hx-get="/home/loadFeatures" hx-trigger="load"
-            hx-target="#features-container" hx-swap="innerHTML">
-            <!-- Features will be loaded here via HTMX -->
+        <div class="row gy-3 gy-sm-5 gx-sm-5" id="features-container">
+            <cfoutput query="features">
+                <div class="col-lg-4">
+                    <div class="px-4 py-4 bg-white border-transparent border-2 cards rounded-5 cursor-pointer shadow-sm">
+                        <div class="icon-container d-flex justify-content-center align-items-center">
+                            #features.image#
+                        </div>
+                        <div class="mt-3">
+                            <p class="fw-bold fs-24 text--secondary">#features.title#</p>
+                            <p class="fs-18 text--secondary/70 pt-1 line-clamp-2">#features.description#</p>
+                        </div>
+                    </div>
+                </div>
+            </cfoutput>
         </div>
     </div>
 
     <!-- Latest blogs -->
     <div class="pt-5 px-2 blog-main">
-        <h1 class="text-center fw-bold fs-60">Latest Blog Posts</h1>
+        <h1 class="text-center fw-bold fs-60">Latest From the Wheels Dev Blog</h1>
         <div class="swiper py-5 blogSwiper h-max">
-            <div class="swiper-wrapper" id="blogs-container" hx-get="/home/loadBlogs" hx-trigger="load"
-                hx-target="#blogs-container" hx-swap="innerHTML">
-                <!-- Blogs will be loaded here via HTMX -->
+            <div class="swiper-wrapper" id="blogs-container">
+                <cfoutput query= "blogs">
+                    <div class="p-4 bg-white rounded-5 shadow-sm swiper-slide">
+                        <a href="/blog/#slug#" class="">
+                            <div>
+                                <p class="fs-18 mb-3 text--secondary/70 fw-bold line-clamp-1">#blogs.title#</p>
+                            </div>
+                        
+                            <div class="d-flex gap-2 justify-content-between align-items-center">
+                                <p class="fs-16 truncate fw-medium text--lightGray">#dateformat(blogs.postDate, 'MMMM DD, YYYY')# by #blogs.fullName#</p>
+                                <button class="bg--primary text-nowrap fs-16 text-white rounded-2 px-3 py-1">Learn more</button>
+                            </div>
+                        </a>
+                    </div>
+                </cfoutput>
             </div>
         </div>
     </div>
 
-    <!-- our guide  -->
-    <div class="gudie-main py-5 d-none">
-        <h1 class="text-center text-white fs-60 fw-bold">Our Guide</h1>
-        <div class="container mt-5" id="guides-container" hx-get="/home/loadGuides" hx-trigger="load"
-            hx-target="#guides-container" hx-swap="innerHTML">
-            <!-- Guides will be loaded here via HTMX -->
-        </div>
-    </div>
-
     <!-- welcome community -->
+    <cfoutput>
     <div class="container py-5 mt-5">
         <div class="row align-items-center gy-5">
             <div class="col-lg-12 space-y-3 text-center col-12">
@@ -71,15 +86,16 @@
                     Welcome to Our Community - a place where like-minded people connect, share ideas, <br> and grow
                     together in a positive and supportive environment.
                 </p>
-                <a href="/community" class="bg--primary d-block w-max mx-auto fs-16 px-3 py-2 rounded-18 text-white">
+                <a href="#urlFor(route='community')#" class="bg--primary d-block w-max mx-auto fs-16 px-3 py-2 rounded-18 text-white">
                     <span>Explore community</span>
                 </a>
             </div>
             <div class="text-center col-12">
-                <img src="/images/community.png" class="img-fluid" alt="Community">
+                    #imageTag(source="community.png", class="img-fluid", alt="Wheels.dev Community")#
             </div>
         </div>
     </div>
+    </cfoutput>
 
     <!-- Testimonials -->
     <cfoutput>
@@ -99,7 +115,11 @@
                         <cfloop query="testimonials">
                             <div class="d-flex row swiper-slide">
                                 <div class="col-lg-3 col-12 pb-2 pb-sm-0">
-                                    <img src="#len(testimonials.logoPath) gt 0 ? testimonials.logoPath : '/images/testi.png'#" class="img-fluid" alt="#encodeForHtml(testimonials.companyName)#" style="width: 330px; height: 290px;">
+                                    <cfset imgSrc = testimonials.logoPath>
+                                    <cfif !len(trim(imgSrc))>
+                                        <cfset imgSrc = "testi.png">
+                                    </cfif>
+                                    #imageTag(source=imgSrc, class="img-fluid", alt=encodeForHtml(testimonials.companyName), style="width: 330px; height: 290px;")#
                                 </div>
                                 <div class="col-lg-9 col-12">
                                     <div class="d-flex flex-column justify-content-between h-100">
@@ -108,9 +128,9 @@
                                             #encodeForHtml(testimonials.testimonialText)#
                                         </p>
                                         <p class="fs-18 text--secondary fw-medium border-top pt-4">
-                                            <cfif structKeyExists(variables, "user_fullName") AND len(trim(user_fullName))>
-                                                #encodeForHtml(user_fullName)#
-                                            <cfelseif len(trim(testimonials.companyName))>
+                                            <cfif structKeyExists(testimonials, "authorName") AND len(trim(testimonials.authorName))>
+                                                #encodeForHtml(testimonials.authorName)#
+                                            <cfelseif structKeyExists(testimonials, "companyName") AND len(trim(testimonials.companyName))>
                                                 #encodeForHtml(testimonials.companyName)#
                                             <cfelse>
                                                 Anonymous
@@ -149,7 +169,7 @@
         </div>
         <div class="d-flex flex-wrap justify-content-center mt-5 gap-3">
             <a href="https://github.com/wheels-dev/wheels/graphs/contributors" target="_blank">
-                <img src="https://contrib.rocks/image?repo=wheels-dev/wheels" style="max-width: 100%;">
+                <img src="https://contrib.rocks/image?repo=wheels-dev/wheels" style="max-width: 100%;" alt="GitHub Contributors for CFWheels">
             </a>
         </div>
     </div>
diff --git a/app/views/web/NewsletterController/welcome.cfm b/app/views/web/NewsletterController/welcome.cfm
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Welcome to Wheels.dev Newsletter</title>
+    <title>Welcome to the Wheels.dev Community</title>
     <style>
         body {
             font-family: Arial, sans-serif;

Original file line number	Diff line number	Diff line change
`@@ -1215,7 +1215,18 @@ component extends="app.Controllers.Controller" {`
`1215`	`1215`	`}`
`1216`	`1216`	`}`
`1217`	`1217`	`} catch (any e) {`
`1218`		`- local.exception = e;`
	`1218`	`+ model("Log").log(`
	`1219`	`+ category = "wheels.blog.tags",`
	`1220`	`+ level = "ERROR",`
	`1221`	`+ message = "Failed to save blog tags for blogId: #blogId#",`
	`1222`	`+ details = {`
	`1223`	`+ "blog_id": blogId,`
	`1224`	`+ "error_message": e.message,`
	`1225`	`+ "error_detail": e.detail,`
	`1226`	`+ "error_type": e.type`
	`1227`	`+ },`
	`1228`	`+ userId = GetSignedInUserId()`
	`1229`	`+ );`
`1219`	`1230`	`}`
`1220`	`1231`	`}`
`1221`	`1232`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ component extends="app.Controllers.Controller" {`
`33`	`33`	`perPage = 3`
`34`	`34`	`);`
`35`	`35`	`settings = model("Setting").findAll();`
	`36`	`+ blogs = model('Blog').getTenLatest(); // Get blog list`
	`37`	`+ features = getAllFeatures();`
`36`	`38`	`renderView();`
`37`	`39`	`}`
`38`	`40`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ component extends="app.Models.Model" {`
`53`	`53`	`where='statusid <> 1',`
`54`	`54`	`include="User",`
`55`	`55`	`maxRows=10,`
`56`		`- order="postDate DESC"`
	`56`	`+ order="random"`
`57`	`57`	`);`
`58`	`58`	`return blogs;`
`59`	`59`	`}`