Merge pull request #99 from paiindustries/develop

Finish 1.1.0

Author: zainforbjs

.github/workflows/prod.yml

@@ -42,12 +42,12 @@ jobs:
           docker pull ${{ secrets.DOCKER_HUB_IP }}:${{ secrets.DOCKER_HUB_PORT}}/wheels-dev-prod
           docker stack deploy --with-registry-auth -c docker-compose.yml wheels-dev-prod
 
-      - name: Post Slack Message
-        id: Post-Slack-Message
-        uses: act10ns/slack@v2
-        with:
-          webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
-          status: ${{ job.status }}
-          steps: ${{ toJson(steps) }}
-          channel: '#wheels-dev'
-        if: always()
+#      - name: Post Slack Message
+#        id: Post-Slack-Message
+#        uses: act10ns/slack@v2
+#        with:
+#          webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
+#          status: ${{ job.status }}
+#          steps: ${{ toJson(steps) }}
+#          channel: '#wheels-dev'
+#        if: always()

app/config/routes.cfm

@@ -103,6 +103,13 @@
 		.namespace("admin")
 			// Admin Controls
 			.get(name = "dashboard", pattern="/", to="AdminController##dashboard")
+
+			// FeatureController routes
+			.get(name = "feature", pattern = "feature", to = "FeatureController##index")
+			.get(name = "addFeature", pattern = "feature/add", to = "FeatureController##addFeature")
+			.get(name = "editFeature", pattern = "feature/edit/[id]", to = "FeatureController##addFeature")
+			.post(name = "storeFeature", pattern = "feature/store", to = "FeatureController##store")
+			.get(name = "deleteFeature", pattern = "feature/delete/[id]", to = "FeatureController##delete")
 			.get(name = "blog", pattern = "blog", to = "AdminController##blog")
 			.get(name = "blogEdit", pattern = "blog/edit/[id]", to = "AdminController##editBlog")
 			.put(name = "blog-update", pattern = "blog/blogUpdate/[id]", to = "AdminController##update")

app/controllers/admin/AdminController.cfc

@@ -441,9 +441,11 @@ component extends="app.Controllers.Controller" {
                     var emailparams = {
                         "name" = user.fullname,
                         "buttonTitle" = "View Your Post",
-                        "content" = "Thank you for writing a blog post. Your post '#blog.title#' has been published on the Wheels website.",
+                        "content" = "Thank you for contributing to the Wheels.dev community. Your blog post '#blog.title#' has been published and is now live on our platform.",
                         "URl" = siteurl,
-                        "Footer" = "If you did not write blog post, you can safely ignore this email."
+                        "Footer" = "If you haven't published a blog post, please disregard this email.",
+                        "footerGreetings" = "Thank you for being part of the Wheels.dev community.",
+                        "isSubscriber" = user.newsletter
                     };
                     emailContent = renderView(template="/email", layout=false, returnAs="string", params=emailparams);
                     cfheader(name="Content-Type" value="text/html; charset=UTF-8");
@@ -797,9 +799,11 @@ component extends="app.Controllers.Controller" {
                 var emailparams = {
                     "name" = user.fullname,
                     "buttonTitle" = "View Your Comment",
-                    "content" = "Thanks for commenting on our blog post. Your comment is now live on the Wheels site.",
+                    "content" = "Thank you for engaging with our community. Your comment has been published and is now visible on the Wheels.dev platform.",
                     "URl" = siteurl,
-                    "Footer" = "If you did not write comment, you can safely ignore this email."
+                    "Footer" = "If you haven't submitted a comment, please disregard this email.",
+                    "footerGreetings" = "Thank you for being part of the Wheels.dev community.",
+                    "isSubscriber" = user.newsletter
                 };
                 emailContent = renderView(template="/email", layout=false, returnAs="string", params=emailparams);
                 cfmail( 
@@ -871,9 +875,11 @@ component extends="app.Controllers.Controller" {
                 var emailparams = {
                     "name" = user.fullname,
                     "buttonTitle" = "View Your Post",
-                    "content" = "Thank you for writing a blog post. Your post '#blog.title#' has been rejected.",
+                    "content" = "Thank you for your contribution to the Wheels.dev community. After careful review, we regret to inform you that your blog post '#blog.title#' has not been approved for publication at this time.",
                     "URl" = "",
-                    "Footer" = "If you did not write blog post, you can safely ignore this email."
+                    "Footer" = "If you haven't submitted a blog post, please disregard this email.",
+                    "footerGreetings" = "Thank you for being part of the Wheels.dev community.",
+                    "isSubscriber" = user.newsletter
                 };
                 emailContent = renderView(template="/email", layout=false, returnAs="string", params=emailparams);
                 cfheader(name="Content-Type" value="text/html; charset=UTF-8");

app/controllers/admin/FeatureController.cfc

@@ -0,0 +1,93 @@
+component extends="app.Controllers.Controller" {
+
+    function config() {
+        verifies(except="index,addFeature,store", params="key", paramsTypes="integer", handler="index");
+        usesLayout(template="/admin/AdminController/layout");
+        filters(through="checkAdminAccess");
+    }
+
+    // List all features
+    function index() {
+        features = model("Feature").getAllFeatures();
+    }
+
+    // Add or edit feature
+    function addFeature() {
+        param name="id" default=0;
+        feature;
+        if (id > 0) {
+            feature = findById(params.id);
+        } else {
+            feature = model("Feature");
+        }
+        return feature;
+    }
+
+    // Save feature (create or update)
+    function store() {
+        try {
+            var message = saveFeature(params);
+            flashInsert(success=message);
+            redirectTo(route="adminFeature");
+        } catch (any e) {
+            flashInsert(error="Failed to save feature: " & e.message);
+            redirectTo(route="adminFeature");
+        }
+    }
+
+    // Delete feature (soft delete)
+    function delete() {
+        try {
+            var message = softDelete(params.id);
+            flashInsert(success=message.message);
+            renderText('');
+        } catch (any e) {
+            flashInsert(error="Failed to delete feature: " & e.message);
+            cfheader(statusCode=500);
+        }
+    }
+
+    // Find feature by ID
+    private function findById(id) {
+        return model("Feature").findByKey(arguments.id);
+    }
+
+    // Save or update feature
+    private function saveFeature(featureData) {
+        var message = "";
+        if (featureData.id > 0) {
+            var feature = model("Feature").findByKey(featureData.id);
+            if (!isNull(feature)) {
+                feature.title = featureData.title;
+                feature.image = featureData.image;
+                feature.description = featureData.description;
+                feature.updatedAt = now();
+                feature.save();
+                message = "Feature updated successfully.";
+            } else {
+                message = "Feature not found for editing.";
+            }
+        } else {
+            var newFeature = model("Feature").new();
+            newFeature.title = featureData.title;
+            newFeature.image = featureData.image;
+            newFeature.description = featureData.description;
+            newFeature.createdAt = now();
+            newFeature.updatedAt = now();
+            newFeature.save();
+            message = "Feature created successfully.";
+        }
+        return message;
+    }
+
+    // Soft delete feature
+    private function softDelete(id) {
+        var feature = model("Feature").findByKey(arguments.id);
+        if (!isNull(feature)) {
+            feature.deletedAt = now();
+            feature.save();
+            return { success = true, message = "Feature deleted successfully." };
+        }
+        return { success = false, message = "Feature not found." };
+    }
+}

app/controllers/admin/testimonialController.cfc

@@ -222,7 +222,9 @@ component extends="app.Controllers.Controller" {
                     "buttonTitle" = "View Your Testimonial",
                     "content" = "Thank you for writing a testimonial. Your testimonial has been approved and published on the Wheels website.",
                     "URl" = siteurl,
-                    "Footer" = "If you did not write testinomial, you can safely ignore this email."
+                    "Footer" = "If you did not write testinomial, you can safely ignore this email.",
+                    "footerGreetings" = "Thank you for being a part of Wheels community.",
+                    "isSubscriber" = user.newsletter
                 };
                 emailContent = renderView(template="/email", layout=false, returnAs="string", params=emailparams);
                 cfheader(name="Content-Type" value="text/html; charset=UTF-8");