conflict resolve
Browse files- Backend/app/config.py +0 -7
Backend/app/config.py
CHANGED
|
@@ -3,13 +3,6 @@ from pydantic_settings import BaseSettings
|
|
| 3 |
class Settings(BaseSettings):
|
| 4 |
DATABASE_URL: str
|
| 5 |
SECRET_KEY: str
|
| 6 |
-
DATABASE_URL: str = os.getenv(
|
| 7 |
-
"DATABASE_URL",
|
| 8 |
-
"postgresql+asyncpg://postgres:mysecretpassword@localhost:5432/studentdb"
|
| 9 |
-
)
|
| 10 |
-
|
| 11 |
-
# Security
|
| 12 |
-
SECRET_KEY: str = os.getenv("SECRET_KEY", "production")
|
| 13 |
ALGORITHM: str = "HS256"
|
| 14 |
ACCESS_TOKEN_EXPIRE_MINUTES: int = 30
|
| 15 |
|
|
|
|
| 3 |
class Settings(BaseSettings):
|
| 4 |
DATABASE_URL: str
|
| 5 |
SECRET_KEY: str
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 6 |
ALGORITHM: str = "HS256"
|
| 7 |
ACCESS_TOKEN_EXPIRE_MINUTES: int = 30
|
| 8 |
|