iridium/redsunlib
iridium/redsunlib
2
2
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 4 Wiki Activity

Merge pull request #7 from spikecodes/master

Browse Source 
Merge upstream
This commit is contained in:
robrobinbin 2021-02-02 21:18:21 +01:00 committed by GitHub
commit f8e0d2d4b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.rs
View File

@ -134,7 +134,7 @@ async fn main() -> std::io::Result<()> {
.route("/search/", web::get().to(search::find)) .route("/search/", web::get().to(search::find))
// View wiki of subreddit // View wiki of subreddit
.service( .service(
web::scope("/wiki") web::scope("/{scope:wiki|w}")
.route("/", web::get().to(subreddit::wiki)) .route("/", web::get().to(subreddit::wiki))
.route("/{page}/", web::get().to(subreddit::wiki)), .route("/{page}/", web::get().to(subreddit::wiki)),
), ),

4
static/manifest.json
View File

@ -2,9 +2,9 @@
"name": "Libreddit", "name": "Libreddit",
"short_name": "Libreddit", "short_name": "Libreddit",
"display": "standalone", "display": "standalone",
"background_color": "#2A3443", "background_color": "#1F1F1F",
"description": "An alternative private front-end to Reddit", "description": "An alternative private front-end to Reddit",
"theme_color": "#2A3443", "theme_color": "#1F1F1F",
"icons": [ "icons": [
{ {
"src": "./logo.png", "src": "./logo.png",

21
static/style.css
View File

@ -286,9 +286,9 @@ aside {
background-color: var(--highlighted); background-color: var(--highlighted);
} }
/* Subscribed subreddit list */ /* Feeds */
#subscriptions { #feeds {
position: relative; position: relative;
border-radius: 5px; border-radius: 5px;
border: var(--panel-border); border: var(--panel-border);
@ -299,11 +299,11 @@ aside {
display: inline-block; display: inline-block;
} }
#subscriptions > summary { #feeds > summary {
padding: 8px 15px; padding: 8px 15px;
} }
#sub_list { #feed_list {
position: absolute; position: absolute;
display: flex; display: flex;
min-width: 100%; min-width: 100%;
@ -315,17 +315,24 @@ aside {
z-index: 1; z-index: 1;
} }
#sub_list > a { #feed_list > p {
font-size: 13px;
opacity: 0.5;
padding: 5px 20px;
margin-top: 10px;
}
#feed_list > a {
padding: 10px 20px; padding: 10px 20px;
transition: 0.2s background; transition: 0.2s background;
} }
#sub_list > .selected { #feed_list > .selected {
background-color: var(--accent); background-color: var(--accent);
color: var(--foreground); color: var(--foreground);
} }
#sub_list > a:not(.selected):hover { #feed_list > a:not(.selected):hover {
background-color: var(--foreground); background-color: var(--foreground);
} }

3
templates/base.html
View File

@ -7,13 +7,12 @@
<meta name="description" content="View on Libreddit, an alternative private front-end to Reddit."> <meta name="description" content="View on Libreddit, an alternative private front-end to Reddit.">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- General PWA --> <!-- General PWA -->
<meta name="theme-color" content="#009a9a"/> <meta name="theme-color" content="#1F1F1F">
<!-- iOS Application --> <!-- iOS Application -->
<meta name="apple-mobile-web-app-title" content="Libreddit"> <meta name="apple-mobile-web-app-title" content="Libreddit">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="default"> <meta name="apple-mobile-web-app-status-bar-style" content="default">
<!-- Android --> <!-- Android -->
<meta name="theme-color" content="#2A3443">
<meta name="mobile-web-app-capable" content="yes"> <meta name="mobile-web-app-capable" content="yes">
<!-- iOS Logo --> <!-- iOS Logo -->
<link href="/touch-icon-iphone.png" rel="apple-touch-icon"> <link href="/touch-icon-iphone.png" rel="apple-touch-icon">

11
templates/utils.html
View File

@ -42,9 +42,14 @@
{% macro sub_list(current) -%} {% macro sub_list(current) -%}
{% if prefs.subs.len() > 0 %} {% if prefs.subs.len() > 0 %}
<details id="subscriptions"> <details id="feeds">
<summary>Subscriptions</summary> <summary>Feeds</summary>
<div id="sub_list"> <div id="feed_list">
<p>MAIN FEEDS</p>
<a href="/">Home</a>
<a href="/r/popular">Popular</a>
<a href="/r/all">All</a>
<p>REDDIT FEEDS</p>
{% for sub in prefs.subs %} {% for sub in prefs.subs %}
<a href="/r/{{ sub }}" {% if sub == current %}class="selected"{% endif %}>{{ sub }}</a> <a href="/r/{{ sub }}" {% if sub == current %}class="selected"{% endif %}>{{ sub }}</a>
{% endfor %} {% endfor %}