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

Finished sketching out quests, misc improvements #25

Merged
merged 7 commits into from
Oct 6, 2022
Merged

Finished sketching out quests, misc improvements #25

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3340113
Minor edits to bosses
davvolun Oct 1, 2022
b29015b
Finish sketching out quests
davvolun Oct 1, 2022
79504dc
Add terms to workspace directory
davvolun Oct 1, 2022
6eb22b5
Add url to list props and map link to items
davvolun Oct 1, 2022
2674ebc
Fix issues on PR
davvolun Oct 5, 2022
85f7e61
Make periods consistent at eol
davvolun Oct 5, 2022
418ad2e
Update Deathroot/Gurranq steps (and add game term)
davvolun Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 17 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@
"Aeonia",
"Agheel",
"Ainsel",
"Albinauric",
"Albinaurics",
"Albus",
"Altus",
"Anix",
"Astel",
"Auriza",
"Azula",
"Azur",
"Battlemage",
"Beastclaw",
"Beastman",
"Bernahl",
"Blackblade",
Expand All @@ -25,13 +28,15 @@
"Castleward",
"Celes",
"Chrysalids",
"Clawmark",
"Cleanrot",
"Cliffbottom",
"Cliffside",
"clonedeep",
"Corhyn",
"Crystalian",
"Cursemark",
"Daedicar's",
"Darriwil",
"Deathbird",
"Deathroot",
Expand Down Expand Up @@ -62,13 +67,15 @@
"Faroth",
"Farum",
"Fia's",
"Fingerslayer",
"Forlon",
"Fortissax",
"Garris",
"Gatefront",
"Gateside",
"Gelmir",
"Gilika",
"Glintblade",
"Glintstone",
"Godefroy",
"Godrick",
Expand All @@ -78,6 +85,7 @@
"Gransax",
"Gravepost",
"Greatbridge",
"Greathammer",
"Greatshield",
"Greatsword",
"Greyll",
Expand All @@ -92,6 +100,8 @@
"Hugues",
"Hyetta",
"Irina",
"Irith",
"Istvan",
"Jarburg",
"Kalé",
"Knifeprint",
Expand All @@ -110,6 +120,7 @@
"Loux",
"Lucaria",
"Lusat",
"Magnus",
"Makar",
"Malenia",
"Maliketh",
Expand Down Expand Up @@ -138,6 +149,7 @@
"Omenkiller",
"Ordina",
"Ordovis",
"Pidia",
"Placidusax",
"playthrough",
"Precipe",
Expand All @@ -154,6 +166,7 @@
"Redmane",
"Renna",
"Rennala",
"Rileigh",
"Ringblade",
"Roadmap",
"Roderika",
Expand All @@ -171,6 +184,7 @@
"Sellia",
"Sellian",
"Seluvis",
"Serpentbone",
"Shabriri",
"Shoreside",
"Shotel",
Expand Down Expand Up @@ -201,13 +215,15 @@
"Twinblade",
"Varré",
"Vyke",
"Warhammer",
"Warmaster's",
"Whiteridge",
"Witchbane",
"Wormface",
"Wyrm",
"Yelough",
"Yura",
"Zamor"
"Zamor",
"Zorayas"
]
}
32 changes: 30 additions & 2 deletions components/checkboxContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,18 @@ const CheckboxContainer = (props: Props) => {
htmlFor={list.id}
className="ml-3 text-elden-ring-green-1000 dark:text-elden-ring-green-0 leading-none"
>
{list.name}
{list.url ? (
<a
href={list.url}
target="_blank"
rel="noreferrer"
className="underline dark:text-elden-ring-green-150"
>
{list.name}
</a>
) : (
list.name
)}
Gobluebro marked this conversation as resolved.
Show resolved Hide resolved
</label>
{list.imageUrl && (
<div className="flex items-center ml-2">
Expand Down Expand Up @@ -135,7 +146,7 @@ const CheckboxContainer = (props: Props) => {
isOpen ? "block" : "hidden"
}`}
>
{list.requirements.map(({ id, description, url }) => (
{list.requirements.map(({ id, description, url, mapLink }) => (
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see other comments about just using jsx

Suggested change
{list.requirements.map(({ id, description, url, mapLink }) => (

<div
key={id}
className={!showCompleted && checkedState[id] ? "hidden" : "block"}
Expand All @@ -153,6 +164,7 @@ const CheckboxContainer = (props: Props) => {
href={url}
target="_blank"
rel="noreferrer"
tabIndex={-1}
className="underline dark:text-elden-ring-green-150"
>
{description}
Expand All @@ -161,6 +173,22 @@ const CheckboxContainer = (props: Props) => {
description
)}
</label>
{
mapLink ?
(
<span>
<span> [</span>
<a
href={mapLink}
target="_blank"
rel="noreferrer"
tabIndex={-1}
className="underline dark:text-elden-ring-green-150">
Map Link
</a>
<span>]</span>
</span>
) : null }
Comment on lines +176 to +191
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see other comment about this being replaced by just pure jsx.

Suggested change
{
mapLink ?
(
<span>
<span> [</span>
<a
href={mapLink}
target="_blank"
rel="noreferrer"
tabIndex={-1}
className="underline dark:text-elden-ring-green-150">
Map Link
</a>
<span>]</span>
</span>
) : null }

</div>
))}
</div>
Expand Down
8 changes: 4 additions & 4 deletions data/bosses.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const Bosses: Array<ListType> = [
},
{
id: "a0bd6291-7b69-4ff1-9f0a-ea1e7db313dc",
description: "Beast of Farum Azula",
description: "Beastman of Farum Azula",
Gobluebro marked this conversation as resolved.
Show resolved Hide resolved
url: "https://eldenring.wiki.fextralife.com/Beastman+of+Farum+Azula",
},
{
Expand Down Expand Up @@ -67,7 +67,7 @@ export const Bosses: Array<ListType> = [
},
{
id: "6661ea64-18aa-42f1-b26e-a8f30436171e",
description: "Erdtree Burial Watchdog (Impaler Catacombs)",
description: "Erdtree Burial Watchdog (Impaler's Catacombs)",
url: "https://eldenring.wiki.fextralife.com/Erdtree+Burial+Watchdog",
},
{
Expand Down Expand Up @@ -400,7 +400,7 @@ export const Bosses: Array<ListType> = [
},
{
id: "f9060a52-c138-46c7-917c-28cd6bebd018",
description: "Mad Pumpkin Heads",
description: "Mad Pumpkin Head (Duo)",
url: "https://eldenring.wiki.fextralife.com/Mad+Pumpkin+Head",
},
{
Expand Down Expand Up @@ -517,7 +517,7 @@ export const Bosses: Array<ListType> = [
{
id: "5a111a25-094c-43a6-91d6-47d3339f5b65",
description: "Omenkiller & Miranda the Blighted Bloom",
url: "https://eldenring.wiki.fextralife.com/Miranda+the+Blighted+Bloom",
url: "https://eldenring.wiki.fextralife.com/Omenkiller+and+Miranda,+the+Blighted+Bloom",
},
{
id: "ed4562de-6a01-4b9d-8928-25e546083d90",
Expand Down