Skip to content

Commit

Permalink
style: fix linting
Browse files Browse the repository at this point in the history
  • Loading branch information
JohanHjelsethStorstad committed Oct 23, 2024
1 parent d2edc3b commit c8322e4
Show file tree
Hide file tree
Showing 49 changed files with 315 additions and 308 deletions.
6 changes: 3 additions & 3 deletions src/actions/career/companies/create.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use server'
import { Action } from "@/actions/Action"
import { Companies } from "@/services/career/companies"
import { Action } from '@/actions/Action'
import { Companies } from '@/services/career/companies'

export const createCompanyAction = Action(Companies.create)
export const createCompanyAction = Action(Companies.create)
6 changes: 3 additions & 3 deletions src/actions/career/companies/destroy.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use server'
import { ActionNoData } from "@/actions/Action"
import { Companies } from "@/services/career/companies"
import { ActionNoData } from '@/actions/Action'
import { Companies } from '@/services/career/companies'

export const destroyCompanyAction = ActionNoData(Companies.destory)
export const destroyCompanyAction = ActionNoData(Companies.destory)
6 changes: 3 additions & 3 deletions src/actions/career/companies/read.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use server'
import { ActionNoData } from "@/actions/Action"
import { Companies } from "@/services/career/companies"
import { ActionNoData } from '@/actions/Action'
import { Companies } from '@/services/career/companies'

export const readCompanyPageAction = ActionNoData(Companies.readPage)
export const readCompanyPageAction = ActionNoData(Companies.readPage)
6 changes: 3 additions & 3 deletions src/actions/career/companies/update.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use server'
import { Action } from "@/actions/Action"
import { Companies } from "@/services/career/companies"
import { Action } from '@/actions/Action'
import { Companies } from '@/services/career/companies'

export const updateComanyAction = Action(Companies.update)
export const updateComanyAction = Action(Companies.update)
10 changes: 5 additions & 5 deletions src/app/_components/Cms/Article/Article.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import ChangeName from './ChangeName'
import CmsImage from '@/cms/CmsImage/CmsImage'
import SlideInOnView from '@/components/SlideInOnView/SlideInOnView'
import ArticleSection from '@/cms/ArticleSection/ArticleSection'
import type { ReactNode } from 'react'
import type { ExpandedArticle } from '@/cms/articles/Types'
import { ReactNode } from 'react'

export type PropTypes = {
article: ExpandedArticle,
Expand All @@ -17,10 +17,10 @@ export type PropTypes = {
sideBarClassName?: string
}

export default function Article({
article,
coverImageClass,
hideCoverImage = false,
export default function Article({
article,
coverImageClass,
hideCoverImage = false,
noMargin = false,
sideBarContent,
sideBarClassName,
Expand Down
2 changes: 1 addition & 1 deletion src/app/_components/Cms/CmsImage/CmsImageClient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default function CmsImageClient({

return (
<div className={`${styles.CmsImage} ${className}`}>
{(image && !disableEditor ) && <CmsImageEditor cmsImage={{ ...cmsImage, image }}/>}
{(image && !disableEditor) && <CmsImageEditor cmsImage={{ ...cmsImage, image }}/>}
<div className={styles.children}>{children}</div>
{image &&
<Image
Expand Down
62 changes: 31 additions & 31 deletions src/app/_components/Company/Company.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { CompanyExpanded } from "@/services/career/companies/Types"
import CmsImage from "@/cms/CmsImage/CmsImage"
import CmsImageClient from "@/cms/CmsImage/CmsImageClient"
import styles from './Company.module.scss'
import { SessionMaybeUser } from "@/auth/Session"
import { DestroyCompanyAuther, UpdateCompanyAuther } from "@/services/career/companies/Authers"
import { SettingsHeaderItemPopUp } from "../HeaderItems/HeaderItemPopUp"
import Form from "@/components/Form/Form"
import { updateComanyAction } from "@/actions/career/companies/update"
import TextInput from "../UI/TextInput"
import { destroyCompanyAction } from "@/actions/career/companies/destroy"
import SelectCompany from "./SelectCompany"
import SelectCompany from './SelectCompany'
import { SettingsHeaderItemPopUp } from '@/components/HeaderItems/HeaderItemPopUp'
import TextInput from '@/UI/TextInput'
import CmsImage from '@/cms/CmsImage/CmsImage'
import CmsImageClient from '@/cms/CmsImage/CmsImageClient'
import { DestroyCompanyAuther, UpdateCompanyAuther } from '@/services/career/companies/Authers'
import Form from '@/components/Form/Form'
import { updateComanyAction } from '@/actions/career/companies/update'
import { destroyCompanyAction } from '@/actions/career/companies/destroy'
import type { CompanyExpanded } from '@/services/career/companies/Types'
import type { SessionMaybeUser } from '@/auth/Session'

type PropTypes = {
company: CompanyExpanded,
Expand All @@ -21,39 +21,39 @@ type PropTypes = {
}

/**
*
*
* @param company - The company to display
* @param asClient - If the component is rendered clinet side (uses CmsImageClient)
* @param session - The session of the user
* @param disableEdit - If the edit buttons should be disabled even if the user has the rights
* @param logoWidth - The width of the logo
* @param squareLogo - If the logo should be square (contained in center of square frame)
* @returns
* @returns
*/
export default function Company({
company,
asClient,
session,
disableEdit = false,
export default function Company({
company,
asClient,
session,
disableEdit = false,
logoWidth = 300,
squareLogo = true,
}: PropTypes) {
const canUpdate = UpdateCompanyAuther.dynamicFields({}).auth(session)
const canDestroy = DestroyCompanyAuther.dynamicFields({}).auth(session)
return (
<div className={styles.Company}>
{ asClient ?
<CmsImageClient
disableEditor={disableEdit}
className={squareLogo ? styles.logoSq : styles.logo}
cmsImage={company.logo}
width={logoWidth}
/> :
<CmsImage
disableEditor={disableEdit}
className={squareLogo ? styles.logoSq : styles.logo}
cmsImage={company.logo}
width={logoWidth}
{ asClient ?
<CmsImageClient
disableEditor={disableEdit}
className={squareLogo ? styles.logoSq : styles.logo}
cmsImage={company.logo}
width={logoWidth}
/> :
<CmsImage
disableEditor={disableEdit}
className={squareLogo ? styles.logoSq : styles.logo}
cmsImage={company.logo}
width={logoWidth}
/>
}
<div className={styles.info}>
Expand All @@ -72,7 +72,7 @@ export default function Company({
<TextInput name="name" label="Navn" defaultValue={company.name} />
<TextInput name="description" label="Beskrivelse" defaultValue={company.description} />
</Form>
<Form
<Form
action={destroyCompanyAction.bind(null, { id: company.id })}
refreshOnSuccess
closePopUpOnSuccess={`Edit ${company.id}`}
Expand Down
13 changes: 6 additions & 7 deletions src/app/_components/Company/CompanyList.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
'use client'
import EndlessScroll from '@/components/PagingWrappers/EndlessScroll'
import type { ReactNode } from 'react'
import { companyListRenderer } from './CompanyListRenderer'
import { CompanyPagingContext } from '@/contexts/paging/CompanyPaging'
import styles from './CompanyList.module.scss'
import { CompanyPagingContext } from '@/contexts/paging/CompanyPaging'
import EndlessScroll from '@/components/PagingWrappers/EndlessScroll'
import { useUser } from '@/auth/useUser'
import { permission } from 'process'
import type { ReactNode } from 'react'

type PropTypes = {
serverRenderedData: ReactNode,
Expand All @@ -22,9 +21,9 @@ export default function CompanyList({ serverRenderedData, disableEditing }: Prop
return (
<div className={styles.CompanyList}>
{serverRenderedData}
<EndlessScroll
pagingContext={CompanyPagingContext}
renderer={data => companyListRenderer({ asClient: true, session, disableEditing })(data)}
<EndlessScroll
pagingContext={CompanyPagingContext}
renderer={data => companyListRenderer({ asClient: true, session, disableEditing })(data)}
/>
</div>
)
Expand Down
8 changes: 4 additions & 4 deletions src/app/_components/Company/CompanyListFilter.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use client'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import TextInput from '@/UI/TextInput'
import { faSearch } from '@fortawesome/free-solid-svg-icons'
import styles from './CompanyListFilter.module.scss'
import TextInput from '@/UI/TextInput'
import { useDebounce } from '@/hooks/useDebounce'
import { useRouter } from 'next/navigation'
import { QueryParams } from '@/lib/query-params/queryParams'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { faSearch } from '@fortawesome/free-solid-svg-icons'
import { useRouter } from 'next/navigation'

type PropTypes = {
currentName: string
Expand Down
8 changes: 4 additions & 4 deletions src/app/_components/Company/CompanyListRenderer.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import type { CompanyExpanded } from '@/services/career/companies/Types'
import Company from './Company'
import { SessionMaybeUser } from '@/auth/Session'
import type { SessionMaybeUser } from '@/auth/Session'
import type { CompanyExpanded } from '@/services/career/companies/Types'

/**
* Used to render schools server side and client side in consistent way
* @param asClient - If the company is rendered as a client
* @param session - The session of the user used to determine if the user is an admin of the company
* @returns A function that takes a company and returns a Company component
*/
// eslint-disable-next-line react/display-name
export const companyListRenderer = ({
asClient,
asClient,
session,
disableEditing = false
}: {
asClient: boolean,
session: SessionMaybeUser,
disableEditing?: boolean
// eslint-disable-next-line react/display-name
}) => (company: CompanyExpanded) =>
<Company disableEdit={disableEditing} session={session} key={company.id} company={company} asClient={asClient} />
32 changes: 16 additions & 16 deletions src/app/_components/Company/SelectCompany.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
'use client'
import { CompanySelectionContext } from "@/contexts/CompanySelection"
import { faCheck } from "@fortawesome/free-solid-svg-icons"
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
import { Company } from "@prisma/client"
import { useContext } from "react"
import styles from "./SelectCompany.module.scss"
import styles from './SelectCompany.module.scss'
import { CompanySelectionContext } from '@/contexts/CompanySelection'
import { faCheck } from '@fortawesome/free-solid-svg-icons'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { useContext } from 'react'
import type { Company } from '@prisma/client'

type PropTypes = {
company: Company
Expand All @@ -20,16 +20,16 @@ export default function SelectCompany({ company }: PropTypes) {
const isSelected = companyCtx.selectedCompany && companyCtx.selectedCompany.id === company.id
return (
<>
<button className={styles.button} onClick={() => {
if (isSelected) {
companyCtx.setSelectedCompany(null)
return
}
companyCtx.setSelectedCompany(company)
}} />
<div className={isSelected ? `${styles.selected} ${styles.check}` : styles.check}>
<FontAwesomeIcon icon={faCheck} />
</div>
<button className={styles.button} onClick={() => {
if (isSelected) {
companyCtx.setSelectedCompany(null)
return
}
companyCtx.setSelectedCompany(company)
}} />
<div className={isSelected ? `${styles.selected} ${styles.check}` : styles.check}>
<FontAwesomeIcon icon={faCheck} />
</div>
</>
)
}
8 changes: 4 additions & 4 deletions src/app/_components/Date/Date.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'
import { displayDate } from '@/dates/displayDate'
import { useEffect, useState } from 'react';
import { useEffect, useState } from 'react'

type PropTypes = {
date: Date
Expand All @@ -13,11 +13,11 @@ type PropTypes = {
* @returns the date in jsx
*/
export default function Date({ date, includeTime = true }: PropTypes) {
const [isClient, setIsClient] = useState(false);
const [isClient, setIsClient] = useState(false)

useEffect(() => {
setIsClient(true);
}, []);
setIsClient(true)
}, [])

if (!isClient) {
return `${date.toISOString().substring(0, includeTime ? 16 : 10)} (UTC)`
Expand Down
2 changes: 1 addition & 1 deletion src/app/_components/HeaderItems/HeaderItemPopUp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type { PropTypes as PopUpProps } from '@/components/PopUp/PopUp'
type PropTypes = Omit<PopUpProps, 'showButtonContent'> & { scale?: number }

function createHeaderItemPopUp(icon: FontAwesomeIconProps['icon'], scale = 40) {
return function HeadItemPopUp({ showButtonClass ,children, scale: overrideScale, ...props }: PropTypes) {
return function HeadItemPopUp({ showButtonClass, children, scale: overrideScale, ...props }: PropTypes) {
return <PopUp
{...props}
showButtonContent = {
Expand Down
29 changes: 15 additions & 14 deletions src/app/_components/UI/DateInput.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
'use client'
import { toLocalDate } from '@/dates/toLocal'
import styles from './DateInput.module.scss'
import type { PropTypes as PropTypesInput } from './TextInput'
import { toLocalDate } from '@/dates/toLocal'
import { displayDefaultInputValue } from '@/dates/displayDefaultInputValue'
import { useState } from 'react'
import type { PropTypes as PropTypesInput } from './TextInput'
import type { ChangeEvent } from 'react'

type PropTypes = Omit<PropTypesInput, 'type' | 'defaultValue'> & {
defaultValue?: PropTypesInput['defaultValue'] | Date,
Expand All @@ -21,30 +22,30 @@ export default function DateInput({
const defaultValueTransformedLocal = defaultValue instanceof Date
? displayDefaultInputValue(toLocalDate(defaultValue), includeTime)
: defaultValue
const defaultValueTransformedUtc = defaultValue instanceof Date
const defaultValueTransformedUtc = defaultValue instanceof Date
? defaultValue.toISOString().substring(0, includeTime ? 16 : 10)
: defaultValue
const [utcValue, setUtcValue] = useState(defaultValueTransformedUtc)

const setUtc = (e: React.ChangeEvent<HTMLInputElement>) => {
const setUtc = (e: ChangeEvent<HTMLInputElement>) => {
setUtcValue(toLocalDate(new Date(e.target.value)).toISOString().substring(0, includeTime ? 16 : 10))
}

return (
<div className={`${styles.DateInput} ${styles[color]} ${className}`}>
<label className={styles.label}>{label}</label>
<input
onChange={setUtc}
defaultValue={defaultValueTransformedLocal}
<input
onChange={setUtc}
defaultValue={defaultValueTransformedLocal}
type={includeTime ? 'datetime-local' : 'date'}
{...props}
name={props.name + 'Local'}
{...props}
name={`${props.name}Local`}
/>
<input
defaultValue={defaultValueTransformedUtc}
{...props}
<input
defaultValue={defaultValueTransformedUtc}
{...props}
type="hidden"
name={props.name}
name={props.name}
value={utcValue}
/>
</div>
Expand Down
1 change: 0 additions & 1 deletion src/app/admin/api-keys/[name]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import DateInput from '@/components/UI/DateInput'
import TextInput from '@/components/UI/TextInput'
import DisplayAllPermissions from '@/components/Permission/DisplayAllPermissions'
import Slider from '@/components/UI/Slider'
import { displayDate } from '@/dates/displayDate'
import { destroyApiKeyAction } from '@/actions/api-keys/destroy'
import Date from '@/app/_components/Date/Date'

Expand Down
2 changes: 1 addition & 1 deletion src/app/admin/api-keys/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import CreateApiKeyForm from './CreateApiKeyForm'
import PageWrapper from '@/components/PageWrapper/PageWrapper'
import { AddHeaderItemPopUp } from '@/components/HeaderItems/HeaderItemPopUp'
import { readApiKeysAction } from '@/actions/api-keys/read'
import Date from '@/components/Date/Date'
import { v4 as uuid } from 'uuid'
import Link from 'next/link'
import Date from '@/components/Date/Date'

const popUpKey = 'createApiKey'

Expand Down
Loading

0 comments on commit c8322e4

Please sign in to comment.