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.

Sign up for GitHub

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

Jump to bottom

Development/lab 7 #216

Merged
merged 82 commits into from Mar 8, 2023
Merged

Development/lab 7 #216

merged 82 commits into from Mar 8, 2023

Commits on Mar 7, 2022

  1. Merge branch 'dev' of https://github.com/all-rit/ALL into development… 

    …/Lab-7
    @kxl1360
    kxl1360 committed Mar 7, 2022
    Configuration menu
    Copy the full SHA
    fc00ce1 View commit details
    Browse the repository at this point in the history

  2. stubbed out pages for lab 7 and added lab7 route to routes/index.js

    @kxl1360
    kxl1360 committed Mar 7, 2022
    Configuration menu
    Copy the full SHA
    49e4589 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2022

  1. rm

    @kxl1360
    kxl1360 committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    d88ca1e View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2022

  1. create lab7 client side

    @kxl1360
    kxl1360 committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    e5f4366 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2022

  1. working url to Lab 7 page

    @kxl1360
    kxl1360 committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    4869b04 View commit details
    Browse the repository at this point in the history

  2. more skeleton pages

    @kxl1360
    kxl1360 committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    64f3ba0 View commit details
    Browse the repository at this point in the history

  3. lab 7 server files

    @kxl1360
    kxl1360 committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    e3259f3 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2022

  1. Lab 7 reading in database and created exercise pages

    @kxl1360
    kxl1360 committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    3775614 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2022

  1. create rest of exercise pages and fixed routing

    @kxl1360
    kxl1360 committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    b0097a2 View commit details
    Browse the repository at this point in the history

  2. create quiz skeleton

    @kxl1360
    kxl1360 committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    d8d184d View commit details
    Browse the repository at this point in the history

  3. small formatting tweaks

    @kxl1360
    kxl1360 committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    707112e View commit details
    Browse the repository at this point in the history

  4. create components and added them to pages

    @kxl1360
    kxl1360 committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    3c6bb08 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2022

  1. create missing main components and fixed reducers for lab7

    @kxl1360
    kxl1360 committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    42612e8 View commit details
    Browse the repository at this point in the history

  2. minor css change to sim summary

    @kxl1360
    kxl1360 committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    5455470 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. refined components and add imgs for sim

    @kxl1360
    kxl1360 committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    5e8fe46 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. create missing sim components and add scss file

    @kxl1360
    kxl1360 committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    1862166 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

  1. sim ui 90% done, mostly css work

    @kxl1360
    kxl1360 committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    3f9a3c9 View commit details
    Browse the repository at this point in the history

  2. fix button css

    @kxl1360
    kxl1360 committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    6c890af View commit details
    Browse the repository at this point in the history

  3. fix button css pt 2

    @kxl1360
    kxl1360 committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    9be63bd View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2022

  1. simulation update

    @kxl1360
    kxl1360 committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    7ae9481 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2022

  1. found issue with file reset after each round

    @kxl1360
    kxl1360 committed Apr 25, 2022
    Configuration menu
    Copy the full SHA
    c1c1cd4 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2022

  1. repair done

    @kxl1360
    kxl1360 committed May 6, 2022
    Configuration menu
    Copy the full SHA
    1d53160 View commit details
    Browse the repository at this point in the history

  2. added quiz and changed lab7 exercise table

    @kxl1360
    kxl1360 committed May 6, 2022
    Configuration menu
    Copy the full SHA
    2d94773 View commit details
    Browse the repository at this point in the history

  3. add alteration exercise quiz

    @kxl1360
    kxl1360 committed May 6, 2022
    Configuration menu
    Copy the full SHA
    50e2bcd View commit details
    Browse the repository at this point in the history

  4. added comment to repair and found simulation running issues found in … 

    …repair part of exercise
    @kxl1360
    kxl1360 committed May 6, 2022
    Configuration menu
    Copy the full SHA
    74a1218 View commit details
    Browse the repository at this point in the history

  5. fixed naming issues

    @kxl1360
    kxl1360 committed May 6, 2022
    Configuration menu
    Copy the full SHA
    8a11b11 View commit details
    Browse the repository at this point in the history

  6. fixed typos and parameter mistakes

    @kxl1360
    kxl1360 committed May 6, 2022
    Configuration menu
    Copy the full SHA
    ed2b9a5 View commit details
    Browse the repository at this point in the history

  7. pushing missed file

    @kxl1360
    kxl1360 committed May 6, 2022
    Configuration menu
    Copy the full SHA
    aa0cb4e View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2023

  1. Merged from dev and fixed conflicts

    @notcruz
    notcruz committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    9fd78a6 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2023

  1. Handling eslint errors

    @notcruz
    notcruz committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    d7abdcf View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2023

  1. Added endpoint for Lab7 exercise end because API.js was returning 404… 

    … to client
    @jjm8759
    jjm8759 committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    24c6fb4 View commit details
    Browse the repository at this point in the history

  2. [#142] Updated components, styling, and round animation.

    @notcruz
    notcruz committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    ca13926 View commit details
    Browse the repository at this point in the history

  3. [#142] Added functional progress bar and message for when the AI is i… 

    …ncorrect.
    @notcruz
    notcruz committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    457e2de View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2023

  1. [#142] Functional simulation of all ten rounds.

    @notcruz
    notcruz committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    a332cb7 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2023

  1. [#142] Functional tally system for all ten rounds.

    @notcruz
    notcruz committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    3e7f81c View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2023

  1. #143 - Fixed Repair Button State Bug

    @dm9965
    dm9965 committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    94c2397 View commit details
    Browse the repository at this point in the history

  2. [#142] Styling Collapsible component for exercise status report

    @notcruz
    notcruz committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    289967d View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2023

  1. [#142] Working on status report

    @notcruz
    notcruz committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    f5e5bda View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2023

  1. Fixed eslint errors for lab7

    @jjm8759
    jjm8759 committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    4eae1b7 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. Merge pull request #195 from all-rit/143-improving-the-autonomous-sys… 

    …tem-exercise

143 improving the autonomous system exercise
    @notcruz
    notcruz committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    5b43c61 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. Merge branch '143-improving-the-autonomous-system-exercise' into 142-… 

    …simulation-exercise

# Conflicts:
#	client/package-lock.json
#	client/src/assets/stylesheets/components/AutoSysAI.scss
#	client/src/assets/stylesheets/components/File.scss
#	client/src/assets/stylesheets/components/Files.scss
#	client/src/assets/stylesheets/components/Simulation.scss
#	client/src/components/exercise/lab7/components/AutoSysAI.js
#	client/src/components/exercise/lab7/components/Collapsible.js
#	client/src/components/exercise/lab7/components/File.js
#	client/src/components/exercise/lab7/components/Files.js
#	client/src/components/exercise/lab7/components/Message.js
#	client/src/components/exercise/lab7/components/Simulation.js
#	client/src/components/exercise/lab7/components/mockData/fileMockData.js
#	client/src/components/exercise/lab7/pages/Simulation/AISimulation.js
#	client/src/components/exercise/lab7/pages/Simulation/SimulationSummary.js
#	client/src/constants/lab7/index.js
#	client/src/reducers/lab7/ExerciseReducer.js
#	client/src/services/lab7/ExerciseService.js
    @notcruz
    notcruz committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    39a6099 View commit details
    Browse the repository at this point in the history

  2. [#142] Fixing errors and finalizing summary report

    @notcruz
    notcruz committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    ebd37a8 View commit details
    Browse the repository at this point in the history

  3. [#144] Fixed State issue with Lab 7alteration quiz

    @dm9965
    dm9965 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    07227b6 View commit details
    Browse the repository at this point in the history

  4. [#142] Added method documentation, finalized phase one and updated co… 

    …nstants
    @notcruz
    notcruz committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    fb2d49b View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2023

  1. #144 Created prop to hide certificate on Alteration Quiz Result

    @dm9965
    dm9965 committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    764b872 View commit details
    Browse the repository at this point in the history

  2. #200 updated quiz component to match updated config for Lab 7

    @dm9965
    dm9965 committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    70c6590 View commit details
    Browse the repository at this point in the history

  3. [#143] Decoupling code component

    @notcruz
    notcruz committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    dda42a4 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2023

  1. [#143] Adding redux use in components and removing the passing of props

    @notcruz
    notcruz committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    4ffe17f View commit details
    Browse the repository at this point in the history

  2. [#143] More fixes with redux implementation

    @notcruz
    notcruz committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    83f45f1 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2023

  1. #181 Updated Exercise End Pages for Lab 3, 4, 5

    @dm9965
    dm9965 committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    52ab05f View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2023

  1. [#143] Fixing styles on Lab 7 and allowing phase two to be taken mult… 

    …iple times
    @notcruz
    notcruz committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    487d58c View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2023

  1. [#143] Added functional user input parsing for utility equation to ru… 

    …n simulation.
    @notcruz
    notcruz committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    7e0a357 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2023

  1. [#142] Simulation styling

    @notcruz
    notcruz committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    90188c4 View commit details
    Browse the repository at this point in the history

  2. [#143] Removed unused style file

    @notcruz
    notcruz committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    84e7913 View commit details
    Browse the repository at this point in the history

  3. Merging #142, #143, #144

    @notcruz
    notcruz committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    df09902 View commit details
    Browse the repository at this point in the history

  4. colorPicker warning removed

    @notcruz
    notcruz committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    a2df037 View commit details
    Browse the repository at this point in the history

  5. [#216] Decreasing read time to 10s from 15s

    @notcruz
    notcruz committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    e818201 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. Updating state at mount for each component

    @notcruz
    notcruz committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    4cffea4 View commit details
    Browse the repository at this point in the history

  2. Updating Alteration Quiz to display equations using latex

    @notcruz
    notcruz committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    992bb19 View commit details
    Browse the repository at this point in the history

  3. Package changes

    @notcruz
    notcruz committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    ef19fba View commit details
    Browse the repository at this point in the history

  4. Input title updated

    @notcruz
    notcruz committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    1324d08 View commit details
    Browse the repository at this point in the history

  5. Fixed popup color timeout bug

    @notcruz
    notcruz committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    bceb18e View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2023

  1. [#216] Fixed question three not appearing on alteration quiz

    @notcruz
    notcruz committed Feb 19, 2023
    Configuration menu
    Copy the full SHA
    8c353b8 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2023

  1. [#216] Updated code repair to inform user of error

    @notcruz
    notcruz committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    60815c6 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2023

  1. [#216] Proper use of react-redux to components

    @notcruz
    notcruz committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    a36b99a View commit details
    Browse the repository at this point in the history

  2. [#216] Handled all es-lint ignores

    @notcruz
    notcruz committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    092c69a View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. Merge branch 'dev' into development/Lab-7

    @Mster115
    Mster115 committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    1b10522 View commit details
    Browse the repository at this point in the history

  2. prettier fix

    @Mster115
    Mster115 committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    afcd02b View commit details
    Browse the repository at this point in the history

  3. stubbed func for non final quiz data submission

    @Mster115
    Mster115 committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    293c911 View commit details
    Browse the repository at this point in the history

  4. prettier fix

    @Mster115
    Mster115 committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    b866d72 View commit details
    Browse the repository at this point in the history

  5. [#216] DB Implementation

    @notcruz
    notcruz committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    71c5245 View commit details
    Browse the repository at this point in the history

  6. [#216] DB Implementation

    @notcruz
    notcruz committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    7ca03ef View commit details
    Browse the repository at this point in the history

  7. [#216] Alteration Quiz DB implementation

    @notcruz
    notcruz committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    61396c3 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. [#216] Ryan's review implementation

    @notcruz
    notcruz committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    23b819f View commit details
    Browse the repository at this point in the history

  2. [#216] Andreas' review implementation

    @notcruz
    notcruz committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    a41c6f7 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. Updates based on demo

    @notcruz
    notcruz committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    61fe07b View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. More updates

    @notcruz
    notcruz committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    f8d285b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into development/Lab-7

    @Mster115
    Mster115 committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    5665c77 View commit details
    Browse the repository at this point in the history

  3. fixed change effected by previous defect

    @Mster115
    Mster115 committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    f74d1fe View commit details
    Browse the repository at this point in the history

  4. prettier fixes

    @Mster115
    Mster115 committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    fa9efff View commit details
    Browse the repository at this point in the history

  5. fixed ending of exercise

    @Mster115
    Mster115 committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    388ef6d View commit details
    Browse the repository at this point in the history

  6. prettier fixes

    @Mster115
    Mster115 committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    2a330e9 View commit details
    Browse the repository at this point in the history