Merge pull request #7 from spikecodes/master

Merge upstream

src/main.rs

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

static/manifest.json

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

static/style.css

@@ -286,9 +286,9 @@ aside {
 	background-color: var(--highlighted);
 }
 
-/* Subscribed subreddit list */
+/* Feeds */
 
-#subscriptions {
+#feeds {
 	position: relative;
 	border-radius: 5px;
 	border: var(--panel-border);
@@ -299,11 +299,11 @@ aside {
 	display: inline-block;
 }
 
-#subscriptions > summary {
+#feeds > summary {
 	padding: 8px 15px;
 }
 
-#sub_list {
+#feed_list {
 	position: absolute;
 	display: flex;
 	min-width: 100%;
@@ -315,17 +315,24 @@ aside {
 	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;
 	transition: 0.2s background;
 }
 
-#sub_list > .selected {
+#feed_list > .selected {
 	background-color: var(--accent);
 	color: var(--foreground);
 }
 
-#sub_list > a:not(.selected):hover {
+#feed_list > a:not(.selected):hover {
 	background-color: var(--foreground);
 }
 

templates/base.html

@@ -7,13 +7,12 @@
 		<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">
 		<!-- General PWA -->
-		<meta name="theme-color" content="#009a9a"/>
+		<meta name="theme-color" content="#1F1F1F">
 		<!-- iOS Application -->
 		<meta name="apple-mobile-web-app-title" content="Libreddit">
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="default">
 		<!-- Android  -->
-		<meta name="theme-color" content="#2A3443">
 		<meta name="mobile-web-app-capable" content="yes">
 		<!-- iOS Logo -->
 		<link href="/touch-icon-iphone.png" rel="apple-touch-icon">

templates/utils.html

@@ -42,9 +42,14 @@
 
 {% macro sub_list(current) -%}
 {% if prefs.subs.len() > 0 %}
-	<details id="subscriptions">
-		<summary>Subscriptions</summary>
-		<div id="sub_list">
+	<details id="feeds">
+		<summary>Feeds</summary>
+		<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 %}
 				<a href="/r/{{ sub }}" {% if sub == current %}class="selected"{% endif %}>{{ sub }}</a>
 			{% endfor %}