Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
be50b8f
Django base setup
adarshtri Oct 13, 2020
a6f9b05
Added new thread
prithviraj-chaudhuri Oct 15, 2020
781e67b
Updated second thread
prithviraj-chaudhuri Oct 15, 2020
ed92a78
Added test file
prithviraj-chaudhuri Oct 15, 2020
62caff5
User management start.
adarshtri Oct 16, 2020
b6110e3
User login, signup
adarshtri Oct 16, 2020
2e5b79f
Merge pull request #5 from adarshtri/server
adarshtri Oct 16, 2020
17bb413
File Log API
prithvipatl Oct 16, 2020
4fb2d10
Merge branch 'server' of github.com:adarshtri/CodeTime into user-api
prithvipatl Oct 16, 2020
50e2b19
Working File Log API
prithvipatl Oct 16, 2020
776e8b6
Reverting python path
prithvipatl Oct 16, 2020
ac9f540
Merge branch 'server' of https://github.com/adarshtri/CodeTime into s…
adarshtri Oct 17, 2020
1394380
Timelog list support for creation.
adarshtri Oct 17, 2020
127413d
Merge pull request #6 from adarshtri/server
adarshtri Oct 17, 2020
3684de4
UI Login, Signup
adarshtri Oct 18, 2020
db2b67e
Try Travis Fix and update Docs
prithvipatl Oct 18, 2020
e525ecb
Merge branch 'master' into auto-data-export-pipeline
prithviraj-chaudhuri Oct 18, 2020
9fa6712
API calling in progress
prithviraj-chaudhuri Oct 19, 2020
99ebb9c
Add Video and modify readme (#13)
prithvipatl Oct 19, 2020
2dfc5c7
Add video
prithvipatl Oct 19, 2020
94172c9
Merge branch 'master' into fix-travis
prithvipatl Oct 19, 2020
4f171e8
Updated Periodic processor
prithviraj-chaudhuri Oct 24, 2020
a4ac94b
Merge branch 'master' into auto-data-export-pipeline
prithviraj-chaudhuri Oct 24, 2020
4b3e706
Removed file writting
prithviraj-chaudhuri Oct 24, 2020
780b88e
File extension
prithviraj-chaudhuri Oct 24, 2020
1b9650c
Add Comments and Evaluation doc
prithvipatl Oct 25, 2020
9e7dd42
Merge pull request #10 from adarshtri/fix-travis
Ayushi61 Oct 25, 2020
ac3f198
requirements
Ayushi61 Oct 25, 2020
74812f1
testing travis
Rashi0911 Oct 25, 2020
5d1d777
update settings.py and add env file
Ayushi61 Oct 25, 2020
eff178e
revert main requirements
Ayushi61 Oct 25, 2020
1da5265
test urls
Ayushi61 Oct 25, 2020
477fbbe
Updated codetime configs
prithviraj-chaudhuri Oct 25, 2020
c8aa36b
Merge branch 'master' into auto-data-export-pipeline
prithviraj-chaudhuri Oct 25, 2020
4801df4
adding correction in test_logsaver
Rashi0911 Oct 25, 2020
8f4dae4
correcting test
Rashi0911 Oct 25, 2020
6436ad7
Working tests in Travis (#17)
prithvipatl Oct 25, 2020
04eb6f0
test- sublime
Ayushi61 Oct 25, 2020
d438ba2
mreging conflicts
Ayushi61 Oct 25, 2020
987d2bf
post_travis_fix
Ayushi61 Oct 25, 2020
768697e
flake 8 errors
Ayushi61 Oct 25, 2020
b61c2c6
post_travis_fix
Ayushi61 Oct 25, 2020
5b056c2
Merge pull request #22 from adarshtri/post_travis_fix
Ayushi61 Oct 25, 2020
d7e1671
Adding comments periodiclogsaver
Rashi0911 Oct 25, 2020
1ac3956
Merge branch 'master' into auto-data-export-pipeline
adarshtri Oct 25, 2020
98a22bb
Merge branch 'master' into auto-data-export-pipeline
adarshtri Oct 25, 2020
a326415
Merge pull request #16 from adarshtri/auto-data-export-pipeline
adarshtri Oct 25, 2020
605e1f5
test_view
Ayushi61 Oct 26, 2020
23ab9f0
check
Ayushi61 Oct 26, 2020
fdba4c4
Merge pull request #23 from adarshtri/post_travis_fix
Ayushi61 Oct 26, 2020
489865f
Linter check (#24)
Ayushi61 Oct 26, 2020
30f193e
Setup Travis For Django App (#25)
prithvipatl Oct 26, 2020
2532c42
Dashboard stats
adarshtri Oct 26, 2020
be8c485
Merge pull request #9 from adarshtri/ui
adarshtri Oct 26, 2020
39c0d5f
Summary apis
adarshtri Oct 26, 2020
85cd842
Summary APIs
adarshtri Oct 26, 2020
be34ba2
Recovering lost changes.
adarshtri Oct 26, 2020
cdaaef1
Fix Linter Check (#26)
prithvipatl Oct 26, 2020
b498934
Update PROJ2-selfAssessment.md
prithvipatl Oct 26, 2020
790e23d
Update CONTRIBUTING.md
Ayushi61 Oct 26, 2020
aa0f17b
Update CONTRIBUTING.md
prithvipatl Oct 26, 2020
594f949
Update CONTRIBUTING.md
Rashi0911 Oct 26, 2020
6a548af
Server changes for overall report
adarshtri Oct 26, 2020
2f3dd69
Overall stats header, line chart.
adarshtri Oct 26, 2020
e1eb4d0
Pull
adarshtri Oct 26, 2020
ef10aa6
test timelog
Ayushi61 Oct 26, 2020
9d5845d
Added api call for recent stats summary
Rashi0911 Oct 26, 2020
42ceb5b
Recent stats summary api changes.
adarshtri Oct 26, 2020
8d55722
travis updated
Ayushi61 Oct 26, 2020
ad8b140
Additions for recent changes table.
adarshtri Oct 26, 2020
cfd5653
Merge branch 'master' of https://github.com/adarshtri/CodeTime
adarshtri Oct 26, 2020
4f1da97
flake8
Ayushi61 Oct 26, 2020
1b39361
Changed color for one of the line graphs.
adarshtri Oct 26, 2020
a7eb8b5
Fix View Return codes
prithvipatl Oct 26, 2020
739af55
File Log Test
prithvipatl Oct 26, 2020
f600527
timelog test
Ayushi61 Oct 26, 2020
54ffa3b
travis fix
Ayushi61 Oct 26, 2020
c1d1bd3
Summary URL test
prithvipatl Oct 26, 2020
ee8620e
Merge branch 'master' into post_travis_fix
prithvipatl Oct 26, 2020
a2fb399
Updated readme
prithviraj-chaudhuri Oct 27, 2020
8734d27
Added placeholder for test plan
prithviraj-chaudhuri Oct 27, 2020
a1d91fe
Web dashboard tbd
prithviraj-chaudhuri Oct 27, 2020
c977e3e
Add Get Summary Tests
prithvipatl Oct 27, 2020
242056e
Add Get Summary Tests
prithvipatl Oct 27, 2020
fc4b446
Add Summary Tests
prithvipatl Oct 27, 2020
e299255
Modify requirements
prithvipatl Oct 27, 2020
4ffbc72
Create test-plan.md
Rashi0911 Oct 27, 2020
3368937
Added working dashboard video
adarshtri Oct 27, 2020
26ca084
Update README.md
adarshtri Oct 27, 2020
f3fdcc7
Update README.md
adarshtri Oct 27, 2020
24dfead
Update test-plan.md
adarshtri Oct 27, 2020
e5bbbb8
Update test-plan.md
adarshtri Oct 27, 2020
813bfc2
Update test-plan.md
adarshtri Oct 27, 2020
dc19c11
documentation
Ayushi61 Oct 27, 2020
0a69d67
gitignore build
Ayushi61 Oct 27, 2020
08e1148
Update README.md
adarshtri Oct 27, 2020
4f3b861
Update README.md
adarshtri Oct 27, 2020
35c8a71
Update README.md
adarshtri Oct 27, 2020
b901722
Create Code_coverage_Report.MD
Ayushi61 Oct 27, 2020
edf3dfe
auto generated docs (#35)
Ayushi61 Oct 27, 2020
db3beaa
Update README.md
Rashi0911 Oct 27, 2020
10a1e51
Update Code_coverage_Report.MD
Ayushi61 Oct 27, 2020
8eb31d7
What Documentation
prithvipatl Oct 27, 2020
bfd7504
Update Project_Requirements.md
Rashi0911 Oct 27, 2020
5e7ccc2
Add contents
prithvipatl Oct 27, 2020
f9153aa
Merge branch 'master' of github.com:adarshtri/CodeTime
prithvipatl Oct 27, 2020
19598fc
Merge branch 'master' into post_travis_fix
prithvipatl Oct 27, 2020
0a1ef3d
How and What Doc
prithvipatl Oct 27, 2020
de32ee8
Merge branch 'post_travis_fix' of github.com:adarshtri/CodeTime into …
prithvipatl Oct 27, 2020
c92c312
Fix Lint
prithvipatl Oct 27, 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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ __pycache__/

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
Expand Down Expand Up @@ -439,3 +438,6 @@ x509.genkey

# Clang's compilation database file
/compile_commands.json
code/codetime_server/docker-compose.yml
code/codetime_server/Dockerfile
code/codetime_server/run.sh
37 changes: 23 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,30 @@
language: python
python:
- "3.6" # current default Python on Travis CI
- "3.7"
matrix:
include:
- os: linux
language: python

services:
- xvfb
- mysql

env:
- MYSQL_CODE_TIME_DB_NAME=codetime_db MYSQL_CODE_TIME_USER=travis MYSQL_CODE_TIME_PASSWORD='' MYSQL_CODE_TIME_HOST='127.0.0.1' MYSQL_CODE_TIME_CONNECTION_PORT=3306 CODE_TIME_SECRET_KEY=Sample

before_install:
- curl -OL https://raw.githubusercontent.com/SublimeText/UnitTesting/master/sbin/travis.sh
# command to install dependencies

install:
- pip install -r requirements.txt
- python setup.py install
- pip install flake8==3.5
- sh sbin/travis.sh bootstrap
- sh sbin/travis.sh install_color_scheme_unit
- if ["$PCINSTALL" == true]; then sh sbin/travis.sh install_package_control; fi
# command to run tests
- pip install coverage
- sh travis.sh bootstrap
- pip install -r code/codetime_server/requirements.txt

before_script:
- mysql -e 'create database codetime_db;'
script:
- flake8 --statistics
- sh sbin/travis.sh run_tests --coverage
- python -m pytes
- flake8 --max-line-length=200
- sh travis.sh run_tests
- cd code/codetime_server/
- coverage run --source='.' --omit=*sgi*,*apps* manage.py test codetime
- coverage report

32 changes: 19 additions & 13 deletions CITATION.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
# Cite as

Nirav Shah,Omkar Kulkarni,Chintan Gandhi, Suraj Patel, Jay Modi
SE_Fall20_Project-1:
Group 23,
August, 2020
Adarsh Trivedi, oaaky, Jay Modi, Chintan Gandhi, NIRAV SHAH, Suraj Patel, Ayushi Rajendra Kumar, Prithvi Patel, Prithviraj Chaudhuri and Rashi0911. (2020, October 27). adarshtri/CodeTime: 1.3-pre-release (Version 1.3). Zenodo. http://doi.org/10.5281/zenodo.4136964

```bibtex
@article{oaaky:SE_Fall20_Project-1,
title = {sj23patel: Homework 1},
DOI = {10.5281/zenodo.4041230},
author = {Group 23},
publisher = {Zenodo},
year = {2020},
month = {September}
version = {v1.1},
url = {https://doi.org/10.5281/zenodo.4041230}
@software{adarsh_trivedi_2020_4136964,
author = {Adarsh Trivedi and
oaaky and
Jay Modi and
Chintan Gandhi and
NIRAV SHAH and
Suraj Patel and
Ayushi Rajendra Kumar and
Prithvi Patel and
Prithviraj Chaudhuri and
Rashi0911},
title = {adarshtri/CodeTime: 1.3-pre-release},
month = oct,
year = 2020,
publisher = {Zenodo},
version = {1.3},
doi = {10.5281/zenodo.4136964},
url = {https://doi.org/10.5281/zenodo.4136964}
}
```
109 changes: 61 additions & 48 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,103 +1,116 @@
# Contributing to SE-PROJECT-1
# Contributing to CodeTime

:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:

The following is a set of guidelines for contributing to CSC 510 Project 1 and its packages, which are hosted on the [GitHub project page](https://github.com/oaaky/SE_Fall20_Project-1.git). These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
Thank you so much for taking an interest in contributing! We are lookng forward to contributions that will enable lesser human intervention!! There are many ways to contribute to this porject!

#### Table Of Contents

[Code of Conduct](#code-of-conduct)

[What should I know before I get started?](#what-should-i-know-before-i-get-started)
[Code of Conduct](CODE_OF_CONDUCT.md)

[How Can I Contribute?](#how-can-i-contribute)
* [Reporting Bugs](#reporting-bugs)
* [Suggesting Enhancements](#suggesting-enhancements)
* [Your First Code Contribution](#your-first-code-contribution)
* [Pull Requests](#pull-requests)

[Styleguides](#styleguides)
* [Coding Style](#coding-style)
* [Git Commit Messages](#git-commit-messages)
[Styleguide](#styleguide)

[Attribution](#attribution)

## Code of Conduct
## How Can I Contribute?

This project and everyone participating in it is governed by the [Code of Conduct](CODE-OF-CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [cagandhi97@gmail.com](mailto:cagandhi97@gmail.com).
Each contribution counts for our project. So make sure to classify which is yours.

## What should I know before I get started?
### Obvious Fixes

This is a sample project that sets up some base project files for future work. Please look through the [README](README.md) file.
The Obvious Fixes comprise of:

* For feature requests, please fork the repository, create a new branch with your feature changes and make a pull request. The maintainers will review the code change and merge it into the master branch once checks have successfully passed.
* Provide documentation for the modifications in the code. It will be easier and quicker for the maintainers to review and approve your code if you have added meaningful comments to your code change.
* Spelling / grammar fixes and Typo correction
* Formatting changes
* Comment and code clean up
* Bug fixes that change default return values or error codes stored in constants
* Adding logging messages or debugging output
* Updating documentation

## How Can I Contribute?
One can go ahead and follow the [3-step process](#required-3-steps-for-contributing)

### Reporting Bugs

This section guides you through submitting a bug report. Following these guidelines helps maintainers and the community understand your report :pencil:, reproduce the behavior :computer: :computer:, and find related reports :mag_right:.
This section guides you through submitting a bug report for this repository. Following these guidelines helps maintainers and the community understand your report :pencil:, reproduce the behavior :computer: :computer:, and find related reports :mag_right:.

Before creating bug reports, please check [this list](#before-submitting-a-bug-report) as you might find out that you don't need to create one. When you are creating a bug report, please include detailed information about the environment, package version numbers, OS and other information maintainers may find useful in reproducing and resolving issues quickly.
Before creating bug reports, please perform a cursory search to see if the problem has already been reported. If it has **and the issue is still open**, add a comment to the existing issue instead of opening a new one.

> **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.

#### Before Submitting A Bug Report

Check that the bug does not exists because of any issue in your local environment. You might be able to find the cause of the problem and fix things yourself. If the problem has been reported **and the issue is still open**, add a comment to the existing issue instead of opening a new one.

#### How Do I Submit A (Good) Bug Report?

Explain the problem and include details to help maintainers reproduce the problem:
Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). After you've determined [which repository](#atom-and-packages) your bug is related to, create an issue on that repository and provide the following information by filling in [the template](https://github.com/atom/.github/blob/master/.github/ISSUE_TEMPLATE/bug_report.md).

Explain the problem and include additional details to help a developer reproduce the problem:

* **Use a clear and descriptive title** for the issue to identify the problem.
* **Describe the exact steps which reproduce the problem** in as many details as possible. When listing steps, **don't just say what you did, but explain how you did it**.
* **Describe the exact steps which reproduce the problem** in as many details as possible. Alongwith it, provide the details regarding the name and version of OS, Python version, configuration of the environment, if used any.
* **Provide specific examples to demonstrate the steps**. Include links to files or GitHub projects, or copy/pasteable snippets, which you use in those examples. If you're providing snippets in the issue, use [Markdown code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines).
* **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
* **Explain which behavior you expected to see instead and why.**
* **Include screenshots** that show the described steps and clearly demonstrate the problem.
* **If the problem is related to performance or memory**, include details of the errors encountered with your report.
* **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.


### Suggesting Enhancements and new features

This section guides you through submitting an enhancement suggestion for this project:

Include details about your configuration and environment:

* **What's the name and version of the OS you're using**?
* **Which packages do you have installed?** Check that issue is not present because of a local package.
#### How Do I Submit A (Good) Enhancement Suggestion?

Enhancement suggestions are tracked as [GitHub issues](https://guides.github.com/features/issues/). Create an issue on that repository with an enhancement or feature tag and provide the following information:

* **Use a clear and descriptive title** for the issue to identify the suggestion.
* **Provide a step-by-step description of the suggested enhancement** in as many details as possible.
* **Provide specific examples to demonstrate the steps**. Include copy/pasteable snippets which you use in those examples, as [Markdown code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines).
* **Describe the current behavior** and **explain which behavior you expected to see instead** and why.

### Your First Code Contribution

#### Required 3 Steps for contributing:
* Commit changes to a new git branch.
* Create a Pull-Request for the changes. Make sure to follow the [Pull Request Template](#pull-requests).
* Request a Code-Review from the project maintainers.


### Pull Requests

The process described here has several goals:

- Maintain the project's quality
- Maintain code quality by following some basic [PEP 8 standards](https://www.python.org/dev/peps/pep-0008/)
- Fix problems that are important to users
- Engage the community in working toward the best possible Atom
- Enable a sustainable system for project maintainers to review contributions
- Enable a sustainable system for this project's maintainers to review contributions

Please follow these steps to have your contribution considered by the maintainers:

1. Follow the [styleguides](#styleguides)
2. After you submit your pull request, verify that the build is passing and the tests are successful.
2. After you submit your pull request, verify that all [status checks](https://help.github.com/articles/about-status-checks/) are passing <details><summary>What if the status checks are failing?</summary>If a status check is failing, and you believe that the failure is unrelated to your change, please leave a comment on the pull request explaining why you believe the failure is unrelated. A maintainer will re-run the status check for you. If we conclude that the failure was a false positive, then we will open an issue to track that problem with our status check suite.</details>

While the prerequisites above must be satisfied prior to having your pull request reviewed, the reviewer(s) may ask you to complete additional design work, tests, or other changes before your pull request can be ultimately accepted.

## Styleguides
Please include the following while creating a Pull Request:

### Coding Style
* Link to the issue it addresses, if issues exist.
* A short description of what the Pull Request fixes or does (in case of a feature)

* Use tab based indentation
* Make sure variables representing constants such as `DATA_FOLDER` and `FILE_PATH` should be capitalized.
## Styleguides

### Git Commit Messages

* Use the present tense ("Add feature" not "Added feature")
* Use short, crisp and clear commit messages. It's easier to understand for everyone.
* Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
* Limit the first line to 72 characters or less
* Reference issues and pull requests liberally after the first line
* When only changing documentation, include `[ci skip]` in the commit title
* Consider starting the commit message with an applicable emoji:
* :art: `:art:` when improving the format/structure of the code
* :racehorse: `:racehorse:` when improving performance
* :memo: `:memo:` when writing docs
* :penguin: `:penguin:` when fixing something on Linux
* :apple: `:apple:` when fixing something on macOS
* :checkered_flag: `:checkered_flag:` when fixing something on Windows
* :bug: `:bug:` when fixing a bug
* :fire: `:fire:` when removing code or files
* :green_heart: `:green_heart:` when fixing the CI build
* :white_check_mark: `:white_check_mark:` when adding tests

## Attribution

These Contributing guidelines are adapted from the [Atom's][homepage] contributing guidelines.

[homepage]: https://github.com/atom/atom/blob/master/CONTRIBUTING.md
30 changes: 30 additions & 0 deletions Code_coverage_Report.MD
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

<br clear=all>

| Name | Stmts | Miss | Cover |
| -------------------------------------------------|---------|------|------------|
| codetime\__init__.py | 0 | 0 | 100% |
| codetime\admin.py | 0 | 0 | 100% |
| codetime\apps.py | 3 | 3 | 0% |
| codetime\migrations\0001_initial.py | 6 | 0 | 100% |
| codetime\migrations\0002_auto_20201016_1851.py | 4 | 0 | 100% |
| codetime\migrations\0003_auto_20201017_1840.py | 4 | 0 | 100% |
| codetime\migrations\0004_auto_20201026_0331.py | 4 | 0 | 100% |
| codetime\migrations\__init__.py | 0 | 0 | 100% |
| codetime\models.py | 122 | 26 | 79% |
| codetime\request_handlers.py | 96 | 28 | 71% |
| codetime\serializers.py | 20 | 4 | 80% |
| codetime\tests\__init__.py | 0 | 0 | 100% |
| codetime\tests\test_views.py | 96 | 0 | 100% |
| codetime\tests\tests_url.py | 13 | 0 | 100% |
| codetime\urls.py | 3 | 0 | 100% |
| codetime\views.py | 21 | 4 | 81% |
| codetime_server\__init__.py | 0 | 0 | 100% |
| codetime_server\asgi.py | 4 | 4 | 0% |
| codetime_server\settings.py | 26 | 0 | 100% |
| codetime_server\urls.py | 4 | 0 | 100% |
| codetime_server\wsgi.py | 4 | 4 | 0% |
| manage.py | 12 | 2 | 83% |
| tests.py | 0 | 0 | 100% |
| TOTAL | 442 | 75 | 83% |

52 changes: 0 additions & 52 deletions PROJ1-selfAssessment.md

This file was deleted.

Loading