Commit 27bc8747 authored by Gamage B.G.J's avatar Gamage B.G.J

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

This reverts merge request !6
parent 3c233a51
...@@ -2,11 +2,7 @@ ...@@ -2,11 +2,7 @@
"cells": [ "cells": [
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": 6,
=======
"execution_count": 2, "execution_count": 2,
>>>>>>> master
"id": "ade37944", "id": "ade37944",
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
...@@ -21,11 +17,7 @@ ...@@ -21,11 +17,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": 7,
=======
"execution_count": 3, "execution_count": 3,
>>>>>>> master
"id": "16176bf6", "id": "16176bf6",
"metadata": {}, "metadata": {},
"outputs": [ "outputs": [
...@@ -48,11 +40,7 @@ ...@@ -48,11 +40,7 @@
" 'Uhh']" " 'Uhh']"
] ]
}, },
<<<<<<< HEAD
"execution_count": 7,
=======
"execution_count": 3, "execution_count": 3,
>>>>>>> master
"metadata": {}, "metadata": {},
"output_type": "execute_result" "output_type": "execute_result"
} }
...@@ -69,11 +57,7 @@ ...@@ -69,11 +57,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": 8,
=======
"execution_count": 4, "execution_count": 4,
>>>>>>> master
"id": "8f7b1301", "id": "8f7b1301",
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
...@@ -99,11 +83,7 @@ ...@@ -99,11 +83,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": 9,
=======
"execution_count": 5, "execution_count": 5,
>>>>>>> master
"id": "c9034cbe", "id": "c9034cbe",
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
...@@ -133,11 +113,7 @@ ...@@ -133,11 +113,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": null,
=======
"execution_count": 6, "execution_count": 6,
>>>>>>> master
"id": "7adb379e", "id": "7adb379e",
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
...@@ -148,11 +124,7 @@ ...@@ -148,11 +124,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": null,
=======
"execution_count": 7, "execution_count": 7,
>>>>>>> master
"id": "d44f7806", "id": "d44f7806",
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
...@@ -172,18 +144,11 @@ ...@@ -172,18 +144,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": null,
=======
"execution_count": 8, "execution_count": 8,
>>>>>>> master
"id": "ff4f0d06", "id": "ff4f0d06",
"metadata": { "metadata": {
"scrolled": true "scrolled": true
}, },
<<<<<<< HEAD
"outputs": [],
=======
"outputs": [ "outputs": [
{ {
"name": "stdout", "name": "stdout",
...@@ -222,7 +187,6 @@ ...@@ -222,7 +187,6 @@
"output_type": "execute_result" "output_type": "execute_result"
} }
], ],
>>>>>>> master
"source": [ "source": [
"model.compile(optimizer='adam', loss='categorical_crossentropy', metrics=['accuracy'])\n", "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" "model.fit(train_data, train_labels, epochs=EPOCHS, batch_size=BATCH_SIZE, validation_data=(val_data, val_labels))\n"
...@@ -230,12 +194,6 @@ ...@@ -230,12 +194,6 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": null,
"id": "61d6a8d8",
"metadata": {},
"outputs": [],
=======
"execution_count": 9, "execution_count": 9,
"id": "61d6a8d8", "id": "61d6a8d8",
"metadata": {}, "metadata": {},
...@@ -262,20 +220,14 @@ ...@@ -262,20 +220,14 @@
] ]
} }
], ],
>>>>>>> master
"source": [ "source": [
"model.save('./models/model')" "model.save('./models/model')"
] ]
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": null,
"id": "fdc9bfe6",
=======
"execution_count": 10, "execution_count": 10,
"id": "dc610fdb", "id": "dc610fdb",
>>>>>>> master
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
...@@ -303,12 +255,6 @@ ...@@ -303,12 +255,6 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": null,
"id": "297e3e3c",
"metadata": {},
"outputs": [],
=======
"execution_count": 11, "execution_count": 11,
"id": "6b6d20d2", "id": "6b6d20d2",
"metadata": {}, "metadata": {},
...@@ -325,7 +271,6 @@ ...@@ -325,7 +271,6 @@
] ]
} }
], ],
>>>>>>> master
"source": [ "source": [
"predictions = model.predict(test_data)\n", "predictions = model.predict(test_data)\n",
"predicted_classes = np.argmax(predictions, axis=1)\n", "predicted_classes = np.argmax(predictions, axis=1)\n",
...@@ -337,11 +282,7 @@ ...@@ -337,11 +282,7 @@
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
<<<<<<< HEAD
"id": "e22211b0",
=======
"id": "2bd77ac5", "id": "2bd77ac5",
>>>>>>> master
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
......
...@@ -41,11 +41,7 @@ export const signUp = async (req, res) => { ...@@ -41,11 +41,7 @@ export const signUp = async (req, res) => {
} = req.body; } = req.body;
try { 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" }) // 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 (!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 (!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" }) 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) => { ...@@ -54,53 +50,6 @@ export const signUp = async (req, res) => {
const existingUser = await User.findOne({ email }) const existingUser = await User.findOne({ email })
if (existingUser) return res.status(400).json({ code: "02", message: "User already exists" }) 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 (type === "buyer") {
// if (!password) return res.status(400).json({ code: "02", message: "Password Field Required" }) // 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" }) // 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) => { ...@@ -169,7 +118,6 @@ export const signUp = async (req, res) => {
const token = jwt.sign({ email: userResult.email, id: userResult._id }, 'test', { expiresIn: "1h" }) const token = jwt.sign({ email: userResult.email, id: userResult._id }, 'test', { expiresIn: "1h" })
res.status(200).json({ code: "01", result: userResult, token }) res.status(200).json({ code: "01", result: userResult, token })
>>>>>>> master
} catch (error) { } catch (error) {
res.status(500).json({ code: "00", message: "Something went wrong" }) res.status(500).json({ code: "00", message: "Something went wrong" })
......
...@@ -36,10 +36,7 @@ const userSchema = mongoose.Schema({ ...@@ -36,10 +36,7 @@ const userSchema = mongoose.Schema({
}, },
userType: { userType: {
type: String, type: String,
<<<<<<< HEAD
=======
default: "N/A", default: "N/A",
>>>>>>> master
required: true required: true
}, },
}, },
......
...@@ -5,13 +5,8 @@ import express from "express"; ...@@ -5,13 +5,8 @@ import express from "express";
import mongoose from "mongoose"; import mongoose from "mongoose";
//import routes //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 translateRoutes from "./routes/translate.routes.js";
import userRoutes from "./routes/user.routes.js"; import userRoutes from "./routes/user.routes.js";
>>>>>>> master
dotenv.config(); dotenv.config();
const app = express(); const app = express();
......
...@@ -16,12 +16,6 @@ ...@@ -16,12 +16,6 @@
files/* files/*
!files/ !files/
<<<<<<< HEAD
*.pyc
*~
*.swp
=======
>>>>>>> master
# Created by https://www.toptal.com/developers/gitignore/api/python # Created by https://www.toptal.com/developers/gitignore/api/python
# Edit at https://www.toptal.com/developers/gitignore?templates=python # Edit at https://www.toptal.com/developers/gitignore?templates=python
......
<<<<<<< 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 base64
import os import os
import cv2 import cv2
...@@ -15,7 +7,6 @@ from pydantic import BaseModel ...@@ -15,7 +7,6 @@ from pydantic import BaseModel
import tensorflow as tf import tensorflow as tf
from core import setup_logger from core import setup_logger
>>>>>>> master
from services.translate_service import SignLanguagePredictionService from services.translate_service import SignLanguagePredictionService
from utils import mappings from utils import mappings
......
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
...@@ -2,13 +2,7 @@ from fastapi import FastAPI ...@@ -2,13 +2,7 @@ from fastapi import FastAPI
from controllers import translate_controler, users_controller from controllers import translate_controler, users_controller
from fastapi.responses import RedirectResponse from fastapi.responses import RedirectResponse
from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.cors import CORSMiddleware
<<<<<<< HEAD
from core.logger import setup_logger
=======
from core import setup_logger from core import setup_logger
>>>>>>> master
app = FastAPI() app = FastAPI()
......
...@@ -5,15 +5,10 @@ import numpy as np ...@@ -5,15 +5,10 @@ import numpy as np
from fastapi import HTTPException, UploadFile from fastapi import HTTPException, UploadFile
from typing import Dict from typing import Dict
<<<<<<< HEAD
from core.logger import setup_logger
=======
import tensorflow as tf import tensorflow as tf
from core import setup_logger from core import setup_logger
from utils import mappings from utils import mappings
>>>>>>> master
logger = setup_logger() logger = setup_logger()
......
This diff is collapsed.
{ {
<<<<<<< HEAD
"name": "React Material Minimal UI",
=======
"name": "React Material SignConnect+", "name": "React Material SignConnect+",
>>>>>>> master
"short_name": "Minimal-UI", "short_name": "Minimal-UI",
"display": "standalone", "display": "standalone",
"start_url": "/", "start_url": "/",
......
...@@ -17,11 +17,7 @@ import MegaMenuCarousel from './MenuCarousel'; ...@@ -17,11 +17,7 @@ import MegaMenuCarousel from './MenuCarousel';
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
const MENU_PAPER_WIDTH = 800; const MENU_PAPER_WIDTH = 800;
<<<<<<< HEAD
const PARENT_ITEM_HEIGHT = 40;
=======
const PARENT_ITEM_HEIGHT = 60; const PARENT_ITEM_HEIGHT = 60;
>>>>>>> master
type Props = { type Props = {
data: MegaMenuItemProps[]; data: MegaMenuItemProps[];
......
...@@ -2,33 +2,18 @@ import { useEffect } from 'react'; ...@@ -2,33 +2,18 @@ import { useEffect } from 'react';
// next // next
import { useRouter } from 'next/router'; import { useRouter } from 'next/router';
// @mui // @mui
<<<<<<< HEAD
import { Box, Stack, Drawer, Button } from '@mui/material';
=======
import { Box, Button, Drawer, Stack } from '@mui/material'; import { Box, Button, Drawer, Stack } from '@mui/material';
>>>>>>> master
// hooks // hooks
import useResponsive from '../../../hooks/useResponsive'; import useResponsive from '../../../hooks/useResponsive';
// config // config
import { NAV } from '../../../config'; import { NAV } from '../../../config';
// components // 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 { NavSectionVertical } from '../../../components/nav-section';
import Scrollbar from '../../../components/scrollbar'; import Scrollbar from '../../../components/scrollbar';
// //
import { useSettingsContext } from 'src/components/settings'; import { useSettingsContext } from 'src/components/settings';
import NavAccount from './NavAccount'; import NavAccount from './NavAccount';
import navConfig from './config'; import navConfig from './config';
>>>>>>> master
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
...@@ -51,20 +36,12 @@ export default function NavVertical({ openNav, onCloseNav }: Props) { ...@@ -51,20 +36,12 @@ export default function NavVertical({ openNav, onCloseNav }: Props) {
value: 'mini' value: 'mini'
} }
} as React.ChangeEvent<HTMLInputElement>) } as React.ChangeEvent<HTMLInputElement>)
<<<<<<< HEAD
}else {
=======
} else { } else {
>>>>>>> master
onChangeLayout({ onChangeLayout({
target: { target: {
value: 'vertical' value: 'vertical'
} }
<<<<<<< HEAD
} as React.ChangeEvent<HTMLInputElement> )
=======
} as React.ChangeEvent<HTMLInputElement>) } as React.ChangeEvent<HTMLInputElement>)
>>>>>>> master
} }
} }
...@@ -96,11 +73,7 @@ export default function NavVertical({ openNav, onCloseNav }: Props) { ...@@ -96,11 +73,7 @@ export default function NavVertical({ openNav, onCloseNav }: Props) {
}} }}
> >
<<<<<<< HEAD
<Button onClick={onClickHan}>Change Layout</Button>
=======
<Button onClick={onClickHan}>Change Layout</Button> <Button onClick={onClickHan}>Change Layout</Button>
>>>>>>> master
{/* <Logo /> */} {/* <Logo /> */}
<NavAccount /> <NavAccount />
...@@ -109,12 +82,7 @@ export default function NavVertical({ openNav, onCloseNav }: Props) { ...@@ -109,12 +82,7 @@ export default function NavVertical({ openNav, onCloseNav }: Props) {
<NavSectionVertical data={navConfig} /> <NavSectionVertical data={navConfig} />
<Box sx={{ flexGrow: 1 }} /> <Box sx={{ flexGrow: 1 }} />
<<<<<<< HEAD
<NavDocs />
=======
>>>>>>> master
</Scrollbar> </Scrollbar>
); );
......
// routes // routes
import { PATH_DASHBOARD } from '../../../routes/paths'; import { PATH_DASHBOARD } from '../../../routes/paths';
// components // components
<<<<<<< HEAD
import Label from '../../../components/label';
import Iconify from '../../../components/iconify';
=======
>>>>>>> master
import SvgColor from '../../../components/svg-color'; import SvgColor from '../../../components/svg-color';
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
...@@ -36,216 +31,15 @@ const ICONS = { ...@@ -36,216 +31,15 @@ const ICONS = {
ecommerce: icon('ic_ecommerce'), ecommerce: icon('ic_ecommerce'),
analytics: icon('ic_analytics'), analytics: icon('ic_analytics'),
dashboard: icon('ic_dashboard'), dashboard: icon('ic_dashboard'),
<<<<<<< HEAD
};
const navConfig = [
// GENERAL
// ----------------------------------------------------------------------
=======
learning: icon('ic_learning') learning: icon('ic_learning')
}; };
const navConfig = [ const navConfig = [
// GENERAL // GENERAL
>>>>>>> master
{ {
subheader: 'general', subheader: 'general',
items: [ items: [
{ title: 'app', path: PATH_DASHBOARD.general.app, icon: ICONS.dashboard }, { 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 }, { title: 'blank', path: PATH_DASHBOARD.blank, icon: ICONS.blank },
//Spoken language to Sign Language Module items //Spoken language to Sign Language Module items
{ {
...@@ -271,7 +65,6 @@ const navConfig = [ ...@@ -271,7 +65,6 @@ const navConfig = [
], ],
}, },
>>>>>>> master
]; ];
export default navConfig; export default navConfig;
...@@ -97,11 +97,7 @@ export default function Footer() { ...@@ -97,11 +97,7 @@ export default function Footer() {
<Grid item xs={8} md={3}> <Grid item xs={8} md={3}>
<Typography variant="body2" sx={{ pr: { md: 5 } }}> <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 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. version of Material-UI ©, ready to be customized to your style.
</Typography> </Typography>
......
...@@ -21,11 +21,7 @@ export default function Page403() { ...@@ -21,11 +21,7 @@ export default function Page403() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> 403 Forbidden | Minimal UI</title>
=======
<title> 403 Forbidden | SignConnect+</title> <title> 403 Forbidden | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<MotionContainer> <MotionContainer>
......
...@@ -21,11 +21,7 @@ export default function Page404() { ...@@ -21,11 +21,7 @@ export default function Page404() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> 404 Page Not Found | Minimal UI</title>
=======
<title> 404 Page Not Found | SignConnect+</title> <title> 404 Page Not Found | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<MotionContainer> <MotionContainer>
......
...@@ -21,11 +21,7 @@ export default function Page500() { ...@@ -21,11 +21,7 @@ export default function Page500() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> 500 Internal Server Error | Minimal UI</title>
=======
<title> 500 Internal Server Error | SignConnect+</title> <title> 500 Internal Server Error | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<MotionContainer> <MotionContainer>
......
...@@ -45,17 +45,10 @@ export default class MyDocument extends Document { ...@@ -45,17 +45,10 @@ export default class MyDocument extends Document {
{/* Meta */} {/* Meta */}
<meta <meta
name="description" 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" 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="keywords" content="react,material,kit,application,dashboard,admin,template" />
<meta name="author" content="SignConnect+ Kit" /> <meta name="author" content="SignConnect+ Kit" />
>>>>>>> master
</Head> </Head>
<body> <body>
......
...@@ -17,11 +17,7 @@ export default function AboutPage() { ...@@ -17,11 +17,7 @@ export default function AboutPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> About us | Minimal UI</title>
=======
<title> About us | SignConnect+</title> <title> About us | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<AboutHero /> <AboutHero />
......
...@@ -9,11 +9,7 @@ export default function LoginUnprotectedPage() { ...@@ -9,11 +9,7 @@ export default function LoginUnprotectedPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Login Unprotected | Minimal UI</title>
=======
<title> Login Unprotected | SignConnect+</title> <title> Login Unprotected | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Login /> <Login />
......
...@@ -12,11 +12,7 @@ export default function LoginPage() { ...@@ -12,11 +12,7 @@ export default function LoginPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Login | Minimal UI</title>
=======
<title> Login | SignConnect+</title> <title> Login | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<GuestGuard> <GuestGuard>
......
...@@ -24,11 +24,7 @@ export default function NewPasswordPage() { ...@@ -24,11 +24,7 @@ export default function NewPasswordPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> New Password | Minimal UI</title>
=======
<title> New Password | SignConnect+</title> <title> New Password | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<SentIcon sx={{ mb: 5, height: 96 }} /> <SentIcon sx={{ mb: 5, height: 96 }} />
......
...@@ -9,11 +9,7 @@ export default function RegisterUnprotectedPage() { ...@@ -9,11 +9,7 @@ export default function RegisterUnprotectedPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Register Unprotected | Minimal UI</title>
=======
<title> Register Unprotected | SignConnect+</title> <title> Register Unprotected | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Register /> <Register />
......
// next // next
import Head from 'next/head'; import Head from 'next/head';
// auth // auth
<<<<<<< HEAD
import GuestGuard from '../../auth/GuestGuard';
=======
>>>>>>> master
// sections // sections
import Register from '../../sections/auth/Register'; import Register from '../../sections/auth/Register';
...@@ -14,19 +10,10 @@ export default function RegisterPage() { ...@@ -14,19 +10,10 @@ export default function RegisterPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Register | Minimal UI</title>
</Head>
<GuestGuard>
<Register />
</GuestGuard>
=======
<title> Register | SignConnect+</title> <title> Register | SignConnect+</title>
</Head> </Head>
<Register /> <Register />
>>>>>>> master
</> </>
); );
} }
...@@ -24,11 +24,7 @@ export default function ResetPasswordPage() { ...@@ -24,11 +24,7 @@ export default function ResetPasswordPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Reset Password | Minimal UI</title>
=======
<title> Reset Password | SignConnect+</title> <title> Reset Password | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<PasswordIcon sx={{ mb: 5, height: 96 }} /> <PasswordIcon sx={{ mb: 5, height: 96 }} />
......
...@@ -24,11 +24,7 @@ export default function VerifyCodePage() { ...@@ -24,11 +24,7 @@ export default function VerifyCodePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Verify Code | Minimal UI</title>
=======
<title> Verify Code | SignConnect+</title> <title> Verify Code | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<EmailInboxIcon sx={{ mb: 5, height: 96 }} /> <EmailInboxIcon sx={{ mb: 5, height: 96 }} />
......
...@@ -27,11 +27,7 @@ export default function ComingSoonPage() { ...@@ -27,11 +27,7 @@ export default function ComingSoonPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Coming Soon | Minimal UI</title>
=======
<title> Coming Soon | SignConnect+</title> <title> Coming Soon | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Typography variant="h3" paragraph> <Typography variant="h3" paragraph>
......
...@@ -40,11 +40,7 @@ export default function DemoAnimatePage() { ...@@ -40,11 +40,7 @@ export default function DemoAnimatePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Animate | Minimal UI</title>
=======
<title> Extra Components: Animate | SignConnect+</title> <title> Extra Components: Animate | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -41,11 +41,7 @@ export default function DemoCarouselsPage() { ...@@ -41,11 +41,7 @@ export default function DemoCarouselsPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Carousels | Minimal UI</title>
=======
<title> Extra Components: Carousels | SignConnect+</title> <title> Extra Components: Carousels | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -34,11 +34,7 @@ export default function DemoChartsPage() { ...@@ -34,11 +34,7 @@ export default function DemoChartsPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Charts | Minimal UI</title>
=======
<title> Extra Components: Charts | SignConnect+</title> <title> Extra Components: Charts | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -65,11 +65,7 @@ export default function DemoCopyToClipboardPage() { ...@@ -65,11 +65,7 @@ export default function DemoCopyToClipboardPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Copy To Clipboard | Minimal UI</title>
=======
<title> Extra Components: Copy To Clipboard | SignConnect+</title> <title> Extra Components: Copy To Clipboard | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -35,11 +35,7 @@ export default function DemoEditorPage() { ...@@ -35,11 +35,7 @@ export default function DemoEditorPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Editor | Minimal UI</title>
=======
<title> Extra Components: Editor | SignConnect+</title> <title> Extra Components: Editor | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -21,11 +21,7 @@ export default function DemoFormValidationPage() { ...@@ -21,11 +21,7 @@ export default function DemoFormValidationPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Form Validation | Minimal UI</title>
=======
<title> Extra Components: Form Validation | SignConnect+</title> <title> Extra Components: Form Validation | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -29,11 +29,7 @@ export default function DemoImagePage() { ...@@ -29,11 +29,7 @@ export default function DemoImagePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Image | Minimal UI</title>
=======
<title> Extra Components: Image | SignConnect+</title> <title> Extra Components: Image | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -26,11 +26,7 @@ export default function DemoLabelPage() { ...@@ -26,11 +26,7 @@ export default function DemoLabelPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Label | Minimal UI</title>
=======
<title> Extra Components: Label | SignConnect+</title> <title> Extra Components: Label | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -42,11 +42,7 @@ export default function DemoLightboxPage() { ...@@ -42,11 +42,7 @@ export default function DemoLightboxPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Lightbox | Minimal UI</title>
=======
<title> Extra Components: Lightbox | SignConnect+</title> <title> Extra Components: Lightbox | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -74,11 +74,7 @@ export default function DemoMapPage() { ...@@ -74,11 +74,7 @@ export default function DemoMapPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Map | Minimal UI</title>
=======
<title> Extra Components: Map | SignConnect+</title> <title> Extra Components: Map | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -30,11 +30,7 @@ export default function DemoMegaMenuPage() { ...@@ -30,11 +30,7 @@ export default function DemoMegaMenuPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Mega Menu | Minimal UI</title>
=======
<title> Extra Components: Mega Menu | SignConnect+</title> <title> Extra Components: Mega Menu | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -60,11 +60,7 @@ export default function DemoMultiLanguagePage() { ...@@ -60,11 +60,7 @@ export default function DemoMultiLanguagePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Multi Language | Minimal UI</title>
=======
<title> Extra Components: Multi Language | SignConnect+</title> <title> Extra Components: Multi Language | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -27,11 +27,7 @@ export default function DemoNavigationBarPage() { ...@@ -27,11 +27,7 @@ export default function DemoNavigationBarPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Navigation Bar | Minimal UI</title>
=======
<title> Extra Components: Navigation Bar | SignConnect+</title> <title> Extra Components: Navigation Bar | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -29,11 +29,7 @@ export default function DemoOrganizationalChartPage() { ...@@ -29,11 +29,7 @@ export default function DemoOrganizationalChartPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Organizational Chart | Minimal UI</title>
=======
<title> Extra Components: Organizational Chart | SignConnect+</title> <title> Extra Components: Organizational Chart | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -20,11 +20,7 @@ export default function DemoScrollbarPage() { ...@@ -20,11 +20,7 @@ export default function DemoScrollbarPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Scrollbar | Minimal UI</title>
=======
<title> Extra Components: Scrollbar | SignConnect+</title> <title> Extra Components: Scrollbar | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -59,11 +59,7 @@ export default function DemoSnackbarPage() { ...@@ -59,11 +59,7 @@ export default function DemoSnackbarPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Snackbar | Minimal UI</title>
=======
<title> Extra Components: Snackbar | SignConnect+</title> <title> Extra Components: Snackbar | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -21,11 +21,7 @@ export default function DemoTextMaxLinePage() { ...@@ -21,11 +21,7 @@ export default function DemoTextMaxLinePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Text Max Line | Minimal UI</title>
=======
<title> Extra Components: Text Max Line | SignConnect+</title> <title> Extra Components: Text Max Line | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -87,11 +87,7 @@ export default function DemoUploadPage() { ...@@ -87,11 +87,7 @@ export default function DemoUploadPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Extra Components: Upload | Minimal UI</title>
=======
<title> Extra Components: Upload | SignConnect+</title> <title> Extra Components: Upload | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -54,11 +54,7 @@ export default function FoundationColorsPage() { ...@@ -54,11 +54,7 @@ export default function FoundationColorsPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Foundations: Colors | Minimal UI</title>
=======
<title> Foundations: Colors | SignConnect+</title> <title> Foundations: Colors | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -60,11 +60,7 @@ export default function FoundationGridPage() { ...@@ -60,11 +60,7 @@ export default function FoundationGridPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Foundations: Grid | Minimal UI</title>
=======
<title> Foundations: Grid | SignConnect+</title> <title> Foundations: Grid | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -33,11 +33,7 @@ export default function FoundationIconsPage() { ...@@ -33,11 +33,7 @@ export default function FoundationIconsPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Foundations: Icons | Minimal UI</title>
=======
<title> Foundations: Icons | SignConnect+</title> <title> Foundations: Icons | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -51,11 +51,7 @@ export default function FoundationShadowsPage() { ...@@ -51,11 +51,7 @@ export default function FoundationShadowsPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Foundations: Shadows | Minimal UI</title>
=======
<title> Foundations: Shadows | SignConnect+</title> <title> Foundations: Shadows | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -55,11 +55,7 @@ export default function FoundationTypographyPage() { ...@@ -55,11 +55,7 @@ export default function FoundationTypographyPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Foundations: Typography | Minimal UI</title>
=======
<title> Foundations: Typography | SignConnect+</title> <title> Foundations: Typography | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -19,11 +19,7 @@ export default function ComponentsOverviewPage() { ...@@ -19,11 +19,7 @@ export default function ComponentsOverviewPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Components Overview | Minimal UI</title>
=======
<title> Components Overview | SignConnect+</title> <title> Components Overview | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<ComponentHero /> <ComponentHero />
......
...@@ -50,11 +50,7 @@ export default function MUIAccordionPage() { ...@@ -50,11 +50,7 @@ export default function MUIAccordionPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Accordion | Minimal UI</title>
=======
<title> MUI Components: Accordion | SignConnect+</title> <title> MUI Components: Accordion | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -36,11 +36,7 @@ export default function MUIAlertPage() { ...@@ -36,11 +36,7 @@ export default function MUIAlertPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Alert | Minimal UI</title>
=======
<title> MUI Components: Alert | SignConnect+</title> <title> MUI Components: Alert | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -47,11 +47,7 @@ export default function MUIAutocompletePage() { ...@@ -47,11 +47,7 @@ export default function MUIAutocompletePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Autocomplete | Minimal UI</title>
=======
<title> MUI Components: Autocomplete | SignConnect+</title> <title> MUI Components: Autocomplete | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -40,11 +40,7 @@ export default function MUIAvatarPage() { ...@@ -40,11 +40,7 @@ export default function MUIAvatarPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Avatar | Minimal UI</title>
=======
<title> MUI Components: Avatar | SignConnect+</title> <title> MUI Components: Avatar | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -23,11 +23,7 @@ export default function MUIBadgePage() { ...@@ -23,11 +23,7 @@ export default function MUIBadgePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Badge | Minimal UI</title>
=======
<title> MUI Components: Badge | SignConnect+</title> <title> MUI Components: Badge | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -22,11 +22,7 @@ export default function MUIBreadcrumbsPage() { ...@@ -22,11 +22,7 @@ export default function MUIBreadcrumbsPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Breadcrumbs | Minimal UI</title>
=======
<title> MUI Components: Breadcrumbs | SignConnect+</title> <title> MUI Components: Breadcrumbs | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -49,11 +49,7 @@ export default function MUIButtonsPage() { ...@@ -49,11 +49,7 @@ export default function MUIButtonsPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Buttons | Minimal UI</title>
=======
<title> MUI Components: Buttons | SignConnect+</title> <title> MUI Components: Buttons | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -52,11 +52,7 @@ export default function MUICheckboxPage() { ...@@ -52,11 +52,7 @@ export default function MUICheckboxPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Checkbox | Minimal UI</title>
=======
<title> MUI Components: Checkbox | SignConnect+</title> <title> MUI Components: Checkbox | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -21,11 +21,7 @@ export default function MUIChipPage() { ...@@ -21,11 +21,7 @@ export default function MUIChipPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Chip | Minimal UI</title>
=======
<title> MUI Components: Chip | SignConnect+</title> <title> MUI Components: Chip | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -40,11 +40,7 @@ export default function MUIDataGridPage() { ...@@ -40,11 +40,7 @@ export default function MUIDataGridPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: DataGrid | Minimal UI</title>
=======
<title> MUI Components: DataGrid | SignConnect+</title> <title> MUI Components: DataGrid | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -37,11 +37,7 @@ export default function MUIDialogPage() { ...@@ -37,11 +37,7 @@ export default function MUIDialogPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Dialog | Minimal UI</title>
=======
<title> MUI Components: Dialog | SignConnect+</title> <title> MUI Components: Dialog | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -97,11 +97,7 @@ export default function MUIListPage() { ...@@ -97,11 +97,7 @@ export default function MUIListPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: List | Minimal UI</title>
=======
<title> MUI Components: List | SignConnect+</title> <title> MUI Components: List | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -98,11 +98,7 @@ export default function MUIMenuPage() { ...@@ -98,11 +98,7 @@ export default function MUIMenuPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Menu | Minimal UI</title>
=======
<title> MUI Components: Menu | SignConnect+</title> <title> MUI Components: Menu | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -60,11 +60,7 @@ export default function MUIPaginationPage() { ...@@ -60,11 +60,7 @@ export default function MUIPaginationPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Pagination | Minimal UI</title>
=======
<title> MUI Components: Pagination | SignConnect+</title> <title> MUI Components: Pagination | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -36,11 +36,7 @@ export default function MUIPickersPage() { ...@@ -36,11 +36,7 @@ export default function MUIPickersPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Pickers | Minimal UI</title>
=======
<title> MUI Components: Pickers | SignConnect+</title> <title> MUI Components: Pickers | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -73,11 +73,7 @@ export default function MUIPopoverPage() { ...@@ -73,11 +73,7 @@ export default function MUIPopoverPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Popover | Minimal UI</title>
=======
<title> MUI Components: Popover | SignConnect+</title> <title> MUI Components: Popover | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -70,11 +70,7 @@ export default function MUIProgressPage() { ...@@ -70,11 +70,7 @@ export default function MUIProgressPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Progress | Minimal UI</title>
=======
<title> MUI Components: Progress | SignConnect+</title> <title> MUI Components: Progress | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -43,11 +43,7 @@ export default function MUIRadioButtonsPage() { ...@@ -43,11 +43,7 @@ export default function MUIRadioButtonsPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Radio Buttons | Minimal UI</title>
=======
<title> MUI Components: Radio Buttons | SignConnect+</title> <title> MUI Components: Radio Buttons | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -88,11 +88,7 @@ export default function MUIRatingPage() { ...@@ -88,11 +88,7 @@ export default function MUIRatingPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Rating | Minimal UI</title>
=======
<title> MUI Components: Rating | SignConnect+</title> <title> MUI Components: Rating | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -79,11 +79,7 @@ export default function MUISliderPage() { ...@@ -79,11 +79,7 @@ export default function MUISliderPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Slider | Minimal UI</title>
=======
<title> MUI Components: Slider | SignConnect+</title> <title> MUI Components: Slider | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -25,11 +25,7 @@ export default function MUIStepperPage() { ...@@ -25,11 +25,7 @@ export default function MUIStepperPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Stepper | Minimal UI</title>
=======
<title> MUI Components: Stepper | SignConnect+</title> <title> MUI Components: Stepper | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -36,11 +36,7 @@ export default function MUISwitchPage() { ...@@ -36,11 +36,7 @@ export default function MUISwitchPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Switch | Minimal UI</title>
=======
<title> MUI Components: Switch | SignConnect+</title> <title> MUI Components: Switch | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -24,11 +24,7 @@ export default function MUITablePage() { ...@@ -24,11 +24,7 @@ export default function MUITablePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Table | Minimal UI</title>
=======
<title> MUI Components: Table | SignConnect+</title> <title> MUI Components: Table | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -78,11 +78,7 @@ export default function MUITabsPage() { ...@@ -78,11 +78,7 @@ export default function MUITabsPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Tabs | Minimal UI</title>
=======
<title> MUI Components: Tabs | SignConnect+</title> <title> MUI Components: Tabs | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -32,11 +32,7 @@ export default function MUITextFieldPage() { ...@@ -32,11 +32,7 @@ export default function MUITextFieldPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Textfield | Minimal UI</title>
=======
<title> MUI Components: Textfield | SignConnect+</title> <title> MUI Components: Textfield | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -106,11 +106,7 @@ export default function MUITimelinePage() { ...@@ -106,11 +106,7 @@ export default function MUITimelinePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Timeline | Minimal UI</title>
=======
<title> MUI Components: Timeline | SignConnect+</title> <title> MUI Components: Timeline | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -40,11 +40,7 @@ export default function MUITooltipPage() { ...@@ -40,11 +40,7 @@ export default function MUITooltipPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Tooltip | Minimal UI</title>
=======
<title> MUI Components: Tooltip | SignConnect+</title> <title> MUI Components: Tooltip | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -32,11 +32,7 @@ export default function MUITransferListPage() { ...@@ -32,11 +32,7 @@ export default function MUITransferListPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Transfer List | Minimal UI</title>
=======
<title> MUI Components: Transfer List | SignConnect+</title> <title> MUI Components: Transfer List | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -45,11 +45,7 @@ export default function MUITreesViewPage() { ...@@ -45,11 +45,7 @@ export default function MUITreesViewPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> MUI Components: Tree View | Minimal UI</title>
=======
<title> MUI Components: Tree View | SignConnect+</title> <title> MUI Components: Tree View | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Box <Box
......
...@@ -19,11 +19,7 @@ export default function ContactPage() { ...@@ -19,11 +19,7 @@ export default function ContactPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Contact us | Minimal UI</title>
=======
<title> Contact us | SignConnect+</title> <title> Contact us | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<ContactHero /> <ContactHero />
......
...@@ -38,11 +38,7 @@ export default function GeneralAnalyticsPage() { ...@@ -38,11 +38,7 @@ export default function GeneralAnalyticsPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> General: Analytics | Minimal UI</title>
=======
<title> General: Analytics | SignConnect+</title> <title> General: Analytics | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'xl'}> <Container maxWidth={themeStretch ? false : 'xl'}>
......
...@@ -49,11 +49,7 @@ export default function GeneralAppPage() { ...@@ -49,11 +49,7 @@ export default function GeneralAppPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> General: App | Minimal UI</title>
=======
<title> General: App | SignConnect+</title> <title> General: App | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'xl'}> <Container maxWidth={themeStretch ? false : 'xl'}>
......
...@@ -40,11 +40,7 @@ export default function GeneralBankingPage() { ...@@ -40,11 +40,7 @@ export default function GeneralBankingPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> General: Banking | Minimal UI</title>
=======
<title> General: Banking | SignConnect+</title> <title> General: Banking | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'xl'}> <Container maxWidth={themeStretch ? false : 'xl'}>
......
...@@ -18,11 +18,7 @@ export default function BlankPage() { ...@@ -18,11 +18,7 @@ export default function BlankPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Blank Page | Minimal UI</title>
=======
<title> Blank Page | SignConnect+</title> <title> Blank Page | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'xl'}> <Container maxWidth={themeStretch ? false : 'xl'}>
......
...@@ -24,11 +24,7 @@ export default function BlogNewPostPage() { ...@@ -24,11 +24,7 @@ export default function BlogNewPostPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Blog: New Post | Minimal UI</title>
=======
<title> Blog: New Post | SignConnect+</title> <title> Blog: New Post | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -87,11 +87,7 @@ export default function BlogPostPage() { ...@@ -87,11 +87,7 @@ export default function BlogPostPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title>{`Blog: ${post?.title || ''} | Minimal UI`}</title>
=======
<title>{`Blog: ${post?.title || ''} | SignConnect+`}</title> <title>{`Blog: ${post?.title || ''} | SignConnect+`}</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -64,11 +64,7 @@ export default function BlogPostsPage() { ...@@ -64,11 +64,7 @@ export default function BlogPostsPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Blog: Posts | Minimal UI</title>
=======
<title> Blog: Posts | SignConnect+</title> <title> Blog: Posts | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -43,11 +43,7 @@ export default function GeneralBookingPage() { ...@@ -43,11 +43,7 @@ export default function GeneralBookingPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> General: Booking | Minimal UI</title>
=======
<title> General: Booking | SignConnect+</title> <title> General: Booking | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'xl'}> <Container maxWidth={themeStretch ? false : 'xl'}>
......
...@@ -253,11 +253,7 @@ export default function CalendarPage() { ...@@ -253,11 +253,7 @@ export default function CalendarPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Calendar | Minimal UI</title>
=======
<title> Calendar | SignConnect+</title> <title> Calendar | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'xl'}> <Container maxWidth={themeStretch ? false : 'xl'}>
......
...@@ -15,11 +15,7 @@ export default function ChatPage() { ...@@ -15,11 +15,7 @@ export default function ChatPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Chat | Minimal UI</title>
=======
<title> Chat | SignConnect+</title> <title> Chat | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Chat /> <Chat />
......
...@@ -15,11 +15,7 @@ export default function ChatPage() { ...@@ -15,11 +15,7 @@ export default function ChatPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Chat | Minimal UI</title>
=======
<title> Chat | SignConnect+</title> <title> Chat | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Chat /> <Chat />
......
...@@ -15,11 +15,7 @@ export default function ChatPage() { ...@@ -15,11 +15,7 @@ export default function ChatPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Chat | Minimal UI</title>
=======
<title> Chat | SignConnect+</title> <title> Chat | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Chat /> <Chat />
......
...@@ -121,11 +121,7 @@ export default function EcommerceCheckoutPage() { ...@@ -121,11 +121,7 @@ export default function EcommerceCheckoutPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Ecommerce: Checkout | Minimal UI</title>
=======
<title> Ecommerce: Checkout | SignConnect+</title> <title> Ecommerce: Checkout | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -198,11 +198,7 @@ export default function EcommerceProductListPage() { ...@@ -198,11 +198,7 @@ export default function EcommerceProductListPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Ecommerce: Product List | Minimal UI</title>
=======
<title> Ecommerce: Product List | SignConnect+</title> <title> Ecommerce: Product List | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -99,11 +99,7 @@ export default function EcommerceProductDetailsPage() { ...@@ -99,11 +99,7 @@ export default function EcommerceProductDetailsPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title>{`Ecommerce: ${product?.name || ''} | Minimal UI`}</title>
=======
<title>{`Ecommerce: ${product?.name || ''} | SignConnect+`}</title> <title>{`Ecommerce: ${product?.name || ''} | SignConnect+`}</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -46,11 +46,7 @@ export default function EcommerceProductEditPage() { ...@@ -46,11 +46,7 @@ export default function EcommerceProductEditPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Ecommerce: Edit product | Minimal UI</title>
=======
<title> Ecommerce: Edit product | SignConnect+</title> <title> Ecommerce: Edit product | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -26,11 +26,7 @@ export default function EcommerceProductCreatePage() { ...@@ -26,11 +26,7 @@ export default function EcommerceProductCreatePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Ecommerce: Create a new product | Minimal UI</title>
=======
<title> Ecommerce: Create a new product | SignConnect+</title> <title> Ecommerce: Create a new product | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment