Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
aa5b9b6
Implemented update route for User and Project.
petak5 Apr 12, 2020
00f484a
Added Flask Marshmallow to the project, implemented get_all_users end…
petak5 Apr 3, 2020
2735876
Fixed User's get and post routes and added a delete route.
petak5 Apr 5, 2020
3d6e16c
Removed Flask Marshmallow and replaced it with manual iterating over …
petak5 Apr 11, 2020
05f21b5
Implemented Project routes.
petak5 Apr 12, 2020
994cdf9
Moved models to separate files.
petak5 Apr 12, 2020
319f25b
Implemented update route for User and Project.
petak5 Apr 12, 2020
b8a1acc
Merge remote-tracking branch 'origin/routes' into routes
petak5 Apr 26, 2020
09ffce4
feedback entities and relations
Apr 28, 2020
0822271
separated feedback models
May 3, 2020
5b274e3
Removed unused packages from versions endpoint.
petak5 May 12, 2020
4859c20
Validate property names in create and update routes for user.
petak5 May 12, 2020
3ea9246
Validate property names in create and update routes for project.
petak5 May 12, 2020
b838527
Fix id possibly being passed twice to controller's update methods.
petak5 May 12, 2020
2e3dbf0
ProjectFeedback model fix v
May 13, 2020
11723fa
Merge pull request #38 from ProgrammingBuddies/models
marter11 May 14, 2020
524b742
Imlemented UserFeedback routes.
petak5 May 16, 2020
7202114
Implemented ProjectFeedback routes + small fixes.
petak5 May 16, 2020
81dd14b
Added `feedbacks` to `/users` ans `/projects` routes.
petak5 May 16, 2020
83c6936
Implemented CRUD routes for UserLink.
petak5 May 16, 2020
25c9aa3
Implemented CRUD routes for Project Link.
petak5 May 16, 2020
f906ac2
Added rule for `trim_trailing_whitespace` to editorconfig.
petak5 May 16, 2020
aadd675
Dockerfile works
notarock May 20, 2020
1e0b55c
Include signed SSL key
notarock May 20, 2020
a06e670
Initial docker-compose
notarock May 20, 2020
19aef98
Remove unused ports
notarock May 20, 2020
830397c
Update README.md
notarock May 20, 2020
1d8baa1
Added missing env vars in docker-compose
notarock May 21, 2020
dfb0f62
Generate key in src folder
notarock May 21, 2020
720227b
Commented on openSSL in Dockerfile
notarock May 21, 2020
8dd4ce7
Fixed key destination
notarock May 21, 2020
0b324e8
Removed documentation folder
petak5 May 22, 2020
b69668f
Added swagger packages.
petak5 May 22, 2020
54532c6
Swagger setup and routes.
petak5 May 22, 2020
61b2f1a
Update Dockerfile
notarock May 22, 2020
0e2253a
Merge pull request #45 from ProgrammingBuddies/dockerfile-typo
petak5 May 22, 2020
715e13e
Merge branch 'routes' into swagger
petak5 May 22, 2020
831bd78
Merge pull request #46 from ProgrammingBuddies/swagger
petak5 May 22, 2020
3c2f351
Add general information to swagger.
petak5 May 23, 2020
e0e403d
Add missing dependencies to route.
petak5 May 23, 2020
2c4cc3e
Add documentation for User* routes.
petak5 May 23, 2020
03f27ba
Minor documentation tweaks.
petak5 May 23, 2020
f8d12e3
Modify user documentation descriptions.
petak5 May 23, 2020
fdb4ad6
Add project swagger documentation.
petak5 May 23, 2020
3cac3c1
initial testing setup
May 25, 2020
b753aee
basic userView tests
May 29, 2020
33dbbd1
basic projectView tests
May 30, 2020
deb51c6
tests README
Jun 2, 2020
c9e1e48
pr
Jun 2, 2020
9871df7
test object functions
Jun 3, 2020
d1edcc8
changed tests path and README
Jun 3, 2020
8477a42
Change update routes to PUT method
petak5 Jun 4, 2020
0d5acb9
shared functions
Jun 5, 2020
d271d13
shared functions
Jun 5, 2020
6c944a0
fixed db session exception handling
Jun 8, 2020
75f1e9d
user link creation tests
Jun 8, 2020
4fa95e6
tests for every user view
Jun 10, 2020
9802905
tested project view links
Jun 13, 2020
03db9c3
Merge pull request #61 from ProgrammingBuddies/setup_tests
petak5 Jun 14, 2020
dc42750
Merge branch 'develop' into routes
petak5 Jun 14, 2020
168e40f
Merge branch 'develop' into routes and update Pipfile.lock
petak5 Jun 14, 2020
17b259f
Fix duplicate methods after merge
petak5 Jun 14, 2020
0886a83
Explicitly require package
petak5 Jun 15, 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
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ root = true
indent_style = space
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.py]
indent_style = space
Expand Down
4 changes: 4 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ sqlalchemy-utils = "*"
mysql-connector-python = "*"
flask-dance = "*"
pyopenssl = "*"
flask-swagger = "*"
flask-swagger-ui = "*"
pytest = "*"
flask-cors = "*"
blinker = "*"
flask-jwt-extended = "*"
atomicwrites = "*"

[requires]
python_version = "3.7"
132 changes: 114 additions & 18 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ Run the server:

Your `.env` file should now look something like [example.env](https://github.com/ProgrammingBuddies/programmingbuddies-api/blob/develop/example.env)

### Testing

- to run multiple tests just specify the directory which contains them for example `pipenv run pytest tests/`
- - this will run all the tests in the `tests` directory
- if you want to run test cases only in a particular file, then just give the full file path `pipenv run pytest tests/example.py`

## Milestones
- [ ] build DB and endpoints with basic CRUD
- [ ] add security for app (ie - bots, and non-human actors/clients)
- [ ] add users and profile stores as well as registration/management API endpoints for users
## Tech stack:

- Python
Expand Down
18 changes: 0 additions & 18 deletions documentation/.editorconfig

This file was deleted.

27 changes: 0 additions & 27 deletions documentation/.github/ISSUE_TEMPLATE/start-here.md

This file was deleted.

5 changes: 0 additions & 5 deletions documentation/.github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

24 changes: 0 additions & 24 deletions documentation/.gitignore

This file was deleted.

Loading