Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
f88d389
Add passing tests for iteration 0 and 5/7 tests for iteration 1
alexanderela Oct 3, 2018
1a30e01
Merge pull request #1 from alexanderela/Iteration-1-Part-1
alexanderela Oct 3, 2018
3d8e568
Add passing test to round to nearest thousandth
alexanderela Oct 3, 2018
2db2ff0
Add passing test to sanitize and default data to 0
alexanderela Oct 3, 2018
6e6fa43
Merge pull request #2 from alexanderela/Iteration-1-Part-1-Last-2-Tests
alexanderela Oct 3, 2018
cafc460
Add first 2 passing tests
alexanderela Oct 3, 2018
df4e02c
Merge pull request #3 from alexanderela/Iteration-1-Part-2
alexanderela Oct 3, 2018
2c7d749
Add last test
alexanderela Oct 3, 2018
5a643f5
Merge pull request #4 from alexanderela/Iteration-1-Part-2
alexanderela Oct 4, 2018
869b4e2
Add component files for DistrictsContainer and DistrictsCard
alexanderela Oct 4, 2018
659c0d9
Add preliminary test for DistrictCard and DistrictsContainer
alexanderela Oct 4, 2018
ef0f639
Add failing tests for Districts Container
alexanderela Oct 4, 2018
441381a
Add 1st stage tests to App component
alexanderela Oct 5, 2018
2910f6f
Render DistrictCards to page
alexanderela Oct 5, 2018
4f7213d
Add different color fonts for data greater than and less than 0.5
alexanderela Oct 5, 2018
db1faa4
Merge pull request #5 from alexanderela/Iteration-2
alexanderela Oct 5, 2018
8252a21
Add passing test for App setting dataset to state
alexanderela Oct 5, 2018
66cee4c
Remove unnecessary paragraph container in DistrictCard
alexanderela Oct 5, 2018
0bda244
Add failing tests
alexanderela Oct 5, 2018
e7a937a
Merge pull request #6 from alexanderela/Iteration-2-Tests
alexanderela Oct 5, 2018
413af91
Add Search component skeleton
alexanderela Oct 6, 2018
fc3a5d2
Add passing tests for DistrictCard
alexanderela Oct 6, 2018
581f925
Add passing tests up to Iteration 2
alexanderela Oct 6, 2018
2876410
Add semi functional search component
alexanderela Oct 6, 2018
5ace79f
Fix broken tests after changing App componentDidMount
alexanderela Oct 6, 2018
c5feb3f
Add working search component
alexanderela Oct 6, 2018
aefda1c
Merge pull request #7 from alexanderela/Search-2
alexanderela Oct 6, 2018
848181d
Add CSS styling with green header
alexanderela Oct 6, 2018
8975e05
Merge pull request #8 from alexanderela/CSS
alexanderela Oct 6, 2018
939e305
Add cap icon to header
alexanderela Oct 6, 2018
7acb53d
Merge pull request #9 from alexanderela/Search-3
alexanderela Oct 6, 2018
a8e2cbe
Refactor Search handleChange
alexanderela Oct 6, 2018
b0eb917
Add properly functioning search component
alexanderela Oct 6, 2018
72bc5eb
Merge pull request #10 from alexanderela/Search-3
alexanderela Oct 6, 2018
df78f8b
Add passing test for handleInputChange when input is entered
alexanderela Oct 6, 2018
68a3276
Add passing tests for Search Component
alexanderela Oct 6, 2018
f61f2d6
Merge pull request #11 from alexanderela/Search-tests
alexanderela Oct 6, 2018
7d351e1
Add passing first test
alexanderela Oct 7, 2018
aff7520
Add passing tests for iteration 4
alexanderela Oct 7, 2018
fa1c711
Merge pull request #12 from alexanderela/Iteration-4
alexanderela Oct 7, 2018
3ed9050
Add passing app test for state
alexanderela Oct 7, 2018
71f2fdf
Merge pull request #13 from alexanderela/Iteration-5
alexanderela Oct 7, 2018
1237b77
Fix App tests
alexanderela Oct 7, 2018
30c9299
Merge pull request #14 from alexanderela/Iteration-5-2
alexanderela Oct 7, 2018
cdfe558
Add 2 click functionality to CompareCard component. 2 cards appear at…
alexanderela Oct 7, 2018
e418620
Add CSS box shadow for search and DistrictCard. Add blue outline for …
alexanderela Oct 7, 2018
ba2d8fd
Merge pull request #15 from alexanderela/Iteration-5
alexanderela Oct 7, 2018
d1cad1c
Fix linting errors in App and Helper
alexanderela Oct 7, 2018
f0ed6ff
Merge pull request #16 from alexanderela/eslint
alexanderela Oct 7, 2018
7bddb1d
Refactor compareDistrict method in App
alexanderela Oct 7, 2018
d2c8b52
Merge pull request #17 from alexanderela/Iteration-5
alexanderela Oct 7, 2018
6697837
Fix compareDistrict App state error that was causing the districtsBei…
alexanderela Oct 7, 2018
07ff348
Add functionality for removing Cards from CompareCard upon second click
alexanderela Oct 7, 2018
385ac29
Merge pull request #18 from alexanderela/Iteration-5
alexanderela Oct 7, 2018
deb702b
Add functionality for comparison card
alexanderela Oct 7, 2018
8d002cb
Add CSS styling for compare card
alexanderela Oct 8, 2018
ee5b3f3
Merge pull request #19 from alexanderela/Iteration-5-Compare-Card
alexanderela Oct 8, 2018
a27181d
Add preliminary tests for highlights
alexanderela Oct 8, 2018
b950736
Merge pull request #20 from alexanderela/Iteration-5-Highlight
alexanderela Oct 8, 2018
fd28f40
Update README.md
alexanderela Oct 8, 2018
03daa0d
Add images for readme
alexanderela Oct 8, 2018
fb0ae65
Merge pull request #21 from alexanderela/Iteration-5-Highlight
alexanderela Oct 8, 2018
e0f4631
Update README.md
alexanderela Oct 8, 2018
aa28ba3
Update README.md
alexanderela Oct 8, 2018
cd876db
Update README.md
alexanderela Oct 8, 2018
cffafcb
Fix linting errors in App
alexanderela Oct 8, 2018
b2fcda9
Merge pull request #22 from alexanderela/Iteration-5-Tests
alexanderela Oct 8, 2018
41469ff
Add passing tests for Iteration 5
alexanderela Oct 8, 2018
0f993b9
Merge pull request #23 from alexanderela/Iteration-5-Tests
alexanderela Oct 8, 2018
5221cda
Alphabetize CSS
alexanderela Oct 8, 2018
213b058
Add linting
alexanderela Oct 8, 2018
9e8d955
Merge pull request #24 from alexanderela/Iteration-5-Highlight
alexanderela Oct 8, 2018
069b481
Add Arvo font for compared card compared result
alexanderela Oct 8, 2018
21abfbc
Merge pull request #25 from alexanderela/Iteration-5-Highlight
alexanderela Oct 8, 2018
6f833e3
Add passing CompareCard snapshot test
alexanderela Oct 8, 2018
3a1be60
Merge branch 'master' into Iteration-5-Highlight
alexanderela Oct 8, 2018
8e066c6
Merge pull request #26 from alexanderela/Iteration-5-Highlight
alexanderela Oct 8, 2018
476128c
Add GH pages
alexanderela Nov 17, 2018
bd27d97
Add correct homepage to package.json
alexanderela Nov 17, 2018
fe0ea7f
Merge branch 'master' into Class-eval
alexanderela Nov 17, 2018
fe4f357
Merge pull request #27 from alexanderela/Class-eval
alexanderela Nov 17, 2018
c875e98
Fix filepath on GH pages
alexanderela Nov 17, 2018
117a29a
Merge master
alexanderela Nov 17, 2018
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
42 changes: 42 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"parser": "babel-eslint",
"extends": [
"eslint:recommended",
"plugin:react/recommended"
],
"plugins": [
"react"
],
"env": {
"browser": true,
"mocha": true,
"node": true,
"es6": true
},
// Having a problem with one of these rules? Learn more about it here: https://eslint.org/docs/rules/
"rules": {
"eqeqeq": ["error", "always"],
"getter-return": ["error", { "allowImplicit": true }],
"no-template-curly-in-string": "error",
"semi": ["error", "always"],
"array-bracket-spacing": ["error", "never"],
"block-spacing": ["error", "always"],
"brace-style": ["error", "1tbs", { "allowSingleLine": true }],
"camelcase": "warn",
"comma-dangle": ["error", "never"],
"comma-spacing": ["error", { "before": false, "after": true }],
"comma-style": ["error", "last"],
"computed-property-spacing": ["error", "never"],
"func-call-spacing": ["error", "never"],
"indent": ["warn", tab, {"SwitchCase": 1}],
"keyword-spacing": ["error", { "before": true, "after": true }],
"max-len": ["warn", 80],
"no-duplicate-imports": "error",
"id-length": "error",
"id-blacklist": ["error", "err", "e", "cb", "callback", "payload", "obj", "arr"],
"max-depth": ["warn", 4]
},
"globals": {
"expect": true
}
}
21 changes: 13 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
# HeadCount 2.0

HeadCount 2.0 is a project designed to challenge your skills at manipulating data and creating small, reusable React components.

You will start the project by importing files containing various educational stats from districts within Colorado by year, per district.
### Project Description

In the spirit of TDD we have created some unit tests for you to start off with. These tests will help you break out calculation logic into a `DistrictRepository` class. After you finish `iteration 1` you'll move on to creating the rest of the react application on your own, with the expectation that you will continue to test the application on your own.
### Team
Team members for this project included Alexander Ela.

This application was built using the `create-react-app` boilerplate. This boilerplate provides a lot of build in content and dependencies for free. Take a few minutes to read through [the documentation](https://github.com/facebookincubator/create-react-app), and remember to refer back to these docs if you run into unexpected issues.
### Functionality
* To use HeadCount, users need only to enter a search query to filter through all 181 school districts contained in the site's dataset.
* At any point, users can select up to two cards. Once two cards have been selected, they will be displayed at the top of the page with a comparison summary of each school district's averages, and the compared value between them.

## Set Up
### Images
#### HeadCount homepage with query 'county' entered in search bar
![headcount_desktop](https://github.com/alexanderela/headcount2.0/blob/master/public/images/desktop_main.png)

Fork this project

Run `npm install` from the root directory
#### HeadCount homepage with two cards selected for comparison
![headcount_desktop_cards_selected](https://github.com/alexanderela/headcount2.0/blob/master/public/images/desktop_main_highlighted.png)

This project was bootstrapped with [Create React App](https://github.com/facebookincubator/create-react-app).
Run `npm start` and visit localhost:3000 in your browser

You can begin running your tests with `npm test`
Expand Down Expand Up @@ -208,4 +213,4 @@ The output from ESLint shows…
- 4 - Unicorn
- 3 - Hot Fire
- 2 - Sparkles
- 1 - Magic
- 1 - Magic
Loading