Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 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
6db37bc
rectifiy lint
Ayushi61 Oct 26, 2020
a9bdcaf
rectify
Ayushi61 Oct 26, 2020
c79ae27
rectify
Ayushi61 Oct 26, 2020
1f5c2f6
rectify
Ayushi61 Oct 26, 2020
fdba4c4
Merge pull request #23 from adarshtri/post_travis_fix
Ayushi61 Oct 26, 2020
19ac445
Try Mocking
prithvipatl Oct 26, 2020
4203a3c
Try Mocking
prithvipatl Oct 26, 2020
01bb518
Merge branch 'master' into linter_check
prithvipatl Oct 26, 2020
489865f
Linter check (#24)
Ayushi61 Oct 26, 2020
9ef6e28
Add Django test
prithvipatl Oct 26, 2020
fbd9f5f
Fix Travis env
prithvipatl Oct 26, 2020
c836b6d
Fix Travis env
prithvipatl Oct 26, 2020
53d29db
Fix mysql host
prithvipatl Oct 26, 2020
0180927
Fix mysql host
prithvipatl Oct 26, 2020
3bb32d5
Fix Travis Badge
prithvipatl Oct 26, 2020
30f193e
Setup Travis For Django App (#25)
prithvipatl Oct 26, 2020
3d5dc38
Merge branch 'master' into linter_check
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
37d5e62
Merge branch 'master' into linter_check
prithvipatl Oct 26, 2020
03b5950
Linter Fix and PeriodicLogSaver changes
prithvipatl Oct 26, 2020
4d7939f
Linter Fix and PeriodicLogSaver changes
prithvipatl Oct 26, 2020
9064861
Coverage
prithvipatl Oct 26, 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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -439,3 +439,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
35 changes: 21 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
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
- 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='.' manage.py test codetime
- coverage report
52 changes: 0 additions & 52 deletions PROJ1-selfAssessment.md

This file was deleted.

61 changes: 61 additions & 0 deletions PROJ2-selfAssessment.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Group 18 Self Assessment

## Total score

- write down "4" into every right-hand-side cell
- Look for evidence that any "4" should be something else
- sum the right-hand-column, divide by number of rows

<br clear=all>

| What | Notes | score 0..4<br>(0=no, 2=ok, 4=wow!) |
| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------- |
| Misc | Group members attended tutorial sessions | |
| Distrbuted dev model: | decisions made by unanmyous vote | |
| | group meetings had a round robin speaking order | |
| | group meetings had a moderator that managed the round robin | |
| | group meeting moderator rotated among the group | |
| | code conforms to some packaging standard | |
| | code has can be downloaded from some standard package manager | |
| | workload is spread over the whole team (one team member is often Xtimes more productive than the others... but nevertheless, here is a track record that everyone is contributing a lot) | |
| | Number of commits | |
| | Number of commits: by different people | |
| | Issues reports: there are many | |
| | issues are being closed | |
| | License: exists | |
| | DOI badge: exists | |
| | Docs: doco generated , format not ugly | |
| | Docs: what: point descriptions of each class/function (in isolation) | |
| | Docs: how: for common use cases X,Y,Z mini-tutorials showing worked examples on how to do X,Y,Z | |
| | Docs: why: docs tell a story, motivate the whole thing, deliver a punchline that makes you want to rush out and use the thing | |
| | Docs: 3 minute video, posted to YouTube. That convinces people why they want to work on your code. | |
| | (hard) code conforms to some known patterns | |
| Tools Matter | Use of version control tools | |
| | Extensive use of version control tools | |
| | Repo has an up-to-date requirements.txt file | |
| | Repo does not have "ignore" files. | |
| | Use of style checkers | |
| | Extensive Use of style checkers | |
| | Use of code formatters. | |
| | Extensive Use of code formatters. | |
| | Use of syntax checkers. | |
| | Extensive use of syntax checkers. | |
| | Use of code coverage | |
| | Extensive use of code coverage | |
| | other automated analysis tools | |
| | Extensive use of other automated analysis tools | |
| | test cases exist | |
| | test cases are routinely executed | |
| consensus-oriented model | the files CONTRIBUTING.md and CODEOFCONDUCT.md has have multiple edits by multiple people | |
| | the files CONTRIBUTING.md lists coding standards and lots of tips on how to extend the system without screwing things up | |
| | multiple people contribute to discussions | |
| | issues are discussed before they are closed | |
| | Chat channel: exists | |
| | Chat channel: is active | |
| | test cases:.a large proportion of the issues related to handling failing cases. | |
| zero internal boundaries | evidence that the whole team is using the same tools: everyone can get to all tools and files | |
| | evidence that the whole team is using the same tools (e.g. config files in the repo, updated by lots of different people) | |
| | evidence that the whole team is using the same tools (e.g. tutor can ask anyone to share screen, they demonstrate the system running on their computer) | |
| | evidence that the members of the team are working across multiple places in the code base | |
| low-regressions rule | (hard to judge) features released are not subsequently removed | |
| short release cycles | (hard to see in short projects) project members are committing often enough so that everyone can get your work | |
Loading