From 79bdb88a5fc099b5871a83d18eadf9b0448b41d1 Mon Sep 17 00:00:00 2001 From: piotrruss Date: Thu, 30 Sep 2021 22:48:13 +0200 Subject: added favicons & notes route for phone --- components/Header.js | 13 ++----------- components/Layout.js | 26 +++++++++++++++++++------- 2 files changed, 21 insertions(+), 18 deletions(-) (limited to 'components') diff --git a/components/Header.js b/components/Header.js index 5e4ff12..2db8178 100644 --- a/components/Header.js +++ b/components/Header.js @@ -3,11 +3,11 @@ import React, { useState } from 'react' import { useRouter } from 'next/router' import Link from 'next/link' import useUser from 'hooks/useUser' -import fetchJson from 'helpers/fetchJson' import { focus, toggleMin, open, close } from 'helpers/windowActions' import appList from 'configs/appList' import useSettings from 'hooks/useSettings' import useApps from 'hooks/useApps' +import handleLogout from 'helpers/logout' import { faArrowUp, faTimes } from '@fortawesome/free-solid-svg-icons' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' @@ -19,15 +19,6 @@ const Header = () => { const { t } = useSettings() const router = useRouter() - const handleLogout = async (e) => { - e.preventDefault() - mutateUser( - await fetchJson('/api/logout', { method: 'POST' }), - false - ) - router.push('/login') - } - const handleClick = (app, setApps) => { if (app.min) { toggleMin(app.name, apps, setApps) @@ -118,7 +109,7 @@ const Header = () => { )}
  • - + handleLogout(e, router, mutateUser)}> {t('logout')}
    • diff --git a/components/Layout.js b/components/Layout.js index 7caa5a5..8c48dd5 100644 --- a/components/Layout.js +++ b/components/Layout.js @@ -1,4 +1,5 @@ import styles from 'styles/Main.module.scss' +import Head from 'next/head' import React from 'react' import { Header, Popup } from 'components' import useSettings from 'hooks/useSettings' @@ -12,13 +13,24 @@ const Layout = ({ if (!settings || !settings.theme || !settings.language) return null return ( -
    -
    -
    {children}
    -
    -
    - -
    + <> + + + + + + + + + +
    +
    +
    {children}
    +
    +
    + +
    + ) } -- cgit v1.2.3