Skip to content

Commit

Permalink
Merge pull request #374 from stscoundrel/release/2024-02
Browse files Browse the repository at this point in the history
Release/2024 02
  • Loading branch information
stscoundrel authored Feb 24, 2024
2 parents 13b28cd + 1553246 commit 7a2b8be
Show file tree
Hide file tree
Showing 17 changed files with 1,321 additions and 1,401 deletions.
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,26 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"reset-css": "^5.0.2",
"sass": "^1.70.0",
"scandinavian-dictionary-crosslinker": "^0.5.0",
"sass": "^1.71.1",
"scandinavian-dictionary-crosslinker": "^0.6.0",
"sitemap": "^7.1.1",
"slugify": "^1.6.6",
"teljari": "^1.1.1",
"younger-futhark": "^1.2.5"
},
"devDependencies": {
"@types/cleasby-vigfusson-dictionary": "^1.0.2",
"@types/jest": "^29.5.11",
"@types/react": "^18.2.48",
"@typescript-eslint/eslint-plugin": "^6.19.1",
"@typescript-eslint/parser": "^6.19.1",
"cypress": "^13.6.3",
"eslint": "^8.56.0",
"@types/jest": "^29.5.12",
"@types/react": "^18.2.58",
"@typescript-eslint/eslint-plugin": "^7.0.2",
"@typescript-eslint/parser": "^7.0.2",
"cypress": "^13.6.6",
"eslint": "^8.57.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-next": "^14.1.0",
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^27.6.3",
"eslint-plugin-jest": "^27.9.0",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
Expand Down
4 changes: 4 additions & 0 deletions src/components/Crosslinks/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ export default function Crosslinks({ crosslinks }: CrossLinkProps) {
return 'Old Swedish - K.F Söderwall\'s Dictionary'
}

if (source === 'old-danish') {
return 'Old Danish - Otto Kalkar\'s Dictionary'
}

return ''
}

Expand Down
11 changes: 0 additions & 11 deletions src/components/ExternalLink/index.js

This file was deleted.

16 changes: 16 additions & 0 deletions src/components/ExternalLink/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
interface ExternalLinkProps{
href: string,
title: string,
}

export default function ExternalLink({ href, title }: ExternalLinkProps) {
return (
<a
href={href}
target="_blank"
rel="noopener noreferrer"
>
{title}
</a>
)
}
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,11 @@ exports[`Footer component Matches snapshot 1`] = `
</li>
<li>
<a
href="https://github.com/stscoundrel/old-norse-alphabet"
href="https://old-danish-dictionary.vercel.app/"
rel="noopener noreferrer"
target="_blank"
>
Old Norse Alphabet
Otto Kalkar's Old Danish Dictionary
</a>
</li>
</ul>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import ExternalLink from 'components/ExternalLink'
import LetterLink from 'components/LetterLink'
import ContentArea from 'components/ContentArea'
import { AlphabetLetter } from 'lib/services/dictionary'
import styles from './Footer.module.scss'

export default function Footer({ letters }) {
interface FooterProps{
letters: AlphabetLetter[]
}

export default function Footer({ letters }: FooterProps) {
return (
<footer className={styles.section}>
<div className="container">
Expand Down Expand Up @@ -93,8 +98,8 @@ export default function Footer({ letters }) {
</li>
<li>
<ExternalLink
title="Old Norse Alphabet"
href="https://github.com/stscoundrel/old-norse-alphabet"
title="Otto Kalkar's Old Danish Dictionary"
href="https://old-danish-dictionary.vercel.app/"
/>
</li>
</ul>
Expand Down
8 changes: 4 additions & 4 deletions src/components/Layout/__snapshots__/Layout.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -679,11 +679,11 @@ exports[`Layout component Letter layout Matches snapshot 1`] = `
</li>
<li>
<a
href="https://github.com/stscoundrel/old-norse-alphabet"
href="https://old-danish-dictionary.vercel.app/"
rel="noopener noreferrer"
target="_blank"
>
Old Norse Alphabet
Otto Kalkar's Old Danish Dictionary
</a>
</li>
</ul>
Expand Down Expand Up @@ -1811,11 +1811,11 @@ exports[`Layout component Word layout Matches snapshot 1`] = `
</li>
<li>
<a
href="https://github.com/stscoundrel/old-norse-alphabet"
href="https://old-danish-dictionary.vercel.app/"
rel="noopener noreferrer"
target="_blank"
>
Old Norse Alphabet
Otto Kalkar's Old Danish Dictionary
</a>
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/pages/__snapshots__/404.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -680,11 +680,11 @@ exports[`404 page page Matches snapshot 1`] = `
</li>
<li>
<a
href="https://github.com/stscoundrel/old-norse-alphabet"
href="https://old-danish-dictionary.vercel.app/"
rel="noopener noreferrer"
target="_blank"
>
Old Norse Alphabet
Otto Kalkar's Old Danish Dictionary
</a>
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/pages/__snapshots__/index.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1267,11 +1267,11 @@ exports[`Index page Matches snapshot 1`] = `
</li>
<li>
<a
href="https://github.com/stscoundrel/old-norse-alphabet"
href="https://old-danish-dictionary.vercel.app/"
rel="noopener noreferrer"
target="_blank"
>
Old Norse Alphabet
Otto Kalkar's Old Danish Dictionary
</a>
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/pages/__snapshots__/letter.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -12150,11 +12150,11 @@ exports[`Letter page: render Matches snapshot 1`] = `
</li>
<li>
<a
href="https://github.com/stscoundrel/old-norse-alphabet"
href="https://old-danish-dictionary.vercel.app/"
rel="noopener noreferrer"
target="_blank"
>
Old Norse Alphabet
Otto Kalkar's Old Danish Dictionary
</a>
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/pages/__snapshots__/search.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -728,11 +728,11 @@ exports[`Search page: render Matches snapshot 1`] = `
</li>
<li>
<a
href="https://github.com/stscoundrel/old-norse-alphabet"
href="https://old-danish-dictionary.vercel.app/"
rel="noopener noreferrer"
target="_blank"
>
Old Norse Alphabet
Otto Kalkar's Old Danish Dictionary
</a>
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/pages/__snapshots__/word.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -830,11 +830,11 @@ exports[`Word page: render & usage Matches snapshot 1`] = `
</li>
<li>
<a
href="https://github.com/stscoundrel/old-norse-alphabet"
href="https://old-danish-dictionary.vercel.app/"
rel="noopener noreferrer"
target="_blank"
>
Old Norse Alphabet
Otto Kalkar's Old Danish Dictionary
</a>
</li>
</ul>
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/pages/word.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,14 @@ describe('Word page: data fetching', () => {
],
letters: getAlphabet(),
crosslinks: [
{
source: 'old-norwegian',
url: 'https://old-norwegian-dictionary.vercel.app/word/leynidyrr',
},
{
url: 'https://cleasby-vigfusson-dictionary.vercel.app/word/leyni-dyrr',
source: 'old-norse',
},
{
source: 'old-norwegian',
url: 'https://old-norwegian-dictionary.vercel.app/word/leynidyrr',
},
],
},
}
Expand Down
Loading

0 comments on commit 7a2b8be

Please sign in to comment.