Skip to content

Commit

Permalink
style: format all files with prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
42tte committed Sep 9, 2024
1 parent f01606c commit f3fc866
Show file tree
Hide file tree
Showing 92 changed files with 1,451 additions and 732 deletions.
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Please provide a brief summary of the changes you’ve made. Explain the purpose

If applicable, please include screenshots or a short video showcasing the changes you have made.

*Insert images or videos here.*
_Insert images or videos here._

---

Expand All @@ -24,4 +24,4 @@ Please ensure that you’ve completed the following checkpoints before submittin

## Additional Notes

Other comments relevant to this pull request.
Other comments relevant to this pull request.
10 changes: 5 additions & 5 deletions pages/api/files.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {utapi} from '../../src/server/uploadthing'
import { utapi } from '../../src/server/uploadthing';

export default async function handler(_:any, res:any) {
const data = await utapi.listFiles();
res.status(200).json(data);
}
export default async function handler(_: any, res: any) {
const data = await utapi.listFiles();
res.status(200).json(data);
}
6 changes: 3 additions & 3 deletions pages/api/uploadthing.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { createRouteHandler } from "uploadthing/next-legacy";
import { createRouteHandler } from 'uploadthing/next-legacy';

import { uploadRouter } from "../../src/server/uploadthing";
import { uploadRouter } from '../../src/server/uploadthing';

const handler = createRouteHandler({
router: uploadRouter,
});

export default handler;
export default handler;
2 changes: 1 addition & 1 deletion pages/hemsedal24/aktiviteter.tsx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'src/hemsedal24/activities';
export { default } from 'src/hemsedal24/activities';
2 changes: 1 addition & 1 deletion pages/hemsedal24/bilder.tsx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export {default} from '../../src/hemsedal24/bilder'
export { default } from '../../src/hemsedal24/bilder';
2 changes: 1 addition & 1 deletion pages/hemsedal24/index.tsx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'src/hemsedal24/index';
export { default } from 'src/hemsedal24/index';
2 changes: 1 addition & 1 deletion pages/hemsedal24/lastopp.tsx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export {default} from 'src/hemsedal24/upload'
export { default } from 'src/hemsedal24/upload';
2 changes: 1 addition & 1 deletion pages/hemsedal24/tingogtang.tsx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'src/hemsedal24/tingogtang'
export { default } from 'src/hemsedal24/tingogtang';
1 change: 0 additions & 1 deletion pages/jobs/[listing].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ export const getStaticProps: GetStaticProps<
};
}


const contactEmails = listing.contact_emails?.split(',').map((e) => e.trim());
let contacts: EmployeeItem[] = [];
if (contactEmails?.length) {
Expand Down
2 changes: 1 addition & 1 deletion pages/startskudd.tsx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export {default} from "src/startskudd"
export { default } from 'src/startskudd';
2 changes: 1 addition & 1 deletion pages/varianttur/guildford23/aktiviteter.tsx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'src/varianttur/guildford23/aktiviteter';
export { default } from 'src/varianttur/guildford23/aktiviteter';
2 changes: 1 addition & 1 deletion pages/varianttur/guildford23/bliKjent.tsx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'src/varianttur/guildford23/bliKjent';
export { default } from 'src/varianttur/guildford23/bliKjent';
2 changes: 1 addition & 1 deletion pages/varianttur/guildford23/index.tsx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'src/varianttur/guildford23';
export { default } from 'src/varianttur/guildford23';
2 changes: 1 addition & 1 deletion pages/varianttur/guildford23/tips.tsx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'src/varianttur/guildford23/tips';
export { default } from 'src/varianttur/guildford23/tips';
2 changes: 1 addition & 1 deletion pages/vidsyn.tsx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'src/vidsyn';
export { default } from 'src/vidsyn';
74 changes: 37 additions & 37 deletions src/advanced-calculator/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,41 +184,41 @@ export const payscale = {
'1982': '1420658',
},
'2024': {
"2024" : "600000",
"2023" : "635833",
"2022" : "681829",
"2021" : "734982",
"2020" : "789982",
"2019" : "838539",
"2018" : "879553",
"2017" : "916886",
"2016" : "949000",
"2015" : "977333",
"2014" : "1005324",
"2013" : "1031405",
"2012" : "1064738",
"2011" : "1091489",
"2010" : "1113742",
"2009" : "1138742",
"2008" : "1166667",
"2007" : "1192460",
"2006" : "1210126",
"2005" : "1233560",
"2004" : "1264767",
"2003" : "1289780",
"2002" : "1299680",
"2001" : "1295953",
"2000" : "1305501",
"1999" : "1328501",
"1998" : "1349349",
"1997" : "1365121",
"1996" : "1384832",
"1995" : "1399711",
"1994" : "1422069",
"1993" : "1429358",
"1992" : "1452891",
"1991" : "1458021",
"1990" : "1467321",
"1989" : "1484721"
}
'2024': '600000',
'2023': '635833',
'2022': '681829',
'2021': '734982',
'2020': '789982',
'2019': '838539',
'2018': '879553',
'2017': '916886',
'2016': '949000',
'2015': '977333',
'2014': '1005324',
'2013': '1031405',
'2012': '1064738',
'2011': '1091489',
'2010': '1113742',
'2009': '1138742',
'2008': '1166667',
'2007': '1192460',
'2006': '1210126',
'2005': '1233560',
'2004': '1264767',
'2003': '1289780',
'2002': '1299680',
'2001': '1295953',
'2000': '1305501',
'1999': '1328501',
'1998': '1349349',
'1997': '1365121',
'1996': '1384832',
'1995': '1399711',
'1994': '1422069',
'1993': '1429358',
'1992': '1452891',
'1991': '1458021',
'1990': '1467321',
'1989': '1484721',
},
} as HistoricalPayscaleData;
28 changes: 19 additions & 9 deletions src/bergen/bergensvyer/index.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,11 @@
grid-template-areas: 'left right';

max-width: 1300px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.11), 0 2px 2px rgba(0, 0, 0, 0.11),
0 4px 4px rgba(0, 0, 0, 0.11), 0 6px 8px rgba(0, 0, 0, 0.11),
box-shadow:
0 1px 1px rgba(0, 0, 0, 0.11),
0 2px 2px rgba(0, 0, 0, 0.11),
0 4px 4px rgba(0, 0, 0, 0.11),
0 6px 8px rgba(0, 0, 0, 0.11),
0 8px 16px rgba(0, 0, 0, 0.11);

overflow: hidden;
Expand Down Expand Up @@ -98,7 +101,8 @@

@media (max-width: 1100px) {
.page2 {
background: url('./assets/bg-page2-alt1.svg') top left no-repeat,
background:
url('./assets/bg-page2-alt1.svg') top left no-repeat,
url('./assets/bg-page2-alt2.svg') bottom right no-repeat,
var(--color-secondary4__tint3);
}
Expand All @@ -108,27 +112,31 @@
}

.page3 {
background: url('./assets/bg-page3-1.svg') top left no-repeat,
background:
url('./assets/bg-page3-1.svg') top left no-repeat,
url('./assets/bg-page3-2.svg') bottom center no-repeat,
url('./assets/bg-page3-3.jpg') right 250px no-repeat,
var(--color-secondary4__tint3);
}
@media (max-width: 1100px) {
.page3 {
background: url('./assets/bg-page3-1.svg') -25px top no-repeat,
background:
url('./assets/bg-page3-1.svg') -25px top no-repeat,
url('./assets/bg-page3-2.svg') bottom center no-repeat,
var(--color-secondary4__tint3);
}
}

.page4 {
background: url('./assets/bg-page4-2.svg') bottom left no-repeat,
background:
url('./assets/bg-page4-2.svg') bottom left no-repeat,
url('./assets/bg-page4-3.jpg') bottom right no-repeat,
var(--color-secondary4__tint3);
}
@media (max-width: 1100px) {
.page4 {
background: url('./assets/bg-page4-2.svg') bottom left no-repeat,
background:
url('./assets/bg-page4-2.svg') bottom left no-repeat,
var(--color-secondary4__tint3);
}
}
Expand All @@ -142,13 +150,15 @@
}

.page5 {
background: url('./assets/bg-page5-1.svg') bottom left no-repeat,
background:
url('./assets/bg-page5-1.svg') bottom left no-repeat,
url('./assets/bg-page5-2.svg') top right no-repeat;
}

@media (max-width: 1100px) {
.page5 {
background: url('./assets/bg-page5-1.svg') -50px 130% no-repeat,
background:
url('./assets/bg-page5-1.svg') -50px 130% no-repeat,
url('./assets/bg-page5-2.svg') top right no-repeat;
}
}
Expand Down
4 changes: 3 additions & 1 deletion src/berlin23/varianttur.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,9 @@
border-right: var(--thickness) solid var(--color);
border-bottom: var(--thickness) solid var(--color);
transform: rotate(45deg);
animation: bounce 3.5s infinite, fadeIn 1s 1 forwards;
animation:
bounce 3.5s infinite,
fadeIn 1s 1 forwards;
animation-delay: 3s;
opacity: 0;
display: none;
Expand Down
7 changes: 5 additions & 2 deletions src/components/page-header/page-header.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,17 @@
left: 0;
background-color: rgba(0, 0, 0, 0.4);
transform: translateX(0%);
transition: transform 450ms ease-in-out,
transition:
transform 450ms ease-in-out,
background-color 300ms ease-in-out 300ms;
z-index: 99;
}

.header__nav__hidden {
transform: translateX(100%);
transition: transform 450ms ease-in-out, background-color 100ms ease-in-out;
transition:
transform 450ms ease-in-out,
background-color 100ms ease-in-out;
background-color: rgba(0, 0, 0, 0);
}

Expand Down
52 changes: 37 additions & 15 deletions src/helsinki23/components/Collapsable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,47 @@ import { ReactNode, useState } from 'react';
import styles from './Collapsable.module.css';
import collapseIcon from '../images/collapse.svg';

const Collapsable: React.FC<{ title: string, children: ReactNode }> = ({ title, children }) => {

const Collapsable: React.FC<{ title: string; children: ReactNode }> = ({
title,
children,
}) => {
const [isOpen, setIsOpen] = useState<boolean>(false);

const split = title.indexOf(' ');

return <div className={`${styles.collapsable} ${isOpen ? styles.open : styles.closed}`}>
<div tabIndex={0} className={styles.header} role='button' onClick={() => setIsOpen((s) => !s)} onKeyDown={(e) => {
if (e.key == "Enter") {
setIsOpen((s) => !s)
}
}}>
<span>{title.slice(0, split)} {split !== -1 && <span className={styles.hidden}>{title.slice(split + 1)}</span>}</span>
<img src={collapseIcon} alt={isOpen ? "close" : "open"} />
</div>
<div className={styles.content} style={{opacity: isOpen ? '1' : '0', transition: 'all 0.2s'}}>
{children}
return (
<div
className={`${styles.collapsable} ${
isOpen ? styles.open : styles.closed
}`}
>
<div
tabIndex={0}
className={styles.header}
role="button"
onClick={() => setIsOpen((s) => !s)}
onKeyDown={(e) => {
if (e.key == 'Enter') {
setIsOpen((s) => !s);
}
}}
>
<span>
{title.slice(0, split)}{' '}
{split !== -1 && (
<span className={styles.hidden}>{title.slice(split + 1)}</span>
)}
</span>
<img src={collapseIcon} alt={isOpen ? 'close' : 'open'} />
</div>
<div
className={styles.content}
style={{ opacity: isOpen ? '1' : '0', transition: 'all 0.2s' }}
>
{children}
</div>
</div>
</div>
}
);
};

export default Collapsable;
20 changes: 17 additions & 3 deletions src/helsinki23/components/Container.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
import { ReactNode } from "react";
import { ReactNode } from 'react';
import styles from './Container.module.css';

export default function Container({ children, className, ...props }: { children: ReactNode } & React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>) {
return <div className={`${className ? className : ''} ${styles.container}`} {...props}>{children}</div>
export default function Container({
children,
className,
...props
}: { children: ReactNode } & React.DetailedHTMLProps<
React.HTMLAttributes<HTMLDivElement>,
HTMLDivElement
>) {
return (
<div
className={`${className ? className : ''} ${styles.container}`}
{...props}
>
{children}
</div>
);
}
Loading

0 comments on commit f3fc866

Please sign in to comment.