Skip to content
This repository was archived by the owner on Oct 11, 2022. It is now read-only.

Commit a19986c

Browse files
authored
Merge pull request #3198 from withspectrum/show-login-on-desktop
Show login as first view on desktop startup
2 parents 0cec257 + 33f1ee5 commit a19986c

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
**Deploy after merge (delete what needn't be deployed)**
88
- api
99
- hyperion (frontend)
10+
- desktop
1011
- athena
1112
- vulcan
1213
- mercury
@@ -20,11 +21,8 @@ YES
2021

2122
**Release notes for users (delete if codebase-only change)**
2223
-
23-
2424
<!--
25-
2625
If your pull request introduces changes to the user interface on Spectrum, please share before and after screenshots of the changes (gifs or videos are encouraged for interaction changes). Please include screenshots of desktop and mobile viewports to ensure that all responsive cases are reviewed.
27-
2826
-->
2927

3028
**Related issues (delete if you don't know any existing issue(s) that could be related to this PR)**

desktop/src/config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ const { resolve } = require('path');
99
module.exports = {
1010
APP_NAME: 'Spectrum',
1111
APP_VERSION: app.getVersion(),
12-
APP_REMOTE_URL: 'https://spectrum.chat/',
13-
APP_DEV_URL: 'http://localhost:3000',
12+
APP_REMOTE_URL: 'https://spectrum.chat/login',
13+
APP_DEV_URL: 'http://localhost:3000/login',
1414

1515
GITHUB_URL: 'https://github.com/withspectrum/spectrum',
1616
GITHUB_URL_LICENSE:

src/routes.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ const Body = styled(FlexCol)`
123123

124124
const DashboardFallback = signedOutFallback(Dashboard, Pages);
125125
const HomeFallback = signedOutFallback(Dashboard, () => <Redirect to="/" />);
126+
const LoginFallback = signedOutFallback(() => <Redirect to="/" />, Login);
126127
const NewCommunityFallback = signedOutFallback(NewCommunity, () => (
127128
<Redirect to={`/login?r=${CLIENT_URL}/new/community`} />
128129
));
@@ -219,7 +220,7 @@ class Routes extends React.Component<{||}> {
219220
render={() => <Redirect to="/new/community" />}
220221
/>
221222

222-
<Route path="/login" component={Login} />
223+
<Route path="/login" component={LoginFallback} />
223224
<Route path="/explore" component={Explore} />
224225
<Route path="/messages/new" component={MessagesFallback} />
225226
<Route

0 commit comments

Comments
 (0)