Skip to content

Commit 39c0bc1

Browse files
authored
Merge pull request #6 from josethz00/final_example
Final example
2 parents 3025242 + 4412252 commit 39c0bc1

File tree

10 files changed

+55
-71
lines changed

10 files changed

+55
-71
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $ cd server
2222
-----------------------------------
2323

2424
```
25-
$ pip3 install -r requirements.txt
25+
$ pip3 install -r requirements/requirements.txt
2626
```
2727

2828
4- Start Flask server

server/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ env
33
__pycache__
44
dump.rdb
55
.vscode
6+
variables.py

server/config/jwt_secret.py

Whitespace-only changes.

server/config/variables.example.py

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import os
2+
3+
4+
os.environ['HOST'] = '0.0.0.0'
5+
os.environ['PORT'] = '5000'
6+
os.environ['SQL_DATABASE'] = 'your database'
7+
os.environ['DATABASE_USER'] = 'your user database'
8+
os.environ['DATABASE_PASSWORD'] = 'your database password'
9+
os.environ['DATABASE_NAME'] = 'your database name'
10+
os.environ['DATABASE_HOST'] = 'your local ipv4 or remote host'
11+
os.environ['DATABASE_PORT'] = 'the port thatthe database is running'
12+
os.environ['FLASK_ENV'] = 'development | production | testing'
13+
os.environ['SECRET_KEY'] = 'your secret key'
14+
os.environ['MAIL_SERVER'] = 'mail server'
15+
os.environ['MAIL_PORT'] = 'mail server port'
16+
os.environ['MAIL_USERNAME'] = 'mail username'
17+
os.environ['MAIL_PASSWORD'] = 'mail password'
18+
19+
HOST = os.environ.get('HOST')
20+
PORT = os.environ.get('PORT')
21+
DEBUG = True
22+
SQL_DATABASE = os.environ.get('SQL_DATABASE')
23+
DATABASE_USER = os.environ.get('DATABASE_USER')
24+
DATABASE_PASSWORD = os.environ.get('DATABASE_PASSWORD')
25+
DATABASE_NAME = os.environ.get('DATABASE_NAME')
26+
DATABASE_HOST = os.environ.get('DATABASE_HOST')
27+
DATABASE_PORT = os.environ.get('DATABASE_PORT')
28+
FLASK_ENV = os.environ.get('FLASK_ENV')
29+
SECRET_KEY = os.environ.get('SECRET_KEY')
30+
MAIL_SERVER = os.environ.get('MAIL_SERVER')
31+
MAIL_PORT = os.environ.get('MAIL_PORT')
32+
MAIL_USERNAME = os.environ.get('MAIL_USERNAME')
33+
MAIL_PASSWORD = os.environ.get('MAIL_PASSWORD')
34+
MAIL_USE_TLS = True
35+
MAIL_USE_SSL = False

server/config/variables.py

Lines changed: 0 additions & 37 deletions
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-r requirements.txt
2+
flake8
File renamed without changes.

server/src/modules/users/user.py

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
from datetime import datetime
2+
from dataclasses import dataclass
23

34
from src.shared.database.db import db
45

56

7+
@dataclass
68
class User(db.Model):
79

10+
id: int
11+
username: str
12+
email: str
13+
password: str
14+
created_at: datetime
15+
updated_at: datetime
16+
817
__tablename__ = 'users'
918

1019
id = db.Column(db.Integer, primary_key=True, nullable=False)
@@ -23,17 +32,5 @@ class User(db.Model):
2332
nullable=False
2433
)
2534

26-
tasks = db.relationship(
27-
'Task',
28-
backref='users',
29-
cascade='all, delete-orphan',
30-
uselist=True
31-
)
32-
projects = db.relationship(
33-
'Project',
34-
backref='users',
35-
uselist=True
36-
)
37-
3835
def __repr__(self):
3936
return '<User %r>' % self.id

server/src/modules/users/user_blueprint.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
from flask import Blueprint, request
1+
from flask import Blueprint, request, jsonify
22
import json
33
import hashlib
44
from werkzeug.exceptions import Unauthorized
5-
from threading import Thread
65

76
from .user import User
87
from src.shared.database.db import db
98
from src.shared.utils.jwt_handler import JWTHandler
109
from src.shared.utils.mail_handler import send_email
1110

11+
1212
user_bp = Blueprint('users', __name__, url_prefix='/users')
1313

1414

1515
@user_bp.route('', methods=['GET'])
1616
def index() -> json:
17-
result = []
18-
users = db.session.query(User).all()
17+
# result = []
18+
users = User.query.all()
1919

20-
for user in users:
20+
'''for user in users:
2121
result.append(
2222
{
2323
'id': user.id,
@@ -26,7 +26,8 @@ def index() -> json:
2626
}
2727
)
2828
29-
return json.dumps(result), 200
29+
return json.dumps(result), 200'''
30+
return jsonify(users), 200
3031

3132

3233
@user_bp.route('', methods=['POST'])

server/src/shared/utils/handle_exception.py

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)