Commit Graph

30 Commits

Author SHA1 Message Date
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
04942268a6 adds calendars to sql database, calls backend to remap calendars to color accurate information 2020-04-15 17:43:11 +00:00
19bbf53282 adds backend as submodule 2020-04-15 17:18:25 +00:00
596f690cce adds sending toggle (true, false) information; adds color picker and sending that information back to server
- the color picker is from 'colorPick' which makes implementation easy. It's only a .js and a .css file
  which need to be included and the color-picker is simple enough to handle on the client side.
  The only main problem with it, is that accessing the 'id' information of the css it was called from is not straightforward

- the toggle switch which is just implemented in .css currently has the checklist inverted, works but ugly

- The Client sends this information back to the server via a json file, which defines the calendar id and either
  color or the toggle information. The server currently just prints this information.great stuff.
2020-04-14 20:11:34 +00:00
53a1f201f8 adds template structure 2020-04-10 09:53:25 +00:00
bcb3b1bbac restructured website into folders 2020-04-07 16:29:51 +00:00
f86f15069a Generates new google signin users in database and generates json for todays events
- imports caltojson from calendarwatch_server
- gets the user info from google api
- gets user information and compares them to the user database
- returns to login page and shows user information as well as 'api test' button

- api test button uses 'calendarwatch_server' to get calendars and calculate todays events
2020-04-03 10:18:16 +00:00
76c711a58b added second test login, moved into seperate folder 2020-04-02 12:22:59 +00:00
b00413de93 added a server.py, which does google api handling via google auth oauthlib flow. works 2020-03-28 10:57:18 +00:00
b676ee1a71 adds
- basic login button on website frontend
- index.html hosting using python
- posting google oauth token from javascript on client side
- passing token id to python hoster
- verifying token, and returning a string to client
2020-03-26 09:43:10 +00:00
a80fc3fa72 added gitignore 2020-03-26 09:42:30 +00:00
69297bda90 initial commit 2020-03-26 09:38:27 +00:00