Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
c9c667d
Add initial create react app
ViriCruz May 18, 2020
f74eb0a
Add prop-types, react-redux and redux packages
ViriCruz May 19, 2020
ff1df0c
Delete yarn.lock
ViriCruz May 19, 2020
546d3dd
Add redux actions and remove unnecessary files
ViriCruz May 19, 2020
4c3ed2b
Add categories reducer
ViriCruz May 19, 2020
e125f26
Add eslint config
ViriCruz May 19, 2020
f701380
Add babel config file
ViriCruz May 19, 2020
3bdad6c
Add barebones components
ViriCruz May 19, 2020
067aff6
Add reducers for user,reading,category,measurement entity
ViriCruz May 19, 2020
1f0c238
Remove unnecessary files and add enzyme to setupTests.js
ViriCruz May 19, 2020
645e96e
Add reset css
ViriCruz May 20, 2020
278e5ed
Add barebone code
ViriCruz May 20, 2020
ebd58f9
Add bootstrap classes to registration form component
ViriCruz May 20, 2020
1df3638
Refactor data object that is dispatched when post successful
ViriCruz May 20, 2020
a808670
Add mapDispatchToProps and mapStateToProps to store data in redux store
ViriCruz May 20, 2020
1b0da47
Change data array to data object in initialState object
ViriCruz May 20, 2020
aa73e60
Add loginForm component and redirect users after registration
ViriCruz May 20, 2020
0f5c60b
Add categories list component
ViriCruz May 21, 2020
8805af0
Add fetch categories module
ViriCruz May 21, 2020
5281706
Add onClick listener
ViriCruz May 21, 2020
1fd9bfb
Add loginForm route
ViriCruz May 21, 2020
a41e117
Add basic navbar
ViriCruz May 21, 2020
aa05a7f
Add form to trackReading component
ViriCruz May 21, 2020
af4d77a
Add stopWatch barebones component
ViriCruz May 21, 2020
6deb0d0
Add action dispatcher to set category
ViriCruz May 22, 2020
afbb695
Add readingContainer component
ViriCruz May 22, 2020
b519780
Rename categoryReducer to categoriesReducer
ViriCruz May 22, 2020
4c9ea2e
Add categoryReducer
ViriCruz May 22, 2020
7836d73
Add default route to redirect to signin
ViriCruz May 25, 2020
151ef26
Add register link at bottom
ViriCruz May 25, 2020
62dfc8f
Add fetch post method to signin user
ViriCruz May 26, 2020
671b678
Add mapStateToProps and dispatchToProps to connect with redux store
ViriCruz May 26, 2020
46c7d3a
Refactor error case to send correctly error message to redux store
ViriCruz May 26, 2020
08db0fb
Change redirect to /categories
ViriCruz May 26, 2020
f84ab4c
Add signout action
ViriCruz May 26, 2020
835fbcd
Add signout function
ViriCruz May 26, 2020
49ad9e6
Add spinner component while fetching
ViriCruz May 26, 2020
63e7fcc
Add not_logged_in case
ViriCruz May 26, 2020
1083a57
Add links for signin and signout status
ViriCruz May 26, 2020
560c41f
Add dispatch and state to props
ViriCruz May 26, 2020
7ddb434
Refactor NOT_LOGGED_IN case
ViriCruz May 26, 2020
d6af1cb
Change import for navbar component
ViriCruz May 26, 2020
151cfcc
Add redirect to login if user is not logged in or when logout
ViriCruz May 27, 2020
b57da8d
Add handleSave function to readings component
ViriCruz May 27, 2020
bf22d1d
Add stopwatch component
ViriCruz May 27, 2020
8cefb95
Merge branch 'react-app' of github.com:ViriCruz/readouts_tracker into…
ViriCruz May 27, 2020
bb6d13a
Add create reading function to call api
ViriCruz May 28, 2020
32805b2
Add helper functions to extract time in numbers. Also add setDuration…
ViriCruz May 28, 2020
497b079
Add props to handle save, set duration, set description and props to …
ViriCruz May 28, 2020
b6d8086
Add handle save, set duration and set description to pass as props to…
ViriCruz May 28, 2020
59f1f57
Refactor fetch function to create a new reading
ViriCruz May 29, 2020
1217b6b
Remove disabled prop
ViriCruz May 29, 2020
61bb643
Refactor condition to evaluate if categories prop exists on data
ViriCruz May 29, 2020
96e41e9
Add map dispatch to props
ViriCruz May 29, 2020
254590b
Add callback fn to setState when saving duration to avoid delay
ViriCruz May 29, 2020
348c54a
Add recharts
ViriCruz May 29, 2020
ba0d1fc
Add measure component
ViriCruz May 29, 2020
ef4e95a
Add measurements barebones component
ViriCruz May 29, 2020
198c75b
Add actions for fetching total time
ViriCruz May 31, 2020
4d04af6
Add function to fetch total time
ViriCruz May 31, 2020
817d79b
Remove onChange from div
ViriCruz May 31, 2020
d235a71
Remove className vh-100
ViriCruz May 31, 2020
5cbe945
Add totalTime to state
ViriCruz May 31, 2020
d9336e0
Add totalTime to store
ViriCruz May 31, 2020
a72ad67
Add totalTime to combineReducers
ViriCruz May 31, 2020
4858d2b
Add reducer for total time
ViriCruz May 31, 2020
16c015b
Add function to create measure
ViriCruz Jun 1, 2020
dd99994
Add fetchMeasurements function to retrieve measurements data
ViriCruz Jun 1, 2020
fb8522b
Add component did update to reading container
ViriCruz Jun 1, 2020
1917109
Add pie chart
ViriCruz Jun 2, 2020
ec786f8
Add moment-react
ViriCruz Jun 3, 2020
bfe9da2
Add data fetched from api to fit on pie chart
ViriCruz Jun 3, 2020
63402f5
Add tests for categories container component
ViriCruz Jun 3, 2020
93e1148
Add tests for registrationForm component
ViriCruz Jun 3, 2020
16f7044
Add tests for reading container component
ViriCruz Jun 3, 2020
fbdafe5
Add tests for navbar component
ViriCruz Jun 3, 2020
9ce696f
Add tests for measurements component
ViriCruz Jun 3, 2020
4e8ab31
Add tests for login form component
ViriCruz Jun 4, 2020
f21ea40
Add custom style to navbar
ViriCruz Jun 4, 2020
fe1054e
Restore file
ViriCruz Jun 4, 2020
04af033
Add custom css to all components
ViriCruz Jun 4, 2020
516f0f6
Add custom css and fix linting errors
ViriCruz Jun 4, 2020
0af0fef
Add favicon and refactor html structure for signin links
ViriCruz Jun 4, 2020
ce0b985
Add eslintrc.json to root
ViriCruz Jun 4, 2020
8cf964f
Add conditional to stop editing reading before saving
ViriCruz Jun 10, 2020
8e1c6af
Refactor propTypes for measurements, readingContainer and registratio…
ViriCruz Jun 10, 2020
117e7f6
Refactor stop button test
ViriCruz Jun 10, 2020
a23122d
Refactor start/stop button to be just one button
ViriCruz Jun 10, 2020
4dd9fa2
Delete .eslintrc.json
ViriCruz Jun 10, 2020
d28b1c5
Update eslint
ViriCruz Jun 10, 2020
f2535e0
Create .eslintrc.json
ViriCruz Jun 10, 2020
2a88162
Update .eslintrc.json
ViriCruz Jun 10, 2020
a6470c6
Update .eslintrc.json
ViriCruz Jun 10, 2020
714a805
Update .eslintrc.json
ViriCruz Jun 10, 2020
b9d1dc2
Update .eslintrc.json
ViriCruz Jun 10, 2020
cb49da9
Update README file
ViriCruz Jun 10, 2020
424e7bb
Merge branch 'react-app' of github.com:ViriCruz/readouts_tracker into…
ViriCruz Jun 10, 2020
3cf9e9b
Create LICENSE
ViriCruz Jun 10, 2020
bc820df
Merge pull request #7 from ViriCruz/add-license-1
ViriCruz Jun 10, 2020
7752abe
Add MIT License
ViriCruz Jun 10, 2020
8600ae4
Merge branch 'react-app' of github.com:ViriCruz/readouts_tracker into…
ViriCruz Jun 10, 2020
f93f878
Remove MIT License from root folder
ViriCruz Jun 10, 2020
2f00992
Add all files to root to test stickler config
ViriCruz Jun 10, 2020
1267afc
update stickler
ViriCruz Jun 10, 2020
20b3d68
Add peer dependencies
ViriCruz Jun 10, 2020
c6e8e58
Add latest eslint config airbnb
ViriCruz Jun 10, 2020
82e5431
Update stickler
ViriCruz Jun 10, 2020
9f25df9
update eslint
ViriCruz Jun 10, 2020
342b8aa
update eslint
ViriCruz Jun 10, 2020
6ab2668
Update .eslintrc.json
ViriCruz Jun 10, 2020
c419513
adas
ViriCruz Jun 10, 2020
5fa024f
Merge branch 'testing-stickler' of github.com:ViriCruz/readouts_track…
ViriCruz Jun 10, 2020
2d0b86a
Update .eslintrc.json
ViriCruz Jun 10, 2020
739a3f4
Update .eslintrc.json
ViriCruz Jun 10, 2020
2e5bf9a
Update .eslintrc.json
ViriCruz Jun 10, 2020
054c2fa
Update .eslintrc.json
ViriCruz Jun 10, 2020
3fc5e15
Update measurements.js
ViriCruz Jun 10, 2020
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
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["@babel/preset-env"],
}
28 changes: 28 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"env": {
"browser": true,
"es6": true,
"jest": true
},
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
},
"experimentalObjectRestSpread": true
},
"extends": ["airbnb"],
"plugins": ["react"],
"rules": {
"react/jsx-filename-extension": ["warn", { "extensions": [".js", ".jsx"] }],
"import/no-unresolved": "off",
"no-shadow": "off",
"arrow-parens": ["error", "as-needed"],
"jsx-a11y/href-no-hash": "off",
"jsx-a11y/img-has-alt": "off",
"no-mixed-operators":"off",
"import/extensions":"off"
}
}
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
11 changes: 11 additions & 0 deletions .stickler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

# add the linters you want stickler to use for this project
linters:
eslint:
# indicate where is the config file for stylelint
config: './.eslintrc.json'

# PLEASE DO NOT enable auto fixing options
# if you need extra support from you linter - do it in your local env as described in README for this config

# find full documentation here: https://stickler-ci.com/docs
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020 Gabriela Cruz

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
95 changes: 92 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,94 @@
## Readings tracker app

Initial setup for readouts tracker.
[![Contributors][contributors-shield]][contributors-url]
[![Forks][forks-shield]][forks-url]
[![Stargazers][stars-shield]][stars-url]
[![Issues][issues-shield]][issues-url]
[![MIT License][license-shield]][license-url]

More information coming soon.
# Tracking mobile web app with react
This project is a tracking app to measure how much do you read during a day. Taking in count only: books, articles, audiobooks, mangas, and comics.
This is a manual tracking to acquire the habit of reading.


## Demo down below
Visit [Readouts tracker](https://readouts-tracker.herokuapp.com/ ) to try the live version.

## Built With ✨
- React 16.13
- react-router 5.1
- react-router-dom 5.1
- create-react-app
- JavaScript ES6


## Prerequisites
* Node.js installed
You will need Node.js up to v8

* System dependencies
Windows/ Mac


## How to Install locally
Clone project and run
`npm install`
`npm start`

This will launch project on **localhost:3000**


### How to use

#### Login page
If you already registered, you only need to type your email and password to sign in.

#### SignUp page
To signup, you need to fill a form with your first name, last name, email, and password. After this, you will be redirected to the main page.

#### Categories page
You will see a list of categories here, you only need to click or tap on one to select it. You will be redirected to the track reading section.

#### Track Reading page
Here you can start your manual tracking. You write a description of what you are reading, click or tap start to measure. Don't forget to save first before you edit or stop the time.

#### Measurements page
Here you can see what do you read more during a day. Showing a pie chart to represent the percentage of the categories that you read.


## How to contribute and partipate
Fork this repo and submit a PR for review and potential merge to main branch. Feel free to leave feedback :smile:

## How to run tests
If you want to use npm, run:
`npm test`

If you want to use yarn, run:
`yarn test`

## Authors

👨‍💻 **Gabriela Cruz**

- Github [@viricruz](https://github.com/ViriCruz/)

- email me at [email protected]

- Linkedin [@viricruz](https://www.linkedin.com/in/viricruz/)

## License

This project is [MIT](LICENSE) licensed.

<!-- MARKDOWN LINKS & IMAGES -->
<!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->

[contributors-shield]: https://img.shields.io/github/contributors/viricruz/readouts_tracker.svg?style=flat-square
[contributors-url]: https://github.com/viricruz/readouts_tracker/graphs/contributors
[forks-shield]: https://img.shields.io/github/forks/viricruz/readouts_tracker
[forks-url]: https://github.com/viricruz/readouts_tracker/network/members
[stars-shield]: https://img.shields.io/github/stars/viricruz/readouts_tracker
[stars-url]: https://github.com/viricruz/readouts_tracker/stargazers
[issues-shield]: https://img.shields.io/github/issues/viricruz/readouts_tracker
[issues-url]: https://github.com/viricruz/readouts_tracker/issues
[license-shield]: https://img.shields.io/github/license/viricruz/readouts_tracker
[license-url]: https://github.com/viricruz/readouts_tracker/blob/master/LICENSE.txt
Loading