mirror of
https://github.com/ourongxing/newsnow.git
synced 2025-01-18 18:59:15 +08:00
pref: new UI
This commit is contained in:
Ou
parent
250fc4543a
commit
6fa32ce275
@ -2,7 +2,7 @@
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<link rel="icon" type="image/svg+xml" href="/icon.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>NewsNow</title>
|
||||
</head>
|
||||
|
||||
@ -26,10 +26,8 @@
|
||||
"@dnd-kit/core": "^6.1.0",
|
||||
"@dnd-kit/sortable": "^8.0.0",
|
||||
"@dnd-kit/utilities": "^3.2.2",
|
||||
"@tanstack/react-query": "^5.56.2",
|
||||
"@tanstack/react-query-devtools": "^5.58.0",
|
||||
"@tanstack/react-router": "^1.58.9",
|
||||
"@tanstack/router-devtools": "^1.58.9",
|
||||
"@unocss/reset": "^0.62.4",
|
||||
"cheerio": "^1.0.0",
|
||||
"clsx": "^2.1.1",
|
||||
@ -38,7 +36,6 @@
|
||||
"db0": "npm:@ourongxing/db0@latest",
|
||||
"defu": "^6.1.4",
|
||||
"fast-xml-parser": "^4.5.0",
|
||||
"favicons-scraper": "^1.3.2",
|
||||
"framer-motion": "^11.11.5",
|
||||
"h3": "^1.13.0",
|
||||
"iconv-lite": "^0.6.3",
|
||||
@ -59,6 +56,8 @@
|
||||
"@iconify-json/ph": "^1.2.0",
|
||||
"@ourongxing/eslint-config": "3.2.3-beta.4",
|
||||
"@ourongxing/tsconfig": "^0.0.4",
|
||||
"@tanstack/react-query": "^5.56.2",
|
||||
"@tanstack/router-devtools": "^1.58.9",
|
||||
"@tanstack/router-plugin": "^1.58.10",
|
||||
"@types/md5": "^2.3.5",
|
||||
"@types/react": "^18.3.9",
|
||||
@ -68,6 +67,7 @@
|
||||
"eslint": "^9.11.1",
|
||||
"eslint-plugin-react-hooks": "^5.1.0-rc-778e1ed2-20240926",
|
||||
"eslint-plugin-react-refresh": "^0.4.12",
|
||||
"favicons-scraper": "^1.3.2",
|
||||
"lint-staged": "^15.2.10",
|
||||
"mlly": "^1.7.2",
|
||||
"mockdate": "^3.0.5",
|
||||
|
||||
6
public/icon.svg
Normal file
6
public/icon.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 24 KiB |
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||
|
Before Width: | Height: | Size: 1.5 KiB |
@ -10,13 +10,13 @@ export default defineSource(async () => {
|
||||
const $items = $(".newsflash-item")
|
||||
$items.each((_, el) => {
|
||||
const $el = $(el)
|
||||
const $a = $el.find("a")
|
||||
const $a = $el.find("a.item-title")
|
||||
const url = $a.attr("href")
|
||||
const title = $a.text()
|
||||
const relativeDate = $el.find(".time")
|
||||
if (url && title && relativeDate) {
|
||||
news.push({
|
||||
url,
|
||||
url: `https://www.36kr.com${url}`,
|
||||
title,
|
||||
id: url,
|
||||
extra: {
|
||||
|
||||
6
src/assets/icon.svg
Normal file
6
src/assets/icon.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 13 KiB |
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||
|
Before Width: | Height: | Size: 4.0 KiB |
@ -5,7 +5,7 @@ import { useIsFetching } from "@tanstack/react-query"
|
||||
import clsx from "clsx"
|
||||
import type { SourceID } from "@shared/types"
|
||||
import { Homepage, Version } from "@shared/consts"
|
||||
import logo from "~/assets/react.svg"
|
||||
import logo from "~/assets/icon.svg"
|
||||
import { useDark } from "~/hooks/useDark"
|
||||
import { currentSectionAtom, refetchSourcesAtom } from "~/atoms"
|
||||
|
||||
@ -43,27 +43,36 @@ function RefreshButton() {
|
||||
})
|
||||
|
||||
return (
|
||||
<button type="button" className={clsx("btn-pure i-ph:arrow-clockwise", isFetching && "animate-spin")} onClick={refreshAll} />
|
||||
<button
|
||||
type="button"
|
||||
className={clsx("i-ph:arrow-counter-clockwise-duotone btn-pure", isFetching && "animate-spin i-ph:circle-dashed-duotone")}
|
||||
onClick={refreshAll}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
export function Header() {
|
||||
return (
|
||||
<>
|
||||
<div className="flex items-center">
|
||||
<Link className="text-6 flex gap-2 items-center" to="/">
|
||||
<img src={logo} alt="logo" className="h-8" />
|
||||
<span className="font-mono">NewsNow</span>
|
||||
</Link>
|
||||
<a className="btn-pure text-sm ml-1 mt--2">
|
||||
{`v${Version}`}
|
||||
</a>
|
||||
<div className="flex">
|
||||
<div className="flex">
|
||||
<Link to="/" className="flex gap-2">
|
||||
<img src={logo} alt="logo" className="h-12" />
|
||||
<span className="flex flex-col text-2xl font-mono font-bold line-height-none">
|
||||
<span>News</span>
|
||||
<span>Now</span>
|
||||
</span>
|
||||
</Link>
|
||||
<a className="btn-pure text-sm ml-1">
|
||||
{`v${Version}`}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex gap-2 items-center">
|
||||
<span className="flex gap-2 items-center text-xl">
|
||||
<RefreshButton />
|
||||
<ThemeToggle />
|
||||
<GithubIcon />
|
||||
</div>
|
||||
</span>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
@ -46,10 +46,10 @@ export const CardWrapper = forwardRef<HTMLDivElement, ItemsProps>(({ id, isDragg
|
||||
<div
|
||||
ref={ref}
|
||||
className={clsx(
|
||||
"flex flex-col h-500px aspect-auto border border-gray-100 rounded-xl shadow-2xl shadow-gray-600/10 bg-base",
|
||||
"dark:( border-gray-700 shadow-none)",
|
||||
"flex flex-col h-550px rounded-2xl bg-blue bg-op-50 p-4 backdrop-blur-5",
|
||||
"shadow-base",
|
||||
isDragged && "op-50",
|
||||
isOverlay ? "bg-glass" : "",
|
||||
isOverlay ? "backdrop-blur-5 bg-op-40" : "",
|
||||
)}
|
||||
style={{
|
||||
transformOrigin: "50% 50%",
|
||||
@ -98,22 +98,35 @@ export function NewsCard({ id, inView, isOverlay, handleListeners }: NewsCardPro
|
||||
|
||||
return (
|
||||
<>
|
||||
<div
|
||||
className={clsx("flex justify-between p-2 items-center")}
|
||||
>
|
||||
<div className="flex items-center gap-2">
|
||||
<div className={clsx("flex justify-between m-4 mt-0 items-center")}>
|
||||
<div className="flex gap-2 items-center">
|
||||
<img
|
||||
src={`/icons/${id.split("-")[0]}.png`}
|
||||
className="w-4 h-4 rounded"
|
||||
className={clsx("h-8 rounded-full")}
|
||||
alt={id}
|
||||
onError={e => e.currentTarget.hidden = true}
|
||||
onError={e => e.currentTarget.src = "/icons/default.png"}
|
||||
/>
|
||||
<span className="text-md font-bold">
|
||||
{sources[id].name}
|
||||
<span className="flex flex-col">
|
||||
<span className="flex items-center gap-2">
|
||||
<span className="text-xl font-bold">
|
||||
{sources[id].name}
|
||||
</span>
|
||||
{sources[id]?.title && <span className="text-sm">{sources[id].title}</span>}
|
||||
</span>
|
||||
<span className="text-xs"><UpdateTime query={query} /></span>
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex gap-2 items-center">
|
||||
<span className="text-xs">{sources[id]?.title}</span>
|
||||
<div className="flex gap-2">
|
||||
<button
|
||||
type="button"
|
||||
className={clsx("i-ph:arrow-counter-clockwise-duotone", query.isFetching && "animate-spin i-ph:circle-dashed-duotone")}
|
||||
onClick={manualRefetch}
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
className={clsx(focusSources.includes(id) ? "i-ph:star-fill" : "i-ph:star-duotone")}
|
||||
onClick={addFocusList}
|
||||
/>
|
||||
<button
|
||||
{...handleListeners}
|
||||
type="button"
|
||||
@ -122,21 +135,6 @@ export function NewsCard({ id, inView, isOverlay, handleListeners }: NewsCardPro
|
||||
</div>
|
||||
</div>
|
||||
<NewsList query={query} />
|
||||
<div className="p-2 flex items-center justify-between">
|
||||
<span className="text-sm"><UpdateTime query={query} /></span>
|
||||
<div className="flex gap-1">
|
||||
<button
|
||||
type="button"
|
||||
className={clsx("i-ph:arrow-clockwise", query.isFetching && "animate-spin")}
|
||||
onClick={manualRefetch}
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
className={clsx(focusSources.includes(id) ? "i-ph:star-fill" : "i-ph:star", "color-primary")}
|
||||
onClick={addFocusList}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
)
|
||||
}
|
||||
@ -175,7 +173,7 @@ function NewsList({ query }: Query) {
|
||||
const items = query.data?.items
|
||||
return (
|
||||
<OverlayScrollbar
|
||||
className="h-full pl-2 pr-3 mr-1 overflow-x-auto"
|
||||
className="h-full pl-2 pr-3 mr-1 py-2 overflow-x-auto bg-base rounded-2xl"
|
||||
options={{
|
||||
overflow: { x: "hidden" },
|
||||
}}
|
||||
|
||||
@ -26,7 +26,7 @@ export function Dnd() {
|
||||
<motion.div
|
||||
className="grid w-full gap-6"
|
||||
style={{
|
||||
gridTemplateColumns: "repeat(auto-fill, minmax(325px, 1fr))",
|
||||
gridTemplateColumns: "repeat(auto-fill, minmax(350px, 1fr))",
|
||||
}}
|
||||
initial="hidden"
|
||||
animate="visible"
|
||||
|
||||
@ -27,11 +27,11 @@ function RootComponent() {
|
||||
useOnReload()
|
||||
return (
|
||||
<>
|
||||
<OverlayScrollbar className="px-6 md:(px-16) h-full overflow-x-auto relative">
|
||||
<header className="flex justify-between items-center sticky top-0 z-100 bg-base py-4 md:(pt-8)">
|
||||
<OverlayScrollbar className="h-full overflow-x-auto relative">
|
||||
<header className="flex justify-between items-center sticky top-0 z-100 bg-base py-4 px-6 md:(pt-8 px-16)">
|
||||
<Header />
|
||||
</header>
|
||||
<main className="min-h-[calc(100vh-11rem)]">
|
||||
<main className="min-h-[calc(100vh-11rem)] px-6 md:(px-16)">
|
||||
<Outlet />
|
||||
</main>
|
||||
<footer className="py-6 flex flex-col items-center justify-center text-sm">
|
||||
|
||||
@ -11,12 +11,11 @@ body,
|
||||
}
|
||||
|
||||
html.dark {
|
||||
background-color: #1d1c1c;
|
||||
color-scheme: dark;
|
||||
}
|
||||
|
||||
body {
|
||||
--at-apply: color-base;
|
||||
--at-apply: color-base bg-base;
|
||||
-moz-user-select: none;
|
||||
-webkit-user-select: none;
|
||||
user-select: none;
|
||||
@ -36,4 +35,12 @@ button:disabled {
|
||||
--os-handle-bg: rgba(255, 255, 255, 0.44);
|
||||
--os-handle-bg-hover: rgba(255, 255, 255, 0.55);
|
||||
--os-handle-bg-active: rgba(255, 255, 255, 0.66);
|
||||
}
|
||||
|
||||
.card {
|
||||
box-shadow: 0px 2px 3px -1px rgba(0,0,0,0.1), 0px 1px 0px 0px rgba(25,28,33,0.02), 0px 0px 0px 1px rgba(25,28,33,0.08);
|
||||
}
|
||||
|
||||
.dark .card {
|
||||
box-shadow: rgba(50, 50, 105, 0.15) 0px 2px 5px 0px, rgba(0, 0, 0, 0.05) 0px 1px 1px 0px;
|
||||
}
|
||||
@ -14,8 +14,9 @@ export default defineConfig({
|
||||
"color-base": "color-neutral-800 dark:color-neutral-300",
|
||||
"bg-base": "bg-white dark:bg-[#1d1c1c]",
|
||||
"border-base": "border-gray-500/30",
|
||||
"shadow-base": "shadow-[0px_2px_3px_-1px_rgba(0,0,0,0.1),0px_1px_0px_0px_rgba(25,28,33,0.02),0px_0px_0px_1px_rgba(25,28,33,0.08)] dark:shadow-[0px_2px_3px_-1px_rgba(0,0,0,0.1),0px_1px_0px_0px_rgba(25,28,33,0.02),0px_0px_0px_1px_rgba(25,28,33,0.08)]",
|
||||
|
||||
"bg-glass": "bg-white:75 dark:bg-[#1d1c1c]:75 backdrop-blur-5",
|
||||
// "bg-glass": "bg-white:75 dark:bg-[#1d1c1c]:75 backdrop-blur-5",
|
||||
"bg-code": "bg-gray5:5",
|
||||
"bg-hover": "bg-primary-400:5",
|
||||
|
||||
@ -23,7 +24,7 @@ export default defineConfig({
|
||||
"border-active": "border-primary-600/25 dark:border-primary-400/25",
|
||||
"bg-active": "bg-primary-400:10",
|
||||
|
||||
"btn-pure": "text-lg op50 hover:op75",
|
||||
"btn-pure": "op50 hover:op75",
|
||||
"btn-action": "border border-base rounded flex gap-2 items-center px2 py1 op75 hover:op100 hover:bg-hover",
|
||||
"btn-action-sm": "btn-action text-sm",
|
||||
"btn-action-active": "color-active border-active! bg-active op100!",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user