fix: userId not generated in the first visit

Bumps the npm_and_yarn group with 1 update in the / directory: [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite).


Updates `vite` from 7.1.2 to 7.1.10
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v7.1.10/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 7.1.10
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>

.env.example

@@ -13,3 +13,5 @@ DATABASE_URL="postgres://cactoide:cactoide_password@localhost:5432/cactoide_data
 APP_VERSION=latest
 PORT=3000
 HOSTNAME=0.0.0.0
+
+PUBLIC_LANDING_INFO=true

.github/workflows/build-and-push.yml

@@ -60,6 +60,8 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
+          build-args: |
+            PUBLIC_LANDING_INFO=${{ vars.PUBLIC_LANDING_INFO }}
           push: true
           platforms: linux/amd64,linux/arm64
           cache-from: type=gha

.github/workflows/test.yml

@@ -28,6 +28,8 @@ jobs:
 
       - name: Build application
         run: npm run build
+        env:
+          PUBLIC_LANDING_INFO: ${{ vars.PUBLIC_LANDING_INFO }}
 
       - name: Test build output
         run: |

Dockerfile

@@ -3,25 +3,27 @@ WORKDIR /app
 COPY package*.json .
 
 RUN npm ci
+
+ARG PUBLIC_LANDING_INFO
+ENV PUBLIC_LANDING_INFO=$PUBLIC_LANDING_INFO
+
 COPY . .
 
 RUN npm run build
 RUN npm prune --production
 
 FROM node:20-alpine
-
 WORKDIR /app
 
 COPY --from=builder /app/build build/
 COPY --from=builder /app/node_modules node_modules/
 COPY package.json .
 
-EXPOSE 3000
-
 ENV PORT 3000
 ENV HOSTNAME "0.0.0.0"
 
 HEALTHCHECK --interval=30s --timeout=10s --start-period=10s --retries=3 \
   CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:3000/healthz || exit 1
 
+EXPOSE 3000
 CMD [ "node", "build" ]

README.md

@@ -55,7 +55,18 @@ Your app will be available at `http://localhost:5173`. You can use the Makefile
 
 Use the `database/seed.sql` if you want to populate your database with dummy data.
 
-### i18n
+### Options
+
+#### 1. Landing page option
+
+Supports a conditional landing page display based on the `PUBLIC_LANDING_INFO` environment variable. If you don't want to show your users the cactoide landing page, just use the `PUBLIC_LANDING_INFO=false` variable. This will automatically remove the landing home page and redirect users to the `/discover` page.
+
+This is useful for:
+
+- Creating a minimal discovery-focused experience
+- Customizing the user journey based on deployment environment
+
+#### 2. i18n
 
 There is no proper i18n implemented, we have an `/i18n` folder with specific languages. To use an existing translation, just rename the language code JSON file to `messages.json` and you are ready to go. If you would like to add a new translation (which is really appreciated), just create a new `<language_code>.json` file and add the translations from the `messages.json`.
 
@@ -71,6 +82,19 @@ make i18n
 make i18n FILE=src/lib/i18n/it.json
 ```
 
+### Support
+
+Cactoide is an open-source project licensed under `AGPL-3.0`. Its growth and development are possible thanks to the amazing support of the community. This project is the result of many late nights, weekends, and after-hours work.
+
+It isn’t backed by a big company. Development depends on the support and generosity of people like you. With your help, I can focus more on making Cactoide even better and building tools that make coding more enjoyable.
+
+You can support in a few ways:
+
+- Send a one-time donation via [paypal.me/zenoazurben](paypal.me/zenoazurben)
+- Reach me directly: leventeorb[@]gmail.com
+
+If you enjoy using Cactoide, or if your business depends on it, please consider sponsoring its development. Your support keeps the project alive, improves it for everyone, and helps create educational content like blog posts and videos for the whole Cactoide community.
+
 ### License
 
 This project is licensed under the `AGPL-3.0 License` - see the [LICENSE](./LICENSE) file for details.

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "event-cactus",
-	"version": "0.0.1",
+	"version": "0.1.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "event-cactus",
-			"version": "0.0.1",
+			"version": "0.1.1",
 			"dependencies": {
 				"@sveltejs/adapter-node": "^5.3.1",
 				"drizzle-orm": "^0.44.5",
@@ -35,7 +35,7 @@
 				"tailwindcss": "^4.0.0",
 				"typescript": "^5.0.0",
 				"typescript-eslint": "^8.20.0",
-				"vite": "^7.0.4"
+				"vite": "^7.1.10"
 			}
 		},
 		"node_modules/@drizzle-team/brocli": {
@@ -1949,6 +1949,66 @@
 				"node": ">=14.0.0"
 			}
 		},
+		"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": {
+			"version": "1.4.5",
+			"dev": true,
+			"inBundle": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"@emnapi/wasi-threads": "1.0.4",
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": {
+			"version": "1.4.5",
+			"dev": true,
+			"inBundle": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
+			"version": "1.0.4",
+			"dev": true,
+			"inBundle": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
+			"version": "0.2.12",
+			"dev": true,
+			"inBundle": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"@emnapi/core": "^1.4.3",
+				"@emnapi/runtime": "^1.4.3",
+				"@tybys/wasm-util": "^0.10.0"
+			}
+		},
+		"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": {
+			"version": "0.10.0",
+			"dev": true,
+			"inBundle": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/tslib": {
+			"version": "2.8.0",
+			"dev": true,
+			"inBundle": true,
+			"license": "0BSD",
+			"optional": true
+		},
 		"node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
 			"version": "4.1.12",
 			"resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.12.tgz",
@@ -2602,9 +2662,9 @@
 			}
 		},
 		"node_modules/devalue": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/devalue/-/devalue-5.1.1.tgz",
-			"integrity": "sha512-maua5KUiapvEwiEAe+XnlZ3Rh0GD+qI1J/nb9vrJc3muPXvcF/8gXYTWF76+5DAqHyDUtOIImEuo0YKE9mshVw==",
+			"version": "5.4.1",
+			"resolved": "https://registry.npmjs.org/devalue/-/devalue-5.4.1.tgz",
+			"integrity": "sha512-YtoaOfsqjbZQKGIMRYDWKjUmSB4VJ/RElB+bXZawQAQYAo4xu08GKTMVlsZDTF6R2MbAgjcAQRPI5eIyRAT2OQ==",
 			"license": "MIT"
 		},
 		"node_modules/drizzle-kit": {
@@ -4737,13 +4797,13 @@
 			}
 		},
 		"node_modules/tinyglobby": {
-			"version": "0.2.14",
-			"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
-			"integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
+			"version": "0.2.15",
+			"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+			"integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
 			"license": "MIT",
 			"dependencies": {
-				"fdir": "^6.4.4",
-				"picomatch": "^4.0.2"
+				"fdir": "^6.5.0",
+				"picomatch": "^4.0.3"
 			},
 			"engines": {
 				"node": ">=12.0.0"
@@ -4864,17 +4924,17 @@
 			"license": "MIT"
 		},
 		"node_modules/vite": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/vite/-/vite-7.1.2.tgz",
-			"integrity": "sha512-J0SQBPlQiEXAF7tajiH+rUooJPo0l8KQgyg4/aMunNtrOa7bwuZJsJbDWzeljqQpgftxuq5yNJxQ91O9ts29UQ==",
+			"version": "7.1.10",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-7.1.10.tgz",
+			"integrity": "sha512-CmuvUBzVJ/e3HGxhg6cYk88NGgTnBoOo7ogtfJJ0fefUWAxN/WDSUa50o+oVBxuIhO8FoEZW0j2eW7sfjs5EtA==",
 			"license": "MIT",
 			"dependencies": {
 				"esbuild": "^0.25.0",
-				"fdir": "^6.4.6",
+				"fdir": "^6.5.0",
 				"picomatch": "^4.0.3",
 				"postcss": "^8.5.6",
 				"rollup": "^4.43.0",
-				"tinyglobby": "^0.2.14"
+				"tinyglobby": "^0.2.15"
 			},
 			"bin": {
 				"vite": "bin/vite.js"

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "cactoide",
 	"private": true,
-	"version": "0.0.3",
+	"version": "0.1.1",
 	"type": "module",
 	"scripts": {
 		"dev": "vite dev",
@@ -35,7 +35,7 @@
 		"tailwindcss": "^4.0.0",
 		"typescript": "^5.0.0",
 		"typescript-eslint": "^8.20.0",
-		"vite": "^7.0.4"
+		"vite": "^7.1.10"
 	},
 	"dependencies": {
 		"@sveltejs/adapter-node": "^5.3.1",

src/hooks.server.ts

@@ -0,0 +1,22 @@
+// src/hooks.server.ts
+import type { Handle } from '@sveltejs/kit';
+import { generateUserId } from '$lib/generateUserId.js';
+
+export const handle: Handle = async ({ event, resolve }) => {
+	const cactoideUserId = event.cookies.get('cactoideUserId');
+	const userId = generateUserId();
+
+	const DAYS = 400; // practical upper bound in many browsers for cookies
+	const MAX_AGE = 60 * 60 * 24 * DAYS;
+	const PATH = '/';
+
+	if (!cactoideUserId) {
+		console.debug(`There is no cactoideUserId cookie, generating new one...`);
+		event.cookies.set('cactoideUserId', userId, { path: PATH, maxAge: MAX_AGE });
+	} else {
+		console.debug(`cactoideUserId: ${cactoideUserId}`);
+		console.debug(`cactoideUserId cookie found, using existing one...`);
+	}
+
+	return resolve(event);
+};

src/lib/components/Navbar.svelte

@@ -2,6 +2,7 @@
 	import { page } from '$app/stores';
 	import { goto } from '$app/navigation';
 	import { t } from '$lib/i18n/i18n.js';
+	import { PUBLIC_LANDING_INFO } from '$env/static/public';
 
 	// Check if current page is active
 	const isActive = (path: string): boolean => {
@@ -24,12 +25,14 @@
 
 			<!-- Navigation -->
 			<div class="md:flex md:items-center md:space-x-8">
-				<button
-					on:click={() => goto('/')}
-					class={isActive('/') ? 'text-violet-400' : 'cursor-pointer'}
-				>
-					{t('navigation.home')}
-				</button>
+				{#if PUBLIC_LANDING_INFO !== 'false'}
+					<button
+						on:click={() => goto('/')}
+						class={isActive('/') ? 'text-violet-400' : 'cursor-pointer'}
+					>
+						{t('navigation.home')}
+					</button>
+				{/if}
 
 				<button
 					on:click={() => goto('/discover')}

src/routes/+layout.server.ts

@@ -1,20 +1,5 @@
-import { generateUserId } from '$lib/generateUserId.js';
-
 export function load({ cookies }) {
 	const cactoideUserId = cookies.get('cactoideUserId');
-	const userId = generateUserId();
-
-	const DAYS = 400; // practical upper bound in many browsers for cookies
-	const MAX_AGE = 60 * 60 * 24 * DAYS;
-	const PATH = '/';
-
-	if (!cactoideUserId) {
-		console.debug(`There is no cactoideUserId cookie, generating new one...`);
-		cookies.set('cactoideUserId', userId, { path: PATH, maxAge: MAX_AGE });
-	} else {
-		console.debug(`cactoideUserId: ${cactoideUserId}`);
-		console.debug(`cactoideUserId cookie found, using existing one...`);
-	}
 
 	return {
 		cactoideUserId

src/routes/+layout.svelte

@@ -3,7 +3,7 @@
 	import Navbar from '$lib/components/Navbar.svelte';
 	import { t } from '$lib/i18n/i18n.js';
 
-	let { data } = $props();
+	let { data, children } = $props();
 </script>
 
 <svelte:head>
@@ -21,7 +21,7 @@
 
 		<!-- Main content -->
 		<main class="relative z-10">
-			<slot />
+			{@render children?.()}
 		</main>
 
 		<!-- Footer -->

src/routes/+page.server.ts

@@ -0,0 +1,11 @@
+import { redirect } from '@sveltejs/kit';
+import type { PageServerLoad } from './$types';
+import { PUBLIC_LANDING_INFO } from '$env/static/public';
+
+export const load: PageServerLoad = async () => {
+	if (PUBLIC_LANDING_INFO === 'false') {
+		throw redirect(302, '/discover');
+	}
+
+	return {};
+};