Merge pull request #12 from kucrut/issue/11

Remember TT-RSS URL
kucrut · Mar 28, 2017 · 9dc584c · 9dc584c
2 parents 1f3e7e5 + 0567cc8
commit 9dc584c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/app/components/Article.jsx b/app/components/Article.jsx
@@ -96,7 +96,6 @@ class Article extends React.Component {
 	}
 
 	scrollToTop() {
-		console.log( this.props.mainContent.scrollTop );
 		this.props.mainContent.scrollTop = 0;
 	}
 

diff --git a/app/components/LoginForm.jsx b/app/components/LoginForm.jsx
@@ -1,4 +1,5 @@
 import React, { PropTypes } from 'react';
+import { toString } from 'lodash';
 import { requestLogin } from 'actions/session';
 import Icon from 'components/Icon';
 import styles from 'css/components/form';
@@ -16,7 +17,7 @@ export default class LoginForm extends React.Component {
 		this.state = {
 			user:     '',
 			password: '',
-			url:      window.location.origin,
+			url:      toString( localStorage.getItem( 'ttrssBaseUrl' ) ) || window.location.origin,
 		};
 
 		this.handleChange = this.handleChange.bind( this );

diff --git a/app/css/common/typography.css b/app/css/common/typography.css
@@ -30,6 +30,7 @@ pre {
 	overflow: auto;
 	border: 1px solid #ddd;
 	border-radius: 3px;
+	white-space: pre-wrap;
 }
 
 :not(pre) > code,

diff --git a/app/reducers/session.js b/app/reducers/session.js
@@ -1,5 +1,5 @@
 import { PropTypes } from 'react';
-import { get } from 'lodash';
+import { get, trimEnd } from 'lodash';
 import {
 	CHECK_SESSION_SUCCESS,
 	CHECK_SESSION_FAILURE,
@@ -19,6 +19,10 @@ const initialState = {
 function saveSession( url, sid ) {
 	localStorage.setItem( 'ttrssUrl', url );
 	localStorage.setItem( 'ttrssSid', sid );
+
+	if ( url ) {
+		localStorage.setItem( 'ttrssBaseUrl', trimEnd( url, '/api/' ) );
+	}
 }
 
 export const sessionShape = {