Commit ee079c57 authored by Gamage B.G.J's avatar Gamage B.G.J

Merge branch 'revert-3c233a51' into 'dev'

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

See merge request !7
parents 3c233a51 27bc8747
...@@ -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": [
......
{ {
"cells": [ "cells": [
{ {
<<<<<<< HEAD
"cell_type": "markdown",
"id": "91b96b6e",
"metadata": {},
"source": [
"### Importing Required Libraries\n"
]
},
{
"cell_type": "code",
"execution_count": 6,
=======
"cell_type": "code", "cell_type": "code",
"execution_count": 12, "execution_count": 12,
>>>>>>> master
"id": "ade37944", "id": "ade37944",
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
...@@ -24,31 +11,13 @@ ...@@ -24,31 +11,13 @@
"import os\n", "import os\n",
"import cv2\n", "import cv2\n",
"import numpy as np\n", "import numpy as np\n",
<<<<<<< HEAD
"from sklearn.model_selection import train_test_split"
]
},
{
"cell_type": "markdown",
"id": "a75d6b34",
"metadata": {},
"source": [
"### Define Constants\n",
"\n",
"In this section, I define some constants used throughout the code. IMG_SIZE represents the desired size of the input images, BATCH_SIZE determines the number of samples processed in each training batch, and EPOCHS specifies the number of times the model will iterate over the entire dataset during training. CLASSES is a list of class names extracted from the directory structure, and NUM_CLASSES represents the total number of classes in the dataset."
=======
"from sklearn.model_selection import train_test_split\n", "from sklearn.model_selection import train_test_split\n",
"import mediapipe as mp" "import mediapipe as mp"
>>>>>>> master
] ]
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": 7,
=======
"execution_count": 13, "execution_count": 13,
>>>>>>> master
"id": "16176bf6", "id": "16176bf6",
"metadata": {}, "metadata": {},
"outputs": [ "outputs": [
...@@ -71,11 +40,7 @@ ...@@ -71,11 +40,7 @@
" 'Uhh']" " 'Uhh']"
] ]
}, },
<<<<<<< HEAD
"execution_count": 7,
=======
"execution_count": 13, "execution_count": 13,
>>>>>>> master
"metadata": {}, "metadata": {},
"output_type": "execute_result" "output_type": "execute_result"
} }
...@@ -92,11 +57,7 @@ ...@@ -92,11 +57,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": 8,
=======
"execution_count": 14, "execution_count": 14,
>>>>>>> master
"id": "8f7b1301", "id": "8f7b1301",
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
...@@ -121,23 +82,8 @@ ...@@ -121,23 +82,8 @@
] ]
}, },
{ {
<<<<<<< HEAD
"cell_type": "markdown",
"id": "3d2af75d",
"metadata": {},
"source": [
"### Load Dataset\n",
"\n",
"In this section, I define a function load_dataset() to load the images and labels from the dataset directory. The function iterates over the classes and images, reads and preprocesses each image, and stores the data and corresponding labels. The dataset path is provided as an argument to the function. After loading the dataset, I split it into training and validation sets using the train_test_split() function from sklearn. The split is done with a test size of 20% and a random state of 42."
]
},
{
"cell_type": "code",
"execution_count": 9,
=======
"cell_type": "code", "cell_type": "code",
"execution_count": 15, "execution_count": 15,
>>>>>>> master
"id": "c9034cbe", "id": "c9034cbe",
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
...@@ -167,11 +113,7 @@ ...@@ -167,11 +113,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": 10,
=======
"execution_count": 16, "execution_count": 16,
>>>>>>> master
"id": "7adb379e", "id": "7adb379e",
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
...@@ -181,23 +123,8 @@ ...@@ -181,23 +123,8 @@
] ]
}, },
{ {
<<<<<<< HEAD
"cell_type": "markdown",
"id": "34d79d4d",
"metadata": {},
"source": [
"### Define the Model Architecture and Compile\n",
"\n",
"In this section, I define the model architecture using the Sequential API from TensorFlow's Keras API. The model consists of a series of convolutional and pooling layers, followed by flatten and dense layers. The convolutional layers extract features from the input images, and the dense layers perform classification based on these extracted features. The model is compiled with the Adam optimizer, categorical cross-entropy loss function, and accuracy as the evaluation metric."
]
},
{
"cell_type": "code",
"execution_count": 11,
=======
"cell_type": "code", "cell_type": "code",
"execution_count": 17, "execution_count": 17,
>>>>>>> master
"id": "d44f7806", "id": "d44f7806",
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
...@@ -216,23 +143,8 @@ ...@@ -216,23 +143,8 @@
] ]
}, },
{ {
<<<<<<< HEAD
"cell_type": "markdown",
"id": "ab7b7e82",
"metadata": {},
"source": [
"### Train the Model\n",
"\n",
"In this section, I train the model using the fit() function. It takes the training data and labels as inputs and trains the model for the specified number of epochs and batch size. The validation data and labels are provided for evaluation during training. The model learns from the training data to minimize the defined loss function and improve its accuracy."
]
},
{
"cell_type": "code",
"execution_count": 12,
=======
"cell_type": "code", "cell_type": "code",
"execution_count": 18, "execution_count": 18,
>>>>>>> master
"id": "ff4f0d06", "id": "ff4f0d06",
"metadata": { "metadata": {
"scrolled": true "scrolled": true
...@@ -242,48 +154,6 @@ ...@@ -242,48 +154,6 @@
"name": "stdout", "name": "stdout",
"output_type": "stream", "output_type": "stream",
"text": [ "text": [
<<<<<<< HEAD
"Epoch 1/20\n",
"152/152 [==============================] - 238s 2s/step - loss: 0.7102 - accuracy: 0.8011 - val_loss: 0.1194 - val_accuracy: 0.9703\n",
"Epoch 2/20\n",
"152/152 [==============================] - 238s 2s/step - loss: 0.0302 - accuracy: 0.9926 - val_loss: 0.0199 - val_accuracy: 0.9934\n",
"Epoch 3/20\n",
"152/152 [==============================] - 239s 2s/step - loss: 0.0124 - accuracy: 0.9963 - val_loss: 0.0118 - val_accuracy: 0.9959\n",
"Epoch 4/20\n",
"152/152 [==============================] - 229s 2s/step - loss: 0.0066 - accuracy: 0.9971 - val_loss: 0.0149 - val_accuracy: 0.9967\n",
"Epoch 5/20\n",
"152/152 [==============================] - 232s 2s/step - loss: 0.0108 - accuracy: 0.9973 - val_loss: 0.0066 - val_accuracy: 0.9967\n",
"Epoch 6/20\n",
"152/152 [==============================] - 231s 2s/step - loss: 5.5893e-05 - accuracy: 1.0000 - val_loss: 0.0039 - val_accuracy: 0.9975\n",
"Epoch 7/20\n",
"152/152 [==============================] - 232s 2s/step - loss: 2.1583e-05 - accuracy: 1.0000 - val_loss: 0.0033 - val_accuracy: 0.9975\n",
"Epoch 8/20\n",
"152/152 [==============================] - 229s 2s/step - loss: 1.3742e-05 - accuracy: 1.0000 - val_loss: 0.0029 - val_accuracy: 0.9983\n",
"Epoch 9/20\n",
"152/152 [==============================] - 241s 2s/step - loss: 9.8952e-06 - accuracy: 1.0000 - val_loss: 0.0026 - val_accuracy: 0.9983\n",
"Epoch 10/20\n",
"152/152 [==============================] - 248s 2s/step - loss: 7.5536e-06 - accuracy: 1.0000 - val_loss: 0.0024 - val_accuracy: 0.9983\n",
"Epoch 11/20\n",
"152/152 [==============================] - 250s 2s/step - loss: 5.9049e-06 - accuracy: 1.0000 - val_loss: 0.0021 - val_accuracy: 0.9983\n",
"Epoch 12/20\n",
"152/152 [==============================] - 235s 2s/step - loss: 4.7004e-06 - accuracy: 1.0000 - val_loss: 0.0018 - val_accuracy: 0.9992\n",
"Epoch 13/20\n",
"152/152 [==============================] - 235s 2s/step - loss: 3.7410e-06 - accuracy: 1.0000 - val_loss: 0.0016 - val_accuracy: 1.0000\n",
"Epoch 14/20\n",
"152/152 [==============================] - 217s 1s/step - loss: 2.8805e-06 - accuracy: 1.0000 - val_loss: 0.0015 - val_accuracy: 1.0000\n",
"Epoch 15/20\n",
"152/152 [==============================] - 208s 1s/step - loss: 2.1801e-06 - accuracy: 1.0000 - val_loss: 0.0012 - val_accuracy: 1.0000\n",
"Epoch 16/20\n",
"152/152 [==============================] - 206s 1s/step - loss: 1.6329e-06 - accuracy: 1.0000 - val_loss: 9.0677e-04 - val_accuracy: 1.0000\n",
"Epoch 17/20\n",
"152/152 [==============================] - 203s 1s/step - loss: 1.2007e-06 - accuracy: 1.0000 - val_loss: 7.3540e-04 - val_accuracy: 1.0000\n",
"Epoch 18/20\n",
"152/152 [==============================] - 205s 1s/step - loss: 9.0502e-07 - accuracy: 1.0000 - val_loss: 6.9178e-04 - val_accuracy: 1.0000\n",
"Epoch 19/20\n",
"152/152 [==============================] - 205s 1s/step - loss: 6.9678e-07 - accuracy: 1.0000 - val_loss: 6.0417e-04 - val_accuracy: 1.0000\n",
"Epoch 20/20\n",
"152/152 [==============================] - 204s 1s/step - loss: 5.5925e-07 - accuracy: 1.0000 - val_loss: 6.0406e-04 - val_accuracy: 1.0000\n"
=======
"Epoch 1/10\n", "Epoch 1/10\n",
"152/152 [==============================] - 217s 1s/step - loss: 0.8329 - accuracy: 0.7585 - val_loss: 0.0838 - val_accuracy: 0.9860\n", "152/152 [==============================] - 217s 1s/step - loss: 0.8329 - accuracy: 0.7585 - val_loss: 0.0838 - val_accuracy: 0.9860\n",
"Epoch 2/10\n", "Epoch 2/10\n",
...@@ -304,23 +174,15 @@ ...@@ -304,23 +174,15 @@
"152/152 [==============================] - 220s 1s/step - loss: 1.7629e-04 - accuracy: 1.0000 - val_loss: 0.0190 - val_accuracy: 0.9967\n", "152/152 [==============================] - 220s 1s/step - loss: 1.7629e-04 - accuracy: 1.0000 - val_loss: 0.0190 - val_accuracy: 0.9967\n",
"Epoch 10/10\n", "Epoch 10/10\n",
"152/152 [==============================] - 208s 1s/step - loss: 1.5000e-05 - accuracy: 1.0000 - val_loss: 0.0197 - val_accuracy: 0.9967\n" "152/152 [==============================] - 208s 1s/step - loss: 1.5000e-05 - accuracy: 1.0000 - val_loss: 0.0197 - val_accuracy: 0.9967\n"
>>>>>>> master
] ]
}, },
{ {
"data": { "data": {
"text/plain": [ "text/plain": [
<<<<<<< HEAD
"<keras.callbacks.History at 0x283f3ad5a90>"
]
},
"execution_count": 12,
=======
"<keras.callbacks.History at 0x2d6000ebeb0>" "<keras.callbacks.History at 0x2d6000ebeb0>"
] ]
}, },
"execution_count": 18, "execution_count": 18,
>>>>>>> master
"metadata": {}, "metadata": {},
"output_type": "execute_result" "output_type": "execute_result"
} }
...@@ -332,11 +194,7 @@ ...@@ -332,11 +194,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": 13,
=======
"execution_count": 19, "execution_count": 19,
>>>>>>> master
"id": "61d6a8d8", "id": "61d6a8d8",
"metadata": {}, "metadata": {},
"outputs": [ "outputs": [
...@@ -363,20 +221,12 @@ ...@@ -363,20 +221,12 @@
} }
], ],
"source": [ "source": [
<<<<<<< HEAD
"model.save('./models/model') "
=======
"model.save('./models/model')" "model.save('./models/model')"
>>>>>>> master
] ]
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": 14,
=======
"execution_count": 20, "execution_count": 20,
>>>>>>> master
"id": "fdc9bfe6", "id": "fdc9bfe6",
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
...@@ -405,11 +255,7 @@ ...@@ -405,11 +255,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": 15,
=======
"execution_count": 21, "execution_count": 21,
>>>>>>> master
"id": "297e3e3c", "id": "297e3e3c",
"metadata": {}, "metadata": {},
"outputs": [ "outputs": [
...@@ -417,13 +263,8 @@ ...@@ -417,13 +263,8 @@
"name": "stdout", "name": "stdout",
"output_type": "stream", "output_type": "stream",
"text": [ "text": [
<<<<<<< HEAD
"5/5 [==============================] - 2s 299ms/step\n",
"Test Accuracy: 0.9084507042253521\n"
=======
"5/5 [==============================] - 2s 297ms/step\n", "5/5 [==============================] - 2s 297ms/step\n",
"Test Accuracy: 0.9225352112676056\n" "Test Accuracy: 0.9225352112676056\n"
>>>>>>> master
] ]
} }
], ],
...@@ -437,11 +278,7 @@ ...@@ -437,11 +278,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
<<<<<<< HEAD
"execution_count": 16,
=======
"execution_count": 22, "execution_count": 22,
>>>>>>> master
"id": "e22211b0", "id": "e22211b0",
"metadata": {}, "metadata": {},
"outputs": [ "outputs": [
...@@ -449,11 +286,7 @@ ...@@ -449,11 +286,7 @@
"name": "stdout", "name": "stdout",
"output_type": "stream", "output_type": "stream",
"text": [ "text": [
<<<<<<< HEAD
"5/5 [==============================] - 2s 323ms/step\n"
=======
"5/5 [==============================] - 2s 299ms/step\n" "5/5 [==============================] - 2s 299ms/step\n"
>>>>>>> master
] ]
} }
], ],
...@@ -469,8 +302,6 @@ ...@@ -469,8 +302,6 @@
] ]
}, },
{ {
<<<<<<< HEAD
=======
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
"id": "885678c5", "id": "885678c5",
...@@ -491,7 +322,6 @@ ...@@ -491,7 +322,6 @@
] ]
}, },
{ {
>>>>>>> master
"cell_type": "markdown", "cell_type": "markdown",
"id": "69b66fc1", "id": "69b66fc1",
"metadata": {}, "metadata": {},
......
...@@ -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 source diff could not be displayed because it is too large. You can view the blob instead.
{ {
<<<<<<< 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'}>
......
...@@ -96,11 +96,7 @@ export default function EcommerceShopPage() { ...@@ -96,11 +96,7 @@ export default function EcommerceShopPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Ecommerce: Shop | Minimal UI</title>
=======
<title> Ecommerce: Shop | SignConnect+</title> <title> Ecommerce: Shop | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<FormProvider methods={methods}> <FormProvider methods={methods}>
......
...@@ -49,11 +49,7 @@ export default function GeneralEcommercePage() { ...@@ -49,11 +49,7 @@ export default function GeneralEcommercePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> General: E-commerce | Minimal UI</title>
=======
<title> General: E-commerce | SignConnect+</title> <title> General: E-commerce | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'xl'}> <Container maxWidth={themeStretch ? false : 'xl'}>
......
...@@ -135,11 +135,7 @@ export default function GeneralFilePage() { ...@@ -135,11 +135,7 @@ export default function GeneralFilePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> General: File | Minimal UI</title>
=======
<title> General: File | SignConnect+</title> <title> General: File | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'xl'}> <Container maxWidth={themeStretch ? false : 'xl'}>
......
...@@ -196,11 +196,7 @@ export default function FileManagerPage() { ...@@ -196,11 +196,7 @@ export default function FileManagerPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> File Manager | Minimal UI</title>
=======
<title> File Manager | SignConnect+</title> <title> File Manager | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -33,11 +33,7 @@ export default function InvoiceEditPage() { ...@@ -33,11 +33,7 @@ export default function InvoiceEditPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Invoice: Edit | Minimal UI</title>
=======
<title> Invoice: Edit | SignConnect+</title> <title> Invoice: Edit | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -35,11 +35,7 @@ export default function InvoiceDetailsPage() { ...@@ -35,11 +35,7 @@ export default function InvoiceDetailsPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Invoice: View | Minimal UI</title>
=======
<title> Invoice: View | SignConnect+</title> <title> Invoice: View | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -236,11 +236,7 @@ export default function InvoiceListPage() { ...@@ -236,11 +236,7 @@ export default function InvoiceListPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Invoice: List | Minimal UI</title>
=======
<title> Invoice: List | SignConnect+</title> <title> Invoice: List | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -26,11 +26,7 @@ export default function InvoiceCreatePage() { ...@@ -26,11 +26,7 @@ export default function InvoiceCreatePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Invoices: Create a new invoice | Minimal UI</title>
=======
<title> Invoices: Create a new invoice | SignConnect+</title> <title> Invoices: Create a new invoice | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -107,11 +107,7 @@ export default function KanbanPage() { ...@@ -107,11 +107,7 @@ export default function KanbanPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Kanban | Minimal UI</title>
=======
<title> Kanban | SignConnect+</title> <title> Kanban | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={false} sx={{ height: 1 }}> <Container maxWidth={false} sx={{ height: 1 }}>
......
...@@ -15,11 +15,7 @@ export default function MailPage() { ...@@ -15,11 +15,7 @@ export default function MailPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Mail | Minimal UI</title>
=======
<title> Mail | SignConnect+</title> <title> Mail | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Mail /> <Mail />
......
...@@ -15,11 +15,7 @@ export default function MailPage() { ...@@ -15,11 +15,7 @@ export default function MailPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Mail | Minimal UI</title>
=======
<title> Mail | SignConnect+</title> <title> Mail | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Mail /> <Mail />
......
...@@ -15,11 +15,7 @@ export default function MailPage() { ...@@ -15,11 +15,7 @@ export default function MailPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Mail | Minimal UI</title>
=======
<title> Mail | SignConnect+</title> <title> Mail | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Mail /> <Mail />
......
...@@ -15,11 +15,7 @@ export default function MailPage() { ...@@ -15,11 +15,7 @@ export default function MailPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Mail | Minimal UI</title>
=======
<title> Mail | SignConnect+</title> <title> Mail | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Mail /> <Mail />
......
...@@ -43,11 +43,7 @@ export default function PermissionDeniedPage() { ...@@ -43,11 +43,7 @@ export default function PermissionDeniedPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Other Cases: Permission Denied | Minimal UI</title>
=======
<title> Other Cases: Permission Denied | SignConnect+</title> <title> Other Cases: Permission Denied | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
import { Alert, Button, Card, CardActions, CardContent, CardHeader, Container, Grid, Typography } from '@mui/material'; import { Container, Typography } from '@mui/material';
import Head from 'next/head'; import Head from 'next/head';
import { useCallback, useState } from 'react';
import { ComingSoonIllustration } from 'src/assets/illustrations';
import CustomBreadcrumbs from 'src/components/custom-breadcrumbs/CustomBreadcrumbs';
import Iconify from 'src/components/iconify/Iconify';
import HomeWidget from 'src/sections/@dashboard/spokenLanguageTranslation-module/HomeWidget';
import _mock from '../../../_mock';
import Editor from '../../../components/editor';
import { useSettingsContext } from '../../../components/settings'; import { useSettingsContext } from '../../../components/settings';
import { Upload } from '../../../components/upload';
import DashboardLayout from '../../../layouts/dashboard'; import DashboardLayout from '../../../layouts/dashboard';
import {
CarouselBasic3
} from '../../../sections/_examples/extra/carousel';
SpokenLanguageTranslationHomePage.getLayout = (page: React.ReactElement) => <DashboardLayout>{page}</DashboardLayout>; SpokenLanguageTranslationHomePage.getLayout = (page: React.ReactElement) => <DashboardLayout>{page}</DashboardLayout>;
export default function SpokenLanguageTranslationHomePage() { export default function SpokenLanguageTranslationHomePage() {
const { themeStretch } = useSettingsContext(); const { themeStretch } = useSettingsContext();
const [translateType, setTranslateType] = useState<"video" | "text">()
const [file, setFile] = useState<File | string | null>(null);
const [quillSimple, setQuillSimple] = useState('');
const handleHomeWidgetOnClick = (value: string) => {
if (!value) return
if (value == "Video Translate") {
setTranslateType("video")
return
}
if (value == "Text Translate") {
setTranslateType("text")
return
}
}
const handleDropSingleFile = useCallback((acceptedFiles: File[]) => {
const file = acceptedFiles[0];
if (file) {
setFile(
Object.assign(file, {
preview: URL.createObjectURL(file),
})
);
}
}, []);
const _carouselsExample = [...Array(5)].map((_, index) => ({
id: _mock.id(index),
title: _mock.text.title(index),
image: _mock.image.cover(index),
description: _mock.text.description(index),
}));
return ( return (
<> <>
<Head> <Head>
<title> Spoken Language Translation Home | SignLink </title> <title> Blank Page | SignConnect+</title>
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'xl'}> <Container maxWidth={themeStretch ? false : 'xl'}>
<CustomBreadcrumbs <Typography variant="h6"> Blank </Typography>
heading="Spoken Language Translation"
links={[
{
name: 'Dashboard',
href: '#',
icon: <Iconify icon="eva:home-fill" />,
},
{ name: 'Spoken Language Translation Module', href: '#', icon: <Iconify icon="eva:cube-outline" /> },
{ name: 'Spoken Language Translation', icon: <Iconify icon="eva:cube-outline" /> },
]}
/>
</Container>
<Container maxWidth={themeStretch ? false : 'xl'}>
<Grid container spacing={2} rowSpacing={3}>
<Grid item xs={12} md={6} lg={6}>
<HomeWidget
title="Video Translate"
subTitle="Spoken Language Video Convert to sign language"
icon="eva:video-fill"
color='warning'
handleClick={handleHomeWidgetOnClick}
/>
</Grid>
<Grid item xs={12} md={6} lg={6}>
<HomeWidget
title="Text Translate"
subTitle="Spoken Language Text Convert to sign language"
icon="eva:text-fill"
color="success"
handleClick={handleHomeWidgetOnClick}
/>
</Grid>
{!translateType && <>
<Grid item xs={12} md={12} lg={12}>
<Alert severity='info' >Select a Translation type</Alert>
</Grid>
</>}
{translateType == "video" && <>
<Grid item xs={12} md={8} lg={8}>
<Card>
<CardHeader
title="Upload Video"
subheader="Upload you're video to convert to sigh language"
/>
<CardContent>
<Upload file={file} onDrop={handleDropSingleFile} onDelete={() => setFile(null)} />
</CardContent>
<CardActions>
<Button variant="contained" color='error' fullWidth onClick={() => { setFile(null) }}>
Reset
</Button>
<Button variant="contained" fullWidth>
Convert
</Button>
</CardActions>
</Card>
</Grid>
<Grid item xs={12} md={4} lg={4}>
<Card>
<CardHeader title="3D Model" />
<CardContent>
<Typography variant="h3" paragraph>
Coming Soon!
</Typography>
<Typography sx={{ color: 'text.secondary' }}>
We are currently working hard on this page!
</Typography>
<ComingSoonIllustration sx={{ my: 1, height: 200 }} />
</CardContent>
</Card>
</Grid>
</>}
{translateType == "text" && <>
<Grid item xs={12} md={8} lg={8}>
<Card sx={{ height: "100%" }}>
<CardHeader
title="Enter text"
subheader="Enter you're text to convert to sigh language"
/>
<CardContent>
<Editor
simple
id="simple-editor"
value={quillSimple}
onChange={(value) => setQuillSimple(value)}
/>
</CardContent>
<CardActions>
<Button variant="contained" color='error' fullWidth onClick={() => { setQuillSimple('') }}>
Reset
</Button>
<Button variant="contained" fullWidth>
Convert
</Button>
</CardActions>
</Card>
</Grid>
<Grid item xs={12} md={4} lg={4}>
<Card>
<CardHeader title="Converted Output" />
<CardContent>
<CarouselBasic3 data={_carouselsExample} />
</CardContent>
</Card>
</Grid>
</>}
</Grid>
</Container> </Container>
</> </>
); );
......
...@@ -34,11 +34,7 @@ export default function UserEditPage() { ...@@ -34,11 +34,7 @@ export default function UserEditPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> User: Edit user | Minimal UI</title>
=======
<title> User: Edit user | SignConnect+</title> <title> User: Edit user | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -75,11 +75,7 @@ export default function UserAccountPage() { ...@@ -75,11 +75,7 @@ export default function UserAccountPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> User: Account Settings | Minimal UI</title>
=======
<title> User: Account Settings | SignConnect+</title> <title> User: Account Settings | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -26,11 +26,7 @@ export default function UserCardsPage() { ...@@ -26,11 +26,7 @@ export default function UserCardsPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> User: Cards | Minimal UI</title>
=======
<title> User: Cards | SignConnect+</title> <title> User: Cards | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -195,11 +195,7 @@ export default function UserListPage() { ...@@ -195,11 +195,7 @@ export default function UserListPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> User: List | Minimal UI</title>
=======
<title> User: List | SignConnect+</title> <title> User: List | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -24,11 +24,7 @@ export default function UserCreatePage() { ...@@ -24,11 +24,7 @@ export default function UserCreatePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> User: Create a new user | Minimal UI</title>
=======
<title> User: Create a new user | SignConnect+</title> <title> User: Create a new user | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -83,11 +83,7 @@ export default function UserProfilePage() { ...@@ -83,11 +83,7 @@ export default function UserProfilePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> User: Profile | Minimal UI</title>
=======
<title> User: Profile | SignConnect+</title> <title> User: Profile | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container maxWidth={themeStretch ? false : 'lg'}> <Container maxWidth={themeStretch ? false : 'lg'}>
......
...@@ -17,11 +17,7 @@ export default function FaqsPage() { ...@@ -17,11 +17,7 @@ export default function FaqsPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Faqs | Minimal UI</title>
=======
<title> Faqs | SignConnect+</title> <title> Faqs | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<FaqsHero /> <FaqsHero />
......
<<<<<<< HEAD
import { m, useScroll, useSpring } from 'framer-motion';
// next
import Head from 'next/head';
// @mui
import { useTheme } from '@mui/material/styles';
import { Box } from '@mui/material';
// layouts
import MainLayout from '../layouts/main';
// sections
import {
HomeHero,
HomeMinimal,
HomeDarkMode,
HomeLookingFor,
HomeForDesigner,
HomeColorPresets,
HomePricingPlans,
HomeAdvertisement,
HomeCleanInterfaces,
HomeHugePackElements,
} from '../sections/home';
// ----------------------------------------------------------------------
HomePage.getLayout = (page: React.ReactElement) => <MainLayout> {page} </MainLayout>;
// ----------------------------------------------------------------------
export default function HomePage() {
const theme = useTheme();
const { scrollYProgress } = useScroll();
const scaleX = useSpring(scrollYProgress, {
stiffness: 100,
damping: 30,
restDelta: 0.001,
});
const progress = (
<m.div
style={{
top: 0,
left: 0,
right: 0,
height: 3,
zIndex: 1999,
position: 'fixed',
transformOrigin: '0%',
backgroundColor: theme.palette.primary.main,
scaleX,
}}
/>
);
return (
<>
<Head>
<title> The starting point for your next project | Minimal UI</title>
</Head>
{progress}
<HomeHero />
<Box
sx={{
overflow: 'hidden',
position: 'relative',
bgcolor: 'background.default',
}}
>
<HomeMinimal />
<HomeHugePackElements />
<HomeForDesigner />
<HomeDarkMode />
<HomeColorPresets />
<HomeCleanInterfaces />
<HomePricingPlans />
<HomeLookingFor />
<HomeAdvertisement />
</Box>
</>
);
}
=======
import LoginPage from "./auth/login"; import LoginPage from "./auth/login";
export default LoginPage export default LoginPage
\ No newline at end of file
>>>>>>> master
...@@ -18,11 +18,7 @@ export default function MaintenancePage() { ...@@ -18,11 +18,7 @@ export default function MaintenancePage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Maintenance | Minimal UI</title>
=======
<title> Maintenance | SignConnect+</title> <title> Maintenance | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Stack sx={{ alignItems: 'center' }}> <Stack sx={{ alignItems: 'center' }}>
......
...@@ -21,11 +21,7 @@ export default function PaymentPage() { ...@@ -21,11 +21,7 @@ export default function PaymentPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Payment | Minimal UI</title>
=======
<title> Payment | SignConnect+</title> <title> Payment | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container <Container
......
...@@ -19,11 +19,7 @@ export default function PricingPage() { ...@@ -19,11 +19,7 @@ export default function PricingPage() {
return ( return (
<> <>
<Head> <Head>
<<<<<<< HEAD
<title> Pricing | Minimal UI</title>
=======
<title> Pricing | SignConnect+</title> <title> Pricing | SignConnect+</title>
>>>>>>> master
</Head> </Head>
<Container <Container
......
...@@ -97,8 +97,6 @@ export const PATH_DASHBOARD = { ...@@ -97,8 +97,6 @@ export const PATH_DASHBOARD = {
view: (title: string) => path(ROOTS_DASHBOARD, `/blog/post/${title}`), view: (title: string) => path(ROOTS_DASHBOARD, `/blog/post/${title}`),
demoView: path(ROOTS_DASHBOARD, '/blog/post/apply-these-7-secret-techniques-to-improve-event'), demoView: path(ROOTS_DASHBOARD, '/blog/post/apply-these-7-secret-techniques-to-improve-event'),
}, },
<<<<<<< HEAD
=======
spokenLanguageTranslationModule: { spokenLanguageTranslationModule: {
root: path(ROOTS_DASHBOARD, '/spokenLanguageTranslation-module'), root: path(ROOTS_DASHBOARD, '/spokenLanguageTranslation-module'),
spokenLanguageTranslationHome: path(ROOTS_DASHBOARD, '/spokenLanguageTranslation-module'), spokenLanguageTranslationHome: path(ROOTS_DASHBOARD, '/spokenLanguageTranslation-module'),
...@@ -111,7 +109,6 @@ export const PATH_DASHBOARD = { ...@@ -111,7 +109,6 @@ export const PATH_DASHBOARD = {
leadBoardHome: path(ROOTS_DASHBOARD, '/learning-module/leadBoard'), leadBoardHome: path(ROOTS_DASHBOARD, '/learning-module/leadBoard'),
feedbackHome: path(ROOTS_DASHBOARD, '/learning-module/feedback'), feedbackHome: path(ROOTS_DASHBOARD, '/learning-module/feedback'),
}, },
>>>>>>> master
}; };
export const PATH_DOCS = { export const PATH_DOCS = {
......
...@@ -20,11 +20,7 @@ export default function Login() { ...@@ -20,11 +20,7 @@ export default function Login() {
return ( return (
<LoginLayout> <LoginLayout>
<Stack spacing={2} sx={{ mb: 5, position: 'relative' }}> <Stack spacing={2} sx={{ mb: 5, position: 'relative' }}>
<<<<<<< HEAD
<Typography variant="h4">Sign in to Minimal</Typography>
=======
<Typography variant="h4">Sign in to SignConnect+</Typography> <Typography variant="h4">Sign in to SignConnect+</Typography>
>>>>>>> master
<Stack direction="row" spacing={0.5}> <Stack direction="row" spacing={0.5}>
<Typography variant="body2">New user?</Typography> <Typography variant="body2">New user?</Typography>
...@@ -49,11 +45,6 @@ export default function Login() { ...@@ -49,11 +45,6 @@ export default function Login() {
</Alert> </Alert>
<AuthLoginForm /> <AuthLoginForm />
<<<<<<< HEAD
<AuthWithSocial />
=======
>>>>>>> master
</LoginLayout> </LoginLayout>
); );
} }
// next // next
import NextLink from 'next/link'; import NextLink from 'next/link';
// @mui // @mui
<<<<<<< HEAD
import { Stack, Typography, Link } from '@mui/material';
=======
import { Link, Stack, Typography } from '@mui/material'; import { Link, Stack, Typography } from '@mui/material';
>>>>>>> master
// layouts // layouts
import LoginLayout from '../../layouts/login'; import LoginLayout from '../../layouts/login';
// routes // routes
import { PATH_AUTH } from '../../routes/paths'; import { PATH_AUTH } from '../../routes/paths';
// //
<<<<<<< HEAD
import AuthWithSocial from './AuthWithSocial';
=======
>>>>>>> master
import AuthRegisterForm from './AuthRegisterForm'; import AuthRegisterForm from './AuthRegisterForm';
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
...@@ -51,10 +43,6 @@ export default function Register() { ...@@ -51,10 +43,6 @@ export default function Register() {
. .
</Typography> </Typography>
<<<<<<< HEAD
<AuthWithSocial />
=======
>>>>>>> master
</LoginLayout> </LoginLayout>
); );
} }
...@@ -58,11 +58,7 @@ export default function HomeMinimal() { ...@@ -58,11 +58,7 @@ export default function HomeMinimal() {
> >
<m.div variants={varFade().inUp}> <m.div variants={varFade().inUp}>
<Typography component="div" variant="overline" sx={{ color: 'text.disabled' }}> <Typography component="div" variant="overline" sx={{ color: 'text.disabled' }}>
<<<<<<< HEAD
Minimal UI
=======
SignConnect+ SignConnect+
>>>>>>> master
</Typography> </Typography>
</m.div> </m.div>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -13,44 +13,6 @@ The main objective of this project is to develop a Sign Language Translation Sys ...@@ -13,44 +13,6 @@ The main objective of this project is to develop a Sign Language Translation Sys
## Individual Research Questions and Objectives ## Individual Research Questions and Objectives
<<<<<<< HEAD
### Member: Ranaweera R M S H (IT20251000)
**Research Question:**
- How can sign language translation be achieved by identifying the audio components in a video and the text, and translating them into sign language using 3D components?
**Objectives:**
- Pre-process video data to extract audio components.
- Develop techniques to translate audio into sign language.
- Develop techniques to translate text into sign language.
- Integrate sign language translation with 3D components to create visually appealing sign language videos.
- Evaluate the accuracy of sign language translation.
- Evaluate the overall effectiveness of the sign language translation demonstration.
- Apply computer graphics techniques to enhance the realism and visual quality of the sign language animations.
## Novelty and Contributions
- **Novel Approach:**
> The research question proposes a novel approach to sign language translation by utilizing audio components from a video and text input. This approach combines audio analysis and text translation with 3D components to create visually appealing sign language videos.
- **Audio Component Extraction:**
The research aims to develop techniques to pre-process video data and extract audio components. This extraction process is crucial for identifying and analyzing the audio elements necessary for sign language translation.
- **Audio-to-Sign Language Translation:**
The research contributes to the development of techniques that translate audio components into sign language. By analyzing the audio data, the system can generate accurate sign language gestures and expressions corresponding to the spoken words or sounds.
- **Text-to-Sign Language Translation:**
Another significant contribution is the development of techniques to translate text input into sign language. This enables users to input text directly, which the system converts into sign language gestures and expressions, providing a means of communication for individuals who are deaf or hard of hearing.
- **Integration of 3D Components:**
The research focuses on integrating sign language translation with 3D components to enhance the visual quality and realism of the sign language animations. This integration adds depth and realism to the sign language gestures and creates visually appealing videos that effectively convey the intended message.
- **Evaluation of Translation Accuracy:**
The research evaluates the accuracy of the sign language translation by comparing the generated sign language gestures with established sign language conventions. This evaluation ensures that the translations are linguistically and culturally appropriate, enhancing the overall effectiveness of the system.
- **Computer Graphics Enhancements:**
The research contributes to the application of computer graphics techniques to enhance the realism and visual quality of the sign language animations. By leveraging graphics capabilities, the system can create visually engaging and expressive sign language videos, improving the user experience.
=======
### Member / Leader: Gamage B G J (IT20402266) ### Member / Leader: Gamage B G J (IT20402266)
**Research Question:** **Research Question:**
...@@ -107,4 +69,3 @@ The research contributes to the application of computer graphics techniques to e ...@@ -107,4 +69,3 @@ The research contributes to the application of computer graphics techniques to e
- Incorporation of emotions into sign language translation, providing a more expressive and accurate communication experience. - Incorporation of emotions into sign language translation, providing a more expressive and accurate communication experience.
- Advanced image and video processing techniques for accurate identification and translation of sign language gestures. - Advanced image and video processing techniques for accurate identification and translation of sign language gestures.
- Optimization of deployments and models to increase the overall performance and efficiency of the Sign Language Translation System. - Optimization of deployments and models to increase the overall performance and efficiency of the Sign Language Translation System.
>>>>>>> master
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