diff --git a/backend/Dockerfile b/backend/Dockerfile index 10aef33..ed9d494 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,5 +1,5 @@ -FROM python:3.8 +FROM python:3.11.4 RUN mkdir /app WORKDIR /app diff --git a/backend/app/core/auth.py b/backend/app/core/auth.py index 60d06b4..97e2985 100644 --- a/backend/app/core/auth.py +++ b/backend/app/core/auth.py @@ -67,8 +67,8 @@ def sign_up_new_user(db, email: str, password: str, firstname: str,lastname: str schemas.UserCreate( email=email, password=password, - firstname = firstname, - lastname = lastname, + first_name = firstname, + last_name = lastname, is_active=True, is_superuser=False, ), diff --git a/backend/app/core/config.py b/backend/app/core/config.py index efc75ef..256a07e 100644 --- a/backend/app/core/config.py +++ b/backend/app/core/config.py @@ -3,8 +3,8 @@ import base64 PROJECT_NAME = "KintoneAppBuilder" -SQLALCHEMY_DATABASE_URI = "postgres://maxz64:m@xz1205@alicornkintone.postgres.database.azure.com/postgres" -#SQLALCHEMY_DATABASE_URI = "postgres://kabAdmin:P@ssw0rd!@kintonetooldb.postgres.database.azure.com/postgres" +#SQLALCHEMY_DATABASE_URI = "postgres://maxz64:m@xz1205@alicornkintone.postgres.database.azure.com/postgres" +SQLALCHEMY_DATABASE_URI = "postgres://kabAdmin:P@ssw0rd!@kintonetooldb.postgres.database.azure.com/postgres" API_V1_STR = "/k/v1" diff --git a/backend/app/db/schemas.py b/backend/app/db/schemas.py index e96484a..5a8ee07 100644 --- a/backend/app/db/schemas.py +++ b/backend/app/db/schemas.py @@ -20,9 +20,12 @@ class UserOut(UserBase): class UserCreate(UserBase): + email:str password: str first_name: str last_name: str + is_active:bool + is_superuser:bool class Config: orm_mode = True diff --git a/backend/app/main.py b/backend/app/main.py index 0175c69..0b00200 100644 --- a/backend/app/main.py +++ b/backend/app/main.py @@ -19,9 +19,7 @@ app = FastAPI( ) origins = [ - "http://localhost:9000", - "http://localhost", - "http://localhost:8080", + "*" ] app.add_middleware( diff --git a/frontend/.env b/frontend/.env index 2807162..019b6f4 100644 --- a/frontend/.env +++ b/frontend/.env @@ -1,2 +1,3 @@ -KAB_BACKEND_URL="http://127.0.0.1:8000/" +KAB_BACKEND_URL="https://kab-backend.azurewebsites.net/" +#KAB_BACKEND_URL="http://127.0.0.1:8000/" diff --git a/sample2.json b/sample2.json new file mode 100644 index 0000000..e69de29