Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cmdk": "^1.1.1",
"fathom-client": "^3.7.2",
"lucide-react": "^0.545.0",
"next": "15.5.7",
"next-themes": "^0.4.6",
Expand Down
7 changes: 0 additions & 7 deletions public/witch/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,6 @@
(n.className += t + "touch");
})(window, document);
</script>
<!-- Fathom - beautiful, simple website analytics disable - use the fathom component instead -->
<!-- <script
src="https://cdn.usefathom.com/script.js"
data-site="ASGWDEGI"
defer
></script> -->
<!-- / Fathom -->
<link href="images/favicon.png" rel="shortcut icon" type="image/x-icon" />
<link href="images/webclip.png" rel="apple-touch-icon" />
<style>
Expand Down
2 changes: 0 additions & 2 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { maziusDisplay, ebGaramond, ubuntuMono } from "@/lib/fonts";
import "./globals.css";
// import { ThemeProvider } from "next-themes";
import { Providers } from "@/providers/providers";
import Fathom from "@/components/Fathom";
import VercelAnalytics from "@/components/VercelAnalytics";

export const metadata: Metadata = {
Expand All @@ -21,7 +20,6 @@ export default function RootLayout({
<body
className={`${maziusDisplay.variable} ${ebGaramond.variable} ${ubuntuMono.variable} antialiased`}
>
<Fathom />
<VercelAnalytics />
{/* <ThemeProvider
attribute="class"
Expand Down
6 changes: 4 additions & 2 deletions src/components/CohortHero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import Image from "next/image";
import { useState } from "react";
import { Input } from "./ui/input";
import { trackEvent } from "fathom-client";
import { Button } from "./ui/button";
import { analyticsEvents, trackAnalyticsEvent } from "@/lib/analytics";

const cohortImages = [
"/images/cohort-image-1-bw.webp",
Expand Down Expand Up @@ -53,7 +53,9 @@ export default function CohortHero({ referral }: JoinUsProps) {

if (response.ok) {
setSubmissionStatus("success");
trackEvent("cohort-hero-email-signup");
trackAnalyticsEvent(analyticsEvents.cohortHeroEmailSignup, {
hasReferral: Boolean(referral),
});
setEmail("");
} else {
setSubmissionStatus("error");
Expand Down
55 changes: 0 additions & 55 deletions src/components/Fathom.tsx

This file was deleted.

5 changes: 0 additions & 5 deletions src/components/HireUs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import {
import Image from "next/image";
import MultipleSelector, { type Option } from "./ui/multiselect";
import { DISCORD_INVITE_URL } from "@/lib/data/constants";
import { trackEvent } from "fathom-client";
import { analyticsEvents, trackAnalyticsEvent } from "@/lib/analytics";

interface StepProps {
Expand Down Expand Up @@ -471,7 +470,6 @@ export default function HireUs() {
setValidationErrors([]);

//tracking
trackEvent("hire-us-submission");
trackAnalyticsEvent(analyticsEvents.hireFormSubmitAttempt, {
budget: formData.budget,
servicesCount,
Expand All @@ -496,7 +494,6 @@ export default function HireUs() {
setSubmissionStatus("success");

//tracking
trackEvent("hire-us-submission");
trackAnalyticsEvent(analyticsEvents.hireFormSubmitSuccess, {
budget: formData.budget,
servicesCount,
Expand Down Expand Up @@ -624,7 +621,6 @@ export default function HireUs() {
component: <PersonalInfoStep form={form} />,
validation: validatePersonalInfo,
onStepComplete: () => {
trackEvent("hire-us-step-1");
trackAnalyticsEvent(analyticsEvents.hireFormStepCompleted, {
step: "contact_info",
stepNumber: 1,
Expand All @@ -638,7 +634,6 @@ export default function HireUs() {
component: <ProjectDetailsStep form={form} />,
validation: validateProjectDetails,
onStepComplete: () => {
trackEvent("hire-us-step-2");
trackAnalyticsEvent(analyticsEvents.hireFormStepCompleted, {
step: "project_details",
stepNumber: 2,
Expand Down
2 changes: 0 additions & 2 deletions src/components/JoinUs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
} from "@/components/ui/form";
import { joinUsFormSchema, type JoinUsFormData } from "@/lib/validation";
import Image from "next/image";
import { trackEvent } from "fathom-client";
import { Button } from "./ui/button";
import { analyticsEvents, trackAnalyticsEvent } from "@/lib/analytics";

Expand Down Expand Up @@ -79,7 +78,6 @@ export default function JoinUs({ referral }: JoinUsProps) {
setSubmissionStatus("success");

//tracking
trackEvent("join-us-submission");
trackAnalyticsEvent(analyticsEvents.joinSignupSuccess, {
hasReferral: Boolean(referral),
});
Expand Down
3 changes: 2 additions & 1 deletion src/lib/analytics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ export const analyticsEvents = {
joinSignupAttempt: "Join Signup Attempt",
joinSignupSuccess: "Join Signup Success",
joinSignupError: "Join Signup Error",
cohortHeroEmailSignup: "Cohort Hero Email Signup",
witchTriggered: "Witch Triggered",
} as const;

export function trackAnalyticsEvent(
Expand All @@ -28,4 +30,3 @@ export function trackAnalyticsEvent(
}
}
}

10 changes: 7 additions & 3 deletions src/providers/providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { useEffect, useRef, useState } from "react";
import { useRouter } from "next/navigation";
import { trackEvent } from "fathom-client";
import { analyticsEvents, trackAnalyticsEvent } from "@/lib/analytics";

interface Drip {
id: number;
Expand Down Expand Up @@ -181,7 +181,9 @@ function useLegacy() {
// Check if the trigger word was typed
if (newTyped.includes(triggerWord.toLowerCase())) {
setIsTriggered(true);
trackEvent("witch");
trackAnalyticsEvent(analyticsEvents.witchTriggered, {
method: "keyboard",
});
setTypedKeys("");

// Wait for animation to complete before routing
Expand All @@ -204,7 +206,9 @@ function useLegacy() {

if (sequenceRef.current.join(",") === pattern.join(",")) {
setIsTriggered(true);
trackEvent("witch");
trackAnalyticsEvent(analyticsEvents.witchTriggered, {
method: "click_pattern",
});
sequenceRef.current = [];

setTimeout(() => {
Expand Down