Compare commits

...

43 Commits

Author SHA1 Message Date
tanner 98955a1ce7 Style fixes 2026-01-03 23:26:56 +00:00
tanner 83cc49e7ec style: Make settings button appear as plain text
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2026-01-03 19:51:18 +00:00
tanner 82d96f3b7b style: Refine settings button style 2026-01-03 19:51:16 +00:00
tanner 9d5ba84f0d fix: Fix modal overlay positioning 2026-01-03 00:50:34 +00:00
tanner 5214e5676f style: Style settings modal for dark, black, and red themes
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2026-01-03 00:43:31 +00:00
tanner fa030a069c fix: Allow modal to scroll with page content
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2026-01-03 00:22:36 +00:00
tanner 7faebe346e feat: Add X close button to settings modal
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2026-01-03 00:19:14 +00:00
tanner fcb78b9803 style: Add spacing to settings modal for readability 2026-01-03 00:19:12 +00:00
tanner d133383c06 feat: Move fullscreen toggle to settings modal
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2026-01-03 00:15:44 +00:00
tanner 4240ff07df style: Adjust feed filter label and spacing 2026-01-03 00:15:41 +00:00
tanner 5554b58f93 fix: Make feed update check more robust by comparing all story IDs
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2026-01-03 00:09:25 +00:00
tanner ab15868397 feat: Add feed source filtering to settings and API
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2026-01-03 00:01:46 +00:00
tanner 93903eedf9 feat: Move "Small websites" filter to settings dialog
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2026-01-02 23:51:23 +00:00
tanner e0f523cc1c feat: Add body and article font selection settings
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2026-01-02 22:11:28 +00:00
tanner cf35bd53bf style: Remove redundant font inheritance from comment button 2026-01-02 22:11:26 +00:00
tanner 0fd3589313 feat: Consolidate font size settings; adjust increment to 0.05
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2026-01-02 22:06:39 +00:00
tanner 6dce141862 fix: Use em unit for story font size 2026-01-02 22:06:35 +00:00
tanner a8a794bc65 refactor: Standardize font size units to rem and add per-setting resets
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2026-01-02 21:49:07 +00:00
tanner 656c322249 feat: Keep settings menu open after theme selection 2026-01-02 21:49:02 +00:00
tanner cde095169f feat: Implement settings modal with theme and font size adjustments
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2026-01-02 21:39:54 +00:00
tanner 649b8a0da4 fix: Prevent React app flash by hiding static content with display: none
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2026-01-02 20:52:07 +00:00
tanner 407c995d9f fix: Prevent content and dark mode background flashes on load
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2026-01-02 20:44:10 +00:00
tanner 7b978cac43 Test update 2025-12-27 18:36:32 +00:00
tanner b5241a2a42 Style update banner correctly 2025-12-27 18:29:23 +00:00
tanner 8bf33e2d45 style: Consolidate update banner styles and add theme support
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2025-12-27 18:15:22 +00:00
tanner 987c401dc4 chore: Update client version mismatch message 2025-12-27 18:15:18 +00:00
tanner 6facbd3397 chore: Log service worker update check 2025-12-27 18:13:07 +00:00
tanner a680b4b446 feat: Check for service worker updates on feed load
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2025-12-27 18:01:45 +00:00
tanner 2757f701d0 feat: Implement in-app service worker update notification
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2025-12-27 17:52:45 +00:00
tanner a1ebcc6d80 Change checkbox label to "Small websites" 2025-12-16 23:41:11 +00:00
tanner 82478c469d Add "similar" link for searching host name 2025-12-13 22:37:47 +00:00
tanner 77b429a742 Don't move backward dot tooltip 2025-12-08 23:54:41 +00:00
tanner 0c1c56b54a Fix: Prevent false positive single dollar math detection in text nodes
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2025-12-08 23:52:36 +00:00
tanner 73a139ef9a fix: Fix browser navigation tooltip alignment
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2025-12-08 23:42:39 +00:00
tanner 5796bc56b5 fix: Adjust default tooltip horizontal position 2025-12-08 23:42:36 +00:00
tanner 7c1910c919 fix: Improve nav dot tooltip visibility and positioning
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2025-12-08 23:37:10 +00:00
tanner 60a4df2efc feat: Add tooltips to browser navigation dots
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2025-12-08 23:33:52 +00:00
tanner a712ca12da Bring single dollar sign math back, check for whitespace 2025-12-07 22:59:09 +00:00
tanner 8700bda104 Adjust checkbox styles 2025-12-07 22:53:12 +00:00
tanner 3160e02d41 Fix: Split border shorthand for dark mode color override
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2025-12-07 22:53:12 +00:00
tanner cfa61c2066 fix: Improve dark mode checkbox checkmark visibility
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2025-12-07 22:53:12 +00:00
tanner 27faea1823 style: Refine checked checkbox border color in dark theme 2025-12-07 22:53:12 +00:00
tanner df76e34c71 fix: Prevent price false positives in single dollar math detection
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
2025-12-07 22:53:12 +00:00
11 changed files with 630 additions and 138 deletions
+21 -13
View File
@@ -76,8 +76,12 @@ cors = CORS(flask_app)
def api(): def api():
skip = request.args.get('skip', 0) skip = request.args.get('skip', 0)
limit = request.args.get('limit', settings.FEED_LENGTH) limit = request.args.get('limit', settings.FEED_LENGTH)
is_smallweb_filter = request.args.get('smallweb') == 'true' and smallweb_set
sources_filter = request.args.getlist('source')
if request.args.get('smallweb') == 'true' and smallweb_set: if not is_smallweb_filter and not sources_filter:
stories = database.get_stories(limit, skip)
else:
limit = int(limit) limit = int(limit)
skip = int(skip) skip = int(skip)
filtered_stories = [] filtered_stories = []
@@ -90,24 +94,28 @@ def api():
for story_str in stories_batch: for story_str in stories_batch:
story = json.loads(story_str) story = json.loads(story_str)
story_url = story.get('url') or story.get('link') or ''
if not story_url: if is_smallweb_filter:
continue story_url = story.get('url') or story.get('link') or ''
hostname = urlparse(story_url).hostname if not story_url:
if hostname: continue
hostname = hostname.replace('www.', '') hostname = urlparse(story_url).hostname
if hostname in smallweb_set: if not hostname or hostname.replace('www.', '') not in smallweb_set:
filtered_stories.append(story_str) continue
if len(filtered_stories) == limit:
break if sources_filter:
if story.get('source') not in sources_filter:
continue
filtered_stories.append(story_str)
if len(filtered_stories) == limit:
break
if len(filtered_stories) == limit: if len(filtered_stories) == limit:
break break
current_skip += limit current_skip += limit
stories = filtered_stories stories = filtered_stories
else:
stories = database.get_stories(limit, skip)
# hacky nested json # hacky nested json
res = Response('{"stories":[' + ','.join(stories) + ']}') res = Response('{"stories":[' + ','.join(stories) + ']}')
+100 -82
View File
@@ -30,7 +30,11 @@
--> -->
<title>{{ title }}</title> <title>{{ title }}</title>
<script>document.documentElement.className = 'js-enabled';</script>
<style> <style>
.js-enabled .static-content {
display: none;
}
html { html {
overflow-y: scroll; overflow-y: scroll;
} }
@@ -41,98 +45,112 @@
</head> </head>
<body> <body>
<script>
(function() {
try {
var theme = localStorage.getItem('theme');
if (theme === 'dark') {
document.body.style.backgroundColor = '#1a1a1a';
} else if (theme === 'black' || theme === 'red') {
document.body.style.backgroundColor = '#000';
}
} catch (e) {}
})();
</script>
<div id="root"> <div id="root">
<div class="container menu"> <div class="static-content">
<p> <div class="container menu">
<a href="/">QotNews</a> <p>
<br /> <a href="/">QotNews</a>
<span class="slogan">Hacker News, Reddit, Lobsters, and Tildes articles rendered in reader mode.</span> <br />
</p> <span class="slogan">Hacker News, Reddit, Lobsters, and Tildes articles rendered in reader mode.</span>
</div> </p>
{% if story %}
<div class="{% if show_comments %}container{% else %}article-container{% endif %}">
<div class="article">
<h1>{{ story.title }}</h1>
{% if show_comments %}
<div class="info">
<a href="/{{ story.id }}">View article</a>
</div>
{% else %}
<div class="info">
Source: <a class="source" href="{{ story.url or story.link }}">{{ url }}</a>
</div>
{% endif %}
<div class="info">
{{ story.score }} points
by <a href="{{ story.author_link }}">{{ story.author }}</a>
{{ story.date | fromnow }}
on <a href="{{ story.link }}">{{ story.source }}</a> |
<a href="/{{ story.id }}/c">
{{ story.num_comments }} comment{{ 's' if story.num_comments != 1 }}
</a>
</div>
{% if not show_comments and story.text %}
<div class="story-text">{{ story.text | safe }}</div>
{% elif show_comments %}
{% macro render_comment(comment, level) %}
<dt></dt>
<dd class="comment{% if level > 0 %} lined{% endif %}">
<div class="info">
<p>
{% if comment.author == story.author %}[OP] {% endif %}{{ comment.author or '[Deleted]' }} | <a href="#{{ comment.author }}{{ comment.date }}" id="{{ comment.author }}{{ comment.date }}">{{ comment.date | fromnow }}</a>
</p>
</div>
<div class="text">{{ (comment.text | safe) if comment.text else '<p>[Empty / deleted comment]</p>' }}</div>
{% if comment.comments %}
<dl>
{% for reply in comment.comments %}
{{ render_comment(reply, level + 1) }}
{% endfor %}
</dl>
{% endif %}
</dd>
{% endmacro %}
<dl class="comments">
{% for comment in story.comments %}{{ render_comment(comment, 0) }}{% endfor %}
</dl>
{% endif %}
</div>
<div class='dot toggleDot'>
<div class='button'>
<a href="/{{ story.id }}{{ '/c' if not show_comments else '' }}">
{{ '' if not show_comments else '' }}
</a>
</div>
</div>
</div> </div>
{% elif stories %} {% if story %}
<div class="container"> <div class="{% if show_comments %}container{% else %}article-container{% endif %}">
{% for story in stories %} <div class="article">
<div class='item'> <h1>{{ story.title }}</h1>
<div class='title'>
<a class='link' href='/{{ story.id }}'> {% if show_comments %}
<img class='source-logo' src='/logos/{{ story.source }}.png' alt='{{ story.source }}:' /> {{ story.title }} <div class="info">
</a> <a href="/{{ story.id }}">View article</a>
<span class='source'> </div>
(<a class='source' href='{{ story.url or story.link }}'>{{ story.hostname }}</a>) {% else %}
</span> <div class="info">
</div> Source: <a class="source" href="{{ story.url or story.link }}">{{ url }}</a>
<div class='info'> </div>
{% endif %}
<div class="info">
{{ story.score }} points {{ story.score }} points
by <a href="{{ story.author_link }}">{{ story.author }}</a> by <a href="{{ story.author_link }}">{{ story.author }}</a>
{{ story.date | fromnow }} {{ story.date | fromnow }}
on <a href="{{ story.link }}">{{ story.source }}</a> | on <a href="{{ story.link }}">{{ story.source }}</a> |
<a class="{{ 'hot' if story.num_comments > 99 else '' }}" href="/{{ story.id }}/c"> <a href="/{{ story.id }}/c">
{{ story.num_comments }} comment{{ 's' if story.num_comments != 1 }} {{ story.num_comments }} comment{{ 's' if story.num_comments != 1 }}
</a> </a>
</div> </div>
{% if not show_comments and story.text %}
<div class="story-text">{{ story.text | safe }}</div>
{% elif show_comments %}
{% macro render_comment(comment, level) %}
<dt></dt>
<dd class="comment{% if level > 0 %} lined{% endif %}">
<div class="info">
<p>
{% if comment.author == story.author %}[OP] {% endif %}{{ comment.author or '[Deleted]' }} | <a href="#{{ comment.author }}{{ comment.date }}" id="{{ comment.author }}{{ comment.date }}">{{ comment.date | fromnow }}</a>
</p>
</div>
<div class="text">{{ (comment.text | safe) if comment.text else '<p>[Empty / deleted comment]</p>' }}</div>
{% if comment.comments %}
<dl>
{% for reply in comment.comments %}
{{ render_comment(reply, level + 1) }}
{% endfor %}
</dl>
{% endif %}
</dd>
{% endmacro %}
<dl class="comments">
{% for comment in story.comments %}{{ render_comment(comment, 0) }}{% endfor %}
</dl>
{% endif %}
</div> </div>
{% endfor %} <div class='dot toggleDot'>
</div> <div class='button'>
{% endif %} <a href="/{{ story.id }}{{ '/c' if not show_comments else '' }}">
{{ '' if not show_comments else '' }}
</a>
</div>
</div>
</div>
{% elif stories %}
<div class="container">
{% for story in stories %}
<div class='item'>
<div class='title'>
<a class='link' href='/{{ story.id }}'>
<img class='source-logo' src='/logos/{{ story.source }}.png' alt='{{ story.source }}:' /> {{ story.title }}
</a>
<span class='source'>
(<a class='source' href='{{ story.url or story.link }}'>{{ story.hostname }}</a>)
</span>
</div>
<div class='info'>
{{ story.score }} points
by <a href="{{ story.author_link }}">{{ story.author }}</a>
{{ story.date | fromnow }}
on <a href="{{ story.link }}">{{ story.source }}</a> |
<a class="{{ 'hot' if story.num_comments > 99 else '' }}" href="/{{ story.id }}/c">
{{ story.num_comments }} comment{{ 's' if story.num_comments != 1 }}
</a>
</div>
</div>
{% endfor %}
</div>
{% endif %}
</div>
</div> </div>
<!-- <!--
This HTML file is a template. This HTML file is a template.
+194 -9
View File
@@ -19,6 +19,22 @@ function App() {
const [theme, setTheme] = useState(localStorage.getItem('theme') || ''); const [theme, setTheme] = useState(localStorage.getItem('theme') || '');
const cache = useRef({}); const cache = useRef({});
const [isFullScreen, setIsFullScreen] = useState(!!document.fullscreenElement); const [isFullScreen, setIsFullScreen] = useState(!!document.fullscreenElement);
const [waitingWorker, setWaitingWorker] = useState(null);
const [settingsOpen, setSettingsOpen] = useState(false);
const defaultBodyFontSize = 1.0;
const [bodyFontSize, setBodyFontSize] = useState(Number(localStorage.getItem('bodyFontSize')) || defaultBodyFontSize);
const [bodyFont, setBodyFont] = useState(localStorage.getItem('bodyFont') || 'Sans Serif');
const [articleFont, setArticleFont] = useState(localStorage.getItem('articleFont') || 'Apparatus SIL');
const [filterSmallweb, setFilterSmallweb] = useState(() => localStorage.getItem('filterSmallweb') === 'true');
const [feedSources, setFeedSources] = useState(() => {
const saved = localStorage.getItem('feedSources');
return saved ? JSON.parse(saved) : {
hackernews: true,
reddit: true,
lobsters: true,
tildes: true,
};
});
const updateCache = useCallback((key, value) => { const updateCache = useCallback((key, value) => {
cache.current[key] = value; cache.current[key] = value;
@@ -44,6 +60,51 @@ function App() {
localStorage.setItem('theme', 'red'); localStorage.setItem('theme', 'red');
}; };
const handleFilterChange = e => {
const isChecked = e.target.checked;
setFilterSmallweb(isChecked);
localStorage.setItem('filterSmallweb', isChecked);
};
const handleFeedSourceChange = (source) => {
setFeedSources(prevSources => {
const newSources = { ...prevSources, [source]: !prevSources[source] };
localStorage.setItem('feedSources', JSON.stringify(newSources));
return newSources;
});
};
const changeBodyFont = (font) => {
setBodyFont(font);
localStorage.setItem('bodyFont', font);
};
const changeArticleFont = (font) => {
setArticleFont(font);
localStorage.setItem('articleFont', font);
};
const changeBodyFontSize = (amount) => {
const newSize = bodyFontSize + amount;
setBodyFontSize(parseFloat(newSize.toFixed(2)));
localStorage.setItem('bodyFontSize', newSize.toFixed(2));
};
const resetBodyFontSize = () => {
setBodyFontSize(defaultBodyFontSize);
localStorage.removeItem('bodyFontSize');
};
const bodyFontSettingsChanged = bodyFontSize !== defaultBodyFontSize;
useEffect(() => {
const onSWUpdate = e => {
setWaitingWorker(e.detail.waiting);
};
window.addEventListener('swUpdate', onSWUpdate);
return () => window.removeEventListener('swUpdate', onSWUpdate);
}, []);
useEffect(() => { useEffect(() => {
if (Object.keys(cache.current).length === 0) { if (Object.keys(cache.current).length === 0) {
localForage.iterate((value, key) => { localForage.iterate((value, key) => {
@@ -83,6 +144,32 @@ function App() {
} }
}, [theme]); }, [theme]);
useEffect(() => {
document.documentElement.style.fontSize = `${bodyFontSize}rem`;
}, [bodyFontSize]);
const fontMap = {
'Sans Serif': 'sans-serif',
'Serif': 'serif',
'Apparatus SIL': "'Apparatus SIL', sans-serif"
};
useEffect(() => {
document.body.style.fontFamily = fontMap[bodyFont];
}, [bodyFont]);
useEffect(() => {
const styleId = 'article-font-family-style';
let style = document.getElementById(styleId);
if (!style) {
style = document.createElement('style');
style.id = styleId;
document.head.appendChild(style);
}
style.innerHTML = `.story-text { font-family: ${fontMap[articleFont]} !important; }`;
}, [articleFont]);
const fullScreenAvailable = document.fullscreenEnabled || const fullScreenAvailable = document.fullscreenEnabled ||
document.mozFullscreenEnabled || document.mozFullscreenEnabled ||
document.webkitFullscreenEnabled || document.webkitFullscreenEnabled ||
@@ -90,27 +177,125 @@ function App() {
return ( return (
<div className={theme}> <div className={theme}>
{settingsOpen &&
<>
<div className="modal-overlay" onClick={() => setSettingsOpen(false)}></div>
<div className="modal-content" onClick={e => e.stopPropagation()}>
<button className="close-modal-button" onClick={() => setSettingsOpen(false)}>&times;</button>
<h3>Settings</h3>
<div className="setting-group">
<h4>Theme</h4>
<button className={theme === '' ? 'active' : ''} onClick={() => { light() }}>Light</button>
<button className={theme === 'dark' ? 'active' : ''} onClick={() => { dark() }}>Dark</button>
<button className={theme === 'black' ? 'active' : ''} onClick={() => { black() }}>Black</button>
<button className={theme === 'red' ? 'active' : ''} onClick={() => { red() }}>Red</button>
{fullScreenAvailable &&
<div style={{ marginTop: '0.5rem' }}>
{!isFullScreen ?
<button onClick={() => goFullScreen()}>Enter Fullscreen</button>
:
<button onClick={() => exitFullScreen()}>Exit Fullscreen</button>
}
</div>
}
</div>
<div className="setting-group">
<h4>Feed</h4>
<div className="font-option gap">
<input className="checkbox" type="checkbox" id="filter-smallweb" checked={filterSmallweb} onChange={handleFilterChange} />
<label htmlFor="filter-smallweb">Small websites only</label>
</div>
<div className="font-option">
<input className="checkbox" type="checkbox" id="filter-hackernews" name="feed-source" checked={feedSources.hackernews} onChange={() => handleFeedSourceChange('hackernews')} />
<label htmlFor="filter-hackernews">Hacker News</label>
</div>
<div className="font-option">
<input className="checkbox" type="checkbox" id="filter-reddit" name="feed-source" checked={feedSources.reddit} onChange={() => handleFeedSourceChange('reddit')} />
<label htmlFor="filter-reddit">Reddit</label>
</div>
<div className="font-option">
<input className="checkbox" type="checkbox" id="filter-lobsters" name="feed-source" checked={feedSources.lobsters} onChange={() => handleFeedSourceChange('lobsters')} />
<label htmlFor="filter-lobsters">Lobsters</label>
</div>
<div className="font-option">
<input className="checkbox" type="checkbox" id="filter-tildes" name="feed-source" checked={feedSources.tildes} onChange={() => handleFeedSourceChange('tildes')} />
<label htmlFor="filter-tildes">Tildes</label>
</div>
</div>
<div className="setting-group">
<h4>Font Size</h4>
<button onClick={() => changeBodyFontSize(-0.05)}>-</button>
<span className="font-size-display">{bodyFontSize.toFixed(2)}</span>
<button onClick={() => changeBodyFontSize(0.05)}>+</button>
<button onClick={resetBodyFontSize} disabled={!bodyFontSettingsChanged}>Reset</button>
</div>
<div className="setting-group">
<h4>Body Font</h4>
<div className="font-option">
<input className="checkbox" type="radio" id="body-sans-serif" name="body-font" value="Sans Serif" checked={bodyFont === 'Sans Serif'} onChange={() => changeBodyFont('Sans Serif')} />
<label htmlFor="body-sans-serif">Sans Serif *</label>
</div>
<div className="font-option">
<input className="checkbox" type="radio" id="body-serif" name="body-font" value="Serif" checked={bodyFont === 'Serif'} onChange={() => changeBodyFont('Serif')} />
<label htmlFor="body-serif">Serif</label>
</div>
<div className="font-option">
<input className="checkbox" type="radio" id="body-apparatus" name="body-font" value="Apparatus SIL" checked={bodyFont === 'Apparatus SIL'} onChange={() => changeBodyFont('Apparatus SIL')} />
<label htmlFor="body-apparatus">Apparatus SIL</label>
</div>
</div>
<div className="setting-group">
<h4>Article Font</h4>
<div className="font-option">
<input className="checkbox" type="radio" id="article-sans-serif" name="article-font" value="Sans Serif" checked={articleFont === 'Sans Serif'} onChange={() => changeArticleFont('Sans Serif')} />
<label htmlFor="article-sans-serif">Sans Serif</label>
</div>
<div className="font-option">
<input className="checkbox" type="radio" id="article-serif" name="article-font" value="Serif" checked={articleFont === 'Serif'} onChange={() => changeArticleFont('Serif')} />
<label htmlFor="article-serif">Serif</label>
</div>
<div className="font-option">
<input className="checkbox" type="radio" id="article-apparatus" name="article-font" value="Apparatus SIL" checked={articleFont === 'Apparatus SIL'} onChange={() => changeArticleFont('Apparatus SIL')} />
<label htmlFor="article-apparatus">Apparatus SIL *</label>
</div>
</div>
</div>
</>
}
{waitingWorker &&
<div className='update-banner'>
Client version mismatch, please refresh:{' '}
<button onClick={() => {
waitingWorker.postMessage({ type: 'SKIP_WAITING' });
navigator.serviceWorker.addEventListener('controllerchange', () => {
window.location.reload();
});
}}>
Refresh
</button>
</div>
}
<Router> <Router>
<div className='container menu'> <div className='container menu'>
<p> <p>
<Link to='/'>QotNews</Link> <Link to='/'>QotNews</Link>
<span className='theme'><a href='#' onClick={() => light()}>Light</a> - <a href='#' onClick={() => dark()}>Dark</a> - <a href='#' onClick={() => black()}>Black</a> - <a href='#' onClick={() => red()}>Red</a></span> <button className="settings-button" onClick={() => setSettingsOpen(true)}>Settings</button>
<br /> <br />
<span className='slogan'>Hacker News, Reddit, Lobsters, and Tildes articles rendered in reader mode.</span> <span className='slogan'>Hacker News, Reddit, Lobsters, and Tildes articles rendered in reader mode.</span>
</p> </p>
{fullScreenAvailable &&
<Route path='/(|search)' render={() => !isFullScreen ?
<button className='fullscreen' onClick={() => goFullScreen()}>Enter Fullscreen</button>
:
<button className='fullscreen' onClick={() => exitFullScreen()}>Exit Fullscreen</button>
} />
}
<Route path='/(|search)' component={Search} /> <Route path='/(|search)' component={Search} />
<Route path='/(|search)' component={Submit} /> <Route path='/(|search)' component={Submit} />
</div> </div>
<Route path='/' exact render={(props) => <Feed {...props} updateCache={updateCache} />} /> <Route path='/' exact render={(props) => <Feed {...props} updateCache={updateCache} filterSmallweb={filterSmallweb} feedSources={feedSources} />} />
<Switch> <Switch>
<Route path='/search' component={Results} /> <Route path='/search' component={Results} />
<Route path='/:id' exact render={(props) => <Article {...props} cache={cache.current} />} /> <Route path='/:id' exact render={(props) => <Article {...props} cache={cache.current} />} />
+13 -4
View File
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
import { useParams } from 'react-router-dom'; import { useParams } from 'react-router-dom';
import { Helmet } from 'react-helmet'; import { Helmet } from 'react-helmet';
import localForage from 'localforage'; import localForage from 'localforage';
import { sourceLink, infoLine, ToggleDot } from './utils.js'; import { sourceLink, similarLink, infoLine, ToggleDot } from './utils.js';
import Latex from 'react-latex-next'; import Latex from 'react-latex-next';
import 'katex/dist/katex.min.css'; import 'katex/dist/katex.min.css';
@@ -12,6 +12,7 @@ const DANGEROUS_TAGS = ['svg', 'math'];
const latexDelimiters = [ const latexDelimiters = [
{ left: '$$', right: '$$', display: true }, { left: '$$', right: '$$', display: true },
{ left: '\\[', right: '\\]', display: true }, { left: '\\[', right: '\\]', display: true },
{ left: '$', right: '$', display: false },
{ left: '\\(', right: '\\)', display: false } { left: '\\(', right: '\\)', display: false }
]; ];
@@ -105,7 +106,7 @@ function Article({ cache }) {
if (v.nodeName === '#text') { if (v.nodeName === '#text') {
const text = v.data; const text = v.data;
if (text.includes('\\[') || text.includes('\\(') || text.includes('$$')) { if (text.includes('\\[') || text.includes('\\(') || text.includes('$$') || /\$(?:[^$]*[^\s$])\$/.test(text)) {
return <Latex key={key} delimiters={latexDelimiters}>{text}</Latex>; return <Latex key={key} delimiters={latexDelimiters}>{text}</Latex>;
} }
@@ -137,7 +138,8 @@ function Article({ cache }) {
const textContent = v.textContent.trim(); const textContent = v.textContent.trim();
const isMath = (textContent.startsWith('\\(') && textContent.endsWith('\\)')) || const isMath = (textContent.startsWith('\\(') && textContent.endsWith('\\)')) ||
(textContent.startsWith('\\[') && textContent.endsWith('\\]')) || (textContent.startsWith('\\[') && textContent.endsWith('\\]')) ||
(textContent.startsWith('$$') && textContent.endsWith('$$')); (textContent.startsWith('$$') && textContent.endsWith('$$')) ||
(textContent.startsWith('$') && textContent.endsWith('$') && textContent.indexOf('$') !== textContent.lastIndexOf('$') && !/\s/.test(textContent.charAt(textContent.length - 2)));
const props = { key: key }; const props = { key: key };
if (v.hasAttributes()) { if (v.hasAttributes()) {
@@ -157,6 +159,13 @@ function Article({ cache }) {
const firstParen = mathContent.indexOf('\\('); const firstParen = mathContent.indexOf('\\(');
const lastParen = mathContent.lastIndexOf('\\)'); const lastParen = mathContent.lastIndexOf('\\)');
mathContent = mathContent.substring(0, firstParen) + '\\[' + mathContent.substring(firstParen + 2, lastParen) + '\\]' + mathContent.substring(lastParen + 2); mathContent = mathContent.substring(0, firstParen) + '\\[' + mathContent.substring(firstParen + 2, lastParen) + '\\]' + mathContent.substring(lastParen + 2);
} else if (trimmed.startsWith('$') && !trimmed.startsWith('$$')) {
// Replace $ with $$
const firstDollar = mathContent.indexOf('$');
const lastDollar = mathContent.lastIndexOf('$');
if (firstDollar !== lastDollar) {
mathContent = mathContent.substring(0, firstDollar) + '$$' + mathContent.substring(firstDollar + 1, lastDollar) + '$$' + mathContent.substring(lastDollar + 1);
}
} }
} }
return <Tag {...props}><Latex delimiters={latexDelimiters}>{mathContent}</Latex></Tag>; return <Tag {...props}><Latex delimiters={latexDelimiters}>{mathContent}</Latex></Tag>;
@@ -204,7 +213,7 @@ function Article({ cache }) {
<h1>{story.title} <button className='copy-button' onClick={copyLink}>{copyButtonText}</button></h1> <h1>{story.title} <button className='copy-button' onClick={copyLink}>{copyButtonText}</button></h1>
<div className='info'> <div className='info'>
Source: {sourceLink(story)} Source: {sourceLink(story)} | {similarLink(story)}
</div> </div>
{infoLine(story)} {infoLine(story)}
+35 -17
View File
@@ -1,26 +1,49 @@
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { Helmet } from 'react-helmet'; import { Helmet } from 'react-helmet';
import localForage from 'localforage'; import localForage from 'localforage';
import { sourceLink, infoLine, logos } from './utils.js'; import { sourceLink, infoLine, logos } from './utils.js';
function Feed({ updateCache }) { function Feed({ updateCache, filterSmallweb, feedSources }) {
const [stories, setStories] = useState(() => JSON.parse(localStorage.getItem('stories')) || false); const [stories, setStories] = useState(() => JSON.parse(localStorage.getItem('stories')) || false);
const [error, setError] = useState(''); const [error, setError] = useState('');
const [loadingStatus, setLoadingStatus] = useState(null); const [loadingStatus, setLoadingStatus] = useState(null);
const [filterSmallweb, setFilterSmallweb] = useState(() => localStorage.getItem('filterSmallweb') === 'true'); const isInitialMount = useRef(true);
const handleFilterChange = e => { useEffect(() => {
const isChecked = e.target.checked; if (isInitialMount.current) {
setStories(false); isInitialMount.current = false;
setFilterSmallweb(isChecked); } else {
localStorage.setItem('filterSmallweb', isChecked); setStories(false);
}; }
}, [filterSmallweb, feedSources]);
useEffect(() => { useEffect(() => {
const controller = new AbortController(); const controller = new AbortController();
fetch(filterSmallweb ? '/api?smallweb=true' : '/api', { signal: controller.signal }) if ('serviceWorker' in navigator) {
navigator.serviceWorker.getRegistration().then(reg => {
if (reg) {
console.log('Checking for client update...');
reg.update();
}
});
}
const params = new URLSearchParams();
if (filterSmallweb) {
params.append('smallweb', 'true');
}
const allSources = Object.keys(feedSources);
const enabledSources = allSources.filter(key => feedSources[key]);
if (enabledSources.length > 0 && enabledSources.length < allSources.length) {
enabledSources.forEach(source => params.append('source', source));
}
const apiUrl = `/api?${params.toString()}`;
fetch(apiUrl, { signal: controller.signal })
.then(res => { .then(res => {
if (!res.ok) { if (!res.ok) {
throw new Error(`Server responded with ${res.status} ${res.statusText}`); throw new Error(`Server responded with ${res.status} ${res.statusText}`);
@@ -31,7 +54,7 @@ function Feed({ updateCache }) {
async (result) => { async (result) => {
const newApiStories = result.stories; const newApiStories = result.stories;
const updated = !stories || !stories.length || stories[0].id !== newApiStories[0].id; const updated = !stories || stories.map(s => s.id).join() !== newApiStories.map(s => s.id).join();
console.log('New stories available:', updated); console.log('New stories available:', updated);
if (!updated) return; if (!updated) return;
@@ -107,7 +130,7 @@ function Feed({ updateCache }) {
); );
return () => controller.abort(); return () => controller.abort();
}, [updateCache, filterSmallweb]); }, [updateCache, filterSmallweb, feedSources]);
return ( return (
<div className='container'> <div className='container'>
@@ -116,11 +139,6 @@ function Feed({ updateCache }) {
<meta name="robots" content="index" /> <meta name="robots" content="index" />
</Helmet> </Helmet>
<div style={{marginBottom: '1rem'}}>
<input type="checkbox" id="filter-smallweb" className="checkbox" checked={filterSmallweb} onChange={handleFilterChange} />
<label htmlFor="filter-smallweb">Only Smallweb</label>
</div>
{error && {error &&
<details style={{marginBottom: '1rem'}}> <details style={{marginBottom: '1rem'}}>
<summary>Connection error? Click to expand.</summary> <summary>Connection error? Click to expand.</summary>
+28 -2
View File
@@ -13,7 +13,7 @@
.black .menu button, .black .menu button,
.black .story-text button { .black .story-text button {
background-color: #444444; background-color: #222222;
border-color: #bbb; border-color: #bbb;
color: #ddd; color: #ddd;
} }
@@ -69,9 +69,35 @@
} }
.black .checkbox:checked + label::after { .black .checkbox:checked + label::after {
border-color: #ddd; border-color: #eee;
} }
.black .copy-button { .black .copy-button {
color: #828282; color: #828282;
} }
.black .update-banner {
background-color: #333;
color: #ddd;
}
.black .update-banner button {
background-color: #222222;
border-color: #bbb;
color: #ddd;
}
.black .modal-content {
background: #222;
border-color: #828282;
color: #ddd;
}
.black .modal-content button {
background-color: #222222;
border-color: #bbb;
}
.black .modal-content button.active {
background-color: #555;
}
+28 -2
View File
@@ -13,7 +13,7 @@
.dark .menu button, .dark .menu button,
.dark .story-text button { .dark .story-text button {
background-color: #444444; background-color: #222222;
border-color: #bbb; border-color: #bbb;
color: #ddd; color: #ddd;
} }
@@ -65,9 +65,35 @@
} }
.dark .checkbox:checked + label::after { .dark .checkbox:checked + label::after {
border-color: #ddd; border-color: #eee;
} }
.dark .copy-button { .dark .copy-button {
color: #828282; color: #828282;
} }
.dark .update-banner {
background-color: #333;
color: #ddd;
}
.dark .update-banner button {
background-color: #222222;
border-color: #bbb;
color: #ddd;
}
.dark .modal-content {
background: #222;
border-color: #828282;
color: #ddd;
}
.dark .modal-content button {
background-color: #222222;
border-color: #bbb;
}
.dark .modal-content button.active {
background-color: #555;
}
+146 -3
View File
@@ -1,6 +1,7 @@
body { body {
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
font: 1rem/1.3 sans-serif; font-size: 1rem;
line-height: 1.3;
color: #000000; color: #000000;
word-break: break-word; word-break: break-word;
font-kerning: normal; font-kerning: normal;
@@ -43,6 +44,21 @@ input {
border-radius: 4px; border-radius: 4px;
} }
.update-banner {
background-color: #ddd;
padding: 0.75rem;
text-align: center;
}
.update-banner button {
margin-left: 1rem;
padding: 0.25rem 0.75rem;
border: 1px solid #828282;
border-radius: 4px;
background-color: transparent;
cursor: pointer;
}
.fullscreen { .fullscreen {
margin: 0.25rem; margin: 0.25rem;
padding: 0.25rem; padding: 0.25rem;
@@ -70,6 +86,7 @@ pre {
.slogan { .slogan {
color: #828282; color: #828282;
margin-bottom: 0.5rem;
} }
.theme { .theme {
@@ -183,7 +200,8 @@ span.source {
} }
.story-text { .story-text {
font: 1.2rem/1.5 'Apparatus SIL', sans-serif; font-size: 1.2rem;
line-height: 1.5;
margin-top: 1em; margin-top: 1em;
} }
@@ -355,7 +373,132 @@ button.comment {
top: 0.2em; top: 0.2em;
width: 0.3rem; width: 0.3rem;
height: 0.6rem; height: 0.6rem;
border: solid #000; border-style: solid;
border-color: #000;
border-width: 0 2px 2px 0; border-width: 0 2px 2px 0;
transform: rotate(45deg); transform: rotate(45deg);
} }
.tooltip .tooltiptext {
visibility: hidden;
width: 140px;
background-color: #555;
color: #fff;
text-align: center;
border-radius: 6px;
padding: 5px 0;
position: absolute;
z-index: 1;
bottom: 110%;
left: 50%;
margin-left: -70px;
opacity: 0;
transition: opacity 0.2s;
font-size: 0.9rem;
line-height: 1.3;
}
.forwardDot .tooltiptext {
left: auto;
right: 0;
margin-left: 0;
}
.tooltip.show-tooltip .tooltiptext {
visibility: visible;
opacity: 1;
}
.settings-button {
float: right;
background: none;
border: none;
padding: 0;
cursor: pointer;
color: inherit;
font: inherit;
}
.modal-overlay {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0,0,0,0.5);
z-index: 100;
}
.modal-content {
position: absolute;
top: 1rem;
right: 1rem;
background: #eee;
color: #000;
padding: 1rem;
border-radius: 4px;
z-index: 101;
min-width: 250px;
border: 1px solid #828282;
}
.modal-content h3, .modal-content h4 {
margin-top: 0;
margin-bottom: 0.5rem;
}
.modal-content .setting-group {
margin-bottom: 1rem;
}
.modal-content button {
margin-right: 0.5rem;
padding: 0.25rem 0.75rem;
border: 1px solid #828282;
border-radius: 4px;
background-color: transparent;
cursor: pointer;
font: inherit;
color: inherit;
}
.modal-content button:last-child {
margin-right: 0;
}
.modal-content button.active {
background-color: #ccc;
}
.modal-content button:disabled {
opacity: 0.5;
cursor: not-allowed;
}
.modal-content .font-size-display {
display: inline-block;
width: 50px;
text-align: center;
margin: 0 0.25rem;
}
.modal-content .font-option {
margin-bottom: 0.25rem;
}
.modal-content .gap {
margin-bottom: 0.75rem;
}
.close-modal-button {
position: absolute;
top: 0.5rem;
right: 0.75rem;
background: transparent;
border: none;
font-size: 1.5rem;
line-height: 1;
padding: 0;
cursor: pointer;
color: inherit;
}
+28 -2
View File
@@ -22,7 +22,7 @@
.red .menu button, .red .menu button,
.red .story-text button { .red .story-text button {
background-color: #440000; background-color: #220000;
border-color: #b00; border-color: #b00;
color: #b00; color: #b00;
} }
@@ -87,9 +87,35 @@
} }
.red .checkbox:checked + label::after { .red .checkbox:checked + label::after {
border-color: #aa0000; border-color: #dd0000;
} }
.red .copy-button { .red .copy-button {
color: #690000; color: #690000;
} }
.red .update-banner {
background-color: #300;
color: #d00;
}
.red .update-banner button {
background-color: #220000;
border-color: #b00;
color: #d00;
}
.red .modal-content {
background: #100;
border-color: #690000;
color: #b00;
}
.red .modal-content button {
background-color: #220000;
border-color: #b00;
}
.red .modal-content button.active {
background-color: #550000;
}
+7 -1
View File
@@ -3,9 +3,15 @@ import ReactDOM from 'react-dom';
import App from './App'; import App from './App';
import * as serviceWorker from './serviceWorker'; import * as serviceWorker from './serviceWorker';
// version 4
ReactDOM.render(<App />, document.getElementById('root')); ReactDOM.render(<App />, document.getElementById('root'));
// If you want your app to work offline and load faster, you can change // If you want your app to work offline and load faster, you can change
// // unregister() to register() below. Note this comes with some pitfalls. // // unregister() to register() below. Note this comes with some pitfalls.
// // Learn more about service workers: https://bit.ly/CRA-PWA // // Learn more about service workers: https://bit.ly/CRA-PWA
serviceWorker.unregister(); serviceWorker.register({
onUpdate: registration => {
window.dispatchEvent(new CustomEvent('swUpdate', { detail: registration }));
}
});
+30 -3
View File
@@ -1,4 +1,4 @@
import React from 'react'; import React, { useState } from 'react';
import moment from 'moment'; import moment from 'moment';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
@@ -9,6 +9,13 @@ export const sourceLink = (story) => {
return (<a className='source' href={url}>{host}</a>); return (<a className='source' href={url}>{host}</a>);
}; };
export const similarLink = (story) => {
const url = story.url || story.link;
const urlObj = new URL(url);
const host = urlObj.hostname.replace(/^www\./, '');
return (<Link to={'/search?q="'+host+'"'} className='similar'>similar</Link>);
};
export const infoLine = (story) => export const infoLine = (story) =>
<div className='info'> <div className='info'>
{story.score} points {story.score} points
@@ -32,6 +39,8 @@ export const ToggleDot = ({ id, article }) => (
); );
export const BackwardDot = () => { export const BackwardDot = () => {
const [showTooltip, setShowTooltip] = useState(false);
const goBackward = () => { const goBackward = () => {
localStorage.setItem('scrollLock', 'True'); localStorage.setItem('scrollLock', 'True');
window.history.back(); window.history.back();
@@ -42,15 +51,25 @@ export const BackwardDot = () => {
if (!document.fullscreenElement) return null; if (!document.fullscreenElement) return null;
return ( return (
<div className='dot backwardDot' onClick={goBackward}> <div
className={'dot backwardDot tooltip' + (showTooltip ? ' show-tooltip' : '')}
onClick={goBackward}
onMouseEnter={() => setShowTooltip(true)}
onMouseLeave={() => setShowTooltip(false)}
onTouchStart={() => setShowTooltip(true)}
onTouchEnd={() => setShowTooltip(false)}
>
<div className='button'> <div className='button'>
</div> </div>
<span className="tooltiptext">Browser Back</span>
</div> </div>
); );
}; };
export const ForwardDot = () => { export const ForwardDot = () => {
const [showTooltip, setShowTooltip] = useState(false);
const goForward = () => { const goForward = () => {
localStorage.setItem('scrollLock', 'True'); localStorage.setItem('scrollLock', 'True');
window.history.forward(); window.history.forward();
@@ -60,10 +79,18 @@ export const ForwardDot = () => {
if (!isMobile) return null; if (!isMobile) return null;
return ( return (
<div className='dot forwardDot' onClick={goForward}> <div
className={'dot forwardDot tooltip' + (showTooltip ? ' show-tooltip' : '')}
onClick={goForward}
onMouseEnter={() => setShowTooltip(true)}
onMouseLeave={() => setShowTooltip(false)}
onTouchStart={() => setShowTooltip(true)}
onTouchEnd={() => setShowTooltip(false)}
>
<div className='button'> <div className='button'>
</div> </div>
<span className="tooltiptext">Browser Forward</span>
</div> </div>
); );
}; };