Compare commits
258 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e8911dc1d1 | |||
| 41c4d7619d | |||
| e36fe3a403 | |||
| fbec869257 | |||
| e9e3cb30a4 | |||
| a5e762c36b | |||
| bbcb01f8d1 | |||
| df0e66ad08 | |||
| 1fefc149e2 | |||
| 449cb13dbd | |||
| f206485124 | |||
| b185ecfe81 | |||
| 274b4065e2 | |||
| 85b6fbabf3 | |||
| 32cbf47d95 | |||
| 7c600dcfba | |||
| 92e70229fe | |||
| b749e58f62 | |||
| b1b2be6080 | |||
| 5ebe87dbc2 | |||
| a8a36b693e | |||
| 60eefb4b27 | |||
| 8f5dae4bdc | |||
| 89a511efc0 | |||
| 504fe745ea | |||
| 762e8a9a2e | |||
| 6dc47f6672 | |||
| da108f25d4 | |||
| a2303841ec | |||
| 0e7aedbc5e | |||
| ec7d395407 | |||
| fd5acd4861 | |||
| b1d4fc2903 | |||
| 0f87d47536 | |||
| 8472907730 | |||
| 482753e96a | |||
| 169a84faa1 | |||
| 6fa929fb1f | |||
| 5f02a95cf3 | |||
| 1789f88d4d | |||
| f5eab47496 | |||
| 985e596790 | |||
| 30298928f3 | |||
| 8d7d692d9c | |||
| bd85127613 | |||
| 4c9d5eede1 | |||
| bf3e6bbc28 | |||
| 856c360d98 | |||
| 1ce55e6d1f | |||
| 6a329e3ba9 | |||
| 3acaf230c4 | |||
| 7b84573dd8 | |||
| 7523426f15 | |||
| b2ec85cfa5 | |||
| 8c201d5c2e | |||
| a21c84efc6 | |||
| 15aa413584 | |||
| e9ee231954 | |||
| 62d5915133 | |||
| 61ec583882 | |||
| 1443fdcc32 | |||
| f2310b6925 | |||
| aa80570da4 | |||
| 7d0e60f5f0 | |||
| 21b5d67052 | |||
| 53468c8ccd | |||
| 6cfb4b317f | |||
| f08202d592 | |||
| 5a7f55184d | |||
| e84062394b | |||
| e867d5d868 | |||
| 845d87ec55 | |||
| e18aaad741 | |||
| 02e86efb4f | |||
| b85d879ae7 | |||
| 55bf75742e | |||
| 83cb6fc0ae | |||
| 667c2c5eaf | |||
| 1df1c59d61 | |||
| c4f2e7d595 | |||
| f61cfc09b0 | |||
| 366e76e25d | |||
| 6f1811c564 | |||
| 443115ac0f | |||
| 034c440e46 | |||
| 26a6353ca5 | |||
| 7ac4dfa01c | |||
| 633429c976 | |||
| 5cdbf6ef54 | |||
| f1a30d0af2 | |||
| 9ec61ea5bc | |||
| bdc7a6c10d | |||
| 4858516b01 | |||
| f10e6063fc | |||
| 249a616531 | |||
| ab92bd5441 | |||
| 6b16a768a7 | |||
| 57de076fec | |||
| 074b898508 | |||
| f049d194ab | |||
| c2b9a1cb7a | |||
| 4435f49e17 | |||
| 494d89ac30 | |||
| e79fca6ecc | |||
| c65fb69092 | |||
| 632d028e4c | |||
| ea8e9e5a23 | |||
| 2838ea9b41 | |||
| f15d108971 | |||
| f777348af8 | |||
| 486404a413 | |||
| 7c9c07a4cf | |||
| 08d02f6013 | |||
| 1b54342702 | |||
| 9e9571a3c0 | |||
| dc83a70887 | |||
| 2e2c9ae837 | |||
| 61021d8f91 | |||
| e65047fead | |||
| 8e775c189f | |||
| 3d9274309a | |||
| 7bdbbf10b2 | |||
| 6aa0f78536 | |||
| bf3663bbec | |||
| e6589dc61c | |||
| 307e8349f3 | |||
| 04cd56daa8 | |||
| c80769def6 | |||
| ebd1ad2140 | |||
| 2cc7dd0d6d | |||
| 6e7cb86d2e | |||
| a25457254f | |||
| a693ea5342 | |||
| 7386e1d8b0 | |||
| f8e8597e3a | |||
| 55c282ee69 | |||
| 3f774a9e38 | |||
| dcedd4caa1 | |||
| 7a131ebd03 | |||
| 6f64401785 | |||
| 3ff917e806 | |||
| c9fb9bd5df | |||
| fd9c9c888d | |||
| 42dcf15374 | |||
| d8a0b77765 | |||
| 9a279d44b1 | |||
| e506804666 | |||
| ca78a6d7a9 | |||
| 7acce407e9 | |||
| 5281672000 | |||
| e59acefda9 | |||
| cbc802b7e9 | |||
| 4579dfce00 | |||
| 0d16bec6f6 | |||
| feba8b7aa0 | |||
| ee5105743d | |||
| 72802a6fcf | |||
| 99d3a234f4 | |||
| f95df227f1 | |||
| b82095ca7a | |||
| 992c1c1233 | |||
| 88d2216627 | |||
| 6cf2f01b08 | |||
| 607573dd44 | |||
| c554ecd890 | |||
| 6576eb1bac | |||
| 472af76d1a | |||
| 4727d34eb6 | |||
| 0e086b60b8 | |||
| b46ce36c63 | |||
| 9a449bf3ca | |||
| 0bd9f05250 | |||
| 9c116bde4a | |||
| ebedaef00b | |||
| d7f0643bd7 | |||
| eb1137299d | |||
| 72d4a68929 | |||
| f1c846acd0 | |||
| 850b30e353 | |||
| d614ad0743 | |||
| f46cafdc90 | |||
| 873dc44cb1 | |||
| 1fb9db3f4b | |||
| b923908a45 | |||
| dbdcfaa921 | |||
| 8799b10525 | |||
| 6430fe5e9f | |||
| a4cf719cb8 | |||
| 595f469b4a | |||
| b252c6a207 | |||
| 02b73a8b14 | |||
| 72f1043952 | |||
| 7b31fcf690 | |||
| b3d2eeb67f | |||
| 9078b567f0 | |||
| ced20390eb | |||
| 6cd41f0902 | |||
| 746932ab96 | |||
| 2822974b6e | |||
| 8fd7fc158c | |||
| 17ef7e3a65 | |||
| 3363ccd47e | |||
| 2d80b19414 | |||
| ebcbf1b624 | |||
| e231cd5c31 | |||
| 569e5b16ca | |||
| db5097ac57 | |||
| 2edb3ceba7 | |||
| 38b5f2dbeb | |||
| 6826f731c7 | |||
| bb693ba434 | |||
| 632b0276c4 | |||
| 4cf97304e4 | |||
| 9e55f6e4ec | |||
| edc4c439d7 | |||
| 187c6b8110 | |||
| 6764bf0d6d | |||
| dc588fee91 | |||
| f8998b687e | |||
| e4f81472fc | |||
| f293f2b5f9 | |||
| 810e8c5ead | |||
| 9c4766a928 | |||
| 0f5b2a5ff9 | |||
| 7cb87b59fe | |||
| 45b75b420b | |||
| f0721519e1 | |||
| 25a671f58e | |||
| 5fd4fdb21c | |||
| 19e9a80be1 | |||
| 5caa4542d8 | |||
| 1ed2baded6 | |||
| c7734eb2bc | |||
| 0053147226 | |||
| 0496fbba45 | |||
| 0a1ebaa8b8 | |||
| 2ede5ed6ff | |||
| 20a9d9d452 | |||
| 23cdbc9292 | |||
| 10d4ec863e | |||
| fc8ce79e33 | |||
| 8eca354a47 | |||
| b1275d9a27 | |||
| 9336760ed3 | |||
| cf9e197e6c | |||
| 2b1a352917 | |||
| 1b6c8fc6cb | |||
| a2509958da | |||
| 4450e93c65 | |||
| d341d4422f | |||
| 82074eb8aa | |||
| c1a81a4d8c | |||
| dde6ac4566 | |||
| 62d68da415 | |||
| c04b5c27f2 | |||
| 771c3987ec | |||
| c0607b3fb6 | |||
| a814411c12 |
@@ -1,6 +1,6 @@
|
|||||||
The MIT License (MIT)
|
The MIT License (MIT)
|
||||||
|
|
||||||
Copyright (c) 2019 Tanner (tanner.vc)
|
Copyright (c) 2019 Tanner Collin
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ $ sudo apt install yarn
|
|||||||
Clone this repo:
|
Clone this repo:
|
||||||
|
|
||||||
```text
|
```text
|
||||||
$ git clone https://git.tanner.vc/tanner/qotnews.git
|
$ git clone https://gogs.tannercollin.com/tanner/qotnews.git
|
||||||
$ cd qotnews
|
$ cd qotnews
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ from utils import clean
|
|||||||
# cache the topic groups to prevent redirects
|
# cache the topic groups to prevent redirects
|
||||||
group_lookup = {}
|
group_lookup = {}
|
||||||
|
|
||||||
USER_AGENT = 'qotnews scraper (github:tanner37)'
|
USER_AGENT = 'qotnews scraper (github:tannercollin)'
|
||||||
|
|
||||||
API_TOPSTORIES = lambda : 'https://tildes.net'
|
API_TOPSTORIES = lambda : 'https://tildes.net'
|
||||||
API_ITEM = lambda x : 'https://tildes.net/shortener/{}'.format(x)
|
API_ITEM = lambda x : 'https://tildes.net/shortener/{}'.format(x)
|
||||||
|
|||||||
@@ -1,67 +0,0 @@
|
|||||||
import logging
|
|
||||||
logging.basicConfig(
|
|
||||||
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
|
|
||||||
level=logging.INFO)
|
|
||||||
|
|
||||||
import database
|
|
||||||
from sqlalchemy import select
|
|
||||||
import search
|
|
||||||
import sys
|
|
||||||
|
|
||||||
import time
|
|
||||||
import json
|
|
||||||
import requests
|
|
||||||
from bs4 import BeautifulSoup
|
|
||||||
|
|
||||||
database.init()
|
|
||||||
search.init()
|
|
||||||
|
|
||||||
BATCH_SIZE = 1000
|
|
||||||
|
|
||||||
def put_stories(stories):
|
|
||||||
return search.meili_api(requests.post, 'indexes/qotnews/documents', stories)
|
|
||||||
|
|
||||||
def get_update(update_id):
|
|
||||||
return search.meili_api(requests.get, 'tasks/{}'.format(update_id))
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
num_stories = database.count_stories()
|
|
||||||
|
|
||||||
print('Reindex {} stories?'.format(num_stories))
|
|
||||||
print('Press ENTER to continue, ctrl-c to cancel')
|
|
||||||
input()
|
|
||||||
|
|
||||||
story_list = database.get_story_list()
|
|
||||||
|
|
||||||
count = 1
|
|
||||||
while len(story_list):
|
|
||||||
stories = []
|
|
||||||
|
|
||||||
for _ in range(BATCH_SIZE):
|
|
||||||
try:
|
|
||||||
sid = story_list.pop()
|
|
||||||
except IndexError:
|
|
||||||
break
|
|
||||||
|
|
||||||
story = database.get_story(sid)
|
|
||||||
print('Indexing {}/{} id: {} title: {}'.format(count, num_stories, sid[0], story.title))
|
|
||||||
story_obj = json.loads(story.full_json)
|
|
||||||
story_obj.pop('comments', False)
|
|
||||||
if 'text' in story_obj and story_obj['text']:
|
|
||||||
soup = BeautifulSoup(story_obj['text'], 'html.parser')
|
|
||||||
story_obj['text'] = soup.get_text()
|
|
||||||
stories.append(story_obj)
|
|
||||||
count += 1
|
|
||||||
|
|
||||||
res = put_stories(stories)
|
|
||||||
update_id = res['taskUid']
|
|
||||||
|
|
||||||
print('Waiting for processing', end='')
|
|
||||||
while get_update(update_id)['status'] != 'succeeded':
|
|
||||||
time.sleep(0.5)
|
|
||||||
print('.', end='', flush=True)
|
|
||||||
|
|
||||||
print()
|
|
||||||
|
|
||||||
print('Done.')
|
|
||||||
|
|
||||||
@@ -11,7 +11,6 @@ import sys
|
|||||||
import time
|
import time
|
||||||
import json
|
import json
|
||||||
import requests
|
import requests
|
||||||
from bs4 import BeautifulSoup
|
|
||||||
|
|
||||||
database.init()
|
database.init()
|
||||||
search.init()
|
search.init()
|
||||||
@@ -46,9 +45,6 @@ if __name__ == '__main__':
|
|||||||
story = database.get_story(sid)
|
story = database.get_story(sid)
|
||||||
print('Indexing {}/{} id: {} title: {}'.format(count, num_stories, sid[0], story.title))
|
print('Indexing {}/{} id: {} title: {}'.format(count, num_stories, sid[0], story.title))
|
||||||
story_obj = json.loads(story.meta_json)
|
story_obj = json.loads(story.meta_json)
|
||||||
if 'text' in story_obj and story_obj['text']:
|
|
||||||
soup = BeautifulSoup(story_obj['text'], 'html.parser')
|
|
||||||
story_obj['text'] = soup.get_text()
|
|
||||||
stories.append(story_obj)
|
stories.append(story_obj)
|
||||||
count += 1
|
count += 1
|
||||||
|
|
||||||
|
|||||||
+23
-22
@@ -10,8 +10,7 @@ SEARCH_ENABLED = bool(settings.MEILI_URL)
|
|||||||
|
|
||||||
def meili_api(method, route, json=None, params=None, parse_json=True):
|
def meili_api(method, route, json=None, params=None, parse_json=True):
|
||||||
try:
|
try:
|
||||||
headers = {'Authorization': 'Bearer ' + settings.MEILI_API_KEY}
|
r = method(settings.MEILI_URL + route, json=json, params=params, timeout=4)
|
||||||
r = method(settings.MEILI_URL + route, json=json, params=params, headers=headers, timeout=4)
|
|
||||||
if r.status_code > 299:
|
if r.status_code > 299:
|
||||||
raise Exception('Bad response code ' + str(r.status_code))
|
raise Exception('Bad response code ' + str(r.status_code))
|
||||||
if parse_json:
|
if parse_json:
|
||||||
@@ -25,40 +24,42 @@ def meili_api(method, route, json=None, params=None, parse_json=True):
|
|||||||
logging.error('Problem with MeiliSearch api route: %s: %s', route, str(e))
|
logging.error('Problem with MeiliSearch api route: %s: %s', route, str(e))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def update_settings():
|
def create_index():
|
||||||
json = {
|
json = dict(uid='qotnews', primaryKey='id')
|
||||||
'rankingRules': ['words', 'typo', 'proximity', 'attribute', 'date:desc', 'exactness'],
|
return meili_api(requests.post, 'indexes', json=json)
|
||||||
'searchableAttributes': ['title', 'url', 'author', 'text'],
|
|
||||||
'displayedAttributes': ['id', 'ref', 'source', 'author', 'author_link', 'score', 'date', 'title', 'link', 'url', 'num_comments', 'text'],
|
def update_rankings():
|
||||||
'stopWords': ['a', 'an', 'the', 'and', 'or', 'but', 'if', 'in', 'on', 'at', 'by', 'for', 'with', 'to', 'from', 'of', 'is', 'it', 'that', 'this'],
|
json = ['typo', 'words', 'proximity', 'date:desc', 'exactness']
|
||||||
}
|
return meili_api(requests.post, 'indexes/qotnews/settings/ranking-rules', json=json)
|
||||||
return meili_api(requests.patch, 'indexes/qotnews/settings', json=json)
|
|
||||||
|
def update_attributes():
|
||||||
|
json = ['title', 'url', 'author']
|
||||||
|
r = meili_api(requests.post, 'indexes/qotnews/settings/searchable-attributes', json=json)
|
||||||
|
json = ['id', 'ref', 'source', 'author', 'author_link', 'score', 'date', 'title', 'link', 'url', 'num_comments']
|
||||||
|
r = meili_api(requests.post, 'indexes/qotnews/settings/displayed-attributes', json=json)
|
||||||
|
return r
|
||||||
|
|
||||||
def init():
|
def init():
|
||||||
if not SEARCH_ENABLED:
|
if not SEARCH_ENABLED:
|
||||||
logging.info('Search is not enabled, skipping init.')
|
logging.info('Search is not enabled, skipping init.')
|
||||||
return
|
return
|
||||||
update_settings()
|
print(create_index())
|
||||||
|
update_rankings()
|
||||||
|
update_attributes()
|
||||||
|
|
||||||
def put_story(story):
|
def put_story(story):
|
||||||
if not SEARCH_ENABLED: return
|
if not SEARCH_ENABLED: return
|
||||||
return meili_api(requests.post, 'indexes/qotnews/documents', [story])
|
return meili_api(requests.post, 'indexes/qotnews/documents', [story])
|
||||||
|
|
||||||
def search(q, in_article=False):
|
def search(q):
|
||||||
if not SEARCH_ENABLED: return []
|
if not SEARCH_ENABLED: return []
|
||||||
|
params = dict(q=q, limit=settings.FEED_LENGTH)
|
||||||
json = dict(q=q, limit=settings.FEED_LENGTH)
|
r = meili_api(requests.get, 'indexes/qotnews/search', params=params, parse_json=False)
|
||||||
|
|
||||||
if True:
|
|
||||||
json['attributesToSearchOn'] = ['text']
|
|
||||||
json['attributesToCrop'] = ['text']
|
|
||||||
json['attributesToRetrieve'] = ['id', 'ref', 'source', 'author', 'author_link', 'score', 'date', 'title', 'link', 'url', 'num_comments']
|
|
||||||
json['cropLength'] = 80
|
|
||||||
|
|
||||||
r = meili_api(requests.post, 'indexes/qotnews/search', json=json, parse_json=False)
|
|
||||||
return r
|
return r
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
init()
|
init()
|
||||||
|
|
||||||
|
print(update_rankings())
|
||||||
|
|
||||||
print(search('facebook'))
|
print(search('facebook'))
|
||||||
|
|||||||
+2
-55
@@ -16,7 +16,6 @@ import traceback
|
|||||||
import time
|
import time
|
||||||
import datetime
|
import datetime
|
||||||
import humanize
|
import humanize
|
||||||
import urllib.request
|
|
||||||
from urllib.parse import urlparse, parse_qs
|
from urllib.parse import urlparse, parse_qs
|
||||||
|
|
||||||
import settings
|
import settings
|
||||||
@@ -29,25 +28,6 @@ from flask import abort, Flask, request, render_template, stream_with_context, R
|
|||||||
from werkzeug.exceptions import NotFound
|
from werkzeug.exceptions import NotFound
|
||||||
from flask_cors import CORS
|
from flask_cors import CORS
|
||||||
|
|
||||||
smallweb_set = set()
|
|
||||||
def load_smallweb_list():
|
|
||||||
EXCLUDED = [
|
|
||||||
'github.com',
|
|
||||||
]
|
|
||||||
|
|
||||||
global smallweb_set
|
|
||||||
try:
|
|
||||||
url = 'https://raw.githubusercontent.com/kagisearch/smallweb/refs/heads/main/smallweb.txt'
|
|
||||||
with urllib.request.urlopen(url, timeout=10) as response:
|
|
||||||
urls = response.read().decode('utf-8').splitlines()
|
|
||||||
hosts = {urlparse(u).hostname for u in urls if u and urlparse(u).hostname}
|
|
||||||
smallweb_set = {h.replace('www.', '') for h in hosts if h not in EXCLUDED}
|
|
||||||
logging.info('Loaded {} smallweb domains.'.format(len(smallweb_set)))
|
|
||||||
except Exception as e:
|
|
||||||
logging.error('Failed to load smallweb list: {}'.format(e))
|
|
||||||
|
|
||||||
load_smallweb_list()
|
|
||||||
|
|
||||||
database.init()
|
database.init()
|
||||||
search.init()
|
search.init()
|
||||||
|
|
||||||
@@ -76,39 +56,7 @@ 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)
|
||||||
|
|
||||||
if request.args.get('smallweb') == 'true' and smallweb_set:
|
|
||||||
limit = int(limit)
|
|
||||||
skip = int(skip)
|
|
||||||
filtered_stories = []
|
|
||||||
current_skip = skip
|
|
||||||
|
|
||||||
while len(filtered_stories) < limit:
|
|
||||||
stories_batch = database.get_stories(limit, current_skip)
|
|
||||||
if not stories_batch:
|
|
||||||
break
|
|
||||||
|
|
||||||
for story_str in stories_batch:
|
|
||||||
story = json.loads(story_str)
|
|
||||||
story_url = story.get('url') or story.get('link') or ''
|
|
||||||
if not story_url:
|
|
||||||
continue
|
|
||||||
hostname = urlparse(story_url).hostname
|
|
||||||
if hostname:
|
|
||||||
hostname = hostname.replace('www.', '')
|
|
||||||
if hostname in smallweb_set:
|
|
||||||
filtered_stories.append(story_str)
|
|
||||||
if len(filtered_stories) == limit:
|
|
||||||
break
|
|
||||||
|
|
||||||
if len(filtered_stories) == limit:
|
|
||||||
break
|
|
||||||
|
|
||||||
current_skip += limit
|
|
||||||
stories = filtered_stories
|
|
||||||
else:
|
|
||||||
stories = database.get_stories(limit, skip)
|
stories = database.get_stories(limit, skip)
|
||||||
|
|
||||||
# hacky nested json
|
# hacky nested json
|
||||||
res = Response('{"stories":[' + ','.join(stories) + ']}')
|
res = Response('{"stories":[' + ','.join(stories) + ']}')
|
||||||
res.headers['content-type'] = 'application/json'
|
res.headers['content-type'] = 'application/json'
|
||||||
@@ -131,9 +79,8 @@ def apistats():
|
|||||||
@flask_app.route('/api/search', strict_slashes=False)
|
@flask_app.route('/api/search', strict_slashes=False)
|
||||||
def apisearch():
|
def apisearch():
|
||||||
q = request.args.get('q', '')
|
q = request.args.get('q', '')
|
||||||
in_article = request.args.get('article', False)
|
|
||||||
if len(q) >= 3:
|
if len(q) >= 3:
|
||||||
results = search.search(q, in_article)
|
results = search.search(q)
|
||||||
else:
|
else:
|
||||||
results = '[]'
|
results = '[]'
|
||||||
res = Response(results)
|
res = Response(results)
|
||||||
@@ -263,7 +210,7 @@ def static_story(sid):
|
|||||||
show_comments=request.path.endswith('/c'),
|
show_comments=request.path.endswith('/c'),
|
||||||
)
|
)
|
||||||
|
|
||||||
http_server = WSGIServer(('0.0.0.0', 33842), flask_app)
|
http_server = WSGIServer(('', 33842), flask_app)
|
||||||
|
|
||||||
def feed_thread():
|
def feed_thread():
|
||||||
global news_index, ref_list, current_item
|
global news_index, ref_list, current_item
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ def alert_tanner(message):
|
|||||||
try:
|
try:
|
||||||
logging.info('Alerting Tanner: ' + message)
|
logging.info('Alerting Tanner: ' + message)
|
||||||
params = dict(qotnews=message)
|
params = dict(qotnews=message)
|
||||||
requests.get('https://tbot.tanner.vc/message', params=params, timeout=4)
|
requests.get('https://tbot.tannercollin.com/message', params=params, timeout=4)
|
||||||
except BaseException as e:
|
except BaseException as e:
|
||||||
logging.error('Problem alerting Tanner: ' + str(e))
|
logging.error('Problem alerting Tanner: ' + str(e))
|
||||||
|
|
||||||
|
|||||||
@@ -4,4 +4,3 @@
|
|||||||
|
|
||||||
meilisearch-linux-amd64
|
meilisearch-linux-amd64
|
||||||
data.ms/
|
data.ms/
|
||||||
data.ms.old/
|
|
||||||
|
|||||||
@@ -4,14 +4,12 @@
|
|||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"abort-controller": "^3.0.0",
|
"abort-controller": "^3.0.0",
|
||||||
"katex": "^0.16.25",
|
|
||||||
"localforage": "^1.7.3",
|
"localforage": "^1.7.3",
|
||||||
"moment": "^2.24.0",
|
"moment": "^2.24.0",
|
||||||
"query-string": "^6.8.3",
|
"query-string": "^6.8.3",
|
||||||
"react": "^16.9.0",
|
"react": "^16.9.0",
|
||||||
"react-dom": "^16.9.0",
|
"react-dom": "^16.9.0",
|
||||||
"react-helmet": "^5.2.1",
|
"react-helmet": "^5.2.1",
|
||||||
"react-latex-next": "^3.0.0",
|
|
||||||
"react-router-dom": "^5.0.1",
|
"react-router-dom": "^5.0.1",
|
||||||
"react-router-hash-link": "^1.2.2",
|
"react-router-hash-link": "^1.2.2",
|
||||||
"react-scripts": "3.1.1"
|
"react-scripts": "3.1.1"
|
||||||
|
|||||||
@@ -41,6 +41,9 @@
|
|||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
<div class="nojs">
|
||||||
|
<noscript></noscript>
|
||||||
|
</div>
|
||||||
<div id="root">
|
<div id="root">
|
||||||
<div class="container menu">
|
<div class="container menu">
|
||||||
<p>
|
<p>
|
||||||
@@ -78,26 +81,21 @@
|
|||||||
<div class="story-text">{{ story.text | safe }}</div>
|
<div class="story-text">{{ story.text | safe }}</div>
|
||||||
{% elif show_comments %}
|
{% elif show_comments %}
|
||||||
{% macro render_comment(comment, level) %}
|
{% macro render_comment(comment, level) %}
|
||||||
<dt></dt>
|
<div class="comment{% if level > 0 %} lined{% endif %}">
|
||||||
<dd class="comment{% if level > 0 %} lined{% endif %}">
|
|
||||||
<div class="info">
|
<div class="info">
|
||||||
<p>
|
<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>
|
{% 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>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="text">{{ (comment.text | safe) if comment.text else '<p>[Empty / deleted comment]</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 %}
|
{% for reply in comment.comments %}
|
||||||
{{ render_comment(reply, level + 1) }}
|
{{ render_comment(reply, level + 1) }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</dl>
|
</div>
|
||||||
{% endif %}
|
|
||||||
</dd>
|
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
<dl class="comments">
|
<div class="comments">
|
||||||
{% for comment in story.comments %}{{ render_comment(comment, 0) }}{% endfor %}
|
{% for comment in story.comments %}{{ render_comment(comment, 0) }}{% endfor %}
|
||||||
</dl>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
<div class='dot toggleDot'>
|
<div class='dot toggleDot'>
|
||||||
|
|||||||
@@ -3,17 +3,8 @@ 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, infoLine, ToggleDot } from './utils.js';
|
||||||
import Latex from 'react-latex-next';
|
|
||||||
import 'katex/dist/katex.min.css';
|
|
||||||
|
|
||||||
const VOID_ELEMENTS = ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
|
const VOID_ELEMENTS = ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
|
||||||
const DANGEROUS_TAGS = ['svg', 'math'];
|
|
||||||
|
|
||||||
const latexDelimiters = [
|
|
||||||
{ left: '$$', right: '$$', display: true },
|
|
||||||
{ left: '\\[', right: '\\]', display: true },
|
|
||||||
{ left: '\\(', right: '\\)', display: false }
|
|
||||||
];
|
|
||||||
|
|
||||||
function Article({ cache }) {
|
function Article({ cache }) {
|
||||||
const { id } = useParams();
|
const { id } = useParams();
|
||||||
@@ -104,11 +95,6 @@ function Article({ cache }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (v.nodeName === '#text') {
|
if (v.nodeName === '#text') {
|
||||||
const text = v.data;
|
|
||||||
if (text.includes('\\[') || text.includes('\\(') || text.includes('$$')) {
|
|
||||||
return <Latex key={key} delimiters={latexDelimiters}>{text}</Latex>;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only wrap top-level text nodes in <p>
|
// Only wrap top-level text nodes in <p>
|
||||||
if (keyPrefix === '' && v.data.trim() !== '') {
|
if (keyPrefix === '' && v.data.trim() !== '') {
|
||||||
return <p key={key}>{v.data}</p>;
|
return <p key={key}>{v.data}</p>;
|
||||||
@@ -120,10 +106,6 @@ function Article({ cache }) {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (DANGEROUS_TAGS.includes(v.localName)) {
|
|
||||||
return <span key={key} dangerouslySetInnerHTML={{ __html: v.outerHTML }} />;
|
|
||||||
}
|
|
||||||
|
|
||||||
const Tag = v.localName;
|
const Tag = v.localName;
|
||||||
if (isCodeBlock(v)) {
|
if (isCodeBlock(v)) {
|
||||||
return (
|
return (
|
||||||
@@ -134,11 +116,6 @@ function Article({ cache }) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const textContent = v.textContent.trim();
|
|
||||||
const isMath = (textContent.startsWith('\\(') && textContent.endsWith('\\)')) ||
|
|
||||||
(textContent.startsWith('\\[') && textContent.endsWith('\\]')) ||
|
|
||||||
(textContent.startsWith('$$') && textContent.endsWith('$$'));
|
|
||||||
|
|
||||||
const props = { key: key };
|
const props = { key: key };
|
||||||
if (v.hasAttributes()) {
|
if (v.hasAttributes()) {
|
||||||
for (const attr of v.attributes) {
|
for (const attr of v.attributes) {
|
||||||
@@ -147,21 +124,6 @@ function Article({ cache }) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isMath) {
|
|
||||||
let mathContent = v.textContent;
|
|
||||||
// align environment requires display math mode
|
|
||||||
if (mathContent.includes('\\begin{align')) {
|
|
||||||
const trimmed = mathContent.trim();
|
|
||||||
if (trimmed.startsWith('\\(')) {
|
|
||||||
// Replace \( and \) with \[ and \] to switch to display mode
|
|
||||||
const firstParen = mathContent.indexOf('\\(');
|
|
||||||
const lastParen = mathContent.lastIndexOf('\\)');
|
|
||||||
mathContent = mathContent.substring(0, firstParen) + '\\[' + mathContent.substring(firstParen + 2, lastParen) + '\\]' + mathContent.substring(lastParen + 2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return <Tag {...props}><Latex delimiters={latexDelimiters}>{mathContent}</Latex></Tag>;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (VOID_ELEMENTS.includes(Tag)) {
|
if (VOID_ELEMENTS.includes(Tag)) {
|
||||||
return <Tag {...props} />;
|
return <Tag {...props} />;
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-33
@@ -8,19 +8,9 @@ function Feed({ updateCache }) {
|
|||||||
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 handleFilterChange = e => {
|
|
||||||
const isChecked = e.target.checked;
|
|
||||||
setStories(false);
|
|
||||||
setFilterSmallweb(isChecked);
|
|
||||||
localStorage.setItem('filterSmallweb', isChecked);
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const controller = new AbortController();
|
fetch('/api')
|
||||||
|
|
||||||
fetch(filterSmallweb ? '/api?smallweb=true' : '/api', { 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}`);
|
||||||
@@ -36,19 +26,21 @@ function Feed({ updateCache }) {
|
|||||||
|
|
||||||
if (!updated) return;
|
if (!updated) return;
|
||||||
|
|
||||||
|
if (!stories || !stories.length) {
|
||||||
|
setStories(newApiStories);
|
||||||
|
localStorage.setItem('stories', JSON.stringify(newApiStories));
|
||||||
|
}
|
||||||
|
|
||||||
setLoadingStatus({ current: 0, total: newApiStories.length });
|
setLoadingStatus({ current: 0, total: newApiStories.length });
|
||||||
|
|
||||||
let currentStories = Array.isArray(stories) ? [...stories] : [];
|
let currentStories = Array.isArray(stories) ? [...stories] : [];
|
||||||
let preloadedCount = 0;
|
let preloadedCount = 0;
|
||||||
|
|
||||||
for (const [index, newStory] of newApiStories.entries()) {
|
for (const [index, newStory] of newApiStories.entries()) {
|
||||||
if (controller.signal.aborted) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
try {
|
try {
|
||||||
const storyFetchController = new AbortController();
|
const controller = new AbortController();
|
||||||
const timeoutId = setTimeout(() => storyFetchController.abort(), 10000); // 10-second timeout
|
const timeoutId = setTimeout(() => controller.abort(), 10000); // 10-second timeout
|
||||||
const storyRes = await fetch('/api/' + newStory.id, { signal: storyFetchController.signal });
|
const storyRes = await fetch('/api/' + newStory.id, { signal: controller.signal });
|
||||||
clearTimeout(timeoutId);
|
clearTimeout(timeoutId);
|
||||||
|
|
||||||
if (!storyRes.ok) {
|
if (!storyRes.ok) {
|
||||||
@@ -97,17 +89,11 @@ function Feed({ updateCache }) {
|
|||||||
setLoadingStatus(null);
|
setLoadingStatus(null);
|
||||||
},
|
},
|
||||||
(error) => {
|
(error) => {
|
||||||
if (error.name === 'AbortError') {
|
|
||||||
console.log('Feed fetch aborted.');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const errorMessage = `Failed to fetch the main story list from the API. Your connection may be down or the server might be experiencing issues. ${error.toString()}.`;
|
const errorMessage = `Failed to fetch the main story list from the API. Your connection may be down or the server might be experiencing issues. ${error.toString()}.`;
|
||||||
setError(errorMessage);
|
setError(errorMessage);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
}, [updateCache]);
|
||||||
return () => controller.abort();
|
|
||||||
}, [updateCache, filterSmallweb]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='container'>
|
<div className='container'>
|
||||||
@@ -115,12 +101,7 @@ function Feed({ updateCache }) {
|
|||||||
<title>QotNews</title>
|
<title>QotNews</title>
|
||||||
<meta name="robots" content="index" />
|
<meta name="robots" content="index" />
|
||||||
</Helmet>
|
</Helmet>
|
||||||
|
{loadingStatus && <p>Preloading stories {loadingStatus.current} / {loadingStatus.total}...</p>}
|
||||||
<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>
|
||||||
@@ -128,7 +109,6 @@ function Feed({ updateCache }) {
|
|||||||
{stories && <p>Loaded feed from cache.</p>}
|
{stories && <p>Loaded feed from cache.</p>}
|
||||||
</details>
|
</details>
|
||||||
}
|
}
|
||||||
|
|
||||||
{stories ?
|
{stories ?
|
||||||
<div>
|
<div>
|
||||||
{stories.map(x =>
|
{stories.map(x =>
|
||||||
@@ -150,8 +130,6 @@ function Feed({ updateCache }) {
|
|||||||
:
|
:
|
||||||
<p>Loading...</p>
|
<p>Loading...</p>
|
||||||
}
|
}
|
||||||
|
|
||||||
{loadingStatus && <p>Preloading stories {loadingStatus.current} / {loadingStatus.total}...</p>}
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import { Link, useLocation, useHistory } from 'react-router-dom';
|
import { Link, useLocation } from 'react-router-dom';
|
||||||
import { Helmet } from 'react-helmet';
|
import { Helmet } from 'react-helmet';
|
||||||
import queryString from 'query-string';
|
|
||||||
import { sourceLink, infoLine, logos } from './utils.js';
|
import { sourceLink, infoLine, logos } from './utils.js';
|
||||||
import AbortController from 'abort-controller';
|
import AbortController from 'abort-controller';
|
||||||
|
|
||||||
@@ -9,19 +8,6 @@ function Results() {
|
|||||||
const [stories, setStories] = useState(false);
|
const [stories, setStories] = useState(false);
|
||||||
const [error, setError] = useState(false);
|
const [error, setError] = useState(false);
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
const history = useHistory();
|
|
||||||
|
|
||||||
const handleFilterChange = e => {
|
|
||||||
const isChecked = e.target.checked;
|
|
||||||
|
|
||||||
const currentQuery = queryString.parse(location.search);
|
|
||||||
if (isChecked) {
|
|
||||||
currentQuery.article = 'true';
|
|
||||||
} else {
|
|
||||||
delete currentQuery.article;
|
|
||||||
}
|
|
||||||
history.push('/search?' + queryString.stringify(currentQuery));
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const controller = new AbortController();
|
const controller = new AbortController();
|
||||||
@@ -46,19 +32,11 @@ function Results() {
|
|||||||
};
|
};
|
||||||
}, [location.search]);
|
}, [location.search]);
|
||||||
|
|
||||||
const searchInArticle = queryString.parse(location.search).article === 'true';
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='container'>
|
<div className='container'>
|
||||||
<Helmet>
|
<Helmet>
|
||||||
<title>Search Results | QotNews</title>
|
<title>Search Results | QotNews</title>
|
||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
<div style={{marginBottom: '1rem'}}>
|
|
||||||
<input type="checkbox" id="search-in-article" className="checkbox" checked={searchInArticle} onChange={handleFilterChange} />
|
|
||||||
<label htmlFor="search-in-article">Search in article</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{error && <p>Connection error?</p>}
|
{error && <p>Connection error?</p>}
|
||||||
{stories ?
|
{stories ?
|
||||||
<>
|
<>
|
||||||
@@ -78,10 +56,6 @@ function Results() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{infoLine(x)}
|
{infoLine(x)}
|
||||||
|
|
||||||
{!!x?._formatted &&
|
|
||||||
<p>{x._formatted.text.replace(/\n/g, ' ')}</p>
|
|
||||||
}
|
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
:
|
:
|
||||||
|
|||||||
@@ -15,9 +15,7 @@ function Search() {
|
|||||||
const newSearch = event.target.value;
|
const newSearch = event.target.value;
|
||||||
setSearch(newSearch);
|
setSearch(newSearch);
|
||||||
if (newSearch.length >= 3) {
|
if (newSearch.length >= 3) {
|
||||||
const currentQuery = queryString.parse(location.search);
|
const searchQuery = queryString.stringify({ 'q': newSearch });
|
||||||
currentQuery.q = newSearch;
|
|
||||||
const searchQuery = queryString.stringify(currentQuery);
|
|
||||||
history.replace('/search?' + searchQuery);
|
history.replace('/search?' + searchQuery);
|
||||||
} else {
|
} else {
|
||||||
history.replace('/');
|
history.replace('/');
|
||||||
@@ -26,9 +24,7 @@ function Search() {
|
|||||||
|
|
||||||
const searchAgain = (event) => {
|
const searchAgain = (event) => {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
const currentQuery = queryString.parse(location.search);
|
const searchString = queryString.stringify({ 'q': event.target[0].value });
|
||||||
currentQuery.q = event.target[0].value;
|
|
||||||
const searchString = queryString.stringify(currentQuery);
|
|
||||||
history.push('/search?' + searchString);
|
history.push('/search?' + searchString);
|
||||||
inputRef.current.blur();
|
inputRef.current.blur();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,8 +11,7 @@
|
|||||||
border: 1px solid #828282;
|
border: 1px solid #828282;
|
||||||
}
|
}
|
||||||
|
|
||||||
.black .menu button,
|
.black button {
|
||||||
.black .story-text button {
|
|
||||||
background-color: #444444;
|
background-color: #444444;
|
||||||
border-color: #bbb;
|
border-color: #bbb;
|
||||||
color: #ddd;
|
color: #ddd;
|
||||||
@@ -67,11 +66,3 @@
|
|||||||
.black .comment.lined {
|
.black .comment.lined {
|
||||||
border-left: 1px solid #444444;
|
border-left: 1px solid #444444;
|
||||||
}
|
}
|
||||||
|
|
||||||
.black .checkbox:checked + label::after {
|
|
||||||
border-color: #ddd;
|
|
||||||
}
|
|
||||||
|
|
||||||
.black .copy-button {
|
|
||||||
color: #828282;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -11,8 +11,7 @@
|
|||||||
border: 1px solid #828282;
|
border: 1px solid #828282;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dark .menu button,
|
.dark button {
|
||||||
.dark .story-text button {
|
|
||||||
background-color: #444444;
|
background-color: #444444;
|
||||||
border-color: #bbb;
|
border-color: #bbb;
|
||||||
color: #ddd;
|
color: #ddd;
|
||||||
@@ -63,11 +62,3 @@
|
|||||||
.dark .comment.lined {
|
.dark .comment.lined {
|
||||||
border-left: 1px solid #444444;
|
border-left: 1px solid #444444;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dark .checkbox:checked + label::after {
|
|
||||||
border-color: #ddd;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dark .copy-button {
|
|
||||||
color: #828282;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -189,13 +189,6 @@ span.source {
|
|||||||
|
|
||||||
.comments {
|
.comments {
|
||||||
margin-left: -1.25rem;
|
margin-left: -1.25rem;
|
||||||
margin-top: 0;
|
|
||||||
margin-bottom: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comments dl, .comments dd {
|
|
||||||
margin: 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.comment {
|
.comment {
|
||||||
@@ -312,50 +305,8 @@ button.comment {
|
|||||||
|
|
||||||
.copy-button {
|
.copy-button {
|
||||||
font: 1.5rem/1 'icomoon2';
|
font: 1.5rem/1 'icomoon2';
|
||||||
color: #828282;
|
|
||||||
background: transparent;
|
background: transparent;
|
||||||
border: none;
|
border: none;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
.checkbox {
|
|
||||||
-webkit-appearance: none;
|
|
||||||
appearance: none;
|
|
||||||
position: absolute;
|
|
||||||
opacity: 0;
|
|
||||||
cursor: pointer;
|
|
||||||
height: 0;
|
|
||||||
width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkbox + label {
|
|
||||||
position: relative;
|
|
||||||
cursor: pointer;
|
|
||||||
padding-left: 1.75rem;
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkbox + label::before {
|
|
||||||
content: '';
|
|
||||||
position: absolute;
|
|
||||||
left: 0;
|
|
||||||
top: 0.1em;
|
|
||||||
width: 1rem;
|
|
||||||
height: 1rem;
|
|
||||||
border: 1px solid #828282;
|
|
||||||
background-color: transparent;
|
|
||||||
border-radius: 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkbox:checked + label::after {
|
|
||||||
content: "";
|
|
||||||
position: absolute;
|
|
||||||
left: 0.35rem;
|
|
||||||
top: 0.2em;
|
|
||||||
width: 0.3rem;
|
|
||||||
height: 0.6rem;
|
|
||||||
border: solid #000;
|
|
||||||
border-width: 0 2px 2px 0;
|
|
||||||
transform: rotate(45deg);
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -20,8 +20,7 @@
|
|||||||
background-color: #690000;
|
background-color: #690000;
|
||||||
}
|
}
|
||||||
|
|
||||||
.red .menu button,
|
.red button {
|
||||||
.red .story-text button {
|
|
||||||
background-color: #440000;
|
background-color: #440000;
|
||||||
border-color: #b00;
|
border-color: #b00;
|
||||||
color: #b00;
|
color: #b00;
|
||||||
@@ -81,15 +80,3 @@
|
|||||||
.red .dot {
|
.red .dot {
|
||||||
background-color: #440000;
|
background-color: #440000;
|
||||||
}
|
}
|
||||||
|
|
||||||
.red .checkbox + label::before {
|
|
||||||
border: 1px solid #690000;
|
|
||||||
}
|
|
||||||
|
|
||||||
.red .checkbox:checked + label::after {
|
|
||||||
border-color: #aa0000;
|
|
||||||
}
|
|
||||||
|
|
||||||
.red .copy-button {
|
|
||||||
color: #690000;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -3169,11 +3169,6 @@ commander@^2.11.0, commander@^2.20.0:
|
|||||||
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
|
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
|
||||||
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
|
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
|
||||||
|
|
||||||
commander@^8.3.0:
|
|
||||||
version "8.3.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
|
|
||||||
integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
|
|
||||||
|
|
||||||
commander@~2.19.0:
|
commander@~2.19.0:
|
||||||
version "2.19.0"
|
version "2.19.0"
|
||||||
resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
|
resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
|
||||||
@@ -6861,13 +6856,6 @@ jsx-ast-utils@^2.1.0, jsx-ast-utils@^2.2.1:
|
|||||||
array-includes "^3.1.1"
|
array-includes "^3.1.1"
|
||||||
object.assign "^4.1.0"
|
object.assign "^4.1.0"
|
||||||
|
|
||||||
katex@^0.16.0, katex@^0.16.25:
|
|
||||||
version "0.16.25"
|
|
||||||
resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.25.tgz#61699984277e3bdb3e89e0e446b83cd0a57d87db"
|
|
||||||
integrity sha512-woHRUZ/iF23GBP1dkDQMh1QBad9dmr8/PAwNA54VrSOVYgI12MAcE14TqnDdQOdzyEonGzMepYnqBMYdsoAr8Q==
|
|
||||||
dependencies:
|
|
||||||
commander "^8.3.0"
|
|
||||||
|
|
||||||
killable@^1.0.0:
|
killable@^1.0.0:
|
||||||
version "1.0.1"
|
version "1.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
|
resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
|
||||||
@@ -9131,13 +9119,6 @@ react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.4:
|
|||||||
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
|
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
|
||||||
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
|
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
|
||||||
|
|
||||||
react-latex-next@^3.0.0:
|
|
||||||
version "3.0.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/react-latex-next/-/react-latex-next-3.0.0.tgz#3e347a13b1e701439b5fa52f75201bc86166854e"
|
|
||||||
integrity sha512-x70f1b1G7TronVigsRgKHKYYVUNfZk/3bciFyYX1lYLQH2y3/TXku3+5Vap8MDbJhtopePSYBsYWS6jhzIdz+g==
|
|
||||||
dependencies:
|
|
||||||
katex "^0.16.0"
|
|
||||||
|
|
||||||
react-router-dom@^5.0.1:
|
react-router-dom@^5.0.1:
|
||||||
version "5.3.4"
|
version "5.3.4"
|
||||||
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.4.tgz#2ed62ffd88cae6db134445f4a0c0ae8b91d2e5e6"
|
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.4.tgz#2ed62ffd88cae6db134445f4a0c0ae8b91d2e5e6"
|
||||||
|
|||||||
Reference in New Issue
Block a user