fix yandere

This commit is contained in:
skidoodle 2023-09-16 23:15:55 +02:00
parent 159cc3a2b6
commit cb4ea60dfc
13 changed files with 2859 additions and 337 deletions

View file

@ -1,6 +1,6 @@
{ {
"trailingComma": "es5", "trailingComma": "es5",
"tabWidth": 4, "tabWidth": 2,
"semi": false, "semi": false,
"singleQuote": true "singleQuote": true
} }

View file

@ -19,6 +19,7 @@
"postcss": "8.4.29", "postcss": "8.4.29",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"react-icons": "^4.11.0",
"tailwindcss": "3.3.3", "tailwindcss": "3.3.3",
"typescript": "5.2.2" "typescript": "5.2.2"
} }

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>

Before

Width:  |  Height:  |  Size: 629 B

View file

@ -1,15 +1,13 @@
import { NextApiRequest, NextApiResponse } from 'next' import { NextApiRequest, NextApiResponse } from 'next'
export default function handler(req: NextApiRequest, res: NextApiResponse) { export default function handler(req: NextApiRequest, res: NextApiResponse) {
const { ev, szint, vizsgatargy, evszak, tipus, file } = req.query const { ev, szint, vizsgatargy, idoszak, tipus, file } = req.query
const pdfBaseUrl = 'https://dload-oktatas.educatio.hu/erettsegi/feladatok_' const baseUrl = 'https://dload-oktatas.educatio.hu/erettsegi/feladatok_'
const zipBaseUrl =
'https://www.oktatas.hu/bin/content/dload/erettsegi/feladatok_'
const missingParams = [] const missingParams = []
if (!ev) missingParams.push('ev') if (!ev) missingParams.push('ev')
if (!szint) missingParams.push('szint') if (!szint) missingParams.push('szint')
if (!evszak) missingParams.push('evszak') if (!idoszak) missingParams.push('evszak')
if (!vizsgatargy) missingParams.push('vizsgatargy') if (!vizsgatargy) missingParams.push('vizsgatargy')
if (!tipus) missingParams.push('tipus') if (!tipus) missingParams.push('tipus')
@ -20,46 +18,75 @@ export default function handler(req: NextApiRequest, res: NextApiResponse) {
} }
let honap let honap
if (evszak === 'osz') { switch (idoszak) {
case 'osz':
honap = 'okt' honap = 'okt'
} else if (evszak === 'tavasz') { break
case 'tavasz':
honap = 'maj' honap = 'maj'
} else { break
default:
return res.status(400).json({ error: 'Érvénytelen évszak' }) return res.status(400).json({ error: 'Érvénytelen évszak' })
} }
let prefix let prefix
if (szint === 'emelt') { switch (szint) {
case 'emelt':
prefix = `e_${vizsgatargy}` prefix = `e_${vizsgatargy}`
} else if (szint === 'kozep') { break
case 'kozep':
prefix = `k_${vizsgatargy}` prefix = `k_${vizsgatargy}`
break
default:
return res.status(400).json({ error: 'Érvénytelen szint' })
} }
const forras = 'for'
const megoldas = 'meg'
const shortev = ev!.slice(-2)
let pdfUrl, zipUrl let pdfUrl, zipUrl
if (vizsgatargy === 'inf' || vizsgatargy === 'infoism') { switch (vizsgatargy) {
if (file === 'forras' && tipus === 'fl') { case 'inf':
zipUrl = `${zipBaseUrl}${ev}${evszak}_${szint}/${prefix}for_${ev!.slice( case 'infoism':
-2 switch (file) {
)}${honap}_${tipus}.zip` case 'forras':
} else if (file === 'megoldas' && tipus === 'ut') { switch (tipus) {
zipUrl = `${zipBaseUrl}${ev}${evszak}_${szint}/${prefix}meg_${ev!.slice( case 'fl':
-2 zipUrl = `${baseUrl}${ev}${idoszak}_${szint}/${prefix}${forras}_${shortev}${honap}_${tipus}.zip`
)}${honap}_${tipus}.zip` pdfUrl = `${baseUrl}${ev}${idoszak}_${szint}/${prefix}_${shortev}${honap}_${tipus}.pdf`
} else if (file === 'megoldas' && tipus === 'fl') { break
zipUrl = `${zipBaseUrl}${ev}${evszak}_${szint}/${prefix}meg_${ev!.slice( case 'ut':
-2 zipUrl = `${baseUrl}${ev}${idoszak}_${szint}/${prefix}${forras}_${shortev}${honap}_fl.zip`
)}${honap}_ut.zip` pdfUrl = `${baseUrl}${ev}${idoszak}_${szint}/${prefix}_${shortev}${honap}_${tipus}.pdf`
} else if (file === 'forras' && tipus === 'ut') { break
zipUrl = `${zipBaseUrl}${ev}${evszak}_${szint}/${prefix}for_${ev!.slice( default:
-2
)}${honap}_fl.zip`
} else {
return res.status(400).json({ error: 'Érvénytelen fájltípus' }) return res.status(400).json({ error: 'Érvénytelen fájltípus' })
} }
} else { break
pdfUrl = `${pdfBaseUrl}${ev}${evszak}_${szint}/${prefix}_${ev!.slice( case 'megoldas':
switch (tipus) {
case 'ut':
zipUrl = `${baseUrl}${ev}${idoszak}_${szint}/${prefix}${megoldas}_${shortev}${honap}_${tipus}.zip`
pdfUrl = `${baseUrl}${ev}${idoszak}_${szint}/${prefix}_${shortev}${honap}_${tipus}.pdf`
break
case 'fl':
zipUrl = `${baseUrl}${ev}${idoszak}_${szint}/${prefix}${megoldas}_${shortev}${honap}_ut.zip`
pdfUrl = `${baseUrl}${ev}${idoszak}_${szint}/${prefix}_${shortev}${honap}_${tipus}.pdf`
break
default:
return res.status(400).json({ error: 'Érvénytelen fájltípus' })
}
break
default:
return res.status(400).json({ error: 'Érvénytelen fájltípus' })
}
break
default:
pdfUrl = `${baseUrl}${ev}${idoszak}_${szint}/${prefix}_${ev!.slice(
-2 -2
)}${honap}_${tipus}.pdf` )}${honap}_${tipus}.pdf`
break
} }
res.status(200).json({ pdfUrl, zipUrl }) res.status(200).json({ pdfUrl, zipUrl })

View file

@ -1,3 +1,4 @@
import Link from 'next/link'
import { useState, useEffect } from 'react' import { useState, useEffect } from 'react'
export default function Home() { export default function Home() {
@ -5,19 +6,19 @@ export default function Home() {
const [zipLink, setZipLink] = useState<string>('') const [zipLink, setZipLink] = useState<string>('')
const [selectedSubject, setSelectedSubject] = useState<string>('') const [selectedSubject, setSelectedSubject] = useState<string>('')
const [selectedYear, setSelectedYear] = useState<string>('') const [selectedYear, setSelectedYear] = useState<string>('')
const [selectedSeason, setSelectedSeason] = useState<string>('') const [selectedPeriod, setSelectedPeriod] = useState<string>('')
const [selectedLevel, setSelectedLevel] = useState<string>('') const [selectedLevel, setSelectedLevel] = useState<string>('')
const [selectedType, setSelectedType] = useState<string>('') const [selectedType, setSelectedType] = useState<string>('')
const [selectedFile, setSelectedFile] = useState<string>('') const [selectedFile, setSelectedFile] = useState<string>('')
const subjects = [ const subjects = [
{ value: 'magyir', label: 'Magyar' }, { value: 'magyir', label: 'Magyar nyelv és irodalom' },
{ value: 'mat', label: 'Matek' }, { value: 'mat', label: 'Matematika' },
{ value: 'tort', label: 'Történelem' }, { value: 'tort', label: 'Történelem' },
{ value: 'angol', label: 'Angol' }, { value: 'angol', label: 'Angol nyelv' },
{ value: 'nemet', label: 'Német' }, { value: 'nemet', label: 'Német nyelv' },
{ value: 'inf', label: 'Közismereti Informatika' }, { value: 'inf', label: 'Informatika' },
{ value: 'infoism', label: 'Szakmai Informatika' }, { value: 'infoism', label: 'Informatikai ismeretek' },
] ]
const [years, setYears] = useState<string[]>([]) const [years, setYears] = useState<string[]>([])
@ -25,7 +26,7 @@ export default function Home() {
useEffect(() => { useEffect(() => {
const currentYear = new Date().getFullYear() const currentYear = new Date().getFullYear()
const availableYears: string[] = [] const availableYears: string[] = []
for (let year = currentYear; year >= 2005; year--) { for (let year = currentYear; year >= 2013; year--) {
availableYears.push(year.toString()) availableYears.push(year.toString())
} }
setYears(availableYears) setYears(availableYears)
@ -34,21 +35,22 @@ export default function Home() {
useEffect(() => { useEffect(() => {
const fetchData = async () => { const fetchData = async () => {
try { try {
let url = `/api/erettsegi?vizsgatargy=${selectedSubject}&ev=${selectedYear}&evszak=${selectedSeason}&szint=${selectedLevel}&tipus=${selectedType}` let url = `/api/erettsegi?vizsgatargy=${selectedSubject}&ev=${selectedYear}&idoszak=${selectedPeriod}&szint=${selectedLevel}&tipus=${selectedType}`
if ( switch (selectedSubject) {
selectedSubject === 'inf' || case 'inf':
selectedSubject === 'infoism' case 'infoism':
) {
url += `&file=${selectedFile}` url += `&file=${selectedFile}`
} else { break
url += `&file="none"` default:
break
} }
const response = await fetch(url) const response = await fetch(url)
if (response.ok) { if (response.ok) {
const data = await response.json() const data = await response.json()
if (data.pdfUrl) { if (data.pdfUrl) {
setPdfLink(data.pdfUrl) setPdfLink(data.pdfUrl)
} else { } else {
@ -71,7 +73,7 @@ export default function Home() {
}, [ }, [
selectedSubject, selectedSubject,
selectedYear, selectedYear,
selectedSeason, selectedPeriod,
selectedLevel, selectedLevel,
selectedType, selectedType,
selectedFile, selectedFile,
@ -87,12 +89,9 @@ export default function Home() {
onChange={(e) => setSelectedSubject(e.target.value)} onChange={(e) => setSelectedSubject(e.target.value)}
className="bg-[#181a1b] text-[#efefef] w-56 max-w-lg h-10 px-4 text-sm border border-[#3C4143] rounded-lg focus:outline-none" className="bg-[#181a1b] text-[#efefef] w-56 max-w-lg h-10 px-4 text-sm border border-[#3C4143] rounded-lg focus:outline-none"
> >
<option value="">Tantárgy</option> <option value="">Tárgy</option>
{subjects.map((subject) => ( {subjects.map((subject) => (
<option <option key={subject.value} value={subject.value}>
key={subject.value}
value={subject.value}
>
{subject.label} {subject.label}
</option> </option>
))} ))}
@ -114,11 +113,11 @@ export default function Home() {
</div> </div>
<div className="mb-3"> <div className="mb-3">
<select <select
value={selectedSeason} value={selectedPeriod}
onChange={(e) => setSelectedSeason(e.target.value)} onChange={(e) => setSelectedPeriod(e.target.value)}
className="bg-[#181a1b] text-[#efefef] w-56 max-w-lg h-10 px-4 text-sm border border-[#3C4143] rounded-lg focus:outline-none" className="bg-[#181a1b] text-[#efefef] w-56 max-w-lg h-10 px-4 text-sm border border-[#3C4143] rounded-lg focus:outline-none"
> >
<option value="">Évszak</option> <option value="">Időszak</option>
<option value="tavasz">Tavasz</option> <option value="tavasz">Tavasz</option>
<option value="osz">Ősz</option> <option value="osz">Ősz</option>
</select> </select>
@ -145,14 +144,11 @@ export default function Home() {
<option value="ut">Útmutató</option> <option value="ut">Útmutató</option>
</select> </select>
</div> </div>
{selectedSubject === 'inf' || {selectedSubject === 'inf' || selectedSubject === 'infoism' ? (
selectedSubject === 'infoism' ? (
<div className="mb-3"> <div className="mb-3">
<select <select
value={selectedFile} value={selectedFile}
onChange={(e) => onChange={(e) => setSelectedFile(e.target.value)}
setSelectedFile(e.target.value)
}
className="bg-[#181a1b] text-[#efefef] w-56 max-w-lg h-10 px-4 text-sm border border-[#3C4143] rounded-lg focus:outline-none" className="bg-[#181a1b] text-[#efefef] w-56 max-w-lg h-10 px-4 text-sm border border-[#3C4143] rounded-lg focus:outline-none"
> >
<option value="">Fájl</option> <option value="">Fájl</option>
@ -163,24 +159,38 @@ export default function Home() {
) : null} ) : null}
<button <button
className="mt-3 bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded" className="mt-3 bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded"
onClick={ onClick={pdfLink ? () => window.open(pdfLink) : () => {}}
pdfLink ? () => window.open(pdfLink) : () => {}
}
> >
Megnyitás Megnyitás
</button> </button>
{selectedSubject === 'inf' || {selectedSubject === 'inf' || selectedSubject === 'infoism' ? (
selectedSubject === 'infoism' ? (
<button <button
className="mt-3 bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded" className="mt-3 bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded"
onClick={ onClick={zipLink ? () => window.open(zipLink) : () => {}}
zipLink ? () => window.open(zipLink) : () => {}
}
> >
Letöltés Letöltés
</button> </button>
) : null} ) : null}
</div> </div>
<div className="fixed bottom-5 left-0 right-0 text-center py-4">
<p className="text-sm text-gray-400">
<Link
href="https://albert.lol"
target="_blank"
className="text-blue-500 hover:text-blue-700"
>
albert
</Link>
{' | '}
<Link
href="https://github.com/skidoodle/erettsegi-browser"
target="_blank"
className="text-blue-500 hover:text-blue-700"
>
github
</Link>
</p>
</div>
</div> </div>
</main> </main>
) )

View file

@ -6,15 +6,6 @@ const config: Config = {
'./src/components/**/*.{js,ts,jsx,tsx,mdx}', './src/components/**/*.{js,ts,jsx,tsx,mdx}',
'./src/app/**/*.{js,ts,jsx,tsx,mdx}', './src/app/**/*.{js,ts,jsx,tsx,mdx}',
], ],
theme: {
extend: {
backgroundImage: {
'gradient-radial': 'radial-gradient(var(--tw-gradient-stops))',
'gradient-conic':
'conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))',
},
},
},
plugins: [],
} }
export default config export default config

2495
yarn.lock Normal file

File diff suppressed because it is too large Load diff