summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDessalines <tyhou13@gmx.com>2019-04-05 22:29:20 -0700
committerDessalines <tyhou13@gmx.com>2019-04-05 22:29:20 -0700
commite826f631d84c2d29aa9adde13188d4b0affa0a13 (patch)
treeff7201e7114863b6b145e74e5e5d9c82ccd3daa0 /ui
parent751cf26be6ff598bd1ef213e4a60df5f0db8ceed (diff)
Adding docker.
- Adding docker support. Fixes #6 - Completing the name change to lemmy. Fixes #36 - Running DB migrations from code. Fixes #38
Diffstat (limited to 'ui')
-rw-r--r--ui/package.json4
-rw-r--r--ui/src/components/navbar.tsx2
-rw-r--r--ui/src/env.ts5
-rw-r--r--ui/src/index.html3
-rw-r--r--ui/src/utils.ts2
5 files changed, 7 insertions, 9 deletions
diff --git a/ui/package.json b/ui/package.json
index c8df32a7..1b82db12 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,7 +1,7 @@
{
- "name": "rust_reddit_fediverse",
+ "name": "lemmy",
"version": "1.0.0",
- "description": "A simple UI for rust_reddit_fediverse",
+ "description": "A simple UI for lemmy",
"main": "index.js",
"scripts": {
"start": "node fuse dev",
diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx
index 44424994..d766bf07 100644
--- a/ui/src/components/navbar.tsx
+++ b/ui/src/components/navbar.tsx
@@ -27,7 +27,7 @@ export class Navbar extends Component<any, any> {
navbar() {
return (
<nav class="navbar navbar-expand-sm navbar-light bg-light p-0 px-3 shadow">
- <a class="navbar-brand" href="#">rrf</a>
+ <a class="navbar-brand" href="#">Lemmy</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
diff --git a/ui/src/env.ts b/ui/src/env.ts
index a8e72d90..1750006b 100644
--- a/ui/src/env.ts
+++ b/ui/src/env.ts
@@ -1,3 +1,2 @@
-// export const endpoint = window.location.origin;
-export const endpoint = "http://localhost:8080";
-export let wsUri = (window.location.protocol=='https:') ? 'wss://' : 'ws://' + endpoint.substr(7) + '/service/ws';
+export const endpoint = `${window.location.hostname}:8080`;
+export let wsUri = (window.location.protocol=='https:') ? 'wss://' : 'ws://' + endpoint + '/service/ws';
diff --git a/ui/src/index.html b/ui/src/index.html
index 2b79ac1c..eff8efa3 100644
--- a/ui/src/index.html
+++ b/ui/src/index.html
@@ -6,11 +6,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="shortcut icon" type="image/ico" href="/static/assets/favicon.ico" />
- <title>rust-reddit-fediverse</title>
+ <title>Lemmy</title>
<link rel="stylesheet" href="https://bootswatch.com/4/darkly/bootstrap.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/balloon-css/0.5.0/balloon.min.css">
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,700,800" rel="stylesheet">
- <!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/sortable/0.8.0/css/sortable-theme-minimal.min.css" /> -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/sortable/0.8.0/js/sortable.min.js"></script>
</head>
diff --git a/ui/src/utils.ts b/ui/src/utils.ts
index 64c82682..21122d0a 100644
--- a/ui/src/utils.ts
+++ b/ui/src/utils.ts
@@ -1,7 +1,7 @@
import { UserOperation, Comment } from './interfaces';
import * as markdown_it from 'markdown-it';
-export let repoUrl = 'https://github.com/dessalines/rust-reddit-fediverse';
+export let repoUrl = 'https://github.com/dessalines/lemmy';
export let wsUri = (window.location.protocol=='https:'&&'wss://'||'ws://')+window.location.host + '/service/ws/';
export function msgOp(msg: any): UserOperation {