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.

Sign up for GitHub

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

Sma 111 fix image paths #89

Merged
merged 4 commits into from
Apr 30, 2024
Merged

Sma 111 fix image paths #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db7128b
SMA 111 changed paths for images
Johna91 Apr 30, 2024
f8402f4
SMA 111 fixed path
Johna91 Apr 30, 2024
755e0e5
SMA 111 solving merge conflict
Johna91 Apr 30, 2024
2e9db2d
SMA 111 added / to paths
Johna91 Apr 30, 2024
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
0 ...s/jeffrey-keenan-pUhxoSapPFA-unsplash.jpg → ...s/jeffrey-keenan-pUhxoSapPFA-unsplash.jpg
View file
Open in desktop
File renamed without changes
0 frontend/sportsmatch-app/pictures/man.svg → frontend/sportsmatch-app/assets/man.svg
View file
Open in desktop
File renamed without changes
0 ...ures/michael-dam-mEZ3PoFGs_k-unsplash.jpg → ...sets/michael-dam-mEZ3PoFGs_k-unsplash.jpg
View file
Open in desktop
File renamed without changes
0 ...app/pictures/unknown-user-placeholder.png → ...h-app/assets/unknown-user-placeholder.png
View file
Open in desktop
File renamed without changes
0 frontend/sportsmatch-app/pictures/woman.svg → frontend/sportsmatch-app/assets/woman.svg
View file
Open in desktop
File renamed without changes
2 changes: 1 addition & 1 deletion frontend/sportsmatch-app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="assets/favicon.png" />
<link rel="icon" type="image/svg+xml" href="/assets/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>SPORTS MINGLE</title>
</head>
Expand Down
4 changes: 2 additions & 2 deletions frontend/sportsmatch-app/src/components/EventHistoryItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function EventHistoryItem({ eventHistoryDTO }: EventHistoryProps) {
<div className="user-side">
<div className="profile">
<div className="user-avatar">
<Avatar src="pictures/michael-dam-mEZ3PoFGs_k-unsplash.jpg" />
<Avatar src="/assets/michael-dam-mEZ3PoFGs_k-unsplash.jpg" />
</div>
<div className="user-name">You</div>
</div>
Expand Down Expand Up @@ -78,7 +78,7 @@ function EventHistoryItem({ eventHistoryDTO }: EventHistoryProps) {
</div>
<div className="profile">
<div className="opponent-avatar">
<Avatar src="pictures/jeffrey-keenan-pUhxoSapPFA-unsplash.jpg" />
<Avatar src="/assets/jeffrey-keenan-pUhxoSapPFA-unsplash.jpg" />
</div>
<div className="opponent-name">
{eventHistoryDTO.opponent?.name}
Expand Down
4 changes: 2 additions & 2 deletions frontend/sportsmatch-app/src/components/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<boolean>(false)
const [userId, setUserId] = useState<number>()
Expand Down
4 changes: 2 additions & 2 deletions frontend/sportsmatch-app/src/components/RateGameComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ export default function RateGameComponent(p: Props) {
init()
}, [])

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)
Expand Down
2 changes: 1 addition & 1 deletion frontend/sportsmatch-app/src/components/RatingCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function RatingCard({ rating }: RatingCardProps) {
<div className="col-2">
<img
className="rated-img"
src="\pictures\jeffrey-keenan-pUhxoSapPFA-unsplash.jpg"
src="/assets/jeffrey-keenan-pUhxoSapPFA-unsplash.jpg"
/>
</div>
<div className="col">
Expand Down
2 changes: 1 addition & 1 deletion frontend/sportsmatch-app/src/components/UserCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default function UserCard({ user, summary }: UserCardProp) {
<div className="user-card">
<div className="row">
<div className="col profile-details">
<img src="\pictures\michael-dam-mEZ3PoFGs_k-unsplash.jpg" />
<img src="/assets/michael-dam-mEZ3PoFGs_k-unsplash.jpg" />
<ul>
<li>
<h4>{user.name}</h4>
Expand Down
4 changes: 2 additions & 2 deletions frontend/sportsmatch-app/src/pages/UserInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export default function UserInfo() {
checked={selectedGender === 'male'}
onChange={() => handleSelectGender('male')}
/>
<img src="../pictures/man.svg" alt="man" />
<img src="/assets/man.svg" alt="man" />
<p>Male</p>
</label>
</div>
Expand All @@ -138,7 +138,7 @@ export default function UserInfo() {
checked={selectedGender === 'female'}
onChange={() => handleSelectGender('female')}
/>
<img src="../pictures/woman.svg" alt="man" />
<img src="/assets/woman.svg" alt="man" />
<p>Female</p>
</label>
</div>
Expand Down
6 changes: 6 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading