Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finaldoc #21

Open
wants to merge 34 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
512d1ad
db setup
edwinliiiii Dec 1, 2023
7f6a9d2
post for animals
mlebiedzinski Dec 1, 2023
5b71666
delete anima;
edwinliiiii Dec 1, 2023
a8afa20
finished mockaroooo
Dec 1, 2023
74230df
animals and types
mlebiedzinski Dec 1, 2023
a179107
finished all animals endpoints
edwinliiiii Dec 2, 2023
1068a3c
Merge pull request #1 from edwinliiiii/feature/sample-data
emilysabia Dec 2, 2023
0df3545
types endpoints completed
mlebiedzinski Dec 3, 2023
76cf368
updated comments
mlebiedzinski Dec 3, 2023
f04babe
progress on review endpoints
Dec 3, 2023
d2fdf1b
reviews
Dec 3, 2023
a9fd138
customer endpoints completed
mlebiedzinski Dec 3, 2023
1eb27e6
suppliers endpoints complete
mlebiedzinski Dec 3, 2023
a7d3af9
worked on orders, guides, and reviews
Dec 3, 2023
185beb9
fixing
Dec 3, 2023
4c2ad69
null cases
edwinliiiii Dec 3, 2023
ad74fb2
worked on orders, guides, reviews
Dec 3, 2023
4eb9522
fixed
Dec 3, 2023
7761c55
changed fullText
Dec 4, 2023
475ccba
allowed for null
Dec 4, 2023
f6950f9
appsmith
Dec 4, 2023
0a3c6ac
backend done
edwinliiiii Dec 4, 2023
1c082c5
finished mockaroooo
Dec 1, 2023
4659f02
fix
edwinliiiii Dec 5, 2023
c5abf3f
fix
edwinliiiii Dec 5, 2023
524e577
backend is best
edwinliiiii Dec 5, 2023
d015a76
Merge branch 'main' into feature/initial-endpoints
edwinliiiii Dec 5, 2023
a241741
Merge pull request #2 from edwinliiiii/feature/initial-endpoints
edwinliiiii Dec 5, 2023
eb7753d
fixed animals
edwinliiiii Dec 5, 2023
0d8304d
Merge pull request #3 from edwinliiiii/bugs/fix-animals
edwinliiiii Dec 5, 2023
96fea0e
inital commit to documentation,endpoint descriptions
Dec 6, 2023
bd22211
intial commit on finaldoc
Dec 6, 2023
a123aac
more edits to finaldoc
Dec 6, 2023
cd5705d
more doc changes
Dec 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
463 changes: 454 additions & 9 deletions db/db_bootstrap.sql

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion db/mywind
Submodule mywind deleted from f99e93
22 changes: 11 additions & 11 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,17 @@ services:
- secret_db_pw
- secret_db_root_pw

##################################################################
# configure the AppSmith container (borrowed directly from Appsmith)
# appsmith:
# image: index.docker.io/appsmith/appsmith-ce
# container_name: appsmith
# ports:
# - "8080:80"
# - "4443:443"
# volumes:
# - ./stacks:/appsmith-stacks
# restart: unless-stopped
###################################################################
#configure the AppSmith container (borrowed directly from Appsmith)
appsmith:
image: index.docker.io/appsmith/appsmith-ce
container_name: appsmith
ports:
- "8080:80"
- "4443:443"
volumes:
- ./stacks:/appsmith-stacks
restart: unless-stopped

secrets:
secret_db_pw:
Expand Down
16 changes: 12 additions & 4 deletions flask-app/src/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def create_app():
app.config['MYSQL_DATABASE_PASSWORD'] = open('/secrets/db_root_password.txt').readline().strip()
app.config['MYSQL_DATABASE_HOST'] = 'db'
app.config['MYSQL_DATABASE_PORT'] = 3306
app.config['MYSQL_DATABASE_DB'] = 'northwind' # Change this to your DB name
app.config['MYSQL_DATABASE_DB'] = 'cool_db' # Change this to your DB name

# Initialize the database object with the settings above.
db.init_app(app)
Expand All @@ -34,12 +34,20 @@ def welcome():

# Import the various Beluprint Objects
from src.customers.customers import customers
from src.products.products import products
from src.animals.animals import animals
from src.reviews.reviews import reviews
from src.orders.orders import orders
from src.suppliers.suppliers import suppliers
from src.guides.guides import guides

# Register the routes from each Blueprint with the app object
# and give a url prefix to each
app.register_blueprint(customers, url_prefix='/c')
app.register_blueprint(products, url_prefix='/p')
app.register_blueprint(customers, url_prefix='/customers') #6
app.register_blueprint(animals, url_prefix='/animals') #10
app.register_blueprint(reviews, url_prefix='/reviews') #7
app.register_blueprint(orders, url_prefix='/orders') #6
app.register_blueprint(guides, url_prefix='/guides') #6
app.register_blueprint(suppliers, url_prefix='/suppliers') #7

# Don't forget to return the app object
return app
Loading