Merge branch 'master' of https://git.kompot.si/gia/contentmatcher

create_db.py

@@ -21,9 +21,9 @@ class User(Base):
     id              = Column(Integer, primary_key=True, autoincrement=True)
     username        = Column(String(64))
     password        = Column(String(64))
-#    username        = Column(String)
-#    password        = Column(String) #mogoče raje kaj drugega, neki hash passworda al neki
 #    email           = Column(String)
+#   config
+#   deck_size       = Column(Integer)
 
 
 class Card(Base):
@@ -33,9 +33,10 @@ class Card(Base):
     interest_rate   = Column(Float)
     owner_id        = Column(Integer, ForeignKey("user.id"), nullable=False)
 #   shared          = Column(Bool)
-#    item_location   = Column(String)
-#    item_type       = Column(String)
-#    item_size       = Column(Integer)
+#   item_location   = Column(String)
+#   item_type       = Column(String)
+#   content_type    = Column(String)
+#   item_size       = Column(Integer)
     #ali
 #   date_added      = Column(String)
 #   last_review     = Column(DateTime)