FIX - coins attribution wrong

Author: MeMMa137

client/src/components/AdminReviewPage.jsx

@@ -39,6 +39,8 @@ function formatHours(value) {
   return Number(value ?? 0).toFixed(2);
 }
 
+const BRICKS_PER_APPROVED_HOUR = 20;
+
 function formatDate(value) {
   if (!value) return "Shipped (unknown date)";
   return `Shipped ${new Date(value).toLocaleDateString()}`;
@@ -231,7 +233,7 @@ function AdminReviewDetail({ projectId }) {
       if (!response.ok) throw new Error(data.error || "Failed to load project.");
       setProject(data.project);
       setJournalEntries(data.journalEntries || []);
-      setApprovedHours(data.project?.pendingReviewHours ? String(data.project.pendingReviewHours) : "");
+      setApprovedHours("");
       setStatus("");
     } catch (err) {
       setMessage(err.message);
@@ -355,6 +357,8 @@ function AdminReviewDetail({ projectId }) {
   const isSuperadmin = user?.role === "superadmin";
   const newHoursMax = Number(project.pendingReviewHours ?? 0);
   const newHoursPlaceholder = formatHours(newHoursMax);
+  const approvedHoursNumber = Number.parseFloat(approvedHours);
+  const awardPreview = Number.isFinite(approvedHoursNumber) ? approvedHoursNumber * BRICKS_PER_APPROVED_HOUR : 0;
 
   return (
     <main className="admin-review-page">
@@ -453,6 +457,7 @@ function AdminReviewDetail({ projectId }) {
                 disabled={isAlreadyReviewed}
                 onChange={(event) => setApprovedHours(clampApprovalHours(event.target.value, newHoursMax))}
               />
+              <small>Only this approved amount awards bricks: {formatHours(awardPreview)} bricks</small>
             </div>
             <div>
               <span>Journal hours</span>

client/src/components/ProjectsPage.jsx

@@ -889,8 +889,9 @@ function ProjectFormModal({
             <select value={project.projectType || "software"} onChange={(event) => onChange("projectType", event.target.value)}>
               <option value="software">Software</option>
               <option value="hardware">Hardware</option>
-              <option value="art">Art</option>
-              <option value="other">Other</option>
+              <option value="art" disabled title="Coming soon...">
+                Art (Coming soon...)
+              </option>
             </select>
           </label>
           <label>

client/src/components/ShopPage.jsx

@@ -12,6 +12,8 @@ const stackTitle = "https://cdn.hackclub.com/019e3e5a-8745-7bee-a1ab-07b5743f98c
 const legoCharacter = "https://cdn.hackclub.com/019e3e5a-6d71-79f0-9633-8668b69f464d/legoChar_1.png";
 import "./ShopPage.css";
 
+const BRICKS_PER_USD = 20;
+
 function formatBricks(value) {
   const numeric = Number(value);
   return Number.isFinite(numeric) ? Math.round(numeric).toString() : "0";
@@ -74,7 +76,7 @@ export function ShopPage() {
   const quantity = Math.max(1, Number(purchaseQuantity) || 1);
   const shippingUsd = shippingTaxUsd ? Number(shippingTaxUsd) : 0;
   const safeShippingUsd = Number.isFinite(shippingUsd) ? shippingUsd : 0;
-  const shippingBricks = safeShippingUsd ? Math.ceil(safeShippingUsd * 10) : 0;
+  const shippingBricks = safeShippingUsd ? Math.ceil(safeShippingUsd * BRICKS_PER_USD) : 0;
   const totalBricks = baseBricks * quantity + (Number.isFinite(shippingBricks) ? shippingBricks : 0);
   const itemUsd = selectedItem?.priceUsd != null ? Number(selectedItem.priceUsd) : baseBricks / 10;
   const totalUsd = (Number.isFinite(itemUsd) ? itemUsd : 0) * quantity + safeShippingUsd;

server/adminStats.js

@@ -126,7 +126,7 @@ export async function getAdminStats() {
     `),
     pool.query(`SELECT COALESCE(SUM(bricks), 0) AS wallet_bricks FROM users`),
     pool.query(`
-      SELECT COALESCE(SUM(bricks_earned), 0) AS total_earned FROM projects WHERE status = 'approved'
+      SELECT COALESCE(SUM(bricks_earned), 0) AS total_earned FROM projects WHERE COALESCE(approved_hours, 0) > 0
     `),
     pool.query(`
       SELECT

server/projects.js

@@ -4,6 +4,8 @@ import { syncJournalEntryToAirtable } from "./airtableJournals.js";
 import { deleteProjectSubmissionsFromYsws, ensureYswsProjectSubmissionsTable, submitProjectToYsws } from "./airtableYsws.js";
 import { fetchHackatimeProjects, sumHackatimeHoursForNames } from "./hackatimeAuth.js";
 
+export const BRICKS_PER_APPROVED_HOUR = 20;
+
 export async function ensureProjectsTable() {
   if (!pool) {
     console.warn("[projects] DATABASE_URL not set; skipping projects table setup.");
@@ -97,6 +99,35 @@ export async function ensureProjectsTable() {
   await pool.query(`UPDATE projects SET fraud_flag = FALSE WHERE fraud_flag IS NULL`);
   await pool.query(`UPDATE projects SET ship_kind = 'initial' WHERE ship_kind IS NULL`);
   await pool.query(`UPDATE projects SET blocked = FALSE WHERE blocked IS NULL`);
+  await pool.query(`
+    WITH mismatched AS (
+      SELECT
+        id,
+        user_id,
+        COALESCE(bricks_earned, 0) AS old_bricks,
+        ROUND(COALESCE(approved_hours, 0) * $1, 2) AS new_bricks
+      FROM projects
+      WHERE COALESCE(bricks_earned, 0) != ROUND(COALESCE(approved_hours, 0) * $1, 2)
+    ),
+    corrected AS (
+      UPDATE projects
+      SET bricks_earned = mismatched.new_bricks,
+          updated_at = NOW()
+      FROM mismatched
+      WHERE projects.id = mismatched.id
+      RETURNING mismatched.user_id, mismatched.new_bricks - mismatched.old_bricks AS delta
+    ),
+    deltas AS (
+      SELECT user_id, SUM(delta) AS delta
+      FROM corrected
+      GROUP BY user_id
+    )
+    UPDATE users
+    SET bricks = GREATEST(0, users.bricks + deltas.delta),
+        updated_at = NOW()
+    FROM deltas
+    WHERE users.id = deltas.user_id
+  `, [BRICKS_PER_APPROVED_HOUR]);
   await pool.query(`
     UPDATE projects
     SET last_shipped_hours = GREATEST(
@@ -436,7 +467,7 @@ export async function approveAdminReviewProject(adminId, projectId, input = {})
       throw new Error(`Cannot approve ${newTotalApprovedHours.toFixed(2)} total hours because only ${totalLoggedHours.toFixed(2)} hours are logged.`);
     }
 
-    const bricksDelta = approvedHours * 20;
+    const bricksDelta = approvedHours * BRICKS_PER_APPROVED_HOUR;
     const reductionHours = Math.max(0, roundedHours(totalLoggedHours - newTotalApprovedHours));
     const newCumulativeBricks = Number(project.bricks_earned ?? 0) + bricksDelta;
 
@@ -506,8 +537,9 @@ export async function rejectAdminReviewProject(adminId, projectId, input = {}) {
     await client.query("BEGIN");
     await refreshProjectJournalHoursWithClient(client, projectId);
 
-    const lookup = await client.query("SELECT ship_kind FROM projects WHERE id = $1 FOR UPDATE", [projectId]);
-    const isReship = lookup.rows[0]?.ship_kind === "reship";
+    const lookup = await client.query("SELECT * FROM projects WHERE id = $1 FOR UPDATE", [projectId]);
+    const project = lookup.rows[0];
+    const isReship = project?.ship_kind === "reship";
 
     const result = await client.query(
       `

server/shopItems.js

@@ -27,6 +27,7 @@ const REMOVED_SHOP_ITEM_COLUMNS = [
 ];
 
 const REMOVED_SHOP_ORDER_COLUMNS = ["total_coins"];
+const BRICKS_PER_USD = 20;
 
 export async function ensureShopItemsTable() {
   if (!pool) {
@@ -60,10 +61,10 @@ export async function ensureShopItemsTable() {
 
   await pool.query(`
     UPDATE shop_items
-    SET price = CEIL(price_usd * 20)
+    SET price = CEIL(price_usd * $1)
     WHERE price_usd IS NOT NULL
-      AND (price IS NULL OR price != CEIL(price_usd * 20))
-  `);
+      AND (price IS NULL OR price != CEIL(price_usd * $1))
+  `, [BRICKS_PER_USD]);
 
   for (const column of REMOVED_SHOP_ITEM_COLUMNS) {
     await pool.query(`ALTER TABLE shop_items DROP COLUMN IF EXISTS ${column}`);
@@ -233,7 +234,7 @@ export async function purchaseShopItemForUser(userId, itemId, input = {}) {
     }
 
     const itemBricks = Number(item.price ?? 0);
-    const shippingBricks = Math.ceil(shippingTaxUsd * 10);
+    const shippingBricks = Math.ceil(shippingTaxUsd * BRICKS_PER_USD);
     const totalBricks = itemBricks * quantity + shippingBricks;
 
     const userResult = await client.query(
@@ -300,7 +301,7 @@ function normalizeShopItemInput(input = {}) {
   const price = integerOrNull(input.price);
   return {
     name: textOrNull(input.name),
-    price: price ?? (priceUsd === null ? null : Math.ceil(priceUsd * 20)),
+    price: price ?? (priceUsd === null ? null : Math.ceil(priceUsd * BRICKS_PER_USD)),
     itemLink: safeHttpUrl(input.itemLink ?? input.item_link),
     imageUrl: safeHttpUrl(input.imageUrl ?? input.image_url),
     description: textOrNull(input.description),