Revert "Merge branch 'IT20251000' into 'dev'"

This reverts merge request !6

Project/Backend/ML_Models/sign_language_to_text/.ipynb_checkpoints/tensorflow-cnn-checkpoint.ipynb

@@ -2,11 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": 6,
-=======
    "execution_count": 2,
->>>>>>> master
    "id": "ade37944",
    "metadata": {},
    "outputs": [],
@@ -21,11 +17,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": 7,
-=======
    "execution_count": 3,
->>>>>>> master
    "id": "16176bf6",
    "metadata": {},
    "outputs": [
@@ -48,11 +40,7 @@
        " 'Uhh']"
       ]
      },
-<<<<<<< HEAD
-     "execution_count": 7,
-=======
      "execution_count": 3,
->>>>>>> master
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -69,11 +57,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": 8,
-=======
    "execution_count": 4,
->>>>>>> master
    "id": "8f7b1301",
    "metadata": {},
    "outputs": [],
@@ -99,11 +83,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": 9,
-=======
    "execution_count": 5,
->>>>>>> master
    "id": "c9034cbe",
    "metadata": {},
    "outputs": [],
@@ -133,11 +113,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": null,
-=======
    "execution_count": 6,
->>>>>>> master
    "id": "7adb379e",
    "metadata": {},
    "outputs": [],
@@ -148,11 +124,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": null,
-=======
    "execution_count": 7,
->>>>>>> master
    "id": "d44f7806",
    "metadata": {},
    "outputs": [],
@@ -172,18 +144,11 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": null,
-=======
    "execution_count": 8,
->>>>>>> master
    "id": "ff4f0d06",
    "metadata": {
     "scrolled": true
    },
-<<<<<<< HEAD
-   "outputs": [],
-=======
    "outputs": [
     {
      "name": "stdout",
@@ -222,7 +187,6 @@
      "output_type": "execute_result"
     }
    ],
->>>>>>> master
    "source": [
     "model.compile(optimizer='adam', loss='categorical_crossentropy', metrics=['accuracy'])\n",
     "model.fit(train_data, train_labels, epochs=EPOCHS, batch_size=BATCH_SIZE, validation_data=(val_data, val_labels))\n"
@@ -230,12 +194,6 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": null,
-   "id": "61d6a8d8",
-   "metadata": {},
-   "outputs": [],
-=======
    "execution_count": 9,
    "id": "61d6a8d8",
    "metadata": {},
@@ -262,20 +220,14 @@
      ]
     }
    ],
->>>>>>> master
    "source": [
     "model.save('./models/model')"
    ]
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": null,
-   "id": "fdc9bfe6",
-=======
    "execution_count": 10,
    "id": "dc610fdb",
->>>>>>> master
    "metadata": {},
    "outputs": [],
    "source": [
@@ -303,12 +255,6 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": null,
-   "id": "297e3e3c",
-   "metadata": {},
-   "outputs": [],
-=======
    "execution_count": 11,
    "id": "6b6d20d2",
    "metadata": {},
@@ -325,7 +271,6 @@
      ]
     }
    ],
->>>>>>> master
    "source": [
     "predictions = model.predict(test_data)\n",
     "predicted_classes = np.argmax(predictions, axis=1)\n",
@@ -337,11 +282,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-<<<<<<< HEAD
-   "id": "e22211b0",
-=======
    "id": "2bd77ac5",
->>>>>>> master
    "metadata": {},
    "outputs": [],
    "source": [

Project/Backend/Server_Node/controllers/user.controller.js

@@ -41,11 +41,7 @@ export const signUp = async (req, res) => {
     } = req.body;
 
     try {
-<<<<<<< HEAD
-        if (!type) return res.status(400).json({ code: "02", message: "Type Field Required" })
-=======
         // if (!type) return res.status(400).json({ code: "02", message: "Type Field Required" })
->>>>>>> master
         if (!email) return res.status(400).json({ code: "02", message: "Email Field Required" })
         if (!userFirstName) return res.status(400).json({ code: "02", message: "User First Name Field Required" })
         if (!userLastName) return res.status(400).json({ code: "02", message: "User Last Name Field Required" })
@@ -54,53 +50,6 @@ export const signUp = async (req, res) => {
         const existingUser = await User.findOne({ email })
         if (existingUser) return res.status(400).json({ code: "02", message: "User already exists" })
 
-<<<<<<< HEAD
-        if (type === "buyer") {
-            if (!password) return res.status(400).json({ code: "02", message: "Password Field Required" })
-            if (password !== confirmPassword) return res.status(400).json({ code: "02", message: "Passwords do not match" })
-            const hashedPassword = await bcrypt.hash(password, 12)
-
-            const userDetails = new User({
-                email,
-                password: hashedPassword,
-                type,
-                userDetails: {
-                    userQNumber: uuidv4(),
-                    userEmail: email,
-                    userName: `${userFirstName} ${userLastName}`,
-                    userContactNumber,
-                    userAddress: `${userAddressLine1}, ${userAddressLine2}, ${userAddressLine3}`,
-                    userType: type,
-                }
-            })
-
-            const userResult = await userDetails.save()
-
-            const token = jwt.sign({ email: userResult.email, id: userResult._id }, 'test', { expiresIn: "1h" })
-
-            res.status(200).json({ code: "01", result: userResult, token })
-        } else if (type === "trader") {
-            const userDetails = new User({
-                email,
-                type,
-                userDetails: {
-                    userQNumber: uuidv4(),
-                    userEmail: email,
-                    userName: `${userFirstName} ${userLastName}`,
-                    userContactNumber,
-                    userAddress: `${userAddressLine1}, ${userAddressLine2}, ${userAddressLine3}`,
-                    userType: type,
-                },
-                states: 2
-            })
-
-            const userResult = await userDetails.save()
-
-            const token = jwt.sign({ email: userResult.email, id: userResult._id }, 'test', { expiresIn: "1h" })
-
-            res.status(200).json({ code: "01", result: userResult, token })
-        }
-=======
         // if (type === "buyer") {
         //     if (!password) return res.status(400).json({ code: "02", message: "Password Field Required" })
         //     if (password !== confirmPassword) return res.status(400).json({ code: "02", message: "Passwords do not match" })
@@ -169,7 +118,6 @@ export const signUp = async (req, res) => {
         const token = jwt.sign({ email: userResult.email, id: userResult._id }, 'test', { expiresIn: "1h" })
 
         res.status(200).json({ code: "01", result: userResult, token })
->>>>>>> master
 
     } catch (error) {
         res.status(500).json({ code: "00", message: "Something went wrong" })

Project/Backend/Server_Node/models/user.model.js

@@ -36,10 +36,7 @@ const userSchema = mongoose.Schema({
         },
         userType: {
             type: String,
-<<<<<<< HEAD
-=======
             default: "N/A",
->>>>>>> master
             required: true
         },
     },

Project/Backend/Server_Node/server.js

@@ -5,13 +5,8 @@ import express from "express";
 import mongoose from "mongoose";
 
 //import routes
-<<<<<<< HEAD
-import userRoutes from "./routes/user.routes.js";
-import translateRoutes from "./routes/translate.routes.js";
-=======
 import translateRoutes from "./routes/translate.routes.js";
 import userRoutes from "./routes/user.routes.js";
->>>>>>> master
 
 dotenv.config();
 const app = express();

Project/Backend/Server_Python/.gitignore

@@ -16,12 +16,6 @@
 files/*
 !files/
 
-<<<<<<< HEAD
-*.pyc
-*~
-*.swp
-=======
->>>>>>> master
 
 # Created by https://www.toptal.com/developers/gitignore/api/python
 # Edit at https://www.toptal.com/developers/gitignore?templates=python

Project/Backend/Server_Python/controllers/translate_controler.py

-<<<<<<< HEAD
-from fastapi import APIRouter, File, HTTPException,UploadFile
-from pydantic import BaseModel
-import tensorflow as tf
-from core.logger import setup_logger
-
-
-=======
 import base64
 import os
 import cv2
@@ -15,7 +7,6 @@ from pydantic import BaseModel
 import tensorflow as tf
 
 from core import setup_logger
->>>>>>> master
 from services.translate_service import SignLanguagePredictionService
 from utils import mappings
 

Project/Backend/Server_Python/core/logger.py

-import logging
-
-def setup_logger():
-    logger = logging.getLogger(__name__)
-    logger.setLevel(logging.DEBUG)
-
-    formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
-
-    # Create a file handler for logging to a file
-    file_handler = logging.FileHandler('app.log')
-    file_handler.setLevel(logging.DEBUG)
-    file_handler.setFormatter(formatter)
-
-    # Create a stream handler for logging to console
-    stream_handler = logging.StreamHandler()
-    stream_handler.setLevel(logging.INFO)
-    stream_handler.setFormatter(formatter)
-
-    # Add the handlers to the logger
-    logger.addHandler(file_handler)
-    logger.addHandler(stream_handler)
-
-    return logger

Project/Backend/Server_Python/main.py

@@ -2,13 +2,7 @@ from fastapi import FastAPI
 from controllers import translate_controler, users_controller
 from fastapi.responses import RedirectResponse
 from fastapi.middleware.cors import CORSMiddleware
-<<<<<<< HEAD
-
-from core.logger import setup_logger
-
-=======
 from core import setup_logger
->>>>>>> master
 
 
 app = FastAPI()

Project/Backend/Server_Python/services/translate_service.py

@@ -5,15 +5,10 @@ import numpy as np
 from fastapi import HTTPException, UploadFile
 from typing import Dict
 
-<<<<<<< HEAD
-from core.logger import setup_logger
-
-=======
 import tensorflow as tf
 
 from core import setup_logger
 from utils import mappings
->>>>>>> master
 
 logger = setup_logger()
 

Project/Frontend/Web_App/public/manifest.json

 {
-<<<<<<< HEAD
-  "name": "React Material Minimal UI",
-=======
   "name": "React Material SignConnect+",
->>>>>>> master
   "short_name": "Minimal-UI",
   "display": "standalone",
   "start_url": "/",

Project/Frontend/Web_App/src/components/mega-menu/MegaMenuDesktopVertical.tsx

@@ -17,11 +17,7 @@ import MegaMenuCarousel from './MenuCarousel';
 // ----------------------------------------------------------------------
 
 const MENU_PAPER_WIDTH = 800;
-<<<<<<< HEAD
-const PARENT_ITEM_HEIGHT = 40;
-=======
 const PARENT_ITEM_HEIGHT = 60;
->>>>>>> master
 
 type Props = {
   data: MegaMenuItemProps[];

Project/Frontend/Web_App/src/layouts/dashboard/nav/NavVertical.tsx

@@ -2,33 +2,18 @@ import { useEffect } from 'react';
 // next
 import { useRouter } from 'next/router';
 // @mui
-<<<<<<< HEAD
-import { Box, Stack, Drawer, Button } from '@mui/material';
-=======
 import { Box, Button, Drawer, Stack } from '@mui/material';
->>>>>>> master
 // hooks
 import useResponsive from '../../../hooks/useResponsive';
 // config
 import { NAV } from '../../../config';
 // components
-<<<<<<< HEAD
-import Logo from '../../../components/logo';
-import Scrollbar from '../../../components/scrollbar';
-import { NavSectionVertical } from '../../../components/nav-section';
-//
-import navConfig from './config';
-import NavDocs from './NavDocs';
-import NavAccount from './NavAccount';
-import { useSettingsContext } from 'src/components/settings';
-=======
 import { NavSectionVertical } from '../../../components/nav-section';
 import Scrollbar from '../../../components/scrollbar';
 //
 import { useSettingsContext } from 'src/components/settings';
 import NavAccount from './NavAccount';
 import navConfig from './config';
->>>>>>> master
 
 // ----------------------------------------------------------------------
 
@@ -51,20 +36,12 @@ export default function NavVertical({ openNav, onCloseNav }: Props) {
           value: 'mini'
         }
       } as React.ChangeEvent<HTMLInputElement>)
-<<<<<<< HEAD
-    }else {
-=======
     } else {
->>>>>>> master
       onChangeLayout({
         target: {
           value: 'vertical'
         }
-<<<<<<< HEAD
-      } as React.ChangeEvent<HTMLInputElement> )
-=======
       } as React.ChangeEvent<HTMLInputElement>)
->>>>>>> master
     }
   }
 
@@ -96,11 +73,7 @@ export default function NavVertical({ openNav, onCloseNav }: Props) {
         }}
       >
 
-<<<<<<< HEAD
-<Button onClick={onClickHan}>Change Layout</Button>
-=======
         <Button onClick={onClickHan}>Change Layout</Button>
->>>>>>> master
         {/* <Logo /> */}
 
         <NavAccount />
@@ -109,12 +82,7 @@ export default function NavVertical({ openNav, onCloseNav }: Props) {
       <NavSectionVertical data={navConfig} />
 
       <Box sx={{ flexGrow: 1 }} />
-<<<<<<< HEAD
-
-      <NavDocs />
-=======
  
->>>>>>> master
     </Scrollbar>
   );
 

Project/Frontend/Web_App/src/layouts/dashboard/nav/config.tsx

 // routes
 import { PATH_DASHBOARD } from '../../../routes/paths';
 // components
-<<<<<<< HEAD
-import Label from '../../../components/label';
-import Iconify from '../../../components/iconify';
-=======
->>>>>>> master
 import SvgColor from '../../../components/svg-color';
 
 // ----------------------------------------------------------------------
@@ -36,216 +31,15 @@ const ICONS = {
   ecommerce: icon('ic_ecommerce'),
   analytics: icon('ic_analytics'),
   dashboard: icon('ic_dashboard'),
-<<<<<<< HEAD
-};
-
-const navConfig = [
-  // GENERAL
-  // ----------------------------------------------------------------------
-=======
   learning: icon('ic_learning')
 };
 
 const navConfig = [
   // GENERAL 
->>>>>>> master
   {
     subheader: 'general',
     items: [
       { title: 'app', path: PATH_DASHBOARD.general.app, icon: ICONS.dashboard },
-<<<<<<< HEAD
-      { title: 'ecommerce', path: PATH_DASHBOARD.general.ecommerce, icon: ICONS.ecommerce },
-      { title: 'analytics', path: PATH_DASHBOARD.general.analytics, icon: ICONS.analytics },
-      { title: 'banking', path: PATH_DASHBOARD.general.banking, icon: ICONS.banking },
-      { title: 'booking', path: PATH_DASHBOARD.general.booking, icon: ICONS.booking },
-      { title: 'file', path: PATH_DASHBOARD.general.file, icon: ICONS.file },
-    ],
-  },
-
-  // MANAGEMENT
-  // ----------------------------------------------------------------------
-  {
-    subheader: 'management',
-    items: [
-      // USER
-      {
-        title: 'user',
-        path: PATH_DASHBOARD.user.root,
-        icon: ICONS.user,
-        children: [
-          { title: 'profile', path: PATH_DASHBOARD.user.profile },
-          { title: 'cards', path: PATH_DASHBOARD.user.cards },
-          { title: 'list', path: PATH_DASHBOARD.user.list },
-          { title: 'create', path: PATH_DASHBOARD.user.new },
-          { title: 'edit', path: PATH_DASHBOARD.user.demoEdit },
-          { title: 'account', path: PATH_DASHBOARD.user.account },
-        ],
-      },
-
-      // E-COMMERCE
-      {
-        title: 'ecommerce',
-        path: PATH_DASHBOARD.eCommerce.root,
-        icon: ICONS.cart,
-        children: [
-          { title: 'shop', path: PATH_DASHBOARD.eCommerce.shop },
-          { title: 'product', path: PATH_DASHBOARD.eCommerce.demoView },
-          { title: 'list', path: PATH_DASHBOARD.eCommerce.list },
-          { title: 'create', path: PATH_DASHBOARD.eCommerce.new },
-          { title: 'edit', path: PATH_DASHBOARD.eCommerce.demoEdit },
-          { title: 'checkout', path: PATH_DASHBOARD.eCommerce.checkout },
-        ],
-      },
-
-      // INVOICE
-      {
-        title: 'invoice',
-        path: PATH_DASHBOARD.invoice.root,
-        icon: ICONS.invoice,
-        children: [
-          { title: 'list', path: PATH_DASHBOARD.invoice.list },
-          { title: 'details', path: PATH_DASHBOARD.invoice.demoView },
-          { title: 'create', path: PATH_DASHBOARD.invoice.new },
-          { title: 'edit', path: PATH_DASHBOARD.invoice.demoEdit },
-        ],
-      },
-
-      // BLOG
-      {
-        title: 'blog',
-        path: PATH_DASHBOARD.blog.root,
-        icon: ICONS.blog,
-        children: [
-          { title: 'posts', path: PATH_DASHBOARD.blog.posts },
-          { title: 'post', path: PATH_DASHBOARD.blog.demoView },
-          { title: 'create', path: PATH_DASHBOARD.blog.new },
-        ],
-      },
-      {
-        title: 'File manager',
-        path: PATH_DASHBOARD.fileManager,
-        icon: ICONS.folder,
-      },
-    ],
-  },
-
-  // APP
-  // ----------------------------------------------------------------------
-  {
-    subheader: 'app',
-    items: [
-      {
-        title: 'mail',
-        path: PATH_DASHBOARD.mail.root,
-        icon: ICONS.mail,
-        info: <Label color="error">+32</Label>,
-      },
-      {
-        title: 'chat',
-        path: PATH_DASHBOARD.chat.root,
-        icon: ICONS.chat,
-      },
-      {
-        title: 'calendar',
-        path: PATH_DASHBOARD.calendar,
-        icon: ICONS.calendar,
-      },
-      {
-        title: 'kanban',
-        path: PATH_DASHBOARD.kanban,
-        icon: ICONS.kanban,
-      },
-    ],
-  },
-
-  // DEMO MENU STATES
-  {
-    subheader: 'Other cases',
-    items: [
-      {
-        // default roles : All roles can see this entry.
-        // roles: ['user'] Only users can see this item.
-        // roles: ['admin'] Only admin can see this item.
-        // roles: ['admin', 'manager'] Only admin/manager can see this item.
-        // Reference from 'src/guards/RoleBasedGuard'.
-        title: 'item_by_roles',
-        path: PATH_DASHBOARD.permissionDenied,
-        icon: ICONS.lock,
-        roles: ['admin'],
-        caption: 'only_admin_can_see_this_item',
-      },
-      {
-        title: 'menu_level',
-        path: '#/dashboard/menu_level',
-        icon: ICONS.menuItem,
-        children: [
-          {
-            title: 'menu_level_2a',
-            path: '#/dashboard/menu_level/menu_level_2a',
-          },
-          {
-            title: 'menu_level_2b',
-            path: '#/dashboard/menu_level/menu_level_2b',
-            children: [
-              {
-                title: 'menu_level_3a',
-                path: '#/dashboard/menu_level/menu_level_2b/menu_level_3a',
-              },
-              {
-                title: 'menu_level_3b',
-                path: '#/dashboard/menu_level/menu_level_2b/menu_level_3b',
-                children: [
-                  {
-                    title: 'menu_level_4a',
-                    path: '#/dashboard/menu_level/menu_level_2b/menu_level_3b/menu_level_4a',
-                  },
-                  {
-                    title: 'menu_level_4b',
-                    path: '#/dashboard/menu_level/menu_level_2b/menu_level_3b/menu_level_4b',
-                  },
-                ],
-              },
-            ],
-          },
-        ],
-      },
-      {
-        title: 'item_disabled',
-        path: '#disabled',
-        icon: ICONS.disabled,
-        disabled: true,
-      },
-
-      {
-        title: 'item_label',
-        path: '#label',
-        icon: ICONS.label,
-        info: (
-          <Label color="info" startIcon={<Iconify icon="eva:email-fill" />}>
-            NEW
-          </Label>
-        ),
-      },
-      {
-        title: 'item_caption',
-        path: '#caption',
-        icon: ICONS.menuItem,
-        caption:
-          'Quisque malesuada placerat nisl. In hac habitasse platea dictumst. Cras id dui. Pellentesque commodo eros a enim. Morbi mollis tellus ac sapien.',
-      },
-      {
-        title: 'item_external_link',
-        path: 'https://www.google.com/',
-        icon: ICONS.external,
-      },
-      {
-        title: 'blank',
-        path: PATH_DASHBOARD.blank,
-        icon: ICONS.blank,
-      },
-    ],
-  },
-=======
       { title: 'blank', path: PATH_DASHBOARD.blank, icon: ICONS.blank },
       //Spoken language to Sign Language Module items
       {
@@ -271,7 +65,6 @@ const navConfig = [
     ],
   },
 
->>>>>>> master
 ];
 
 export default navConfig;

Project/Frontend/Web_App/src/layouts/main/Footer.tsx

@@ -97,11 +97,7 @@ export default function Footer() {
 
           <Grid item xs={8} md={3}>
             <Typography variant="body2" sx={{ pr: { md: 5 } }}>
-<<<<<<< HEAD
-              The starting point for your next project with Minimal UI Kit, built on the newest
-=======
               The starting point for your next project with SignConnect+ Kit, built on the newest
->>>>>>> master
               version of Material-UI ©, ready to be customized to your style.
             </Typography>
 

Project/Frontend/Web_App/src/pages/403.tsx

@@ -21,11 +21,7 @@ export default function Page403() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> 403 Forbidden | Minimal UI</title>
-=======
         <title> 403 Forbidden | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <MotionContainer>

Project/Frontend/Web_App/src/pages/404.tsx

@@ -21,11 +21,7 @@ export default function Page404() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> 404 Page Not Found | Minimal UI</title>
-=======
         <title> 404 Page Not Found | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <MotionContainer>

Project/Frontend/Web_App/src/pages/500.tsx

@@ -21,11 +21,7 @@ export default function Page500() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> 500 Internal Server Error | Minimal UI</title>
-=======
         <title> 500 Internal Server Error | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <MotionContainer>

Project/Frontend/Web_App/src/pages/_document.tsx

@@ -45,17 +45,10 @@ export default class MyDocument extends Document {
           {/* Meta */}
           <meta
             name="description"
-<<<<<<< HEAD
-            content="The starting point for your next project with Minimal UI Kit, built on the newest version of Material-UI ©, ready to be customized to your style"
-          />
-          <meta name="keywords" content="react,material,kit,application,dashboard,admin,template" />
-          <meta name="author" content="Minimal UI Kit" />
-=======
             content="The starting point for your next project with SignConnect+ Kit, built on the newest version of Material-UI ©, ready to be customized to your style"
           />
           <meta name="keywords" content="react,material,kit,application,dashboard,admin,template" />
           <meta name="author" content="SignConnect+ Kit" />
->>>>>>> master
         </Head>
 
         <body>

Project/Frontend/Web_App/src/pages/about-us.tsx

@@ -17,11 +17,7 @@ export default function AboutPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> About us | Minimal UI</title>
-=======
         <title> About us | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <AboutHero />

Project/Frontend/Web_App/src/pages/auth/login-unprotected.tsx

@@ -9,11 +9,7 @@ export default function LoginUnprotectedPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Login Unprotected | Minimal UI</title>
-=======
         <title> Login Unprotected | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Login />

Project/Frontend/Web_App/src/pages/auth/login.tsx

@@ -12,11 +12,7 @@ export default function LoginPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Login | Minimal UI</title>
-=======
         <title> Login | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <GuestGuard>

Project/Frontend/Web_App/src/pages/auth/new-password.tsx

@@ -24,11 +24,7 @@ export default function NewPasswordPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> New Password | Minimal UI</title>
-=======
         <title> New Password | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <SentIcon sx={{ mb: 5, height: 96 }} />

Project/Frontend/Web_App/src/pages/auth/register-unprotected.tsx

@@ -9,11 +9,7 @@ export default function RegisterUnprotectedPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Register Unprotected | Minimal UI</title>
-=======
         <title> Register Unprotected | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Register />

Project/Frontend/Web_App/src/pages/auth/register.tsx

 // next
 import Head from 'next/head';
 // auth
-<<<<<<< HEAD
-import GuestGuard from '../../auth/GuestGuard';
-=======
->>>>>>> master
 // sections
 import Register from '../../sections/auth/Register';
 
@@ -14,19 +10,10 @@ export default function RegisterPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Register | Minimal UI</title>
-      </Head>
-
-      <GuestGuard>
-        <Register />
-      </GuestGuard>
-=======
         <title> Register | SignConnect+</title>
       </Head>
 
       <Register />
->>>>>>> master
     </>
   );
 }

Project/Frontend/Web_App/src/pages/auth/reset-password.tsx

@@ -24,11 +24,7 @@ export default function ResetPasswordPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Reset Password | Minimal UI</title>
-=======
         <title> Reset Password | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <PasswordIcon sx={{ mb: 5, height: 96 }} />

Project/Frontend/Web_App/src/pages/auth/verify.tsx

@@ -24,11 +24,7 @@ export default function VerifyCodePage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Verify Code | Minimal UI</title>
-=======
         <title> Verify Code | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <EmailInboxIcon sx={{ mb: 5, height: 96 }} />

Project/Frontend/Web_App/src/pages/coming-soon.tsx

@@ -27,11 +27,7 @@ export default function ComingSoonPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Coming Soon | Minimal UI</title>
-=======
         <title> Coming Soon | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Typography variant="h3" paragraph>

Project/Frontend/Web_App/src/pages/components/extra/animate.tsx

@@ -40,11 +40,7 @@ export default function DemoAnimatePage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Animate | Minimal UI</title>
-=======
         <title> Extra Components: Animate | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/carousel.tsx

@@ -41,11 +41,7 @@ export default function DemoCarouselsPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Carousels | Minimal UI</title>
-=======
         <title> Extra Components: Carousels | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/chart.tsx

@@ -34,11 +34,7 @@ export default function DemoChartsPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Charts | Minimal UI</title>
-=======
         <title> Extra Components: Charts | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/copy-to-clipboard.tsx

@@ -65,11 +65,7 @@ export default function DemoCopyToClipboardPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Copy To Clipboard | Minimal UI</title>
-=======
         <title> Extra Components: Copy To Clipboard | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/editor.tsx

@@ -35,11 +35,7 @@ export default function DemoEditorPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Editor | Minimal UI</title>
-=======
         <title> Extra Components: Editor | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/form-validation.tsx

@@ -21,11 +21,7 @@ export default function DemoFormValidationPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Form Validation | Minimal UI</title>
-=======
         <title> Extra Components: Form Validation | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/image.tsx

@@ -29,11 +29,7 @@ export default function DemoImagePage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Image | Minimal UI</title>
-=======
         <title> Extra Components: Image | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/label.tsx

@@ -26,11 +26,7 @@ export default function DemoLabelPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Label | Minimal UI</title>
-=======
         <title> Extra Components: Label | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/lightbox.tsx

@@ -42,11 +42,7 @@ export default function DemoLightboxPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Lightbox | Minimal UI</title>
-=======
         <title> Extra Components: Lightbox | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/map.tsx

@@ -74,11 +74,7 @@ export default function DemoMapPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Map | Minimal UI</title>
-=======
         <title> Extra Components: Map | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/mega-menu.tsx

@@ -30,11 +30,7 @@ export default function DemoMegaMenuPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Mega Menu | Minimal UI</title>
-=======
         <title> Extra Components: Mega Menu | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/multi-language.tsx

@@ -60,11 +60,7 @@ export default function DemoMultiLanguagePage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Multi Language | Minimal UI</title>
-=======
         <title> Extra Components: Multi Language | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/navigation-bar.tsx

@@ -27,11 +27,7 @@ export default function DemoNavigationBarPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Navigation Bar | Minimal UI</title>
-=======
         <title> Extra Components: Navigation Bar | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/organization-chart.tsx

@@ -29,11 +29,7 @@ export default function DemoOrganizationalChartPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Organizational Chart | Minimal UI</title>
-=======
         <title> Extra Components: Organizational Chart | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/scroll.tsx

@@ -20,11 +20,7 @@ export default function DemoScrollbarPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Scrollbar | Minimal UI</title>
-=======
         <title> Extra Components: Scrollbar | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/snackbar.tsx

@@ -59,11 +59,7 @@ export default function DemoSnackbarPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Snackbar | Minimal UI</title>
-=======
         <title> Extra Components: Snackbar | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/text-max-line.tsx

@@ -21,11 +21,7 @@ export default function DemoTextMaxLinePage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Text Max Line | Minimal UI</title>
-=======
         <title> Extra Components: Text Max Line | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/extra/upload.tsx

@@ -87,11 +87,7 @@ export default function DemoUploadPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Extra Components: Upload | Minimal UI</title>
-=======
         <title> Extra Components: Upload | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/foundation/colors.tsx

@@ -54,11 +54,7 @@ export default function FoundationColorsPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Foundations: Colors | Minimal UI</title>
-=======
         <title> Foundations: Colors | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/foundation/grid.tsx

@@ -60,11 +60,7 @@ export default function FoundationGridPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Foundations: Grid | Minimal UI</title>
-=======
         <title> Foundations: Grid | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/foundation/icons.tsx

@@ -33,11 +33,7 @@ export default function FoundationIconsPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Foundations: Icons | Minimal UI</title>
-=======
         <title> Foundations: Icons | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/foundation/shadows.tsx

@@ -51,11 +51,7 @@ export default function FoundationShadowsPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Foundations: Shadows | Minimal UI</title>
-=======
         <title> Foundations: Shadows | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/foundation/typography.tsx

@@ -55,11 +55,7 @@ export default function FoundationTypographyPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Foundations: Typography | Minimal UI</title>
-=======
         <title> Foundations: Typography | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/index.tsx

@@ -19,11 +19,7 @@ export default function ComponentsOverviewPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Components Overview | Minimal UI</title>
-=======
         <title> Components Overview | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <ComponentHero />

Project/Frontend/Web_App/src/pages/components/mui/accordion.tsx

@@ -50,11 +50,7 @@ export default function MUIAccordionPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Accordion | Minimal UI</title>
-=======
         <title> MUI Components: Accordion | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/alert.tsx

@@ -36,11 +36,7 @@ export default function MUIAlertPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Alert | Minimal UI</title>
-=======
         <title> MUI Components: Alert | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/autocomplete.tsx

@@ -47,11 +47,7 @@ export default function MUIAutocompletePage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Autocomplete | Minimal UI</title>
-=======
         <title> MUI Components: Autocomplete | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/avatar.tsx

@@ -40,11 +40,7 @@ export default function MUIAvatarPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Avatar | Minimal UI</title>
-=======
         <title> MUI Components: Avatar | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/badge.tsx

@@ -23,11 +23,7 @@ export default function MUIBadgePage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Badge | Minimal UI</title>
-=======
         <title> MUI Components: Badge | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/breadcrumbs.tsx

@@ -22,11 +22,7 @@ export default function MUIBreadcrumbsPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Breadcrumbs | Minimal UI</title>
-=======
         <title> MUI Components: Breadcrumbs | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/buttons.tsx

@@ -49,11 +49,7 @@ export default function MUIButtonsPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Buttons | Minimal UI</title>
-=======
         <title> MUI Components: Buttons | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/checkbox.tsx

@@ -52,11 +52,7 @@ export default function MUICheckboxPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Checkbox | Minimal UI</title>
-=======
         <title> MUI Components: Checkbox | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/chip.tsx

@@ -21,11 +21,7 @@ export default function MUIChipPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Chip | Minimal UI</title>
-=======
         <title> MUI Components: Chip | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/data-grid.tsx

@@ -40,11 +40,7 @@ export default function MUIDataGridPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: DataGrid | Minimal UI</title>
-=======
         <title> MUI Components: DataGrid | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/dialog.tsx

@@ -37,11 +37,7 @@ export default function MUIDialogPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Dialog | Minimal UI</title>
-=======
         <title> MUI Components: Dialog | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/list.tsx

@@ -97,11 +97,7 @@ export default function MUIListPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: List | Minimal UI</title>
-=======
         <title> MUI Components: List | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/menu.tsx

@@ -98,11 +98,7 @@ export default function MUIMenuPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Menu | Minimal UI</title>
-=======
         <title> MUI Components: Menu | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/pagination.tsx

@@ -60,11 +60,7 @@ export default function MUIPaginationPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Pagination | Minimal UI</title>
-=======
         <title> MUI Components: Pagination | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/pickers.tsx

@@ -36,11 +36,7 @@ export default function MUIPickersPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Pickers | Minimal UI</title>
-=======
         <title> MUI Components: Pickers | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/popover.tsx

@@ -73,11 +73,7 @@ export default function MUIPopoverPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Popover | Minimal UI</title>
-=======
         <title> MUI Components: Popover | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/progress.tsx

@@ -70,11 +70,7 @@ export default function MUIProgressPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Progress | Minimal UI</title>
-=======
         <title> MUI Components: Progress | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/radio-button.tsx

@@ -43,11 +43,7 @@ export default function MUIRadioButtonsPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Radio Buttons | Minimal UI</title>
-=======
         <title> MUI Components: Radio Buttons | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/rating.tsx

@@ -88,11 +88,7 @@ export default function MUIRatingPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Rating | Minimal UI</title>
-=======
         <title> MUI Components: Rating | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/slider.tsx

@@ -79,11 +79,7 @@ export default function MUISliderPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Slider | Minimal UI</title>
-=======
         <title> MUI Components: Slider | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/stepper.tsx

@@ -25,11 +25,7 @@ export default function MUIStepperPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Stepper | Minimal UI</title>
-=======
         <title> MUI Components: Stepper | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/switch.tsx

@@ -36,11 +36,7 @@ export default function MUISwitchPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Switch | Minimal UI</title>
-=======
         <title> MUI Components: Switch | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/table.tsx

@@ -24,11 +24,7 @@ export default function MUITablePage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Table | Minimal UI</title>
-=======
         <title> MUI Components: Table | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/tabs.tsx

@@ -78,11 +78,7 @@ export default function MUITabsPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Tabs | Minimal UI</title>
-=======
         <title> MUI Components: Tabs | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/textfield.tsx

@@ -32,11 +32,7 @@ export default function MUITextFieldPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Textfield | Minimal UI</title>
-=======
         <title> MUI Components: Textfield | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/timeline.tsx

@@ -106,11 +106,7 @@ export default function MUITimelinePage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Timeline | Minimal UI</title>
-=======
         <title> MUI Components: Timeline | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/tooltip.tsx

@@ -40,11 +40,7 @@ export default function MUITooltipPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Tooltip | Minimal UI</title>
-=======
         <title> MUI Components: Tooltip | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/transfer-list.tsx

@@ -32,11 +32,7 @@ export default function MUITransferListPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Transfer List | Minimal UI</title>
-=======
         <title> MUI Components: Transfer List | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/components/mui/tree-view.tsx

@@ -45,11 +45,7 @@ export default function MUITreesViewPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> MUI Components: Tree View | Minimal UI</title>
-=======
         <title> MUI Components: Tree View | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Box

Project/Frontend/Web_App/src/pages/contact-us.tsx

@@ -19,11 +19,7 @@ export default function ContactPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Contact us | Minimal UI</title>
-=======
         <title> Contact us | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <ContactHero />

Project/Frontend/Web_App/src/pages/dashboard/analytics.tsx

@@ -38,11 +38,7 @@ export default function GeneralAnalyticsPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> General: Analytics | Minimal UI</title>
-=======
         <title> General: Analytics | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Container maxWidth={themeStretch ? false : 'xl'}>

Project/Frontend/Web_App/src/pages/dashboard/app.tsx

@@ -49,11 +49,7 @@ export default function GeneralAppPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> General: App | Minimal UI</title>
-=======
         <title> General: App | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Container maxWidth={themeStretch ? false : 'xl'}>

Project/Frontend/Web_App/src/pages/dashboard/banking.tsx

@@ -40,11 +40,7 @@ export default function GeneralBankingPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> General: Banking | Minimal UI</title>
-=======
         <title> General: Banking | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Container maxWidth={themeStretch ? false : 'xl'}>

Project/Frontend/Web_App/src/pages/dashboard/blank.tsx

@@ -18,11 +18,7 @@ export default function BlankPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Blank Page | Minimal UI</title>
-=======
         <title> Blank Page | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Container maxWidth={themeStretch ? false : 'xl'}>

Project/Frontend/Web_App/src/pages/dashboard/blog/new.tsx

@@ -24,11 +24,7 @@ export default function BlogNewPostPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Blog: New Post | Minimal UI</title>
-=======
         <title> Blog: New Post | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Container maxWidth={themeStretch ? false : 'lg'}>

Project/Frontend/Web_App/src/pages/dashboard/blog/post/[title].tsx

@@ -87,11 +87,7 @@ export default function BlogPostPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title>{`Blog: ${post?.title || ''} | Minimal UI`}</title>
-=======
         <title>{`Blog: ${post?.title || ''} | SignConnect+`}</title>
->>>>>>> master
       </Head>
 
       <Container maxWidth={themeStretch ? false : 'lg'}>

Project/Frontend/Web_App/src/pages/dashboard/blog/posts.tsx

@@ -64,11 +64,7 @@ export default function BlogPostsPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Blog: Posts | Minimal UI</title>
-=======
         <title> Blog: Posts | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Container maxWidth={themeStretch ? false : 'lg'}>

Project/Frontend/Web_App/src/pages/dashboard/booking.tsx

@@ -43,11 +43,7 @@ export default function GeneralBookingPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> General: Booking | Minimal UI</title>
-=======
         <title> General: Booking | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Container maxWidth={themeStretch ? false : 'xl'}>

Project/Frontend/Web_App/src/pages/dashboard/calendar.tsx

@@ -253,11 +253,7 @@ export default function CalendarPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Calendar | Minimal UI</title>
-=======
         <title> Calendar | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Container maxWidth={themeStretch ? false : 'xl'}>

Project/Frontend/Web_App/src/pages/dashboard/chat/[conversationKey].tsx

@@ -15,11 +15,7 @@ export default function ChatPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Chat | Minimal UI</title>
-=======
         <title> Chat | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Chat />

Project/Frontend/Web_App/src/pages/dashboard/chat/index.tsx

@@ -15,11 +15,7 @@ export default function ChatPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Chat | Minimal UI</title>
-=======
         <title> Chat | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Chat />

Project/Frontend/Web_App/src/pages/dashboard/chat/new.tsx

@@ -15,11 +15,7 @@ export default function ChatPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Chat | Minimal UI</title>
-=======
         <title> Chat | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Chat />

Project/Frontend/Web_App/src/pages/dashboard/e-commerce/checkout.tsx

@@ -121,11 +121,7 @@ export default function EcommerceCheckoutPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Ecommerce: Checkout | Minimal UI</title>
-=======
         <title> Ecommerce: Checkout | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Container maxWidth={themeStretch ? false : 'lg'}>

Project/Frontend/Web_App/src/pages/dashboard/e-commerce/list.tsx

@@ -198,11 +198,7 @@ export default function EcommerceProductListPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Ecommerce: Product List | Minimal UI</title>
-=======
         <title> Ecommerce: Product List | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Container maxWidth={themeStretch ? false : 'lg'}>

Project/Frontend/Web_App/src/pages/dashboard/e-commerce/product/[name].tsx

@@ -99,11 +99,7 @@ export default function EcommerceProductDetailsPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title>{`Ecommerce: ${product?.name || ''} | Minimal UI`}</title>
-=======
         <title>{`Ecommerce: ${product?.name || ''} | SignConnect+`}</title>
->>>>>>> master
       </Head>
 
       <Container maxWidth={themeStretch ? false : 'lg'}>

Project/Frontend/Web_App/src/pages/dashboard/e-commerce/product/[name]/edit.tsx

@@ -46,11 +46,7 @@ export default function EcommerceProductEditPage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Ecommerce: Edit product | Minimal UI</title>
-=======
         <title> Ecommerce: Edit product | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Container maxWidth={themeStretch ? false : 'lg'}>

Project/Frontend/Web_App/src/pages/dashboard/e-commerce/product/new.tsx

@@ -26,11 +26,7 @@ export default function EcommerceProductCreatePage() {
   return (
     <>
       <Head>
-<<<<<<< HEAD
-        <title> Ecommerce: Create a new product | Minimal UI</title>
-=======
         <title> Ecommerce: Create a new product | SignConnect+</title>
->>>>>>> master
       </Head>
 
       <Container maxWidth={themeStretch ? false : 'lg'}>