Merge pull request #35 from pawelmalak/feature

v1.3 Release
Reworked OtherSettings to work with global config state. Fixed bug with certain settings not being synchronized
2026-03-01 09:53:12 +08:00 · 2021-06-14 00:03:32 +02:00 · 2021-06-13 23:21:35 +02:00 · 2021-06-13 01:06:42 +02:00 · 2021-06-13 00:16:57 +02:00 · 2021-06-11 15:33:06 +02:00
55 changed files with 800 additions and 426 deletions
--- a/4
+++ b/4
@@ -2,9 +2,9 @@ FROM node:14-alpine

 WORKDIR /app

-COPY package*.json .
+COPY package*.json ./

-RUN npm install --only=production
+RUN npm install --production

 COPY . .

--- a/LICENSE.md
+++ b/LICENSE.md
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Paweł Malak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
 # Flame

+[![JS Badge](https://img.shields.io/badge/JavaScript-F7DF1E?style=for-the-badge&logo=javascript&logoColor=black)](https://shields.io/)
+[![TS Badge](https://img.shields.io/badge/TypeScript-007ACC?style=for-the-badge&logo=typescript&logoColor=white)](https://shields.io/)
+[![React Badge](https://img.shields.io/badge/React-20232A?style=for-the-badge&logo=react&logoColor=61DAFB)](https://shields.io/)
+
 ![Homescreen screenshot](./github/_home.png)

 ## Description
@@ -10,7 +14,7 @@ Flame is self-hosted startpage for your server. It's inspired (heavily) by [SUI]
  - Node.js + Express
  - Sequelize ORM + SQLite
 - Frontend
-  - React
+  - React 
  - Redux
  - TypeScript
 - Deployment
@@ -55,4 +59,17 @@ docker run -p 5005:5005 -v <host_dir>:/app/data flame
 - Themes
  - Customize your page by choosing from 12 color themes 

-![Homescreen screenshot](./github/_themes.png)
+![Homescreen screenshot](./github/_themes.png)
+
+## Usage
+### Supported URL formats for applications and bookmarks
+#### Rules
+- URL starts with `http://`
+  - Format: `http://www.domain.com`, `http://domain.com`
+  - Redirect: `{dest}`
+- URL starts with `https://`
+  - Format: `https://www.domain.com`, `https://domain.com`
+  - Redirect: `https://{dest}`
+- URL without protocol
+  - Format: `www.domain.com`, `domain.com`, `sub.domain.com`, `local`, `ip`, `ip:port`
+  - Redirect: `http://{dest}`
--- a/Socket.js
+++ b/Socket.js
@@ -5,11 +5,11 @@ class Socket {
    this.webSocketServer = new WebSocket.Server({ server })

    this.webSocketServer.on('listening', () => {
-      console.log('socket listen');
+      console.log('Socket: listen');
    })

    this.webSocketServer.on('connection', (webSocketClient) => {
-      console.log('new connection');
+      // console.log('Socket: new connection');
    })
  }

--- a/client/README.md
+++ b/client/README.md
@@ -1,46 +0,0 @@
-# Getting Started with Create React App
-
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm start`
-
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.\
-You will also see any lint errors in the console.
-
-### `npm test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `npm run build`
-
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -2304,6 +2304,14 @@
      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz",
      "integrity": "sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA=="
    },
+    "@types/http-proxy": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.6.tgz",
+      "integrity": "sha512-+qsjqR75S/ib0ig0R9WN+CDoZeOBU6F2XLewgC4KVgdXiNHiKKHFEMRHOrs5PbYE97D5vataw5wPj4KLYfUkuQ==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
    "@types/istanbul-lib-coverage": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
@@ -7449,110 +7457,21 @@
      }
    },
    "http-proxy-middleware": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
-      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.0.tgz",
+      "integrity": "sha512-S+RN5njuyvYV760aiVKnyuTXqUMcSIvYOsHA891DOVQyrdZOwaXtBHpt9FUVPEDAsOvsPArZp6VXQLs44yvkow==",
      "requires": {
-        "http-proxy": "^1.17.0",
-        "is-glob": "^4.0.0",
-        "lodash": "^4.17.11",
-        "micromatch": "^3.1.10"
+        "@types/http-proxy": "^1.17.5",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
      },
      "dependencies": {
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-number": {
+        "is-plain-obj": {
          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
+          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+          "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="
        }
      }
    },
@@ -16033,6 +15952,17 @@
            }
          }
        },
+        "http-proxy-middleware": {
+          "version": "0.19.1",
+          "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
+          "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+          "requires": {
+            "http-proxy": "^1.17.0",
+            "is-glob": "^4.0.0",
+            "lodash": "^4.17.11",
+            "micromatch": "^3.1.10"
+          }
+        },
        "import-local": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
--- a/client/package.json
+++ b/client/package.json
@@ -15,6 +15,7 @@
    "@types/react-redux": "^7.1.16",
    "@types/react-router-dom": "^5.1.7",
    "axios": "^0.21.1",
+    "http-proxy-middleware": "^2.0.0",
    "react": "^17.0.2",
    "react-dom": "^17.0.2",
    "react-redux": "^7.2.4",
@@ -50,6 +51,5 @@
      "last 1 firefox version",
      "last 1 safari version"
    ]
-  },
-  "proxy": "http://localhost:5005"
+  }
 }
--- a/client/src/App.module.css
+++ b/client/src/App.module.css
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -1,27 +1,23 @@
 import { BrowserRouter, Route, Switch } from 'react-router-dom';
-import { setTheme } from './store/actions';
+import { getConfig, setTheme } from './store/actions';

 // Redux
-import store from './store/store';
+import { store } from './store/store';
 import { Provider } from 'react-redux';

-import classes from './App.module.css';
-
 import Home from './components/Home/Home';
 import Apps from './components/Apps/Apps';
 import Settings from './components/Settings/Settings';
 import Bookmarks from './components/Bookmarks/Bookmarks';
-
 import NotificationCenter from './components/NotificationCenter/NotificationCenter';

+// Get config pairs from database
+store.dispatch<any>(getConfig());
+
 if (localStorage.theme) {
  store.dispatch<any>(setTheme(localStorage.theme));
 }

-if (localStorage.customTitle) {
-  document.title = localStorage.customTitle;
-}
-
 const App = (): JSX.Element => {
  return (
    <Provider store={store}>
--- a/client/src/components/Apps/AppCard/AppCard.module.css
+++ b/client/src/components/Apps/AppCard/AppCard.module.css
@@ -27,4 +27,16 @@
  font-weight: 400;
  font-size: 0.8em;
  opacity: 1;
+}
+
+@media (min-width: 500px) {
+  .AppCard {
+    padding: 2px;
+    border-radius: 4px;
+    transition: all 0.10s;
+  }
+
+  .AppCard:hover {
+    background-color: rgba(0,0,0,0.2);
+  }
 }
--- a/client/src/components/Apps/AppCard/AppCard.tsx
+++ b/client/src/components/Apps/AppCard/AppCard.tsx
@@ -1,7 +1,6 @@
-import { Link } from 'react-router-dom';
-
 import classes from './AppCard.module.css';
 import Icon from '../../UI/Icons/Icon/Icon';
+import { iconParser, urlParser } from '../../../utility';

 import { App } from '../../../interfaces';

@@ -11,28 +10,21 @@ interface ComponentProps {
 }

 const AppCard = (props: ComponentProps): JSX.Element => {
-  const iconParser = (mdiName: string): string => {
-    let parsedName = mdiName
-      .split('-')
-      .map((word: string) => `${word[0].toUpperCase()}${word.slice(1)}`)
-      .join('');
-    parsedName = `mdi${parsedName}`;
-
-    return parsedName;
-  }
-
-  const redirectHandler = (url: string): void => {
-    window.open(url);
-  }
+  const [displayUrl, redirectUrl] = urlParser(props.app.url);

  return (
-    <a href={`http://${props.app.url}`} target='blank' className={classes.AppCard}>
+    <a
+      href={redirectUrl}
+      target='_blank'
+      rel='noreferrer'
+      className={classes.AppCard}
+    >
      <div className={classes.AppCardIcon}>
        <Icon icon={iconParser(props.app.icon)} />
      </div>
      <div className={classes.AppCardDetails}>
        <h5>{props.app.name}</h5>
-        <span>{props.app.url}</span>
+        <span>{displayUrl}</span>
      </div>
    </a>
  )
--- a/client/src/components/Apps/AppForm/AppForm.tsx
+++ b/client/src/components/Apps/AppForm/AppForm.tsx
@@ -98,7 +98,15 @@ const AppForm = (props: ComponentProps): JSX.Element => {
          value={formData.url}
          onChange={(e) => inputChangeHandler(e)}
        />
-        <span>Only urls without http[s]:// are supported</span>
+        <span>
+          <a
+            href='https://github.com/pawelmalak/flame#supported-url-formats-for-applications-and-bookmarks'
+            target='_blank'
+            rel='noreferrer'
+          >
+            {' '}Check supported URL formats
+          </a>
+        </span>
      </InputGroup>
      <InputGroup>
        <label htmlFor='icon'>App Icon</label>
--- a/client/src/components/Apps/Apps.tsx
+++ b/client/src/components/Apps/Apps.tsx
@@ -1,4 +1,4 @@
-import { Fragment, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';

 // Redux
@@ -30,6 +30,12 @@ interface ComponentProps {
 }

 const Apps = (props: ComponentProps): JSX.Element => {
+  const {
+    getApps,
+    apps,
+    loading
+  } = props;
+
  const [modalIsOpen, setModalIsOpen] = useState(false);
  const [isInEdit, setIsInEdit] = useState(false);
  const [isInUpdate, setIsInUpdate] = useState(false);
@@ -44,10 +50,10 @@ const Apps = (props: ComponentProps): JSX.Element => {
  })

  useEffect(() => {
-    if (props.apps.length === 0) {
-      props.getApps();
+    if (apps.length === 0) {
+      getApps();
    }
-  }, [props.getApps]);
+  }, [getApps, apps]);

  const toggleModal = (): void => {
    setModalIsOpen(!modalIsOpen);
@@ -93,10 +99,10 @@ const Apps = (props: ComponentProps): JSX.Element => {
      </div>

      <div className={classes.Apps}>
-        {props.loading
+        {loading
          ? <Spinner />
          : (!isInEdit
-              ? <AppGrid apps={props.apps} />
+              ? <AppGrid apps={apps} />
              : <AppTable updateAppHandler={toggleUpdate} />)
        }
      </div>
--- a/client/src/components/Bookmarks/BookmarkCard/BookmarkCard.module.css
+++ b/client/src/components/Bookmarks/BookmarkCard/BookmarkCard.module.css
@@ -18,9 +18,18 @@
 .Bookmarks a {
  line-height: 2;
  transition: all 0.25s;
+  display: flex;
 }

 .BookmarkCard a:hover {
  text-decoration: underline;
  padding-left: 10px;
+}
+
+.BookmarkIcon {
+  width: 20px;
+  height: 20px;
+  display: flex;
+  margin-top: 3px;
+  margin-right: 2px;
 }
--- a/client/src/components/Bookmarks/BookmarkCard/BookmarkCard.tsx
+++ b/client/src/components/Bookmarks/BookmarkCard/BookmarkCard.tsx
@@ -1,6 +1,9 @@
 import { Bookmark, Category } from '../../../interfaces';
 import classes from './BookmarkCard.module.css';

+import Icon from '../../UI/Icons/Icon/Icon';
+import { iconParser, urlParser } from '../../../utility';
+
 interface ComponentProps {
  category: Category;
 }
@@ -10,14 +13,24 @@ const BookmarkCard = (props: ComponentProps): JSX.Element => {
    <div className={classes.BookmarkCard}>
      <h3>{props.category.name}</h3>
      <div className={classes.Bookmarks}>
-        {props.category.bookmarks.map((bookmark: Bookmark) => (
-          <a
-            href={`http://${bookmark.url}`}
-            target='blank'
-            key={`bookmark-${bookmark.id}`}>
-            {bookmark.name}
-          </a>
-        ))}
+        {props.category.bookmarks.map((bookmark: Bookmark) => {
+          const redirectUrl = urlParser(bookmark.url)[1];
+
+          return (
+            <a
+              href={redirectUrl}
+              target='_blank'
+              rel='noreferrer'
+              key={`bookmark-${bookmark.id}`}>
+              {bookmark.icon && (
+                <div className={classes.BookmarkIcon}>
+                  <Icon icon={iconParser(bookmark.icon)} />
+                </div>
+              )}
+              {bookmark.name}
+            </a>
+          )
+        })}
      </div>
    </div>
  )
--- a/client/src/components/Bookmarks/BookmarkForm/BookmarkForm.tsx
+++ b/client/src/components/Bookmarks/BookmarkForm/BookmarkForm.tsx
@@ -29,9 +29,11 @@ const BookmarkForm = (props: ComponentProps): JSX.Element => {
  const [formData, setFormData] = useState<NewBookmark>({
    name: '',
    url: '',
-    categoryId: -1
+    categoryId: -1,
+    icon: ''
  })

+  // Load category data if provided for editing
  useEffect(() => {
    if (props.category) {
      setCategoryName({ name: props.category.name });
@@ -40,18 +42,21 @@ const BookmarkForm = (props: ComponentProps): JSX.Element => {
    }
  }, [props.category])

+  // Load bookmark data if provided for editing
  useEffect(() => {
    if (props.bookmark) {
      setFormData({
        name: props.bookmark.name,
        url: props.bookmark.url,
-        categoryId: props.bookmark.categoryId
+        categoryId: props.bookmark.categoryId,
+        icon: props.bookmark.icon
      })
    } else {
      setFormData({
        name: '',
        url: '',
-        categoryId: -1
+        categoryId: -1,
+        icon: ''
      })
    }
  }, [props.bookmark])
@@ -79,7 +84,8 @@ const BookmarkForm = (props: ComponentProps): JSX.Element => {
        setFormData({
          name: '',
          url: '',
-          categoryId: formData.categoryId
+          categoryId: formData.categoryId,
+          icon: ''
        })
      }
    } else {
@@ -94,7 +100,8 @@ const BookmarkForm = (props: ComponentProps): JSX.Element => {
        setFormData({
          name: '',
          url: '',
-          categoryId: -1
+          categoryId: -1,
+          icon: ''
        })
      }

@@ -177,7 +184,15 @@ const BookmarkForm = (props: ComponentProps): JSX.Element => {
                value={formData.url}
                onChange={(e) => inputChangeHandler(e)}
              />
-              <span>Only urls without http[s]:// are supported</span>
+              <span>
+                <a
+                  href='https://github.com/pawelmalak/flame#supported-url-formats-for-applications-and-bookmarks'
+                  target='_blank'
+                  rel='noreferrer'
+                >
+                  {' '}Check supported URL formats
+                </a>
+              </span>
            </InputGroup>
            <InputGroup>
              <label htmlFor='categoryId'>Bookmark Category</label>
@@ -201,6 +216,25 @@ const BookmarkForm = (props: ComponentProps): JSX.Element => {
                })}
              </select>
            </InputGroup>
+            <InputGroup>
+              <label htmlFor='icon'>Bookmark Icon (optional)</label>
+              <input
+                type='text'
+                name='icon'
+                id='icon'
+                placeholder='book-open-outline'
+                value={formData.icon}
+                onChange={(e) => inputChangeHandler(e)}
+              />
+              <span>
+                Use icon name from MDI. 
+                <a
+                  href='https://materialdesignicons.com/'
+                  target='blank'>
+                  {' '}Click here for reference
+                </a>
+              </span>
+            </InputGroup>
          </Fragment>
        )
      }
--- a/client/src/components/Bookmarks/BookmarkGrid/BookmarkGrid.tsx
+++ b/client/src/components/Bookmarks/BookmarkGrid/BookmarkGrid.tsx
@@ -2,7 +2,7 @@ import { Link } from 'react-router-dom';

 import classes from './BookmarkGrid.module.css';

-import { Bookmark, Category } from '../../../interfaces';
+import { Category } from '../../../interfaces';

 import BookmarkCard from '../BookmarkCard/BookmarkCard';

--- a/client/src/components/Bookmarks/BookmarkTable/BookmarkTable.tsx
+++ b/client/src/components/Bookmarks/BookmarkTable/BookmarkTable.tsx
@@ -96,6 +96,7 @@ const BookmarkTable = (props: ComponentProps): JSX.Element => {
      <Table headers={[
        'Name',
        'URL',
+        'Icon',
        'Category',
        'Actions'
      ]}>
@@ -104,6 +105,7 @@ const BookmarkTable = (props: ComponentProps): JSX.Element => {
            <tr key={bookmark.bookmark.id}>
              <td>{bookmark.bookmark.name}</td>
              <td>{bookmark.bookmark.url}</td>
+              <td>{bookmark.bookmark.icon}</td>
              <td>{bookmark.categoryName}</td>
              <td className={classes.TableActions}>
                <div
--- a/client/src/components/Bookmarks/Bookmarks.tsx
+++ b/client/src/components/Bookmarks/Bookmarks.tsx
@@ -28,6 +28,12 @@ export enum ContentType {
 }

 const Bookmarks = (props: ComponentProps): JSX.Element => {
+  const {
+    getCategories,
+    categories,
+    loading
+  } = props;
+
  const [modalIsOpen, setModalIsOpen] = useState(false);
  const [formContentType, setFormContentType] = useState(ContentType.category);
  const [isInEdit, setIsInEdit] = useState(false);
@@ -45,16 +51,17 @@ const Bookmarks = (props: ComponentProps): JSX.Element => {
    name: '',
    url: '',
    categoryId: -1,
+    icon: '',
    id: -1,
    createdAt: new Date(),
    updatedAt: new Date()
  })

  useEffect(() => {
-    if (props.categories.length === 0) {
-      props.getCategories();
+    if (categories.length === 0) {
+      getCategories();
    }
-  }, [props.getCategories])
+  }, [getCategories, categories])

  const toggleModal = (): void => {
    setModalIsOpen(!modalIsOpen);
@@ -131,13 +138,13 @@ const Bookmarks = (props: ComponentProps): JSX.Element => {
        />
      </div>

-      {props.loading
+      {loading
        ? <Spinner />
        : (!isInEdit
-          ? <BookmarkGrid categories={props.categories} />
+          ? <BookmarkGrid categories={categories} />
          : <BookmarkTable
              contentType={tableContentType}
-              categories={props.categories}
+              categories={categories}
              updateHandler={goToUpdateMode}
            />
          )
--- a/client/src/components/Home/Home.tsx
+++ b/client/src/components/Home/Home.tsx
@@ -1,4 +1,4 @@
-import { useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import { Link } from 'react-router-dom';

 // Redux
@@ -23,6 +23,13 @@ import AppGrid from '../Apps/AppGrid/AppGrid';
 import BookmarkGrid from '../Bookmarks/BookmarkGrid/BookmarkGrid';
 import WeatherWidget from '../Widgets/WeatherWidget/WeatherWidget';

+// Functions
+import { greeter } from './functions/greeter';
+import { dateTime } from './functions/dateTime';
+
+// Utils
+import { searchConfig } from '../../utility';
+
 interface ComponentProps {
  getApps: Function;
  getCategories: Function;
@@ -33,68 +40,84 @@ interface ComponentProps {
 }

 const Home = (props: ComponentProps): JSX.Element => {
+  const {
+    getApps,
+    apps,
+    appsLoading,
+    getCategories,
+    categories,
+    categoriesLoading
+  } = props;
+
+  const [header, setHeader] = useState({
+    dateTime: dateTime(),
+    greeting: greeter()
+  })
+
+  // Load applications
  useEffect(() => {
-    if (props.apps.length === 0) {
-      props.getApps();
+    if (apps.length === 0) {
+      getApps();
    }
-  }, [props.getApps]);
+  }, [getApps, apps]);

+  // Load bookmark categories
  useEffect(() => {
-    if (props.categories.length === 0) {
-      props.getCategories();
+    if (categories.length === 0) {
+      getCategories();
    }
-  }, [props.getCategories]);
+  }, [getCategories, categories]);

-  const dateAndTime = (): string => {
-    const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
-    const months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+  // Refresh greeter and time
+  useEffect(() => {
+    let interval: any;

-    const now = new Date();
-
-    return `${days[now.getDay()]}, ${now.getDate()} ${months[now.getMonth()]} ${now.getFullYear()}`;
-  }
-
-  const greeter = (): string => {
-    const now = new Date().getHours();
-    let msg: string;
-
-    if (now >= 18) msg = 'Good evening!';
-    else if (now >= 12) msg = 'Good afternoon!';
-    else if (now >= 6) msg = 'Good morning!';
-    else if (now >= 0) msg = 'Good night!';
-    else msg = 'Hello!';
-
-    return msg;
-  }
+    // Start interval only when hideHeader is false
+    if (searchConfig('hideHeader', 0) !== 1) {
+      interval = setInterval(() => {
+        setHeader({
+          dateTime: dateTime(),
+          greeting: greeter()
+        })
+      }, 1000);
+    }

+    return () => clearInterval(interval);
+  }, [])
+  
  return (
    <Container>
-      <header className={classes.Header}>
-        <p>{dateAndTime()}</p>
-        <Link to='/settings' className={classes.SettingsLink}>Go to Settings</Link>
-        <span className={classes.HeaderMain}>
-          <h1>{greeter()}</h1>
-          <WeatherWidget />
-        </span>
-      </header>
+      {searchConfig('hideHeader', 0) !== 1
+        ? (
+          <header className={classes.Header}>
+            <p>{header.dateTime}</p>
+            <Link to='/settings' className={classes.SettingsLink}>Go to Settings</Link>
+            <span className={classes.HeaderMain}>
+              <h1>{header.greeting}</h1>
+              <WeatherWidget />
+            </span>
+          </header>
+          )
+        : <div></div>
+      }
      
      <SectionHeadline title='Applications' link='/applications' />
-      {props.appsLoading
+      {appsLoading
        ? <Spinner />
        : <AppGrid
-          apps={props.apps.filter((app: App) => app.isPinned)}
-          totalApps={props.apps.length}
+          apps={apps.filter((app: App) => app.isPinned)}
+          totalApps={apps.length}
        />
      }

      <div className={classes.HomeSpace}></div>

      <SectionHeadline title='Bookmarks' link='/bookmarks' />
-      {props.categoriesLoading
+      {categoriesLoading
        ? <Spinner />
        : <BookmarkGrid
-            categories={props.categories.filter((category: Category) => category.isPinned)}
-            totalCategories={props.categories.length}
+            categories={categories.filter((category: Category) => category.isPinned)}
+            totalCategories={categories.length}
        />
      }

--- a/client/src/components/Home/functions/dateTime.ts
+++ b/client/src/components/Home/functions/dateTime.ts
@@ -0,0 +1,8 @@
+export const dateTime = (): string => {
+  const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+  const months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+
+  const now = new Date();
+
+  return `${days[now.getDay()]}, ${now.getDate()} ${months[now.getMonth()]} ${now.getFullYear()}`;
+}
--- a/client/src/components/Home/functions/greeter.ts
+++ b/client/src/components/Home/functions/greeter.ts
@@ -0,0 +1,12 @@
+export const greeter = (): string => {
+  const now = new Date().getHours();
+  let msg: string;
+
+  if (now >= 18) msg = 'Good evening!';
+  else if (now >= 12) msg = 'Good afternoon!';
+  else if (now >= 6) msg = 'Good morning!';
+  else if (now >= 0) msg = 'Good night!';
+  else msg = 'Hello!';
+
+  return msg;
+}
--- a/client/src/components/Settings/OtherSettings/OtherSettings.tsx
+++ b/client/src/components/Settings/OtherSettings/OtherSettings.tsx
@@ -1,76 +1,73 @@
 import { useState, useEffect, ChangeEvent, FormEvent } from 'react';
-import axios from 'axios';
-import { connect } from 'react-redux';

+// Redux
+import { connect } from 'react-redux';
+import { createNotification, updateConfig } from '../../../store/actions';
+
+// Typescript
+import { GlobalState, NewNotification, SettingsForm } from '../../../interfaces';
+
+// UI
 import InputGroup from '../../UI/Forms/InputGroup/InputGroup';
 import Button from '../../UI/Buttons/Button/Button';
-import { createNotification } from '../../../store/actions';
-import { ApiResponse, Config, NewNotification } from '../../../interfaces';

-interface FormState {
-  customTitle: string;
-}
+// Utils
+import { searchConfig } from '../../../utility';

 interface ComponentProps {
  createNotification: (notification: NewNotification) => void;
+  updateConfig: (formData: SettingsForm) => void;
+  loading: boolean;
 }

 const OtherSettings = (props: ComponentProps): JSX.Element => {
-  const [formData, setFormData] = useState<FormState>({
-    customTitle: document.title
+  // Initial state
+  const [formData, setFormData] = useState<SettingsForm>({
+    customTitle: document.title,
+    pinAppsByDefault: 1,
+    pinCategoriesByDefault: 1,
+    hideHeader: 0
  })

-  // get initial config
+  // Get config
  useEffect(() => {
-    axios.get<ApiResponse<Config[]>>('/api/config?keys=customTitle')
-      .then(data => {
-        let tmpFormData = { ...formData };
+    setFormData({
+      customTitle: searchConfig('customTitle', 'Flame'),
+      pinAppsByDefault: searchConfig('pinAppsByDefault', 1),
+      pinCategoriesByDefault: searchConfig('pinCategoriesByDefault', 1),
+      hideHeader: searchConfig('hideHeader', 0)
+    })
+  }, [props.loading]);

-        data.data.data.forEach((config: Config) => {
-          let value: string | number = config.value;
-          if (config.valueType === 'number') {
-            value = parseFloat(value);
-          }
-
-          tmpFormData = {
-            ...tmpFormData,
-            [config.key]: value
-          }
-        })
-
-        setFormData(tmpFormData);
-      })
-      .catch(err => console.log(err));
-  }, [])
-
-  const formSubmitHandler = (e: FormEvent) => {
+  // Form handler
+  const formSubmitHandler = async (e: FormEvent) => {
    e.preventDefault();

-    axios.put<ApiResponse<{}>>('/api/config', formData)
-      .then(() => {
-        props.createNotification({
-          title: 'Success',
-          message: 'Settings updated'
-        })
-      })
-      .catch((err) => console.log(err));
+    // Save settings
+    await props.updateConfig(formData);

    // update local page title
-    localStorage.setItem('customTitle', formData.customTitle);
    document.title = formData.customTitle;
  }

-  const inputChangeHandler = (e: ChangeEvent<HTMLInputElement>) => {
+  // Input handler
+  const inputChangeHandler = (e: ChangeEvent<HTMLInputElement | HTMLSelectElement>, isNumber?: boolean) => {
+    let value: string | number = e.target.value;
+
+    if (isNumber) {
+      value = parseFloat(value);
+    }
+
    setFormData({
      ...formData,
-      [e.target.name]: e.target.value
+      [e.target.name]: value
    })
  }

  return (
    <form onSubmit={(e) => formSubmitHandler(e)}>
      <InputGroup>
-        <label htmlFor='customTitle'>Custom Page Title</label>
+        <label htmlFor='customTitle'>Custom page title</label>
        <input
          type='text'
          id='customTitle'
@@ -80,9 +77,51 @@ const OtherSettings = (props: ComponentProps): JSX.Element => {
          onChange={(e) => inputChangeHandler(e)}
        />
      </InputGroup>
+      <InputGroup>
+        <label htmlFor='pinAppsByDefault'>Pin new applications by default</label>
+        <select
+          id='pinAppsByDefault'
+          name='pinAppsByDefault'
+          value={formData.pinAppsByDefault}
+          onChange={(e) => inputChangeHandler(e, true)}
+        >
+          <option value={1}>True</option>
+          <option value={0}>False</option>
+        </select>
+      </InputGroup>
+      <InputGroup>
+        <label htmlFor='pinCategoriesByDefault'>Pin new categories by default</label>
+        <select
+          id='pinCategoriesByDefault'
+          name='pinCategoriesByDefault'
+          value={formData.pinCategoriesByDefault}
+          onChange={(e) => inputChangeHandler(e, true)}
+        >
+          <option value={1}>True</option>
+          <option value={0}>False</option>
+        </select>
+      </InputGroup>
+      <InputGroup>
+        <label htmlFor='hideHeader'>Hide greeting and date</label>
+        <select
+          id='hideHeader'
+          name='hideHeader'
+          value={formData.hideHeader}
+          onChange={(e) => inputChangeHandler(e, true)}
+        >
+          <option value={1}>True</option>
+          <option value={0}>False</option>
+        </select>
+      </InputGroup>
    <Button>Save changes</Button>
    </form>
  )
 }

-export default connect(null, { createNotification })(OtherSettings);
+const mapStateToProps = (state: GlobalState) => {
+  return {
+    loading: state.config.loading
+  }
+}
+
+export default connect(mapStateToProps, { createNotification, updateConfig })(OtherSettings);
--- a/client/src/components/Settings/WeatherSettings/WeatherSettings.tsx
+++ b/client/src/components/Settings/WeatherSettings/WeatherSettings.tsx
@@ -1,31 +1,77 @@
 import { useState, ChangeEvent, useEffect, FormEvent } from 'react';
-import { connect } from 'react-redux';
 import axios from 'axios';
-import { ApiResponse, Config, NewNotification, Weather } from '../../../interfaces';

+// Redux
+import { connect } from 'react-redux';
+import { createNotification, updateConfig } from '../../../store/actions';
+
+// Typescript
+import { ApiResponse, GlobalState, NewNotification, Weather, WeatherForm } from '../../../interfaces';
+
+// UI
 import InputGroup from '../../UI/Forms/InputGroup/InputGroup';
 import Button from '../../UI/Buttons/Button/Button';
-import { createNotification } from '../../../store/actions';

-interface FormState {
-  WEATHER_API_KEY: string;
-  lat: number;
-  long: number;
-  isCelsius: number;
-}
+// Utils
+import { searchConfig } from '../../../utility';

 interface ComponentProps {
  createNotification: (notification: NewNotification) => void;
+  updateConfig: (formData: WeatherForm) => void;
+  loading: boolean;
 }

 const WeatherSettings = (props: ComponentProps): JSX.Element => {
-  const [formData, setFormData] = useState<FormState>({
+  // Initial state
+  const [formData, setFormData] = useState<WeatherForm>({
    WEATHER_API_KEY: '',
    lat: 0,
    long: 0,
    isCelsius: 1
  })

+  // Get config
+  useEffect(() => {
+    setFormData({
+      WEATHER_API_KEY: searchConfig('WEATHER_API_KEY', ''),
+      lat: searchConfig('lat', 0),
+      long: searchConfig('long', 0),
+      isCelsius: searchConfig('isCelsius', 1)
+    })
+  }, [props.loading]);
+
+  // Form handler
+  const formSubmitHandler = async (e: FormEvent) => {
+    e.preventDefault();
+
+    // Check for api key input
+    if ((formData.lat || formData.long) && !formData.WEATHER_API_KEY) {
+      props.createNotification({
+        title: 'Warning',
+        message: 'API key is missing. Weather Module will NOT work'
+      })
+    }
+
+    // Save settings
+    await props.updateConfig(formData);
+    
+    // Update weather
+    axios.get<ApiResponse<Weather>>('/api/weather/update')
+      .then(() => {
+        props.createNotification({
+          title: 'Success',
+          message: 'Weather updated'
+        })
+      })
+      .catch((err) => {
+        props.createNotification({
+          title: 'Error',
+          message: err.response.data.error
+        })
+      });
+  }
+
+  // Input handler
  const inputChangeHandler = (e: ChangeEvent<HTMLInputElement | HTMLSelectElement>, isNumber?: boolean) => {
    let value: string | number = e.target.value;

@@ -39,63 +85,10 @@ const WeatherSettings = (props: ComponentProps): JSX.Element => {
    })
  }

-  useEffect(() => {
-    axios.get<ApiResponse<Config[]>>('/api/config?keys=WEATHER_API_KEY,lat,long,isCelsius')
-      .then(data => {
-        let tmpFormData = { ...formData };
-
-        data.data.data.forEach((config: Config) => {
-          let value: string | number = config.value;
-          if (config.valueType === 'number') {
-            value = parseFloat(value);
-          }
-
-          tmpFormData = {
-            ...tmpFormData,
-            [config.key]: value
-          }
-        })
-
-        setFormData(tmpFormData);
-      })
-      .catch(err => console.log(err));
-  }, []);
-
-  const formSubmitHandler = (e: FormEvent) => {
-    e.preventDefault();
-
-    axios.put<ApiResponse<{}>>('/api/config', formData)
-      .then(() => {
-        props.createNotification({
-          title: 'Success',
-          message: 'Settings updated'
-        })
-
-        // Update weather with new settings
-        axios.get<ApiResponse<Weather>>('/api/weather/update')
-          .then(() => {
-            props.createNotification({
-              title: 'Success',
-              message: 'Weather updated'
-            })
-          })
-          .catch((err) => {
-            props.createNotification({
-              title: 'Error',
-              message: err.response.data.error
-            })
-          });
-      })
-      .catch(err => console.log(err));
-    
-    // set localStorage
-    localStorage.setItem('isCelsius', JSON.stringify(parseInt(`${formData.isCelsius}`) === 1))
-  }
-
  return (
    <form onSubmit={(e) => formSubmitHandler(e)}>
      <InputGroup>
-        <label htmlFor='WEATHER_API_KEY'>API Key</label>
+        <label htmlFor='WEATHER_API_KEY'>API key</label>
        <input
          type='text'
          id='WEATHER_API_KEY'
@@ -111,10 +104,11 @@ const WeatherSettings = (props: ComponentProps): JSX.Element => {
            target='blank'>
            {' '}Weather API
          </a>
+          . Key is required for weather module to work.
        </span>
      </InputGroup>
      <InputGroup>
-        <label htmlFor='lat'>Location Latitude</label>
+        <label htmlFor='lat'>Location latitude</label>
        <input
          type='number'
          id='lat'
@@ -133,7 +127,7 @@ const WeatherSettings = (props: ComponentProps): JSX.Element => {
        </span>
      </InputGroup>
      <InputGroup>
-        <label htmlFor='long'>Location Longitude</label>
+        <label htmlFor='long'>Location longitude</label>
        <input
          type='number'
          id='long'
@@ -144,7 +138,7 @@ const WeatherSettings = (props: ComponentProps): JSX.Element => {
        />
      </InputGroup>
      <InputGroup>
-        <label htmlFor='isCelsius'>Temperature Unit</label>
+        <label htmlFor='isCelsius'>Temperature unit</label>
        <select
          id='isCelsius'
          name='isCelsius'
@@ -160,4 +154,10 @@ const WeatherSettings = (props: ComponentProps): JSX.Element => {
  )
 }

-export default connect(null, { createNotification })(WeatherSettings);
+const mapStateToProps = (state: GlobalState) => {
+  return {
+    loading: state.config.loading
+  }
+}
+
+export default connect(mapStateToProps, { createNotification, updateConfig })(WeatherSettings);
--- a/client/src/components/UI/Icons/WeatherIcon/WeatherIcon.tsx
+++ b/client/src/components/UI/Icons/WeatherIcon/WeatherIcon.tsx
@@ -12,8 +12,8 @@ interface ComponentProps {

 const WeatherIcon = (props: ComponentProps): JSX.Element => {
  const icon = props.isDay
-    ? (new IconMapping).mapIcon(props.weatherStatusCode, TimeOfDay.day)
-    : (new IconMapping).mapIcon(props.weatherStatusCode, TimeOfDay.night);
+    ? new IconMapping().mapIcon(props.weatherStatusCode, TimeOfDay.day)
+    : new IconMapping().mapIcon(props.weatherStatusCode, TimeOfDay.night);

  useEffect(() => {
    const delay = setTimeout(() => {
@@ -25,7 +25,7 @@ const WeatherIcon = (props: ComponentProps): JSX.Element => {
    return () => {
      clearTimeout(delay);
    }
-  }, [props.weatherStatusCode]);
+  }, [props.weatherStatusCode, icon, props.theme.colors.accent]);

  return <canvas id={`weather-icon`} width='50' height='50'></canvas>
 }
--- a/client/src/components/UI/Modal/Modal.tsx
+++ b/client/src/components/UI/Modal/Modal.tsx
@@ -1,4 +1,4 @@
-import { MouseEvent, useRef, useEffect } from 'react';
+import { MouseEvent, useRef } from 'react';

 import classes from './Modal.module.css';

--- a/client/src/components/Widgets/WeatherWidget/WeatherWidget.tsx
+++ b/client/src/components/Widgets/WeatherWidget/WeatherWidget.tsx
@@ -1,12 +1,27 @@
 import { useState, useEffect, Fragment } from 'react';
-import { Weather, ApiResponse, Config } from '../../../interfaces';
 import axios from 'axios';

-import WeatherIcon from '../../UI/Icons/WeatherIcon/WeatherIcon';
+// Redux
+import { connect } from 'react-redux';

+// Typescript
+import { Weather, ApiResponse, Config, GlobalState } from '../../../interfaces';
+
+// CSS
 import classes from './WeatherWidget.module.css';

-const WeatherWidget = (): JSX.Element => {
+// UI
+import WeatherIcon from '../../UI/Icons/WeatherIcon/WeatherIcon';
+
+// Utils
+import { searchConfig } from '../../../utility';
+
+interface ComponentProps {
+  configLoading: boolean;
+  config: Config[];
+}
+
+const WeatherWidget = (props: ComponentProps): JSX.Element => {
  const [weather, setWeather] = useState<Weather>({
    externalLastUpdate: '',
    tempC: 0,
@@ -20,11 +35,9 @@ const WeatherWidget = (): JSX.Element => {
    updatedAt: new Date()
  });
  const [isLoading, setIsLoading] = useState(true);
-  const [isCelsius, setIsCelsius] = useState(true);

  // Initial request to get data
  useEffect(() => {
-    // get weather
    axios.get<ApiResponse<Weather[]>>('/api/weather')
      .then(data => {
        const weatherData = data.data.data[0];
@@ -34,23 +47,13 @@ const WeatherWidget = (): JSX.Element => {
        setIsLoading(false);
      })
      .catch(err => console.log(err));
-    
-    // get config
-    if (!localStorage.isCelsius) {
-      axios.get<ApiResponse<Config>>('/api/config/isCelsius')
-        .then((data) => {
-          setIsCelsius(parseInt(data.data.data.value) === 1);
-          localStorage.setItem('isCelsius', JSON.stringify(isCelsius));
-        })
-        .catch((err) => console.log(err));
-    } else {
-      setIsCelsius(JSON.parse(localStorage.isCelsius));
-    }
  }, []);

  // Open socket for data updates
  useEffect(() => {
-    const webSocketClient = new WebSocket('ws://localhost:5005');
+    const socketProtocol = document.location.protocol === 'http:' ? 'ws:' : 'wss:';
+    const socketAddress = `${socketProtocol}//${window.location.host}/socket`;
+    const webSocketClient = new WebSocket(socketAddress);

    webSocketClient.onmessage = (e) => {
      const data = JSON.parse(e.data);
@@ -65,9 +68,8 @@ const WeatherWidget = (): JSX.Element => {

  return (
    <div className={classes.WeatherWidget}>
-      {isLoading
-        ? 'loading'
-        : (weather.id > 0 && 
+      {(isLoading || props.configLoading || searchConfig('WEATHER_API_KEY', '')) && 
+         (weather.id > 0 && 
            (<Fragment>
              <div className={classes.WeatherIcon}>
                <WeatherIcon
@@ -76,7 +78,7 @@ const WeatherWidget = (): JSX.Element => {
                />
              </div>
              <div className={classes.WeatherDetails}>
-                {isCelsius
+                {searchConfig('isCelsius', true)
                  ? <span>{weather.tempC}°C</span>
                  : <span>{weather.tempF}°F</span>
                }
@@ -89,4 +91,11 @@ const WeatherWidget = (): JSX.Element => {
  )
 }

-export default WeatherWidget;
+const mapStateToProps = (state: GlobalState) => {
+  return {
+    configLoading: state.config.loading,
+    config: state.config.config
+  }
+}
+
+export default connect(mapStateToProps)(WeatherWidget);
--- a/client/src/interfaces/Bookmark.ts
+++ b/client/src/interfaces/Bookmark.ts
@@ -4,10 +4,12 @@ export interface Bookmark extends Model {
  name: string;
  url: string;
  categoryId: number;
+  icon: string;
 }

 export interface NewBookmark {
  name: string;
  url: string;
  categoryId: number;
+  icon: string;
 }
--- a/client/src/interfaces/Forms.ts
+++ b/client/src/interfaces/Forms.ts
@@ -0,0 +1,13 @@
+export interface WeatherForm {
+  WEATHER_API_KEY: string;
+  lat: number;
+  long: number;
+  isCelsius: number;
+}
+
+export interface SettingsForm {
+  customTitle: string;
+  pinAppsByDefault: number;
+  pinCategoriesByDefault: number;
+  hideHeader: number;
+}
--- a/client/src/interfaces/GlobalState.ts
+++ b/client/src/interfaces/GlobalState.ts
@@ -2,10 +2,12 @@ import { State as AppState } from '../store/reducers/app';
 import { State as ThemeState } from '../store/reducers/theme';
 import { State as BookmarkState } from '../store/reducers/bookmark';
 import { State as NotificationState } from '../store/reducers/notification';
+import { State as ConfigState } from '../store/reducers/config';

 export interface GlobalState {
  theme: ThemeState;
  app: AppState;
  bookmark: BookmarkState;
  notification: NotificationState;
+  config: ConfigState;
 }
--- a/client/src/interfaces/index.ts
+++ b/client/src/interfaces/index.ts
@@ -6,4 +6,5 @@ export * from './Weather';
 export * from './Bookmark';
 export * from './Category';
 export * from './Notification';
-export * from './Config';
+export * from './Config';
+export * from './Forms';
--- a/client/src/setupProxy.js
+++ b/client/src/setupProxy.js
@@ -0,0 +1,15 @@
+const { createProxyMiddleware } = require('http-proxy-middleware');
+
+module.exports = function (app) {
+  const apiProxy = createProxyMiddleware('/api', {
+    target: 'http://localhost:5005'
+  })
+
+  const wsProxy = createProxyMiddleware('/socket', {
+    target: 'http://localhost:5005',
+    ws: true
+  })
+
+  app.use(apiProxy);
+  app.use(wsProxy);
+};
--- a/client/src/store/actions/actionTypes.ts
+++ b/client/src/store/actions/actionTypes.ts
@@ -19,7 +19,10 @@ import {
  UpdateBookmarkAction,
  // Notifications
  CreateNotificationAction,
-  ClearNotificationAction
+  ClearNotificationAction,
+  // Config
+  GetConfigAction,
+  UpdateConfigAction
 } from './';

 export enum ActionTypes {
@@ -48,7 +51,10 @@ export enum ActionTypes {
  updateBookmark = 'UPDATE_BOOKMARK',
  // Notifications
  createNotification = 'CREATE_NOTIFICATION',
-  clearNotification = 'CLEAR_NOTIFICATION'
+  clearNotification = 'CLEAR_NOTIFICATION',
+  // Config
+  getConfig = 'GET_CONFIG',
+  updateConfig = 'UPDATE_CONFIG'
 }

 export type Action = 
@@ -72,4 +78,7 @@ export type Action =
  UpdateBookmarkAction |
  // Notifications
  CreateNotificationAction |
-  ClearNotificationAction;
+  ClearNotificationAction |
+  // Config
+  GetConfigAction |
+  UpdateConfigAction;
--- a/client/src/store/actions/app.ts
+++ b/client/src/store/actions/app.ts
@@ -23,10 +23,7 @@ export const getApps = () => async (dispatch: Dispatch) => {
      payload: res.data.data
    })
  } catch (err) {
-    dispatch<GetAppsAction<string>>({
-      type: ActionTypes.getAppsError,
-      payload: err.data.data
-    })
+    console.log(err);
  }
 }

@@ -92,7 +89,7 @@ export interface DeleteAppAction {

 export const deleteApp = (id: number) => async (dispatch: Dispatch) => {
  try {
-    const res = await axios.delete<ApiResponse<{}>>(`/api/apps/${id}`);
+    await axios.delete<ApiResponse<{}>>(`/api/apps/${id}`);

    dispatch<CreateNotificationAction>({
      type: ActionTypes.createNotification,
--- a/client/src/store/actions/bookmark.ts
+++ b/client/src/store/actions/bookmark.ts
@@ -130,7 +130,7 @@ export interface DeleteCategoryAction {

 export const deleteCategory = (id: number) => async (dispatch: Dispatch) => {
  try {
-    const res = await axios.delete<ApiResponse<{}>>(`/api/categories/${id}`);
+    await axios.delete<ApiResponse<{}>>(`/api/categories/${id}`);

    dispatch<CreateNotificationAction>({
      type: ActionTypes.createNotification,
@@ -191,7 +191,7 @@ export interface DeleteBookmarkAction {

 export const deleteBookmark = (bookmarkId: number, categoryId: number) => async (dispatch: Dispatch) => {
  try {
-    const res = await axios.delete<ApiResponse<{}>>(`/api/bookmarks/${bookmarkId}`);
+    await axios.delete<ApiResponse<{}>>(`/api/bookmarks/${bookmarkId}`);

    dispatch<CreateNotificationAction>({
      type: ActionTypes.createNotification,
--- a/client/src/store/actions/config.ts
+++ b/client/src/store/actions/config.ts
@@ -0,0 +1,52 @@
+import axios from 'axios';
+import { Dispatch } from 'redux';
+import { ActionTypes } from './actionTypes';
+import { Config, ApiResponse } from '../../interfaces';
+import { CreateNotificationAction } from './notification';
+import { searchConfig } from '../../utility';
+
+export interface GetConfigAction {
+  type: ActionTypes.getConfig;
+  payload: Config[];
+}
+
+export const getConfig = () => async (dispatch: Dispatch) => {
+  try {
+    const res = await axios.get<ApiResponse<Config[]>>('/api/config');
+   
+    dispatch<GetConfigAction>({
+      type: ActionTypes.getConfig,
+      payload: res.data.data
+    })
+
+    // Set custom page title if set
+    document.title = searchConfig('customTitle', 'Flame');
+  } catch (err) {
+    console.log(err)
+  }
+}
+
+export interface UpdateConfigAction {
+  type: ActionTypes.updateConfig;
+  payload: Config[];
+}
+
+export const updateConfig = (formData: any) => async (dispatch: Dispatch) => {
+  try {
+    const res = await axios.put<ApiResponse<Config[]>>('/api/config', formData);
+    dispatch<CreateNotificationAction>({
+      type: ActionTypes.createNotification,
+      payload: {
+        title: 'Success',
+        message: 'Settings updated'
+      }
+    })
+
+    dispatch<UpdateConfigAction>({
+      type: ActionTypes.updateConfig,
+      payload: res.data.data
+    })
+  } catch (err) {
+    console.log(err);
+  }
+}
--- a/client/src/store/actions/index.ts
+++ b/client/src/store/actions/index.ts
@@ -2,4 +2,5 @@ export * from './theme';
 export * from './app';
 export * from './actionTypes';
 export * from './bookmark';
-export * from './notification';
+export * from './notification';
+export * from './config';
--- a/client/src/store/reducers/config.ts
+++ b/client/src/store/reducers/config.ts
@@ -0,0 +1,36 @@
+import { ActionTypes, Action } from '../actions';
+import { Config } from '../../interfaces';
+
+export interface State {
+  loading: boolean;
+  config: Config[];
+}
+
+const initialState: State = {
+  loading: true,
+  config: []
+}
+
+const getConfig = (state: State, action: Action): State => {
+  return {
+    loading: false,
+    config: action.payload
+  }
+}
+
+const updateConfig = (state: State, action: Action): State => {
+  return {
+    ...state,
+    config: action.payload
+  }
+}
+
+const configReducer = (state: State = initialState, action: Action) => {
+  switch(action.type) {
+    case ActionTypes.getConfig: return getConfig(state, action);
+    case ActionTypes.updateConfig: return updateConfig(state, action);
+    default: return state;
+  }
+}
+
+export default configReducer;
--- a/client/src/store/reducers/index.ts
+++ b/client/src/store/reducers/index.ts
@@ -6,12 +6,14 @@ import themeReducer from './theme';
 import appReducer from './app';
 import bookmarkReducer from './bookmark';
 import notificationReducer from './notification';
+import configReducer from './config';

 const rootReducer = combineReducers<GlobalState>({
  theme: themeReducer,
  app: appReducer,
  bookmark: bookmarkReducer,
-  notification: notificationReducer
+  notification: notificationReducer,
+  config: configReducer
 })

 export default rootReducer;
--- a/client/src/store/store.ts
+++ b/client/src/store/store.ts
@@ -4,6 +4,4 @@ import thunk from 'redux-thunk';
 import rootReducer from './reducers';
 const initialState = {};

-const store = createStore(rootReducer, initialState, composeWithDevTools(applyMiddleware(thunk)));
-
-export default store;
+export const store = createStore(rootReducer, initialState, composeWithDevTools(applyMiddleware(thunk)));
--- a/client/src/utility/iconParser.ts
+++ b/client/src/utility/iconParser.ts
@@ -0,0 +1,14 @@
+/**
+ * Parse Material Desgin icon name to be used with mdi/js
+ * @param mdiName Dash separated icon name from MDI, e.g. alert-box-outline
+ * @returns Parsed icon name to be used with mdi/js, e.g mdiAlertBoxOutline
+ */
+export const iconParser = (mdiName: string): string => {
+  let parsedName = mdiName
+    .split('-')
+    .map((word: string) => `${word[0].toUpperCase()}${word.slice(1)}`)
+    .join('');
+  parsedName = `mdi${parsedName}`;
+
+  return parsedName;
+}
--- a/client/src/utility/index.ts
+++ b/client/src/utility/index.ts
@@ -0,0 +1,3 @@
+export * from './iconParser';
+export * from './urlParser';
+export * from './searchConfig';
--- a/client/src/utility/searchConfig.ts
+++ b/client/src/utility/searchConfig.ts
@@ -0,0 +1,24 @@
+import { store } from '../store/store';
+
+/**
+ * Search config store with given key
+ * @param key Config pair key to search
+ * @param _default Value to return if key is not found
+ */
+export const searchConfig = (key: string, _default: any) => {
+  const state = store.getState();
+
+  const pair = state.config.config.find(p => p.key === key);
+
+  if (pair) {
+    if (pair.valueType === 'number') {
+      return parseFloat(pair.value);
+    } else if (pair.valueType === 'boolean') {
+      return parseInt(pair.value);
+    } else {
+      return pair.value;
+    }
+  } else {
+    return _default;
+  }
+}
--- a/client/src/utility/urlParser.ts
+++ b/client/src/utility/urlParser.ts
@@ -0,0 +1,20 @@
+export const urlParser = (url: string): string[] => {
+  let parsedUrl: string;
+  let displayUrl: string;
+
+  if (/https?:\/\//.test(url)) {
+    // Url starts with http[s]:// -> leave it as it is
+    parsedUrl = url;
+  } else {
+    // No protocol -> apply http:// prefix
+    parsedUrl = `http://${url}`;
+  }
+
+  // Create simplified url to display as text
+  displayUrl = url
+    .replace(/https?:\/\//, '')
+    .replace('www.', '')
+    .replace(/\/$/, '');
+
+  return [displayUrl, parsedUrl]
+}
--- a/controllers/apps.js
+++ b/controllers/apps.js
@@ -1,12 +1,29 @@
 const asyncWrapper = require('../middleware/asyncWrapper');
 const ErrorResponse = require('../utils/ErrorResponse');
 const App = require('../models/App');
+const Config = require('../models/Config');

 // @desc      Create new app
 // @route     POST /api/apps
 // @access    Public
 exports.createApp = asyncWrapper(async (req, res, next) => {
-  const app = await App.create(req.body);
+  // Get config from database
+  const pinApps = await Config.findOne({
+    where: { key: 'pinAppsByDefault' }
+  });
+
+  let app;
+
+  if (pinApps) {
+    if (parseInt(pinApps.value)) {
+      app = await App.create({
+        ...req.body,
+        isPinned: true
+      })
+    } else {
+      app = await App.create(req.body);
+    }
+  }

  res.status(201).json({
    success: true,
--- a/controllers/category.js
+++ b/controllers/category.js
@@ -2,12 +2,29 @@ const asyncWrapper = require('../middleware/asyncWrapper');
 const ErrorResponse = require('../utils/ErrorResponse');
 const Category = require('../models/Category');
 const Bookmark = require('../models/Bookmark');
+const Config = require('../models/Config');

 // @desc      Create new category
 // @route     POST /api/categories
 // @access    Public
 exports.createCategory = asyncWrapper(async (req, res, next) => {
-  const category = await Category.create(req.body);
+  // Get config from database
+  const pinCategories = await Config.findOne({
+    where: { key: 'pinCategoriesByDefault' }
+  });
+
+  let category;
+
+  if (pinCategories) {
+    if (parseInt(pinCategories.value)) {
+      category = await Category.create({
+        ...req.body,
+        isPinned: true
+      })
+    } else {
+      category = await Category.create(req.body);
+    }
+  }

  res.status(201).json({
    success: true,
--- a/controllers/config.js
+++ b/controllers/config.js
@@ -96,9 +96,11 @@ exports.updateValues = asyncWrapper(async (req, res, next) => {
    })
  })
  
+  const config = await Config.findAll();
+
  res.status(200).send({
    success: true,
-    data: {}
+    data: config
  })
 })

--- a/db.js
+++ b/db.js
@@ -8,13 +8,10 @@ const sequelize = new Sequelize({

 const connectDB = async () => {
  try {
-    await sequelize.authenticate({ logging: false });
+    await sequelize.authenticate();
    console.log('Connected to database');
    
-    await sequelize.sync({
-      // alter: true,
-      logging: false
-    });
+    await sequelize.sync({ alter: true });
    console.log('All models were synced');
  } catch (error) {
    console.error('Unable to connect to the database:', error);
--- a/models/Bookmark.js
+++ b/models/Bookmark.js
@@ -13,6 +13,10 @@ const Bookmark = sequelize.define('Bookmark', {
  categoryId: {
    type: DataTypes.INTEGER,
    allowNull: false
+  },
+  icon: {
+    type: DataTypes.STRING,
+    defaultValue: ''
  }
 }, {
  tableName: 'bookmarks'
--- a/package-lock.json
+++ b/package-lock.json
@@ -2794,9 +2794,9 @@
      }
    },
    "ws": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
-      "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g=="
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="
    },
    "xdg-basedir": {
      "version": "4.0.0",
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
    "node-schedule": "^2.0.0",
    "sequelize": "^6.6.2",
    "sqlite3": "^5.0.2",
-    "ws": "^7.4.5"
+    "ws": "^7.4.6"
  },
  "devDependencies": {
    "nodemon": "^2.0.7"
--- a/utils/clearWeatherData.js
+++ b/utils/clearWeatherData.js
@@ -0,0 +1,22 @@
+const { Op } = require('sequelize');
+const Weather = require('../models/Weather');
+
+const clearWeatherData = async () => {
+  const weather = await Weather.findOne({
+    order: [[ 'createdAt', 'DESC' ]]
+  });
+
+  if (weather) {
+    await Weather.destroy({
+      where: {
+        id: {
+          [Op.lt]: weather.id
+        }
+      }
+    })
+  }
+
+  console.log('Old weather data was deleted');
+}
+
+module.exports = clearWeatherData;
--- a/utils/initConfig.js
+++ b/utils/initConfig.js
@@ -1,16 +1,13 @@
 const { Op } = require('sequelize');
 const Config = require('../models/Config');
+const { config } = require('./initialConfig.json');

 const initConfig = async () => {
-  // Config keys
-  const keys = ['WEATHER_API_KEY', 'lat', 'long', 'isCelsius', 'customTitle'];
-  const values = ['', 0, 0, true, 'Flame'];
-
  // Get config values
  const configPairs = await Config.findAll({
    where: {
      key: {
-        [Op.or]: keys
+        [Op.or]: config.map(pair => pair.key)
      }
    }
  })
@@ -19,12 +16,12 @@ const initConfig = async () => {
  const configKeys = configPairs.map((pair) => pair.key);

  // Create missing pairs
-  keys.forEach(async (key, idx) => {
+  config.forEach(async ({ key, value}) => {
    if (!configKeys.includes(key)) {
      await Config.create({
        key,
-        value: values[idx],
-        valueType: typeof values[idx]
+        value,
+        valueType: typeof value
      })
    }
  })
--- a/utils/initialConfig.json
+++ b/utils/initialConfig.json
@@ -0,0 +1,36 @@
+{
+  "config": [
+    {
+      "key": "WEATHER_API_KEY",
+      "value": ""
+    },
+    {
+      "key": "lat",
+      "value": 0
+    },
+    {
+      "key": "long",
+      "value": 0
+    },
+    {
+      "key": "isCelsius",
+      "value": true
+    },
+    {
+      "key": "customTitle",
+      "value": "Flame"
+    },
+    {
+      "key": "pinAppsByDefault",
+      "value": true
+    },
+    {
+      "key": "pinCategoriesByDefault",
+      "value": true
+    },
+    {
+      "key": "hideHeader",
+      "value": false
+    }
+  ]
+}
--- a/utils/jobs.js
+++ b/utils/jobs.js
@@ -1,5 +1,6 @@
 const schedule = require('node-schedule');
 const getExternalWeather = require('./getExternalWeather');
+const clearWeatherData = require('./clearWeatherData');
 const Sockets = require('../Sockets');

 // Update weather data every 15 minutes
@@ -14,6 +15,6 @@ const weatherJob = schedule.scheduleJob('updateWeather', '0 */15 * * * *', async
 })

 // Clear old weather data every 4 hours
-const weatherCleanerJob = schedule.scheduleJob('clearWeather', '0 0 */4 * * *', async () => {
-  console.log('clean')
+const weatherCleanerJob = schedule.scheduleJob('clearWeather', '0 5 */4 * * *', async () => {
+  clearWeatherData();
 })
Author	SHA1	Message	Date
pawelmalak	ff1d11f512	Merge pull request #35 from pawelmalak/feature v1.3 Release	2021-06-14 00:03:32 +02:00
unknown	5e7cb72b82	Reworked OtherSettings to work with global config state. Fixed bug with certain settings not being synchronized	2021-06-13 23:21:35 +02:00
unknown	f137498e7e	Added auto-refresh for greeting and date. Fixed multiple React warnings	2021-06-13 01:06:42 +02:00
unknown	d257fbf9a3	Created config global state. Reworked WeatherSettings and WeatherWidget to use new config state.	2021-06-13 00:16:57 +02:00
unknown	a5504e6e80	Added url parser to support wider range of addresses	2021-06-11 15:33:06 +02:00
pawelmalak	5968663be4	Merge pull request #25 from pawelmalak/reverse-proxy-support Fixed bug related to websocket protocol which was making app unusable…	2021-06-11 00:10:08 +02:00
unknown	66cc59c48e	Fixed bug related to websocket protocol which was making app unusable with reverse proxy and https	2021-06-11 00:09:25 +02:00
unknown	f5f735372a	Added License file	2021-06-10 13:44:03 +02:00
pawelmalak	91ab1c5ae4	Merge pull request #21 from pawelmalak/feature Release v1.2	2021-06-10 13:21:51 +02:00
unknown	78de8752c6	Fixed bug with overwriting opened tabs. Added proxy for websocket	2021-06-10 13:05:55 +02:00
unknown	936da301b8	Clear weather data job. Fixed bug with displaying bookmark icons on mobile devices	2021-06-10 01:51:59 +02:00
unknown	80c807bfba	Fixed typo in Dockerfile. Added some checks to weather module settings	2021-06-09 22:26:39 +02:00
unknown	4583ca00e9	Added ability to set icons on bookmarks. Added hover indicator for apps	2021-06-09 12:45:55 +02:00
unknown	8b87ad92f1	Added option to pin new apps/categories by default	2021-06-09 10:58:45 +02:00
pawelmalak	43e110d378	Merge pull request #10 from pawelmalak/dependabot/npm_and_yarn/ws-7.4.6 Bump ws from 7.4.5 to 7.4.6	2021-06-09 01:24:22 +02:00
dependabot[bot]	a8217e2632	Bump ws from 7.4.5 to 7.4.6 Bumps [ws](https://github.com/websockets/ws) from 7.4.5 to 7.4.6. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/7.4.5...7.4.6) --- updated-dependencies: - dependency-name: ws dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2021-06-08 23:22:59 +00:00