diff --git a/apps/game_craft/lib/store/purchases/purchases.thunk.ts b/apps/game_craft/lib/store/purchases/purchases.thunk.ts index 0e67c419..506d5497 100644 --- a/apps/game_craft/lib/store/purchases/purchases.thunk.ts +++ b/apps/game_craft/lib/store/purchases/purchases.thunk.ts @@ -2,12 +2,13 @@ import { createAppAsyncThunk } from "../createAppAsyncThunk"; import { PurchasesResponse } from "@ssc/core"; +import {eventId} from "../../utils/constants"; export const fetchPurchasesThunk = createAppAsyncThunk( "purchases/fetchPurchases", async (_, thunkAPI) => { try { - const response = await thunkAPI.extra.Api.purchases.fetchPurchases(); + const response = await thunkAPI.extra.Api.purchases.fetchPurchases(eventId); const data = response.data.data; return thunkAPI.fulfillWithValue(data); } catch (error) { diff --git a/apps/level_up/app/[locale]/(public)/page.tsx b/apps/level_up/app/[locale]/(public)/page.tsx index 80f32045..dac6eb26 100644 --- a/apps/level_up/app/[locale]/(public)/page.tsx +++ b/apps/level_up/app/[locale]/(public)/page.tsx @@ -1,9 +1,7 @@ "use client"; import { Flex, theme } from "antd"; -import { GameCraftTimeline } from "../../../components/features/Timeline"; import { GameCraftIntro } from "../../../components/features/home/GameCraftIntro"; -import { Prizes } from "../../../components/features/home/Prizes"; import { AboutUs } from "../../../components/features/home/AboutUs"; import { OfflineWorkshop } from "../../../components/features/workshops/OfflineWorkshop"; import { OnlineWorkshop } from "../../../components/features/workshops/OnlineWorkshop"; @@ -47,7 +45,6 @@ export default function HomePage() { {/**/} {/* Workshop Sections - Matching React order exactly */} -
- {/* Sponsors Section */} + {/*Sponsors Section*/} {/**/} diff --git a/apps/level_up/components/features/competitions/CompetitonsList.tsx b/apps/level_up/components/features/competitions/CompetitonsList.tsx index 8235fede..1fcd4731 100644 --- a/apps/level_up/components/features/competitions/CompetitonsList.tsx +++ b/apps/level_up/components/features/competitions/CompetitonsList.tsx @@ -18,7 +18,7 @@ interface Props { } export function CompetitionsList({ - padding = "3rem 2rem", + padding = "2rem 2rem", backgroundColor, dashboardMode = false, }: Props) { diff --git a/apps/level_up/components/features/workshops/OfflineWorkshop.tsx b/apps/level_up/components/features/workshops/OfflineWorkshop.tsx index 7ace581d..936430a6 100644 --- a/apps/level_up/components/features/workshops/OfflineWorkshop.tsx +++ b/apps/level_up/components/features/workshops/OfflineWorkshop.tsx @@ -8,6 +8,8 @@ import { useEffect, useMemo, useState } from "react"; import { PresentationsList, PresentationType } from "@ssc/core"; import { clientApi } from "lib/api/client/clientApi"; import { eventId } from "lib/utils/constants"; +import Wave from "../../common/Wave"; +import {customColors} from "../../../config/colors"; interface OfflineWorkshopProps { padding?: string; @@ -15,7 +17,7 @@ interface OfflineWorkshopProps { } export function OfflineWorkshop({ - padding = "3rem 2rem", + padding = "2rem 2rem", backgroundColor, }: OfflineWorkshopProps) { const screens = useResponsive(); diff --git a/apps/level_up/components/features/workshops/OnlineWorkshop.tsx b/apps/level_up/components/features/workshops/OnlineWorkshop.tsx index 2f500a0e..c95707b5 100644 --- a/apps/level_up/components/features/workshops/OnlineWorkshop.tsx +++ b/apps/level_up/components/features/workshops/OnlineWorkshop.tsx @@ -9,6 +9,7 @@ import { useEffect, useMemo, useState } from "react"; import { PresentationsList, PresentationType } from "@ssc/core"; import { clientApi } from "lib/api/client/clientApi"; import { eventId } from "lib/utils/constants"; +import {customColors} from "../../../config/colors"; const { useToken } = theme; @@ -18,7 +19,7 @@ interface OnlineWorkshopProps { } export function OnlineWorkshop({ - padding = "3rem 2rem", + padding = "2rem 2rem", backgroundColor, }: OnlineWorkshopProps) { const { token } = useToken(); @@ -101,7 +102,7 @@ export function OnlineWorkshop({ backgroundColor: backgroundColor, }} > - + - {content} + + {content} + + { try { - const response = await thunkAPI.extra.Api.purchases.fetchPurchases(); + const response = await thunkAPI.extra.Api.purchases.fetchPurchases(eventId); const data = response.data.data; return thunkAPI.fulfillWithValue(data); } catch (error) { diff --git a/apps/level_up/messages/en.json b/apps/level_up/messages/en.json index 71210277..d662c454 100644 --- a/apps/level_up/messages/en.json +++ b/apps/level_up/messages/en.json @@ -229,9 +229,9 @@ "offlineWorkshops": "In-Person Workshops", "free": "Free", "error": "Failed to load workshops", - "noWorkshops": "No workshops available", - "noOnlineWorkshops": "No online workshops are currently available", - "noOfflineWorkshops": "No in-person workshops are currently available", + "noWorkshops": "No Items available", + "noOnlineWorkshops": "No items are currently available.", + "noOfflineWorkshops": "No items are currently available.", "viewDetails": "View Details", "capacity": "Total Capacity", "teamsCapacity": "Teams Total Capacity", diff --git a/apps/level_up/messages/fa.json b/apps/level_up/messages/fa.json index 929063e1..4c9ca827 100644 --- a/apps/level_up/messages/fa.json +++ b/apps/level_up/messages/fa.json @@ -229,9 +229,9 @@ "offlineWorkshops": "کارگاه‌های حضوری", "free": "رایگان", "error": "خطا در بارگذاری کارگاه‌ها", - "noWorkshops": "کارگاهی موجود نیست", - "noOnlineWorkshops": "در حال حاضر هیچ کارگاه آنلاینی موجود نیست", - "noOfflineWorkshops": "در حال حاضر هیچ کارگاه حضوری موجود نیست", + "noWorkshops": "آیتمی موجود نیست.", + "noOnlineWorkshops": "در حال حاضر هیچ آیتمی موجود نیست.", + "noOfflineWorkshops": "در حال حاضر هیچ آیتمی موجود نیست.", "viewDetails": "جزئیات بیشتر", "capacity": "ظرفیت کل", "teamsCapacity": "ظرفیت کل تیم ها", diff --git a/apps/level_up/tailwind.config.ts b/apps/level_up/tailwind.config.ts index 7b3f2823..e2d48133 100644 --- a/apps/level_up/tailwind.config.ts +++ b/apps/level_up/tailwind.config.ts @@ -17,36 +17,32 @@ const config: Config = { "sf-pro": ["SF Pro Rounded", "sans-serif"], }, colors: { - // Your custom brand colors - primary: "#0056D2", // Bright blue - action: "#00C897", // Fresh green accent - "offline-workshop": "#4E6E81", // Muted teal + primary: "#4B164C", + action: "#E83E8C", + "offline-workshop": "#5C4D7D", - // Ant Design theme colors extracted from provider - "antd-primary": "#0056D2", - "antd-primary-hover": "#1E6DEB", - "antd-primary-active": "#0041A8", - "antd-success": "#00C897", - "antd-warning": "#FFC93C", - "antd-error": "#FF5A5F", + "antd-primary": "#4B164C", + "antd-primary-hover": "#662566", + "antd-primary-active": "#351034", + "antd-success": "#22C55E", + "antd-warning": "#FACC15", + "antd-error": "#F43F5E", - // Light theme colors - "antd-bg-base": "#ffffff", - "antd-bg-container": "#f9fafb", - "antd-bg-elevated": "#ffffff", - "antd-text": "#1a1a1a", - "antd-text-secondary": "#4b5563", - "antd-layout-header": "#0056D2", - "antd-layout-body": "#f4f6f8", + "antd-bg-base": "#FFFFFF", + "antd-bg-container": "#F9F7FB", + "antd-bg-elevated": "#FFFFFF", + "antd-text": "#1E1B1B", + "antd-text-secondary": "#575369", + "antd-layout-header": "#4B164C", + "antd-layout-body": "#F6F4F9", - // Dark theme colors - "antd-dark-bg-base": "#0F172A", - "antd-dark-bg-container": "#1E293B", - "antd-dark-bg-elevated": "#27364A", + "antd-dark-bg-base": "#130E15", + "antd-dark-bg-container": "#1F1825", + "antd-dark-bg-elevated": "#2B1F36", "antd-dark-text": "#F8FAFC", - "antd-dark-text-secondary": "#CBD5E1", - "antd-dark-layout-header": "#0056D2", - "antd-dark-layout-body": "#0F172A", + "antd-dark-text-secondary": "#A1A1AA", + "antd-dark-layout-header": "#4B164C", + "antd-dark-layout-body": "#130E15", }, backgroundImage: { "gradient-radial": "radial-gradient(var(--tw-gradient-stops))", diff --git a/apps/ssc/app/payment/callback/page.tsx b/apps/ssc/app/payment/callback/page.tsx index cdc1f899..6c238220 100644 --- a/apps/ssc/app/payment/callback/page.tsx +++ b/apps/ssc/app/payment/callback/page.tsx @@ -31,10 +31,10 @@ const PaymentCallbackContent = () => { }); }, [searchParams]); - const handleRedirectToGameCraft = () => { - const gamecraftUrl = - process.env.NEXT_PUBLIC_GAMECRAFT_URL || "https://gamecraft.ir"; - window.location.href = gamecraftUrl; + const handleRedirect = () => { + const redirectUrl = + process.env.NEXT_PUBLIC_API_URL || "https://ceit-ssc.ir"; + window.location.href = redirectUrl; }; const { success, message, orderId } = paymentState; @@ -86,9 +86,9 @@ const PaymentCallbackContent = () => {
diff --git a/packages/core/src/api/Purchases/purchases.api.ts b/packages/core/src/api/Purchases/purchases.api.ts index d39818c3..8b16b50e 100644 --- a/packages/core/src/api/Purchases/purchases.api.ts +++ b/packages/core/src/api/Purchases/purchases.api.ts @@ -4,9 +4,9 @@ import { PurchasesResponse } from "../../types/api/Purchases/Purchases"; import { RequestResponse } from "../../types/api/general"; export class PurchasesApi extends ApiClient { - async fetchPurchases() { + async fetchPurchases(event: number) { return await this.Api.get>( - apiPath(ApiPath.PURCHASES_GET_LIST), + apiPath(ApiPath.PURCHASES_GET_LIST, {event}), { requiresAuth: true, }