From b93fc5a2b3b86bb084466ffe1e3b37b27d326dce Mon Sep 17 00:00:00 2001 From: Alex Johnson Date: Tue, 6 Feb 2024 12:46:14 -0500 Subject: [PATCH 1/5] Allowed newer versions of Node. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ad0f63ff..d3374eda0 100644 --- a/package.json +++ b/package.json @@ -146,6 +146,6 @@ } }, "engines": { - "node": "18" + "node": ">=18" } } From 0bc9ee637670c0609a12861530fa40033b16cd0e Mon Sep 17 00:00:00 2001 From: Alex Johnson Date: Tue, 6 Feb 2024 12:55:30 -0500 Subject: [PATCH 2/5] chore(docs):add Alex's information to openbeta-devs file --- src/assets/contributors-map.geojson | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/assets/contributors-map.geojson b/src/assets/contributors-map.geojson index d66e0ec4a..fc068897b 100644 --- a/src/assets/contributors-map.geojson +++ b/src/assets/contributors-map.geojson @@ -136,6 +136,21 @@ ] } }, + { + "type": "Feature", + "properties": { + "firstName": "Alex", + "githubId": "alexoj46", + "favoriteCrag": "b81f8942-4e04-56eb-a681-84568676c681" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 34.18008, + -85.81680 + ] + } + }, { "type": "Feature", "properties": { From ef46ea323ddff90591c32841b2b8feb95ed65021 Mon Sep 17 00:00:00 2001 From: Alex Johnson Date: Tue, 6 Feb 2024 22:04:38 -0500 Subject: [PATCH 3/5] Added structure for coordinates to be added on climb pages --- src/pages/climbs/[id].tsx | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/pages/climbs/[id].tsx b/src/pages/climbs/[id].tsx index 1c3434e8f..40986f2b8 100644 --- a/src/pages/climbs/[id].tsx +++ b/src/pages/climbs/[id].tsx @@ -35,6 +35,7 @@ import { ClimbList } from '@/app/(default)/editArea/[slug]/general/components/cl import { getArea } from '@/js/graphql/getArea' import { climbLeftRightIndexComparator } from '@/js/utils' import { NeighboringRoutesNav } from '@/components/crag/NeighboringRoute' +import { MapPinLine } from '@phosphor-icons/react/dist/ssr' export const CLIMB_DESCRIPTION_FORM_VALIDATION_RULES: RulesType = { maxLength: { @@ -287,10 +288,28 @@ const Body = ({ climb, leftClimb, rightClimb, parentArea }: ClimbPageProps): JSX )} - {(authorMetadata.createdAt != null || authorMetadata.updatedAt != null) && -
- -
} + {/* trying to put my stuff here */} +
+ + + + LAT,LNG  + my, stuff + {/* {lat.toFixed(5)}, {lng.toFixed(5)} */} + + + + + {(authorMetadata.createdAt != null || authorMetadata.updatedAt != null) && + } +
{!editMode &&
From e9128fcd13a1b50c2a77b412f18fd50482ce90a5 Mon Sep 17 00:00:00 2001 From: Alex Johnson Date: Thu, 8 Feb 2024 19:10:03 -0500 Subject: [PATCH 4/5] Implemented FrontEnd Display for Route Coordinates --- src/pages/climbs/[id].tsx | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/pages/climbs/[id].tsx b/src/pages/climbs/[id].tsx index 40986f2b8..e8ba67ef7 100644 --- a/src/pages/climbs/[id].tsx +++ b/src/pages/climbs/[id].tsx @@ -26,7 +26,7 @@ import { ClientSideFormSaveAction, Skeleton as ContentSkeleton } from '../../com import { ArticleLastUpdate } from '../../components/edit/ArticleLastUpdate' import { TradSportGradeInput, BoulderingGradeInput } from '../../components/edit/form/GradeTextInput' import Grade from '../../js/grades/Grade' -import { removeTypenameFromDisciplines } from '../../js/utils' +import { getMapHref, removeTypenameFromDisciplines } from '../../js/utils' import { TotalLengthInput } from '../../components/edit/form/TotalLengthInput' import { LegacyFAInput } from '../../components/edit/form/LegacyFAInput' import { getClimbById } from '../../js/graphql/api' @@ -111,7 +111,7 @@ const Body = ({ climb, leftClimb, rightClimb, parentArea }: ClimbPageProps): JSX id, name, fa: legacyFA, length, yds, grades, type, content, safety, metadata, ancestors, pathTokens, authorMetadata, parent } = climb - const { climbId } = metadata + const { lat, lng, climbId } = metadata const gradesObj = new Grade(parent.gradeContext, grades, type, parent.metadata.isBoulder) @@ -291,18 +291,28 @@ const Body = ({ climb, leftClimb, rightClimb, parentArea }: ClimbPageProps): JSX {/* trying to put my stuff here */}
LAT,LNG  - my, stuff - {/* {lat.toFixed(5)}, {lng.toFixed(5)} */} + + {(lat != null && lng != null) + ? ( + + {lat.toFixed(5)}, {lng.toFixed(5)} + + ) + : ( + + NA, NA + + )} From c2900454ba3f35a4cf6ce7be229bf3205800c066 Mon Sep 17 00:00:00 2001 From: Alex Johnson <52000958+alexoj46@users.noreply.github.com> Date: Thu, 8 Feb 2024 19:32:37 -0500 Subject: [PATCH 5/5] Restored original package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d3374eda0..3ad0f63ff 100644 --- a/package.json +++ b/package.json @@ -146,6 +146,6 @@ } }, "engines": { - "node": ">=18" + "node": "18" } }