Skip to content

Add maps #28

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.

Sign up for GitHub

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

Merged
johanneherheim merged 3 commits into from
Mar 29, 2025
Merged

Add maps #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d103de6
Add maps
johanneherheim Mar 29, 2025
4685230
Fix grid
johanneherheim Mar 29, 2025
378de10
Fix grid
johanneherheim Mar 29, 2025
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
7 changes: 2 additions & 5 deletions app/hobbies/[slug]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { NewPost } from "@/components/new-post";
import { Post } from "@/components/posts";
import { posts } from "@/components/types/post";
import Link from "next/link";
interface PageProps {
params: Promise<{
slug: string;
Expand All @@ -16,11 +15,9 @@ export default async function HobbyPage({ params }: PageProps) {
return (
<div className="relative p-4 w-full space-y-4">
<NewPost />
<div className="w-full grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3 ">
<div className="w-full grid grid-cols-1 gap-4 md:grid-cols-2 ">
{filteredPosts.map((post) => (
<Link href={`/event/${post.id}`} key={post.id}>
<Post key={post.date.toISOString()} post={post} />
</Link>
<Post key={post.id} post={post} link={`/event/${post.id}`} />
))}
</div>
</div>
Expand Down
11 changes: 6 additions & 5 deletions app/profile/[id]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { Post } from "@/components/posts";
import { posts } from "@/components/types/post";
import { Button } from "@/components/ui/button";
import { signOut, useSession } from "next-auth/react";
import Link from "next/link";

export default function ProfilePage() {
const { data: session } = useSession();
Expand All @@ -22,11 +21,13 @@ export default function ProfilePage() {
<div>
<h2 className="text-2xl font-semibold">Mine arrangementer:</h2>
{myEvents.length > 0 ? (
<ul className="space-y-2 mt-2 grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4">
<ul className="space-y-2 mt-2 grid grid-cols-1 md:grid-cols-2 gap-4">
{myEvents.map((event) => (
<Link href={`/event/${event.id}`} key={event.id}>
<Post key={event.date.toISOString()} post={event} />
</Link>
<Post
key={event.date.toISOString()}
post={event}
link={`/event/${event.id}`}
/>
))}
</ul>
) : (
Expand Down
66 changes: 50 additions & 16 deletions components/posts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,58 @@
import { Calendar, Clock, User } from "lucide-react";
import { formatDateWithDay, formatTime } from "./lib/date-utils";
import { Event } from "./types/post";
import { useState } from "react";
import { Button } from "./ui/button";
import Link from "next/link";

export function Post({ post }: { post: Event }) {
export function Post({ post, link }: { post: Event; link: string }) {
const [isExpanded, setIsExpanded] = useState(false);

const toggleMap = (event: React.MouseEvent) => {
// Stopper klikking på kortet når man trykker på knappen
event.stopPropagation();
setIsExpanded((prev) => !prev);
};
return (
<div className="rounded-xl relative border p-4 bg-primary h-full">
<p className="font-bold text-lg mb-2">{post.place}</p>
<div className="flex space-x-2 w-full">
<Calendar className="size-4" />
<p>{formatDateWithDay(post.date)}</p>
</div>
<div className="flex space-x-2">
<Clock className="size-4" />
<p>{formatTime(post.date)}</p>
</div>
<div className="flex space-x-2">
<User className="size-4" />
<p>{post.user.name}</p>
</div>
<p className="line-clamp-3">{post.description}</p>
<div className="rounded-xl relative border p-4 bg-primary h-full space-y-2 hover:shadow-lg transition-shadow duration-300">
<Link href={link} className="block no-underline">
<p className="font-bold text-lg mb-2">{post.place}</p>
<div className="flex space-x-2 w-full">
<Calendar className="size-4" />
<p>{formatDateWithDay(post.date)}</p>
</div>
<div className="flex space-x-2">
<Clock className="size-4" />
<p>{formatTime(post.date)}</p>
</div>
<div className="flex space-x-2">
<User className="size-4" />
<p>{post.user.name}</p>
</div>
<p className="line-clamp-3">{post.description}</p>
</Link>
{post.mapsLink && (
<Button
variant="primary"
onClick={toggleMap}
className="mt-2 space-y-2 absolute top-4 right-4"
>
{isExpanded ? "Lukk kart" : "Vis kart"}
</Button>
)}
{isExpanded && (
<div className="mt-2">
<iframe
src={post.mapsLink}
width="100%"
height="300"
loading="lazy"
className="rounded-md border"
allowFullScreen
title={`Kart over ${post.place}`}
></iframe>
</div>
)}
</div>
);
}
Loading