Commit Graph

99 Commits

Author SHA1 Message Date
KoaCWells
e148ea6b91 Finish session start, end, and keep alive 2023-02-22 23:14:41 -05:00
f56f0b8a17 Small corrections in session start and config 2023-02-21 10:47:17 -05:00
KoaCWells
901fcd461c Update StartSession and begin updating KeepSessionAlive 2023-02-20 22:10:09 -05:00
e17da5b265 Correct the flasgger deffinition 2023-02-14 05:54:51 -05:00
dc60a0b7ca Correct the flasgger deffinition 2023-02-14 05:43:03 -05:00
40bd435c22 Complete the session deffinitions in the yml file. 2023-02-14 05:37:59 -05:00
f39ffedc87 Clean up and define session start message 2023-02-14 04:32:04 -05:00
5f6b7339c4 Rebase into previous commit 2023-02-13 08:09:48 -05:00
1adfe6519f Merge remote-tracking branch 'origin/city_commands' into api_guille
# Conflicts:
#	bootstrap.py
#	hub_api/city_commands.py
#	hub_api/config.py
#	hub_api/construction_catalog.py
#	hub_api/energy_demand.py
#	hub_api/greenery_catalog.py
#	hub_api/uptime.py
#	hub_api/user.py
#	requirements.txt
2023-02-13 07:15:10 -05:00
Koa
347345b343 Add update, delete, search city API calls and other bug fixes/code refactors 2023-02-09 09:45:25 -05:00
Koa
7b6620eca0 Update bootstrap.py 2023-02-02 14:30:06 -05:00
Koa
783731a9ba Merge main into city_commands 2023-02-02 14:27:02 -05:00
01bbc9e746 Merge pull request 'Removed unneeded files' (#7) from api-v2 into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/p_yefi/gamification_service_v2/pulls/7
2023-02-01 15:59:04 -05:00
Peter Yefi
0aef0c32fc Removed deprecated FLASK_ENV 2023-02-01 15:58:20 -05:00
Peter Yefi
d961241079 Added tests for user 2023-02-01 15:48:14 -05:00
Peter Yefi
4b322148ba Removed unneeded files 2023-01-30 19:45:02 -05:00
86a720dfbe Basic integration of city persistence commands 2023-01-30 05:49:02 -05:00
72c265cd88 Merge remote-tracking branch 'origin/city_commands' into api_guille
# Conflicts:
#	bootstrap.py
2023-01-30 05:24:32 -05:00
bf6a5711ce Small clean up 2023-01-30 05:20:31 -05:00
82be9ee660 Correct the imports to use cerc-hub as a pip package 2023-01-25 04:54:49 -05:00
KoaCWells
cea801a67f Implement AddCity and DeleteCity API calls + comments 2023-01-24 15:21:53 -05:00
01ff8332f9 Playing around with the yml file and typo corrections 2023-01-24 05:50:49 -05:00
48dae8badf Playing around with the yml file 2023-01-24 05:38:45 -05:00
d4e444e3e7 Initial simplification 2023-01-23 12:29:41 -05:00
Koa
d9828f3d57 Starting the implementation of save_city 2023-01-23 10:00:42 -05:00
fda986dc87 Merge pull request 'api-v2' (#6) from api-v2 into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/p_yefi/gamification_service_v2/pulls/6
2023-01-20 14:02:20 -05:00
Peter Yefi
bc76ac86d1 Added documentation for energy demand 2023-01-20 14:01:40 -05:00
Peter Yefi
fdd4a31ac0 Added openapi specs for construction and construction catalog 2023-01-20 13:41:46 -05:00
d73d77fbe4 Merge pull request 'api-v2' (#5) from api-v2 into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/p_yefi/gamification_service_v2/pulls/5
2023-01-17 20:14:54 -05:00
Peter Yefi
c462d75e08 Renamed export factory 2023-01-17 20:13:54 -05:00
Peter Yefi
582c18ef0c included db import reference to config 2023-01-17 20:10:20 -05:00
Koa
4628686d40 Update skeleton 2023-01-17 19:17:18 -05:00
Koa
a9e740d034 Add skeleton for city commands and add API routes 2023-01-17 19:15:18 -05:00
588eef7f9d Merge pull request 'api-v2' (#4) from api-v2 into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/p_yefi/gamification_service_v2/pulls/4
2023-01-17 19:04:51 -05:00
Peter Yefi
aa9cc24f29 Refactored city removal from session 2023-01-17 19:02:49 -05:00
Peter Yefi
f893959c78 Removed city attachment to session. City is read from the DB 2023-01-17 19:00:22 -05:00
Peter Yefi
025fe02f71 Read energy demand as an array of floats 2023-01-17 18:59:59 -05:00
Koa
9c3b9cf535 Update requirements.txt 2023-01-16 21:29:36 -05:00
cb187ee6fb Merge pull request 'Removed unused imports and code' (#3) from api-v2 into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/p_yefi/gamification_service_v2/pulls/3
2023-01-16 16:09:20 -05:00
Peter Yefi
ab4492aebb Removed unused imports and code 2023-01-16 16:08:02 -05:00
Peter Yefi
31867370d8 Added user endpoints with swagger documentation including authorization token and appid 2023-01-16 15:31:02 -05:00
ac776c4e5d Merge pull request 'api-v2' (#1) from api-v2 into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/p_yefi/gamification_service_v2/pulls/1
2023-01-13 18:46:40 -05:00
Peter Yefi
8628dec247 Fixed minor issues 2023-01-13 18:41:14 -05:00
Peter Yefi
82b3e626c7 Removed compiled files 2023-01-13 12:01:51 -05:00
Peter Yefi
6dc6c6ab19 Included auth token 2023-01-13 12:01:13 -05:00
Peter Yefi
8c0fed0d9d Removed compiled files 2023-01-11 19:57:42 -05:00
Peter Yefi
2f59c83b12 Included authorization token 2023-01-11 19:56:51 -05:00
Peter Yefi
bcf5666af6 Added user management API to add and update user 2023-01-10 17:24:26 -05:00
Peter Yefi
385d89ba9d initialised project from existing gamification service 2023-01-10 12:12:01 -05:00