diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index c73e032..6e21c90 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.11"] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 0000000..4cd7a2a --- /dev/null +++ b/.pylintrc @@ -0,0 +1,649 @@ +[MAIN] + +# Analyse import fallback blocks. This can be used to support both Python 2 and +# 3 compatible code, which means that the block might have code that exists +# only in one or another interpreter, leading to false positives when analysed. +analyse-fallback-blocks=no + +# Clear in-memory caches upon conclusion of linting. Useful if running pylint +# in a server-like mode. +clear-cache-post-run=no + +# Load and enable all available extensions. Use --list-extensions to see a list +# all available extensions. +#enable-all-extensions= + +# In error mode, messages with a category besides ERROR or FATAL are +# suppressed, and no reports are done by default. Error mode is compatible with +# disabling specific errors. +#errors-only= + +# Always return a 0 (non-error) status code, even if lint errors are found. +# This is primarily useful in continuous integration scripts. +#exit-zero= + +# A comma-separated list of package or module names from where C extensions may +# be loaded. Extensions are loading into the active Python interpreter and may +# run arbitrary code. +extension-pkg-allow-list= + +# A comma-separated list of package or module names from where C extensions may +# be loaded. Extensions are loading into the active Python interpreter and may +# run arbitrary code. (This is an alternative name to extension-pkg-allow-list +# for backward compatibility.) +extension-pkg-whitelist= + +# Return non-zero exit code if any of these messages/categories are detected, +# even if score is above --fail-under value. Syntax same as enable. Messages +# specified are enabled, while categories only check already-enabled messages. +fail-on= + +# Specify a score threshold under which the program will exit with error. +fail-under=10 + +# Interpret the stdin as a python script, whose filename needs to be passed as +# the module_or_package argument. +#from-stdin= + +# Files or directories to be skipped. They should be base names, not paths. +ignore=CVS + +# Add files or directories matching the regular expressions patterns to the +# ignore-list. The regex matches against paths and can be in Posix or Windows +# format. Because '\\' represents the directory delimiter on Windows systems, +# it can't be used as an escape character. +ignore-paths= + +# Files or directories matching the regular expression patterns are skipped. +# The regex matches against base names, not paths. The default value ignores +# Emacs file locks +ignore-patterns=^\.# + +# List of module names for which member attributes should not be checked and +# will not be imported (useful for modules/projects where namespaces are +# manipulated during runtime and thus existing member attributes cannot be +# deduced by static analysis). It supports qualified module names, as well as +# Unix pattern matching. +ignored-modules= + +# Python code to execute, usually for sys.path manipulation such as +# pygtk.require(). +#init-hook= + +# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the +# number of processors available to use, and will cap the count on Windows to +# avoid hangs. +jobs=1 + +# Control the amount of potential inferred values when inferring a single +# object. This can help the performance when dealing with large functions or +# complex, nested conditions. +limit-inference-results=100 + +# List of plugins (as comma separated values of python module names) to load, +# usually to register additional checkers. +load-plugins= + +# Pickle collected data for later comparisons. +persistent=yes + +# Resolve imports to .pyi stubs if available. May reduce no-member messages and +# increase not-an-iterable messages. +prefer-stubs=no + +# Minimum Python version to use for version dependent checks. Will default to +# the version used to run pylint. +py-version=3.11 + +# Discover python modules and packages in the file system subtree. +recursive=no + +# Add paths to the list of the source roots. Supports globbing patterns. The +# source root is an absolute path or a path relative to the current working +# directory used to determine a package namespace for modules located under the +# source root. +source-roots= + +# When enabled, pylint would attempt to guess common misconfiguration and emit +# user-friendly hints instead of false-positive error messages. +suggestion-mode=yes + +# Allow loading of arbitrary C extensions. Extensions are imported into the +# active Python interpreter and may run arbitrary code. +unsafe-load-any-extension=no + +# In verbose mode, extra non-checker-related info will be displayed. +#verbose= + + +[BASIC] + +# Naming style matching correct argument names. +argument-naming-style=snake_case + +# Regular expression matching correct argument names. Overrides argument- +# naming-style. If left empty, argument names will be checked with the set +# naming style. +#argument-rgx= + +# Naming style matching correct attribute names. +attr-naming-style=snake_case + +# Regular expression matching correct attribute names. Overrides attr-naming- +# style. If left empty, attribute names will be checked with the set naming +# style. +#attr-rgx= + +# Bad variable names which should always be refused, separated by a comma. +bad-names=foo, + bar, + baz, + toto, + tutu, + tata + +# Bad variable names regexes, separated by a comma. If names match any regex, +# they will always be refused +bad-names-rgxs= + +# Naming style matching correct class attribute names. +class-attribute-naming-style=any + +# Regular expression matching correct class attribute names. Overrides class- +# attribute-naming-style. If left empty, class attribute names will be checked +# with the set naming style. +#class-attribute-rgx= + +# Naming style matching correct class constant names. +class-const-naming-style=UPPER_CASE + +# Regular expression matching correct class constant names. Overrides class- +# const-naming-style. If left empty, class constant names will be checked with +# the set naming style. +#class-const-rgx= + +# Naming style matching correct class names. +class-naming-style=PascalCase + +# Regular expression matching correct class names. Overrides class-naming- +# style. If left empty, class names will be checked with the set naming style. +#class-rgx= + +# Naming style matching correct constant names. +const-naming-style=UPPER_CASE + +# Regular expression matching correct constant names. Overrides const-naming- +# style. If left empty, constant names will be checked with the set naming +# style. +#const-rgx= + +# Minimum line length for functions/classes that require docstrings, shorter +# ones are exempt. +docstring-min-length=-1 + +# Naming style matching correct function names. +function-naming-style=snake_case + +# Regular expression matching correct function names. Overrides function- +# naming-style. If left empty, function names will be checked with the set +# naming style. +#function-rgx= + +# Good variable names which should always be accepted, separated by a comma. +good-names=i, + j, + k, + ex, + Run, + _ + +# Good variable names regexes, separated by a comma. If names match any regex, +# they will always be accepted +good-names-rgxs= + +# Include a hint for the correct naming format with invalid-name. +include-naming-hint=no + +# Naming style matching correct inline iteration names. +inlinevar-naming-style=any + +# Regular expression matching correct inline iteration names. Overrides +# inlinevar-naming-style. If left empty, inline iteration names will be checked +# with the set naming style. +#inlinevar-rgx= + +# Naming style matching correct method names. +method-naming-style=snake_case + +# Regular expression matching correct method names. Overrides method-naming- +# style. If left empty, method names will be checked with the set naming style. +#method-rgx= + +# Naming style matching correct module names. +module-naming-style=snake_case + +# Regular expression matching correct module names. Overrides module-naming- +# style. If left empty, module names will be checked with the set naming style. +#module-rgx= + +# Colon-delimited sets of names that determine each other's naming style when +# the name regexes allow several styles. +name-group= + +# Regular expression which should only match function or class names that do +# not require a docstring. +no-docstring-rgx=^_ + +# List of decorators that produce properties, such as abc.abstractproperty. Add +# to this list to register other decorators that produce valid properties. +# These decorators are taken in consideration only for invalid-name. +property-classes=abc.abstractproperty + +# Regular expression matching correct type alias names. If left empty, type +# alias names will be checked with the set naming style. +#typealias-rgx= + +# Regular expression matching correct type variable names. If left empty, type +# variable names will be checked with the set naming style. +#typevar-rgx= + +# Naming style matching correct variable names. +variable-naming-style=snake_case + +# Regular expression matching correct variable names. Overrides variable- +# naming-style. If left empty, variable names will be checked with the set +# naming style. +#variable-rgx= + + +[CLASSES] + +# Warn about protected attribute access inside special methods +check-protected-access-in-special-methods=no + +# List of method names used to declare (i.e. assign) instance attributes. +defining-attr-methods=__init__, + __new__, + setUp, + asyncSetUp, + __post_init__ + +# List of member names, which should be excluded from the protected access +# warning. +exclude-protected=_asdict,_fields,_replace,_source,_make,os._exit + +# List of valid names for the first argument in a class method. +valid-classmethod-first-arg=cls + +# List of valid names for the first argument in a metaclass class method. +valid-metaclass-classmethod-first-arg=mcs + + +[DESIGN] + +# List of regular expressions of class ancestor names to ignore when counting +# public methods (see R0903) +exclude-too-few-public-methods= + +# List of qualified class names to ignore when counting class parents (see +# R0901) +ignored-parents= + +# Maximum number of arguments for function / method. +max-args=5 + +# Maximum number of attributes for a class (see R0902). +max-attributes=7 + +# Maximum number of boolean expressions in an if statement (see R0916). +max-bool-expr=5 + +# Maximum number of branch for function / method body. +max-branches=12 + +# Maximum number of locals for function / method body. +max-locals=15 + +# Maximum number of parents for a class (see R0901). +max-parents=7 + +# Maximum number of positional arguments for function / method. +; max-positional-arguments=5 + +# Maximum number of public methods for a class (see R0904). +max-public-methods=20 + +# Maximum number of return / yield for function / method body. +max-returns=6 + +# Maximum number of statements in function / method body. +max-statements=50 + +# Minimum number of public methods for a class (see R0903). +min-public-methods=2 + + +[EXCEPTIONS] + +# Exceptions that will emit a warning when caught. +overgeneral-exceptions=builtins.BaseException,builtins.Exception + + +[FORMAT] + +# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. +expected-line-ending-format= + +# Regexp for a line that is allowed to be longer than the limit. +ignore-long-lines=^\s*(# )??$ + +# Number of spaces of indent required inside a hanging or continued line. +indent-after-paren=4 + +# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 +# tab). +indent-string=' ' + +# Maximum number of characters on a single line. +max-line-length=100 + +# Maximum number of lines in a module. +max-module-lines=1000 + +# Allow the body of a class to be on the same line as the declaration if body +# contains single statement. +single-line-class-stmt=no + +# Allow the body of an if to be on the same line as the test if there is no +# else. +single-line-if-stmt=no + + +[IMPORTS] + +# List of modules that can be imported at any level, not just the top level +# one. +allow-any-import-level= + +# Allow explicit reexports by alias from a package __init__. +allow-reexport-from-package=no + +# Allow wildcard imports from modules that define __all__. +allow-wildcard-with-all=no + +# Deprecated modules which should not be used, separated by a comma. +deprecated-modules= + +# Output a graph (.gv or any supported image format) of external dependencies +# to the given file (report RP0402 must not be disabled). +ext-import-graph= + +# Output a graph (.gv or any supported image format) of all (i.e. internal and +# external) dependencies to the given file (report RP0402 must not be +# disabled). +import-graph= + +# Output a graph (.gv or any supported image format) of internal dependencies +# to the given file (report RP0402 must not be disabled). +int-import-graph= + +# Force import order to recognize a module as part of the standard +# compatibility libraries. +known-standard-library= + +# Force import order to recognize a module as part of a third party library. +known-third-party=enchant + +# Couples of modules and preferred modules, separated by a comma. +preferred-modules= + + +[LOGGING] + +# The type of string formatting that logging methods do. `old` means using % +# formatting, `new` is for `{}` formatting. +logging-format-style=old + +# Logging modules to check that the string format arguments are in logging +# function parameter format. +logging-modules=logging + + +[MESSAGES CONTROL] + +# Only show warnings with the listed confidence levels. Leave empty to show +# all. Valid levels: HIGH, CONTROL_FLOW, INFERENCE, INFERENCE_FAILURE, +# UNDEFINED. +confidence=HIGH, + CONTROL_FLOW, + INFERENCE, + INFERENCE_FAILURE, + UNDEFINED + +# Disable the message, report, category or checker with the given id(s). You +# can either give multiple identifiers separated by comma (,) or put this +# option multiple times (only on the command line, not in the configuration +# file where it should appear only once). You can also use "--disable=all" to +# disable everything first and then re-enable specific checks. For example, if +# you want to run only the similarities checker, you can use "--disable=all +# --enable=similarities". If you want to run only the classes checker, but have +# no Warning level messages displayed, use "--disable=all --enable=classes +# --disable=W". +disable=raw-checker-failed, + bad-inline-option, + locally-disabled, + file-ignored, + suppressed-message, + useless-suppression, + deprecated-pragma, + use-symbolic-message-instead, + use-implicit-booleaness-not-comparison-to-string, + use-implicit-booleaness-not-comparison-to-zero, + missing-module-docstring, + line-too-long + +# Enable the message, report, category or checker with the given id(s). You can +# either give multiple identifier separated by comma (,) or put this option +# multiple time (only on the command line, not in the configuration file where +# it should appear only once). See also the "--disable" option for examples. +enable= + + +[METHOD_ARGS] + +# List of qualified names (i.e., library.method) which require a timeout +# parameter e.g. 'requests.api.get,requests.api.post' +timeout-methods=requests.api.delete,requests.api.get,requests.api.head,requests.api.options,requests.api.patch,requests.api.post,requests.api.put,requests.api.request + + +[MISCELLANEOUS] + +# List of note tags to take in consideration, separated by a comma. +notes=FIXME, + XXX, + TODO + +# Regular expression of note tags to take in consideration. +notes-rgx= + + +[REFACTORING] + +# Maximum number of nested blocks for function / method body +max-nested-blocks=5 + +# Complete name of functions that never returns. When checking for +# inconsistent-return-statements if a never returning function is called then +# it will be considered as an explicit return statement and no message will be +# printed. +never-returning-functions=sys.exit,argparse.parse_error + +# Let 'consider-using-join' be raised when the separator to join on would be +# non-empty (resulting in expected fixes of the type: ``"- " + " - +# ".join(items)``) +suggest-join-with-non-empty-separator=yes + + +[REPORTS] + +# Python expression which should return a score less than or equal to 10. You +# have access to the variables 'fatal', 'error', 'warning', 'refactor', +# 'convention', and 'info' which contain the number of messages in each +# category, as well as 'statement' which is the total number of statements +# analyzed. This score is used by the global evaluation report (RP0004). +evaluation=max(0, 0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)) + +# Template used to display messages. This is a python new-style format string +# used to format the message information. See doc for all details. +msg-template= + +# Set the output format. Available formats are: text, parseable, colorized, +# json2 (improved json format), json (old json format) and msvs (visual +# studio). You can also give a reporter class, e.g. +# mypackage.mymodule.MyReporterClass. +#output-format= + +# Tells whether to display a full report or only the messages. +reports=no + +# Activate the evaluation score. +score=yes + + +[SIMILARITIES] + +# Comments are removed from the similarity computation +ignore-comments=yes + +# Docstrings are removed from the similarity computation +ignore-docstrings=yes + +# Imports are removed from the similarity computation +ignore-imports=yes + +# Signatures are removed from the similarity computation +ignore-signatures=yes + +# Minimum lines number of a similarity. +min-similarity-lines=4 + + +[SPELLING] + +# Limits count of emitted suggestions for spelling mistakes. +max-spelling-suggestions=4 + +# Spelling dictionary name. No available dictionaries : You need to install +# both the python package and the system dependency for enchant to work. +spelling-dict= + +# List of comma separated words that should be considered directives if they +# appear at the beginning of a comment and should not be checked. +spelling-ignore-comment-directives=fmt: on,fmt: off,noqa:,noqa,nosec,isort:skip,mypy: + +# List of comma separated words that should not be checked. +spelling-ignore-words= + +# A path to a file that contains the private dictionary; one word per line. +spelling-private-dict-file= + +# Tells whether to store unknown words to the private dictionary (see the +# --spelling-private-dict-file option) instead of raising a message. +spelling-store-unknown-words=no + + +[STRING] + +# This flag controls whether inconsistent-quotes generates a warning when the +# character used as a quote delimiter is used inconsistently within a module. +check-quote-consistency=no + +# This flag controls whether the implicit-str-concat should generate a warning +# on implicit string concatenation in sequences defined over several lines. +check-str-concat-over-line-jumps=no + + +[TYPECHECK] + +# List of decorators that produce context managers, such as +# contextlib.contextmanager. Add to this list to register other decorators that +# produce valid context managers. +contextmanager-decorators=contextlib.contextmanager + +# List of members which are set dynamically and missed by pylint inference +# system, and so shouldn't trigger E1101 when accessed. Python regular +# expressions are accepted. +generated-members= + +# Tells whether to warn about missing members when the owner of the attribute +# is inferred to be None. +ignore-none=yes + +# This flag controls whether pylint should warn about no-member and similar +# checks whenever an opaque object is returned when inferring. The inference +# can return multiple potential results while evaluating a Python object, but +# some branches might not be evaluated, which results in partial inference. In +# that case, it might be useful to still emit no-member and other checks for +# the rest of the inferred objects. +ignore-on-opaque-inference=yes + +# List of symbolic message names to ignore for Mixin members. +ignored-checks-for-mixins=no-member, + not-async-context-manager, + not-context-manager, + attribute-defined-outside-init + +# List of class names for which member attributes should not be checked (useful +# for classes with dynamically set attributes). This supports the use of +# qualified names. +ignored-classes=optparse.Values,thread._local,_thread._local,argparse.Namespace + +# Show a hint with possible names when a member name was not found. The aspect +# of finding the hint is based on edit distance. +missing-member-hint=yes + +# The minimum edit distance a name should have in order to be considered a +# similar match for a missing member name. +missing-member-hint-distance=1 + +# The total number of similar names that should be taken in consideration when +# showing a hint for a missing member. +missing-member-max-choices=1 + +# Regex pattern to define which classes are considered mixins. +mixin-class-rgx=.*[Mm]ixin + +# List of decorators that change the signature of a decorated function. +signature-mutators= + + +[VARIABLES] + +# List of additional names supposed to be defined in builtins. Remember that +# you should avoid defining new builtins when possible. +additional-builtins= + +# Tells whether unused global variables should be treated as a violation. +allow-global-unused-variables=yes + +# List of names allowed to shadow builtins +allowed-redefined-builtins= + +# List of strings which can identify a callback function by name. A callback +# name must start or end with one of those strings. +callbacks=cb_, + _cb + +# A regular expression matching the name of dummy variables (i.e. expected to +# not be used). +dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_ + +# Argument names that match this expression will be ignored. +ignored-argument-names=_.*|^ignored_|^unused_ + +# Tells whether we should check for unused import in __init__ files. +init-import=no + +# List of qualified module names which can have objects that can redefine +# builtins. +redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io diff --git a/Pipfile b/Pipfile index 46d82bb..6b9a18e 100644 --- a/Pipfile +++ b/Pipfile @@ -13,6 +13,7 @@ marshmallow = "*" flask-restx = "*" flask-login = "*" python-dotenv = "*" +pylint = "*" [dev-packages] diff --git a/README.md b/README.md index e789bb6..96cf967 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,26 @@ flask run ## Roadmap and releases ### Models +- Users + - Email + - Password + - Username + - First Name + - Last Name - Institution + - User ID + - Name + - Location - Account -- Transactions + - Institution ID + - Name + - Number + - Status + - Balance + - Categories +- Transactions +- Items (thought here is to be able to track the items that make up the transaction) - Merchant - Tags diff --git a/api/account/controllers.py b/api/account/controllers.py index 04b9d40..fb78f61 100644 --- a/api/account/controllers.py +++ b/api/account/controllers.py @@ -2,8 +2,7 @@ from flask_restx import Resource, fields from flask_login import login_user from werkzeug.security import generate_password_hash, check_password_hash -from app import db -from app.user.models import User +from api.user.models import User account_model = g.api.model('Account', { 'email': fields.String(required=True, description='Email'), @@ -48,7 +47,7 @@ def post(self): new_user.save() return make_response(jsonify({'message': 'User created successfully', 'redirect': '/account/login'}), 201) - + @g.api.route('/account/login') class Login(Resource): @g.api.expect(login_model) @@ -62,8 +61,7 @@ def post(self): if not user or not check_password_hash(user.password, password): return make_response(jsonify({'message': 'Invalid Credentials'}), 400) - + login_user(user, remember=remember) return make_response(jsonify({'message': 'User logged in successfully', 'redirect': '/'}), 200) - diff --git a/api/institution/controllers.py b/api/institution/controllers.py new file mode 100644 index 0000000..8abd983 --- /dev/null +++ b/api/institution/controllers.py @@ -0,0 +1,34 @@ +from flask import g, request, jsonify, make_response +from flask_restx import Resource, fields +from api.institution.models import InstitutionModel + +institution_model = g.api.model('Institution', { + 'user_id': fields.String(requierd=True, description='User ID'), + 'name': fields.String(required=True, description='Institution Name'), + 'location': fields.String(description='Location'), + 'description': fields.String(description='Description') +}) + +@g.api.route('/institution') +class Institution(Resource): + @g.api.expect(institution_model) + def post(self): + data = request.json + user_id = data.get('user_id') + name = data.get('name') + location = data.get('location') + description = data.get('description') + + new_institution = InstitutionModel( + user_id=user_id, + name=name, + location=location, + description=description + ) + new_institution.save() + + return make_response(jsonify({'message': 'Institution created successfully'}), 201) + + def get(self): + institutions = InstitutionModel.query.all() + return make_response(jsonify({'institutions': institutions}), 200) \ No newline at end of file diff --git a/api/institution/models.py b/api/institution/models.py new file mode 100644 index 0000000..7643f93 --- /dev/null +++ b/api/institution/models.py @@ -0,0 +1,28 @@ +from app import db +from api.base.models import Base + +class InstitutionModel(Base): + __tablename__ = 'institution' + user_id = db.Column('user_id', db.Text, db.ForeignKey('user.id'), nullable=False) + name = db.Column(db.String(255), nullable=False) + location = db.Column(db.String(255), nullable=True) + description = db.Column(db.Text, nullable=True) + + + def __init__(self, user_id, name, location, description): + self.user_id = user_id + self.name = name + self.location = location + self.description = description + + def __repr__(self): + return '' % self.name + + def save(self): + db.session.add(self) + db.session.commit() + + def delete(self): + db.session.delete(self) + db.session.commit() + \ No newline at end of file diff --git a/api/user/controllers.py b/api/user/controllers.py new file mode 100644 index 0000000..9106bba --- /dev/null +++ b/api/user/controllers.py @@ -0,0 +1,46 @@ +from flask import g, request, jsonify, make_response +from flask_restx import Resource, fields +from api.user.models import User as _user_model + +user_model = g.api.model('User', { + 'email': fields.String(required=True, description='Email'), + 'username': fields.String(required=True, description='Username'), + 'password': fields.String(required=True, description='Password'), + 'first_name': fields.String(required=True, description='First Name'), + 'last_name': fields.String(required=True, description='Last Name'), + 'api_key': fields.String(description='API Key') +}) + +@g.api.route('/user') +class User(Resource): + @g.api.expect(user_model) + def post(self): + data = request.json + email = data.get('email') + username = data.get('username') + password = data.get('password') + first_name = data.get('first_name') + last_name = data.get('last_name') + + user_email = _user_model.query.filter_by(email=email).first() + user_username = _user_model.query.filter_by(username=username).first() + + if user_email: + return make_response(jsonify({'message': 'User email already exists'}), 400) + if user_username: + return make_response(jsonify({'message': 'Username already exists'}), 400) + + new_user = _user_model( + email=email, + username=username, + password=password, + first_name=first_name, + last_name=last_name + ) + new_user.save() + + return make_response(jsonify({'message': 'User created successfully'}), 201) + + def get(self): + users = _user_model.query.all() + return make_response(jsonify({'users': users}), 200)\ diff --git a/api/user/models.py b/api/user/models.py new file mode 100644 index 0000000..844a89a --- /dev/null +++ b/api/user/models.py @@ -0,0 +1,36 @@ +from flask_login import UserMixin +from app import db +from api.base.models import Base +import secrets + +class User(Base, UserMixin): + __tablename__ = 'user' + email = db.Column(db.String(100),unique=True) + password = db.Column(db.String(255)) + username = db.Column(db.String(100),unique=True) + first_name = db.Column(db.String(100)) + last_name = db.Column(db.String(100)) + api_key = db.Column(db.String(64), unique=True, nullable=True) + + def __init__(self,email,username,password,first_name,last_name): + self.email = email + self.username = username + self.password = password + self.first_name = first_name + self.last_name = last_name + + def __init__(self, email, username, password, first_name, last_name): + self.email = email + self.username = username + self.password = password + self.first_name = first_name + self.last_name = last_name + self.api_key = None # Initialize without an API key + + def generate_api_key(self): + """Generate a new unique API key and save it to the database.""" + self.api_key = secrets.token_hex(32) # Generate a 64-character API key + db.session.commit() # Save the new key to the database + + + \ No newline at end of file diff --git a/app/__init__.py b/app/__init__.py index c5ebd38..42998d2 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -25,7 +25,7 @@ def create_app(): app.register_blueprint(dashboards) # Models - from app.user.models import User + from api.user.models import User with app.app_context(): g.api = Api( @@ -38,13 +38,15 @@ def create_app(): ) # API Controllers from api.account.controllers import Signup + from api.institution.controllers import Institution + from api.user.controllers import User as UserAPI db.create_all() @login_manager.user_loader def load_user(user_id): return User.query.get(str(user_id)) - + app.running = True - return app \ No newline at end of file + return app diff --git a/app/account/controllers.py b/app/account/controllers.py index 4a6761c..7ac03e2 100644 --- a/app/account/controllers.py +++ b/app/account/controllers.py @@ -1,8 +1,5 @@ -from flask import Blueprint, render_template, request, redirect, url_for, flash -from flask_login import login_user, logout_user, login_required -from werkzeug.security import generate_password_hash, check_password_hash -from app import db -from app.user.models import User +from flask import Blueprint, render_template, request, redirect, url_for +from flask_login import logout_user, login_required account_blueprint = Blueprint('account', __name__) diff --git a/app/templates/partials/sidebar.html b/app/templates/partials/sidebar.html index 38885fa..01853f2 100644 --- a/app/templates/partials/sidebar.html +++ b/app/templates/partials/sidebar.html @@ -73,10 +73,10 @@
Welcome {{current_user.username}}!
diff --git a/app/user/models.py b/app/user/models.py deleted file mode 100644 index dd4aa83..0000000 --- a/app/user/models.py +++ /dev/null @@ -1,19 +0,0 @@ -from flask_login import UserMixin -from app import db -from api.base.models import Base - -class User(Base, UserMixin): - email = db.Column(db.String(100),unique=True) - password = db.Column(db.String(255)) - username = db.Column(db.String(100),unique=True) - first_name = db.Column(db.String(100)) - last_name = db.Column(db.String(100)) - - def __init__(self,email,username,password,first_name,last_name): - self.email = email - self.username = username - self.password = password - self.first_name = first_name - self.last_name = last_name - - \ No newline at end of file