Skip to content

Commit b1b7dc4

Browse files
zakneslerzaknesler
committed
wip
1 parent a7d4e7a commit b1b7dc4

File tree

17 files changed

+232
-123
lines changed

17 files changed

+232
-123
lines changed

‎crates/blend-feed/src/lib.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@ use error::FeedResult;
33
pub mod error;
44
pub mod model;
55

6-
pub async fn parse_url(url: &str) -> FeedResult<model::ParsedFeed> {
7-
let res = reqwest::get(url).await?.text().await?;
8-
let feed = feed_rs::parser::parse(res.as_bytes())?;
6+
pub async fn parse_feed(url: &str) -> FeedResult<model::ParsedFeed> {
7+
let data = reqwest::get(url).await?.text().await?;
8+
let feed = feed_rs::parser::parse(data.as_bytes()).or_else(|err| match err {
9+
feed_rs::parser::ParseFeedError::ParseError(_) => todo!(),
10+
_ => Err(err),
11+
})?;
12+
913
Ok(feed.into())
1014
}

‎crates/blend-web/src/router/feed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ async fn create(
4141
) -> WebResult<impl IntoResponse> {
4242
data.validate()?;
4343

44-
let parsed = blend_feed::parse_url(&data.url).await?;
44+
let parsed = blend_feed::parse_feed(&data.url).await?;
4545
let feed = repo::feed::FeedRepo::new(ctx.db)
4646
.create_feed(repo::feed::CreateFeedParams {
4747
title: parsed.title,

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
},
2222
"devDependencies": {
2323
"@tailwindcss/forms": "^0.5.7",
24-
"@typescript-eslint/eslint-plugin": "^7.7.1",
25-
"@typescript-eslint/parser": "^7.7.1",
24+
"@typescript-eslint/eslint-plugin": "^7.8.0",
25+
"@typescript-eslint/parser": "^7.8.0",
2626
"autoprefixer": "^10.4.19",
2727
"eslint": "^8.56.0",
2828
"eslint-config-prettier": "^9.1.0",

‎pnpm-lock.yaml

Lines changed: 58 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tailwind.config.ts

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ import colors from 'tailwindcss/colors';
33
import defaultTheme from 'tailwindcss/defaultTheme';
44
import formsPlugin from '@tailwindcss/forms';
55
import kobaltePlugin from '@kobalte/tailwindcss';
6+
import plugin from 'tailwindcss/plugin';
67

78
export default {
8-
content: ['./ui/**/*.{js,ts,jsx,tsx}'],
9+
content: ['./ui/**/*.{js,ts,jsx,tsx,html}'],
910
theme: {
1011
extend: {
1112
fontFamily: {
@@ -18,21 +19,15 @@ export default {
1819
sidebar: '20rem',
1920
},
2021
keyframes: {
21-
overlayShow: {
22-
from: { opacity: '0' },
23-
to: { opacity: '1' },
24-
},
25-
overlayHide: {
26-
from: { opacity: '1' },
27-
to: { opacity: '0' },
28-
},
22+
overlayShow: { from: { opacity: '0' }, to: { opacity: '1' } },
23+
overlayHide: { from: { opacity: '1' }, to: { opacity: '0' } },
2924
contentShow: {
30-
from: { opacity: '0', transform: 'scale(0.96)' },
31-
to: { opacity: '1', transform: 'scale(1)' },
25+
from: { opacity: '0', transform: 'scale(0.95) translateY(0.25rem)' },
26+
to: { opacity: '1', transform: 'scale(1) translateY(0rem)' },
3227
},
3328
contentHide: {
34-
from: { opacity: '1', transform: 'scale(1)' },
35-
to: { opacity: '0', transform: 'scale(0.96)' },
29+
from: { opacity: '1', transform: 'scale(1) translateY(0rem)' },
30+
to: { opacity: '0', transform: 'scale(0.95) translateY(0.25rem)' },
3631
},
3732
},
3833
animation: {
@@ -43,5 +38,21 @@ export default {
4338
},
4439
},
4540
},
46-
plugins: [formsPlugin(), kobaltePlugin({ prefix: 'ui' })],
41+
plugins: [
42+
formsPlugin(),
43+
kobaltePlugin({ prefix: 'ui' }),
44+
plugin(({ addComponents }) => {
45+
addComponents({
46+
'.scrollbar-hide': {
47+
scrollbarWidth: 'none',
48+
'-webkit-overflow-scrolling': 'touch',
49+
'&::-webkit-scrollbar': {
50+
display: 'none',
51+
width: '0',
52+
background: 'transparent',
53+
},
54+
},
55+
});
56+
}),
57+
],
4758
} satisfies Config;

‎ui/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link href="https://fonts.googleapis.com/css2?family=Lora:wght@400;600&display=swap" rel="stylesheet">
1010
<title>Blend</title>
1111
</head>
12-
<body class="bg-gray-100 text-gray-800 h-full">
12+
<body class="bg-gray-50 text-gray-800 dark:bg-gray-900 dark:text-gray-200 h-full">
1313
<noscript>You need to enable JavaScript to run this app.</noscript>
1414
<div id="root" class="h-full"></div>
1515
<script type="module" src="./src/index.tsx"></script>

0 commit comments

Comments
 (0)