Skip to content
This repository was archived by the owner on Apr 21, 2026. It is now read-only.

Commit bffb1eb

Browse files
zainforbjszainforbjs
committed
fix validation and layout issue
1 parent 34b2128 commit bffb1eb

14 files changed

Lines changed: 227 additions & 129 deletions

File tree

‎app/controllers/admin/EmailTemplatesController.cfc‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,17 @@ component extends="app.Controllers.Controller" {
4242
} else {
4343
message = "Email not found for editing.";
4444
}
45-
// renderText("#message#");
46-
redirectto(route="#urlFor(route="adminemail-templates")#", success=message);
45+
redirectto(route="adminEmail-templates", success=message);
4746
return;
4847
}else{
49-
message="Something went wrong email content not updated correctly";
50-
redirectto(route="adminemail-templates", error=message);
48+
message="Something went wrong email content not updated correctly!";
49+
redirectto(route="adminEmail-templates", error=message);
5150
}
5251

5352
}catch(any e){
5453
// handle exception
55-
message="Something went wrong email content not updated correctly";
56-
redirectto(route="adminemail-templates", error=message);
54+
message="Something went wrong email content not updated correctly!";
55+
redirectto(action="adminEmail-templates", error=message);
5756
}
5857
}
5958
}

‎app/controllers/web/BlogController.cfc‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,16 @@ component extends="app.Controllers.Controller" {
3939
try {
4040
var result = getBlogData(filterType, filterValue, page, perPage, isInfiniteScroll);
4141

42+
if (result.query.recordCount == 0) {
43+
// Show fallback blogs
44+
var fallback = getBlogData("", "", 1, perPage, isInfiniteScroll);
45+
blogs = fallback.query;
46+
isFallback = true;
47+
} else {
48+
blogs = result.query;
49+
isFallback = false;
50+
}
4251
// Set template variables
43-
blogs = result.query;
4452
hasMore = result.hasMore;
4553
totalCount = result.totalCount;
4654

‎app/migrator/migrations/20250228154828_creates_user_table.cfc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ component extends="wheels.migrator.Migration" hint="creates user table" {
1616
t.string(columnNames='username', null=true, limit=20);
1717
t.string(columnNames='website', null=true, limit=100);
1818
t.string(columnNames='ip', null=true, limit=40);
19-
t.integer(columnNames='wp_id', null=false);
19+
t.integer(columnNames='wp_id', null=true);
2020
t.timestamps();
2121
t.create();
2222

‎app/views/admin/emailtemplatescontroller/view.cfm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<h5 class="mt-4 mb-4 fs-14">The Team Wheels<h5>
126126
</cfif>
127127
<div class="signatureBox">
128-
<p class="signature">&copy;2005-2025 Wheels.Dev. All rights are reserved.<br>Wheels is licensed under the Apache License, Version 3.0.</p>
128+
<p class="signature">&copy;2005-2025 Wheels.Dev. All rights are reserved.<br>Wheels is licensed under the Apache License, Version 2.0.</p>
129129
<cfif structKeyExists(email, "isSubscriber") AND email.isSubscriber eq true>
130130
<p class="footer" style="color: 707070 !important; margin: 5px !important; font-size: 12px;">You're receiving this email because you're part of the Wheels community. If you'd like to manage your preferences or unsubscribe, click <a href="javascript:void(0)">here</a>.</p>
131131
</cfif>

‎app/views/email.cfm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<h5 style="margin-top: 5px !important; font-size: 14px;">#params.teamSignature#<h5>
125125
</cfif>
126126
<div class="signatureBox">
127-
<p class="signature">&copy;2005-2025 Wheels.Dev. All rights are reserved.<br>Wheels is licensed under the Apache License, Version 3.0.</p>
127+
<p class="signature">&copy;2005-2025 Wheels.Dev. All rights are reserved.<br>Wheels is licensed under the Apache License, Version 2.0.</p>
128128
<cfif structKeyExists(params, "isSubscriber") AND params.isSubscriber eq true>
129129
<p class="footer" style="color: 707070 !important; margin: 5px !important; font-size: 12px;">You're receiving this email because you're part of the Wheels community. If you'd like to manage your preferences or unsubscribe, click <a href="javascript:void(0)">here</a>.</p>
130130
</cfif>

‎app/views/layout.cfm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@
370370
<div>
371371
<p class="p-0 m-0 fs-12 text--secondary">
372372
&copy; 2005-2025 Wheels.Dev. All rights are reserved.<br>
373-
Wheels is licensed under the Apache License, Version 3.0.
373+
Wheels is licensed under the Apache License, Version 2.0.
374374
</p>
375375
</div>
376376
<div class="d-flex justify-content-center gap-3">

‎app/views/web/AuthController/forgotPassword.cfm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<div class="col-lg-4 bg-white col-12 position-relative mx-auto p-4 border rounded-4 shadow-sm">
1111
<div class="mt-2">
1212
<h1 class="fs-24 mb-0 fw-bold text--secondary">Reset Password</h1>
13-
<p class="fs-16 text--secondary fw-medium pt-2">Enter your email to receive reset instructions</p>
13+
<p class="fs-16 text--secondary fw-medium pt-2">Enter your email to get a password reset link</p>
1414

1515
<form hx-boost="true" class="pt-4 needs-validation" id="forgotPasswordForm" novalidate
1616
hx-post="/auth/send-reset-link" hx-swap="none" aria-label="Forgot Password Form">
@@ -40,13 +40,13 @@
4040
<div class="space-y-3">
4141
<button type="submit" class="bg--primary d-block w-100 text-white px-3 py-2 rounded-3 fs-16 hover:bg-primary-dark transition-all" aria-label="Send Reset Link">
4242
<span class="spinner-border spinner-border-sm d-none" role="status" aria-hidden="true"></span>
43-
<span class="button-text">Send Reset Link</span>
43+
<span class="button-text">Send Link</span>
4444
</button>
4545

4646
<div class="text-center">
4747
<p class="fs-14 text--secondary fw-medium">
4848
Remember your password?
49-
<a href="/login" class="text--primary hover:text-primary" data-hx-boost="false">Login here</a>
49+
<a href="/login" class="text--primary hover:text-primary" data-hx-boost="false">Login</a>
5050
</p>
5151
</div>
5252
</div>

‎app/views/web/AuthController/login.cfm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<div class="col-lg-4 bg-white col-12 position-relative mx-auto p-4 border rounded-4 shadow-sm">
1111
<div class="mt-2">
1212
<h1 class="fs-24 mb-0 fw-bold text--secondary">Welcome Back</h1>
13-
<p class="fs-16 text--secondary fw-medium pt-2">Please login to your account</p>
13+
<p class="fs-16 text--secondary fw-medium pt-2">Please login to continue</p>
1414

1515
<form hx-boost="true" class="pt-4 needs-validation" id="loginForm" novalidate
1616
hx-post="/auth/authenticate" hx-swap="none" aria-label="Login Form">
@@ -29,7 +29,7 @@
2929
stroke-linejoin="round" />
3030
</g>
3131
</svg>
32-
<input type="email" placeholder="Enter your email"
32+
<input type="email" placeholder="Email Address"
3333
class="fs-14 flex-grow-1 outline-none bg-transparent input-autofill" id="email"
3434
name="email" required autocomplete="email" aria-label="Email Address">
3535
</div>
@@ -55,7 +55,7 @@
5555
stroke-linecap="round" stroke-linejoin="round" />
5656
</g>
5757
</svg>
58-
<input type="password" placeholder="Enter your password"
58+
<input type="password" placeholder="Password"
5959
class="fs-14 flex-grow-1 outline-none bg-transparent input-autofill" id="password"
6060
name="password" required minlength="8" autocomplete="current-password" aria-label="Password">
6161
<button type="button" class="btn btn-link p-0" onclick="togglePasswordVisibility()" aria-label="Toggle Password Visibility">
@@ -86,7 +86,7 @@
8686
<div class="text-center">
8787
<p class="fs-14 text--secondary fw-medium">
8888
Don't have an account?
89-
<a href="/register" class="text--primary hover:text-primary" data-hx-boost="false">Register here</a>
89+
<a href="/register" class="text--primary hover:text-primary" data-hx-boost="false">Register</a>
9090
</p>
9191
</div>
9292
</div>

0 commit comments

Comments
 (0)