diff --git a/Frontend/src/components/AdminSettings/AdminContainer.jsx b/Frontend/src/components/AdminSettings/AdminContainer.jsx
index b3f0875e..2db67df1 100755
--- a/Frontend/src/components/AdminSettings/AdminContainer.jsx
+++ b/Frontend/src/components/AdminSettings/AdminContainer.jsx
@@ -4,7 +4,6 @@ import AuthContext from '../../AuthContext';
import { MenuTabs } from '../globalStyles/MenuTabs';
import UserProfilesContainer from './UserProfilesContainer';
import AdminSettings from './AdminSettings';
-import ideaLABlogo from '../globalStyles/img/ideaLabLogo.png';
const AdminContainer = () => {
const [adminView, setView] = useState('settings');
diff --git a/Frontend/src/components/AdminSettings/AdminSettings.jsx b/Frontend/src/components/AdminSettings/AdminSettings.jsx
index 9077fc29..9fd87e4b 100755
--- a/Frontend/src/components/AdminSettings/AdminSettings.jsx
+++ b/Frontend/src/components/AdminSettings/AdminSettings.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React from 'react';
import { ToastProvider } from 'react-toast-notifications';
import './AdminSettings.css';
import ColorAvailability from './components/ColorAvailability';
diff --git a/Frontend/src/components/AdminSettings/components/ColorAvailability.jsx b/Frontend/src/components/AdminSettings/components/ColorAvailability.jsx
index eb25ec8d..d3092d10 100644
--- a/Frontend/src/components/AdminSettings/components/ColorAvailability.jsx
+++ b/Frontend/src/components/AdminSettings/components/ColorAvailability.jsx
@@ -4,7 +4,6 @@ import './ColorAvailability.css';
const ColorAvailability = () => {
const [allColors, setAllColors] = useState([]);
- const [hexList, setHexList] = useState([]);
const onSuccess = index => {
const colorIndex = index - 1;
@@ -38,33 +37,28 @@ const ColorAvailability = () => {
};
useEffect(() => {
- let colorList = [];
- let hexArray = [];
RequestService.getAllColors(
response => {
const data = response.data.data;
- data.map((color, i) => {
- colorList.push({
+ const colorList = data.map((color, i) => {
+ return {
hue: color.color,
available: color.available,
id: i,
- });
- hexArray.push(color.color);
+ };
});
setAllColors(colorList);
- setHexList(hexArray);
},
error => console.error(error),
);
}, [allColors]);
const renderCircles = () => {
- let circleRender = [];
- allColors.map((color, i) => {
+ const circleRender = allColors.map((color, i) => {
const colorRectStyle = {
backgroundColor: `${color.hue}`,
};
- circleRender.push(
+ return (
@@ -77,7 +71,7 @@ const ColorAvailability = () => {
onChange={event => updateColorAvail(event)}
>
-
,
+
);
});
return circleRender;
diff --git a/Frontend/src/components/AdminSettings/components/EmailMessage.jsx b/Frontend/src/components/AdminSettings/components/EmailMessage.jsx
index a8699c1d..56e755c5 100644
--- a/Frontend/src/components/AdminSettings/components/EmailMessage.jsx
+++ b/Frontend/src/components/AdminSettings/components/EmailMessage.jsx
@@ -9,6 +9,7 @@ import './EmailMessage.css';
* that is sent via email. It requires the status.
* @param {status} props
*/
+
const EmailMessage = props => {
const [message, setMessage] = useState('');
const [updatedMessage, setUpdatedMessage] = useState('');
@@ -16,8 +17,16 @@ const EmailMessage = props => {
const { addToast } = useToasts();
useEffect(() => {
+ const fetchData = () => {
+ RequestService.getEmailMessage(
+ props.status,
+ getEmailMessageSuccess,
+ changeEmailMessageFailure,
+ );
+ };
+
fetchData();
- }, []);
+ });
const getEmailMessageSuccess = data => {
setMessage(data.data.data.emailMessage);
@@ -50,14 +59,6 @@ const EmailMessage = props => {
}
};
- const fetchData = () => {
- RequestService.getEmailMessage(
- props.status,
- getEmailMessageSuccess,
- changeEmailMessageFailure,
- );
- };
-
return (
diff --git a/Frontend/src/components/AdminSettings/components/ProfileInfo.jsx b/Frontend/src/components/AdminSettings/components/ProfileInfo.jsx
index f6a3d3bc..b7c5286d 100755
--- a/Frontend/src/components/AdminSettings/components/ProfileInfo.jsx
+++ b/Frontend/src/components/AdminSettings/components/ProfileInfo.jsx
@@ -9,7 +9,6 @@ const UserProfilesContainer = props => {
const [passwordChange, setPasswordChange] = useState(false);
const { username, firstName, lastName, role } = props.userData;
- const [loading, setLoading] = useState(false);
const [error, setError] = useState(false);
const [success, setSuccess] = useState(false);
@@ -24,7 +23,6 @@ const UserProfilesContainer = props => {
};
const updateUserRole = newRole => {
- setLoading(true);
setError(false);
setSuccess(false);
RequestService.updateUsers(
@@ -41,7 +39,6 @@ const UserProfilesContainer = props => {
setError(true);
},
);
- setLoading(false);
};
const changeModal = (
diff --git a/Frontend/src/components/Analysis/AnalysisContainer.jsx b/Frontend/src/components/Analysis/AnalysisContainer.jsx
index 015c72dc..39f8da8c 100644
--- a/Frontend/src/components/Analysis/AnalysisContainer.jsx
+++ b/Frontend/src/components/Analysis/AnalysisContainer.jsx
@@ -7,7 +7,6 @@ import AnalysisGraph from './components/AnalysisGraph';
const AnalysisContainer = () => {
const [loading, setLoading] = useState(false);
const [graphData, setGraphData] = useState([]);
- const sampleGraphData = require('./sampleGraphData.json');
useEffect(() => {
setLoading(true);
diff --git a/Frontend/src/components/Analysis/components/AnalysisGraph.jsx b/Frontend/src/components/Analysis/components/AnalysisGraph.jsx
index 93c0f1ca..3137ba02 100644
--- a/Frontend/src/components/Analysis/components/AnalysisGraph.jsx
+++ b/Frontend/src/components/Analysis/components/AnalysisGraph.jsx
@@ -11,7 +11,7 @@ const AnalysisGraph = props => {
labels.push(key);
for (var colorKey in props.graphData[key]) {
if (props.graphData[key].hasOwnProperty(colorKey)) {
- if (datasets[colorKey] != undefined) {
+ if (datasets[colorKey] !== undefined) {
datasets[colorKey].push(props.graphData[key][colorKey]);
} else {
datasets[colorKey] = [props.graphData[key][colorKey]];
diff --git a/Frontend/src/components/Queue/QueueContainer.jsx b/Frontend/src/components/Queue/QueueContainer.jsx
index 65d5497d..01ae91ea 100755
--- a/Frontend/src/components/Queue/QueueContainer.jsx
+++ b/Frontend/src/components/Queue/QueueContainer.jsx
@@ -26,6 +26,41 @@ const QueueContainer = () => {
}, []);
useEffect(() => {
+ const fetchQueueData = () => {
+ //TO DO: GET PRINT JOBS BASED ON STATUS, NOT ALL AT ONCE
+ RequestService.getPrintJobs(
+ response => {
+ const activeCards = response.data.data.filter(card => {
+ if (
+ statusView === 'DONE' &&
+ returnCardStatus(card.status) === 'DONE'
+ ) {
+ return card;
+ } else if (
+ statusView === 'PENDING_REVIEW' &&
+ returnCardStatus(card.status) === 'PENDING_REVIEW'
+ ) {
+ return card;
+ } else if (
+ statusView === 'PRINTING' &&
+ returnCardStatus(card.status) === 'PRINTING'
+ ) {
+ return card;
+ } else if (
+ statusView === 'FAILED' &&
+ returnCardStatus(card.status) === 'FAILED'
+ ) {
+ return card;
+ } else {
+ return null;
+ }
+ });
+ setFilteredData(activeCards);
+ },
+ error => console.error(error),
+ );
+ };
+
//Load initial data and set the loading only on first load
setLoading(true);
fetchQueueData();
@@ -107,39 +142,6 @@ const QueueContainer = () => {
);
- const fetchQueueData = () => {
- //TO DO: GET PRINT JOBS BASED ON STATUS, NOT ALL AT ONCE
- RequestService.getPrintJobs(
- response => {
- const activeCards = response.data.data.filter(card => {
- if (
- statusView === 'DONE' &&
- returnCardStatus(card.status) === 'DONE'
- ) {
- return card;
- } else if (
- statusView === 'PENDING_REVIEW' &&
- returnCardStatus(card.status) === 'PENDING_REVIEW'
- ) {
- return card;
- } else if (
- statusView === 'PRINTING' &&
- returnCardStatus(card.status) === 'PRINTING'
- ) {
- return card;
- } else if (
- statusView === 'FAILED' &&
- returnCardStatus(card.status) === 'FAILED'
- ) {
- return card;
- }
- });
- setFilteredData(activeCards);
- },
- error => console.error(error),
- );
- };
-
const setStatus = view => {
setStatusView(view);
};
diff --git a/Frontend/src/components/Queue/components/PrintCardContainer.jsx b/Frontend/src/components/Queue/components/PrintCardContainer.jsx
index b291ff7f..07918d04 100755
--- a/Frontend/src/components/Queue/components/PrintCardContainer.jsx
+++ b/Frontend/src/components/Queue/components/PrintCardContainer.jsx
@@ -5,8 +5,6 @@ import ColorPickerContainer from './ColorPickerContainer';
import './PrintCardContainer.css';
import PrintDateAdded from './PrintDateAdded';
import StatusDropdown from './StatusDropdown';
-import Backdrop from '../../globalStyles/Backdrop/Backdrop';
-import SendEmailModal from './SendEmailModal';
const PrintCardContainer = props => {
const [isToggled, setIsToggled] = useState(false);
diff --git a/Frontend/src/components/globalStyles/StyledDropdown.jsx b/Frontend/src/components/globalStyles/StyledDropdown.jsx
index 7c73e60c..20ae6a2a 100755
--- a/Frontend/src/components/globalStyles/StyledDropdown.jsx
+++ b/Frontend/src/components/globalStyles/StyledDropdown.jsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
const StyledDropdown = props => {
const [currentVal, updateValue] = useState(props.value);
- const { value, dropdownOptions, saveDropdownChange } = props;
+ const { dropdownOptions, saveDropdownChange } = props;
const dropdownUpdated = event => {
updateValue(event.target.value);
saveDropdownChange(event.target.value);
diff --git a/Frontend/src/util/ColorUtils.js b/Frontend/src/util/ColorUtils.js
index 0cf107a5..a133e114 100644
--- a/Frontend/src/util/ColorUtils.js
+++ b/Frontend/src/util/ColorUtils.js
@@ -7,7 +7,7 @@ const processActiveColors = () => {
response => {
const data = response.data.data;
data.map(color => {
- activeColorList.push(color.color);
+ return activeColorList.push(color.color);
});
},
error => console.error(error),