Skip to content

Commit

Permalink
Vf 123 fiks manglende keys (#249)
Browse files Browse the repository at this point in the history
* Add keys to mappings

* Remove curly braces

* Fixed staging site key error

* ApplyReg default value options fix

* UserAvatar image fix, remove apple touch icon, remove logo192 and logo512 from manifest

* Code smell fix

---------

Co-authored-by: aaryanneupane <[email protected]>
  • Loading branch information
supergelf and aaryanneupane authored Oct 12, 2023
1 parent a921316 commit 826a819
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 26 deletions.
1 change: 0 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<meta name="description" content="Vektorprogrammet er Norges største organisasjon som jobber for å øke interessen for matematikk og realfag blant elever i grunnskolen. Vi sender realfagssterke studenter til barne- og ungdomsskoler hvor de fungerer som lærerens assistent.">
<meta property="og:site_name" content="Vektorprogrammet">

<link rel="apple-touch-icon" href="/logo192.png" />
<link rel="manifest" href="/manifest.json" />
<title>Vektorprogrammet</title>
</head>
Expand Down
10 changes: 0 additions & 10 deletions public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,6 @@
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
Expand Down
4 changes: 2 additions & 2 deletions src/components/Header/UserAvatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ const UserAvatar = () => {
return (
<button tabIndex={0} className="dropdown dropdown-end" type="button">
<div className="btn btn-ghost btn-circle avatar">
<div className="w-10 rounded-full">
<div className="w-12 rounded-full">
<img
src="https://placeimg.com/80/80/people"
src="https://placekitten.com/80/80"
alt="profile avatar"
/>
</div>
Expand Down
10 changes: 5 additions & 5 deletions src/pages/public/Assistenter/components/ApplyReg.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@ export const ApplyCard = (props: any) => {
</div>

<div className="my-4 space-x-4">
<select className="p-2 rounded border-solid border-2 border-vektor-darblue text-vektor-darblue font-bold">
<option value="" disabled selected hidden>
<select className="p-2 rounded border-solid border-2 border-vektor-darblue text-vektor-darblue font-bold" defaultValue="Kjønn">
<option value="Kjønn" disabled>
Kjønn
</option>
<option className="">Mann</option>
<option>Kvinne</option>
<option>Annet</option>
</select>

<select className="p-2 rounded border-solid border-2 border-vektor-darblue text-vektor-darblue font-bold">
<option value="" disabled selected hidden>
<select className="p-2 rounded border-solid border-2 border-vektor-darblue text-vektor-darblue font-bold" defaultValue="Årstrinn">
<option value="Årstrinn" disabled>
Årstrinn
</option>
<option>1. klasse</option>
Expand All @@ -89,4 +89,4 @@ export const ApplyCard = (props: any) => {
</form>
);
};
export default ApplyCard;
export default ApplyCard;
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const Tabs = (): JSX.Element => {
city={value}
onTabClick={() => setOpenTab(value)}
open={openTab === value}
key={value}
/>
))}
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/public/ForSkoler/components/ForSkoler.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const ForSkoler = (): JSX.Element => {
},
].map(({ city, email, url }) => {
return (
<tr>
<tr key={city}>
<td className="py-3 px-6">{city}</td>
<td className="py-3 px-6">
<a
Expand Down
2 changes: 1 addition & 1 deletion src/pages/public/Kontakt/components/Division.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const Division = ({

{contactInfos.map((data, id) => {
return (
<div className="py-2 mt-5">
<div className="py-2 mt-5" key={data.name}>
<div className="text-blue-800">{contactInfos[id].name}</div>
{contactInfos[id].title && <div>{contactInfos[id].title}</div>}
<a className="text-sm hover:underline" href={`mailto:${contactInfos[id].mail}`}>{contactInfos[id].mail}</a>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/public/Kontakt/components/KontaktOss.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const Tabs = ({
{divisions.map((data) => {
const chosenStyle = openTab === data.number ? `border-t-gray-200 border-l-gray-200 border-r-gray-200 border-b-white text-vektor-darblue z-50` : `text-vektor-darblue z-50`;
return (
<div className="flex-auto text-center border-gray-200 border-b-2 -mb-[2px]">
<div className="flex-auto text-center border-gray-200 border-b-2 -mb-[2px]" key={data.name}>
<button
type="button"
className={`rounded-t-lg -mb-[2px] z-50 text-base w-full font-bold py-3 border-b-gray-200 hover:border-2 hover:border-gray-200 hover:text-vektor-blue border-2 border-b-2 border-white ${chosenStyle}`}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const ServerOverview = (): JSX.Element => {
<tbody>
{servers?.map((server, index) => {
return (
<>
<React.Fragment key={server.branch}>
<tr
key={server.branch}
onClick={() => {
Expand Down Expand Up @@ -82,7 +82,7 @@ const ServerOverview = (): JSX.Element => {
: null}
</td>
</tr>
</>
</React.Fragment>
);
})}
</tbody>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/public/Team/components/TeamCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ const TeamCard = ({
<div className="flex w-full mx-auto justify-around flex-wrap">
<div className="max-w-6xl mt-5 flex flex-col">
<h1 className="text-gray-600 text-4xl font-bold mx-3 dark:text-gray-200">{title}</h1>
<p className="max-w-md mt-4 mb-20 text-xl mx-3 dark:text-gray-300">
<div className="max-w-md mt-4 mb-20 text-xl mx-3 dark:text-gray-300">
<span className="mb-4">{text1}</span>
{text2}
<div className="mt-6">
<strong>{text3}</strong>
</div>
</p>
</div>
</div>
<div className="mt-10 relative">
<div className="w-full absolute top-20 overflow-visible">
Expand Down
2 changes: 1 addition & 1 deletion src/pages/public/Team/components/TeamTabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const Tabs = ({
<ul className="flex flex-wrap text-sm font-medium text-center border-gray dark:text-gray-400" role="tablist">
{divisions.map((data) => {
return (
<li className="-mb-px mr-0 last:mr-0 flex-auto text-center">
<li className="-mb-px mr-0 last:mr-0 flex-auto text-center" key={data.name}>
<a
className={`tab-boxed tab-lg text-base font-bold px-1 py-3 block line leading-normal
rounded-t-lg
Expand Down

0 comments on commit 826a819

Please sign in to comment.