diff --git a/.vscode/settings.json b/.vscode/settings.json index 4d6f196..f599308 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,7 @@ "editor.inlayHints.enabled": "offUnlessPressed", "javascript.inlayHints.parameterNames.enabled": "all", "editor.formatOnSaveMode": "modificationsIfAvailable", - "eslint.workingDirectories": ["./fuware-fe"], + "eslint.workingDirectories": ["./frontend"], "editor.insertSpaces": true, "editor.tabSize": 2, "python.analysis.autoImportCompletions": true, @@ -15,11 +15,9 @@ "python.analysis.fixAll": ["source.unusedImports"], "python.analysis.packageIndexDepths": [ { - "name": "fuware", + "name": "backend", "depth": 3, "includeAllSymbols": false } ] - // "python.analysis.extraPaths": ["./fuware"], - // "python.autoComplete.extraPaths": ["./fuware"] } diff --git a/backend/db/init_db.py b/backend/db/init_db.py index f2d768e..67697b6 100644 --- a/backend/db/init_db.py +++ b/backend/db/init_db.py @@ -12,7 +12,6 @@ from backend.core.config import get_app_settings from backend.db.db_setup import session_context from backend.repos.repository_users import RepositoryUsers from backend.repos.seeder import default_users_init -# from fuware.db.models import User PROJECT_DIR = Path(__file__).parent.parent.parent diff --git a/backend/schemas/fuware_model.py b/backend/schemas/main_model.py similarity index 96% rename from backend/schemas/fuware_model.py rename to backend/schemas/main_model.py index 6791838..14be1ce 100644 --- a/backend/schemas/fuware_model.py +++ b/backend/schemas/main_model.py @@ -9,7 +9,7 @@ class SearchType(Enum): fuzzy = "fuzzy" tokenized = "tokenized" -class FuwareModel(BaseModel): +class MainModel(BaseModel): _searchable_properties: ClassVar[list[str]] = [] """ Searchable properties for the search API. diff --git a/backend/schemas/user/user.py b/backend/schemas/user/user.py index 709baf8..1e78f8f 100644 --- a/backend/schemas/user/user.py +++ b/backend/schemas/user/user.py @@ -3,9 +3,9 @@ from uuid import UUID from pydantic import ConfigDict from fastapi import Form -from backend.schemas.fuware_model import FuwareModel +from backend.schemas.main_model import MainModel -class UserBase(FuwareModel): +class UserBase(MainModel): username: str = Form(...) class UserRequest(UserBase): @@ -34,7 +34,7 @@ class ProfileResponse(UserBase): updated_at: datetime model_config = ConfigDict(from_attributes=True) -class LoginResponse(FuwareModel): +class LoginResponse(MainModel): access_token: str exp: int name: str diff --git a/frontend/src/App.scss b/frontend/src/App.scss index f8818e9..d99b35f 100644 --- a/frontend/src/App.scss +++ b/frontend/src/App.scss @@ -1,5 +1,12 @@ #root { margin: 0 auto; + + --white: #fff; + --black: #212121; + --primary: #03c9d7; + --green: #05b187; + --orange: #fb9678; + --yellow: #fec90f; } * { diff --git a/frontend/src/assets/logo-fuware.svg b/frontend/src/assets/logo.svg similarity index 100% rename from frontend/src/assets/logo-fuware.svg rename to frontend/src/assets/logo.svg diff --git a/frontend/src/components/Header.jsx b/frontend/src/components/Header.jsx index 6111d69..f0a2a64 100644 --- a/frontend/src/components/Header.jsx +++ b/frontend/src/components/Header.jsx @@ -1,5 +1,5 @@ import { getProfile } from '@api/user' -import fuwareLogo from '@assets/logo-fuware.svg' +import Logo from '@assets/logo.svg' import { useSiteContext } from '@context/SiteContext' import useAuth from '@hooks/useAuth' import useToast from '@hooks/useToast' @@ -43,7 +43,7 @@ export default function Header() {