resolve merge conflict

.github/workflows/add_labels.yaml

@@ -1,4 +1,4 @@
-name: Add Labels 
+name: Add Labels
 # The events that triggers the workflow
 on:
   pull_request_target:
@@ -20,4 +20,4 @@ jobs:
           labels: |
             gssoc21
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue_label.yaml

@@ -1,19 +1,19 @@
-# Reference: https://github.com/Renato66/auto-label
-name: Labeling new issue
-# The event that triggers the workflow
-on:
-  issues:
-    types: ['opened']
-jobs:
-  build:
-    # The machine each job should run
-    runs-on: ubuntu-latest
-    # The tasks each job should run
-    steps:
-      - uses: Renato66/auto-label@v2
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          ignore-comments: true
-          labels-synonyms: '{"bug":["error","need fix","not working"],"enhancement":["upgrade"],"question":["help"]}'
-          labels-not-allowed: '["good first issue"]'
-          default-labels: '["gssoc21"]'
+# Reference: https://github.com/Renato66/auto-label
+name: Labeling new issue
+# The event that triggers the workflow
+on:
+  issues:
+    types: ["opened"]
+jobs:
+  build:
+    # The machine each job should run
+    runs-on: ubuntu-latest
+    # The tasks each job should run
+    steps:
+      - uses: Renato66/auto-label@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          ignore-comments: true
+          labels-synonyms: '{"bug":["error","need fix","not working"],"enhancement":["upgrade"],"question":["help"]}'
+          labels-not-allowed: '["good first issue"]'
+          default-labels: '["gssoc21"]'

.github/workflows/label_merge_conflicts.yml

@@ -1,13 +1,13 @@
-name: 'Check for merge conflicts'
-on:
-  push:
-    branches:
-      - master
-jobs:
-  triage:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mschilde/auto-label-merge-conflicts@master
-        with:
-          CONFLICT_LABEL_NAME: 'merge-conflict'
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+name: "Check for merge conflicts"
+on:
+  push:
+    branches:
+      - master
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: "merge-conflict"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/mind_your_language.yaml

@@ -1,23 +1,23 @@
-name: Mind your language
-# The events that triggers the workflow
-on:
-  issues:
-    types: [opened, edited] # issue is opened or edited
-  issue_comment:
-    types: [created, edited] # issue comment is created or edited
-  pull_request_review_comment:
-    types: [created, edited] # PR comment is created or edited
-
-jobs:
-  echo_issue_comment:
-    # The machine each job should run
-    runs-on: ubuntu-latest
-    name: profanity check
-    # The tasks each job should run
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Profanity check step
-        uses: tailaiw/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+name: Mind your language
+# The events that triggers the workflow
+on:
+  issues:
+    types: [opened, edited] # issue is opened or edited
+  issue_comment:
+    types: [created, edited] # issue comment is created or edited
+  pull_request_review_comment:
+    types: [created, edited] # PR comment is created or edited
+
+jobs:
+  echo_issue_comment:
+    # The machine each job should run
+    runs-on: ubuntu-latest
+    name: profanity check
+    # The tasks each job should run
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Profanity check step
+        uses: tailaiw/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/poll_bot.yaml

@@ -1,19 +1,19 @@
-# Reference: https://github.com/imjohnbo/gh-polls-bot-action
-name: Poll Bot 
-# The events that triggers the workflow
-on:
-  issue_comment:
-    types: [created, edited] # issue comment is created or edited
-  issues:
-    types: [opened, edited] # issue is opened or edited
-
-jobs:
-  polls:
-    name: Poll Bot 
-    # The machine each job should run
-    runs-on: ubuntu-latest
-    # The tasks each job should run
-    steps:
-    - uses: imjohnbo/gh-polls-bot-action@master
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+# Reference: https://github.com/imjohnbo/gh-polls-bot-action
+name: Poll Bot
+# The events that triggers the workflow
+on:
+  issue_comment:
+    types: [created, edited] # issue comment is created or edited
+  issues:
+    types: [opened, edited] # issue is opened or edited
+
+jobs:
+  polls:
+    name: Poll Bot
+    # The machine each job should run
+    runs-on: ubuntu-latest
+    # The tasks each job should run
+    steps:
+      - uses: imjohnbo/gh-polls-bot-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr_description_enforcer.yaml

@@ -1,16 +1,16 @@
-# Reference: https://github.com/derkinderfietsen/pr-description-enforcer
-name: 'PR Description Enforcer'
-# The event that triggers the workflow
-on:
-    pull_request:
-        types: [opened, edited, reopened]
-
-jobs:
-    enforce:
-        # The machine each job should run
-        runs-on: ubuntu-latest
-        # The tasks each job should run
-        steps:
-            - uses: derkinderfietsen/pr-description-enforcer@v1
-              with:
-                  repo-token: '${{ secrets.GITHUB_TOKEN }}'
+# Reference: https://github.com/derkinderfietsen/pr-description-enforcer
+name: "PR Description Enforcer"
+# The event that triggers the workflow
+on:
+  pull_request:
+    types: [opened, edited, reopened]
+
+jobs:
+  enforce:
+    # The machine each job should run
+    runs-on: ubuntu-latest
+    # The tasks each job should run
+    steps:
+      - uses: derkinderfietsen/pr-description-enforcer@v1
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/prettier_action_on_PR_and_push.yml

@@ -5,22 +5,22 @@ on:
   pull_request:
   push:
     branches:
-    - master
+      - master
 
 jobs:
   prettier:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        # Make sure the actual branch is checked out when running on pull requests
-        ref: ${{ github.head_ref }}
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          # Make sure the actual branch is checked out when running on pull requests
+          ref: ${{ github.head_ref }}
 
-    - name: Prettify code
-      uses: creyD/[email protected]
-      with:
-        prettier_options: --write **/*.{js,jsx,scss,md}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Prettify code
+        uses: creyD/[email protected]
+        with:
+          prettier_options: --write **/*.{js,jsx,scss,md}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.prettierrc.js

@@ -1,15 +1,14 @@
 module.exports = {
-  bracketSpacing: true,
-  jsxBracketSameLine: false,
-  singleQuote: false,
-  trailingComma: 'all',
-  arrowParens: 'avoid',
-  parser: 'json5',
-  endOfLine: 'lf',
-  embeddedLanguageFormatting: 'auto',
-  printWidth: 80,
-  proseWrap: "preserve",
-  tabWidth: 2,
-  semi : true,
-  useTabs: true,
+	bracketSpacing: true,
+	jsxBracketSameLine: false,
+	singleQuote: false,
+	trailingComma: "all",
+	arrowParens: "avoid",
+	endOfLine: "lf",
+	embeddedLanguageFormatting: "auto",
+	printWidth: 80,
+	proseWrap: "preserve",
+	tabWidth: 2,
+	semi: true,
+	useTabs: true,
 };

WEB_OPTIMIZATION.md

@@ -15,9 +15,9 @@ For Optimizing Doc2pen we have always followed some key rules for better SEO and
 
   ```javascript
   <MetaComponent
-    title={metaData.home.title}
-    description={metaData.home.description}
-    keywords={metaData.home.keywords}
+  	title={metaData.home.title}
+  	description={metaData.home.description}
+  	keywords={metaData.home.keywords}
   />
   ```
 

public/index.html

@@ -1,50 +1,52 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/logo.webp" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="A student's savior to submit those assignments by just typing them out and getting it handwritten on the go!"
-      data-react-helmet="true"
-    />
-    <link rel="preconnect" href="https://api.github.com">
-    <link rel="dynamic icon" id="favicon" href="doc2penlogo.png" />
-    <!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo.webp" /> -->
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-  <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-  <link href='https://fonts.googleapis.com/css?family=Montserrat' rel='stylesheet'>
-  <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css" integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ==" crossorigin="" />
-  <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-  <title>Doc2Pen</title>
-</head>
-
-<body>
-  <noscript>You need to enable JavaScript to run this app.</noscript>
-  <div id="root"></div>
-  <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-</body>
-
-</html>
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8" />
+  <link rel="icon" href="%PUBLIC_URL%/logo.webp" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta name="theme-color" content="#000000" />
+  <meta name="description"
+    content="A student's savior to submit those assignments by just typing them out and getting it handwritten on the go!"
+    data-react-helmet="true" />
+  <link rel="preconnect" href="https://api.github.com">
+  <link rel="dynamic icon" id="favicon" href="doc2penlogo.png" />
+  <!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo.webp" /> -->
+  <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+  <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+  <link href='https://fonts.googleapis.com/css?family=Montserrat'
+    rel='stylesheet'>
+  <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
+    integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ=="
+    crossorigin="" />
+  <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+  <title>Doc2Pen</title>
+</head>
+
+<body>
+  <noscript>You need to enable JavaScript to run this app.</noscript>
+  <div id="root"></div>
+  <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+</body>
+
+</html>

src/App.jsx

@@ -3,7 +3,6 @@ import { Route, Switch, Redirect } from "react-router-dom";
 import { withRouter } from "react-router";
 import Header from "./components/Header/Header";
 import Footer from "./components/Footer/Footer";
-import NotFound from "./pages/404/NotFound";
 import "./index.scss";
 import Preloader from "./components/Preloader/Preloader";
 import { ThemeProvider, createMuiTheme } from "@material-ui/core/styles";
@@ -17,6 +16,7 @@ const Home = lazy(() => import("./pages/Home/Home"));
 const Editor = lazy(() => import("./pages/Editor/Editor"));
 const Sketch = lazy(() => import("./pages/Sketch/Sketch"));
 const MediaManip = lazy(() => import("./pages/MediaManip/MediaManip"));
+const NotFound = lazy(() => import("./pages/404/NotFound"));
 
 window.isHome = true;