Merge pull request #30 from paiindustries/fix/blog

zainforbjs · web-flow · commit 70e1e965b670 · 2025-04-16T19:22:58.000+05:00
Fix/blog
diff --git a/app/models/User.cfc b/app/models/User.cfc
@@ -61,7 +61,7 @@ component extends="app.Models.Model" {
             column="profile_picture", 
             dataType="string", 
             label="Profile Picture", 
-            defaultValue="/images/avatar-rounded.webp"
+            defaultValue="avatar-rounded.webp"
         );
 
         // Profile URL Computed Property
diff --git a/app/views/layout.cfm b/app/views/layout.cfm
@@ -127,7 +127,7 @@
 								<li class="nav-item dropdown px-3">
 									<a href="javascript:void(0)" class="nav-link p-0" id="profilePicDropdown" data-bs-toggle="dropdown" aria-expanded="false">
 										<cfif !structKeyExists(session, "profilePic") OR session.profilePic == "">
-											<cfset session.profilePic = "/images/avatar-rounded.webp">
+											<cfset session.profilePic = "avatar-rounded.webp">
 										</cfif>
 										<cfoutput>
 											#imageTag(source = '#session.profilePic#', alt="user profile pic", height="40", width="40", class="rounded-circle")#
diff --git a/app/views/web/ApiController/index.cfm b/app/views/web/ApiController/index.cfm
@@ -8,7 +8,7 @@
                 <div class="d-flex api flex-wrap align-items-center justify-content-end gap-3">
                     <button
                         onclick="handleApiSection('All', this)"
-                        class="active px-4 filter-button fs-16 py-2 d-flex align-items-center gap-2 rounded-3 border--iris bg-transparent text--secondary">
+                        class="active px-4 filter-button fs-16 py-2 d-flex align-items-center gap-2 rounded-3 border--primary bg-transparent text--secondary">
                         A-Z Functions<small>(<span class="functioncount"><cfoutput>#arraylen(docs.functions)#</cfoutput></span>)</small>
                         <svg class="d-none" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
                             <path
@@ -18,7 +18,7 @@
                     </button>
                     <button
                         onclick="handleApiSection('Sections', this)"
-                        class="px-4 filter-button fs-16 py-2 d-flex align-items-center gap-2 rounded-3 border--iris bg-transparent text--secondary">
+                        class="px-4 filter-button fs-16 py-2 d-flex align-items-center gap-2 rounded-3 border--primary bg-transparent text--secondary">
                         Sections
                         <svg class="d-none" width="16" height="16" viewBox="0 0 16 16" fill="none"
                             xmlns="http://www.w3.org/2000/svg">
diff --git a/app/views/web/ApiController/partials/_categorydefinition.cfm b/app/views/web/ApiController/partials/_categorydefinition.cfm
@@ -61,7 +61,7 @@
             <cfif isArray(meta.parameters) && arrayLen(meta.parameters)>
                 <div class="mt-4 overflow-x-auto no-scrollbar">
                     <table class="table table-responsive">
-                        <thead class="table--iris">
+                        <thead class="table--primary">
                             <tr>
                                 <th class="text-white px-lg-3 px-1 fs-14 fw-semibold">Name</th>
                                 <th class="text-white px-lg-3 px-1 fs-14 fw-semibold">Type</th>
@@ -100,7 +100,7 @@
                     class="p-4 rounded-18">
                     <div class="fs-14 fw-normal m-0 p-0">#meta.extended.docs#</div>
                     <div class="text-end">
-                        <i class="bi bi-copy text--iris fs-5 cursor-pointer" onclick="copyToClipboard(this)"></i>
+                        <i class="bi bi-copy text--primary fs-5 cursor-pointer" onclick="copyToClipboard(this)"></i>
                         <span class="text-success fs-5 fw-bold d-none">Copied!</span>
                     </div>
                 </div>
diff --git a/app/views/web/ApiController/partials/_definition.cfm b/app/views/web/ApiController/partials/_definition.cfm
@@ -60,7 +60,7 @@
     <cfif isArray(meta.parameters) && arrayLen(meta.parameters)>
         <div class="mt-4 overflow-x-auto no-scrollbar">
             <table class="table table-responsive">
-                <thead class="table--iris">
+                <thead class="table--primary">
                     <tr>
                         <th class="text-white px-lg-3 px-1 fs-14 fw-semibold">Name</th>
                         <th class="text-white px-lg-3 px-1 fs-14 fw-semibold">Type</th>
@@ -99,7 +99,7 @@
 			class="p-4 rounded-18">
 			<div class="fs-14 fw-normal m-0 p-0">#meta.extended.docs#</div>
 			<div class="text-end">
-				<i class="bi bi-copy text--iris fs-5 cursor-pointer" onclick="copyToClipboard(this)"></i>
+				<i class="bi bi-copy text--primary fs-5 cursor-pointer" onclick="copyToClipboard(this)"></i>
 				<span class="text-success fs-5 fw-bold d-none">Copied!</span>
 			</div>
 		</div>
diff --git a/app/views/web/ApiController/partials/_functionlist.cfm b/app/views/web/ApiController/partials/_functionlist.cfm
@@ -8,7 +8,7 @@ writeOutput('<label>Quick Search</label>
 </div>
 <p id="functionlistoutput">
   <a href="" class="docreset" hx-get="/api/#currentVersion#/functions" hx-trigger="click" hx-target="##main"hx-swap="innerHTML"
-                        class="load-more-trigger mt-3"><i class="fa fa-eye"></i><p class="fs-14 cursor-pointer fw-normal text--iris">All</p></a>');
+                        class="load-more-trigger mt-3"><i class="fa fa-eye"></i><p class="fs-14 cursor-pointer fw-normal text--primary">All</p></a>');
 
 for (var func = 1; func <= arrayLen(docs.functions); func++) {
     var meta = docs.functions[func];
@@ -28,7 +28,7 @@ for (var func = 1; func <= arrayLen(docs.functions); func++) {
   >
     <input type='hidden' name='slug' value='#functionSlug#'>
     <input type='hidden' name='version' value='#params.version#'>
-    <p class='fs-14 cursor-pointer fw-normal text--iris'>#meta.name#()</p>
+    <p class='fs-14 cursor-pointer fw-normal text--primary'>#meta.name#()</p>
   </a>");
 }
 
diff --git a/app/views/web/ApiController/partials/_moredefinition.cfm b/app/views/web/ApiController/partials/_moredefinition.cfm
@@ -61,7 +61,7 @@
             <cfif isArray(meta.parameters) && arrayLen(meta.parameters)>
                 <div class="mt-4 overflow-x-auto no-scrollbar">
                     <table class="table table-responsive">
-                        <thead class="table--iris">
+                        <thead class="table--primary">
                             <tr>
                                 <th class="text-white px-lg-3 px-1 fs-14 fw-semibold">Name</th>
                                 <th class="text-white px-lg-3 px-1 fs-14 fw-semibold">Type</th>
@@ -100,7 +100,7 @@
                     class="p-4 rounded-18">
                     <div class="fs-14 fw-normal m-0 p-0">#meta.extended.docs#</div>
                     <div class="text-end">
-                        <i class="bi bi-copy text--iris fs-5 cursor-pointer" onclick="copyToClipboard(this)"></i>
+                        <i class="bi bi-copy text--primary fs-5 cursor-pointer" onclick="copyToClipboard(this)"></i>
                         <span class="text-success fs-5 fw-bold d-none">Copied!</span>
                     </div>
                 </div>
diff --git a/app/views/web/ApiController/partials/_sectiondefinition.cfm b/app/views/web/ApiController/partials/_sectiondefinition.cfm
@@ -61,7 +61,7 @@
             <cfif isArray(meta.parameters) && arrayLen(meta.parameters)>
                 <div class="mt-4 overflow-x-auto no-scrollbar">
                     <table class="table table-responsive">
-                        <thead class="table--iris">
+                        <thead class="table--primary">
                             <tr>
                                 <th class="text-white px-lg-3 px-1 fs-14 fw-semibold">Name</th>
                                 <th class="text-white px-lg-3 px-1 fs-14 fw-semibold">Type</th>
@@ -100,7 +100,7 @@
                     class="p-4 rounded-18">
                     <div class="fs-14 fw-normal m-0 p-0">#meta.extended.docs#</div>
                     <div class="text-end">
-                        <i class="bi bi-copy text--iris fs-5 cursor-pointer" onclick="copyToClipboard(this)"></i>
+                        <i class="bi bi-copy text--primary fs-5 cursor-pointer" onclick="copyToClipboard(this)"></i>
                         <span class="text-success fs-5 fw-bold d-none">Copied!</span>
                     </div>
                 </div>
diff --git a/app/views/web/ApiController/partials/_sections.cfm b/app/views/web/ApiController/partials/_sections.cfm
@@ -9,8 +9,7 @@ if (structKeyExists(docs, "sections")) {
         writeOutput('
             <div class="accordion-item bg-transparent border-0">
                 <div class="accordion-header section pe-2 text-white" data-section="' & sectionId & '">
-                    <button class="accordion-button fs-14 fw-normal shadow-none p-2 rounded-3 text--iris collapsed"
-                        style="background-color: rgba(179, 179, 179, 0.12);"
+                    <button class="accordion-button fs-14 fw-normal shadow-none bg--primary/10 p-2 rounded-3 text--primary collapsed"
                         type="button"
                         data-section="#sectionId#"
                         type="button" data-bs-toggle="collapse" data-bs-target="##' & sectionId & '" 
@@ -38,7 +37,7 @@ if (structKeyExists(docs, "sections")) {
                 hx-swap="innerHTML">
                 <input type="hidden" name="section" value="#sectionId#">
                 <input type="hidden" name="category" value="#categoryId#">
-                <p class="fs-14 fw-normal cursor-pointer text--iris">#categoryName#</p>
+                <p class="fs-14 fw-normal cursor-pointer text--primary">#categoryName#</p>
                 </a>
             ');
         }
@@ -51,8 +50,7 @@ if (structKeyExists(docs, "sections")) {
 
     // Adding "Uncategorized" section at the end
     writeOutput('
-                <button class="accordion-button fs-14 fw-normal shadow-none p-2 rounded-3 text--iris collapsed"
-                    style="background-color: rgba(179, 179, 179, 0.12);"
+                <button class="accordion-button fs-14 fw-normal shadow-none bg--primary/10 p-2 rounded-3 text--primary collapsed"
                     
                     type="button"
                     hx-get="/api/#params.version#/functions/section" hx-include="this" hx-target="##main" hx-swap="innerHTML">
diff --git a/app/views/web/ApiController/show.cfm b/app/views/web/ApiController/show.cfm
@@ -58,7 +58,7 @@
                 </div>
                 <div class="mt-4 overflow-x-auto no-scrollbar">
                     <table class="table table-responsive">
-                        <thead class="table--iris">
+                        <thead class="table--primary">
                             <tr>
                                 <th class="text-white px-lg-3 px-1 fs-14 fw-semibold">Name</th>
                                 <th class="text-white px-lg-3 px-1 fs-14 fw-semibold">Type</th>
diff --git a/app/views/web/BlogController/index.cfm b/app/views/web/BlogController/index.cfm
@@ -12,8 +12,8 @@
                         <a href="/blog/create" class="bg--iris text-white text-center py-2 fs-16 rounded-3 col-4">Create Blog</a>
                     </cfif>
                     <button 
-                        hx-trigger="click" hx-swap="innerHTML" hx-get="/blog/list" hx-target="#blogsContainer" 
-                        class="active px-4 filter-button fs-16 py-2 d-flex align-items-center gap-2 rounded-3 border--iris bg-transparent text--secondary">
+                        hx-trigger="click" onclick="handleBlogFilter('Archives', this)" hx-swap="innerHTML" hx-get="/blog/list" hx-target="#blogsContainer" 
+                        class="active px-4 filter-button fs-16 py-2 d-flex align-items-center gap-2 rounded-3 border--primary bg-transparent text--secondary">
                         All
                         <svg class="d-none" width="16" height="16" viewBox="0 0 16 16" fill="none"
                             xmlns="http://www.w3.org/2000/svg">
@@ -23,7 +23,7 @@
                         </svg>
                     </button>
                     <button onclick="handleBlogFilter('Archives', this)"
-                        class="px-4 filter-button fs-16 py-2 d-flex align-items-center gap-2 rounded-3 border--iris bg-transparent text--secondary">
+                        class="px-4 filter-button fs-16 py-2 d-flex align-items-center gap-2 rounded-3 border--primary bg-transparent text--secondary">
                         Archives
                         <svg class="d-none" width="16" height="16" viewBox="0 0 16 16" fill="none"
                             xmlns="http://www.w3.org/2000/svg">
@@ -33,7 +33,7 @@
                         </svg>
                     </button>
                     <button onclick="handleBlogFilter('Categories', this)"
-                        class="px-4 filter-button fs-16 py-2 d-flex align-items-center gap-2 rounded-3 border--iris bg-transparent text--secondary">
+                        class="px-4 filter-button fs-16 py-2 d-flex align-items-center gap-2 rounded-3 border--primary bg-transparent text--secondary">
                         Categories
                         <svg class="d-none" width="16" height="16" viewBox="0 0 16 16" fill="none"
                             xmlns="http://www.w3.org/2000/svg">
@@ -94,7 +94,7 @@
                                         hx-get="/blog/#year#/#NumberFormat(month, '00')#" 
                                         hx-target="##blogsContainer" 
                                         hx-swap="innerHTML"
-                                        class="fs-14 border-bottom mb-0 py-2 cursor-pointer fw-normal text--iris">
+                                        class="fs-14 border-bottom mb-0 py-2 cursor-pointer fw-normal text--primary">
                                         #months[month]# #year#
                                     </p>
                                 </cfloop>
diff --git a/app/views/web/BlogController/partials/_blogList.cfm b/app/views/web/BlogController/partials/_blogList.cfm
@@ -4,8 +4,8 @@
             <a href="/blog/#slug#" class="d-flex bg-white px-0 rounded-4 overflow-hidden justify-content-between">
                 <div class="p-3 flex-grow-1 rounded-start-4 d-flex justify-content-between flex-column">
                     <div>
-                        <div class="border--iris w-max border-2 rounded-4 px-3 py-2">
-                            <p class="text--iris fw-medium fs-12 m-0">#blogs.firstname# #blogs.lastname#</p>
+                        <div class="border--primary w-max border-2 rounded-4 px-3 py-2">
+                            <p class="text--primary fw-medium fs-12 m-0">#blogs.firstname# #blogs.lastname#</p>
                         </div>
                         <p class="fs-18 mt-4 text-black fw-bold">#blogs.title#</p>
                     </div>
diff --git a/app/views/web/BlogController/partials/_categorylist.cfm b/app/views/web/BlogController/partials/_categorylist.cfm
@@ -1,6 +1,6 @@
 <cfscript>
         for (var i = 1; i <= categorylist.recordCount; i++) {
-        writeOutput('<p class="fs-14 border-bottom mb-0 py-2 cursor-pointer fw-normal text--iris" 
+        writeOutput('<p class="fs-14 border-bottom mb-0 py-2 cursor-pointer fw-normal text--primary" 
             hx-get="/blog/list/category/#categorylist.name[i]#" 
             hx-trigger="click" 
             hx-target="##blogsContainer" 
diff --git a/app/views/web/BlogController/show.cfm b/app/views/web/BlogController/show.cfm
@@ -14,12 +14,7 @@
                             <div class="d-flex my-3 align-items-center gap-3">
                                 <div>
                                     <cfif structKeyExists(blog.user, "profilePicture") AND len(trim(blog.user.profilePicture))>
-                                        <img 
-                                            src="#blog.user.profilePicture#" 
-                                            style="width:3rem; height:3rem" 
-                                            class="bg-body-secondary rounded-5" 
-                                            alt="profile-picture"
-                                        >
+                                        <cfoutput>#imageTag(source = '#blog.user.profilePicture#', alt="wheels.dev-user-profile-picture", height="50", width="50", class="bg-body-secondary rounded-5")#</cfoutput>
                                     <cfelse>
                                         <img 
                                             src="/images/avatar-rounded.webp" 
@@ -48,7 +43,7 @@
                                             #blog.PostStatus.name# in 
                                             <cfoutput query="categories">
                                                 <strong 
-                                                    class="text--iris"
+                                                    class="text--primary"
                                                     style="cursor: pointer;"
                                                     hx-get="/blog/list/category/#REReplace(name, '\.', '-', 'all')#"
                                                     hx-target="body" 
@@ -65,7 +60,7 @@
                                             Tags: 
                                             <cfoutput query="tags">
                                                 <strong 
-                                                    class="text--iris"
+                                                    class="text--primary"
                                                     style="cursor: pointer;"
                                                     hx-get="/blog/list/tag/#REReplace(name, '\.', '-', 'all')#" 
                                                     hx-target="body"
diff --git a/app/views/web/HomeController/partials/_blogs.cfm b/app/views/web/HomeController/partials/_blogs.cfm
@@ -7,7 +7,7 @@
         
             <div class="d-flex gap-2 justify-content-between align-items-center">
                 <p class="fs-16 truncate fw-medium text--lightGray">#dateformat(blogs.postCreatedDate, 'MMMM DD, YYYY')# by #blogs.fullName#</p>
-                <button class="bg--iris text-nowrap fs-16 text-white rounded-2 px-3 py-1">Learn more</button>
+                <button class="bg--primary text-nowrap fs-16 text-white rounded-2 px-3 py-1">Learn more</button>
             </div>
         </a>
     </div>
diff --git a/public/stylesheets/color.css b/public/stylesheets/color.css
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
