Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
154 commits
Select commit Hold shift + click to select a range
2b5f14c
Require Hello World in the document
acbart Jan 31, 2022
a7dee05
Rename text.Test.tsx to text.test.tsx
acbart Jan 31, 2022
3e381f3
Include the task info
acbart Jan 31, 2022
fee03d3
Merge branch 'task-first-branch' of https://github.com/UD-CISC275-S22…
acbart Jan 31, 2022
986b28a
First stab at questions
acbart Feb 2, 2022
e6b1dab
Allow one or more instances of the Hello World text
acbart Feb 3, 2022
2c852d6
Move Question interface to separate file
acbart Feb 6, 2022
dc3662a
Create answer interface
acbart Feb 8, 2022
51221ee
First stab at nested tasks
acbart Feb 8, 2022
3a793cc
Document Question interface
acbart Feb 9, 2022
5c39a97
Expand questions test data
acbart Feb 9, 2022
6ae0b6f
Add a little hint for a tough one
acbart Feb 9, 2022
b1bbbc8
Nested tests (phew)
acbart Feb 9, 2022
ab9bfb5
Basic starter files for components
acbart Feb 9, 2022
9765863
Another extra paren error
acbart Feb 9, 2022
d6c10cd
Merge branch 'main' of https://github.com/UD-CISC275-S22/react-typesc…
acbart Feb 13, 2022
c0bbc39
Updated, complete tests for all state components
acbart Feb 13, 2022
eb40f3e
Forgot task record for state
acbart Feb 19, 2022
6669ffa
First draft of components subtasks
acbart Feb 19, 2022
562f306
Another subtask, ChooseTeam
acbart Feb 24, 2022
4a34f5f
Oops order out of operations
acbart Feb 24, 2022
7327f4c
Add headers to each subtask
acbart Feb 24, 2022
cf7c212
Make testing easier for these components
acbart Feb 24, 2022
08feee1
Ugh this component is stupid, let's just forget about it for now
acbart Feb 24, 2022
89053a4
Provide the tests for the bad components
acbart Feb 24, 2022
41387d3
First stab at form task components
acbart Feb 25, 2022
1b03faf
Provide tests, change addQuestion to changeColor
acbart Feb 27, 2022
43b41ec
Fix entering blank text for GiveAttempts
acbart Mar 10, 2022
7a20734
Include json test command here
acbart Aug 24, 2024
7fe9ca3
Require Hello World in the document
acbart Jan 31, 2022
b8b8878
Include the task info
acbart Jan 31, 2022
fbdebde
Rename text.Test.tsx to text.test.tsx
acbart Jan 31, 2022
2f0146c
Allow one or more instances of the Hello World text
acbart Feb 3, 2022
a6acb43
Merge branch 'task-first-branch' of https://github.com/frontend-fun/t…
acbart Aug 24, 2024
ac36b32
First set of tests
acbart Jan 30, 2022
d04739d
Some logging tests
acbart Jan 30, 2022
b26100f
More html tests
acbart Jan 30, 2022
3bf4550
Fix the image test
acbart Jan 30, 2022
8dff2b6
Updated CSS tests, left a note about additional tests
acbart Jan 31, 2022
b66d4de
See previous commit message
acbart Jan 31, 2022
0a24364
Add in new css test
acbart Aug 24, 2024
4d43d7a
Add in points
acbart Aug 24, 2024
83c4461
Basic functions tests and stubs
acbart Jan 30, 2022
a486530
Fix test organization
acbart Jan 30, 2022
9722564
Fix issue in fahrenheit conversion
acbart Jan 30, 2022
bd06d5d
Move around some of the functions
acbart Feb 3, 2022
4cd1900
Explain what the actual functions require you to do
acbart Feb 3, 2022
cf1d21a
Update formatting
acbart Aug 24, 2024
e11693a
Add in points
acbart Aug 24, 2024
7cc4e3f
First stab at array problems
acbart Feb 1, 2022
f253337
Add in the rest of the tests
acbart Feb 1, 2022
b8777b1
Fix question text
acbart Feb 1, 2022
f87771e
Update arrays.test.ts
acbart Feb 11, 2022
f0d316b
Add in points
acbart Aug 24, 2024
c2e556d
First stab at questions
acbart Feb 2, 2022
406ffb2
Move Question interface to separate file
acbart Feb 6, 2022
9b9adb6
Fix formatting
acbart Aug 24, 2024
3660252
First stab at questions
acbart Feb 2, 2022
09d3d4f
Move Question interface to separate file
acbart Feb 6, 2022
9a24024
Create answer interface
acbart Feb 8, 2022
879fe17
First stab at nested tasks
acbart Feb 8, 2022
4d29d21
Document Question interface
acbart Feb 9, 2022
d71d9fc
Expand questions test data
acbart Feb 9, 2022
c955718
Add a little hint for a tough one
acbart Feb 9, 2022
c574699
Nested tests (phew)
acbart Feb 9, 2022
a368ad0
Forgot the task record!
acbart Feb 19, 2022
304184e
Fix typo in editOption test, and missing return type for editOption
acbart Mar 1, 2022
1b76b80
Fix formatting
acbart Aug 24, 2024
23314f3
update point values for tests
acbart Aug 24, 2024
82faacc
Fix react return value
acbart Aug 24, 2024
cc7d4db
Update react tests to use async
acbart Aug 24, 2024
c419dc9
Fix linting
acbart Aug 24, 2024
444b03b
Merge branch 'task-state' into task-components
acbart Aug 24, 2024
c1aab28
Merge branch 'update-branches' into task-components
acbart Aug 24, 2024
50a9c85
Update for new react
acbart Aug 24, 2024
28ee8d2
Merge branch 'task-components' into task-forms
acbart Aug 24, 2024
084abb4
Update the code for new version of react
acbart Aug 24, 2024
c95dc0f
This one too
acbart Aug 24, 2024
3119c0f
Add in points
acbart Aug 24, 2024
5131a90
Added name to App
gmanzari Aug 29, 2025
3ba95a0
Merge remote-tracking branch 'upstream/task-first-branch' into solved…
gmanzari Aug 31, 2025
3e02ec2
added Hello World
gmanzari Aug 31, 2025
2720ce6
Merge remote-tracking branch 'upstream/task-html-css' into solved-htm…
gmanzari Sep 6, 2025
fe257dd
Merge remote-tracking branch 'upstream/task-functions' into solved-fu…
gmanzari Sep 8, 2025
1e28352
fixed farenheitToCelsius function
gmanzari Sep 8, 2025
a1335dd
fixed shourt function
gmanzari Sep 8, 2025
0785fd7
fixed add3 function
gmanzari Sep 8, 2025
9440b52
fixed isQuestion
gmanzari Sep 8, 2025
c06bb64
fixed ConvertYesNo function
gmanzari Sep 8, 2025
b7f5fcb
Merge remote-tracking branch 'upstream/task-arrays' into solved-arrays
gmanzari Sep 10, 2025
64dd191
fixed tripleNumbers function
gmanzari Sep 10, 2025
36c5d79
fixed shoutifExclaiming function
gmanzari Sep 10, 2025
4fe5648
fixed countShortWords function
gmanzari Sep 10, 2025
d56ebd4
fixed stringsToIntegers function
gmanzari Sep 10, 2025
4c12a13
fixed removeDollars function
gmanzari Sep 10, 2025
2a5100c
fixed allRGB function
gmanzari Sep 10, 2025
7b30fab
fixed makeMath function
gmanzari Sep 10, 2025
937fbe1
fixed bookEndList function
gmanzari Sep 12, 2025
8961df5
fixed injectPositive function
gmanzari Sep 12, 2025
fc671a6
got rid of import that resulted from an incorrect quickFix that I got…
gmanzari Sep 12, 2025
ba87d25
Merge remote-tracking branch 'upstream/task-objects' into solved-objects
gmanzari Sep 16, 2025
bfe29a2
fixed makeBlankQuestion function
gmanzari Sep 16, 2025
86d8ccc
fixed isCorrect function
gmanzari Sep 16, 2025
f5165d5
fixed isValid function
gmanzari Sep 16, 2025
43eec10
fixed toShortForm function
gmanzari Sep 16, 2025
33bcd0a
fixed toMarkdown function
gmanzari Sep 16, 2025
83a7633
fixed renameQuestion function
gmanzari Sep 16, 2025
40570f8
fixed publishQuestion function
gmanzari Sep 16, 2025
462d819
fixed duplicateQuestion function
gmanzari Sep 16, 2025
52b6558
fixed addOption function
gmanzari Sep 16, 2025
58a96ff
fixed mergeQuestion function
gmanzari Sep 16, 2025
9678948
Merge remote-tracking branch 'upstream/task-nested' into solved-nested
gmanzari Sep 19, 2025
26649b2
fixed getPublishedQuestions function
gmanzari Sep 19, 2025
76a06ae
fixed findQuestion function
gmanzari Sep 19, 2025
cf2993c
fixed removeQuestion fucntion
gmanzari Sep 20, 2025
8e7a978
fixed getNames function
gmanzari Sep 20, 2025
1cef2a3
fixed sumPoints function
gmanzari Sep 20, 2025
f075324
fixed sumPublishedPoints function
gmanzari Sep 20, 2025
51cfe1a
fixed publishAll function
gmanzari Sep 20, 2025
8a7d6b4
fixed getNonEmptyQuestions function
gmanzari Sep 21, 2025
617b9a5
fixed toCSV function
gmanzari Sep 21, 2025
16078d0
fixed makeAnswers function
gmanzari Sep 21, 2025
0aa9cec
fixed sameType function
gmanzari Sep 22, 2025
04018e8
fixed addNewQuestion function
gmanzari Sep 22, 2025
972b58a
fixed renameQuestionById function
gmanzari Sep 22, 2025
7307f63
fixed changeQuestionTypeById function
gmanzari Sep 22, 2025
841c951
fixed newQuestions function
gmanzari Sep 22, 2025
c424ade
fixed duplicateQuestionArray function
gmanzari Sep 22, 2025
a39d5a3
hopefully fixed linting error
gmanzari Sep 22, 2025
a3df807
Merge remote-tracking branch 'upstream/task-state' into solved-state
gmanzari Sep 25, 2025
d419713
Counter and RevealAnswer Components Added and Compiled successfully
gmanzari Sep 25, 2025
9f0d556
Changed RevealAnswer so that the answer isn't shown initially
gmanzari Sep 25, 2025
1ef893d
ChangeType and StartAttempt components finished
gmanzari Sep 26, 2025
c664fda
TwoDice component done
gmanzari Sep 26, 2025
9e4a2e1
capitalized Lose and Win in TwoDice and finished CycleHoliday component
gmanzari Sep 26, 2025
4a40293
fixed TwoDice issue with initial value, fixed changeType issue with d…
gmanzari Sep 26, 2025
a155251
got rid of import not needed
gmanzari Sep 26, 2025
e6d5aad
Merge remote-tracking branch 'upstream/task-components' into solved-c…
gmanzari Sep 27, 2025
9885166
fixed DoubleHalf component
gmanzari Sep 28, 2025
50de120
fixed ChooseTeam and ColoredBox Components
gmanzari Sep 29, 2025
d5baa7c
fixed ShoveBox
gmanzari Sep 29, 2025
6ccb37c
fixed ChooseTeam component
gmanzari Sep 29, 2025
432b9f7
Merge remote-tracking branch 'upstream/task-forms' into solved-forms
gmanzari Oct 2, 2025
6b6ee70
fixed checkAnswer component
gmanzari Oct 2, 2025
c3b942a
fixed EditMode and GiveAttempts components
gmanzari Oct 2, 2025
3f01ece
fixed changeColor component
gmanzari Oct 3, 2025
aa69957
fixed MultipleChoice Question component
gmanzari Oct 3, 2025
4eba480
fixed intial correctness in CheckAnswer component and made the defaul…
gmanzari Oct 3, 2025
6568eef
changed the way I imported Form in hopes that it would fix my linting…
gmanzari Oct 3, 2025
4c4a01e
Merge pull request #1 from gmanzari/solved-first-branch
gmanzari Oct 24, 2025
eb70fc7
Merge pull request #2 from gmanzari/solved-arrays
gmanzari Oct 24, 2025
3defe07
Merge pull request #3 from gmanzari/solved-state
gmanzari Oct 24, 2025
f38ff0b
Merge pull request #4 from gmanzari/solved-components
gmanzari Oct 24, 2025
336a626
Merge pull request #5 from gmanzari/solved-forms
gmanzari Oct 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"env": {
"browser": true,
"es2021": true,
"node": true
},
"settings": {
"react": {
"version": "detect"
}
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"prettier"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 12,
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint", "prettier"],
"rules": {
"prettier/prettier": [
"error",
{
"endOfLine": "auto"
}
],
"no-extra-parens": [
"warn",
"all",
{
"nestedBinaryExpressions": false,
"returnAssign": false,
"enforceForArrowConditionals": false,
"ignoreJSX": "all"
}
],
"brace-style": ["error", "1tbs"],
"indent": ["error", 4],
"quotes": ["error", "double"],
"semi": ["error", "always"]
}
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"build": "react-scripts build",
"test": "react-scripts test",
"test:cov": "react-scripts test --coverage --watchAll",
"test:json": "react-scripts test --json --watchAll=false --outputFile jest-output.json --coverage",
"eject": "react-scripts eject",
"lint": "eslint ./src --ext .tsx --ext .ts --max-warnings 0",
"eslint-output": "eslint-output ./src --ext .tsx --ext .ts --max-warnings 0",
Expand Down
Binary file added public/cute_dogs.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/tasks/task-arrays.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Task - Arrays

Version: 0.0.1

Implement functions that work with arrays immutably.
5 changes: 5 additions & 0 deletions public/tasks/task-components.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Task - Components

Version: 0.0.1

Fix some components that are using state incorrectly.
5 changes: 5 additions & 0 deletions public/tasks/task-first-branch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Task - First Branch

Version: 0.0.1

Pass a short test to have certain text on the page.
5 changes: 5 additions & 0 deletions public/tasks/task-functions.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Task - Functions

Version: 0.0.1

Implement a bunch of functions that work on primitives.
5 changes: 5 additions & 0 deletions public/tasks/task-html-css.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Task - HTML/CSS

Version: 0.0.1

Add in some HTML and CSS, including a fancy looking button.
5 changes: 5 additions & 0 deletions public/tasks/task-nested.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Task - Nested

Version: 0.0.1

Implement functions that work with nested arrays and objects immutably.
5 changes: 5 additions & 0 deletions public/tasks/task-objects.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Task - Objects

Version: 0.0.1

Implement functions that work with objects immutably.
5 changes: 5 additions & 0 deletions public/tasks/task-state.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Task - State

Version: 0.0.1

Create some new components that have React State.
122 changes: 113 additions & 9 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,121 @@
import React from "react";
import "./App.css";
import { Button, Col, Container, Row } from "react-bootstrap";
//import { ChangeType } from "./components/ChangeType";
import { RevealAnswer } from "./components/RevealAnswer";
//import { StartAttempt } from "./components/StartAttempt";
//import { TwoDice } from "./components/TwoDice";
//import { CycleHoliday } from "./components/CycleHoliday";
import { Counter } from "./components/Counter";
import { ChangeType } from "./components/ChangeType";
import { StartAttempt } from "./components/StartAttempt";
import { TwoDice } from "./components/TwoDice";
import { CycleHoliday } from "./components/CycleHoliday";
import { DoubleHalf } from "./bad-components/DoubleHalf";
import { CheckAnswer } from "./form-components/CheckAnswer";
import { GiveAttempts } from "./form-components/GiveAttempts";
import { EditMode } from "./form-components/EditMode";
import { ChangeColor } from "./form-components/ChangeColor";
import { MultipleChoiceQuestion } from "./form-components/MultipleChoiceQuestion";

function App(): React.JSX.Element {
return (
<div className="App">
<header className="App-header">
UD CISC275 with React Hooks and TypeScript
</header>
<p>
Edit <code>src/App.tsx</code> and save. This page will
automatically reload.
</p>
</div>
<>
<div className="App">
<header className="App-header">
<div style={{ backgroundColor: "lightblue" }} />
UD CISC275 with React Hooks and TypeScript
</header>
<h1>Welcome!</h1>
<img src="/cute_dogs.jpg" alt="Image of cute dogs" />
<p>
Gabi Manzari - Edit <code>src/App.tsx</code> and save. This
page will automatically reload.
</p>
<p>Hello World</p>
<div>
List of Movies:
<ul>
<li>Zootopia</li>
<li>Wicked</li>
<li>The Long Walk</li>
</ul>
<div>
<Button
onClick={() => {
console.log("Hello World!");
}}
>
Log Hello World
</Button>
</div>
</div>
<Container>
<Row>
<Col>
<div
style={{
border: "1px solid red",
padding: "4px",
backgroundColor: "red",
}}
></div>
First column.
</Col>
<Col>
<div
style={{
border: "1px solid red",
padding: "4px",
backgroundColor: "red",
}}
></div>
Second column.
</Col>
</Row>
</Container>
</div>
<div>
Counter: <Counter></Counter>
</div>
<div>
{"What's the answer?"}
<RevealAnswer></RevealAnswer>
</div>
<div>
<ChangeType></ChangeType>
</div>
<div>
<StartAttempt></StartAttempt>
</div>
<div>
<TwoDice></TwoDice>
</div>
<div>
<CycleHoliday></CycleHoliday>
</div>
<div>
<DoubleHalf></DoubleHalf>
</div>
<div>
<CheckAnswer expectedAnswer={"hi"}></CheckAnswer>
</div>
<div>
<GiveAttempts></GiveAttempts>
</div>
<div>
<EditMode></EditMode>
</div>
<div>
<ChangeColor></ChangeColor>
</div>
<div>
<MultipleChoiceQuestion
options={["1", "2", "3", "4"]}
expectedAnswer={"3"}
></MultipleChoiceQuestion>
</div>
</>
);
}

Expand Down
Loading