added stadard linter

author: piotrruss <mail@pruss.it> 2021-09-06 23:13:22 +0200
committer: piotrruss <mail@pruss.it> 2021-09-06 23:13:22 +0200
commit: 569bdb8c5d7538fa0ea8a99ff2f8376f7cbfa51a (patch)
tree: 8d1cb94a56d60b9d726222277b7516fc59895613 /pages
parent: 275bd1d0a9aea90696c145cf992d522a0d6b0aa8 (diff)
download: my_apps-569bdb8c5d7538fa0ea8a99ff2f8376f7cbfa51a.tar.gz
my_apps-569bdb8c5d7538fa0ea8a99ff2f8376f7cbfa51a.tar.bz2
my_apps-569bdb8c5d7538fa0ea8a99ff2f8376f7cbfa51a.zip
13 files changed, 110 insertions, 102 deletions
diff --git a/pages/_app.js b/pages/_app.js
index 637b096..5934a9e 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -1,28 +1,38 @@
+import Head from 'next/head'
+import 'styles/global.scss'
 import { SWRConfig } from 'swr'
-import {SettingsProvider} from 'hooks/useSettings'
-import {PopupProvider} from 'hooks/usePopup'
-import {AppsProvider} from 'hooks/useApps'
+import { SettingsProvider } from 'hooks/useSettings'
+import { PopupProvider } from 'hooks/usePopup'
+import { AppsProvider } from 'hooks/useApps'
 import fetchJson from 'helpers/fetchJson'
-import '/styles/global.scss'
 
-function MyApp({Component, pageProps}) {
+function MyApp ({ Component, pageProps }) {
   return (
-    <SWRConfig
-      value={{
-        fetcher: fetchJson,
-        onError: (err) => {
-          console.error(err)
-        },
-      }}
-    >
-      <SettingsProvider>
-        <PopupProvider>
-          <AppsProvider>
-            <Component {...pageProps} />
-          </AppsProvider>
-        </PopupProvider>
-      </SettingsProvider>
-    </SWRConfig>
+    <>
+      <Head>
+        <title>My Apps</title>
+        <meta
+          name='viewport'
+          content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0'
+        />
+      </Head>
+      <SWRConfig
+        value={{
+          fetcher: fetchJson,
+          onError: (err) => {
+            console.error(err)
+          }
+        }}
+      >
+        <SettingsProvider>
+          <PopupProvider>
+            <AppsProvider>
+              <Component {...pageProps} />
+            </AppsProvider>
+          </PopupProvider>
+        </SettingsProvider>
+      </SWRConfig>
+    </>
   )
 }
 
diff --git a/pages/api/login.js b/pages/api/login.js
index 038097c..5d5dd9c 100644
--- a/pages/api/login.js
+++ b/pages/api/login.js
@@ -3,27 +3,26 @@ import dbConnect from 'configs/dbConnect'
 import User from 'models/User'
 
 export default withSession(async (req, res) => {
-  const {method} = req
+  const { method } = req
 
   await dbConnect()
 
   switch (method) {
     case 'POST':
       try {
-        const {_id, email, isVerified, noteList, theme, language} = await User.findByCredentials(req.body.email, req.body.password);
+        const { _id, email, isVerified, noteList, theme, language } = await User.findByCredentials(req.body.email, req.body.password)
         if (!email) { throw new Error('Something went wrong') }
 
-        const user = {_id, email, isVerified, isLoggedIn: true, noteList, theme, language}
+        const user = { _id, email, isVerified, isLoggedIn: true, noteList, theme, language }
         req.session.set('user', user)
         await req.session.save()
         res.status(201).json(user)
       } catch (error) {
-        res.status(400).json({isLoggedIn: false})
+        res.status(400).json({ isLoggedIn: false })
       }
       break
     default:
-      res.status(400).send({isLoggedIn: false})
+      res.status(400).send({ isLoggedIn: false })
       break
   }
 })
-
diff --git a/pages/api/logout.js b/pages/api/logout.js
index 04e5160..d394056 100644
--- a/pages/api/logout.js
+++ b/pages/api/logout.js
@@ -2,5 +2,5 @@ import withSession from 'hocs/withSession'
 
 export default withSession(async (req, res) => {
   req.session.destroy()
-  res.json({isLoggedIn: false})
+  res.json({ isLoggedIn: false })
 })
diff --git a/pages/api/notes/[id].js b/pages/api/notes/[id].js
index 58e458f..12f0ba4 100644
--- a/pages/api/notes/[id].js
+++ b/pages/api/notes/[id].js
@@ -4,7 +4,7 @@ import NoteList from 'models/NoteList'
 import Note from 'models/Note'
 
 export default withSession(async (req, res) => {
-  const {id: _id} = req.query
+  const { id: _id } = req.query
   await dbConnect()
 
   switch (req.method) {
@@ -12,7 +12,7 @@ export default withSession(async (req, res) => {
       try {
         const user = req.session.get('user')
 
-        if (!user || !user?.isVerified || !_id ) {
+        if (!user || !user?.isVerified || !_id) {
           throw new Error('Something went wrong')
         }
 
@@ -25,7 +25,7 @@ export default withSession(async (req, res) => {
         res.status(200).json(note)
       } catch (error) {
         console.log(error)
-        res.status(400).json({error: true})
+        res.status(400).json({ error: true })
       }
       break
     case 'DELETE':
@@ -37,10 +37,10 @@ export default withSession(async (req, res) => {
         }
 
         const noteId = await NoteList.getNoteId(user.noteList, _id)
-        if ( !noteId) throw new Error('Something went wrong')
+        if (!noteId) throw new Error('Something went wrong')
 
         await Note.findByIdAndDelete(noteId)
-        const {notes} = await NoteList.removeNote(user.noteList, _id)
+        const { notes } = await NoteList.removeNote(user.noteList, _id)
 
         res.status(200).json(notes)
       } catch (error) {
@@ -51,14 +51,14 @@ export default withSession(async (req, res) => {
     case 'PUT':
       try {
         const user = req.session.get('user')
-        const {title, noteId, content} = req.body
+        const { title, noteId, content } = req.body
 
         if (!user || !user?.isVerified || !_id || !content) {
           throw new Error('Something went wrong')
         }
 
         await Note.updateNote(noteId, content)
-        const {notes} = await NoteList.updateList(user.noteList, noteId, title)
+        const { notes } = await NoteList.updateList(user.noteList, noteId, title)
 
         res.status(200).json(notes)
       } catch (error) {
diff --git a/pages/api/notes/index.js b/pages/api/notes/index.js
index f62f849..16cb88c 100644
--- a/pages/api/notes/index.js
+++ b/pages/api/notes/index.js
@@ -15,7 +15,7 @@ export default withSession(async (req, res) => {
           throw new Error('Something went wrong')
         }
 
-        const {notes} = await NoteList.getList(user.noteList)
+        const { notes } = await NoteList.getList(user.noteList)
 
         res.status(200).json(notes)
       } catch (error) {
@@ -25,14 +25,14 @@ export default withSession(async (req, res) => {
     case 'POST':
       try {
         const user = req.session.get('user')
-        const {title, content} = req.body
+        const { title, content } = req.body
 
         if (!user || !user?.isVerified || !content) {
           throw new Error('Something went wrong')
         }
 
-        const note = await Note.create({content})
-        const {notes} = await NoteList.addNote(user.noteList, note._id, title)
+        const note = await Note.create({ content })
+        const { notes } = await NoteList.addNote(user.noteList, note._id, title)
 
         res.status(200).json(notes)
       } catch (error) {
@@ -44,5 +44,3 @@ export default withSession(async (req, res) => {
       break
   }
 })
-
-
diff --git a/pages/api/register.js b/pages/api/register.js
index e14044e..036cede 100644
--- a/pages/api/register.js
+++ b/pages/api/register.js
@@ -1,7 +1,7 @@
 import dbConnect from 'configs/dbConnect'
 import sendMail from 'configs/sendMail'
 import withSession from 'hocs/withSession'
-import {subject, text, html} from 'helpers/email'
+import { subject, text, html } from 'helpers/email'
 import User from 'models/User'
 import NoteList from 'models/NoteList'
 
@@ -13,22 +13,21 @@ export default withSession(async (req, res) => {
       try {
         const noteList = await NoteList.create({})
 
-        const {_id, email, verificationKey: key, theme, language} = await User.create({...req.body, noteList})
+        const { _id, email, verificationKey: key, theme, language } = await User.create({ ...req.body, noteList })
         if (!email) { throw new Error('Something went wrong') }
 
         sendMail(req.body.email, subject(language), text(language, key), html(language, key))
 
-        const user = {_id, email, noteList, theme, language, isVerified: false, isLoggedIn: true}
+        const user = { _id, email, noteList, theme, language, isVerified: false, isLoggedIn: true }
         req.session.set('user', user)
         await req.session.save()
         res.status(201).json(user)
       } catch (error) {
-        res.status(400).json({isLoggedIn: false})
+        res.status(400).json({ isLoggedIn: false })
       }
       break
     default:
-      res.status(400).json({isLoggedIn: false})
+      res.status(400).json({ isLoggedIn: false })
       break
   }
 })
-
diff --git a/pages/api/settings.js b/pages/api/settings.js
index 0de5e73..f0d8e06 100644
--- a/pages/api/settings.js
+++ b/pages/api/settings.js
@@ -24,4 +24,3 @@ export default withSession(async (req, res) => {
       break
   }
 })
-
diff --git a/pages/api/user.js b/pages/api/user.js
index 44c7fc3..58c9ea2 100644
--- a/pages/api/user.js
+++ b/pages/api/user.js
@@ -17,7 +17,7 @@ export default withSession(async (req, res) => {
     })
   } else {
     res.json({
-      isLoggedIn: false,
+      isLoggedIn: false
     })
   }
 })
diff --git a/pages/api/verify.js b/pages/api/verify.js
index bdad434..89bd4cd 100644
--- a/pages/api/verify.js
+++ b/pages/api/verify.js
@@ -2,7 +2,7 @@ import dbConnect from 'configs/dbConnect'
 import sendMail from 'configs/sendMail'
 import User from 'models/User'
 import withSession from 'hocs/withSession'
-import {subject, text, html} from 'helpers/email'
+import { subject, text, html } from 'helpers/email'
 
 export default withSession(async (req, res) => {
   await dbConnect()
@@ -10,7 +10,7 @@ export default withSession(async (req, res) => {
   switch (req.method) {
     case 'GET':
       try {
-        const {email, language: l} = req.session.get('user')
+        const { email, language: l } = req.session.get('user')
         if (!email) { throw new Error('Something went wrong') }
 
         const key = await User.getVerificationKey(email)
@@ -41,4 +41,3 @@ export default withSession(async (req, res) => {
       break
   }
 })
-
diff --git a/pages/index.js b/pages/index.js
index 72f99f4..ac36c3b 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -1,38 +1,40 @@
 import styles from 'styles/Main.module.scss'
-import React from 'react'
+import Image from 'next/image'
 import useUser from 'hooks/useUser'
 import useSettings from 'hooks/useSettings'
 import useApps from 'hooks/useApps'
 import useMediaQuery from 'hooks/useMediaQuery'
-import {Layout, App, Splash} from 'components'
-import {open} from 'helpers/windowActions'
+import { Layout, App, Splash } from 'components'
+import { open } from 'helpers/windowActions'
 import appList from 'configs/appList'
 
 const Home = () => {
-  const {t} = useSettings()
-  const {apps, setApps} = useApps()
-  const touchDevice = useMediaQuery('(pointer: coarse)');
-  const {user} = useUser({
+  const { t } = useSettings()
+  const { apps, setApps } = useApps()
+  const touchDevice = useMediaQuery('(pointer: coarse)')
+  const { user } = useUser({
     redirectToLogin: true,
     redirectToVerify: true,
-    redirectToApps: true,
+    redirectToApps: true
   })
 
-  if (!user) return (
-    <Layout><Splash fixed /></Layout>
-  )
+  if (!user) {
+    return (
+      <Layout><Splash fixed /></Layout>
+    )
+  }
 
   const handleClick = (e, appProps) => {
     switch (e.detail) {
       case 1:
         touchDevice ? open(appProps, setApps) : e.currentTarget.focus()
-        break;
+        break
       case 2:
         open(appProps, setApps)
         e.currentTarget.blur()
-        break;
+        break
     }
-  };
+  }
 
   const handleKey = (e, appProps) => {
     if (e.key === 'Enter') {
@@ -48,11 +50,11 @@ const Home = () => {
             <div
               key={`${a[0]}_icon`}
               className={styles.icon}
-              onClick={e => handleClick(e, {appName: a[0], ...a[1]})}
-              onKeyDown={e => handleKey(e, {appName: a[0], ...a[1]})}
-              tabIndex="0"
+              onClick={e => handleClick(e, { appName: a[0], ...a[1] })}
+              onKeyDown={e => handleKey(e, { appName: a[0], ...a[1] })}
+              tabIndex='0'
             >
-              <img src={`./${a[0].toLowerCase()}.svg`} alt={`${a[0]} Icon`} />
+              <Image src={`/icons/${a[0].toLowerCase()}.svg`} width={48} height={48} alt={`${a[0]} Icon`} />
               <p>{t(a[0])}</p>
             </div>
           ))
@@ -70,7 +72,7 @@ const Home = () => {
             >
               <AppComponent />
             </App>
-          );
+          )
         })}
       </>
     </Layout>
diff --git a/pages/login.js b/pages/login.js
index 533e8e8..e7fee15 100644
--- a/pages/login.js
+++ b/pages/login.js
@@ -1,14 +1,14 @@
-import {useState} from 'react'
+import { useState } from 'react'
 import useUser from 'hooks/useUser'
 import submitForm from 'helpers/submitForm'
-import {Layout, Form, Splash} from 'components'
+import { Layout, Form, Splash } from 'components'
 
 const Login = () => {
   const [errorMsg, setErrorMsg] = useState('')
   const [loading, setLoading] = useState(false)
-  const {mutateUser} = useUser({
+  const { mutateUser } = useUser({
     redirectToVerify: true,
-    redirectToApps: true,
+    redirectToApps: true
   })
 
   const handleSubmit = async e => {
@@ -27,7 +27,7 @@ const Login = () => {
             errorMessage={errorMsg}
             onSubmit={handleSubmit}
           />
-        )}
+          )}
     </Layout>
   )
 }
diff --git a/pages/register.js b/pages/register.js
index 5405432..aa6b69e 100644
--- a/pages/register.js
+++ b/pages/register.js
@@ -1,13 +1,13 @@
-import {useState} from 'react'
+import { useState } from 'react'
 import useUser from 'hooks/useUser'
 import submitForm from 'helpers/submitForm'
-import {Layout, Form, Splash} from 'components'
+import { Layout, Form, Splash } from 'components'
 
 const Register = () => {
   const [errorMsg, setErrorMsg] = useState('')
   const [loading, setLoading] = useState(false)
-  const {mutateUser} = useUser({
-    redirectToVerify: true,
+  const { mutateUser } = useUser({
+    redirectToVerify: true
   })
 
   const handleSubmit = async e => {
@@ -25,7 +25,7 @@ const Register = () => {
             errorMessage={errorMsg}
             onSubmit={handleSubmit}
           />
-        )}
+          )}
     </Layout>
   )
 }
diff --git a/pages/verify.js b/pages/verify.js
index 2f7c863..022562c 100644
--- a/pages/verify.js
+++ b/pages/verify.js
@@ -1,20 +1,20 @@
 import styles from 'styles/Main.module.scss'
-import {useState} from 'react'
+import { useState } from 'react'
 import useUser from 'hooks/useUser'
 import useSettings from 'hooks/useSettings'
 import fetchJson from 'helpers/fetchJson'
-import {Layout} from 'components'
+import { Layout } from 'components'
 import Splash from 'components/Splash'
 
 const Verify = () => {
-  const {t} = useSettings()
+  const { t } = useSettings()
   const [errorMsg, setErrorMsg] = useState('')
   const [loading, setLoading] = useState(false)
   const [sending, setSending] = useState(false)
   const [resent, setResent] = useState(false)
-  const {user, mutateUser} = useUser({
+  const { user, mutateUser } = useUser({
     redirectToLogin: true,
-    redirectToApps: true,
+    redirectToApps: true
   })
 
   const handleSendMail = async e => {
@@ -40,7 +40,7 @@ const Verify = () => {
         await fetchJson('/api/verify', {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({_id: user._id, key}),
+          body: JSON.stringify({ _id: user._id, key })
         })
       )
     } catch (err) {
@@ -55,33 +55,35 @@ const Verify = () => {
       {!user || loading
         ? (
           <Splash fixed />
-        ) : (
+          )
+        : (
           <div className={`window window--popup ${styles.verify}`}>
             <p>{t('verification_title')}</p>
             <p>{`${t('verification_text')} ${user.email}`}</p>
             <form onSubmit={handleKey}>
-              <input type="text" placeholder={t('verification_key')} name="key" />
-              <button className="window__button" type="submit">{t('verify')}</button>
+              <input type='text' placeholder={t('verification_key')} name='key' />
+              <button className='window__button' type='submit'>{t('verify')}</button>
             </form>
             {
               sending
                 ? (
                   <p>{t('sending')}</p>
-                ) : (
-                  resent
-                    ? (
-                      <p>{t('verification_sent_again')}</p>
-                    ) : (
-                      <p>{t('verification_not_received')}&nbsp;
-                        <span className={styles.email} onClick={handleSendMail}>{t('verification_send_again')}</span>.
-                      </p>
-                    )
-                )
+                  )
+                : (
+                    resent
+                      ? (
+                        <p>{t('verification_sent_again')}</p>
+                        )
+                      : (
+                        <p>{t('verification_not_received')}&nbsp;
+                          <span className={styles.email} onClick={handleSendMail}>{t('verification_send_again')}</span>.
+                        </p>
+                        )
+                  )
             }
             {errorMsg && <p className={styles.error}>{errorMsg}</p>}
           </div>
-        )
-      }
+          )}
     </Layout>
   )
 }
author	piotrruss <mail@pruss.it>	2021-09-06 23:13:22 +0200
committer	piotrruss <mail@pruss.it>	2021-09-06 23:13:22 +0200
commit	569bdb8c5d7538fa0ea8a99ff2f8376f7cbfa51a (patch)
tree	8d1cb94a56d60b9d726222277b7516fc59895613 /pages
parent	275bd1d0a9aea90696c145cf992d522a0d6b0aa8 (diff)
download	my_apps-569bdb8c5d7538fa0ea8a99ff2f8376f7cbfa51a.tar.gz my_apps-569bdb8c5d7538fa0ea8a99ff2f8376f7cbfa51a.tar.bz2 my_apps-569bdb8c5d7538fa0ea8a99ff2f8376f7cbfa51a.zip