fix: link (#115)

* start

* .

* seeding connections

* .

* wip

* wip: learning state

* wip: notes section

* wip: many

* topics

* chore: update schema

* update package

* update sidebar

* update page section

* feat: profile

* fix: remove z index

* fix: wrong type

* add avatar

* add avatar

* wip

* .

* store page section key

* remove atom page section

* fix rerender

* fix rerender

* fix rerender

* fix rerender

* fix link

* search light/dark mode

* bubble menu ui

* .

* fix: remove unecessary code

* chore: mark as old for old schema

* chore: adapt new schema

* fix: add topic schema but null for now

* fix: add icon on personal link

* fix: list item

* fix: set url fetched when editing

* fix: remove image

* feat: add icon to link

* feat: custom url zod validation

* fix: metadata test

* chore: update utils

* fix: link

* fix: url fetcher

* .

* .

* fix: add link, section

* chore: seeder

* .

* .

* .

* .

* fix: change checkbox to learning state

* fix: click outside editing form

* feat: constant

* chore: move to master folder

* chore: adapt new schema

* chore: cli for new schema

* fix: new schema for dev seed

* fix: seeding

* update package

* chore: forcegraph seed

* bottombar

* if isEdit delete icon

* showCreate X button

* .

* options

* chore: implement topic from public global group

* chore: update learning state

* fix: change implementation for outside click

* chore: implement new form param

* chore: update env example

* feat: link form refs exception

* new page button layout, link topic search fixed

* chore: enable topic

* chore: update seed

* profile

* chore: move framer motion package from root to web and add nuqs

* chore: add LearningStateValue

* chore: implement active state

* profile

* chore: use fancy switch and update const

* feat: filter implementation

* dropdown menu

* .

* sidebar topics

* topic selected color

* feat: topic detail

* fix: collapsible page

* pages - sorted by, layout, visible mode

* .

* .

* .

* topic status sidebar

* topic button and count

* fix: topic

* page delete/topic buttons

* search ui

* selected topic for page

* selected topic status sidebar

* removed footer

* update package

* .

---------

Co-authored-by: Nikita <github@nikiv.dev>
Co-authored-by: marshennikovaolga <marshennikova@gmail.com>
Co-authored-by: Kisuyo <ig.intr3st@gmail.com>
This commit is contained in:
Aslam
2024-08-26 19:35:00 +07:00
committed by GitHub
parent 7cbfcc705b
commit 2d270706a5
77 changed files with 3002 additions and 1327 deletions

View File

@@ -3,7 +3,7 @@
*/
import { NextRequest } from "next/server"
import axios from "axios"
import { GET } from "./route"
import { DEFAULT_VALUES, GET } from "./route"
jest.mock("axios")
const mockedAxios = axios as jest.Mocked<typeof axios>
@@ -19,7 +19,7 @@ describe("Metadata Fetcher", () => {
<head>
<title>Test Title</title>
<meta name="description" content="Test Description">
<link rel="icon" href="/favicon.ico">
<link rel="icon" href="/icon.ico">
</head>
</html>
`
@@ -37,7 +37,7 @@ describe("Metadata Fetcher", () => {
expect(data).toEqual({
title: "Test Title",
description: "Test Description",
favicon: "https://example.com/favicon.ico",
icon: "https://example.com/icon.ico",
url: "https://example.com"
})
})
@@ -66,9 +66,9 @@ describe("Metadata Fetcher", () => {
expect(response.status).toBe(200)
expect(data).toEqual({
title: "No title available",
description: "No description available",
favicon: null,
title: DEFAULT_VALUES.TITLE,
description: DEFAULT_VALUES.DESCRIPTION,
icon: null,
url: "https://example.com"
})
})
@@ -92,9 +92,9 @@ describe("Metadata Fetcher", () => {
expect(response.status).toBe(200)
expect(data).toEqual({
title: "No title available",
description: "No description available",
favicon: null,
title: DEFAULT_VALUES.TITLE,
description: DEFAULT_VALUES.DESCRIPTION,
icon: null,
url: "https://example.com"
})
})

View File

@@ -1,29 +1,39 @@
import { NextRequest, NextResponse } from "next/server"
import axios from "axios"
import * as cheerio from "cheerio"
import { ensureUrlProtocol } from "@/lib/utils"
import { urlSchema } from "@/lib/utils/schema"
interface Metadata {
title: string
description: string
favicon: string | null
icon: string | null
url: string
}
const DEFAULT_VALUES = {
TITLE: "No title available",
DESCRIPTION: "No description available",
IMAGE: null,
export const DEFAULT_VALUES = {
TITLE: "",
DESCRIPTION: "",
FAVICON: null
}
export async function GET(request: NextRequest) {
const { searchParams } = new URL(request.url)
const url = searchParams.get("url")
let url = searchParams.get("url")
await new Promise(resolve => setTimeout(resolve, 1000))
if (!url) {
return NextResponse.json({ error: "URL is required" }, { status: 400 })
}
const result = urlSchema.safeParse(url)
if (!result.success) {
throw new Error(result.error.issues.map(issue => issue.message).join(", "))
}
url = ensureUrlProtocol(url)
try {
const { data } = await axios.get(url, {
timeout: 5000,
@@ -41,13 +51,12 @@ export async function GET(request: NextRequest) {
$('meta[name="description"]').attr("content") ||
$('meta[property="og:description"]').attr("content") ||
DEFAULT_VALUES.DESCRIPTION,
favicon:
$('link[rel="icon"]').attr("href") || $('link[rel="shortcut icon"]').attr("href") || DEFAULT_VALUES.FAVICON,
icon: $('link[rel="icon"]').attr("href") || $('link[rel="shortcut icon"]').attr("href") || DEFAULT_VALUES.FAVICON,
url: url
}
if (metadata.favicon && !metadata.favicon.startsWith("http")) {
metadata.favicon = new URL(metadata.favicon, url).toString()
if (metadata.icon && !metadata.icon.startsWith("http")) {
metadata.icon = new URL(metadata.icon, url).toString()
}
return NextResponse.json(metadata)
@@ -55,7 +64,7 @@ export async function GET(request: NextRequest) {
const defaultMetadata: Metadata = {
title: DEFAULT_VALUES.TITLE,
description: DEFAULT_VALUES.DESCRIPTION,
favicon: DEFAULT_VALUES.FAVICON,
icon: DEFAULT_VALUES.FAVICON,
url: url
}
return NextResponse.json(defaultMetadata)