Commit Graph

61 Commits

Author SHA1 Message Date
1f48689a32 Merge branch 'master' of git.maenle.net:raphael/calendarwatch_frontend 2020-07-25 18:10:04 +02:00
752c7c5577 adds ical input to calendar html templates and implements data handling
- the icalHandler in the backend is used in two instances. First, when
  the user adds a new ical calendar into the database, routes.py passes
  the information (name and url) to the ical Handler. The calendars are
  saved in the database as type 'ical'.

  Then, when a connected device pulls current events, all the calendars
  which are of type 'ical' are pulled and parsed for current events.
  See the backend commit for details on what happens there.

- All google Calendar related functions now have an additional check,
  to make sure that the calendar they are working on is of type 'Google'.
2020-07-25 18:05:55 +02:00
04c5410c41 migration scripts to newest database 2020-07-25 11:41:12 +02:00
524d2f1e1d adds calendar_type to calendar model and to calendar handling 2020-07-25 11:28:59 +02:00
2add28fa00 adds ical form and form visualization in calendar.html 2020-07-25 10:50:02 +02:00
38e16f92e8 device receives a timestamp at creation
no new devices are ever without a lastConnection timestamp
2020-07-17 10:42:27 +02:00
0284eb2fa8 adds cleanup functionality for old devices
- device now last field 'last connection' which gets updated
  at every server connection from the respective device
- manual cleanup script in database deletes all devices which
  have never been updated, or have a timestamp older than 30 days
2020-07-17 10:39:16 +02:00
15e68b88e8 adds uwsgi support instead of using flask dev server
- uses existing wsgi.py file

- adds wsgi.ini file
  - sets socket
  - defines application to be run, which it gets from wsgi.py file
  - uses http communication to nginx server
  - some random number of workers

- updates Dockerfile and docker-entrypoint
2020-07-10 11:47:49 +02:00
adb20dea14 code cleanup and comments 2020-07-10 10:55:01 +02:00
016e52f1e7 updates images, changes step description 2020-06-11 13:55:02 +02:00
6374c8d983 fixes routing bug and provides temporary fix for css overlap 2020-06-06 23:49:39 +02:00
39b899283c adds a landing page which gives an overview of the tool
- landing page shows two images of google calendar and tizen watch
  and how the calendars corelate
- routes redesigned to fit this landing page
- redesign of coloring in css
2020-06-06 20:02:18 +02:00
0f47ff15dd fixes bug where color hex values where not passed along (variable mixup) 2020-05-30 23:33:55 +02:00
70197ee393 Large changes in the seperation of backend and google handler
- backend now takes care of all the recoloring, and communication with database
- google handler takes care of the entire communication with google
- colors selected on the front-end are now translated to the watch

- Calendars in the database now directly save the color the user has set
- only if the event has a different color than the calendar (event color from google is not 0)
  is the event color from google used.
- No more passing around of google color ids, hex colors all the way
2020-05-30 23:05:46 +02:00
98b09bb778 update footer css 2020-05-29 20:32:44 +02:00
36c9b5015f adds privacy policy and page footer 2020-05-29 20:30:37 +02:00
87dedb8e02 adds device generation and connection
- fingerprint generated first time device connects
- saved to database and served to device
- connection status set to true, once device requests first package
- user can link device via online form
2020-05-28 15:43:51 +02:00
7b82086ff0 adds device handling functionality from the browser 2020-05-28 12:00:05 +02:00
5d1edbc6fc fixes account deletion without google user 2020-05-28 00:05:53 +02:00
722db5feae delete now uses orphan cascade deletion instead of manual delete 2020-05-27 20:56:23 +02:00
120931dc4c updated removal process for database elements 2020-05-27 20:45:19 +02:00
d17a76f4b8 fixes bugs in database calles 2020-05-27 20:36:05 +02:00
355ba99ca3 updates database design for mariadb 2020-05-27 20:06:43 +02:00
0cfc801f59 moves models to database folder 2020-05-24 13:33:48 +02:00
c9cbb53eea routing updated to be more variable and on demand
- calendar json file now generated on demand at download request
- device fingerprint route now added
2020-05-24 13:26:41 +02:00
98a78f2102 adds delete account function 2020-05-22 10:47:28 +02:00
cf9c4f0e85 adds minor login design update and device page update 2020-05-22 00:10:16 +02:00
3c6d950bbc adds device page and form for new device
- form added to push new device id to backend
- device added to db model (needs to be pushed still)
- form return right now just prints
- design for device list created, still needs some updates
2020-05-21 18:33:58 +02:00
46eece9b98 adds view mode design 2020-05-21 15:38:22 +02:00
b0f4e98513 updates account design 2020-05-21 11:37:52 +02:00
14670ae871 updated backend 2020-05-21 10:19:59 +02:00
934c4f2a1d adds favicon, changes menu 2020-05-21 10:18:40 +02:00
4a8ac52201 backend now uses calendar_id and this is the frontend upgrade
- calendar_id is unique and therefore creates less problems
- changing id of DOM from item.name to calendar_id
2020-05-18 23:52:18 +02:00
ee54dd5daa updates color generation, tries fixing credentials bug
- credentials still lost the refresh token after a certain event
  - this was now fixed by completely removing any saves past the first one
  - https://trello.com/c/iORYLYHl/44-1-check-on-credentials

- Color Coding is now updated
  - fixed an incorrect color mapping in the colors.json
  - updates some calls to functions to correctly get the natural colors
  - the incorrect red -> yellow mapping might have to do with the previous credentials error
2020-05-17 22:59:12 +02:00
1b7980e834 adds routines.python script 2020-05-15 16:05:45 +02:00
999ae069da db update 2020-05-15 16:01:38 +02:00
2ecb5a4b71 updates routines script and google certification handling 2020-05-15 16:00:54 +02:00
5e7080695d Merge branch 'master' into venv 2020-05-11 23:06:32 +02:00
ae773daad7 modifies entrypoint back to flask 2020-05-11 23:05:41 +02:00
a4265a44f5 adds static files to server 2020-05-11 21:00:00 +00:00
dbb6d170da adds structure for virtual environment uwsgi and http communication
- starts uwsgi and flask in virtual environment instead of docker
- sets oauth2 https error to false (OAUTHLIB_INSECURE_TRANSPORT=1)

- this setup works, but
  - moving it into docker
  -  removing the venv
  -  and allowing https connection internally?
would be better
2020-05-10 20:31:42 +02:00
76a8b97ae4 Merge branch 'master' of git.maenle.net:raphael/calendarwatch_frontend 2020-05-09 07:46:59 +00:00
908d64e0a9 hotfixes removing backend update script 2020-05-09 07:44:15 +00:00
Raphael Maenle
02625299c7 adds backend as submodule 2020-05-08 13:21:42 +02:00
7952ff2c12 upates backend which now includes the calendar json file update script 2020-04-24 18:27:27 +00:00
c89ecd7134 adds backend script which can be run as a cronjob every n minutes to generate new json files for google calendars
- database updated to save google credentials
- database updated to save json calendar information
- json still saved as a json file under userinfo/<user.id>/calendarevents.json
2020-04-24 17:54:56 +00:00
a071193959 adds email login and registration forms
- using flask-wtf forms to create login and registration
- saves and compares input data with database
- generates user if need-be
- same user form as google user
2020-04-23 17:11:23 +00:00
f156d38739 adds more advanced database handling unsing sql alchemy
- moves app into package
- adds sql alchemy equipment
- moves templates into server package
- add app.db sqlite file
2020-04-22 20:15:21 +00:00
8f20be53e1 fixes communication conflicts between frontend and database through backend;
sets up visualization of DOMs in frontend through javascript
2020-04-17 16:54:35 +00:00
c3f815939d adds writing the color as css attribute and then via jsqurey going through all of the class and adding this as background color 2020-04-15 18:47:41 +00:00