@@ -39,10 +47,7 @@ import { Separator } from '@/components/ui/separator';
Abdurrahman
-
- Hacı sana çok özel bir sürpriz hazırladık, aşağıdaki konuma muhakak
- git.
-
+ {data.description}
@@ -50,9 +55,14 @@ import { Separator } from '@/components/ui/separator';
-
+
-
+
+
diff --git a/src/pages/create-url.ts b/src/pages/api/content.ts
similarity index 54%
rename from src/pages/create-url.ts
rename to src/pages/api/content.ts
index 759f0dc..e633ec5 100644
--- a/src/pages/create-url.ts
+++ b/src/pages/api/content.ts
@@ -1,20 +1,9 @@
-export const prerender = false
-
import { put } from "@vercel/blob"
-import type { Generated } from "kysely"
import type { APIRoute } from "astro"
import { createKysely } from "@vercel/postgres-kysely"
+import { customAlphabet } from "nanoid"
-interface ContentTable {
- id: Generated
- blob_url: string
- loc: string
- description: string
-}
-
-interface Database {
- contents: ContentTable
-}
+import type { Database } from "../../lib/db"
export const POST: APIRoute = async ({ request }) => {
const data = await request.formData()
@@ -43,9 +32,14 @@ export const POST: APIRoute = async ({ request }) => {
const db = createKysely({ connectionString: import.meta.env.POSTGRES_URL })
+ const nanoid = customAlphabet("abcdefghijklmnoprstuvyz", 10)
+
+ const newUrl = nanoid()
+
const res = await db
.insertInto("contents")
.values({
+ url: `${newUrl.slice(0, 3)}-${newUrl.slice(3, 7)}-${newUrl.slice(7)}`,
blob_url: blob.url,
description: description?.toString() ?? "",
loc: `SRID=4326;POINT(${pos[0]} ${pos[1]})`
@@ -66,3 +60,39 @@ export const POST: APIRoute = async ({ request }) => {
})
}
}
+
+export const GET: APIRoute = async ({ request }) => {
+ const contentId = new URL(request.url).searchParams.get("id")
+
+ if (!contentId) {
+ return new Response(null, {
+ status: 400,
+ statusText: "Content id is required"
+ })
+ }
+
+ const db = createKysely({ connectionString: import.meta.env.POSTGRES_URL })
+
+ try {
+ const content = await db
+ .selectFrom("contents")
+ .select(({ fn }) => ["blob_url", fn("ST_AsGeoJSON", ["loc"]).as("loc"), "description"])
+ .where("url", "=", contentId)
+ .executeTakeFirst()
+
+ if (content) {
+ return new Response(JSON.stringify(content))
+ } else {
+ return new Response(null, {
+ status: 404,
+ statusText: "Content not found"
+ })
+ }
+ } catch (error) {
+ console.error("Error fetching content:", error)
+ return new Response(null, {
+ status: 500,
+ statusText: "Error while fetching content"
+ })
+ }
+}
diff --git a/src/pages/create.astro b/src/pages/create.astro
index e92bf60..52a2894 100644
--- a/src/pages/create.astro
+++ b/src/pages/create.astro
@@ -1,4 +1,6 @@
---
+export const prerender = true;
+
import '@/styles/globals.css';
import Layout from '../layouts/Layout.astro';
import { Button } from '@/components/ui/button';
@@ -109,7 +111,7 @@ import { Textarea } from '@/components/ui/textarea';
const formData = new FormData(e.target as HTMLFormElement);
- const response = await fetch(`/create-url`, {
+ const response = await fetch(`/api/content`, {
method: 'POST',
body: formData,
});
diff --git a/src/scripts/initMap.js b/src/scripts/initMap.js
index 0f2aa29..0642a0c 100644
--- a/src/scripts/initMap.js
+++ b/src/scripts/initMap.js
@@ -1,4 +1,6 @@
-const TARGET_LOCATION = [41.01907795861253, 29.01715377829709];
+const data = JSON.parse(document.getElementById('map').dataset.targetLocation)
+
+const TARGET_LOCATION = data.coordinates
var map = L.map('map').setView(TARGET_LOCATION, 13);
diff --git a/src/styles/locked-content.css b/src/styles/locked-content.css
index bb3a8b9..ab9bd43 100644
--- a/src/styles/locked-content.css
+++ b/src/styles/locked-content.css
@@ -1,42 +1,14 @@
-.module {
- display: grid;
- place-items: center;
+.image-wrapper {
position: relative;
- overflow: hidden;
}
-.module-unlocked {
- display: grid;
- place-items: center;
- position: relative;
- overflow: hidden;
-}
-
-.module::before {
- content: "";
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
+.overlay {
position: absolute;
- background-image: url("/sample-selfie.webp");
- background-position: center;
- background-repeat: no-repeat;
- filter: blur(20px);
-}
-.module-unlocked::before {
- content: "";
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- position: absolute;
- background-image: url("/sample-selfie.webp");
- background-position: center;
- background-repeat: no-repeat;
-}
+ /* center overlay text */
+ display: flex;
+ align-items: center;
+ justify-content: center;
-.module-inside {
- position: relative;
+ inset: 0;
}