diff --git a/.env.development b/.env.development index 32dd779..4d3582d 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,9 @@ # Port on which the react app will run PORT=3000 +# Clarity +NEXT_PUBLIC_CLARITY_ID="sm45wic0hf" + # Base URL for the EVAPP API SERVER config NEXT_PUBLIC_EVAPP_SERVER_BASE_URL="https://staging.evapp.heedlabs.com/api" NEXT_PUBLIC_EVAPP_SEVER_REQUEST_TIMEOUT=10000 diff --git a/.env.production b/.env.production index 32dd779..4d3582d 100644 --- a/.env.production +++ b/.env.production @@ -1,6 +1,9 @@ # Port on which the react app will run PORT=3000 +# Clarity +NEXT_PUBLIC_CLARITY_ID="sm45wic0hf" + # Base URL for the EVAPP API SERVER config NEXT_PUBLIC_EVAPP_SERVER_BASE_URL="https://staging.evapp.heedlabs.com/api" NEXT_PUBLIC_EVAPP_SEVER_REQUEST_TIMEOUT=10000 diff --git a/.github/workflows/nextjs.yml b/.github/workflows/nextjs.yml index d4e58e2..926ab7f 100644 --- a/.github/workflows/nextjs.yml +++ b/.github/workflows/nextjs.yml @@ -32,45 +32,77 @@ jobs: - name: Debug - List workspace contents run: | + echo "=== Workspace Contents ===" ls -la ${{ github.workspace }} - echo "Looking for yarn.lock file..." + echo "=== Package Files Check ===" if [ -f "${{ github.workspace }}/yarn.lock" ]; then - echo "yarn.lock file found" + echo "βœ… yarn.lock file found" else - echo "yarn.lock file NOT found" + echo "❌ yarn.lock file NOT found" fi + if [ -f "${{ github.workspace }}/package.json" ]; then + echo "βœ… package.json file found" + echo "=== Package.json Contents ===" + cat package.json + else + echo "❌ package.json file NOT found" + fi + + - name: Debug - Node and Yarn versions + run: | + echo "=== Node Version ===" + node --version + echo "=== Yarn Version ===" + yarn --version + echo "=== NPM Version ===" + npm --version - name: Detect package manager id: detect-package-manager run: | + echo "=== Package Manager Detection ===" if [ -f "${{ github.workspace }}/yarn.lock" ]; then + echo "πŸ“¦ Using Yarn as package manager" echo "manager=yarn" >> $GITHUB_OUTPUT echo "command=install" >> $GITHUB_OUTPUT echo "runner=yarn" >> $GITHUB_OUTPUT exit 0 elif [ -f "${{ github.workspace }}/package.json" ]; then + echo "πŸ“¦ Using NPM as package manager" echo "manager=npm" >> $GITHUB_OUTPUT echo "command=ci" >> $GITHUB_OUTPUT echo "runner=npx --no-install" >> $GITHUB_OUTPUT exit 0 else - echo "Unable to determine package manager" + echo "❌ Unable to determine package manager" exit 1 fi + # Enable Corepack and install the correct Yarn version (3.5.0) BEFORE Node setup + - name: Enable Corepack and install Yarn + run: | + echo "=== Setting up Yarn ===" + corepack enable + corepack prepare yarn@3.5.0 --activate + echo "βœ… Yarn setup complete" + - name: Setup Node uses: actions/setup-node@v4 with: node-version: "20" - cache: ${{ steps.detect-package-manager.outputs.manager }} + cache: yarn - # Enable Corepack and install the correct Yarn version (3.5.0) as defined in package.json - - name: Enable Corepack and install Yarn + - name: Debug - Environment after Node setup run: | - corepack enable - corepack prepare yarn@3.5.0 --activate + echo "=== Environment Variables ===" + env | sort + echo "=== Current Directory ===" + pwd + echo "=== Directory Contents ===" + ls -la - name: Setup Pages + if: github.actor != 'nektos/act' uses: actions/configure-pages@v5 with: # Automatically inject basePath in your Next.js configuration file and disable @@ -91,18 +123,43 @@ jobs: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}- - name: Install dependencies - run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }} + run: | + echo "=== Installing Dependencies ===" + if [ "${{ github.actor }}" = "nektos/act" ]; then + echo "Using --no-immutable flag for local testing" + yarn install --no-immutable + else + echo "Using --immutable flag for CI" + # First try with --immutable + if ! yarn install --immutable; then + echo "⚠️ Lockfile needs updates, updating dependencies..." + # If immutable fails, update dependencies and regenerate lockfile + yarn install --mode=update-lockfile + # Verify the installation + yarn install --immutable + fi + fi + echo "=== Dependencies Installation Complete ===" + echo "=== Node Modules Contents ===" + ls -la node_modules - name: Build with Next.js - run: ${{ steps.detect-package-manager.outputs.runner }} next build + run: | + echo "=== Starting Next.js Build ===" + ${{ steps.detect-package-manager.outputs.runner }} next build + echo "=== Build Complete ===" + echo "=== Build Output Contents ===" + ls -la out - name: Upload artifact + if: github.actor != 'nektos/act' uses: actions/upload-pages-artifact@v3 with: path: ./out # Deployment job deploy: + if: github.actor != 'nektos/act' environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} @@ -111,4 +168,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 \ No newline at end of file + uses: actions/deploy-pages@v4 diff --git a/next.config.js b/next.config.js index 08772ee..3f27ae7 100644 --- a/next.config.js +++ b/next.config.js @@ -3,8 +3,8 @@ const nextConfig = { output: "export", trailingSlash: true, // GitHub Pages prefers this for routing reactStrictMode: false, - basePath: "/makerchat.co-website", // Add basePath for GitHub Pages - assetPrefix: "/makerchat.co-website/", // Add assetPrefix for GitHub Pages + basePath: "", // Add basePath for custom domain + assetPrefix: "", // images: { unoptimized: true, // Required for `next export` remotePatterns: [ diff --git a/package.json b/package.json index 7cb3503..0d884bb 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,8 @@ "@radix-ui/react-separator": "^1.1.0", "@radix-ui/react-slot": "^1.1.0", "@radix-ui/react-tooltip": "^1.1.3", + "@splinetool/react-spline": "^4.1.0", + "@splinetool/runtime": "^1.10.33", "@types/leaflet": "^1.9.14", "@types/node": "20.5.6", "@types/react": "18.2.21", @@ -74,6 +76,7 @@ "next-contentlayer": "^0.3.4", "next-mdx-remote": "^5.0.0", "ogl": "^1.0.11", + "powerglitch": "^2.4.0", "react": "19.0.0-rc-69d4b800-20241021", "react-dom": "19.0.0-rc-69d4b800-20241021", "react-leaflet": "v5.0.0-rc.1", @@ -82,6 +85,7 @@ "react-use-measure": "^2.1.7", "rehype-raw": "^7.0.0", "remark-gfm": "^4.0.0", + "sonner": "^2.0.6", "tailwind-merge": "^2.5.4", "tailwindcss-animate": "^1.0.7", "typescript": "5.1.6" diff --git a/public/elements/arduino-skelton.png b/public/elements/arduino-skelton.png deleted file mode 100644 index c85044f..0000000 Binary files a/public/elements/arduino-skelton.png and /dev/null differ diff --git a/public/elements/pi-skelton.png b/public/elements/pi-skelton.png deleted file mode 100644 index c1376e9..0000000 Binary files a/public/elements/pi-skelton.png and /dev/null differ diff --git a/public/fonts/AMORIA.otf b/public/fonts/AMORIA.otf new file mode 100644 index 0000000..e611594 Binary files /dev/null and b/public/fonts/AMORIA.otf differ diff --git a/public/fonts/Barakallah-PERSONAL-USE ONLY.ttf b/public/fonts/Barakallah-PERSONAL-USE ONLY.ttf new file mode 100644 index 0000000..bafbed1 Binary files /dev/null and b/public/fonts/Barakallah-PERSONAL-USE ONLY.ttf differ diff --git a/public/fonts/Cyber City.otf b/public/fonts/Cyber City.otf new file mode 100644 index 0000000..6ddf989 Binary files /dev/null and b/public/fonts/Cyber City.otf differ diff --git a/public/mg-logo-white.png b/public/mg-logo-white.png deleted file mode 100644 index 987358f..0000000 Binary files a/public/mg-logo-white.png and /dev/null differ diff --git a/public/mg-logo-white.webp b/public/mg-logo-white.webp new file mode 100644 index 0000000..6b8c0e9 Binary files /dev/null and b/public/mg-logo-white.webp differ diff --git a/public/uploads/photos/3d-print.gif b/public/photos/elements/3d-print.gif similarity index 100% rename from public/uploads/photos/3d-print.gif rename to public/photos/elements/3d-print.gif diff --git a/public/photos/elements/arduino-skelton.webp b/public/photos/elements/arduino-skelton.webp new file mode 100644 index 0000000..78afd98 Binary files /dev/null and b/public/photos/elements/arduino-skelton.webp differ diff --git a/public/photos/elements/kochi-balloon.webp b/public/photos/elements/kochi-balloon.webp new file mode 100644 index 0000000..7714606 Binary files /dev/null and b/public/photos/elements/kochi-balloon.webp differ diff --git a/public/uploads/photos/makerchat-group-photo.webp b/public/photos/elements/makerchat-group-photo.webp similarity index 100% rename from public/uploads/photos/makerchat-group-photo.webp rename to public/photos/elements/makerchat-group-photo.webp diff --git a/public/photos/elements/pi-skelton.webp b/public/photos/elements/pi-skelton.webp new file mode 100644 index 0000000..4851c9a Binary files /dev/null and b/public/photos/elements/pi-skelton.webp differ diff --git a/public/photos/elements/team-chat.webp b/public/photos/elements/team-chat.webp new file mode 100644 index 0000000..085baf2 Binary files /dev/null and b/public/photos/elements/team-chat.webp differ diff --git a/public/photos/elements/tv.webp b/public/photos/elements/tv.webp new file mode 100644 index 0000000..2c65386 Binary files /dev/null and b/public/photos/elements/tv.webp differ diff --git a/public/photos/locations/blr.webp b/public/photos/locations/blr.webp new file mode 100644 index 0000000..4d23429 Binary files /dev/null and b/public/photos/locations/blr.webp differ diff --git a/public/photos/locations/dubai-wheel.webp b/public/photos/locations/dubai-wheel.webp new file mode 100644 index 0000000..53a76a4 Binary files /dev/null and b/public/photos/locations/dubai-wheel.webp differ diff --git a/public/photos/locations/hyd.webp b/public/photos/locations/hyd.webp new file mode 100644 index 0000000..97cc44a Binary files /dev/null and b/public/photos/locations/hyd.webp differ diff --git a/public/photos/locations/kochi.webp b/public/photos/locations/kochi.webp new file mode 100644 index 0000000..772611c Binary files /dev/null and b/public/photos/locations/kochi.webp differ diff --git a/public/photos/locations/thumbnails/blr-thumbnail.webp b/public/photos/locations/thumbnails/blr-thumbnail.webp new file mode 100644 index 0000000..0cadf79 Binary files /dev/null and b/public/photos/locations/thumbnails/blr-thumbnail.webp differ diff --git a/public/photos/locations/thumbnails/dubai-thumbnail.webp b/public/photos/locations/thumbnails/dubai-thumbnail.webp new file mode 100644 index 0000000..667e1fa Binary files /dev/null and b/public/photos/locations/thumbnails/dubai-thumbnail.webp differ diff --git a/public/photos/locations/thumbnails/dubai-wheel_thumbnail.webp b/public/photos/locations/thumbnails/dubai-wheel_thumbnail.webp new file mode 100644 index 0000000..4338621 Binary files /dev/null and b/public/photos/locations/thumbnails/dubai-wheel_thumbnail.webp differ diff --git a/public/photos/locations/thumbnails/hyd-thumbnail.webp b/public/photos/locations/thumbnails/hyd-thumbnail.webp new file mode 100644 index 0000000..24dea86 Binary files /dev/null and b/public/photos/locations/thumbnails/hyd-thumbnail.webp differ diff --git a/public/photos/locations/thumbnails/kochi-thumbnail.webp b/public/photos/locations/thumbnails/kochi-thumbnail.webp new file mode 100644 index 0000000..9d16f90 Binary files /dev/null and b/public/photos/locations/thumbnails/kochi-thumbnail.webp differ diff --git a/public/photos/posters/HSHS.png b/public/photos/posters/HSHS.png new file mode 100644 index 0000000..6e54e4f Binary files /dev/null and b/public/photos/posters/HSHS.png differ diff --git a/public/photos/posters/arduino-day-poster.webp b/public/photos/posters/arduino-day-poster.webp new file mode 100644 index 0000000..2941f26 Binary files /dev/null and b/public/photos/posters/arduino-day-poster.webp differ diff --git a/public/photos/posters/astrek-poster.webp b/public/photos/posters/astrek-poster.webp new file mode 100644 index 0000000..f2902b2 Binary files /dev/null and b/public/photos/posters/astrek-poster.webp differ diff --git a/public/photos/posters/build-drone-poster.webp b/public/photos/posters/build-drone-poster.webp new file mode 100644 index 0000000..03fca91 Binary files /dev/null and b/public/photos/posters/build-drone-poster.webp differ diff --git a/public/photos/posters/flipper-poster.webp b/public/photos/posters/flipper-poster.webp new file mode 100644 index 0000000..359d19b Binary files /dev/null and b/public/photos/posters/flipper-poster.webp differ diff --git a/public/photos/posters/keyboard-poster.webp b/public/photos/posters/keyboard-poster.webp new file mode 100644 index 0000000..bf2627d Binary files /dev/null and b/public/photos/posters/keyboard-poster.webp differ diff --git a/public/photos/posters/magic-wand-poster.webp b/public/photos/posters/magic-wand-poster.webp new file mode 100644 index 0000000..92bfec9 Binary files /dev/null and b/public/photos/posters/magic-wand-poster.webp differ diff --git a/public/photos/posters/pi-event-poster.webp b/public/photos/posters/pi-event-poster.webp new file mode 100644 index 0000000..2f6d83e Binary files /dev/null and b/public/photos/posters/pi-event-poster.webp differ diff --git a/public/photos/posters/robot-poster.webp b/public/photos/posters/robot-poster.webp new file mode 100644 index 0000000..e087a00 Binary files /dev/null and b/public/photos/posters/robot-poster.webp differ diff --git a/public/uploads/speakers/rahul.webp b/public/photos/speakers/rahul.webp similarity index 100% rename from public/uploads/speakers/rahul.webp rename to public/photos/speakers/rahul.webp diff --git a/public/uploads/speakers/salman-faris.webp b/public/photos/speakers/salman-faris.webp similarity index 100% rename from public/uploads/speakers/salman-faris.webp rename to public/photos/speakers/salman-faris.webp diff --git a/public/photos/speakers/swalah.webp b/public/photos/speakers/swalah.webp new file mode 100644 index 0000000..a7d83fd Binary files /dev/null and b/public/photos/speakers/swalah.webp differ diff --git a/public/photos/speakers/vignesh.webp b/public/photos/speakers/vignesh.webp new file mode 100644 index 0000000..d200480 Binary files /dev/null and b/public/photos/speakers/vignesh.webp differ diff --git a/public/photos/speakers/zain.webp b/public/photos/speakers/zain.webp new file mode 100644 index 0000000..90cb22a Binary files /dev/null and b/public/photos/speakers/zain.webp differ diff --git a/public/uploads/sponsors/edge-impulse.svg b/public/photos/sponsors/edge-impulse.svg similarity index 100% rename from public/uploads/sponsors/edge-impulse.svg rename to public/photos/sponsors/edge-impulse.svg diff --git a/public/uploads/sponsors/seed-studio.webp b/public/photos/sponsors/seed-studio.webp similarity index 100% rename from public/uploads/sponsors/seed-studio.webp rename to public/photos/sponsors/seed-studio.webp diff --git a/public/uploads/sponsors/tinkerspace.webp b/public/photos/sponsors/tinkerspace.webp similarity index 100% rename from public/uploads/sponsors/tinkerspace.webp rename to public/photos/sponsors/tinkerspace.webp diff --git a/public/photos/testimonials/jogin-fablab.webp b/public/photos/testimonials/jogin-fablab.webp new file mode 100644 index 0000000..e355723 Binary files /dev/null and b/public/photos/testimonials/jogin-fablab.webp differ diff --git a/public/photos/testimonials/prajith-docker.webp b/public/photos/testimonials/prajith-docker.webp new file mode 100644 index 0000000..dfaedc9 Binary files /dev/null and b/public/photos/testimonials/prajith-docker.webp differ diff --git a/public/uploads/cover.mp4 b/public/uploads/cover.mp4 deleted file mode 100644 index 79f69f5..0000000 Binary files a/public/uploads/cover.mp4 and /dev/null differ diff --git a/public/uploads/photos/3d.png b/public/uploads/photos/3d.png deleted file mode 100644 index df7a081..0000000 Binary files a/public/uploads/photos/3d.png and /dev/null differ diff --git a/public/uploads/photos/blr-1.jpg b/public/uploads/photos/blr-1.jpg deleted file mode 100644 index dc2d7cd..0000000 Binary files a/public/uploads/photos/blr-1.jpg and /dev/null differ diff --git a/public/uploads/photos/blr.jpg b/public/uploads/photos/blr.jpg deleted file mode 100644 index a5c106f..0000000 Binary files a/public/uploads/photos/blr.jpg and /dev/null differ diff --git a/public/uploads/photos/chat.png b/public/uploads/photos/chat.png deleted file mode 100644 index 46eae43..0000000 Binary files a/public/uploads/photos/chat.png and /dev/null differ diff --git a/public/uploads/photos/device-ai-animated.webp b/public/uploads/photos/device-ai-animated.webp deleted file mode 100644 index 3668929..0000000 Binary files a/public/uploads/photos/device-ai-animated.webp and /dev/null differ diff --git a/public/uploads/photos/dubai-1.jpg b/public/uploads/photos/dubai-1.jpg deleted file mode 100644 index fe206d5..0000000 Binary files a/public/uploads/photos/dubai-1.jpg and /dev/null differ diff --git a/public/uploads/photos/dubai.jpg b/public/uploads/photos/dubai.jpg deleted file mode 100644 index eabc6c1..0000000 Binary files a/public/uploads/photos/dubai.jpg and /dev/null differ diff --git a/public/uploads/photos/hand1.webp b/public/uploads/photos/hand1.webp deleted file mode 100644 index 50232cb..0000000 Binary files a/public/uploads/photos/hand1.webp and /dev/null differ diff --git a/public/uploads/photos/hyd-char.jpg b/public/uploads/photos/hyd-char.jpg deleted file mode 100644 index e18dc29..0000000 Binary files a/public/uploads/photos/hyd-char.jpg and /dev/null differ diff --git a/public/uploads/photos/hyderabad.jpg b/public/uploads/photos/hyderabad.jpg deleted file mode 100644 index 9471de3..0000000 Binary files a/public/uploads/photos/hyderabad.jpg and /dev/null differ diff --git a/public/uploads/photos/kochi.jpg b/public/uploads/photos/kochi.jpg deleted file mode 100644 index adbaede..0000000 Binary files a/public/uploads/photos/kochi.jpg and /dev/null differ diff --git a/public/uploads/photos/kochi.png b/public/uploads/photos/kochi.png deleted file mode 100644 index 092aab1..0000000 Binary files a/public/uploads/photos/kochi.png and /dev/null differ diff --git a/public/uploads/photos/rafi.webp b/public/uploads/photos/rafi.webp deleted file mode 100644 index 87a52ff..0000000 Binary files a/public/uploads/photos/rafi.webp and /dev/null differ diff --git a/public/uploads/photos/seed-studio-device-blink.webp b/public/uploads/photos/seed-studio-device-blink.webp deleted file mode 100644 index 93c8de0..0000000 Binary files a/public/uploads/photos/seed-studio-device-blink.webp and /dev/null differ diff --git a/public/uploads/photos/speak.webp b/public/uploads/photos/speak.webp deleted file mode 100644 index 00ac6f8..0000000 Binary files a/public/uploads/photos/speak.webp and /dev/null differ diff --git a/public/uploads/posters/arduino-day-poster.webp b/public/uploads/posters/arduino-day-poster.webp deleted file mode 100644 index 9ab8a80..0000000 Binary files a/public/uploads/posters/arduino-day-poster.webp and /dev/null differ diff --git a/public/uploads/posters/astrek-poster.webp b/public/uploads/posters/astrek-poster.webp deleted file mode 100644 index 6a9173c..0000000 Binary files a/public/uploads/posters/astrek-poster.webp and /dev/null differ diff --git a/public/uploads/posters/build-drone-poster.webp b/public/uploads/posters/build-drone-poster.webp deleted file mode 100644 index 0ead998..0000000 Binary files a/public/uploads/posters/build-drone-poster.webp and /dev/null differ diff --git a/public/uploads/posters/flipper-poster.webp b/public/uploads/posters/flipper-poster.webp deleted file mode 100644 index ce2381c..0000000 Binary files a/public/uploads/posters/flipper-poster.webp and /dev/null differ diff --git a/public/uploads/posters/keyboard-poster.webp b/public/uploads/posters/keyboard-poster.webp deleted file mode 100644 index b0edbb5..0000000 Binary files a/public/uploads/posters/keyboard-poster.webp and /dev/null differ diff --git a/public/uploads/posters/magic-wand-poster.webp b/public/uploads/posters/magic-wand-poster.webp deleted file mode 100644 index aa9d05d..0000000 Binary files a/public/uploads/posters/magic-wand-poster.webp and /dev/null differ diff --git a/public/uploads/posters/pi-event-poster.webp b/public/uploads/posters/pi-event-poster.webp deleted file mode 100644 index 1539f8d..0000000 Binary files a/public/uploads/posters/pi-event-poster.webp and /dev/null differ diff --git a/public/uploads/posters/robot-poster.webp b/public/uploads/posters/robot-poster.webp deleted file mode 100644 index 68165f0..0000000 Binary files a/public/uploads/posters/robot-poster.webp and /dev/null differ diff --git a/public/uploads/posters/view-all-poster.webp b/public/uploads/posters/view-all-poster.webp deleted file mode 100644 index 2209be4..0000000 Binary files a/public/uploads/posters/view-all-poster.webp and /dev/null differ diff --git a/public/uploads/speakers/swalah.jpeg b/public/uploads/speakers/swalah.jpeg deleted file mode 100644 index f796375..0000000 Binary files a/public/uploads/speakers/swalah.jpeg and /dev/null differ diff --git a/public/uploads/speakers/vignesh.jpeg b/public/uploads/speakers/vignesh.jpeg deleted file mode 100644 index ed16e26..0000000 Binary files a/public/uploads/speakers/vignesh.jpeg and /dev/null differ diff --git a/public/uploads/speakers/zain.jpeg b/public/uploads/speakers/zain.jpeg deleted file mode 100644 index 811475d..0000000 Binary files a/public/uploads/speakers/zain.jpeg and /dev/null differ diff --git a/public/uploads/team-chat-poster.png b/public/uploads/team-chat-poster.png deleted file mode 100644 index 332f616..0000000 Binary files a/public/uploads/team-chat-poster.png and /dev/null differ diff --git a/public/uploads/team-cover.png b/public/uploads/team-cover.png deleted file mode 100644 index efdc779..0000000 Binary files a/public/uploads/team-cover.png and /dev/null differ diff --git a/public/uploads/testimonials/jogin-fablab.jpeg b/public/uploads/testimonials/jogin-fablab.jpeg deleted file mode 100644 index 48ad364..0000000 Binary files a/public/uploads/testimonials/jogin-fablab.jpeg and /dev/null differ diff --git a/public/uploads/testimonials/prajith-docker.jpeg b/public/uploads/testimonials/prajith-docker.jpeg deleted file mode 100644 index 2b6b26e..0000000 Binary files a/public/uploads/testimonials/prajith-docker.jpeg and /dev/null differ diff --git a/public/uploads/video-cover-kid.webp b/public/uploads/video-cover-kid.webp deleted file mode 100644 index ab9f681..0000000 Binary files a/public/uploads/video-cover-kid.webp and /dev/null differ diff --git a/public/video/cover.mp4 b/public/video/cover.mp4 new file mode 100644 index 0000000..e75c4ba Binary files /dev/null and b/public/video/cover.mp4 differ diff --git a/src/app/events/page.tsx b/src/app/events/page.tsx index d3aa5ee..6b64e26 100644 --- a/src/app/events/page.tsx +++ b/src/app/events/page.tsx @@ -6,6 +6,8 @@ import Image from "next/image"; import {placesData} from "@/db"; import PlaceCard from "@/components/ui/location-card"; import Images from "@/config/constants/Images"; +import BackgroundImages from "@/components/BackgroundImages"; +import CitiesSection from "@/components/ui/cities-section"; export const metadata = { title: "Cities – MakerChat", @@ -27,7 +29,7 @@ export const metadata = { keywords: [ "MakerChat cities", "MakerChat Kochi", - "MakerChat Bangalore", + "MakerChat Bengaluru", "maker events India", "startup meetups", "tech meetups India", @@ -64,46 +66,16 @@ export const metadata = { export default function Events() { return ( -
+
{/* Background Mask */} -
+
{/* Background Image */} -
- Raspberry Pi + +
+
-
- Arduino -
- -
-

- MakerChat across the Cities -

-

- Where MakerChat Comes to Life -

- -
- {placesData.ids.map((placeId: string) => { - const place = placesData.details[placeId]; - return ; - })} -
-
); } diff --git a/src/app/layout.tsx b/src/app/layout.tsx index af9a3c3..4cfdb31 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -2,14 +2,17 @@ // by default and can not be set to a Client Component. import React from "react"; +import {Toaster} from "sonner"; import {Manrope, Instrument_Serif} from "next/font/google"; const manrope = Manrope({subsets: ["latin"], variable: "--font-manrope"}); import localFont from "next/font/local"; - import "./globals.css"; +import Script from "next/script"; + import TopNavBar from "@/components/ui/top-navbar"; import {cn} from "@/lib/utils"; import Footer from "@/components/ui/footer"; +import env from "@/config/env"; const instrumentSerif = Instrument_Serif({ subsets: ["latin"], @@ -17,6 +20,39 @@ const instrumentSerif = Instrument_Serif({ variable: "--font-instrument-serif", }); +const yultan = localFont({ + src: [ + { + path: "../../public/fonts/Barakallah-PERSONAL-USE ONLY.ttf", + weight: "400", + style: "normal", + }, + ], + variable: "--font-yultan", +}); + +const ocean = localFont({ + src: [ + { + path: "../../public/fonts/AMORIA.otf", + weight: "400", + style: "normal", + }, + ], + variable: "--font-ocean", +}); + +const cyber = localFont({ + src: [ + { + path: "../../public/fonts/Cyber City.otf", + weight: "300", + style: "normal", + }, + ], + variable: "--font-cyber", +}); + const TiemposHeadline = localFont({ src: [ { @@ -91,14 +127,35 @@ export default function RootLayout({children}: {children: React.ReactNode}) { manrope.variable, instrumentSerif.variable, TiemposHeadline.variable, + yultan.variable, + cyber.variable, + ocean.variable, )} > - -
+ + {/* Microsoft Clarity Tracking */} + +