Updated thememanager

This commit is contained in:
Bastian Meissner 2020-05-21 09:41:21 +02:00
parent 9499641162
commit c5927a859d
8 changed files with 386 additions and 364 deletions

View file

@ -1,14 +1,13 @@
import React from 'react'; import React from "react";
import styled, { createGlobalStyle } from 'styled-components'; import styled, { createGlobalStyle } from "styled-components";
import SearchBar from './components/searchBar' import SearchBar from "./components/searchBar";
import Greeter from './components/greeter' import Greeter from "./components/greeter";
import AppList from './components/appList' import AppList from "./components/appList";
import BookmarkList from './components/bookmarkList' import BookmarkList from "./components/bookmarkList";
import SettingsModal from './components/settingsModal' import SettingsModal from "./components/settingsModal";
import getTheme from './components/themeManager'; import selectedTheme from "./components/themeManager";
const selectedTheme = getTheme();
const GlobalStyle = createGlobalStyle` const GlobalStyle = createGlobalStyle`
body { body {

View file

@ -1,72 +1,67 @@
import React from 'react'; import React from "react";
import MaterialIcon from 'material-icons-react'; import MaterialIcon from "material-icons-react";
import styled from 'styled-components'; import styled from "styled-components";
import appData from './data/apps.json'; import appData from "./data/apps.json";
import getTheme from './themeManager'; import selectedTheme from "./themeManager";
import { Headline, ListContainer, ItemList, Item } from './elements' import { Headline, ListContainer, ItemList, Item } from "./elements";
const selectedTheme = getTheme();
const IconContainer = styled.div` const IconContainer = styled.div`
margin-right: 0.5vh; margin-right: 0.5vh;
`; `;
const DetailsContainer = styled.div` const DetailsContainer = styled.div`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
`; `;
const Link = styled.a` const Link = styled.a`
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
flex: 1 0 auto; flex: 1 0 auto;
color: ${selectedTheme.mainColor}; color: ${selectedTheme.mainColor};
font-weight: 500; font-weight: 500;
text-transform: uppercase; text-transform: uppercase;
margin: 0; margin: 0;
text-decoration: none; text-decoration: none;
font-size: 1rem; font-size: 1rem;
`; `;
const Description = styled.p` const Description = styled.p`
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
text-transform: uppercase; text-transform: uppercase;
margin: 0; margin: 0;
font-size: 0.65rem; font-size: 0.65rem;
font-weight: 400; font-weight: 400;
color: ${selectedTheme.accentColor}; color: ${selectedTheme.accentColor};
`; `;
const App = styled.div` const App = styled.div`
display: flex; display: flex;
flex-basis: 25%; flex-basis: 25%;
padding: 1rem; padding: 1rem;
`; `;
const appList = () => ( const appList = () => (
<ListContainer> <ListContainer>
<Headline>Applications</Headline> <Headline>Applications</Headline>
<ItemList> <ItemList>
{ {appData.apps.map((app, index) => (
appData.apps.map((app, index) => ( <Item key={app.name + index}>
<Item key={app.name + index}> <App>
<App> <IconContainer>
<IconContainer> <MaterialIcon icon={app.icon} color={selectedTheme.mainColor} />
<MaterialIcon icon={app.icon} color={selectedTheme.mainColor} /> </IconContainer>
</IconContainer> <DetailsContainer>
<DetailsContainer> <Link href={app.URL}>{app.name}</Link>
<Link href={app.URL}>{app.name}</Link> <Description>{app.displayURL}</Description>
<Description>{app.displayURL}</Description> </DetailsContainer>
</DetailsContainer> </App>
</App> </Item>
</Item> ))}
)) </ItemList>
} </ListContainer>
</ItemList>
</ListContainer>
); );
export default appList; export default appList;

View file

@ -1,57 +1,53 @@
import React from 'react'; import React from "react";
import styled from 'styled-components'; import styled from "styled-components";
import bookmarkData from './data/bookmarks.json'; import bookmarkData from "./data/bookmarks.json";
import getTheme from './themeManager'; import selectedTheme from "./themeManager";
import { Headline, ListContainer, ItemList, Item } from './elements' import { Headline, ListContainer, ItemList, Item } from "./elements";
const selectedTheme = getTheme();
const Group = styled.h4` const Group = styled.h4`
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
font-weight: 700; font-weight: 700;
margin: 0; margin: 0;
text-transform: uppercase; text-transform: uppercase;
color: ${selectedTheme.mainColor}; color: ${selectedTheme.mainColor};
`; `;
const BookmarkGroup = styled.div` const BookmarkGroup = styled.div`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 2 1 auto; flex: 2 1 auto;
padding: 1rem 0 1rem 0; padding: 1rem 0 1rem 0;
`; `;
const Bookmark = styled.a` const Bookmark = styled.a`
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
font-weight: 400; font-weight: 400;
text-decoration: none; text-decoration: none;
color: ${selectedTheme.accentColor}; color: ${selectedTheme.accentColor};
padding: 10px 0 0 0; padding: 10px 0 0 0;
font-size: 14px; font-size: 14px;
`; `;
const bookmarkList = () => ( const bookmarkList = () => (
<ListContainer> <ListContainer>
<Headline>Bookmarks</Headline> <Headline>Bookmarks</Headline>
<ItemList> <ItemList>
{ {bookmarkData.groups.map((group, index) => (
bookmarkData.groups.map((group, index) => ( <Item key={group.name + index}>
<Item key={group.name + index}> <BookmarkGroup>
<BookmarkGroup> <Group>{group.name}</Group>
<Group>{group.name}</Group> {group.items.map(link => (
{ <Bookmark key={link.name} href={link.url}>
group.items.map((link) => ( {link.name}
<Bookmark key={link.name} href={link.url}>{link.name}</Bookmark> </Bookmark>
)) ))}
} </BookmarkGroup>
</BookmarkGroup> </Item>
</Item> ))}
)) </ItemList>
} </ListContainer>
</ItemList>
</ListContainer>
); );
export default bookmarkList; export default bookmarkList;

View file

@ -1,34 +1,32 @@
import styled from 'styled-components'; import styled from "styled-components";
import getTheme from './themeManager'; import selectedTheme from "./themeManager";
const selectedTheme = getTheme();
const ListContainer = styled.div` const ListContainer = styled.div`
padding: 2rem 0 2rem 0; padding: 2rem 0 2rem 0;
`; `;
const Headline = styled.h3` const Headline = styled.h3`
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
font-weight: 900; font-weight: 900;
text-transform: uppercase; text-transform: uppercase;
margin: 0px; margin: 0px;
font-size: 1.5rem; font-size: 1.5rem;
color: ${selectedTheme.mainColor}; color: ${selectedTheme.mainColor};
`; `;
const ItemList = styled.ul` const ItemList = styled.ul`
display: grid; display: grid;
grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
grid-gap: 1rem; grid-gap: 1rem;
padding: 0; padding: 0;
list-style: none; list-style: none;
`; `;
const Item = styled.li` const Item = styled.li`
max-height: 100px; max-height: 100px;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
list-style: none; list-style: none;
`; `;
export { Headline, ListContainer, ItemList, Item } export { Headline, ListContainer, ItemList, Item };

View file

@ -1,70 +1,97 @@
import React from 'react'; import React from "react";
import styled from 'styled-components'; import styled from "styled-components";
import getTheme from './themeManager'; import selectedTheme from "./themeManager";
const selectedTheme = getTheme();
const GreeterContainer = styled.div` const GreeterContainer = styled.div`
padding: 2rem 0 2rem 0; padding: 2rem 0 2rem 0;
`; `;
const GreetText = styled.h1` const GreetText = styled.h1`
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
font-weight: 900; font-weight: 900;
font-size: 45px; font-size: 45px;
margin: 0.5rem 0 0.5rem 0; margin: 0.5rem 0 0.5rem 0;
color: ${selectedTheme.mainColor}; color: ${selectedTheme.mainColor};
`; `;
const DateText = styled.h3` const DateText = styled.h3`
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
font-weight: 400; font-weight: 400;
font-size: 15px; font-size: 15px;
text-transform: uppercase; text-transform: uppercase;
margin: 0; margin: 0;
color: ${selectedTheme.accentColor}; color: ${selectedTheme.accentColor};
`; `;
const getGreeting = () => { const getGreeting = () => {
// Maybe add some expandability for different greetings? // Maybe add some expandability for different greetings?
return "Hello World!" return "Hello World!";
} };
const getExtension = (day) => { const getExtension = day => {
let extension = "" let extension = "";
if ((day > 4 && day <= 20) || (day > 20 && day % 10 >= 4)) { if ((day > 4 && day <= 20) || (day > 20 && day % 10 >= 4)) {
extension = "th" extension = "th";
} else if (day % 10 === 1) { } else if (day % 10 === 1) {
extension = "st" extension = "st";
} else if (day % 10 === 2) { } else if (day % 10 === 2) {
extension = "nd" extension = "nd";
} else if (day % 10 === 3) { } else if (day % 10 === 3) {
extension = "rd" extension = "rd";
} }
return extension return extension;
} };
const getDateString = () => { const getDateString = () => {
let currentDate = new Date(); let currentDate = new Date();
const monthNames = [ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" ]; const monthNames = [
const weekDayNames = [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ]; "January",
return weekDayNames[currentDate.getUTCDay()] + ", " + monthNames[currentDate.getUTCMonth()] + " " + currentDate.getDate() + getExtension(currentDate.getDate()) + " " + currentDate.getFullYear(); "February",
} "March",
"April",
"May",
"June",
"July",
"August",
"September",
"October",
"November",
"December"
];
const weekDayNames = [
"Sunday",
"Monday",
"Tuesday",
"Wednesday",
"Thursday",
"Friday",
"Saturday"
];
return (
weekDayNames[currentDate.getUTCDay()] +
", " +
monthNames[currentDate.getUTCMonth()] +
" " +
currentDate.getDate() +
getExtension(currentDate.getDate()) +
" " +
currentDate.getFullYear()
);
};
const greeter = () => { const greeter = () => {
let date = getDateString();
let greeting = getGreeting();
let date = getDateString(); return (
let greeting = getGreeting(); <GreeterContainer>
<DateText>{date}</DateText>
<GreetText>{greeting}</GreetText>
</GreeterContainer>
);
};
return ( export default greeter;
<GreeterContainer>
<DateText>{ date }</DateText>
<GreetText>{ greeting }</GreetText>
</GreeterContainer>
);
}
export default greeter;

View file

@ -1,67 +1,66 @@
import React, {useState} from 'react'; import React, { useState } from "react";
import styled from 'styled-components'; import styled from "styled-components";
import searchData from './data/search.json'; import searchData from "./data/search.json";
import getTheme from './themeManager'; import selectedTheme from "./themeManager";
const selectedTheme = getTheme();
const SearchInput = styled.input` const SearchInput = styled.input`
width: 100%; width: 100%;
font-size: 16px; font-size: 16px;
border: none; border: none;
border-bottom: 1px solid ${selectedTheme.accentColor}; border-bottom: 1px solid ${selectedTheme.accentColor};
background: none; background: none;
border-radius: 0; border-radius: 0;
color: ${selectedTheme.mainColor}; color: ${selectedTheme.mainColor};
`; `;
const handleQueryWithProvider = (query) => { const handleQueryWithProvider = query => {
let queryArray = query.split(" ");
let queryArray = query.split(" "); let prefix = queryArray[0];
let prefix = queryArray[0]; queryArray.shift();
queryArray.shift(); let searchQuery = queryArray.join(" ");
let searchQuery = queryArray.join(" "); var foundProvider = false;
searchData.providers.forEach(provider => {
var foundProvider = false; if (provider.prefix === prefix) {
searchData.providers.forEach((provider) => { foundProvider = true;
if (provider.prefix === prefix) { window.location = provider.url + searchQuery;
foundProvider = true;
window.location = provider.url + searchQuery
}
})
if (!foundProvider) {
window.location = "https://google.com/search?q=" + query;
} }
} });
if (!foundProvider) {
window.location = "https://google.com/search?q=" + query;
}
};
const SearchBar = () => { const SearchBar = () => {
let [input, setInput] = useState();
let [input, setInput] = useState(); const handleSearchQuery = e => {
var query = input;
const handleSearchQuery = (e) => { if (query.split(" ")[0].includes("/")) {
handleQueryWithProvider(query);
var query = input; } else {
window.location = "https://google.com/search?q=" + query;
if (query.split(" ")[0].includes("/")) {
handleQueryWithProvider(query)
} else {
window.location = "https://google.com/search?q=" + query;
}
e.preventDefault();
} }
return ( e.preventDefault();
<form onSubmit={(e) => handleSearchQuery(e)}> };
<SearchInput type="text" onChange={(e) => setInput(e.target.value)}></SearchInput>
<button type="submit" hidden />
</form>
)
}
export default SearchBar; return (
<form onSubmit={e => handleSearchQuery(e)}>
<SearchInput
type="text"
onChange={e => setInput(e.target.value)}
></SearchInput>
<button type="submit" hidden />
</form>
);
};
export default SearchBar;

View file

@ -1,173 +1,177 @@
import React, { useState } from 'react'; import React, { useState } from "react";
import MaterialIcon from 'material-icons-react'; import MaterialIcon from "material-icons-react";
import styled from 'styled-components'; import styled from "styled-components";
import Select from 'react-select'; import Select from "react-select";
import searchData from './data/search.json' import searchData from "./data/search.json";
import themeData from './data/themes.json' import themeData from "./data/themes.json";
import getTheme, { setTheme } from './themeManager' import selectedTheme, { setTheme } from "./themeManager";
const selectedTheme = getTheme();
const ModalButton = styled.button` const ModalButton = styled.button`
float: right; float: right;
border: none; border: none;
background: none; background: none;
padding: 10px; padding: 10px;
`; `;
const ExitButton = styled.button` const ExitButton = styled.button`
float: right; float: right;
border: none; border: none;
background: none; background: none;
`; `;
const Modal = styled.div` const Modal = styled.div`
position: absolute; position: absolute;
left: 50%; left: 50%;
top: 50%; top: 50%;
padding: 1rem; padding: 1rem;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
z-index: 10; z-index: 10;
border: 1px solid ${selectedTheme.mainColor}; border: 1px solid ${selectedTheme.mainColor};
background-color: ${selectedTheme.backgroundColor}; background-color: ${selectedTheme.backgroundColor};
`; `;
const SelectContainer = styled.div` const SelectContainer = styled.div`
padding-bottom: 1rem; padding-bottom: 1rem;
`; `;
const FormContainer = styled.div` const FormContainer = styled.div`
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: nowrap; flex-wrap: nowrap;
`; `;
const ApplyButton = styled.button` const ApplyButton = styled.button`
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
text-transform: uppercase; text-transform: uppercase;
font-weight: 400; font-weight: 400;
border: 1px solid ${selectedTheme.mainColor}; border: 1px solid ${selectedTheme.mainColor};
color: ${selectedTheme.mainColor}; color: ${selectedTheme.mainColor};
background: none; background: none;
margin-left: 1rem; margin-left: 1rem;
`; `;
const Headline = styled.h3` const Headline = styled.h3`
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
font-weight: 900; font-weight: 900;
color: ${selectedTheme.mainColor}; color: ${selectedTheme.mainColor};
margin-top: 0; margin-top: 0;
`; `;
const Table = styled.table` const Table = styled.table`
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
font-weight: 400; font-weight: 400;
background: none; background: none;
color: ${selectedTheme.mainColor}; color: ${selectedTheme.mainColor};
`; `;
const TableRow = styled.tr` const TableRow = styled.tr`
border-bottom: 1px solid ${selectedTheme.mainColor}; border-bottom: 1px solid ${selectedTheme.mainColor};
`; `;
const TableCell = styled.td` const TableCell = styled.td`
background: none; background: none;
padding-top: 0.5rem; padding-top: 0.5rem;
`; `;
const HeadCell = styled.th` const HeadCell = styled.th`
font-weight: 700; font-weight: 700;
background: none; background: none;
`; `;
const SelectorStyle = { const SelectorStyle = {
control: (provided) => ({ control: provided => ({
...provided, ...provided,
fontFamily: "Roboto, sans-serif", fontFamily: "Roboto, sans-serif",
fontWeight: "500", fontWeight: "500",
color: selectedTheme.mainColor, color: selectedTheme.mainColor,
textTransform: "uppercase", textTransform: "uppercase",
width: "200px", width: "200px",
background: "none", background: "none",
borderRadius: "0px", borderRadius: "0px",
border: "1px solid " + selectedTheme.mainColor, border: "1px solid " + selectedTheme.mainColor,
boxShadow: 0, boxShadow: 0,
'&:hover': { "&:hover": {
border: "1px solid " + selectedTheme.mainColor, border: "1px solid " + selectedTheme.mainColor
}
}),
menu: (provided) => ({
...provided,
backgroundColor: selectedTheme.backgroundColor,
border: "1px solid " + selectedTheme.mainColor,
borderRadius: "0px",
boxShadow: 0,
}),
option: (provided) => ({
...provided,
fontFamily: "Roboto, sans-serif",
fontWeight: "500",
color: selectedTheme.mainColor,
textTransform: "uppercase",
borderRadius: "0px",
boxShadow: 0,
backgroundColor: selectedTheme.backgroundColor,
'&:hover': {
backgroundColor: selectedTheme.mainColor,
color: selectedTheme.backgroundColor,
}
}),
singleValue: (provided) => {
return {
...provided,
color: selectedTheme.mainColor,
}
} }
} }),
menu: provided => ({
...provided,
backgroundColor: selectedTheme.backgroundColor,
border: "1px solid " + selectedTheme.mainColor,
borderRadius: "0px",
boxShadow: 0
}),
option: provided => ({
...provided,
fontFamily: "Roboto, sans-serif",
fontWeight: "500",
color: selectedTheme.mainColor,
textTransform: "uppercase",
borderRadius: "0px",
boxShadow: 0,
backgroundColor: selectedTheme.backgroundColor,
"&:hover": {
backgroundColor: selectedTheme.mainColor,
color: selectedTheme.backgroundColor
}
}),
singleValue: provided => {
return {
...provided,
color: selectedTheme.mainColor
};
}
};
const SettingsModal = () => { const SettingsModal = () => {
const [modalHidden, setModalHidden] = useState(true);
const [newTheme, setNewTheme] = useState();
const [modalHidden, setModalHidden] = useState(true); return (
const [newTheme, setNewTheme] = useState(); <>
<ModalButton onClick={() => setModalHidden(!modalHidden)}>
<MaterialIcon icon="settings" color={selectedTheme.mainColor} />
</ModalButton>
<Modal hidden={modalHidden}>
<ExitButton onClick={() => setModalHidden(!modalHidden)}>
<MaterialIcon icon="close" color={selectedTheme.mainColor} />
</ExitButton>
<SelectContainer>
<Headline>Theme:</Headline>
<FormContainer>
<Select
options={themeData.themes}
defaultValue={selectedTheme}
onChange={e => {
setNewTheme(e);
}}
styles={SelectorStyle}
/>
<ApplyButton onClick={() => setTheme(JSON.stringify(newTheme))}>
Apply
</ApplyButton>
</FormContainer>
</SelectContainer>
<Table>
<tbody>
<TableRow>
<HeadCell>Search Provider</HeadCell>
<HeadCell>Prefix</HeadCell>
</TableRow>
{searchData.providers.map((provider, index) => (
<TableRow key={provider.name + index}>
<TableCell>{provider.name}</TableCell>
<TableCell>{provider.prefix}</TableCell>
</TableRow>
))}
</tbody>
</Table>
</Modal>
</>
);
};
return ( export default SettingsModal;
<>
<ModalButton onClick={() => setModalHidden(!modalHidden)}>
<MaterialIcon icon="settings" color={selectedTheme.mainColor} />
</ModalButton>
<Modal hidden={modalHidden}>
<ExitButton onClick={() => setModalHidden(!modalHidden)}>
<MaterialIcon icon="close" color={selectedTheme.mainColor} />
</ExitButton>
<SelectContainer>
<Headline>Theme:</Headline>
<FormContainer>
<Select options={themeData.themes} defaultValue={selectedTheme} onChange={(e) => {setNewTheme(e)}} styles={SelectorStyle} />
<ApplyButton onClick={() => setTheme(JSON.stringify(newTheme))}>Apply</ApplyButton>
</FormContainer>
</SelectContainer>
<Table>
<tbody>
<TableRow>
<HeadCell>Search Provider</HeadCell>
<HeadCell>Prefix</HeadCell>
</TableRow>
{
searchData.providers.map((provider, index) => (
<TableRow key={provider.name + index}>
<TableCell>{provider.name}</TableCell>
<TableCell>{provider.prefix}</TableCell>
</TableRow>
))
}
</tbody>
</Table>
</Modal>
</>
)
}
export default SettingsModal;

View file

@ -1,25 +1,29 @@
import themeData from './data/themes.json'; import themeData from "./data/themes.json";
const setTheme = (theme) => { const setTheme = theme => {
localStorage.setItem("theme", theme); localStorage.setItem("theme", theme);
window.location.reload(); window.location.reload();
} };
const resetTheme = () => { const resetTheme = () => {
localStorage.removeItem("theme"); localStorage.removeItem("theme");
} };
const getTheme = () => { const getTheme = () => {
let selectedTheme = themeData.themes[0];
let selectedTheme = themeData.themes[0]; if (
localStorage.getItem("theme") &&
localStorage.getItem("theme") !== undefined
) {
selectedTheme = JSON.parse(localStorage.getItem("theme"));
}
if (localStorage.getItem("theme") && localStorage.getItem("theme") !== undefined) { return selectedTheme;
selectedTheme = JSON.parse(localStorage.getItem("theme")); };
}
return selectedTheme; const selectedTheme = getTheme();
}
export { setTheme, resetTheme } export { setTheme, resetTheme };
export default getTheme; export default selectedTheme;