From db7128be86baa0ac665c695e5cb2439c8c7ccccd Mon Sep 17 00:00:00 2001 From: JanaDupcakova Date: Tue, 30 Apr 2024 17:30:43 +0200 Subject: [PATCH 1/3] SMA 111 changed paths for images --- .../jeffrey-keenan-pUhxoSapPFA-unsplash.jpg | Bin .../sportsmatch-app/{pictures => assets}/man.svg | 0 .../michael-dam-mEZ3PoFGs_k-unsplash.jpg | Bin .../unknown-user-placeholder.png | Bin .../sportsmatch-app/{pictures => assets}/woman.svg | 0 .../src/components/EventHistoryItem.tsx | 4 ++-- frontend/sportsmatch-app/src/components/Navbar.tsx | 4 ++-- .../src/components/RateGameComponent.tsx | 4 ++-- .../sportsmatch-app/src/components/RatingCard.tsx | 2 +- frontend/sportsmatch-app/src/pages/UserInfo.tsx | 4 ++-- package-lock.json | 6 ++++++ 11 files changed, 15 insertions(+), 9 deletions(-) rename frontend/sportsmatch-app/{pictures => assets}/jeffrey-keenan-pUhxoSapPFA-unsplash.jpg (100%) rename frontend/sportsmatch-app/{pictures => assets}/man.svg (100%) rename frontend/sportsmatch-app/{pictures => assets}/michael-dam-mEZ3PoFGs_k-unsplash.jpg (100%) rename frontend/sportsmatch-app/{pictures => assets}/unknown-user-placeholder.png (100%) rename frontend/sportsmatch-app/{pictures => assets}/woman.svg (100%) create mode 100644 package-lock.json diff --git a/frontend/sportsmatch-app/pictures/jeffrey-keenan-pUhxoSapPFA-unsplash.jpg b/frontend/sportsmatch-app/assets/jeffrey-keenan-pUhxoSapPFA-unsplash.jpg similarity index 100% rename from frontend/sportsmatch-app/pictures/jeffrey-keenan-pUhxoSapPFA-unsplash.jpg rename to frontend/sportsmatch-app/assets/jeffrey-keenan-pUhxoSapPFA-unsplash.jpg diff --git a/frontend/sportsmatch-app/pictures/man.svg b/frontend/sportsmatch-app/assets/man.svg similarity index 100% rename from frontend/sportsmatch-app/pictures/man.svg rename to frontend/sportsmatch-app/assets/man.svg diff --git a/frontend/sportsmatch-app/pictures/michael-dam-mEZ3PoFGs_k-unsplash.jpg b/frontend/sportsmatch-app/assets/michael-dam-mEZ3PoFGs_k-unsplash.jpg similarity index 100% rename from frontend/sportsmatch-app/pictures/michael-dam-mEZ3PoFGs_k-unsplash.jpg rename to frontend/sportsmatch-app/assets/michael-dam-mEZ3PoFGs_k-unsplash.jpg diff --git a/frontend/sportsmatch-app/pictures/unknown-user-placeholder.png b/frontend/sportsmatch-app/assets/unknown-user-placeholder.png similarity index 100% rename from frontend/sportsmatch-app/pictures/unknown-user-placeholder.png rename to frontend/sportsmatch-app/assets/unknown-user-placeholder.png diff --git a/frontend/sportsmatch-app/pictures/woman.svg b/frontend/sportsmatch-app/assets/woman.svg similarity index 100% rename from frontend/sportsmatch-app/pictures/woman.svg rename to frontend/sportsmatch-app/assets/woman.svg diff --git a/frontend/sportsmatch-app/src/components/EventHistoryItem.tsx b/frontend/sportsmatch-app/src/components/EventHistoryItem.tsx index 342c5689..8f98c0af 100644 --- a/frontend/sportsmatch-app/src/components/EventHistoryItem.tsx +++ b/frontend/sportsmatch-app/src/components/EventHistoryItem.tsx @@ -49,7 +49,7 @@ function EventHistoryItem({ eventHistoryDTO }: EventHistoryProps) {
- +
You
@@ -78,7 +78,7 @@ function EventHistoryItem({ eventHistoryDTO }: EventHistoryProps) {
- +
{eventHistoryDTO.opponent?.name} diff --git a/frontend/sportsmatch-app/src/components/Navbar.tsx b/frontend/sportsmatch-app/src/components/Navbar.tsx index e8fe0496..e023bb5f 100644 --- a/frontend/sportsmatch-app/src/components/Navbar.tsx +++ b/frontend/sportsmatch-app/src/components/Navbar.tsx @@ -6,8 +6,8 @@ import { NavDropdown } from 'react-bootstrap' import { OpenAPI, ExSecuredEndpointService, ApiError } from '../generated/api' function Navbar() { - const loggedInUserImgUrl = 'pictures/michael-dam-mEZ3PoFGs_k-unsplash.jpg' - const loggedOutUserImgUrl = 'pictures/unknown-user-placeholder.png' + const loggedInUserImgUrl = 'assets/michael-dam-mEZ3PoFGs_k-unsplash.jpg' + const loggedOutUserImgUrl = 'assets/unknown-user-placeholder.png' const [isLoggedIn, setLoggedIn] = useState(false) const [userId, setUserId] = useState() diff --git a/frontend/sportsmatch-app/src/components/RateGameComponent.tsx b/frontend/sportsmatch-app/src/components/RateGameComponent.tsx index 6943cdd4..5b3cc0b5 100644 --- a/frontend/sportsmatch-app/src/components/RateGameComponent.tsx +++ b/frontend/sportsmatch-app/src/components/RateGameComponent.tsx @@ -68,8 +68,8 @@ export default function RateGameComponent(p: Props) { return daysOfTheWeek[dateIndex] } - const userProfilePicture = 'pictures/unknown-user-placeholder.png' - const opponentProfilePicture = 'pictures/unknown-user-placeholder.png' + const userProfilePicture = 'assets/unknown-user-placeholder.png' + const opponentProfilePicture = 'assets/unknown-user-placeholder.png' const [userScore, setUserScore] = useState(0) const [opponentScore, setOpponentScore] = useState(0) diff --git a/frontend/sportsmatch-app/src/components/RatingCard.tsx b/frontend/sportsmatch-app/src/components/RatingCard.tsx index 7a52c9d1..4f8de4b0 100644 --- a/frontend/sportsmatch-app/src/components/RatingCard.tsx +++ b/frontend/sportsmatch-app/src/components/RatingCard.tsx @@ -15,7 +15,7 @@ export default function RatingCard({ rating }: RatingCardProps) {
diff --git a/frontend/sportsmatch-app/src/pages/UserInfo.tsx b/frontend/sportsmatch-app/src/pages/UserInfo.tsx index eec84af7..a4ca0f63 100644 --- a/frontend/sportsmatch-app/src/pages/UserInfo.tsx +++ b/frontend/sportsmatch-app/src/pages/UserInfo.tsx @@ -119,7 +119,7 @@ export default function UserInfo() { checked={selectedGender === 'male'} onChange={() => handleSelectGender('male')} /> - man + man

Male

@@ -138,7 +138,7 @@ export default function UserInfo() { checked={selectedGender === 'female'} onChange={() => handleSelectGender('female')} /> - man + man

Female

diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..35ddc753 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "sportsmatch", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} From f8402f4472ea6af1b7e0ba110d35106f93b025ea Mon Sep 17 00:00:00 2001 From: JanaDupcakova Date: Tue, 30 Apr 2024 17:48:03 +0200 Subject: [PATCH 2/3] SMA 111 fixed path --- frontend/sportsmatch-app/src/components/UserCard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/sportsmatch-app/src/components/UserCard.tsx b/frontend/sportsmatch-app/src/components/UserCard.tsx index ba43ab59..7bf2e9f4 100644 --- a/frontend/sportsmatch-app/src/components/UserCard.tsx +++ b/frontend/sportsmatch-app/src/components/UserCard.tsx @@ -24,7 +24,7 @@ export default function UserCard({ user, summary }: UserCardProp) {
- +
  • {user.name}

    From 2e9db2d88befbc54aae41203f959cdc853fb281e Mon Sep 17 00:00:00 2001 From: JanaDupcakova Date: Tue, 30 Apr 2024 18:36:12 +0200 Subject: [PATCH 3/3] SMA 111 added / to paths --- frontend/sportsmatch-app/index.html | 2 +- frontend/sportsmatch-app/src/components/EventHistoryItem.tsx | 4 ++-- frontend/sportsmatch-app/src/components/Navbar.tsx | 4 ++-- frontend/sportsmatch-app/src/components/RatingCard.tsx | 2 +- frontend/sportsmatch-app/src/components/UserCard.tsx | 2 +- frontend/sportsmatch-app/src/pages/UserInfo.tsx | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/sportsmatch-app/index.html b/frontend/sportsmatch-app/index.html index dba2c9f0..ec5a36d8 100644 --- a/frontend/sportsmatch-app/index.html +++ b/frontend/sportsmatch-app/index.html @@ -2,7 +2,7 @@ - + SPORTS MINGLE diff --git a/frontend/sportsmatch-app/src/components/EventHistoryItem.tsx b/frontend/sportsmatch-app/src/components/EventHistoryItem.tsx index 8f98c0af..6f520d61 100644 --- a/frontend/sportsmatch-app/src/components/EventHistoryItem.tsx +++ b/frontend/sportsmatch-app/src/components/EventHistoryItem.tsx @@ -49,7 +49,7 @@ function EventHistoryItem({ eventHistoryDTO }: EventHistoryProps) {
    - +
    You
    @@ -78,7 +78,7 @@ function EventHistoryItem({ eventHistoryDTO }: EventHistoryProps) {
    - +
    {eventHistoryDTO.opponent?.name} diff --git a/frontend/sportsmatch-app/src/components/Navbar.tsx b/frontend/sportsmatch-app/src/components/Navbar.tsx index e023bb5f..dfbb598a 100644 --- a/frontend/sportsmatch-app/src/components/Navbar.tsx +++ b/frontend/sportsmatch-app/src/components/Navbar.tsx @@ -6,8 +6,8 @@ import { NavDropdown } from 'react-bootstrap' import { OpenAPI, ExSecuredEndpointService, ApiError } from '../generated/api' function Navbar() { - const loggedInUserImgUrl = 'assets/michael-dam-mEZ3PoFGs_k-unsplash.jpg' - const loggedOutUserImgUrl = 'assets/unknown-user-placeholder.png' + const loggedInUserImgUrl = '/assets/michael-dam-mEZ3PoFGs_k-unsplash.jpg' + const loggedOutUserImgUrl = '/assets/unknown-user-placeholder.png' const [isLoggedIn, setLoggedIn] = useState(false) const [userId, setUserId] = useState() diff --git a/frontend/sportsmatch-app/src/components/RatingCard.tsx b/frontend/sportsmatch-app/src/components/RatingCard.tsx index 4f8de4b0..72e3771d 100644 --- a/frontend/sportsmatch-app/src/components/RatingCard.tsx +++ b/frontend/sportsmatch-app/src/components/RatingCard.tsx @@ -15,7 +15,7 @@ export default function RatingCard({ rating }: RatingCardProps) {
    diff --git a/frontend/sportsmatch-app/src/components/UserCard.tsx b/frontend/sportsmatch-app/src/components/UserCard.tsx index 7bf2e9f4..0f0224e5 100644 --- a/frontend/sportsmatch-app/src/components/UserCard.tsx +++ b/frontend/sportsmatch-app/src/components/UserCard.tsx @@ -24,7 +24,7 @@ export default function UserCard({ user, summary }: UserCardProp) {
    - +
    • {user.name}

      diff --git a/frontend/sportsmatch-app/src/pages/UserInfo.tsx b/frontend/sportsmatch-app/src/pages/UserInfo.tsx index a4ca0f63..5df963be 100644 --- a/frontend/sportsmatch-app/src/pages/UserInfo.tsx +++ b/frontend/sportsmatch-app/src/pages/UserInfo.tsx @@ -119,7 +119,7 @@ export default function UserInfo() { checked={selectedGender === 'male'} onChange={() => handleSelectGender('male')} /> - man + man

      Male

    @@ -138,7 +138,7 @@ export default function UserInfo() { checked={selectedGender === 'female'} onChange={() => handleSelectGender('female')} /> - man + man

    Female