Merge pull request #106 from milesflo/master

Frontend Housekeeping
This commit is contained in:
Frikky
2020-07-27 19:40:35 +09:00
committed by GitHub
3 changed files with 343 additions and 363 deletions
+2
View File
@@ -17,10 +17,12 @@ import Apps from './views/Apps';
import AppCreator from './views/AppCreator'; import AppCreator from './views/AppCreator';
import Contact from './views/Contact'; import Contact from './views/Contact';
import Oauth2 from './views/Oauth2'; import Oauth2 from './views/Oauth2';
import Dashboard from "./views/Dashboard"; import Dashboard from "./views/Dashboard";
import AdminSetup from "./views/AdminSetup"; import AdminSetup from "./views/AdminSetup";
import Admin from "./views/Admin"; import Admin from "./views/Admin";
import Docs from "./views/Docs"; import Docs from "./views/Docs";
import LandingPageNew from "./views/LandingpageNew"; import LandingPageNew from "./views/LandingpageNew";
import LoginPage from "./views/LoginPage"; import LoginPage from "./views/LoginPage";
import SettingsPage from "./views/SettingsPage"; import SettingsPage from "./views/SettingsPage";
+7 -4
View File
@@ -6,6 +6,7 @@ import {Link} from 'react-router-dom';
import List from '@material-ui/core/List'; import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem'; import ListItem from '@material-ui/core/ListItem';
import MenuItem from '@material-ui/core/MenuItem'; import MenuItem from '@material-ui/core/MenuItem';
import Select from '@material-ui/core/Select'; import Select from '@material-ui/core/Select';
import Button from '@material-ui/core/Button'; import Button from '@material-ui/core/Button';
@@ -19,7 +20,8 @@ const hoverColor = "#f85a3e"
const hoverOutColor = "#e8eaf6" const hoverOutColor = "#e8eaf6"
const Header = props => { const Header = props => {
const { surfaceColor, inputColor, globalUrl, isLoggedIn, removeCookie, homePage, isLoaded, userdata} = props;
const { globalUrl, isLoggedIn, removeCookie, homePage, isLoaded } = props;
const [HomeHoverColor, setHomeHoverColor] = useState(hoverOutColor); const [HomeHoverColor, setHomeHoverColor] = useState(hoverOutColor);
const [SoarHoverColor, setSoarHoverColor] = useState(hoverOutColor); const [SoarHoverColor, setSoarHoverColor] = useState(hoverOutColor);
@@ -219,6 +221,7 @@ const Header = props => {
</Select> </Select>
</ListItem> </ListItem>
} }
</List> </List>
</div> </div>
</div> </div>
@@ -299,10 +302,10 @@ const Header = props => {
const loadedCheck = isLoaded ? const loadedCheck = isLoaded ?
<div> <div>
<BrowserView> <BrowserView>
{loginTextBrowser} {loginTextBrowser}
</BrowserView> </BrowserView>
<MobileView> <MobileView>
{loginTextMobile} {loginTextMobile}
</MobileView> </MobileView>
</div> </div>
: :
@@ -314,7 +317,7 @@ const Header = props => {
<div> <div>
{loadedCheck} {loadedCheck}
</div> </div>
); )
} }
export default Header; export default Header;
File diff suppressed because it is too large Load Diff