Merge pull request #22 from hackclub/staging

Some sentry fixes and added countdown

Author: ArcaEge

.env.example

@@ -3,7 +3,6 @@
 # POSTGRES_USER=postgres
 # POSTGRES_PASSWORD=password
 # DATABASE_URL=postgresql://postgres:password@db:5432/postgres
-# SENTRY_AUTH_TOKEN=
 # PUBLIC_ENV=production # or staging
 
 PUBLIC_ENV=dev
@@ -24,4 +23,6 @@ SUPER_ADMIN_SLACK_ID=changeme
 
 IDV_DOMAIN=account.hackclub.com
 IDV_CLIENT_ID=changeme
-IDV_CLIENT_SECRET=changeme
+IDV_CLIENT_SECRET=changeme
+
+SENTRY_AUTH_TOKEN=changeme

package-lock.json

@@ -50,7 +50,7 @@
 		"@aws-sdk/client-s3": "^3.940.0",
 		"@lucide/svelte": "^0.547.0",
 		"@prgm/sveltekit-progress-bar": "^3.0.2",
-		"@sentry/sveltekit": "^10.27.0",
+		"@sentry/sveltekit": "^10.29.0",
 		"cron": "^4.3.4",
 		"drizzle-kit": "^0.31.7",
 		"drizzle-orm": "^0.44.7",

package.json

@@ -1,20 +1,17 @@
 import { handleErrorWithSentry, replayIntegration } from '@sentry/sveltekit';
 import * as Sentry from '@sentry/sveltekit';
-import { PUBLIC_ENV } from '$env/static/public';
+import { env } from '$env/dynamic/public';
 
 Sentry.init({
-	dsn:
-		PUBLIC_ENV == 'staging' || PUBLIC_ENV == 'production'
-			? 'https://[email protected]/4510461147742208'
-			: undefined,
+	dsn: 'https://[email protected]/4510461147742208',
 
 	tracesSampleRate: 1.0,
 
 	// Enable logs to be sent to Sentry
 	enableLogs: true,
 
 	// Environment
-	environment: PUBLIC_ENV,
+	environment: env.PUBLIC_ENV ?? 'dev',
 
 	// This sets the sample rate to be 10%. You may want this to be 100% while
 	// in development and sample at a lower rate in production

src/hooks.client.ts

@@ -1,17 +1,14 @@
-import { PUBLIC_ENV } from '$env/static/public';
+import { env } from '$env/dynamic/private';
 import * as Sentry from '@sentry/sveltekit';
 
 Sentry.init({
-	dsn:
-		PUBLIC_ENV == 'staging' || PUBLIC_ENV == 'production'
-			? 'https://[email protected]/4510461147742208'
-			: undefined,
+	dsn: 'https://[email protected]/4510461147742208',
 
 	integrations: [Sentry.consoleLoggingIntegration({ levels: ['log', 'warn', 'error'] })],
 
 	tracesSampleRate: 1.0,
 
-	environment: PUBLIC_ENV,
+	environment: env.PUBLIC_ENV ?? 'dev',
 
 	// Enable logs to be sent to Sentry
 	enableLogs: true
@@ -20,4 +17,4 @@ Sentry.init({
 	// spotlight: import.meta.env.DEV,
 });
 
-export const handleError = Sentry.handleErrorWithSentry();
+// export const handleError = Sentry.handleErrorWithSentry();

src/instrumentation.server.ts

@@ -38,6 +38,7 @@
 				!!
 			</span>
 		</li>
+		<li>Rhino</li>
 		<li>Blender</li>
 	</ul>
 	<p class="mt-2">No TinkerCAD please.</p>