fixed #9 issue

kholmogorov27 · Mar 13, 2023 · 6a48a01 · 6a48a01
1 parent da62801
commit 6a48a01
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 23 deletions.
diff --git a/index.html b/index.html
@@ -24,6 +24,8 @@
   </head>
   <body>
     <div id="root"></div>
+    <script src="config.js"></script>
+    <script src="icons.js"></script>
     <script type="module" src="/src/main.jsx"></script>
   </body>
 </html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/config.js b/public/config.js
@@ -1,4 +1,4 @@
-const CONFIG = {
+window.CONFIG = {
   macros: [
     {
       category: 'Entertainment',
@@ -735,5 +735,3 @@ const CONFIG = {
     }
   }
 }
-
-export default CONFIG
diff --git a/public/icons.js b/public/icons.js
diff --git a/settings/settings.js b/settings/settings.js
@@ -1,9 +1,8 @@
 import * as types from './settingTypes'
-import config from '../public/config'
 
 const searchEngines = {}
-for (const key in config.engines)
-  searchEngines[key] = config.engines[key].name
+for (const key in window.CONFIG.engines)
+  searchEngines[key] = window.CONFIG.engines[key].name
 
 const template = {
   general: {

diff --git a/src/components/Card/Card.jsx b/src/components/Card/Card.jsx
@@ -1,7 +1,6 @@
 import { isValidElement, useMemo, useRef, useState } from 'react'
 import { createPortal } from 'react-dom'
 import useTransitions from '../../hooks/useTransitions'
-import ICONS from '../../../public/icons'
 import { motion } from 'framer-motion'
 import { TbBan } from 'react-icons/tb'
 import getCssGradient from '../../functions/generationUtils/getCssGradient'
@@ -179,8 +178,8 @@ function getIcon(icon, color) {
     return <div>{icon}</div>
 
   // if icon name passed
-  else if (typeof icon === 'string' && Object.prototype.hasOwnProperty.call(ICONS, icon)) 
-    return <div dangerouslySetInnerHTML={{__html: ICONS?.[icon]}}/>
+  else if (typeof icon === 'string' && Object.prototype.hasOwnProperty.call(window.ICONS, icon)) 
+    return <div dangerouslySetInnerHTML={{__html: window.ICONS?.[icon]}}/>
 
   // fallback icon
   return <div><TbBan color={color}/></div>

diff --git a/src/components/MacrosMenu/MacrosMenu.jsx b/src/components/MacrosMenu/MacrosMenu.jsx
@@ -7,11 +7,10 @@ import { Splide, SplideSlide } from '@splidejs/react-splide'
 import { Grid } from '@splidejs/splide-extension-grid'
 import Card from '../Card/Card'
 import { allowedModes } from '../../rules'
-import config from '../../../public/config'
 import classes from './MacrosMenu.module.css'
 import '@splidejs/react-splide/css'
 
-const pinnedMacros = config.macros.filter(m => m.pinned)
+const pinnedMacros = window.CONFIG.macros.filter(m => m.pinned)
 
 function MacrosMenu({ visibility, fullVisibility }) {
   // settings

diff --git a/src/functions/getMacro.js b/src/functions/getMacro.js
@@ -1,17 +1,15 @@
-import config from '../../public/config'
-
 function getMacro(query, normalisedURL=null) {
   // searching for a macro by url
   if (normalisedURL) {
-    for (const macro of config.macros) {
+    for (const macro of window.CONFIG.macros) {
       // comparing query url and current macro url
       if (normalisedURL === macro.normalisedURL) {
         return {options: macro, command: null}
       }
     }
   } else {
     // searching for a macro by triggers
-    for (const macro of config.macros) {
+    for (const macro of window.CONFIG.macros) {
       // iterating through triggers
       for (const trigger of macro.triggers) {
         // query must be equal to a trigger or ends with a command 
@@ -42,7 +40,7 @@ function getCommand(query) {
   let foundCommand = null
 
   // sorting commands to don't skip a command which starts the same as an another command
-  const sortedCommands = config.commands.sort((a, b) => a.trigger.length > b.trigger.length)
+  const sortedCommands = window.CONFIG.commands.sort((a, b) => a.trigger.length > b.trigger.length)
 
   for (const command of sortedCommands)
     // if it's a command

diff --git a/src/hooks/useParseQuery.js b/src/hooks/useParseQuery.js
@@ -2,12 +2,11 @@ import { useContext, useMemo, useRef } from 'react'
 import useIsKeyPressed from './useIsKeyPressed'
 import { SettingsContext , ColorSchemeContext} from '../contexts/Settings'
 import ParsedQuery from '../classes/parsedQuery'
-import config from '../../public/config'
 
 function useParseQuery(value, type='query', origin, persist=false) {
   /* settings */
   const settings = useContext(SettingsContext)
-  const engine = config.engines[settings.general.searchEngine]
+  const engine = window.CONFIG.engines[settings.general.searchEngine]
   const forceSearchEngineOnCtrl = settings.query.forceSearchEngineOnCtrl
   // ---