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

Added production support to master #210

Merged
merged 3 commits into from
Mar 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
safety check -r requirements.txt
- name: Run tests and collect coverage
env:
postgres_uri: ${{ secrets.postgres_uri }}
JWT_ALGO: ${{ secrets.JWT_ALGO }}
JWT_SECRET: ${{ secrets.JWT_SECRET }}
ACCESS_TOKEN_EXPIRES: ${{ secrets.ACCESS_TOKEN_EXPIRES }}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,10 @@ To get started on this project. To get a local copy up and running follow these
- [x] Playing Video Function
- [x] Homepage
- [x] Comment Section
- [ ] Staging
- [ ] Style Improvement:
- [x] Staging
- [x] Style Improvement:
- [x] Video Page
- [ ] Homepage
- [x] Homepage
- [x] Upload
- [x] Test Coverage - 85%
- [ ] Production
Expand Down
15 changes: 7 additions & 8 deletions db/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,19 @@
# pylint: disable=import-error
# pylint: disable=invalid-name

import os

from sqlalchemy import create_engine
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import sessionmaker
from dotenv import load_dotenv


load_dotenv()

SQLALCHEMY_DATABASE_URL = "sqlite:///./sql_app.db"
# SQLALCHEMY_DATABASE_URL = "postgresql://user:password@postgresserver/db"
SQLALCHEMY_DATABASE_URL = os.environ.get("postgres_uri")

# engine = create_engine(
# SQLALCHEMY_DATABASE_URL
# )
engine = create_engine(
SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}
)
engine = create_engine(SQLALCHEMY_DATABASE_URL)

SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)

Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ pathspec==0.9.0
platformdirs==2.4.1
pluggy==1.0.0
pre-commit==2.16.0
psycopg2==2.9.3
py==1.11.0
pyasn1==0.4.8
pycodestyle==2.8.0
Expand Down
Binary file modified static/assets/MyViewFavicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/assets/MyViewLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion static/profile.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,10 @@
.profileElements {
margin-top: 5%;
margin-bottom: 5%;
}
}


.videoThumbnail {
width: 95%;
height: 50%;
}