Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Sessionrecordings #72

Merged
merged 5 commits into from
Jan 22, 2025
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
3 changes: 2 additions & 1 deletion .github/workflows/buildcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
pull_request:
branches:
- dev
- master

jobs:
build:
Expand Down Expand Up @@ -49,6 +48,8 @@ jobs:
DIGISTORE_KEY=${{ secrets.DIGISTORE_KEY }}
SPOTIFY_CLIENT_ID=${{ secrets.SPOTIFY_CLIENT_ID }}
SPOTIFY_CLIENT_SECRET=${{ secrets.SPOTIFY_CLIENT_SECRET }}
NEXT_PUBLIC_POSTHOG_KEY=${{ secrets.NEXT_PUBLIC_POSTHOG_KEY }}
NEXT_PUBLIC_POSTHOG_HOST=${{ secrets.NEXT_PUBLIC_POSTHOG_HOST }}
EOF

- name: Run build
Expand Down
4 changes: 2 additions & 2 deletions amplify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ frontend:
commands:
# Debug: Zeige alle relevanten Umgebungsvariablen an
- echo "Prüfe Environment Variablen:"
- env | grep -e DATABASE_URL -e SPOTIFY_CLIENT_ID -e DIGISTORE_KEY -e SPOTIFY_CLIENT_SECRET -e CLOUDFRONT_KEY -e S3_REGION -e COPECART_KEY -e S3_ACCESS_KEY_ID -e S3_SECRET_ACCESS_KEY -e S3_BUCKET_NAME -e OPTIMIZE_API_KEY -e DIRECT_DATABASE_URL -e NEXTAUTH_SECRET -e META_APP_ID -e META_APP_SECRET -e NEXTAUTH_URL -e GOOGLE_CLIENT_ID -e GOOGLE_CLIENT_SECRET -e EMAIL_SERVER_USER -e EMAIL_SERVER_PASSWORD -e EMAIL_SERVER_HOST -e EMAIL_SERVER_PORT -e EMAIL_FROM
- env | grep -e DATABASE_URL -e SPOTIFY_CLIENT_ID -e NEXT_PUBLIC_POSTHOG_HOST -e NEXT_PUBLIC_POSTHOG_KEY -e DIGISTORE_KEY -e SPOTIFY_CLIENT_SECRET -e CLOUDFRONT_KEY -e S3_REGION -e COPECART_KEY -e S3_ACCESS_KEY_ID -e S3_SECRET_ACCESS_KEY -e S3_BUCKET_NAME -e OPTIMIZE_API_KEY -e DIRECT_DATABASE_URL -e NEXTAUTH_SECRET -e META_APP_ID -e META_APP_SECRET -e NEXTAUTH_URL -e GOOGLE_CLIENT_ID -e GOOGLE_CLIENT_SECRET -e EMAIL_SERVER_USER -e EMAIL_SERVER_PASSWORD -e EMAIL_SERVER_HOST -e EMAIL_SERVER_PORT -e EMAIL_FROM

# Schreibe Variablen in die .env.production Datei
- echo "Erstelle .env.production Datei"
- env | grep -e DATABASE_URL -e SPOTIFY_CLIENT_ID -e DIGISTORE_KEY -e SPOTIFY_CLIENT_SECRET -e CLOUDFRONT_KEY -e S3_REGION -e COPECART_KEY -e S3_ACCESS_KEY_ID -e S3_SECRET_ACCESS_KEY -e S3_BUCKET_NAME -e OPTIMIZE_API_KEY -e DIRECT_DATABASE_URL -e NEXTAUTH_SECRET -e META_APP_ID -e META_APP_SECRET -e NEXTAUTH_URL -e GOOGLE_CLIENT_ID -e GOOGLE_CLIENT_SECRET -e EMAIL_SERVER_USER -e EMAIL_SERVER_PASSWORD -e EMAIL_SERVER_HOST -e EMAIL_SERVER_PORT -e EMAIL_FROM > .env.production
- env | grep -e DATABASE_URL -e SPOTIFY_CLIENT_ID -e NEXT_PUBLIC_POSTHOG_HOST -e NEXT_PUBLIC_POSTHOG_KEY -e DIGISTORE_KEY -e SPOTIFY_CLIENT_SECRET -e CLOUDFRONT_KEY -e S3_REGION -e COPECART_KEY -e S3_ACCESS_KEY_ID -e S3_SECRET_ACCESS_KEY -e S3_BUCKET_NAME -e OPTIMIZE_API_KEY -e DIRECT_DATABASE_URL -e NEXTAUTH_SECRET -e META_APP_ID -e META_APP_SECRET -e NEXTAUTH_URL -e GOOGLE_CLIENT_ID -e GOOGLE_CLIENT_SECRET -e EMAIL_SERVER_USER -e EMAIL_SERVER_PASSWORD -e EMAIL_SERVER_HOST -e EMAIL_SERVER_PORT -e EMAIL_FROM > .env.production
- echo "Inhalt der .env.production Datei:"
- cat .env.production

Expand Down
29 changes: 29 additions & 0 deletions middleware.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// import { type NextRequest, NextResponse } from "next/server";

// export function middleware(req: NextRequest) {
// const { pathname } = req.nextUrl;

// // Überwache nur die Startseite
// if (pathname === "/") {
// // Beispiel: IP-Adresse und User-Agent speichern
// const ip = req.ip ?? req.headers.get("x-forwarded-for") ?? "Unbekannt";
// const userAgent = req.headers.get("user-agent") ?? "Unbekannt";

// console.log(
// `Besuch auf der Startseite: IP: ${ip}, User-Agent: ${userAgent}`,
// );

// // Du könntest die Daten auch an einen Tracking-Service senden
// // await fetch('https://example.com/api/track', {
// // method: 'POST',
// // body: JSON.stringify({ ip, userAgent }),
// // headers: { 'Content-Type': 'application/json' },
// // });
// }

// return NextResponse.next();
// }

// export const config = {
// matcher: ["/", "/about"], // Hier kannst du festlegen, welche Routen überwacht werden
// };
41 changes: 41 additions & 0 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"next-view-transitions": "^0.3.2",
"nodemailer": "^6.9.16",
"phenomenon": "^1.6.0",
"posthog-js": "^1.207.7",
"react": "^18.3.1",
"react-day-picker": "^8.10.1",
"react-dom": "^18.3.1",
Expand Down
1 change: 1 addition & 0 deletions prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ model User {
midCPS Float @default(0.5)
package Package?
admin Boolean @default(false)
tester Boolean @default(false)
accounts Account[]
sessions Session[]
projects Project[]
Expand Down
5 changes: 3 additions & 2 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import { CTA } from "@/app/_components/landing/cta";
import { Navbar } from "@/app/_components/landing/navbar";
import { Footer } from "@/app/_components/landing/footer";
import { FAQ } from "./_components/landing/faq";
import { CSPostHogProvider } from "./providers";

export default async function Home() {
return (
<>
<CSPostHogProvider>
<Navbar />
<main>
<Hero />
Expand All @@ -18,6 +19,6 @@ export default async function Home() {
<CTA />
</main>
<Footer />
</>
</CSPostHogProvider>
);
}
16 changes: 16 additions & 0 deletions src/app/providers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
"use client";
import posthog from 'posthog-js'
import { PostHogProvider } from 'posthog-js/react'

if (typeof window !== 'undefined') {
// @ts-expect-error || @ts-ignore
posthog.init(process.env.NEXT_PUBLIC_POSTHOG_KEY, {
api_host: process.env.NEXT_PUBLIC_POSTHOG_HOST,
// person_profiles: 'identified_only', // or 'always' to create profiles for anonymous users as well
person_profiles: 'always', // or 'always' to create profiles for anonymous users as well
})
}
// @ts-expect-error || @ts-ignore
export function CSPostHogProvider({ children }) {
return <PostHogProvider client={posthog}>{children}</PostHogProvider>
}
4 changes: 4 additions & 0 deletions src/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ export const env = createEnv({
DIGISTORE_KEY: z.string(),
SPOTIFY_CLIENT_ID: z.string(),
SPOTIFY_CLIENT_SECRET: z.string(),
POSTHOG_HOST: z.string(),
POSTHOG_KEY: z.string(),
},

/**
Expand Down Expand Up @@ -82,6 +84,8 @@ export const env = createEnv({
DIGISTORE_KEY: process.env.DIGISTORE_KEY,
SPOTIFY_CLIENT_ID: process.env.SPOTIFY_CLIENT_ID,
SPOTIFY_CLIENT_SECRET: process.env.SPOTIFY_CLIENT_SECRET,
POSTHOG_KEY: process.env.NEXT_PUBLIC_POSTHOG_KEY,
POSTHOG_HOST: process.env.NEXT_PUBLIC_POSTHOG_HOST,
},
/**
* Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation. This is especially
Expand Down
9 changes: 9 additions & 0 deletions src/server/api/routers/consent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@ function hashValue(value: string, algorithm = "sha256"): string {
return hash.digest("hex");
}

function compareHash(
originalValue: string,
hashedValue: string,
algorithm = "sha256",
): boolean {
const newHash = hashValue(originalValue, algorithm);
return newHash === hashedValue;
}

export const consentRouter = createTRPCRouter({
update: publicProcedure
.input(
Expand Down
Loading