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

Jump to bottom

500m+seemore #8

Merged
merged 1 commit into from
Sep 8, 2024
Merged

500m+seemore #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions .firebase/hosting.YnVpbGQ.cache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ manifest.json,1725691795408,4368aeaf848ae2e048765562c289452f33ad2a175c4b1951ea8b
logo512.png,1725691795407,212b102aa09e51b3b3e06647e81f7801a61333e171f6582e8124379aabccb41d
logo192.png,1725691795406,79e2b749561016bc8af300ea19f48347ceed3cb1a54f48ae456172eca45e08f0
favicon.ico,1725691795404,27edce7be5922cf0bef7d4136f69b5bfbdd5bf8c13c7b026f71187d41a00aa7d
index.html,1725753484979,153961d4989c6d46bcc5c97b2e9c10d3790e35a5d888ceb86d3098fcdb5b430c
asset-manifest.json,1725753484979,22c4614a5b692c852c53d856a32c2abffa3a164ccde683a3ba3351f9b4202082
static/js/main.ec691045.js.LICENSE.txt,1725753484993,30f88fcb7f8d73132245dec8d321969add3035e37dbd531f61107e638f8efae4
static/js/453.ed3810f9.chunk.js,1725753484993,ad49a5ec5043145417a4fe58d70d740daa4764cb309e9bb4bcc93dfbdf2b5643
static/js/453.ed3810f9.chunk.js.map,1725753484995,b580f924df88443006fe2c2050df639443c362a4697c20b3a6bd730b8bbd83b0
static/css/main.79d19d76.css,1725753484993,8532eb1bc08eefe39074a437fdd2823b7e14851191c7cd07f96140abf432a5b4
static/css/main.79d19d76.css.map,1725753484995,863af17a469ff836e46a378ba7cf2a08b3d4a827991c0be88c37d888414ad7c9
static/media/poster.0fad7cc42115f255a281.png,1725753484993,f3025012e905a2fd748b83ff036dc7fd5dbc6b6aa6493435a0c7a60db866b5bf
static/js/main.ec691045.js,1725753484995,849f70ba603fde8c7486961ea3fb0ffc350c24a351254ff97759f3b3900e6d41
static/js/main.ec691045.js.map,1725753484995,88483bea13905e9d56d917ffdbb246fd33d6bc708e8f0e9322b38a2046e6fb4a
asset-manifest.json,1725760042799,7768de529e8459f57c91e74d03f232c947a5a7fdae2e68d7c0c40a420f0cb888
index.html,1725760042799,f7c47ab833688fe8f8b6940c3090182f8cef30af7980bece5a2caa1c6086e81d
static/js/main.426c1b5c.js.LICENSE.txt,1725760042805,92ec6870e0d50ef16c11a5af58e8bae63fc674a797281dae6198d723b4582cff
static/js/453.ed3810f9.chunk.js,1725760042807,ad49a5ec5043145417a4fe58d70d740daa4764cb309e9bb4bcc93dfbdf2b5643
static/js/453.ed3810f9.chunk.js.map,1725760042807,b580f924df88443006fe2c2050df639443c362a4697c20b3a6bd730b8bbd83b0
static/css/main.79d19d76.css,1725760042807,8532eb1bc08eefe39074a437fdd2823b7e14851191c7cd07f96140abf432a5b4
static/css/main.79d19d76.css.map,1725760042807,863af17a469ff836e46a378ba7cf2a08b3d4a827991c0be88c37d888414ad7c9
static/media/poster.0fad7cc42115f255a281.png,1725760042805,f3025012e905a2fd748b83ff036dc7fd5dbc6b6aa6493435a0c7a60db866b5bf
static/js/main.426c1b5c.js,1725760042807,af001b316b105908c5ef86295d0485b700bda17be5ad9f0879dc7185cdd38c9a
static/js/main.426c1b5c.js.map,1725760042807,b2fe2e0044e03eb661954cbea4bc4dc4de13e292f9c8a121b37516328b7c23cc
6 changes: 6 additions & 0 deletions .firebase/hosting.cHVibGlj.cache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
manifest.json,1725691795408,4368aeaf848ae2e048765562c289452f33ad2a175c4b1951ea8bdf2ada0d5b10
robots.txt,1725691795409,b2090cf9761ef60aa06e4fab97679bd43dfa5e5df073701ead5879d7c68f1ec5
logo512.png,1725691795407,212b102aa09e51b3b3e06647e81f7801a61333e171f6582e8124379aabccb41d
index.html,1725758286161,7254e94427bdd5d19a4e7f8deb39d70a216cf710a5b1d3f0a54ef16e25037685
favicon.ico,1725691795404,27edce7be5922cf0bef7d4136f69b5bfbdd5bf8c13c7b026f71187d41a00aa7d
logo192.png,1725691795406,79e2b749561016bc8af300ea19f48347ceed3cb1a54f48ae456172eca45e08f0
2 changes: 1 addition & 1 deletion public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>藝通台北</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
4 changes: 2 additions & 2 deletions src/components/ArtDetail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const DetailComponent = () => {
// 檢查 currentLocation 是否存在，否則不渲染
if (!artPiece || !currentLocation) return <p>加載中...</p>;

const isCheckInEnabled = distance && distance < 50;
const isCheckInEnabled = distance && distance < 500;

return (
<div className="container my-5">
Expand All @@ -107,7 +107,7 @@ const DetailComponent = () => {

<span className="d-inline-block" tabIndex="0" data-bs-toggle="tooltip">
<button className="btn btn-primary" disabled={!isCheckInEnabled} style={{ backgroundColor: '#5AB4C5', border: 'none', color: 'white', padding: '10px' }}>
{isCheckInEnabled ? "打卡" : `距離需小於50公尺，當前距離: ${distance} 公尺`}
{isCheckInEnabled ? "打卡" : `距離需小於500公尺，當前距離: ${distance} 公尺`}
</button>
</span>
</div>
Expand Down
2 changes: 0 additions & 2 deletions src/components/ArtMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ const MapComponent = () => {
<h3>${name}</h3>
<p>作者: ${author}</p>
<img src="${imageUrl}" alt="${name}" style="width:200px;">
<br><br>
<button onclick="window.location.href='${detailUrl}';">看更多</button>
</div>
`);
infoWindow.open(map, marker);
Expand Down