Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reordered the imports in several UI React.js files #276

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
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
2 changes: 1 addition & 1 deletion src/Routes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

// React imports
import React from "react";
import routes from "constants/routes";
import { BrowserRouter, Switch, Route } from "react-router-dom";
import routes from "constants/routes";

// Guards imports
const PublicLayout = React.lazy(() => import("shared/PublicLayout"));
Expand Down
3 changes: 1 addition & 2 deletions src/pages/Admin/Group/Delete/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
*/

import React, { useEffect, useState } from "react";
import messages from "constants/messages";

// Jquery for handling modal
import $ from "jquery";
import messages from "constants/messages";

// Title
import Title from "components/Title";
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Admin/Users/Edit/token_space.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
import React, { useState, useEffect } from "react";

// widgets
import PropTypes from "prop-types";
import { Col, Form, Row } from "react-bootstrap";
import { Button, InputContainer, Spinner } from "components/Widgets";
import Modal from "components/Widgets/Modal";
import PropTypes from "prop-types";

// utils
import formatDate from "utils";

// css
import "./index.css";
import { createToken, getTokens } from "services/users";
import { Col, Form, Row } from "react-bootstrap";

const TokenSpace = ({ setMessage, setShowMessage }) => {
// local states
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Browse/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
*/

import React, { useState, useEffect } from "react";
import routes from "constants/routes";
import { Link, useHistory } from "react-router-dom";
import arrayToTree from "array-to-tree";
import Pagination from "@material-ui/lab/Pagination";
import routes from "constants/routes";
import messages from "constants/messages";

// Title
Expand All @@ -40,7 +41,6 @@ import {
getFileNameFromContentDispostionHeader,
handleError,
} from "shared/helper";
import Pagination from "@material-ui/lab/Pagination";

import {
statusOptions,
Expand Down
6 changes: 3 additions & 3 deletions src/pages/Home/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
// React Imports
import React, { useState, useEffect } from "react";

// Title
import Title from "components/Title";

// External library imports
import { useHistory } from "react-router-dom";
import { Form, Row, Col } from "react-bootstrap";
import queryString from "query-string";
import PropTypes from "prop-types";

// Title
import Title from "components/Title";

// Required functions for calling APIs
import fetchToken from "services/auth";
import { getUserSelf } from "services/users";
Expand Down
4 changes: 3 additions & 1 deletion src/pages/Jobs/AllJobs/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@

import React, { useEffect, useState } from "react";

// Required function for API and Error handling
import Pagination from "@material-ui/lab/Pagination";

// Title
import Title from "components/Title";

Expand All @@ -28,7 +31,6 @@ import { initialMessage, entriesOptions } from "constants/constants";
import messages from "constants/messages";
import { InputContainer, Alert } from "components/Widgets";
import { getAllAdminJob } from "services/jobs";
import Pagination from "@material-ui/lab/Pagination";

const AllJobs = () => {
const initialState = {
Expand Down
4 changes: 3 additions & 1 deletion src/pages/Jobs/MyRecentJobs/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@

import React, { useEffect, useState } from "react";

// Required functions for API and Error handling
import Pagination from "@material-ui/lab/Pagination";

// Title
import Title from "components/Title";

Expand All @@ -28,7 +31,6 @@ import { initialMessage, entriesOptions } from "constants/constants";
import messages from "constants/messages";
import { InputContainer, Alert } from "components/Widgets";
import { getAllJob } from "services/jobs";
import Pagination from "@material-ui/lab/Pagination";

const MyRecentJobs = () => {
const initialState = {
Expand Down
4 changes: 3 additions & 1 deletion src/pages/Upload/ImportReport/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@

import React, { useEffect, useState } from "react";

// constants
import { useHistory, useLocation } from "react-router-dom";

// Title
import Title from "components/Title";

Expand All @@ -29,7 +32,6 @@ import { Alert, Button, InputContainer } from "components/Widgets";
import { initialMessage, initialStateImportReport } from "constants/constants";
import { getAllFolders } from "services/folders";
import { getUploadsFolderId } from "services/organizeUploads";
import { useHistory, useLocation } from "react-router-dom";
import { importReport } from "services/jobs";

const ImportReport = () => {
Expand Down