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
This commit is contained in:
2020-05-17 22:59:12 +02:00
parent 1b7980e834
commit ee54dd5daa
13 changed files with 38 additions and 66 deletions

View File

@ -1,28 +0,0 @@
"""empty message
Revision ID: 66f62f457a22
Revises: 7bbc2215d87d
Create Date: 2020-04-24 17:12:45.275636
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '66f62f457a22'
down_revision = '7bbc2215d87d'
branch_labels = None
depends_on = None
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('user', sa.Column('google_credentials', sa.String(), nullable=True))
# ### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('user', 'google_credentials')
# ### end Alembic commands ###

View File

@ -1,28 +0,0 @@
"""empty message
Revision ID: 7bbc2215d87d
Revises: 92db2e496087
Create Date: 2020-04-24 11:36:43.600038
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '7bbc2215d87d'
down_revision = '92db2e496087'
branch_labels = None
depends_on = None
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('user', sa.Column('calendarJson', sa.String(), nullable=True))
# ### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('user', 'calendarJson')
# ### end Alembic commands ###

View File

@ -1,8 +1,8 @@
"""empty message
Revision ID: 92db2e496087
Revision ID: af001b07177d
Revises:
Create Date: 2020-04-20 21:33:50.061962
Create Date: 2020-05-16 13:53:02.747714
"""
from alembic import op
@ -10,7 +10,7 @@ import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '92db2e496087'
revision = 'af001b07177d'
down_revision = None
branch_labels = None
depends_on = None
@ -29,11 +29,13 @@ def upgrade():
op.create_index(op.f('ix_calendar_name'), 'calendar', ['name'], unique=False)
op.create_index(op.f('ix_calendar_usr_id'), 'calendar', ['usr_id'], unique=False)
op.create_table('user',
sa.Column('id', sa.String(length=21), nullable=False),
sa.Column('id', sa.String(length=64), nullable=False),
sa.Column('username', sa.String(length=64), nullable=True),
sa.Column('email', sa.String(length=120), nullable=True),
sa.Column('profile_pic', sa.String(length=256), nullable=True),
sa.Column('password_hash', sa.String(length=128), nullable=True),
sa.Column('calendarJson', sa.String(), nullable=True),
sa.Column('google_credentials', sa.String(), nullable=True),
sa.PrimaryKeyConstraint('id')
)
op.create_index(op.f('ix_user_email'), 'user', ['email'], unique=True)