This commit addresses the two currently outstanding issues and also introduces some changes:

- The port has been changed from 3000 to 8080
- The format of the imprint.json file has changed. See the current example file.
This commit is contained in:
phntxx 2021-03-05 22:00:32 +01:00
parent 15d4a60958
commit 7de67cbbd8
57 changed files with 3168 additions and 19341 deletions

View file

@ -1,5 +1,5 @@
import React from "react";
import styled, { createGlobalStyle } from "styled-components";
import React, { useEffect } from "react";
import { createGlobalStyle } from "styled-components";
import SearchBar from "./components/searchBar";
import Greeter from "./components/greeter";
@ -9,6 +9,13 @@ import Settings from "./components/settings";
import Imprint from "./components/imprint";
import selectedTheme from "./components/themeManager";
import {
useAppData,
useSearchProviderData,
useBookmarkData,
useThemeData,
useImprintData,
} from "./components/fetch";
const GlobalStyle = createGlobalStyle`
body {
@ -22,24 +29,37 @@ const GlobalStyle = createGlobalStyle`
@media (min-width: 1366px) {
max-width: 70%;
}
}
`;
const AppContainer = styled.div``;
const App = () => {
const { appData } = useAppData();
const { searchProviderData } = useSearchProviderData();
const { bookmarkData } = useBookmarkData();
const { themeData } = useThemeData();
const { imprintData } = useImprintData();
const App = () => (
<>
<GlobalStyle />
<AppContainer>
<SearchBar />
<Settings />
<Greeter />
<AppList />
<BookmarkList />
<Imprint />
</AppContainer>
</>
);
return (
<>
<GlobalStyle />
<div>
<SearchBar providers={searchProviderData?.providers} />
{!themeData.error && !searchProviderData.error && (
<Settings
themes={themeData?.themes}
providers={searchProviderData?.providers}
/>
)}
<Greeter />
{!appData.error && (
<AppList apps={appData.apps} categories={appData.categories} />
)}
{!bookmarkData.error && <BookmarkList groups={bookmarkData.groups} />}
{!imprintData.error && <Imprint imprint={imprintData.imprint} />}
</div>
</>
);
};
export default App;