Merge pull request #61 from spotify/freben/nologin
No separate login link anymore
This commit is contained in:
@@ -6,12 +6,12 @@ import {
|
||||
Page,
|
||||
theme,
|
||||
} from '@backstage/core';
|
||||
import HomePagePlugin from '@backstage/plugin-home-page';
|
||||
//import PageHeader from './components/PageHeader';
|
||||
import { LoginComponent } from '@backstage/plugin-login';
|
||||
import HomePagePlugin from '@backstage/plugin-home-page';
|
||||
import { CssBaseline, makeStyles, ThemeProvider } from '@material-ui/core';
|
||||
import React, { FC } from 'react';
|
||||
import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
|
||||
import { BrowserRouter as Router } from 'react-router-dom';
|
||||
import HomePageTimer from './components/HomepageTimer';
|
||||
import SideBar from './components/SideBar';
|
||||
import entities from './entities';
|
||||
@@ -92,20 +92,13 @@ const App: FC<{}> = () => {
|
||||
return (
|
||||
<CssBaseline>
|
||||
<ThemeProvider theme={BackstageTheme}>
|
||||
<LoginBarrier fallback={Login} state$={currentUser.state}>
|
||||
<AppShell>
|
||||
<Router>
|
||||
<Switch>
|
||||
<Route path="/login">
|
||||
<Login />
|
||||
</Route>
|
||||
<Route>
|
||||
<AppComponent />
|
||||
</Route>
|
||||
</Switch>
|
||||
</Router>
|
||||
</AppShell>
|
||||
</LoginBarrier>
|
||||
<Router>
|
||||
<LoginBarrier fallback={Login} state$={currentUser.state}>
|
||||
<AppShell>
|
||||
<AppComponent />
|
||||
</AppShell>
|
||||
</LoginBarrier>
|
||||
</Router>
|
||||
</ThemeProvider>
|
||||
</CssBaseline>
|
||||
);
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
import React, { FC } from 'react';
|
||||
import { InfoCard, EntityLink } from '@backstage/core';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { EntityLink, InfoCard } from '@backstage/core';
|
||||
import { Typography } from '@material-ui/core';
|
||||
import React, { FC } from 'react';
|
||||
|
||||
const HomePage: FC<{}> = () => {
|
||||
return (
|
||||
<InfoCard title="Home Page">
|
||||
<Typography variant="body1">Welcome to Backstage!</Typography>
|
||||
<div>
|
||||
<Link to="/login">Go to Login</Link>
|
||||
<EntityLink kind="service" id="backstage-backend">
|
||||
Backstage Backend
|
||||
</EntityLink>
|
||||
|
||||
Reference in New Issue
Block a user