Skip to content

Commit 9f54339

Browse files
MFarejowiczMFarejowicz
committed
lint and fix tests
1 parent 78b1f0a commit 9f54339

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+537
-816
lines changed

‎.prettierrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
2+
"printWidth": 100,
23
"tabWidth": 2,
34
"useTabs": false,
45
"semi": true,
56
"singleQuote": false,
6-
"trailingComma": "all",
7+
"trailingComma": "es5",
78
"arrowParens": "always"
89
}

‎client/dist/index.html

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<!DOCTYPE html>
22
<html>
3+
34
<head>
45
<meta charset="UTF-8">
5-
<title>React Skeleton</title>
6+
<title>web.lab submission portal!</title>
67
</head>
8+
79
<body>
8-
<div id="root"></div>
9-
<script type="text/javascript" src="/bundle.js"></script></body>
10-
</html>
10+
<div id="root"></div>
11+
<script type="text/javascript" src="/bundle.js"></script>
12+
</body>
13+
14+
</html>

‎client/src/components/AdminView/AdminBody.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ class AdminBody extends React.Component {
1313
renderContent() {
1414
switch (this.props.activeTab) {
1515
case "iteration":
16-
return (
17-
<ClassIterationsSection setViewedYear={this.props.setViewedYear} />
18-
);
16+
return <ClassIterationsSection setViewedYear={this.props.setViewedYear} />;
1917
case "students":
2018
return (
2119
<StudentsSection

‎client/src/components/AdminView/AdminSideBar.js

+2-11
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ import "./AdminSideBar.css";
55

66
class AdminTabButton extends React.Component {
77
render() {
8-
const {
9-
activeTab,
10-
tabName,
11-
tabLabel,
12-
icon,
13-
onClick,
14-
showingMilestones
15-
} = this.props;
8+
const { activeTab, tabName, tabLabel, icon, onClick, showingMilestones } = this.props;
169
const active = !showingMilestones && activeTab === tabName;
1710

1811
return (
@@ -35,9 +28,7 @@ class AdminSideBar extends React.Component {
3528
const { activeTab, year, setActiveTab, showingMilestones } = this.props;
3629

3730
return (
38-
<div
39-
className={`u-flex u-flexAlignCenter u-darkGrey adminSidebar-container`}
40-
>
31+
<div className={`u-flex u-flexAlignCenter u-darkGrey adminSidebar-container`}>
4132
<AdminTabButton
4233
activeTab={activeTab}
4334
tabName="iteration"

‎client/src/components/AdminView/AdminView.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ class AdminView extends React.Component {
88
this.state = {
99
activeTab: "iteration",
1010
viewedYear: 2019,
11-
showingMilestones: false
11+
showingMilestones: false,
1212
};
1313
}
1414

15-
setActiveTab = tab => {
15+
setActiveTab = (tab) => {
1616
this.setState({ activeTab: tab, showingMilestones: false });
1717
};
1818

19-
setViewedYear = year => {
19+
setViewedYear = (year) => {
2020
this.setState({ viewedYear: year });
2121
};
2222

‎client/src/components/AdminView/ClassIterationsSection/ClassEntry.js

+2-9
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,8 @@ class ClassEntry extends React.Component {
1515
return (
1616
<div style={{ display: "flex", justifyContent: "space-around" }}>
1717
<div>{`${year} Class`}</div>
18-
{active ? (
19-
<span>ACTIVE!</span>
20-
) : (
21-
<button onClick={this.makeYearActive}>make active</button>
22-
)}
23-
<div
24-
style={{ color: "blue", cursor: "pointer" }}
25-
onClick={this.setViewedYear}
26-
>
18+
{active ? <span>ACTIVE!</span> : <button onClick={this.makeYearActive}>make active</button>}
19+
<div style={{ color: "blue", cursor: "pointer" }} onClick={this.setViewedYear}>
2720
View
2821
</div>
2922
</div>

‎client/src/components/AdminView/ClassIterationsSection/ClassList.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class ClassList extends React.Component {
1111
this.state = {
1212
loading: true,
1313
years: null,
14-
modalActive: false
14+
modalActive: false,
1515
};
1616
}
1717

@@ -21,41 +21,41 @@ class ClassList extends React.Component {
2121

2222
getYears = () => {
2323
get("/api/class", { complete: true })
24-
.then(data => {
24+
.then((data) => {
2525
data.sort((a, b) => b.year - a.year); // possible error point xd
2626
this.setState({
2727
loading: false,
28-
years: data
28+
years: data,
2929
});
3030
})
31-
.catch(err => console.log(err));
31+
.catch((err) => console.log(err));
3232
};
3333

34-
makeYearActive = id => {
34+
makeYearActive = (id) => {
3535
post(`/api/class/${id}/set-active-year`)
36-
.then(status => {
36+
.then((status) => {
3737
if (status === 204) {
3838
this.getYears();
3939
}
4040
return "You fuked up.";
4141
})
42-
.catch(err => console.log(err));
42+
.catch((err) => console.log(err));
4343
};
4444

4545
openNewIterationModal = () => {
4646
this.setState({ modalActive: true });
4747
};
4848

49-
confirmNewIteration = body => {
49+
confirmNewIteration = (body) => {
5050
console.log("Making new iteration!");
5151
post("/api/class", body)
52-
.then(status => {
52+
.then((status) => {
5353
if (status === 204) {
5454
this.getYears();
5555
}
5656
return "You fucked up";
5757
})
58-
.catch(err => console.log(err));
58+
.catch((err) => console.log(err));
5959
this.setState({ modalActive: false });
6060
};
6161

‎client/src/components/AdminView/ClassIterationsSection/NewClassIterationModal.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ class NewClassIterationModal extends React.Component {
2222

2323
handleInputChange = (event) => {
2424
const target = event.target;
25-
const value =
26-
target.type === "number" ? parseInt(target.value) : target.value;
25+
const value = target.type === "number" ? parseInt(target.value) : target.value;
2726
const name = target.name;
2827

2928
this.setState({

‎client/src/components/AdminView/GradesSection/GradeableEntry.js

+3-6
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,20 @@ class GradeableEntry extends React.Component {
1313
boxShadow: "2px 1px 1px",
1414
margin: "20px 20px",
1515
width: "250px",
16-
padding: "20px"
16+
padding: "20px",
1717
};
1818

1919
const iconStyle = {
2020
margin: "0 10px",
21-
cursor: "pointer"
21+
cursor: "pointer",
2222
};
2323

2424
return (
2525
<div style={teamBlock}>
2626
<span>
2727
{team.team_name} #{num}
2828
</span>
29-
<div
30-
style={iconStyle}
31-
onClick={() => this.props.showMilestonesSection(team._id)}
32-
>
29+
<div style={iconStyle} onClick={() => this.props.showMilestonesSection(team._id)}>
3330
View Submissions
3431
</div>
3532
<div>

‎client/src/components/AdminView/GradesSection/GradesHeader.js

+3-7
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class GradesHeader extends React.Component {
99
marginLeft: "20px",
1010
display: "flex",
1111
justifyContent: "space-around",
12-
alignItems: "center"
12+
alignItems: "center",
1313
};
1414

1515
const options = this.props.milestones.map((el, index) => (
@@ -33,9 +33,7 @@ class GradesHeader extends React.Component {
3333
<option value="submit">submitted</option>
3434
<option value="nosubmit">did not submit</option>
3535
</select>
36-
<select onChange={this.props.changeSelectedMilestone}>
37-
{options}
38-
</select>
36+
<select onChange={this.props.changeSelectedMilestone}>{options}</select>
3937
<span>from range</span>
4038
<input
4139
name="rangeMin"
@@ -52,9 +50,7 @@ class GradesHeader extends React.Component {
5250
/>
5351
</div>
5452
<div>
55-
<SearchBar
56-
onChange={event => this.props.getTeams(event.target.value)}
57-
/>
53+
<SearchBar onChange={(event) => this.props.getTeams(event.target.value)} />
5854
</div>
5955
</div>
6056
</div>

‎client/src/components/AdminView/GradesSection/GradesSection.js

+14-28
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class GradesSection extends React.Component {
1616
selectedSubmit: "submit",
1717
selectedTeamId: null,
1818
rangeMin: 1,
19-
rangeMax: 1
19+
rangeMax: 1,
2020
};
2121
}
2222

@@ -27,63 +27,53 @@ class GradesSection extends React.Component {
2727
loadData = (query = null) => {
2828
Promise.all([
2929
get("/api/milestones/"),
30-
get(
31-
"/api/teams",
32-
query ? { populate: true, searchQuery: query } : { populate: true }
33-
)
30+
get("/api/teams", query ? { populate: true, searchQuery: query } : { populate: true }),
3431
])
35-
.then(data => {
32+
.then((data) => {
3633
this.setState({
3734
loading: false,
3835
milestones: data[0],
3936
allTeams: data[1],
4037
selectedTeams: data[1], //TODO how will this integrate with search?
41-
rangeMax: data[1].length
38+
rangeMax: data[1].length,
4239
});
4340
})
44-
.catch(err => console.log(err));
41+
.catch((err) => console.log(err));
4542
};
4643

47-
updateRange = event => {
44+
updateRange = (event) => {
4845
const target = event.target;
49-
const value =
50-
target.type === "number" ? parseInt(target.value) : target.value;
46+
const value = target.type === "number" ? parseInt(target.value) : target.value;
5147
this.setState({
52-
[target.name]: value
48+
[target.name]: value,
5349
});
5450
};
5551

56-
updateSelectedTeams = event => {
52+
updateSelectedTeams = (event) => {
5753
const { allTeams } = this.state;
5854
const selectedMilestoneId = event.target.value;
5955
let newSelectedTeams = allTeams;
6056
console.log("selected:" + selectedMilestoneId);
6157
if (selectedMilestoneId !== "") {
62-
newSelectedTeams = allTeams.filter(team => {
58+
newSelectedTeams = allTeams.filter((team) => {
6359
return hasSubmission(team, selectedMilestoneId);
6460
});
6561
}
6662

6763
this.setState({
6864
selectedTeams: newSelectedTeams,
6965
rangeMax: newSelectedTeams.length == 0 ? 1 : newSelectedTeams.length,
70-
rangeMin: 1
66+
rangeMin: 1,
7167
});
7268
};
7369

74-
showMilestonesSection = teamId => {
70+
showMilestonesSection = (teamId) => {
7571
this.setState({ selectedTeamId: teamId });
7672
this.props.toggleViewMilestones();
7773
};
7874

7975
render() {
80-
const {
81-
loading,
82-
milestones,
83-
selectedTeams,
84-
rangeMin,
85-
rangeMax
86-
} = this.state;
76+
const { loading, milestones, selectedTeams, rangeMin, rangeMax } = this.state;
8777

8878
if (loading) {
8979
return <div>Loading!</div>;
@@ -113,11 +103,7 @@ class GradesSection extends React.Component {
113103
milestones={milestones}
114104
teams={selectedTeams}
115105
rangeMin={Number.isNaN(rangeMin) ? 1 : rangeMin}
116-
rangeMax={
117-
Number.isNaN(rangeMax) || rangeMax < rangeMin
118-
? rangeMin + 1
119-
: rangeMax
120-
}
106+
rangeMax={Number.isNaN(rangeMax) || rangeMax < rangeMin ? rangeMin + 1 : rangeMax}
121107
showMilestonesSection={this.showMilestonesSection}
122108
/>
123109
</div>

‎client/src/components/AdminView/MilestonesSection/Feedback.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ class Feedback extends React.Component {
3535
<div>Feedback</div>
3636
{submission.feedback &&
3737
submission.feedback.map((el, index) => (
38-
<div
39-
key={`feedback-${index}`}
40-
style={{ margin: "10px 0", border: "1px solid black" }}
41-
>
38+
<div key={`feedback-${index}`} style={{ margin: "10px 0", border: "1px solid black" }}>
4239
<div>{el.from}</div>
4340
<br />
4441
<div>{el.body}</div>

‎client/src/components/AdminView/MilestonesSection/MilestoneSelector.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ class MilestoneSelector extends React.Component {
3939
<div style={{ display: "flex" }}>
4040
<div>{milestone.title}</div>
4141
</div>
42-
<div>
43-
{`${this.countSubmissions(team, milestone._id)} submissions`}
44-
</div>
42+
<div>{`${this.countSubmissions(team, milestone._id)} submissions`}</div>
4543
</div>
4644
))}
4745
</div>

‎client/src/components/AdminView/MilestonesSection/MilestonesSection.js

+2-8
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ class MilestonesSection extends React.Component {
1919
}
2020

2121
loadData = () => {
22-
Promise.all([
23-
get(`/api/teams/${this.props.teamId}`),
24-
get("/api/milestones/"),
25-
])
22+
Promise.all([get(`/api/teams/${this.props.teamId}`), get("/api/milestones/")])
2623
.then((data) => {
2724
console.log(data);
2825
this.setState({
@@ -56,10 +53,7 @@ class MilestonesSection extends React.Component {
5653
team={this.state.team}
5754
milestones={this.state.milestones}
5855
/>
59-
<MilestoneDetails
60-
team={this.state.team}
61-
milestone={this.state.selectedMilestone}
62-
/>
56+
<MilestoneDetails team={this.state.team} milestone={this.state.selectedMilestone} />
6357
</div>
6458
);
6559
}

0 commit comments

Comments
 (0)