Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development/lab 7 #216

Merged
merged 82 commits into from Mar 8, 2023
Merged
Show file tree
Hide file tree
Changes from 64 commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
fc00ce1
Merge branch 'dev' of https://github.com/all-rit/ALL into development…
kxl1360 Mar 7, 2022
49e4589
stubbed out pages for lab 7 and added lab7 route to routes/index.js
kxl1360 Mar 7, 2022
d88ca1e
rm
kxl1360 Mar 9, 2022
e5f4366
create lab7 client side
kxl1360 Mar 11, 2022
4869b04
working url to Lab 7 page
kxl1360 Mar 15, 2022
64f3ba0
more skeleton pages
kxl1360 Mar 15, 2022
e3259f3
lab 7 server files
kxl1360 Mar 15, 2022
3775614
Lab 7 reading in database and created exercise pages
kxl1360 Mar 17, 2022
b0097a2
create rest of exercise pages and fixed routing
kxl1360 Mar 22, 2022
d8d184d
create quiz skeleton
kxl1360 Mar 22, 2022
707112e
small formatting tweaks
kxl1360 Mar 22, 2022
3c6bb08
create components and added them to pages
kxl1360 Mar 22, 2022
42612e8
create missing main components and fixed reducers for lab7
kxl1360 Mar 24, 2022
5455470
minor css change to sim summary
kxl1360 Mar 24, 2022
5e8fe46
refined components and add imgs for sim
kxl1360 Mar 31, 2022
1862166
create missing sim components and add scss file
kxl1360 Apr 1, 2022
3f9a3c9
sim ui 90% done, mostly css work
kxl1360 Apr 6, 2022
6c890af
fix button css
kxl1360 Apr 6, 2022
9be63bd
fix button css pt 2
kxl1360 Apr 6, 2022
7ae9481
simulation update
kxl1360 Apr 19, 2022
c1c1cd4
found issue with file reset after each round
kxl1360 Apr 25, 2022
1d53160
repair done
kxl1360 May 6, 2022
2d94773
added quiz and changed lab7 exercise table
kxl1360 May 6, 2022
50e2bcd
add alteration exercise quiz
kxl1360 May 6, 2022
74a1218
added comment to repair and found simulation running issues found in …
kxl1360 May 6, 2022
8a11b11
fixed naming issues
kxl1360 May 6, 2022
ed2b9a5
fixed typos and parameter mistakes
kxl1360 May 6, 2022
aa0cb4e
pushing missed file
kxl1360 May 6, 2022
9fd78a6
Merged from dev and fixed conflicts
notcruz Jan 18, 2023
d7abdcf
Handling eslint errors
notcruz Jan 20, 2023
24c6fb4
Added endpoint for Lab7 exercise end because API.js was returning 404…
jjm8759 Jan 23, 2023
ca13926
[#142] Updated components, styling, and round animation.
notcruz Jan 23, 2023
457e2de
[#142] Added functional progress bar and message for when the AI is i…
notcruz Jan 23, 2023
a332cb7
[#142] Functional simulation of all ten rounds.
notcruz Jan 25, 2023
3e7f81c
[#142] Functional tally system for all ten rounds.
notcruz Jan 26, 2023
94c2397
#143 - Fixed Repair Button State Bug
dm9965 Jan 27, 2023
289967d
[#142] Styling Collapsible component for exercise status report
notcruz Jan 27, 2023
f5e5bda
[#142] Working on status report
notcruz Jan 28, 2023
4eae1b7
Fixed eslint errors for lab7
jjm8759 Jan 30, 2023
5b43c61
Merge pull request #195 from all-rit/143-improving-the-autonomous-sys…
notcruz Feb 1, 2023
39a6099
Merge branch '143-improving-the-autonomous-system-exercise' into 142-…
notcruz Feb 3, 2023
ebd37a8
[#142] Fixing errors and finalizing summary report
notcruz Feb 3, 2023
07227b6
[#144] Fixed State issue with Lab 7alteration quiz
dm9965 Feb 3, 2023
fb2d49b
[#142] Added method documentation, finalized phase one and updated co…
notcruz Feb 3, 2023
764b872
#144 Created prop to hide certificate on Alteration Quiz Result
dm9965 Feb 6, 2023
70c6590
#200 updated quiz component to match updated config for Lab 7
dm9965 Feb 6, 2023
dda42a4
[#143] Decoupling code component
notcruz Feb 6, 2023
4ffe17f
[#143] Adding redux use in components and removing the passing of props
notcruz Feb 9, 2023
83f45f1
[#143] More fixes with redux implementation
notcruz Feb 9, 2023
52ab05f
#181 Updated Exercise End Pages for Lab 3, 4, 5
dm9965 Feb 10, 2023
487d58c
[#143] Fixing styles on Lab 7 and allowing phase two to be taken mult…
notcruz Feb 13, 2023
7e0a357
[#143] Added functional user input parsing for utility equation to ru…
notcruz Feb 14, 2023
90188c4
[#142] Simulation styling
notcruz Feb 15, 2023
84e7913
[#143] Removed unused style file
notcruz Feb 15, 2023
df09902
Merging #142, #143, #144
notcruz Feb 15, 2023
a2df037
colorPicker warning removed
notcruz Feb 15, 2023
e818201
[#216] Decreasing read time to 10s from 15s
notcruz Feb 15, 2023
4cffea4
Updating state at mount for each component
notcruz Feb 17, 2023
992bb19
Updating Alteration Quiz to display equations using latex
notcruz Feb 17, 2023
ef19fba
Package changes
notcruz Feb 17, 2023
1324d08
Input title updated
notcruz Feb 17, 2023
bceb18e
Fixed popup color timeout bug
notcruz Feb 17, 2023
8c353b8
[#216] Fixed question three not appearing on alteration quiz
notcruz Feb 19, 2023
60815c6
[#216] Updated code repair to inform user of error
notcruz Feb 20, 2023
a36b99a
[#216] Proper use of react-redux to components
notcruz Feb 22, 2023
092c69a
[#216] Handled all es-lint ignores
notcruz Feb 22, 2023
1b10522
Merge branch 'dev' into development/Lab-7
Mster115 Feb 27, 2023
afcd02b
prettier fix
Mster115 Feb 27, 2023
293c911
stubbed func for non final quiz data submission
Mster115 Feb 27, 2023
b866d72
prettier fix
Mster115 Feb 27, 2023
71c5245
[#216] DB Implementation
notcruz Feb 27, 2023
7ca03ef
[#216] DB Implementation
notcruz Feb 27, 2023
61396c3
[#216] Alteration Quiz DB implementation
notcruz Feb 27, 2023
23b819f
[#216] Ryan's review implementation
notcruz Mar 1, 2023
a41c6f7
[#216] Andreas' review implementation
notcruz Mar 1, 2023
61fe07b
Updates based on demo
notcruz Mar 7, 2023
f8d285b
More updates
notcruz Mar 8, 2023
5665c77
Merge branch 'dev' into development/Lab-7
Mster115 Mar 8, 2023
f74d1fe
fixed change effected by previous defect
Mster115 Mar 8, 2023
fa9efff
prettier fixes
Mster115 Mar 8, 2023
388ef6d
fixed ending of exercise
Mster115 Mar 8, 2023
2a330e9
prettier fixes
Mster115 Mar 8, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 32 additions & 9 deletions client/.eslintrc.json
@@ -1,7 +1,8 @@
{
"env": {
"browser": true,
"es2021": true
"es2021": true,
"node": true
},
"extends": ["eslint:recommended", "prettier", "plugin:react/recommended"],
"overrides": [],
Expand All @@ -25,27 +26,49 @@
"propWrapperFunctions": [
// The names of any function used to wrap propTypes, e.g. `forbidExtraProps`. If this isn't set, any propTypes wrapped in a function will be skipped.
"forbidExtraProps",
{ "property": "freeze", "object": "Object" },
{ "property": "myFavoriteWrapper" },
{
"property": "freeze",
"object": "Object"
},
{
"property": "myFavoriteWrapper"
},
// for rules that check exact prop wrappers
{ "property": "forbidExtraProps", "exact": true }
{
"property": "forbidExtraProps",
"exact": true
}
],
"componentWrapperFunctions": [
// The name of any function used to wrap components, e.g. Mobx `observer` function. If this isn't set, components wrapped by these functions will be skipped.
"observer", // `property`
{ "property": "styled" }, // `object` is optional
{ "property": "observer", "object": "Mobx" },
{ "property": "observer", "object": "<pragma>" } // sets `object` to whatever value `settings.react.pragma` is set to
{
"property": "styled"
}, // `object` is optional
{
"property": "observer",
"object": "Mobx"
},
{
"property": "observer",
"object": "<pragma>"
} // sets `object` to whatever value `settings.react.pragma` is set to
],
"formComponents": [
// Components used as alternatives to <form> for forms, eg. <Form endpoint={ url } />
"CustomForm",
{ "name": "Form", "formAttribute": "endpoint" }
{
"name": "Form",
"formAttribute": "endpoint"
}
],
"linkComponents": [
// Components used as alternatives to <a> for linking, eg. <Link to={ url } />
"Hyperlink",
{ "name": "Link", "linkAttribute": "to" }
{
"name": "Link",
"linkAttribute": "to"
}
]
}
}