Merge branch 'main' into add-event-dsa-trees

craft-code-club · Jan 26, 2025 · 97475de · 97475de
2 parents 710f087 + 16062e2
commit 97475de
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,8 +9,10 @@
     "lint": "next lint"
   },
   "dependencies": {
+    "@next/third-parties": "^15.1.6",
     "@tailwindcss/typography": "^0.5.16",
     "@tippyjs/react": "^4.2.6",
+    "escape-html": "^1.0.3",
     "gray-matter": "^4.0.3",
     "next": "15.1.6",
     "next-themes": "^0.4.4",
@@ -22,6 +24,7 @@
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3",
+    "@types/escape-html": "^1.0.4",
     "@types/node": "^22",
     "@types/react": "^19",
     "@types/react-dom": "^19",

diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
@@ -30,14 +30,14 @@ export default function BlogPage() {
                     hiddenTopics={hiddenTopics}
                     hasHidden={hasHidden}
                   />
-                  <Link href={`/posts/${post.id}`}>
+                  <Link href={`/posts/${encodeURIComponent(post.id)}`}>
                     <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-3 hover:text-blue-600 dark:hover:text-blue-400 transition-colors">
                       {post.title}
                     </h2>
                   </Link>
                   <p className="text-gray-600 dark:text-gray-300 mb-4">{post.description}</p>
                   <Link 
-                    href={`/posts/${post.id}`}
+                    href={`/posts/${encodeURIComponent(post.id)}`}
                     className="inline-flex items-center text-blue-600 dark:text-blue-400 hover:text-blue-800 dark:hover:text-blue-300"
                   >
                     Ler mais

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -4,6 +4,7 @@ import Link from "next/link";
 import Image from "next/image";
 import { ThemeProvider } from "@/components/ThemeProvider";
 import { ThemeToggle } from "@/components/ThemeToggle";
+import { GoogleTagManager } from '@next/third-parties/google'
 import "./globals.css";
 
 const inter = Inter({ subsets: ["latin"] });
@@ -20,6 +21,7 @@ export default function RootLayout({
 }>) {
   return (
     <html lang="pt-BR" suppressHydrationWarning>
+      <GoogleTagManager gtmId="GTM-T4MPNQ67" />
       <body className={`${inter.className} bg-gray-50 dark:bg-gray-900 text-gray-900 dark:text-gray-100 antialiased min-h-screen flex flex-col`}>
         <ThemeProvider>
           <nav className="sticky top-0 bg-white dark:bg-gray-800 shadow-sm z-50">

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -1,6 +1,7 @@
 import Link from 'next/link';
 import { getSortedPostsData, formatTopicDisplay } from '@/lib/posts';
 import TopicTags from '@/components/TopicTags';
+import escapeHtml from 'escape-html';
 
 export default function Home() {
   const posts = getSortedPostsData();
@@ -91,12 +92,12 @@ export default function Home() {
                       hiddenTopics={hiddenTopics}
                       hasHidden={hasHidden}
                     />
-                    <Link href={`/posts/${post.id}`}>
+                    <Link href={`/posts/${escapeHtml(post.id)}`}>
                       <h3 className="text-xl font-semibold text-gray-900 dark:text-white mb-3 hover:text-blue-600 dark:hover:text-blue-400 transition-colors">{post.title}</h3>
                     </Link>
                     <p className="text-gray-600 dark:text-gray-300 mb-4">{post.description}</p>
                     <Link 
-                      href={`/posts/${post.id}`}
+                      href={`/posts/${escapeHtml(post.id)}`}
                       className="inline-flex items-center text-blue-600 dark:text-blue-400 hover:text-blue-800 dark:hover:text-blue-300"
                     >
                       Ler mais

diff --git a/src/app/topics/[topic]/page.tsx b/src/app/topics/[topic]/page.tsx
@@ -1,4 +1,5 @@
 import {getSortedPostsData, formatTopicDisplay, getAllTopics} from '@/lib/posts';
+import escapeHtml from 'escape-html';
 import Link from 'next/link';
 import TopicTags from '@/components/TopicTags';
 
@@ -70,14 +71,14 @@ export default async function TopicPage({ params }: Props) {
                       hiddenTopics={hiddenTopics}
                       hasHidden={hasHidden}
                     />
-                    <Link href={`/posts/${post.id}`}>
+                    <Link href={`/posts/${escapeHtml(post.id)}`}>
                       <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-3 hover:text-blue-600 dark:hover:text-blue-400 transition-colors">
                         {post.title}
                       </h2>
                     </Link>
                     <p className="text-gray-600 dark:text-gray-300 mb-4">{post.description}</p>
                     <Link 
-                      href={`/posts/${post.id}`}
+                      href={`/posts/${escapeHtml(post.id)}`}
                       className="inline-flex items-center text-blue-600 dark:text-blue-400 hover:text-blue-800 dark:hover:text-blue-300"
                     >
                       Ler mais