From 7e784654069d9fdacd66dc4098b01c3e712ea7b5 Mon Sep 17 00:00:00 2001 From: alexsparkes Date: Sat, 24 Feb 2024 20:17:11 +0000 Subject: [PATCH] refactor(widgets): Move to new layout of widgets and options --- .../Elements/AddModal}/AddModal.jsx | 3 +- src/components/Elements/AddModal/index.jsx | 1 + src/components/Elements/index.jsx | 1 + .../modals/main/settings/sections/Navbar.jsx | 6 +- .../main/settings/sections/QuickLinks.jsx | 2 +- .../sections/quicklinks/QuickLink.jsx | 68 ----- src/features/modals/main/tabs/Settings.jsx | 125 ++------ src/features/widgets/greeting/index.jsx | 2 + .../greeting/options/GreetingOptions.jsx | 100 +++++++ .../widgets/greeting/options/index.jsx | 1 + src/features/widgets/message/Message.jsx | 2 +- src/features/widgets/message/index.jsx | 2 + .../widgets/message/message_defaults.json | 0 .../message/options/MessageOptions.jsx} | 4 +- .../widgets/message/options/index.jsx | 1 + .../widgets/quicklinks/QuickLinks.jsx | 4 +- src/features/widgets/quicklinks/index.jsx | 2 + .../quicklinks/options/QuickLinksOptions.jsx | 275 ++++++++++++++++++ .../widgets/quicklinks/options/index.jsx | 1 + src/features/widgets/search/index.jsx | 2 + .../widgets/search/options/SearchOptions.jsx | 174 +++++++++++ src/features/widgets/search/options/index.jsx | 1 + src/features/widgets/weather/Weather.jsx | 4 +- src/features/widgets/weather/index.jsx | 2 + .../weather/options/WeatherOptions.jsx} | 4 +- .../widgets/weather/options/index.jsx | 1 + ....timestamp-1708789619302-8ea1d206b4f95.mjs | 110 +++++++ 27 files changed, 727 insertions(+), 171 deletions(-) rename src/{features/modals/main/settings/sections/quicklinks => components/Elements/AddModal}/AddModal.jsx (96%) create mode 100644 src/components/Elements/AddModal/index.jsx delete mode 100644 src/features/modals/main/settings/sections/quicklinks/QuickLink.jsx create mode 100644 src/features/widgets/greeting/index.jsx create mode 100644 src/features/widgets/greeting/options/GreetingOptions.jsx create mode 100644 src/features/widgets/greeting/options/index.jsx create mode 100644 src/features/widgets/message/index.jsx create mode 100644 src/features/widgets/message/message_defaults.json rename src/features/{modals/main/settings/sections/Message.jsx => widgets/message/options/MessageOptions.jsx} (97%) create mode 100644 src/features/widgets/message/options/index.jsx create mode 100644 src/features/widgets/quicklinks/index.jsx create mode 100644 src/features/widgets/quicklinks/options/QuickLinksOptions.jsx create mode 100644 src/features/widgets/quicklinks/options/index.jsx create mode 100644 src/features/widgets/search/index.jsx create mode 100644 src/features/widgets/search/options/SearchOptions.jsx create mode 100644 src/features/widgets/search/options/index.jsx create mode 100644 src/features/widgets/weather/index.jsx rename src/features/{modals/main/settings/sections/Weather.jsx => widgets/weather/options/WeatherOptions.jsx} (98%) create mode 100644 src/features/widgets/weather/options/index.jsx create mode 100644 vite.config.mjs.timestamp-1708789619302-8ea1d206b4f95.mjs diff --git a/src/features/modals/main/settings/sections/quicklinks/AddModal.jsx b/src/components/Elements/AddModal/AddModal.jsx similarity index 96% rename from src/features/modals/main/settings/sections/quicklinks/AddModal.jsx rename to src/components/Elements/AddModal/AddModal.jsx index fe0c7c12..26b23403 100644 --- a/src/features/modals/main/settings/sections/quicklinks/AddModal.jsx +++ b/src/components/Elements/AddModal/AddModal.jsx @@ -76,4 +76,5 @@ function AddModal({ urlError, iconError, addLink, closeModal, edit, editData, ed ); } -export default memo(AddModal); +const MemoizedAddModal = memo(AddModal); +export { MemoizedAddModal as default, MemoizedAddModal as AddModal} \ No newline at end of file diff --git a/src/components/Elements/AddModal/index.jsx b/src/components/Elements/AddModal/index.jsx new file mode 100644 index 00000000..9d77026e --- /dev/null +++ b/src/components/Elements/AddModal/index.jsx @@ -0,0 +1 @@ +export * from './AddModal'; \ No newline at end of file diff --git a/src/components/Elements/index.jsx b/src/components/Elements/index.jsx index 6821f83a..73e09d1c 100644 --- a/src/components/Elements/index.jsx +++ b/src/components/Elements/index.jsx @@ -1,3 +1,4 @@ export * from './Button'; export * from './Tooltip'; export * from './ShareModal'; +export * from './AddModal'; diff --git a/src/features/modals/main/settings/sections/Navbar.jsx b/src/features/modals/main/settings/sections/Navbar.jsx index 42affcbe..36abfb94 100644 --- a/src/features/modals/main/settings/sections/Navbar.jsx +++ b/src/features/modals/main/settings/sections/Navbar.jsx @@ -5,7 +5,7 @@ import { useState, memo } from 'react'; import Modal from 'react-modal'; import { MdAddLink } from 'react-icons/md'; -import AddModal from './quicklinks/AddModal'; +import { AddModal } from 'components/Elements/AddModal'; import Checkbox from '../../../../../components/Form/Settings/Checkbox/Checkbox'; import Dropdown from '../../../../../components/Form/Settings/Dropdown/Dropdown'; @@ -14,7 +14,7 @@ import { Button } from 'components/Elements'; import { Row, Content, Action } from '../../../../../components/Layout/Settings/Item/SettingsItem'; import { Header } from 'components/Layout/Settings'; import { getTitleFromUrl, isValidUrl } from 'utils/links'; -import QuickLink from './quicklinks/QuickLink'; +import { QuickLinks } from 'features/widgets/quicklinks'; function Navbar() { const [showRefreshOptions, setShowRefreshOptions] = useState( @@ -240,7 +240,7 @@ function Navbar() {
{appsModalInfo.items.map((item, i) => ( - startEditLink(item)} diff --git a/src/features/modals/main/settings/sections/QuickLinks.jsx b/src/features/modals/main/settings/sections/QuickLinks.jsx index 44f330a8..fe7a05f3 100644 --- a/src/features/modals/main/settings/sections/QuickLinks.jsx +++ b/src/features/modals/main/settings/sections/QuickLinks.jsx @@ -270,4 +270,4 @@ export default class QuickLinks extends PureComponent { ); } -} +} \ No newline at end of file diff --git a/src/features/modals/main/settings/sections/quicklinks/QuickLink.jsx b/src/features/modals/main/settings/sections/quicklinks/QuickLink.jsx deleted file mode 100644 index 41b462df..00000000 --- a/src/features/modals/main/settings/sections/quicklinks/QuickLink.jsx +++ /dev/null @@ -1,68 +0,0 @@ -import variables from 'config/variables'; - -import { MdEdit, MdCancel } from 'react-icons/md'; - -const QuickLink = ({ item, deleteLink, startEditLink }) => { - let target, - rel = null; - if (localStorage.getItem('quicklinksnewtab') === 'true') { - target = '_blank'; - rel = 'noopener noreferrer'; - } - - const useText = localStorage.getItem('quicklinksText') === 'true'; - - if (useText) { - return ( - deleteLink(item.key, e)} - href={item.url} - target={target} - rel={rel} - draggable={false} - > - {item.name} - - ); - } - - const img = - item.icon || - 'https://icon.horse/icon/ ' + item.url.replace('https://', '').replace('http://', ''); - - return ( -
-
- {item.name} -
-
-
{item.name}
- -
-
-
- - -
-
-
- ); -}; - -export default QuickLink; diff --git a/src/features/modals/main/tabs/Settings.jsx b/src/features/modals/main/tabs/Settings.jsx index 474ac45d..461c9d75 100644 --- a/src/features/modals/main/tabs/Settings.jsx +++ b/src/features/modals/main/tabs/Settings.jsx @@ -5,15 +5,15 @@ import Tabs from './backend/Tabs'; import Overview from '../settings/sections/Overview'; import Navbar from '../settings/sections/Navbar'; -import Greeting from '../settings/sections/Greeting'; +import { GreetingOptions } from 'features/widgets/greeting'; import Time from '../settings/sections/Time'; -import QuickLinks from '../settings/sections/QuickLinks'; +import { QuickLinksOptions } from 'features/widgets/quicklinks'; import Quote from '../settings/sections/Quote'; import Date from '../settings/sections/Date'; -import Message from '../settings/sections/Message'; +import { MessageOptions } from 'features/widgets/message'; import Background from '../settings/sections/background/Background'; -import Search from '../settings/sections/Search'; -import Weather from '../settings/sections/Weather'; +import { SearchOptions } from 'features/widgets/search'; +import { WeatherOptions } from 'features/widgets/weather'; import Appearance from '../settings/sections/Appearance'; import Language from '../settings/sections/Language'; import Advanced from '../settings/sections/Advanced'; @@ -22,98 +22,37 @@ import Experimental from '../settings/sections/Experimental'; import Changelog from '../settings/sections/Changelog'; import About from '../settings/sections/About'; +const sections = [ + { label: 'modals.main.marketplace.product.overview', name: 'order', component: Overview }, + { label: 'modals.main.settings.sections.appearance.navbar.title', name: 'navbar', component: Navbar }, + { label: 'modals.main.settings.sections.greeting.title', name: 'greeting', component: GreetingOptions }, + { label: 'modals.main.settings.sections.time.title', name: 'time', component: Time }, + { label: 'modals.main.settings.sections.quicklinks.title', name: 'quicklinks', component: QuickLinksOptions }, + { label: 'modals.main.settings.sections.quote.title', name: 'quote', component: Quote }, + { label: 'modals.main.settings.sections.date.title', name: 'date', component: Date }, + { label: 'modals.main.settings.sections.message.title', name: 'message', component: MessageOptions }, + { label: 'modals.main.settings.sections.background.title', name: 'background', component: Background }, + { label: 'modals.main.settings.sections.search.title', name: 'search', component: SearchOptions }, + { label: 'modals.main.settings.sections.weather.title', name: 'weather', component: WeatherOptions }, + { label: 'modals.main.settings.sections.appearance.title', name: 'appearance', component: Appearance }, + { label: 'modals.main.settings.sections.language.title', name: 'language', component: Language }, + { label: 'modals.main.settings.sections.advanced.title', name: 'advanced', component: Advanced }, + { label: 'modals.main.settings.sections.stats.title', name: 'stats', component: Stats }, + { label: 'modals.main.settings.sections.experimental.title', name: 'experimental', component: Experimental }, + { label: 'modals.main.settings.sections.changelog.title', name: 'changelog', component: Changelog }, + { label: 'modals.main.settings.sections.about.title', name: 'about', component: About }, +]; + function Settings(props) { return ( props.changeTab(type)} current="settings"> -
- -
-
- -
-
- -
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
+ {sections.map(({ label, name, component: Component }) => ( +
+ +
+ ))} ); } -export default memo(Settings); +export default memo(Settings); \ No newline at end of file diff --git a/src/features/widgets/greeting/index.jsx b/src/features/widgets/greeting/index.jsx new file mode 100644 index 00000000..5a75ab25 --- /dev/null +++ b/src/features/widgets/greeting/index.jsx @@ -0,0 +1,2 @@ +export * from './options'; +export * from './Greeting'; \ No newline at end of file diff --git a/src/features/widgets/greeting/options/GreetingOptions.jsx b/src/features/widgets/greeting/options/GreetingOptions.jsx new file mode 100644 index 00000000..8fe2ec80 --- /dev/null +++ b/src/features/widgets/greeting/options/GreetingOptions.jsx @@ -0,0 +1,100 @@ +import variables from 'config/variables'; +import { useState } from 'react'; + +import { Header, Row, Content, Action, PreferencesWrapper } from 'components/Layout/Settings'; +import { Checkbox, Switch, Text } from 'components/Form/Settings'; + +const GreetingOptions = () => { + const [birthday, setBirthday] = useState( + new Date(localStorage.getItem('birthday')) || new Date(), + ); + + const changeDate = (e) => { + const newDate = e.target.value ? new Date(e.target.value) : new Date(); + localStorage.setItem('birthday', newDate); + setBirthday(newDate); + }; + + const GREETING_SECTION = 'modals.main.settings.sections.greeting'; + + const AdditionalOptions = () => { + return ( + + + + + + + + + ); + }; + + const BirthdayOptions = () => { + return ( + + + + + +

+ {variables.getMessage(`${GREETING_SECTION}.birthday_date`)} +

+ + + + ); + }; + + return ( + <> +
+ + + {BirthdayOptions()} + + + ); +}; + +export { GreetingOptions as default, GreetingOptions }; diff --git a/src/features/widgets/greeting/options/index.jsx b/src/features/widgets/greeting/options/index.jsx new file mode 100644 index 00000000..48a5be47 --- /dev/null +++ b/src/features/widgets/greeting/options/index.jsx @@ -0,0 +1 @@ +export * from './GreetingOptions'; \ No newline at end of file diff --git a/src/features/widgets/message/Message.jsx b/src/features/widgets/message/Message.jsx index adbcae16..d7dd5070 100644 --- a/src/features/widgets/message/Message.jsx +++ b/src/features/widgets/message/Message.jsx @@ -42,4 +42,4 @@ const Message = () => { ); }; -export default Message; +export { Message as default, Message }; diff --git a/src/features/widgets/message/index.jsx b/src/features/widgets/message/index.jsx new file mode 100644 index 00000000..bd85bdff --- /dev/null +++ b/src/features/widgets/message/index.jsx @@ -0,0 +1,2 @@ +export * from './Message'; +export * from './options'; \ No newline at end of file diff --git a/src/features/widgets/message/message_defaults.json b/src/features/widgets/message/message_defaults.json new file mode 100644 index 00000000..e69de29b diff --git a/src/features/modals/main/settings/sections/Message.jsx b/src/features/widgets/message/options/MessageOptions.jsx similarity index 97% rename from src/features/modals/main/settings/sections/Message.jsx rename to src/features/widgets/message/options/MessageOptions.jsx index d85a56da..af1853ef 100644 --- a/src/features/modals/main/settings/sections/Message.jsx +++ b/src/features/widgets/message/options/MessageOptions.jsx @@ -8,7 +8,7 @@ import { Header, Row, Content, Action, PreferencesWrapper } from 'components/Lay import { Button } from 'components/Elements'; import EventBus from 'utils/eventbus'; -export default class Message extends PureComponent { +class MessageOptions extends PureComponent { constructor() { super(); this.state = { @@ -141,3 +141,5 @@ export default class Message extends PureComponent { ); } } + +export { MessageOptions as default, MessageOptions }; \ No newline at end of file diff --git a/src/features/widgets/message/options/index.jsx b/src/features/widgets/message/options/index.jsx new file mode 100644 index 00000000..5c290397 --- /dev/null +++ b/src/features/widgets/message/options/index.jsx @@ -0,0 +1 @@ +export * from './MessageOptions'; \ No newline at end of file diff --git a/src/features/widgets/quicklinks/QuickLinks.jsx b/src/features/widgets/quicklinks/QuickLinks.jsx index 9f75c8be..da988abe 100644 --- a/src/features/widgets/quicklinks/QuickLinks.jsx +++ b/src/features/widgets/quicklinks/QuickLinks.jsx @@ -5,7 +5,7 @@ import EventBus from 'utils/eventbus'; import './quicklinks.scss'; -export default class QuickLinks extends PureComponent { +class QuickLinks extends PureComponent { constructor() { super(); this.state = { @@ -119,3 +119,5 @@ export default class QuickLinks extends PureComponent { ); } } + +export { QuickLinks as default, QuickLinks }; \ No newline at end of file diff --git a/src/features/widgets/quicklinks/index.jsx b/src/features/widgets/quicklinks/index.jsx new file mode 100644 index 00000000..2f7b4883 --- /dev/null +++ b/src/features/widgets/quicklinks/index.jsx @@ -0,0 +1,2 @@ +export * from './options'; +export * from './QuickLinks'; \ No newline at end of file diff --git a/src/features/widgets/quicklinks/options/QuickLinksOptions.jsx b/src/features/widgets/quicklinks/options/QuickLinksOptions.jsx new file mode 100644 index 00000000..2da4b778 --- /dev/null +++ b/src/features/widgets/quicklinks/options/QuickLinksOptions.jsx @@ -0,0 +1,275 @@ +import variables from 'config/variables'; +import { PureComponent, createRef } from 'react'; +import { MdAddLink, MdLinkOff } from 'react-icons/md'; +import { Header, Row, Content, Action, PreferencesWrapper } from 'components/Layout/Settings'; +import { Checkbox, Dropdown } from 'components/Form/Settings'; +import { Button } from 'components/Elements'; +import Modal from 'react-modal'; + +import { AddModal } from 'components/Elements/AddModal'; + +import EventBus from 'utils/eventbus'; +import { QuickLink } from '../QuickLinks'; +import { getTitleFromUrl, isValidUrl } from 'utils/links'; + +class QuickLinksOptions extends PureComponent { + constructor() { + super(); + this.state = { + items: JSON.parse(localStorage.getItem('quicklinks')), + showAddModal: false, + urlError: '', + iconError: '', + edit: false, + editData: '', + }; + this.quicklinksContainer = createRef(); + } + + deleteLink(key, event) { + event.preventDefault(); + + // remove link from array + const data = JSON.parse(localStorage.getItem('quicklinks')).filter((i) => i.key !== key); + + localStorage.setItem('quicklinks', JSON.stringify(data)); + this.setState({ + items: data, + }); + + variables.stats.postEvent('feature', 'Quicklink delete'); + } + + async addLink(name, url, icon) { + const data = JSON.parse(localStorage.getItem('quicklinks')); + + if (!url.startsWith('http://') && !url.startsWith('https://')) { + url = 'http://' + url; + } + + if (url.length <= 0 || isValidUrl(url) === false) { + return this.setState({ + urlError: variables.getMessage('widgets.quicklinks.url_error'), + }); + } + + if (icon.length > 0 && isValidUrl(icon) === false) { + return this.setState({ + iconError: variables.getMessage('widgets.quicklinks.url_error'), + }); + } + + data.push({ + name: name || (await getTitleFromUrl(url)), + url, + icon: icon || '', + key: Math.random().toString(36).substring(7) + 1, + }); + + localStorage.setItem('quicklinks', JSON.stringify(data)); + + this.setState({ + items: data, + showAddModal: false, + urlError: '', + iconError: '', + }); + + variables.stats.postEvent('feature', 'Quicklink add'); + } + + startEditLink(data) { + this.setState({ + edit: true, + editData: data, + showAddModal: true, + }); + } + + async editLink(og, name, url, icon) { + const data = JSON.parse(localStorage.getItem('quicklinks')); + const dataobj = data.find((i) => i.key === og.key); + dataobj.name = name || (await getTitleFromUrl(url)); + dataobj.url = url; + dataobj.icon = icon || ''; + + localStorage.setItem('quicklinks', JSON.stringify(data)); + + this.setState({ + items: data, + showAddModal: false, + edit: false, + }); + } + + componentDidMount() { + EventBus.on('refresh', (data) => { + if (data === 'quicklinks') { + if (localStorage.getItem('quicklinksenabled') === 'false') { + return (this.quicklinksContainer.current.style.display = 'none'); + } + + this.quicklinksContainer.current.style.display = 'block'; + + this.setState({ + items: JSON.parse(localStorage.getItem('quicklinks')), + }); + } + }); + } + + componentWillUnmount() { + EventBus.off('refresh'); + } + + render() { + const QUICKLINKS_SECTION = 'modals.main.settings.sections.quicklinks'; + + const AdditionalSettings = () => { + return ( + + + + + + + + ); + }; + + const StylingOptions = () => { + return ( + + + + + + + ); + }; + + const AddLink = () => { + return ( + + + +
+ + )} + + +
+ {this.state.items.map((item, i) => ( + this.startEditLink(item)} + deleteLink={(key, e) => this.deleteLink(key, e)} + /> + ))} +
+ this.setState({ showAddModal: false, urlError: '', iconError: '' })} + isOpen={this.state.showAddModal} + className="Modal resetmodal mainModal" + overlayClassName="Overlay resetoverlay" + ariaHideApp={false} + > + this.addLink(name, url, icon)} + editLink={(og, name, url, icon) => this.editLink(og, name, url, icon)} + edit={this.state.edit} + editData={this.state.editData} + closeModal={() => + this.setState({ showAddModal: false, urlError: '', iconError: '', edit: false }) + } + /> + + + ); + } +} + +export { QuickLinksOptions as default, QuickLinksOptions }; \ No newline at end of file diff --git a/src/features/widgets/quicklinks/options/index.jsx b/src/features/widgets/quicklinks/options/index.jsx new file mode 100644 index 00000000..3a1a800a --- /dev/null +++ b/src/features/widgets/quicklinks/options/index.jsx @@ -0,0 +1 @@ +export * from './QuickLinksOptions'; \ No newline at end of file diff --git a/src/features/widgets/search/index.jsx b/src/features/widgets/search/index.jsx new file mode 100644 index 00000000..ca5d4651 --- /dev/null +++ b/src/features/widgets/search/index.jsx @@ -0,0 +1,2 @@ +export * from './options'; +export * from './Search'; \ No newline at end of file diff --git a/src/features/widgets/search/options/SearchOptions.jsx b/src/features/widgets/search/options/SearchOptions.jsx new file mode 100644 index 00000000..bb13527c --- /dev/null +++ b/src/features/widgets/search/options/SearchOptions.jsx @@ -0,0 +1,174 @@ +import variables from 'config/variables'; +import { PureComponent } from 'react'; +import { toast } from 'react-toastify'; +import { MenuItem, TextField } from '@mui/material'; + +import { Header, Row, Content, Action, PreferencesWrapper } from 'components/Layout/Settings'; +import { Dropdown, Checkbox } from 'components/Form/Settings'; + +import EventBus from 'utils/eventbus'; + +import searchEngines from 'features/widgets/search/search_engines.json'; + +class SearchOptions extends PureComponent { + constructor() { + super(); + this.state = { + customEnabled: false, + customValue: localStorage.getItem('customSearchEngine') || '', + }; + } + + resetSearch() { + localStorage.removeItem('customSearchEngine'); + this.setState({ + customValue: '', + }); + + toast(variables.getMessage('toasts.reset')); + } + + componentDidMount() { + if (localStorage.getItem('searchEngine') === 'custom') { + this.setState({ + customEnabled: true, + }); + } else { + localStorage.removeItem('customSearchEngine'); + } + } + + componentDidUpdate() { + if (this.state.customEnabled === true && this.state.customValue !== '') { + localStorage.setItem('customSearchEngine', this.state.customValue); + } + + EventBus.emit('refresh', 'search'); + } + + setSearchEngine(input) { + if (input === 'custom') { + this.setState({ + customEnabled: true, + }); + } else { + this.setState({ + customEnabled: false, + }); + localStorage.setItem('searchEngine', input); + } + + EventBus.emit('refresh', 'search'); + } + + render() { + const SEARCH_SECTION = 'modals.main.settings.sections.search'; + + const AdditionalOptions = () => { + return ( + + + + {/* not supported on firefox */} + {navigator.userAgent.includes('Chrome') && typeof InstallTrigger === 'undefined' ? ( + + ) : null} + + + + + + ); + }; + + const SearchEngineSelection = () => { + return ( + + + + this.setSearchEngine(value)} + items={[ + searchEngines.map((engine) => ({ + value: engine.settingsName, + text: engine.name, + })), + { + value: 'custom', + text: variables.getMessage(`${SEARCH_SECTION}.custom`), + }, + ]} + /> + + + ); + }; + + const CustomOptions = () => { + return ( + + + + this.setState({ customValue: e.target.value })} + varient="outlined" + InputLabelProps={{ shrink: true }} + /> +

+ this.resetSearch()}> + {variables.getMessage('modals.main.settings.buttons.reset')} + +

+ + + ); + }; + + return ( + <> +
+ + + + {this.state.customEnabled && CustomOptions()} + + + ); + } +} + +export { SearchOptions as default, SearchOptions }; \ No newline at end of file diff --git a/src/features/widgets/search/options/index.jsx b/src/features/widgets/search/options/index.jsx new file mode 100644 index 00000000..5abc490f --- /dev/null +++ b/src/features/widgets/search/options/index.jsx @@ -0,0 +1 @@ +export * from './SearchOptions'; \ No newline at end of file diff --git a/src/features/widgets/weather/Weather.jsx b/src/features/widgets/weather/Weather.jsx index f38278ea..5b11348f 100644 --- a/src/features/widgets/weather/Weather.jsx +++ b/src/features/widgets/weather/Weather.jsx @@ -10,7 +10,7 @@ import { getWeather } from './api/WeatherAPI.js'; import './weather.scss'; -export default class WeatherSettings extends PureComponent { +class WeatherWidget extends PureComponent { constructor() { super(); this.state = { @@ -84,3 +84,5 @@ export default class WeatherSettings extends PureComponent { ); } } + +export { WeatherWidget as default, WeatherWidget }; diff --git a/src/features/widgets/weather/index.jsx b/src/features/widgets/weather/index.jsx new file mode 100644 index 00000000..cf6f77a5 --- /dev/null +++ b/src/features/widgets/weather/index.jsx @@ -0,0 +1,2 @@ +export * from './options'; +export * from './Weather'; \ No newline at end of file diff --git a/src/features/modals/main/settings/sections/Weather.jsx b/src/features/widgets/weather/options/WeatherOptions.jsx similarity index 98% rename from src/features/modals/main/settings/sections/Weather.jsx rename to src/features/widgets/weather/options/WeatherOptions.jsx index 951b9bd8..b4d13829 100644 --- a/src/features/modals/main/settings/sections/Weather.jsx +++ b/src/features/widgets/weather/options/WeatherOptions.jsx @@ -7,7 +7,7 @@ import { Header, Row, Content, Action, PreferencesWrapper } from 'components/Lay import { Radio, Dropdown, Checkbox } from 'components/Form/Settings'; import { TextField } from '@mui/material'; -export default class WeatherSettings extends PureComponent { +class WeatherOptions extends PureComponent { constructor() { super(); this.state = { @@ -220,3 +220,5 @@ export default class WeatherSettings extends PureComponent { ); } } + +export { WeatherOptions as default, WeatherOptions }; \ No newline at end of file diff --git a/src/features/widgets/weather/options/index.jsx b/src/features/widgets/weather/options/index.jsx new file mode 100644 index 00000000..75c185e1 --- /dev/null +++ b/src/features/widgets/weather/options/index.jsx @@ -0,0 +1 @@ +export * from './WeatherOptions'; \ No newline at end of file diff --git a/vite.config.mjs.timestamp-1708789619302-8ea1d206b4f95.mjs b/vite.config.mjs.timestamp-1708789619302-8ea1d206b4f95.mjs new file mode 100644 index 00000000..dc1b340a --- /dev/null +++ b/vite.config.mjs.timestamp-1708789619302-8ea1d206b4f95.mjs @@ -0,0 +1,110 @@ +// vite.config.mjs +import { defineConfig, loadEnv } from "file:///F:/Programming/mue/node_modules/.pnpm/vite@5.1.3_@types+node@20.11.19_sass@1.71.0/node_modules/vite/dist/node/index.js"; +import react from "file:///F:/Programming/mue/node_modules/.pnpm/@vitejs+plugin-react-swc@3.6.0_vite@5.1.3/node_modules/@vitejs/plugin-react-swc/index.mjs"; +import path from "path"; +import fs from "fs"; +import ADMZip from "file:///F:/Programming/mue/node_modules/.pnpm/adm-zip@0.5.10/node_modules/adm-zip/adm-zip.js"; + +// package.json +var version = "7.0.1"; + +// vite.config.mjs +import progress from "file:///F:/Programming/mue/node_modules/.pnpm/vite-plugin-progress@0.0.7_vite@5.1.3/node_modules/vite-plugin-progress/dist/index.mjs"; +var __vite_injected_original_dirname = "F:\\Programming\\mue"; +var isProd = process.env.NODE_ENV === "production"; +var prepareBuilds = () => ({ + name: "prepareBuilds", + buildEnd() { + if (isProd) { + fs.mkdirSync(path.resolve(__vite_injected_original_dirname, "./build"), { recursive: true }); + fs.mkdirSync(path.resolve(__vite_injected_original_dirname, "./dist"), { recursive: true }); + fs.mkdirSync(path.resolve(__vite_injected_original_dirname, "./build/chrome"), { recursive: true }); + fs.copyFileSync( + path.resolve(__vite_injected_original_dirname, "./manifest/chrome.json"), + path.resolve(__vite_injected_original_dirname, "./build/chrome/manifest.json") + ); + fs.copyFileSync( + path.resolve(__vite_injected_original_dirname, "./manifest/background-chrome.js"), + path.resolve(__vite_injected_original_dirname, "./build/chrome/background.js") + ); + fs.cpSync( + path.resolve(__vite_injected_original_dirname, "./manifest/_locales"), + path.resolve(__vite_injected_original_dirname, "./build/chrome/_locales"), + { + recursive: true + } + ); + fs.cpSync(path.resolve(__vite_injected_original_dirname, "./dist"), path.resolve(__vite_injected_original_dirname, "./build/chrome/"), { + recursive: true + }); + fs.mkdirSync(path.resolve(__vite_injected_original_dirname, "./build/firefox"), { recursive: true }); + fs.copyFileSync( + path.resolve(__vite_injected_original_dirname, "./manifest/firefox.json"), + path.resolve(__vite_injected_original_dirname, "./build/firefox/manifest.json") + ); + fs.copyFileSync( + path.resolve(__vite_injected_original_dirname, "./manifest/background-firefox.js"), + path.resolve(__vite_injected_original_dirname, "./build/firefox/background.js") + ); + fs.cpSync(path.resolve(__vite_injected_original_dirname, "./dist"), path.resolve(__vite_injected_original_dirname, "./build/firefox/"), { + recursive: true + }); + const zip = new ADMZip(); + zip.addLocalFolder(path.resolve(__vite_injected_original_dirname, "./build/chrome")); + zip.writeZip(path.resolve(__vite_injected_original_dirname, `./build/chrome-${version}.zip`)); + const zip2 = new ADMZip(); + zip2.addLocalFolder(path.resolve(__vite_injected_original_dirname, "./build/firefox")); + zip2.writeZip(path.resolve(__vite_injected_original_dirname, `./build/firefox-${version}.zip`)); + } + } +}); +var vite_config_default = defineConfig(({ command, mode }) => { + const env = loadEnv(mode, process.cwd(), ""); + return { + define: { + __APP_ENV__: JSON.stringify(env.APP_ENV) + }, + plugins: [react(), prepareBuilds(), progress()], + server: { + open: true, + hmr: { + protocol: "ws", + host: "localhost" + } + }, + build: { + minify: isProd ? "esbuild" : false, + sourcemap: !isProd, + rollupOptions: { + output: { + manualChunks(id) { + if (id.includes("node_modules")) { + if (id.includes("@mui")) { + return "vendor_mui"; + } + return "vendor"; + } + } + } + } + }, + resolve: { + extensions: [".js", ".jsx"], + alias: { + "@": path.resolve(__vite_injected_original_dirname, "./src"), + i18n: path.resolve(__vite_injected_original_dirname, "./src/i18n"), + components: path.resolve(__vite_injected_original_dirname, "./src/components"), + config: path.resolve(__vite_injected_original_dirname, "./src/config"), + features: path.resolve(__vite_injected_original_dirname, "./src/features"), + lib: path.resolve(__vite_injected_original_dirname, "./src/lib"), + scss: path.resolve(__vite_injected_original_dirname, "./src/scss"), + translations: path.resolve(__vite_injected_original_dirname, "./src/i18n/locales"), + utils: path.resolve(__vite_injected_original_dirname, "./src/utils") + } + } + }; +}); +export { + vite_config_default as default +}; +//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.mjs", "package.json"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"F:\\\\Programming\\\\mue\";const __vite_injected_original_filename = \"F:\\\\Programming\\\\mue\\\\vite.config.mjs\";const __vite_injected_original_import_meta_url = \"file:///F:/Programming/mue/vite.config.mjs\";import { defineConfig, loadEnv } from 'vite';\r\nimport react from '@vitejs/plugin-react-swc';\r\nimport path from 'path';\r\nimport fs from 'fs';\r\nimport ADMZip from 'adm-zip';\r\nimport * as pkg from './package.json';\r\nimport progress from 'vite-plugin-progress';\r\n\r\nconst isProd = process.env.NODE_ENV === 'production';\r\n\r\nconst prepareBuilds = () => ({\r\n  name: 'prepareBuilds',\r\n  buildEnd() {\r\n    if (isProd) {\r\n      // make directories if not exist\r\n      fs.mkdirSync(path.resolve(__dirname, './build'), { recursive: true });\r\n      fs.mkdirSync(path.resolve(__dirname, './dist'), { recursive: true });\r\n\r\n      // chrome\r\n      fs.mkdirSync(path.resolve(__dirname, './build/chrome'), { recursive: true });\r\n      fs.copyFileSync(\r\n        path.resolve(__dirname, './manifest/chrome.json'),\r\n        path.resolve(__dirname, './build/chrome/manifest.json'),\r\n      );\r\n      fs.copyFileSync(\r\n        path.resolve(__dirname, './manifest/background-chrome.js'),\r\n        path.resolve(__dirname, './build/chrome/background.js'),\r\n      );\r\n      fs.cpSync(\r\n        path.resolve(__dirname, './manifest/_locales'),\r\n        path.resolve(__dirname, './build/chrome/_locales'),\r\n        {\r\n          recursive: true,\r\n        },\r\n      );\r\n      fs.cpSync(path.resolve(__dirname, './dist'), path.resolve(__dirname, './build/chrome/'), {\r\n        recursive: true,\r\n      });\r\n\r\n      // firefox\r\n      fs.mkdirSync(path.resolve(__dirname, './build/firefox'), { recursive: true });\r\n      fs.copyFileSync(\r\n        path.resolve(__dirname, './manifest/firefox.json'),\r\n        path.resolve(__dirname, './build/firefox/manifest.json'),\r\n      );\r\n      fs.copyFileSync(\r\n        path.resolve(__dirname, './manifest/background-firefox.js'),\r\n        path.resolve(__dirname, './build/firefox/background.js'),\r\n      );\r\n      fs.cpSync(path.resolve(__dirname, './dist'), path.resolve(__dirname, './build/firefox/'), {\r\n        recursive: true,\r\n      });\r\n\r\n      // create zip\r\n      const zip = new ADMZip();\r\n      zip.addLocalFolder(path.resolve(__dirname, './build/chrome'));\r\n      zip.writeZip(path.resolve(__dirname, `./build/chrome-${pkg.version}.zip`));\r\n\r\n      const zip2 = new ADMZip();\r\n      zip2.addLocalFolder(path.resolve(__dirname, './build/firefox'));\r\n      zip2.writeZip(path.resolve(__dirname, `./build/firefox-${pkg.version}.zip`));\r\n    }\r\n  },\r\n});\r\n\r\nexport default defineConfig(({ command, mode }) => {\r\n  const env = loadEnv(mode, process.cwd(), '');\r\n  return {\r\n    define: {\r\n      __APP_ENV__: JSON.stringify(env.APP_ENV),\r\n    },\r\n    plugins: [react(), prepareBuilds(), progress()],\r\n    server: {\r\n      open: true,\r\n      hmr: {\r\n        protocol: 'ws',\r\n        host: 'localhost',\r\n      },\r\n    },\r\n    build: {\r\n      minify: isProd ? 'esbuild' : false,\r\n      sourcemap: !isProd,\r\n      rollupOptions: {\r\n        output: {\r\n          manualChunks(id) {\r\n            if (id.includes('node_modules')) {\r\n              if (id.includes('@mui')) {\r\n                return 'vendor_mui';\r\n              }\r\n\r\n              return 'vendor';\r\n            }\r\n          },\r\n        },\r\n      },\r\n    },\r\n    resolve: {\r\n      extensions: ['.js', '.jsx'],\r\n      alias: {\r\n        '@': path.resolve(__dirname, './src'),\r\n        i18n: path.resolve(__dirname, './src/i18n'),\r\n        components: path.resolve(__dirname, './src/components'),\r\n        config: path.resolve(__dirname, './src/config'),\r\n        features: path.resolve(__dirname, './src/features'),\r\n        lib: path.resolve(__dirname, './src/lib'),\r\n        scss: path.resolve(__dirname, './src/scss'),\r\n        translations: path.resolve(__dirname, './src/i18n/locales'),\r\n        utils: path.resolve(__dirname, './src/utils'),\r\n      },\r\n    },\r\n  };\r\n});\r\n", "{\r\n  \"name\": \"mue\",\r\n  \"private\": true,\r\n  \"author\": \"The Mue Authors (https://github.com/mue/mue/graphs/contributors)\",\r\n  \"description\": \"Fast, open and free-to-use new tab page for modern browsers.\",\r\n  \"repository\": {\r\n    \"url\": \"github:mue/mue\"\r\n  },\r\n  \"homepage\": \"https://muetab.com\",\r\n  \"bugs\": \"https://github.com/mue/mue/issues/new?assignees=&labels=bug&template=bug-report.md&title=%5BBUG%5D\",\r\n  \"license\": \"BSD-3-Clause\",\r\n  \"version\": \"7.0.1\",\r\n  \"dependencies\": {\r\n    \"@eartharoid/i18n\": \"1.2.1\",\r\n    \"@emotion/react\": \"^11.11.3\",\r\n    \"@emotion/styled\": \"^11.11.0\",\r\n    \"@floating-ui/react-dom\": \"2.0.8\",\r\n    \"@fontsource/lexend-deca\": \"5.0.8\",\r\n    \"@fontsource/montserrat\": \"5.0.16\",\r\n    \"@muetab/react-color-gradient-picker\": \"0.1.2\",\r\n    \"@muetab/react-sortable-hoc\": \"^2.0.1\",\r\n    \"@mui/material\": \"5.15.10\",\r\n    \"@sentry/react\": \"^7.101.1\",\r\n    \"embla-carousel-autoplay\": \"8.0.0-rc23\",\r\n    \"embla-carousel-react\": \"8.0.0-rc23\",\r\n    \"fast-blurhash\": \"^1.1.2\",\r\n    \"image-conversion\": \"^2.1.1\",\r\n    \"react\": \"^18.2.0\",\r\n    \"react-clock\": \"4.6.0\",\r\n    \"react-dom\": \"^18.2.0\",\r\n    \"react-icons\": \"^5.0.1\",\r\n    \"react-modal\": \"3.16.1\",\r\n    \"react-toastify\": \"10.0.4\"\r\n  },\r\n  \"devDependencies\": {\r\n    \"@commitlint/cli\": \"^18.6.1\",\r\n    \"@commitlint/config-conventional\": \"^18.6.2\",\r\n    \"@eartharoid/deep-merge\": \"^0.0.2\",\r\n    \"@vitejs/plugin-react-swc\": \"^3.6.0\",\r\n    \"adm-zip\": \"^0.5.10\",\r\n    \"eslint\": \"^8.56.0\",\r\n    \"eslint-config-prettier\": \"^9.1.0\",\r\n    \"eslint-config-react-app\": \"^7.0.1\",\r\n    \"husky\": \"^9.0.11\",\r\n    \"prettier\": \"^3.2.5\",\r\n    \"sass\": \"^1.71.0\",\r\n    \"stylelint\": \"^16.2.1\",\r\n    \"stylelint-config-standard-scss\": \"^13.0.0\",\r\n    \"stylelint-scss\": \"^6.1.0\",\r\n    \"vite\": \"5.1.3\",\r\n    \"vite-plugin-progress\": \"^0.0.7\"\r\n  },\r\n  \"scripts\": {\r\n    \"dev\": \"vite\",\r\n    \"dev:host\": \"vite --host\",\r\n    \"translations\": \"cd scripts && node updatetranslations.js\",\r\n    \"build\": \"vite build\",\r\n    \"pretty\": \"prettier --write \\\"./**/*.{js,jsx,json,scss,css}\\\"\",\r\n    \"lint\": \"eslint \\\"./src/**/*.{js,jsx}\\\" && stylelint \\\"./src/**/*.{scss,css}\\\"\",\r\n    \"lint:fix\": \"eslint \\\"./src/**/*.{js,jsx}\\\" --fix && stylelint \\\"./src/**/*.{scss,css}\\\" --fix\",\r\n    \"postinstall\": \"husky install\"\r\n  }\r\n}\r\n"],
  "mappings": "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",
  "names": []
}
