Skip to content
Merged
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
6 changes: 3 additions & 3 deletions assets/admin/app.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useEffect, useState, Suspense } from "react";
import { useEffect, useState, Suspense } from "react";
import { I18nextProvider } from "react-i18next";
import { Routes, Route, Navigate } from "react-router-dom";
import i18next from "i18next";
Expand Down Expand Up @@ -40,11 +40,11 @@ import ActivationCodeList from "./components/activation-code/activation-code-lis
import ActivationCodeCreate from "./components/activation-code/activation-code-create";
import ActivationCodeActivate from "./components/activation-code/activation-code-activate";
import AdminConfigLoader from "./components/util/admin-config-loader.js";
import "react-toastify/dist/ReactToastify.css";
import "./app.scss";
import FeedSourcesList from "./components/feed-sources/feed-sources-list";
import FeedSourceCreate from "./components/feed-sources/feed-source-create";
import FeedSourceEdit from "./components/feed-sources/feed-source-edit";
import "react-toastify/dist/ReactToastify.css";
import "./app.scss";

/**
* App component.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useState, useEffect } from "react";
import { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { useNavigate } from "react-router-dom";
import Form from "react-bootstrap/Form";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { useTranslation } from "react-i18next";
import dayjs from "dayjs";
import SelectColumnHoc from "../util/select-column-hoc";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useState, useEffect } from "react";
import { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { useNavigate } from "react-router-dom";
import { usePostV2UserActivationCodesMutation } from "../../../shared/redux/enhanced-api.ts";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { useNavigate } from "react-router-dom";
import { Button, Col, Row } from "react-bootstrap";
import { useTranslation } from "react-i18next";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useEffect, useState, useContext } from "react";
import { useEffect, useState, useContext } from "react";
import { useTranslation } from "react-i18next";
import { useDispatch } from "react-redux";
import { Button } from "react-bootstrap";
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/auth-handler.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useContext } from "react";
import { useContext } from "react";
import Login from "./user/login";
import UserContext from "../context/user-context";

Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/error-boundary.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component } from "react";
import { Component } from "react";
import "./error-boundary.scss";

class ErrorBoundary extends Component {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import FeedSourceManager from "./feed-source-manager";

/**
Expand Down
1 change: 0 additions & 1 deletion assets/admin/components/feed-sources/feed-source-edit.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { useParams } from "react-router-dom";
import { useGetV2FeedSourcesByIdQuery } from "../../../shared/redux/enhanced-api.ts";
import FeedSourceManager from "./feed-source-manager";
Expand Down
1 change: 0 additions & 1 deletion assets/admin/components/feed-sources/feed-source-form.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { Alert, Button, Row, Col } from "react-bootstrap";
import { useTranslation } from "react-i18next";
import { useNavigate } from "react-router-dom";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { useNavigate } from "react-router-dom";
import FeedSourceForm from "./feed-source-form";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useContext } from "react";
import { useContext } from "react";
import { useTranslation } from "react-i18next";
import ColumnHoc from "../util/column-hoc";
import ListButton from "../util/list/list-button";
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/feed-sources/feed-sources-list.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useState, useEffect, useContext } from "react";
import { useState, useEffect, useContext } from "react";
import { useTranslation } from "react-i18next";
import ContentHeader from "../util/content-header/content-header";
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { Alert } from "react-bootstrap";
import MultiselectFromEndpoint from "../../slide/content/multiselect-from-endpoint";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { Alert } from "react-bootstrap";
import MultiselectFromEndpoint from "../../slide/content/multiselect-from-endpoint";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { useTranslation } from "react-i18next";
import FormInput from "../../util/forms/form-input";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { useTranslation } from "react-i18next";
import FormInput from "../../util/forms/form-input";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { useTranslation } from "react-i18next";
import FormInput from "../../util/forms/form-input";

Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/groups/group-create.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useState, useEffect } from "react";
import { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { useNavigate } from "react-router-dom";
import { usePostV2ScreenGroupsMutation } from "../../../shared/redux/enhanced-api.ts";
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/groups/group-edit.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useParams, useNavigate } from "react-router-dom";
import { useTranslation } from "react-i18next";
import {
Expand Down
1 change: 0 additions & 1 deletion assets/admin/components/groups/group-form.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { useNavigate } from "react-router-dom";
import { Button } from "react-bootstrap";
import { useTranslation } from "react-i18next";
Expand Down
1 change: 0 additions & 1 deletion assets/admin/components/groups/groups-columns.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { useTranslation } from "react-i18next";
import ListButton from "../util/list/list-button";
import ColumnHoc from "../util/column-hoc";
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/groups/groups-list.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useEffect, useState, useContext } from "react";
import { useEffect, useState, useContext } from "react";
import { useTranslation } from "react-i18next";
import List from "../util/list/list";
import ListContext from "../../context/list-context";
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/media-modal/media-modal.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import Modal from "react-bootstrap/Modal";
import ModalDialog from "../util/modal/modal-dialog";
Expand Down
1 change: 0 additions & 1 deletion assets/admin/components/media/image-list.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { useTranslation } from "react-i18next";
import { Form } from "react-bootstrap";
import selectedHelper from "../util/helpers/selected-helper";
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/media/media-create.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useState, useEffect } from "react";
import { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { usePostMediaCollectionMutation } from "../../../shared/redux/enhanced-api.ts";
import MediaForm from "./media-form";
Expand Down
1 change: 0 additions & 1 deletion assets/admin/components/media/media-form.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { useNavigate } from "react-router-dom";
import { Button } from "react-bootstrap";
import { useTranslation } from "react-i18next";
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/media/media-list.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useEffect, useState, useContext } from "react";
import { useEffect, useState, useContext } from "react";
import { Button, Col, Row } from "react-bootstrap";
import { Link, useNavigate, useLocation } from "react-router-dom";
import { useTranslation } from "react-i18next";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { useTranslation, Trans } from "react-i18next";
import Logo from "../logo";

Expand Down
1 change: 0 additions & 1 deletion assets/admin/components/navigation/logo.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import DisplayLogo from "./logo.svg";

const Logo = () => {
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/navigation/nav-items/nav-items.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useContext, useEffect } from "react";
import { useContext, useEffect } from "react";
import { Nav } from "react-bootstrap";
import { Link, NavLink, useLocation } from "react-router-dom";
import { useTranslation } from "react-i18next";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useContext } from "react";
import { useContext } from "react";
import UserContext from "../../../context/user-context";

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useContext } from "react";
import { useContext } from "react";
import { Nav, NavDropdown } from "react-bootstrap";
import { useTranslation } from "react-i18next";
import UserContext from "../../../context/user-context";
Expand Down
4 changes: 2 additions & 2 deletions assets/admin/components/navigation/sidebar/sidebar.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { React, useState } from "react";
import { useState } from "react";
import Nav from "react-bootstrap/Nav";
import Brand from "react-bootstrap/NavbarBrand";
import Col from "react-bootstrap/Col";
import NavItems from "../nav-items/nav-items";
import "./sidebar.scss";
import Logo from "../logo";
import TenantSelector from "../nav-items/tenant-selector";
import "./sidebar.scss";

/**
* The sidebar component.
Expand Down
3 changes: 1 addition & 2 deletions assets/admin/components/navigation/topbar/top-bar.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useContext } from "react";
import { useContext } from "react";
import Nav from "react-bootstrap/Nav";
import Dropdown from "react-bootstrap/Dropdown";
import Navbar from "react-bootstrap/Navbar";
Expand All @@ -15,7 +15,6 @@ import {
} from "@fortawesome/free-solid-svg-icons";
import NavItems from "../nav-items/nav-items";
import UserContext from "../../../context/user-context";

import "./top-bar.scss";

/**
Expand Down
1 change: 0 additions & 1 deletion assets/admin/components/no-access/no-access.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { useTranslation } from "react-i18next";

/**
Expand Down
1 change: 0 additions & 1 deletion assets/admin/components/playlist/campaign-form.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { useTranslation } from "react-i18next";
import idFromUrl from "../util/helpers/id-from-url";
import { useGetV2CampaignsByIdScreenGroupsQuery } from "../../../shared/redux/enhanced-api.ts";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import PlaylistCampaignManager from "./playlist-campaign-manager";

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useParams } from "react-router-dom";
import PlaylistCampaignManager from "./playlist-campaign-manager";
import idFromUrl from "../util/helpers/id-from-url";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useContext, useState } from "react";
import { useContext, useState } from "react";
import { Alert, Button, Col, Form, Row } from "react-bootstrap";
import { useTranslation } from "react-i18next";
import { useNavigate } from "react-router-dom";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useState, useEffect, useContext } from "react";
import { useState, useEffect, useContext } from "react";
import { useTranslation } from "react-i18next";
import useModal from "../../context/modal-context/modal-context-hook";
import UserContext from "../../context/user-context";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { useNavigate, useLocation } from "react-router-dom";
import set from "lodash.set";
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/playlist/playlist-form.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useContext } from "react";
import { useContext } from "react";
import { useTranslation } from "react-i18next";
import { Alert } from "react-bootstrap";
import UserContext from "../../context/user-context";
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/playlist/playlist-gantt-chart.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import GanttChart from "../util/gantt-chart";
import localStorageKeys from "../util/local-storage-keys";
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/playlist/playlists-columns.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useContext } from "react";
import { useContext } from "react";
import { useTranslation } from "react-i18next";
import ColumnHoc from "../util/column-hoc";
import SelectColumnHoc from "../util/select-column-hoc";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { useTranslation } from "react-i18next";
import Publishing from "../util/publishing";

Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/playlist/shared-playlists.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useState, useEffect, useContext } from "react";
import { useState, useEffect, useContext } from "react";
import { useTranslation } from "react-i18next";
import UserContext from "../../context/user-context";
import ContentHeader from "../util/content-header/content-header";
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/preview/preview.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, JSX, useEffect, useState } from "react";
import { JSX, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import LocalStorageKeys from "../util/local-storage-keys";

Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/restricted-route.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useContext } from "react";
import { useContext } from "react";
import UserContext from "../context/user-context";
import NoAccess from "./no-access/no-access";

Expand Down
1 change: 0 additions & 1 deletion assets/admin/components/screen/screen-create.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import ScreenManager from "./screen-manager";

/**
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/screen/screen-edit.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useParams } from "react-router-dom";
import idFromUrl from "../util/helpers/id-from-url";
import ScreenManager from "./screen-manager";
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/screen/screen-form.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ import {
useGetV2ScreensByIdScreenGroupsQuery,
} from "../../../shared/redux/enhanced-api.ts";
import FormCheckbox from "../util/forms/form-checkbox";
import "./screen-form.scss";
import Preview from "../preview/preview";
import StickyFooter from "../util/sticky-footer";
import Select from "../util/forms/select";
import userContext from "../../context/user-context";
import ScreenStatus from "./screen-status";
import { displayError } from "../util/list/toast-component/display-toast";
import "./screen-form.scss";

/**
* The screen form component.
Expand Down
4 changes: 2 additions & 2 deletions assets/admin/components/screen/screen-list.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useEffect, useState, useContext } from "react";
import { useEffect, useState, useContext } from "react";
import { useTranslation } from "react-i18next";
import UserContext from "../../context/user-context";
import List from "../util/list/list";
Expand All @@ -17,8 +17,8 @@ import {
displaySuccess,
displayError,
} from "../util/list/toast-component/display-toast";
import "./screen-list.scss";
import AdminConfigLoader from "../util/admin-config-loader.js";
import "./screen-list.scss";

/**
* The screen list component.
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/screen/screen-manager.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import set from "lodash.set";
import { useNavigate } from "react-router-dom";
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/screen/screen-status.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import dayjs from "dayjs";
import { React, JSX, useState, useEffect } from "react";
import { JSX, useState, useEffect } from "react";
import { Alert, Button } from "react-bootstrap";
import { useTranslation } from "react-i18next";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/screen/util/campaign-icon.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useDispatch } from "react-redux";
import { useTranslation } from "react-i18next";
import Spinner from "react-bootstrap/Spinner";
Expand Down
1 change: 0 additions & 1 deletion assets/admin/components/screen/util/screen-columns.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { useTranslation } from "react-i18next";
import ListButton from "../../util/list/list-button";
import CampaignIcon from "./campaign-icon";
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/components/screen/util/screen-gantt-chart.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useState, useContext } from "react";
import { useEffect, useState, useContext } from "react";
import { RRule } from "rrule";
import { useTranslation } from "react-i18next";
import GanttChart from "../../util/gantt-chart";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import set from "lodash.set";
import { Col, Row } from "react-bootstrap";
import { useTranslation } from "react-i18next";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { React } from "react";
import { Button, Card } from "react-bootstrap";
import { useTranslation } from "react-i18next";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { React, useState, useEffect } from "react";
import { useState, useEffect } from "react";
import { Button, Card, Row } from "react-bootstrap";
import { ulid } from "ulid";
import { useTranslation } from "react-i18next";
Expand Down
Loading
Loading