aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2016-11-06 20:26:07 +0100
committerRoger Braun <roger@rogerbraun.net>2016-11-06 20:26:07 +0100
commitb6ac99fdf07a58efe331c82905c513ca7ceb75e1 (patch)
tree420b688630f8fd4dfc402c74de2cdbe2562bf8d2
parent1ae5223742415d69d3b6ec9fd46d04c85d8f787b (diff)
Use history routing.
-rw-r--r--config/index.js5
-rw-r--r--index.html2
-rw-r--r--src/main.js5
3 files changed, 5 insertions, 7 deletions
diff --git a/config/index.js b/config/index.js
index fdfac8b2..6652048c 100644
--- a/config/index.js
+++ b/config/index.js
@@ -26,11 +26,6 @@ module.exports = {
target: 'https://social.heldscal.la/',
changeOrigin: true,
cookieDomainRewrite: 'localhost'
- },
- '/main': {
- target: 'https://social.heldscal.la/',
- changeOrigin: true,
- cookieDomainRewrite: 'localhost'
}
},
// CSS Sourcemaps off by default because relative paths are "buggy"
diff --git a/index.html b/index.html
index 713fe27c..93d9d6fd 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Pleroma</title>
- <link rel="stylesheet" href="static/font/css/fontello.css">
+ <link rel="stylesheet" href="/static/font/css/fontello.css">
</head>
<body>
<div id="app"></div>
diff --git a/src/main.js b/src/main.js
index f95d286f..7f917128 100644
--- a/src/main.js
+++ b/src/main.js
@@ -24,7 +24,10 @@ const routes = [
{ path: '/main/friends', component: FriendsTimeline }
]
-const router = new VueRouter({routes})
+const router = new VueRouter({
+ mode: 'history',
+ routes
+})
/* eslint-disable no-new */
new Vue({