Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ repos:
name: 'Sort Python imports'
args: [--settings, ./backend/pyproject.toml]
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 26.3.1
rev: 26.5.0
hooks:
- id: black
name: 'Format Python code'
Expand Down Expand Up @@ -90,7 +90,7 @@ repos:
- python
args: [--config, ./frontend/.prettierrc]
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v10.3.0
rev: v10.4.0
hooks:
- id: eslint
name: 'Lint JavaScript code (Frontend)'
Expand Down
5 changes: 2 additions & 3 deletions frontend-admin/src/Layout.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React from 'react';

import { ScrollTop } from 'primereact/scrolltop';
import { Outlet, ScrollRestoration, useNavigation } from 'react-router';

import Header from 'components/Header/Header';
import LoadingPage from 'pages/LoadingPage';

Check failure on line 4 in frontend-admin/src/Layout.tsx

View workflow job for this annotation

GitHub Actions / Run tests (24, false) / Run tests

There should be at least one empty line between import groups
import { ScrollTop } from 'primereact/scrolltop';

Check failure on line 5 in frontend-admin/src/Layout.tsx

View workflow job for this annotation

GitHub Actions / Run tests (24, false) / Run tests

`primereact/scrolltop` import should occur before import of `components/Header/Header`

Check failure on line 5 in frontend-admin/src/Layout.tsx

View workflow job for this annotation

GitHub Actions / Run tests (24, false) / Run tests

There should be at least one empty line between import groups
import { AuthenticationProvider } from 'providers/AuthenticationProvider';

Check failure on line 6 in frontend-admin/src/Layout.tsx

View workflow job for this annotation

GitHub Actions / Run tests (24, false) / Run tests

There should be at least one empty line between import groups
import { Outlet, ScrollRestoration, useNavigation } from 'react-router';

Check failure on line 7 in frontend-admin/src/Layout.tsx

View workflow job for this annotation

GitHub Actions / Run tests (24, false) / Run tests

`react-router` import should occur before import of `components/Header/Header`

type LayoutProps = {
children?: React.JSX.Element;
Expand Down
3 changes: 1 addition & 2 deletions frontend-admin/src/api/http.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import axios, { isAxiosError } from 'axios';
import type { AxiosResponse } from 'axios';

Check failure on line 2 in frontend-admin/src/api/http.ts

View workflow job for this annotation

GitHub Actions / Run tests (24, false) / Run tests

There should be at least one empty line between import groups
import { jwtDecode } from 'jwt-decode';

import {

Check failure on line 3 in frontend-admin/src/api/http.ts

View workflow job for this annotation

GitHub Actions / Run tests (24, false) / Run tests

There should be at least one empty line between import groups
getAccessToken,
getRefreshToken,
Expand All @@ -11,6 +9,7 @@
setRefreshToken,
setRefreshTokenExpirationTime,
} from 'helpers/LocalStorageHelper';
import { jwtDecode } from 'jwt-decode';

Check failure on line 12 in frontend-admin/src/api/http.ts

View workflow job for this annotation

GitHub Actions / Run tests (24, false) / Run tests

`jwt-decode` import should occur before import of `helpers/LocalStorageHelper`

import {
AdminApiFactory,
Expand All @@ -22,7 +21,7 @@

// TODO: Create some validation view to check if all local storage elements exists otherwise redirect to login

const axiosInstance = axios.create({

Check warning on line 24 in frontend-admin/src/api/http.ts

View workflow job for this annotation

GitHub Actions / Run tests (24, false) / Run tests

Caution: `axios` also has a named export `create`. Check if you meant to write `import {create} from 'axios'` instead
headers: {
'Accept-Language': 'hu',
Authorization: `Bearer ${getAccessToken()}`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
import { Dialog } from 'primereact/dialog';
import type { DialogProps } from 'primereact/dialog';
import { InputTextarea } from 'primereact/inputtextarea';
import { Controller, useForm } from 'react-hook-form';

Check failure on line 7 in frontend-admin/src/components/AdditionalDataDialog/AdditionalDataDialog.tsx

View workflow job for this annotation

GitHub Actions / Run tests (24, false) / Run tests

There should be at least one empty line between import groups

import { RequestAdditionalDataType } from 'types/additionalDataTypes';

interface AdditionalDataDialogProps extends DialogProps {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { forwardRef, useState } from 'react';

import { useQuery } from '@tanstack/react-query';

Check failure on line 3 in frontend-admin/src/components/AutoCompleteStaff/AutoCompleteStaff.tsx

View workflow job for this annotation

GitHub Actions / Run tests (24, false) / Run tests

There should be at least one empty line between import groups
import { AutoComplete } from 'primereact/autocomplete';
import type { AutoCompleteProps } from 'primereact/autocomplete';

import { UserAdminList } from 'api/models';
import { usersStaffListQuery } from 'api/queries';
import Avatar from 'components/Avatar/Avatar';
import { getUserId } from 'helpers/LocalStorageHelper';
import type { AutoCompleteProps } from 'primereact/autocomplete';
import { AutoComplete } from 'primereact/autocomplete';

const AutoCompleteStaff = forwardRef<
React.Ref<HTMLInputElement>,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { forwardRef } from 'react';

import type { AutoCompleteProps } from 'primereact/autocomplete';

import { UserAdminList } from 'api/models';
import Avatar from 'components/Avatar/Avatar';
import type { AutoCompleteProps } from 'primereact/autocomplete';

import AutoCompleteStaff from './AutoCompleteStaff';

Expand Down
3 changes: 1 addition & 2 deletions frontend-admin/src/components/Avatar/AvatarGroupCrew.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { forwardRef, Fragment } from 'react';

import { UI_AVATAR_URL } from 'localConstants';
import { Avatar } from 'primereact/avatar';
import { AvatarGroup } from 'primereact/avatargroup';
import type { AvatarGroupProps } from 'primereact/avatargroup';
import { Tooltip } from 'primereact/tooltip';
import { classNames } from 'primereact/utils';

import { UI_AVATAR_URL } from 'localConstants';

interface AvatarGroupCrewProps extends AvatarGroupProps {
crew?: {
avatar_url: string | null;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { forwardRef, useEffect } from 'react';

import { isAdmin } from 'helpers/LocalStorageHelper';
import { Button } from 'primereact/button';
import { Dialog } from 'primereact/dialog';
import type { DialogProps } from 'primereact/dialog';
Expand All @@ -9,8 +10,6 @@ import { classNames } from 'primereact/utils';
import type { IconType } from 'primereact/utils';
import { Controller, useForm } from 'react-hook-form';

import { isAdmin } from 'helpers/LocalStorageHelper';

interface AcceptRejectDialogProps extends DialogProps {
accepted: boolean | null | undefined;
canceled: boolean | null | undefined;
Expand Down
26 changes: 13 additions & 13 deletions frontend-admin/src/components/Details/Request/CommentCards.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,14 @@ import {
useQuery,
useQueryClient,
} from '@tanstack/react-query';
import { isAxiosError } from 'axios';
import { Avatar } from 'primereact/avatar';
import { Button } from 'primereact/button';
import { confirmDialog } from 'primereact/confirmdialog';
import { InputTextarea } from 'primereact/inputtextarea';
import { SelectButton } from 'primereact/selectbutton';
import { Tag } from 'primereact/tag';
import { Tooltip } from 'primereact/tooltip';
import { classNames } from 'primereact/utils';
import type { IconType } from 'primereact/utils';
import { Controller, useForm } from 'react-hook-form';
import type { Control } from 'react-hook-form';

import { adminApi } from 'api/http';
import { CommentAdminListRetrieve } from 'api/models';
import {
requestCommentCreateMutation,
requestCommentUpdateMutation,
} from 'api/mutations';
import { requestCommentsListQuery } from 'api/queries';
import { isAxiosError } from 'axios';
import { dateTimeToLocaleString } from 'helpers/DateToLocaleStringCoverters';
import { getErrorMessage } from 'helpers/ErrorMessageProvider';
import {
Expand All @@ -37,6 +25,18 @@ import {
import TimeAgo from 'helpers/TimeAgo';
import { useTheme } from 'hooks/useTheme';
import { UI_AVATAR_URL } from 'localConstants';
import { Avatar } from 'primereact/avatar';
import { Button } from 'primereact/button';
import { confirmDialog } from 'primereact/confirmdialog';
import { InputTextarea } from 'primereact/inputtextarea';
import { SelectButton } from 'primereact/selectbutton';
import { Tag } from 'primereact/tag';
import { Tooltip } from 'primereact/tooltip';
import { classNames } from 'primereact/utils';
import type { IconType } from 'primereact/utils';
import { Controller, useForm } from 'react-hook-form';
import type { Control } from 'react-hook-form';

import { useToast } from 'providers/ToastProvider';

// TODO: Review props
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
import { forwardRef, useState } from 'react';

import { useMutation, useQueryClient } from '@tanstack/react-query';
import { isAxiosError } from 'axios';
import { Button } from 'primereact/button';
import { Dialog } from 'primereact/dialog';
import type { DialogProps } from 'primereact/dialog';
import { Controller, useForm } from 'react-hook-form';

import { UserNestedDetail } from 'api/models/user-nested-detail';
import { requestCrewCreateMutation } from 'api/mutations';
import { isAxiosError } from 'axios';
import AutoCompleteStaff from 'components/AutoCompleteStaff/AutoCompleteStaff';
import { getErrorMessage } from 'helpers/ErrorMessageProvider';
import { Button } from 'primereact/button';
import { Dialog } from 'primereact/dialog';
import type { DialogProps } from 'primereact/dialog';
import { useToast } from 'providers/ToastProvider';
import { Controller, useForm } from 'react-hook-form';

import AutoCompleteCrewPosition from './AutoCompleteCrewPosition';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import { useState } from 'react';

import { useQuery, useQueryClient } from '@tanstack/react-query';
import { adminApi } from 'api/http';
import { CrewMemberAdminListRetrieve } from 'api/models';
import { requestCrewListQuery } from 'api/queries';
import { isAxiosError } from 'axios';
import AutoCompleteStaff from 'components/AutoCompleteStaff/AutoCompleteStaff';
import User from 'components/User/User';
import { getErrorMessage } from 'helpers/ErrorMessageProvider';
import useMobile from 'hooks/useMobile';
import type { AutoCompleteChangeEvent } from 'primereact/autocomplete';
import { Button } from 'primereact/button';
import { Column } from 'primereact/column';
Expand All @@ -11,14 +18,6 @@ import { DataTable } from 'primereact/datatable';
import type { DataTableRowEditCompleteEvent } from 'primereact/datatable';
import { Ripple } from 'primereact/ripple';
import { classNames } from 'primereact/utils';

import { adminApi } from 'api/http';
import { CrewMemberAdminListRetrieve } from 'api/models';
import { requestCrewListQuery } from 'api/queries';
import AutoCompleteStaff from 'components/AutoCompleteStaff/AutoCompleteStaff';
import User from 'components/User/User';
import { getErrorMessage } from 'helpers/ErrorMessageProvider';
import useMobile from 'hooks/useMobile';
import { useToast } from 'providers/ToastProvider';

import AddCrewDialog from './AddCrewDialog';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ import { Button } from 'primereact/button';
import { ButtonGroup } from 'primereact/buttongroup';
import { Dropdown } from 'primereact/dropdown';
import { Tag } from 'primereact/tag';
import { useToast } from 'providers/ToastProvider';
import { Controller } from 'react-hook-form';
import type { Control } from 'react-hook-form';

import { useToast } from 'providers/ToastProvider';
import { RequestAdditionalDataRecordingType } from 'types/additionalDataTypes';

type RequestAdditionalDataRecordingFormType = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import { Fragment } from 'react';

import { UserNestedDetail } from 'api/models';
import LinkButton from 'components/LinkButton/LinkButton';
import User from 'components/User/User';
import { ButtonGroup } from 'primereact/buttongroup';
import { Chip } from 'primereact/chip';
import { Tag } from 'primereact/tag';
import { Tooltip } from 'primereact/tooltip';
import { href } from 'react-router';

import { UserNestedDetail } from 'api/models';
import LinkButton from 'components/LinkButton/LinkButton';
import User from 'components/User/User';
import { RequestAdditionalDataType } from 'types/additionalDataTypes';

type RequesterContentProps = {
Expand Down
11 changes: 5 additions & 6 deletions frontend-admin/src/components/Details/Video/Ratings.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
import { MouseEventHandler, useState } from 'react';

import { UseQueryResult, useQuery } from '@tanstack/react-query';
import { Avatar } from 'primereact/avatar';
import { Button } from 'primereact/button';
import { Dropdown } from 'primereact/dropdown';
import { Tooltip } from 'primereact/tooltip';
import { classNames } from 'primereact/utils';

import { RatingAdminListRetrieve } from 'api/models';
import { requestVideoRatingsListQuery } from 'api/queries';
import RatingDialog from 'components/RatingDialog/RatingDialog';
import { dateTimeToLocaleString } from 'helpers/DateToLocaleStringCoverters';
import { getUserId, isAdmin } from 'helpers/LocalStorageHelper';
import TimeAgo from 'helpers/TimeAgo';
import { UI_AVATAR_URL } from 'localConstants';
import { Avatar } from 'primereact/avatar';
import { Button } from 'primereact/button';
import { Dropdown } from 'primereact/dropdown';
import { Tooltip } from 'primereact/tooltip';
import { classNames } from 'primereact/utils';

interface RatingAdminListDates // TODO: Rename?
extends Omit<RatingAdminListRetrieve, 'created'> {
Expand Down
3 changes: 1 addition & 2 deletions frontend-admin/src/components/FormField/FormField.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { cloneElement } from 'react';

import ConditionalWrapper from 'helpers/ConditionalWrapper';
import { classNames } from 'primereact/utils';
import type { IconType } from 'primereact/utils';
import { Controller } from 'react-hook-form';
Expand All @@ -9,8 +10,6 @@ import type {
UseControllerProps,
} from 'react-hook-form';

import ConditionalWrapper from 'helpers/ConditionalWrapper';

interface FormFieldProps<
T extends FieldValues = FieldValues,
TName extends FieldPath<T> = FieldPath<T>,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Ripple } from 'primereact/ripple';

import Avatar from 'components/Avatar/Avatar';
import { getAvatar, getGroups, getName } from 'helpers/LocalStorageHelper';
import { Ripple } from 'primereact/ripple';

const AvatarButton = () => {
return (
Expand Down
7 changes: 3 additions & 4 deletions frontend-admin/src/components/History/History.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import React from 'react';

import { Avatar } from 'primereact/avatar';
import { Divider } from 'primereact/divider';
import { Tooltip } from 'primereact/tooltip';

import { History } from 'api/models/history';
import { dateTimeToLocaleString } from 'helpers/DateToLocaleStringCoverters';
import TimeAgo from 'helpers/TimeAgo';
import { UI_AVATAR_URL } from 'localConstants';
import { Avatar } from 'primereact/avatar';
import { Divider } from 'primereact/divider';
import { Tooltip } from 'primereact/tooltip';

export interface HistoryDates // TODO: Rename?
extends Omit<History, 'date'> {
Expand Down
3 changes: 1 addition & 2 deletions frontend-admin/src/components/History/RequestHistory.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { useQuery } from '@tanstack/react-query';
import { Skeleton } from 'primereact/skeleton';

import { requestHistoryListQuery, usersListQuery } from 'api/queries';
import { RequestStatusTag } from 'components/StatusTag/StatusTag';
import User from 'components/User/User';
import {
dateTimeToLocaleString,
dateToLocaleString,
} from 'helpers/DateToLocaleStringCoverters';
import { Skeleton } from 'primereact/skeleton';

import HistoryComponent, { getHistory } from './History';

Expand Down
3 changes: 1 addition & 2 deletions frontend-admin/src/components/History/VideoHistory.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { useQuery } from '@tanstack/react-query';
import { Skeleton } from 'primereact/skeleton';

import { requestVideoHistoryListQuery, usersListQuery } from 'api/queries';
import { VideoStatusTag } from 'components/StatusTag/StatusTag';
import User from 'components/User/User';
import { Skeleton } from 'primereact/skeleton';

import HistoryComponent, { getHistory } from './History';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { QueryObserverResult } from '@tanstack/react-query';

import TimeAgo from 'helpers/TimeAgo';

type LastUpdatedAtProps = {
Expand Down
23 changes: 11 additions & 12 deletions frontend-admin/src/components/RatingDialog/RatingDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,6 @@ import {
useMutation,
useQueryClient,
} from '@tanstack/react-query';
import { isAxiosError } from 'axios';
import { Button } from 'primereact/button';
import { ConfirmPopup, confirmPopup } from 'primereact/confirmpopup';
import { Dialog } from 'primereact/dialog';
import type { DialogProps } from 'primereact/dialog';
import { InputTextarea } from 'primereact/inputtextarea';
import { Message } from 'primereact/message';
import { ProgressSpinner } from 'primereact/progressspinner';
import { Rating } from 'primereact/rating';
import { Tag } from 'primereact/tag';
import { Controller, useForm } from 'react-hook-form';

import { adminApi } from 'api/http';
import { RatingAdminListRetrieve } from 'api/models';
import {
Expand All @@ -27,7 +15,18 @@ import {
requestVideoRatingRetrieveOwnQuery,
requestVideoRatingRetrieveQuery,
} from 'api/queries';
import { isAxiosError } from 'axios';
import { getErrorMessage } from 'helpers/ErrorMessageProvider';
import { Button } from 'primereact/button';
import { ConfirmPopup, confirmPopup } from 'primereact/confirmpopup';
import { Dialog } from 'primereact/dialog';
import type { DialogProps } from 'primereact/dialog';
import { InputTextarea } from 'primereact/inputtextarea';
import { Message } from 'primereact/message';
import { ProgressSpinner } from 'primereact/progressspinner';
import { Rating } from 'primereact/rating';
import { Tag } from 'primereact/tag';
import { Controller, useForm } from 'react-hook-form';

interface RatingDialogProps extends DialogProps {
isRated?: boolean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { InputText } from 'primereact/inputtext';
import type { Control } from 'react-hook-form';

import FormField from 'components/FormField/FormField';
import { IRequestCreator } from 'pages/RequestCreatorEditorPage';
import { InputText } from 'primereact/inputtext';
import type { Control } from 'react-hook-form';

type NewRequesterFormProps = {
control: Control<IRequestCreator>;
Expand Down
Loading
Loading