From c9cf2a11426b5c369dc1dcea747dea8b567a33c1 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <me@steffo.eu>
Date: Sat, 22 May 2021 04:17:02 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A5=20Refactor=20some=20more...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nest_frontend/components/base/Button.js       |  4 +--
 .../components/base/ButtonSidebar.js          |  4 +--
 .../components/base/InputWithIcon.js          |  4 +--
 .../URLSearchParams.js}                       |  2 +-
 nest_frontend/prototypes/index.js             |  3 +-
 nest_frontend/utils/defaultMapLocation.js     |  2 --
 nest_frontend/utils/goToOnSuccess.js          |  1 -
 nest_frontend/utils/makeIcon.js               | 29 +++++++++++++++++++
 nest_frontend/utils/make_icon.js              | 17 -----------
 9 files changed, 38 insertions(+), 28 deletions(-)
 rename nest_frontend/{utils/makeURLSearchParams.js => prototypes/URLSearchParams.js} (86%)
 delete mode 100644 nest_frontend/utils/defaultMapLocation.js
 create mode 100644 nest_frontend/utils/makeIcon.js
 delete mode 100644 nest_frontend/utils/make_icon.js

diff --git a/nest_frontend/components/base/Button.js b/nest_frontend/components/base/Button.js
index 1692c46..0a94884 100644
--- a/nest_frontend/components/base/Button.js
+++ b/nest_frontend/components/base/Button.js
@@ -1,7 +1,7 @@
 import React from "react"
 import Style from "./Button.module.css"
 import classNames from "classnames"
-import make_icon from "../../utils/make_icon"
+import makeIcon from "../../utils/makeIcon"
 
 
 /**
@@ -26,7 +26,7 @@ export default function Button({ children, disabled, onClick, className, color,
             disabled={disabled}
             {...props}
         >
-            {children} {make_icon(icon, Style.Icon)}
+            {children} {makeIcon(icon, {className: Style.Icon})}
         </button>
     )
 }
diff --git a/nest_frontend/components/base/ButtonSidebar.js b/nest_frontend/components/base/ButtonSidebar.js
index c9b4840..7e3911b 100644
--- a/nest_frontend/components/base/ButtonSidebar.js
+++ b/nest_frontend/components/base/ButtonSidebar.js
@@ -1,7 +1,7 @@
 import React from "react"
 import Style from "./ButtonSidebar.module.css"
 import classNames from "classnames"
-import make_icon from "../../utils/make_icon"
+import makeIcon from "../../utils/makeIcon"
 import { Link } from "react-router-dom"
 import { useRouteMatch } from "react-router"
 
@@ -31,7 +31,7 @@ export default function ButtonSidebar({ icon, children, to, className, ...props
     return (
         <Link to={to} className={Style.ButtonLink}>
             <div className={classNames(Style.ButtonSidebar, "Clickable", className)} {...props}>
-                {make_icon(icon, Style.ButtonIcon)}
+                {makeIcon(icon, {className: Style.ButtonIcon})}
                 <div className={Style.ButtonText}>
                     {children}
                 </div>
diff --git a/nest_frontend/components/base/InputWithIcon.js b/nest_frontend/components/base/InputWithIcon.js
index bc84e3b..87934f4 100644
--- a/nest_frontend/components/base/InputWithIcon.js
+++ b/nest_frontend/components/base/InputWithIcon.js
@@ -1,7 +1,7 @@
 import React, { useState } from "react"
 import Style from "./InputWithIcon.module.css"
 import classNames from "classnames"
-import make_icon from "../../utils/make_icon"
+import makeIcon from "../../utils/makeIcon"
 
 
 /**
@@ -22,7 +22,7 @@ export default function InputWithIcon({ icon, className, ...props }) {
     return (
         <div className={classNames(Style.InputWithIcon, isFocused ? Style.Focused : null, className)}>
             <div className={Style.IconPart}>
-                {make_icon(icon)}
+                {makeIcon(icon)}
             </div>
             <input
                 className={Style.InputPart}
diff --git a/nest_frontend/utils/makeURLSearchParams.js b/nest_frontend/prototypes/URLSearchParams.js
similarity index 86%
rename from nest_frontend/utils/makeURLSearchParams.js
rename to nest_frontend/prototypes/URLSearchParams.js
index c699be4..ef94c5c 100644
--- a/nest_frontend/utils/makeURLSearchParams.js
+++ b/nest_frontend/prototypes/URLSearchParams.js
@@ -1,7 +1,7 @@
 import isString from "is-string"
 
 
-export default function makeURLSearchParams(obj) {
+URLSearchParams.fromSerializableObject = function(obj) {
     let usp = new URLSearchParams()
     for(const key in obj) {
         if(!obj.hasOwnProperty(key)) {
diff --git a/nest_frontend/prototypes/index.js b/nest_frontend/prototypes/index.js
index aff132e..6589068 100644
--- a/nest_frontend/prototypes/index.js
+++ b/nest_frontend/prototypes/index.js
@@ -1 +1,2 @@
-import "./Date"
\ No newline at end of file
+import "./Date"
+import "./URLSearchParams"
diff --git a/nest_frontend/utils/defaultMapLocation.js b/nest_frontend/utils/defaultMapLocation.js
deleted file mode 100644
index 042e333..0000000
--- a/nest_frontend/utils/defaultMapLocation.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export const DEFAULT_MAP_CENTER = { lat: 0, lng: 0 }
-export const DEFAULT_MAP_ZOOM = 3
diff --git a/nest_frontend/utils/goToOnSuccess.js b/nest_frontend/utils/goToOnSuccess.js
index 2095a28..b240d77 100644
--- a/nest_frontend/utils/goToOnSuccess.js
+++ b/nest_frontend/utils/goToOnSuccess.js
@@ -4,7 +4,6 @@
  * @param func - The function to decorate.
  * @param history - The history to push the destination to.
  * @param destination - The path of the destination.
- * @returns {(function(): void)|*}
  */
 export default function goToOnSuccess(func, history, destination) {
     return async (...args) => {
diff --git a/nest_frontend/utils/makeIcon.js b/nest_frontend/utils/makeIcon.js
new file mode 100644
index 0000000..4a364ed
--- /dev/null
+++ b/nest_frontend/utils/makeIcon.js
@@ -0,0 +1,29 @@
+import React, { isValidElement } from "react"
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
+import {IconDefinition} from "@fortawesome/fontawesome-svg-core"
+
+
+/**
+ * Try to create an icon element based on what is passed to the function:
+ * - If a {@link JSX.Element} is passed, a `<span>` element containing it will be created and returned.
+ * - If a {@link IconDefinition} is passed, a `<span>` element containing a {@link FontAwesomeIcon} will be created
+ *   and returned.
+ * - If a falsy value is passed, `null` will be returned.
+ *
+ * @param icon - The icon value.
+ * @param props - Props to pass to the span element when it is created.
+ * @returns {JSX.Element|null}
+ */
+export default function makeIcon(icon, props) {
+    if(isValidElement(icon)) {
+        return <span {...props}>{icon}</span>
+    }
+    else if(icon) {
+        return (
+            <span {...props}><FontAwesomeIcon icon={icon}/></span>
+        )
+    }
+    else {
+        return null
+    }
+}
diff --git a/nest_frontend/utils/make_icon.js b/nest_frontend/utils/make_icon.js
deleted file mode 100644
index 22f960d..0000000
--- a/nest_frontend/utils/make_icon.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React, { isValidElement } from "react"
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
-
-
-export default function make_icon(icon, className) {
-    if(isValidElement(icon)) {
-        return <span className={className}>icon</span>
-    }
-    else if(icon) {
-        return (
-            <span className={className}><FontAwesomeIcon icon={icon}/></span>
-        )
-    }
-    else {
-        return null
-    }
-}
\ No newline at end of file