diff --git a/package.json b/package.json index 61a0fe3c8..56730097f 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "description": "Deploy custom push protections and policies on top of Git.", "scripts": { - "client": "vite start", + "client": "vite --config vite.config.js", "clientinstall": "npm install --prefix client", "server": "node index.js", "start": "concurrently 'npm run server' 'npm run client'", @@ -80,4 +80,4 @@ "last 1 safari version" ] } -} +} \ No newline at end of file diff --git a/src/index.js b/src/index.jsx similarity index 88% rename from src/index.js rename to src/index.jsx index 9e159b97c..ab30c1281 100644 --- a/src/index.js +++ b/src/index.jsx @@ -6,8 +6,8 @@ import {createBrowserHistory} from 'history'; import {BrowserRouter as Router, Route, Routes, Navigate} from 'react-router-dom'; // core components -import Admin from './ui/layouts/Admin.js'; -import Login from './ui/views/Login/Login.js'; +import Admin from './ui/layouts/Admin.jsx'; +import Login from './ui/views/Login/Login.jsx'; import './ui/assets/css/material-dashboard-react.css'; diff --git a/src/routes.js b/src/routes.js index 44b89a162..076664687 100644 --- a/src/routes.js +++ b/src/routes.js @@ -20,13 +20,13 @@ */ import Dashboard from '@material-ui/icons/Dashboard'; import Person from '@material-ui/icons/Person'; -import DashboardPage from './ui/views/Dashboard/Dashboard.js'; -import OpenPushRequests from './ui/views/OpenPushRequests/OpenPushRequests.js'; -import PushDetails from './ui/views/PushDetails/PushDetails.js'; -import User from './ui/views/User/User.js'; -import UserList from './ui/views/UserList/UserList.js'; -import RepoDetails from './ui/views/RepoDetails/RepoDetails.js'; -import RepoList from './ui/views/RepoList/RepoList.js'; +import DashboardPage from './ui/views/Dashboard/Dashboard.jsx'; +import OpenPushRequests from './ui/views/OpenPushRequests/OpenPushRequests.jsx'; +import PushDetails from './ui/views/PushDetails/PushDetails.jsx'; +import User from './ui/views/User/User.jsx'; +import UserList from './ui/views/UserList/UserList.jsx'; +import RepoDetails from './ui/views/RepoDetails/RepoDetails.jsx'; +import RepoList from './ui/views/RepoList/RepoList.jsx'; const dashboardRoutes = [ { diff --git a/src/ui/components/Card/Card.js b/src/ui/components/Card/Card.jsx similarity index 100% rename from src/ui/components/Card/Card.js rename to src/ui/components/Card/Card.jsx diff --git a/src/ui/components/Card/CardAvatar.js b/src/ui/components/Card/CardAvatar.jsx similarity index 100% rename from src/ui/components/Card/CardAvatar.js rename to src/ui/components/Card/CardAvatar.jsx diff --git a/src/ui/components/Card/CardBody.js b/src/ui/components/Card/CardBody.jsx similarity index 100% rename from src/ui/components/Card/CardBody.js rename to src/ui/components/Card/CardBody.jsx diff --git a/src/ui/components/Card/CardFooter.js b/src/ui/components/Card/CardFooter.jsx similarity index 100% rename from src/ui/components/Card/CardFooter.js rename to src/ui/components/Card/CardFooter.jsx diff --git a/src/ui/components/Card/CardHeader.js b/src/ui/components/Card/CardHeader.jsx similarity index 100% rename from src/ui/components/Card/CardHeader.js rename to src/ui/components/Card/CardHeader.jsx diff --git a/src/ui/components/Card/CardIcon.js b/src/ui/components/Card/CardIcon.jsx similarity index 100% rename from src/ui/components/Card/CardIcon.js rename to src/ui/components/Card/CardIcon.jsx diff --git a/src/ui/components/CustomButtons/Button.js b/src/ui/components/CustomButtons/Button.jsx similarity index 100% rename from src/ui/components/CustomButtons/Button.js rename to src/ui/components/CustomButtons/Button.jsx diff --git a/src/ui/components/CustomInput/CustomInput.js b/src/ui/components/CustomInput/CustomInput.jsx similarity index 100% rename from src/ui/components/CustomInput/CustomInput.js rename to src/ui/components/CustomInput/CustomInput.jsx diff --git a/src/ui/components/CustomTabs/CustomTabs.js b/src/ui/components/CustomTabs/CustomTabs.jsx similarity index 95% rename from src/ui/components/CustomTabs/CustomTabs.js rename to src/ui/components/CustomTabs/CustomTabs.jsx index 2da02cdf6..b5d4a768c 100644 --- a/src/ui/components/CustomTabs/CustomTabs.js +++ b/src/ui/components/CustomTabs/CustomTabs.jsx @@ -6,9 +6,9 @@ import PropTypes from 'prop-types'; import {makeStyles} from '@material-ui/core/styles'; import Tabs from '@material-ui/core/Tabs'; import Tab from '@material-ui/core/Tab'; -import Card from '../Card/Card.js'; -import CardBody from '../Card/CardBody.js'; -import CardHeader from '../Card/CardHeader.js'; +import Card from '../Card/Card.jsx'; +import CardBody from '../Card/CardBody.jsx'; +import CardHeader from '../Card/CardHeader.jsx'; import styles from '../../assets/jss/material-dashboard-react/components/customTabsStyle'; diff --git a/src/ui/components/FixedPlugin/FixedPlugin.js b/src/ui/components/FixedPlugin/FixedPlugin.jsx similarity index 100% rename from src/ui/components/FixedPlugin/FixedPlugin.js rename to src/ui/components/FixedPlugin/FixedPlugin.jsx diff --git a/src/ui/components/Footer/Footer.js b/src/ui/components/Footer/Footer.jsx similarity index 100% rename from src/ui/components/Footer/Footer.js rename to src/ui/components/Footer/Footer.jsx diff --git a/src/ui/components/Grid/GridContainer.js b/src/ui/components/Grid/GridContainer.jsx similarity index 100% rename from src/ui/components/Grid/GridContainer.js rename to src/ui/components/Grid/GridContainer.jsx diff --git a/src/ui/components/Grid/GridItem.js b/src/ui/components/Grid/GridItem.jsx similarity index 100% rename from src/ui/components/Grid/GridItem.js rename to src/ui/components/Grid/GridItem.jsx diff --git a/src/ui/components/Navbars/AdminNavbarLinks.js b/src/ui/components/Navbars/AdminNavbarLinks.jsx similarity index 99% rename from src/ui/components/Navbars/AdminNavbarLinks.js rename to src/ui/components/Navbars/AdminNavbarLinks.jsx index 56d08b623..48b5fe3e0 100644 --- a/src/ui/components/Navbars/AdminNavbarLinks.js +++ b/src/ui/components/Navbars/AdminNavbarLinks.jsx @@ -13,7 +13,7 @@ import Poppers from '@material-ui/core/Popper'; import Divider from '@material-ui/core/Divider'; import Person from '@material-ui/icons/Person'; import Notifications from '@material-ui/icons/Notifications'; -import Button from '../CustomButtons/Button.js'; +import Button from '../CustomButtons/Button.jsx'; import styles from '../../assets/jss/material-dashboard-react/components/headerLinksStyle.js'; const useStyles = makeStyles(styles); diff --git a/src/ui/components/Navbars/Navbar.js b/src/ui/components/Navbars/Navbar.jsx similarity index 94% rename from src/ui/components/Navbars/Navbar.js rename to src/ui/components/Navbars/Navbar.jsx index f132ccbc5..c6b6c346a 100644 --- a/src/ui/components/Navbars/Navbar.js +++ b/src/ui/components/Navbars/Navbar.jsx @@ -9,8 +9,8 @@ import Toolbar from '@material-ui/core/Toolbar'; import IconButton from '@material-ui/core/IconButton'; import Hidden from '@material-ui/core/Hidden'; import Menu from '@material-ui/icons/Menu'; -import AdminNavbarLinks from './AdminNavbarLinks.js'; -import Button from '../CustomButtons/Button.js'; +import AdminNavbarLinks from './AdminNavbarLinks.jsx'; +import Button from '../CustomButtons/Button.jsx'; import styles from '../../assets/jss/material-dashboard-react/components/headerStyle.js'; const useStyles = makeStyles(styles); diff --git a/src/ui/components/Sidebar/Sidebar.js b/src/ui/components/Sidebar/Sidebar.jsx similarity index 98% rename from src/ui/components/Sidebar/Sidebar.js rename to src/ui/components/Sidebar/Sidebar.jsx index 214f1129c..7a9adf39c 100644 --- a/src/ui/components/Sidebar/Sidebar.js +++ b/src/ui/components/Sidebar/Sidebar.jsx @@ -11,7 +11,7 @@ import List from '@material-ui/core/List'; import ListItem from '@material-ui/core/ListItem'; import ListItemText from '@material-ui/core/ListItemText'; import Icon from '@material-ui/core/Icon'; -import AdminNavbarLinks from '../Navbars/AdminNavbarLinks.js'; +import AdminNavbarLinks from '../Navbars/AdminNavbarLinks.jsx'; import styles from '../../assets/jss/material-dashboard-react/components/sidebarStyle.js'; const useStyles = makeStyles(styles); diff --git a/src/ui/components/Snackbar/Snackbar.js b/src/ui/components/Snackbar/Snackbar.jsx similarity index 100% rename from src/ui/components/Snackbar/Snackbar.js rename to src/ui/components/Snackbar/Snackbar.jsx diff --git a/src/ui/components/Snackbar/SnackbarContent.js b/src/ui/components/Snackbar/SnackbarContent.jsx similarity index 100% rename from src/ui/components/Snackbar/SnackbarContent.js rename to src/ui/components/Snackbar/SnackbarContent.jsx diff --git a/src/ui/components/Table/Table.js b/src/ui/components/Table/Table.jsx similarity index 100% rename from src/ui/components/Table/Table.js rename to src/ui/components/Table/Table.jsx diff --git a/src/ui/components/Tasks/Tasks.js b/src/ui/components/Tasks/Tasks.jsx similarity index 100% rename from src/ui/components/Tasks/Tasks.js rename to src/ui/components/Tasks/Tasks.jsx diff --git a/src/ui/components/Typography/Danger.js b/src/ui/components/Typography/Danger.jsx similarity index 100% rename from src/ui/components/Typography/Danger.js rename to src/ui/components/Typography/Danger.jsx diff --git a/src/ui/components/Typography/Info.js b/src/ui/components/Typography/Info.jsx similarity index 100% rename from src/ui/components/Typography/Info.js rename to src/ui/components/Typography/Info.jsx diff --git a/src/ui/components/Typography/Muted.js b/src/ui/components/Typography/Muted.jsx similarity index 100% rename from src/ui/components/Typography/Muted.js rename to src/ui/components/Typography/Muted.jsx diff --git a/src/ui/components/Typography/Primary.js b/src/ui/components/Typography/Primary.jsx similarity index 100% rename from src/ui/components/Typography/Primary.js rename to src/ui/components/Typography/Primary.jsx diff --git a/src/ui/components/Typography/Quote.js b/src/ui/components/Typography/Quote.jsx similarity index 100% rename from src/ui/components/Typography/Quote.js rename to src/ui/components/Typography/Quote.jsx diff --git a/src/ui/components/Typography/Success.js b/src/ui/components/Typography/Success.jsx similarity index 100% rename from src/ui/components/Typography/Success.js rename to src/ui/components/Typography/Success.jsx diff --git a/src/ui/components/Typography/Warning.js b/src/ui/components/Typography/Warning.jsx similarity index 100% rename from src/ui/components/Typography/Warning.js rename to src/ui/components/Typography/Warning.jsx diff --git a/src/ui/layouts/Admin.js b/src/ui/layouts/Admin.jsx similarity index 94% rename from src/ui/layouts/Admin.js rename to src/ui/layouts/Admin.jsx index 64c64ec1b..c4cbf2f97 100644 --- a/src/ui/layouts/Admin.js +++ b/src/ui/layouts/Admin.jsx @@ -3,9 +3,9 @@ import React from 'react'; import {Routes, Route, Navigate} from 'react-router-dom'; import {makeStyles} from '@material-ui/core/styles'; -import Navbar from '../components/Navbars/Navbar.js'; -import Footer from '../components/Footer/Footer.js'; -import Sidebar from '../components/Sidebar/Sidebar.js'; +import Navbar from '../components/Navbars/Navbar.jsx'; +import Footer from '../components/Footer/Footer.jsx'; +import Sidebar from '../components/Sidebar/Sidebar.jsx'; import routes from '../../routes.js'; import styles from '../assets/jss/material-dashboard-react/layouts/adminStyle.js'; import bgImage from '../assets/img/sidebar-2.jpg'; diff --git a/src/ui/variables/charts.js b/src/ui/variables/charts.js index 08e227225..232bd37d2 100644 --- a/src/ui/variables/charts.js +++ b/src/ui/variables/charts.js @@ -3,7 +3,7 @@ // ############################## // // // javascript library for creating charts // ############################# -const Chartist = require('chartist'); +import Chartist from 'chartist'; // ############################## // // // variables used to create animation on charts @@ -17,7 +17,7 @@ const durations2 = 500; // // // Daily Sales // ############################# -const dailySalesChart = { +export const dailySalesChart = { data: { labels: ['M', 'T', 'W', 'T', 'F', 'S', 'S'], series: [[12, 17, 7, 17, 23, 18, 38]], @@ -71,7 +71,7 @@ const dailySalesChart = { // // // Email Subscriptions // ############################# -const emailsSubscriptionChart = { +export const emailsSubscriptionChart = { data: { labels: [ 'Jan', @@ -136,7 +136,7 @@ const emailsSubscriptionChart = { // // // Completed Tasks // ############################# -const completedTasksChart = { +export const completedTasksChart = { data: { labels: ['12am', '3pm', '6pm', '9pm', '12pm', '3am', '6am', '9am'], series: [[230, 750, 450, 300, 280, 240, 200, 190]], @@ -184,9 +184,3 @@ const completedTasksChart = { }, }, }; - -module.exports = { - dailySalesChart, - emailsSubscriptionChart, - completedTasksChart, -}; diff --git a/src/ui/views/Dashboard/Components/ContributorsTable.js b/src/ui/views/Dashboard/Components/ContributorsTable.jsx similarity index 82% rename from src/ui/views/Dashboard/Components/ContributorsTable.js rename to src/ui/views/Dashboard/Components/ContributorsTable.jsx index 24ee8ff27..a5cd50e7c 100644 --- a/src/ui/views/Dashboard/Components/ContributorsTable.js +++ b/src/ui/views/Dashboard/Components/ContributorsTable.jsx @@ -2,10 +2,10 @@ /* eslint-disable require-jsdoc */ import React from 'react'; import {makeStyles} from '@material-ui/core/styles'; -import Table from '../../../components/Table/Table.js'; -import Card from '../../../components/Card/Card.js'; -import CardHeader from '../../../components/Card/CardHeader.js'; -import CardBody from '../../../components/Card/CardBody.js'; +import Table from '../../../components/Table/Table.jsx'; +import Card from '../../../components/Card/Card.jsx'; +import CardHeader from '../../../components/Card/CardHeader.jsx'; +import CardBody from '../../../components/Card/CardBody.jsx'; import styles from '../../../assets/jss/material-dashboard-react/views/dashboardStyle.js'; const useStyles = makeStyles(styles); diff --git a/src/ui/views/Dashboard/Components/DailyPullsGraph.js b/src/ui/views/Dashboard/Components/DailyPullsGraph.jsx similarity index 80% rename from src/ui/views/Dashboard/Components/DailyPullsGraph.js rename to src/ui/views/Dashboard/Components/DailyPullsGraph.jsx index 62ab01629..265a19072 100644 --- a/src/ui/views/Dashboard/Components/DailyPullsGraph.js +++ b/src/ui/views/Dashboard/Components/DailyPullsGraph.jsx @@ -4,16 +4,15 @@ import React from 'react'; import ChartistGraph from 'react-chartist'; import {makeStyles} from '@material-ui/core/styles'; import AccessTime from '@material-ui/icons/AccessTime'; -import Card from '../../../components/Card/Card.js'; -import CardHeader from '../../../components/Card/CardHeader.js'; -import CardBody from '../../../components/Card/CardBody.js'; -import CardFooter from '../../../components/Card/CardFooter.js'; +import Card from '../../../components/Card/Card.jsx'; +import CardHeader from '../../../components/Card/CardHeader.jsx'; +import CardBody from '../../../components/Card/CardBody.jsx'; +import CardFooter from '../../../components/Card/CardFooter.jsx'; import ArrowUpward from '@material-ui/icons/ArrowUpward'; import styles from '../../../assets/jss/material-dashboard-react/views/dashboardStyle.js'; -import { - dailySalesChart, -} from '../../../variables/charts.js'; +import + {dailySalesChart} from '../../../variables/charts.js'; const useStyles = makeStyles(styles); diff --git a/src/ui/views/Dashboard/Components/OpenPushRequestSummary.js b/src/ui/views/Dashboard/Components/OpenPushRequestSummary.jsx similarity index 79% rename from src/ui/views/Dashboard/Components/OpenPushRequestSummary.js rename to src/ui/views/Dashboard/Components/OpenPushRequestSummary.jsx index d3ae3a5ee..5c93bf160 100644 --- a/src/ui/views/Dashboard/Components/OpenPushRequestSummary.js +++ b/src/ui/views/Dashboard/Components/OpenPushRequestSummary.jsx @@ -4,10 +4,10 @@ import React from 'react'; import {makeStyles} from '@material-ui/core/styles'; import Icon from '@material-ui/core/Icon'; import DateRange from '@material-ui/icons/DateRange'; -import Card from '../../../components/Card/Card.js'; -import CardHeader from '../../../components/Card/CardHeader.js'; -import CardIcon from '../../..//components/Card/CardIcon.js'; -import CardFooter from '../../../components/Card/CardFooter.js'; +import Card from '../../../components/Card/Card.jsx'; +import CardHeader from '../../../components/Card/CardHeader.jsx'; +import CardIcon from '../../..//components/Card/CardIcon.jsx'; +import CardFooter from '../../../components/Card/CardFooter.jsx'; import styles from '../../../assets/jss/material-dashboard-react/views/dashboardStyle.js'; diff --git a/src/ui/views/Dashboard/Components/PullRequestSummary.js b/src/ui/views/Dashboard/Components/PullRequestSummary.jsx similarity index 79% rename from src/ui/views/Dashboard/Components/PullRequestSummary.js rename to src/ui/views/Dashboard/Components/PullRequestSummary.jsx index e92e11661..38e94f383 100644 --- a/src/ui/views/Dashboard/Components/PullRequestSummary.js +++ b/src/ui/views/Dashboard/Components/PullRequestSummary.jsx @@ -4,10 +4,10 @@ import React from 'react'; import {makeStyles} from '@material-ui/core/styles'; import Icon from '@material-ui/core/Icon'; import LocalOffer from '@material-ui/icons/LocalOffer'; -import Card from '../../../components/Card/Card.js'; -import CardHeader from '../../../components/Card/CardHeader.js'; -import CardIcon from '../../../components/Card/CardIcon.js'; -import CardFooter from '../../../components/Card/CardFooter.js'; +import Card from '../../../components/Card/Card.jsx'; +import CardHeader from '../../../components/Card/CardHeader.jsx'; +import CardIcon from '../../../components/Card/CardIcon.jsx'; +import CardFooter from '../../../components/Card/CardFooter.jsx'; import styles from '../../../assets/jss/material-dashboard-react/views/dashboardStyle.js'; const useStyles = makeStyles(styles); diff --git a/src/ui/views/Dashboard/Components/PushAuthorizationsGraph.js b/src/ui/views/Dashboard/Components/PushAuthorizationsGraph.jsx similarity index 83% rename from src/ui/views/Dashboard/Components/PushAuthorizationsGraph.js rename to src/ui/views/Dashboard/Components/PushAuthorizationsGraph.jsx index 06d78047d..cb097b127 100644 --- a/src/ui/views/Dashboard/Components/PushAuthorizationsGraph.js +++ b/src/ui/views/Dashboard/Components/PushAuthorizationsGraph.jsx @@ -4,10 +4,10 @@ import React from 'react'; import ChartistGraph from 'react-chartist'; import {makeStyles} from '@material-ui/core/styles'; import AccessTime from '@material-ui/icons/AccessTime'; -import Card from '../../../components/Card/Card.js'; -import CardHeader from '../../../components/Card/CardHeader.js'; -import CardBody from '../../../components/Card/CardBody.js'; -import CardFooter from '../../../components/Card/CardFooter.js'; +import Card from '../../../components/Card/Card.jsx'; +import CardHeader from '../../../components/Card/CardHeader.jsx'; +import CardBody from '../../../components/Card/CardBody.jsx'; +import CardFooter from '../../../components/Card/CardFooter.jsx'; import {emailsSubscriptionChart} from '../../../variables/charts.js'; diff --git a/src/ui/views/Dashboard/Components/PushTable.js b/src/ui/views/Dashboard/Components/PushTable.jsx similarity index 97% rename from src/ui/views/Dashboard/Components/PushTable.js rename to src/ui/views/Dashboard/Components/PushTable.jsx index 7de67532f..1e0dc8b0b 100644 --- a/src/ui/views/Dashboard/Components/PushTable.js +++ b/src/ui/views/Dashboard/Components/PushTable.jsx @@ -4,8 +4,8 @@ import React, {useState, useEffect} from 'react'; import axios from 'axios'; import BugReport from '@material-ui/icons/BugReport'; import Code from '@material-ui/icons/Code'; -import Table from '../../../components/Table/Table.js'; -import CustomTabs from '../../../components/CustomTabs/CustomTabs.js'; +import Table from '../../../components/Table/Table.jsx'; +import CustomTabs from '../../../components/CustomTabs/CustomTabs.jsx'; import {Navigate} from 'react-router-dom'; diff --git a/src/ui/views/Dashboard/Components/RejectedPushGraph.js b/src/ui/views/Dashboard/Components/RejectedPushGraph.jsx similarity index 82% rename from src/ui/views/Dashboard/Components/RejectedPushGraph.js rename to src/ui/views/Dashboard/Components/RejectedPushGraph.jsx index 8ae8f81f4..103d44b64 100644 --- a/src/ui/views/Dashboard/Components/RejectedPushGraph.js +++ b/src/ui/views/Dashboard/Components/RejectedPushGraph.jsx @@ -4,10 +4,10 @@ import React from 'react'; import ChartistGraph from 'react-chartist'; import {makeStyles} from '@material-ui/core/styles'; import AccessTime from '@material-ui/icons/AccessTime'; -import Card from '../../../components/Card/Card.js'; -import CardHeader from '../../../components/Card/CardHeader.js'; -import CardBody from '../../../components/Card/CardBody.js'; -import CardFooter from '../../../components/Card/CardFooter.js'; +import Card from '../../../components/Card/Card.jsx'; +import CardHeader from '../../../components/Card/CardHeader.jsx'; +import CardBody from '../../../components/Card/CardBody.jsx'; +import CardFooter from '../../../components/Card/CardFooter.jsx'; import styles from '../../../assets/jss/material-dashboard-react/views/dashboardStyle.js'; diff --git a/src/ui/views/Dashboard/Components/RejectedPushRequestSummary.js b/src/ui/views/Dashboard/Components/RejectedPushRequestSummary.jsx similarity index 79% rename from src/ui/views/Dashboard/Components/RejectedPushRequestSummary.js rename to src/ui/views/Dashboard/Components/RejectedPushRequestSummary.jsx index e2fc2ae74..aa2c03e32 100644 --- a/src/ui/views/Dashboard/Components/RejectedPushRequestSummary.js +++ b/src/ui/views/Dashboard/Components/RejectedPushRequestSummary.jsx @@ -4,10 +4,10 @@ import React from 'react'; import {makeStyles} from '@material-ui/core/styles'; import Icon from '@material-ui/core/Icon'; import LocalOffer from '@material-ui/icons/LocalOffer'; -import Card from '../../../components/Card/Card.js'; -import CardHeader from '../../../components/Card/CardHeader.js'; -import CardIcon from '../../../components/Card/CardIcon.js'; -import CardFooter from '../../../components/Card/CardFooter.js'; +import Card from '../../../components/Card/Card.jsx'; +import CardHeader from '../../../components/Card/CardHeader.jsx'; +import CardIcon from '../../../components/Card/CardIcon.jsx'; +import CardFooter from '../../../components/Card/CardFooter.jsx'; import styles from '../../../assets/jss/material-dashboard-react/views/dashboardStyle.js'; const useStyles = makeStyles(styles); diff --git a/src/ui/views/Dashboard/Components/SuccessfulPushRequestSummary.js b/src/ui/views/Dashboard/Components/SuccessfulPushRequestSummary.jsx similarity index 78% rename from src/ui/views/Dashboard/Components/SuccessfulPushRequestSummary.js rename to src/ui/views/Dashboard/Components/SuccessfulPushRequestSummary.jsx index 332d47ab6..87bc2dce3 100644 --- a/src/ui/views/Dashboard/Components/SuccessfulPushRequestSummary.js +++ b/src/ui/views/Dashboard/Components/SuccessfulPushRequestSummary.jsx @@ -4,10 +4,10 @@ import React from 'react'; import {makeStyles} from '@material-ui/core/styles'; import Update from '@material-ui/icons/Update'; import Accessibility from '@material-ui/icons/Accessibility'; -import Card from '../../../components/Card/Card.js'; -import CardHeader from '../../../components/Card/CardHeader.js'; -import CardIcon from '../../../components/Card/CardIcon.js'; -import CardFooter from '../../../components/Card/CardFooter.js'; +import Card from '../../../components/Card/Card.jsx'; +import CardHeader from '../../../components/Card/CardHeader.jsx'; +import CardIcon from '../../../components/Card/CardIcon.jsx'; +import CardFooter from '../../../components/Card/CardFooter.jsx'; import styles from '../../../assets/jss/material-dashboard-react/views/dashboardStyle.js'; const useStyles = makeStyles(styles); diff --git a/src/ui/views/Dashboard/Dashboard.js b/src/ui/views/Dashboard/Dashboard.jsx similarity index 96% rename from src/ui/views/Dashboard/Dashboard.js rename to src/ui/views/Dashboard/Dashboard.jsx index 80514867b..8ad2a2d18 100644 --- a/src/ui/views/Dashboard/Dashboard.js +++ b/src/ui/views/Dashboard/Dashboard.jsx @@ -1,8 +1,8 @@ /* eslint-disable max-len */ /* eslint-disable require-jsdoc */ import React from 'react'; -import GridItem from '../../components/Grid/GridItem.js'; -import GridContainer from '../../components/Grid/GridContainer.js'; +import GridItem from '../../components/Grid/GridItem.jsx'; +import GridContainer from '../../components/Grid/GridContainer.jsx'; import OpenPushRequestSummary from './Components/OpenPushRequestSummary'; import PullRequestSummary from './Components/PullRequestSummary'; import RejectedPushRequestSummary from './Components/RejectedPushRequestSummary'; diff --git a/src/ui/views/Login/Login.js b/src/ui/views/Login/Login.jsx similarity index 90% rename from src/ui/views/Login/Login.js rename to src/ui/views/Login/Login.jsx index a018f86ec..b32019c02 100644 --- a/src/ui/views/Login/Login.js +++ b/src/ui/views/Login/Login.jsx @@ -6,14 +6,14 @@ import {makeStyles} from '@material-ui/core/styles'; import FormControl from '@material-ui/core/FormControl'; import InputLabel from '@material-ui/core/InputLabel'; // core components -import GridItem from '../../components/Grid/GridItem.js'; -import GridContainer from '../../components/Grid/GridContainer.js'; +import GridItem from '../../components/Grid/GridItem.jsx'; +import GridContainer from '../../components/Grid/GridContainer.jsx'; import Input from '@material-ui/core/Input'; -import Button from '../../components/CustomButtons/Button.js'; -import Card from '../../components/Card/Card.js'; -import CardHeader from '../../components/Card/CardHeader.js'; -import CardBody from '../../components/Card/CardBody.js'; -import CardFooter from '../../components/Card/CardFooter.js'; +import Button from '../../components/CustomButtons/Button.jsx'; +import Card from '../../components/Card/Card.jsx'; +import CardHeader from '../../components/Card/CardHeader.jsx'; +import CardBody from '../../components/Card/CardBody.jsx'; +import CardFooter from '../../components/Card/CardFooter.jsx'; import axios from 'axios'; import {Navigate} from 'react-router-dom'; diff --git a/src/ui/views/OpenPushRequests/OpenPushRequests.js b/src/ui/views/OpenPushRequests/OpenPushRequests.jsx similarity index 95% rename from src/ui/views/OpenPushRequests/OpenPushRequests.js rename to src/ui/views/OpenPushRequests/OpenPushRequests.jsx index fa8144c25..5e9b11e5c 100644 --- a/src/ui/views/OpenPushRequests/OpenPushRequests.js +++ b/src/ui/views/OpenPushRequests/OpenPushRequests.jsx @@ -1,8 +1,8 @@ /* eslint-disable max-len */ /* eslint-disable require-jsdoc */ import React from 'react'; -import GridItem from '../../components/Grid/GridItem.js'; -import GridContainer from '../../components/Grid/GridContainer.js'; +import GridItem from '../../components/Grid/GridItem.jsx'; +import GridContainer from '../../components/Grid/GridContainer.jsx'; import PushesTable from './components/PushesTable'; import CustomTabs from '../../components/CustomTabs/CustomTabs'; diff --git a/src/ui/views/OpenPushRequests/components/PushesTable.js b/src/ui/views/OpenPushRequests/components/PushesTable.jsx similarity index 100% rename from src/ui/views/OpenPushRequests/components/PushesTable.js rename to src/ui/views/OpenPushRequests/components/PushesTable.jsx diff --git a/src/ui/views/PushDetails/PushDetails.js b/src/ui/views/PushDetails/PushDetails.jsx similarity index 92% rename from src/ui/views/PushDetails/PushDetails.js rename to src/ui/views/PushDetails/PushDetails.jsx index ca275661d..0b43d8a88 100644 --- a/src/ui/views/PushDetails/PushDetails.js +++ b/src/ui/views/PushDetails/PushDetails.jsx @@ -5,14 +5,14 @@ import {Navigate} from 'react-router-dom'; import moment from 'moment'; import {useNavigate} from 'react-router-dom'; import Icon from '@material-ui/core/Icon'; -import GridItem from '../../components/Grid/GridItem.js'; -import GridContainer from '../../components/Grid/GridContainer.js'; -import Card from '../../components/Card/Card.js'; -import CardIcon from '../../components/Card/CardIcon.js'; -import CardBody from '../../components/Card/CardBody.js'; -import CardHeader from '../../components/Card/CardHeader.js'; -import CardFooter from '../../components/Card/CardFooter.js'; -import Button from '../../components/CustomButtons/Button.js'; +import GridItem from '../../components/Grid/GridItem.jsx'; +import GridContainer from '../../components/Grid/GridContainer.jsx'; +import Card from '../../components/Card/Card.jsx'; +import CardIcon from '../../components/Card/CardIcon.jsx'; +import CardBody from '../../components/Card/CardBody.jsx'; +import CardHeader from '../../components/Card/CardHeader.jsx'; +import CardFooter from '../../components/Card/CardFooter.jsx'; +import Button from '../../components/CustomButtons/Button.jsx'; import Diff from './components/Diff'; import Table from '@material-ui/core/Table'; import TableBody from '@material-ui/core/TableBody'; diff --git a/src/ui/views/RepoDetails/Components/AddUser.js b/src/ui/views/RepoDetails/Components/AddUser.jsx similarity index 93% rename from src/ui/views/RepoDetails/Components/AddUser.js rename to src/ui/views/RepoDetails/Components/AddUser.jsx index f594d1ab2..a1049398e 100644 --- a/src/ui/views/RepoDetails/Components/AddUser.js +++ b/src/ui/views/RepoDetails/Components/AddUser.jsx @@ -6,12 +6,12 @@ import PropTypes from 'prop-types'; import InputLabel from '@material-ui/core/InputLabel'; import FormControl from '@material-ui/core/FormControl'; import FormHelperText from '@material-ui/core/FormHelperText'; -import GridItem from '../../../components/Grid/GridItem.js'; -import GridContainer from '../../../components/Grid/GridContainer.js'; -import Card from '../../../components/Card/Card.js'; -import CardBody from '../../../components/Card/CardBody.js'; +import GridItem from '../../../components/Grid/GridItem.jsx'; +import GridContainer from '../../../components/Grid/GridContainer.jsx'; +import Card from '../../../components/Card/Card.jsx'; +import CardBody from '../../../components/Card/CardBody.jsx'; import MenuItem from '@material-ui/core/MenuItem'; -import Button from '../../../components/CustomButtons/Button.js'; +import Button from '../../../components/CustomButtons/Button.jsx'; import DialogTitle from '@material-ui/core/DialogTitle'; import Select from '@material-ui/core/Select'; import Dialog from '@material-ui/core/Dialog'; diff --git a/src/ui/views/RepoDetails/RepoDetails.js b/src/ui/views/RepoDetails/RepoDetails.jsx similarity index 97% rename from src/ui/views/RepoDetails/RepoDetails.js rename to src/ui/views/RepoDetails/RepoDetails.jsx index 69b4782a5..c9a95a997 100644 --- a/src/ui/views/RepoDetails/RepoDetails.js +++ b/src/ui/views/RepoDetails/RepoDetails.jsx @@ -3,10 +3,10 @@ import React, {useState, useEffect} from 'react'; import {Navigate} from 'react-router-dom'; // import Icon from '@material-ui/core/Icon'; -import GridItem from '../../components/Grid/GridItem.js'; -import GridContainer from '../../components/Grid/GridContainer.js'; -import Card from '../../components/Card/Card.js'; -import CardBody from '../../components/Card/CardBody.js'; +import GridItem from '../../components/Grid/GridItem.jsx'; +import GridContainer from '../../components/Grid/GridContainer.jsx'; +import Card from '../../components/Card/Card.jsx'; +import CardBody from '../../components/Card/CardBody.jsx'; import TextField from '@material-ui/core/TextField'; import Paper from '@material-ui/core/Paper'; import Button from '@material-ui/core/Button'; diff --git a/src/ui/views/RepoList/Components/Repositories.js b/src/ui/views/RepoList/Components/Repositories.jsx similarity index 100% rename from src/ui/views/RepoList/Components/Repositories.js rename to src/ui/views/RepoList/Components/Repositories.jsx diff --git a/src/ui/views/RepoList/Components/TabList.js b/src/ui/views/RepoList/Components/TabList.jsx similarity index 90% rename from src/ui/views/RepoList/Components/TabList.js rename to src/ui/views/RepoList/Components/TabList.jsx index d0cc39eb0..efac7ed51 100644 --- a/src/ui/views/RepoList/Components/TabList.js +++ b/src/ui/views/RepoList/Components/TabList.jsx @@ -1,8 +1,8 @@ /* eslint-disable max-len */ /* eslint-disable require-jsdoc */ import React from 'react'; -import GridItem from '../../../components/Grid/GridItem.js'; -import GridContainer from '../../../components/Grid/GridContainer.js'; +import GridItem from '../../../components/Grid/GridItem.jsx'; +import GridContainer from '../../../components/Grid/GridContainer.jsx'; import CustomTabs from '../../../components/CustomTabs/CustomTabs'; import Repositories from './Repositories'; diff --git a/src/ui/views/RepoList/RepoList.js b/src/ui/views/RepoList/RepoList.jsx similarity index 70% rename from src/ui/views/RepoList/RepoList.js rename to src/ui/views/RepoList/RepoList.jsx index 56376bdcf..2dc32d946 100644 --- a/src/ui/views/RepoList/RepoList.js +++ b/src/ui/views/RepoList/RepoList.jsx @@ -2,12 +2,12 @@ /* eslint-disable require-jsdoc */ import React from 'react'; import Icon from '@material-ui/core/Icon'; -import GridItem from '../../components/Grid/GridItem.js'; -import GridContainer from '../../components/Grid/GridContainer.js'; -import Card from '../../components/Card/Card.js'; -import CardIcon from '../../components/Card/CardIcon.js'; -import CardBody from '../../components/Card/CardBody.js'; -import CardHeader from '../../components/Card/CardHeader.js'; +import GridItem from '../../components/Grid/GridItem.jsx'; +import GridContainer from '../../components/Grid/GridContainer.jsx'; +import Card from '../../components/Card/Card.jsx'; +import CardIcon from '../../components/Card/CardIcon.jsx'; +import CardBody from '../../components/Card/CardBody.jsx'; +import CardHeader from '../../components/Card/CardHeader.jsx'; import TabList from './Components/TabList'; export default function RepoList(props) { diff --git a/src/ui/views/User/User.js b/src/ui/views/User/User.jsx similarity index 92% rename from src/ui/views/User/User.js rename to src/ui/views/User/User.jsx index 34e065db1..c1317d0f9 100644 --- a/src/ui/views/User/User.js +++ b/src/ui/views/User/User.jsx @@ -3,12 +3,12 @@ import React, {useState, useEffect} from 'react'; import {Navigate} from 'react-router-dom'; import Icon from '@material-ui/core/Icon'; -import GridItem from '../../components/Grid/GridItem.js'; -import GridContainer from '../../components/Grid/GridContainer.js'; -import Card from '../../components/Card/Card.js'; -import CardIcon from '../../components/Card/CardIcon.js'; -import CardBody from '../../components/Card/CardBody.js'; -import CardHeader from '../../components/Card/CardHeader.js'; +import GridItem from '../../components/Grid/GridItem.jsx'; +import GridContainer from '../../components/Grid/GridContainer.jsx'; +import Card from '../../components/Card/Card.jsx'; +import CardIcon from '../../components/Card/CardIcon.jsx'; +import CardBody from '../../components/Card/CardBody.jsx'; +import CardHeader from '../../components/Card/CardHeader.jsx'; // import Button from '../../components/CustomButtons/Button.js'; // import PropTypes from 'prop-types'; import TextField from '@material-ui/core/TextField'; diff --git a/src/ui/views/UserList/Components/NewUser.js b/src/ui/views/UserList/Components/NewUser.jsx similarity index 94% rename from src/ui/views/UserList/Components/NewUser.js rename to src/ui/views/UserList/Components/NewUser.jsx index a59a49828..558f060f9 100644 --- a/src/ui/views/UserList/Components/NewUser.js +++ b/src/ui/views/UserList/Components/NewUser.jsx @@ -7,11 +7,11 @@ import Input from '@material-ui/core/Input'; import FormControl from '@material-ui/core/FormControl'; import Checkbox from '@material-ui/core/Checkbox'; import FormHelperText from '@material-ui/core/FormHelperText'; -import GridItem from '../../../components/Grid/GridItem.js'; -import GridContainer from '../../../components/Grid/GridContainer.js'; -import Card from '../../../components/Card/Card.js'; -import CardBody from '../../../components/Card/CardBody.js'; -import Button from '../../../components/CustomButtons/Button.js'; +import GridItem from '../../../components/Grid/GridItem.jsx'; +import GridContainer from '../../../components/Grid/GridContainer.jsx'; +import Card from '../../../components/Card/Card.jsx'; +import CardBody from '../../../components/Card/CardBody.jsx'; +import Button from '../../../components/CustomButtons/Button.jsx'; import DialogTitle from '@material-ui/core/DialogTitle'; import Dialog from '@material-ui/core/Dialog'; diff --git a/src/ui/views/UserList/Components/TabList.js b/src/ui/views/UserList/Components/TabList.jsx similarity index 90% rename from src/ui/views/UserList/Components/TabList.js rename to src/ui/views/UserList/Components/TabList.jsx index b399714f4..224391b2c 100644 --- a/src/ui/views/UserList/Components/TabList.js +++ b/src/ui/views/UserList/Components/TabList.jsx @@ -1,8 +1,8 @@ /* eslint-disable max-len */ /* eslint-disable require-jsdoc */ import React from 'react'; -import GridItem from '../../../components/Grid/GridItem.js'; -import GridContainer from '../../../components/Grid/GridContainer.js'; +import GridItem from '../../../components/Grid/GridItem.jsx'; +import GridContainer from '../../../components/Grid/GridContainer.jsx'; import CustomTabs from '../../../components/CustomTabs/CustomTabs'; import UserList from './UserList'; diff --git a/src/ui/views/UserList/Components/UserList.js b/src/ui/views/UserList/Components/UserList.jsx similarity index 97% rename from src/ui/views/UserList/Components/UserList.js rename to src/ui/views/UserList/Components/UserList.jsx index 17b788a8f..4d1bdeb5d 100644 --- a/src/ui/views/UserList/Components/UserList.js +++ b/src/ui/views/UserList/Components/UserList.jsx @@ -2,9 +2,9 @@ /* eslint-disable require-jsdoc */ import React, {useState, useEffect} from 'react'; import {makeStyles} from '@material-ui/core/styles'; +import GridItem from '../../../components/Grid/GridItem.jsx'; +import GridContainer from '../../../components/Grid/GridContainer.jsx'; import {useNavigate} from 'react-router-dom'; -import GridItem from '../../../components/Grid/GridItem.js'; -import GridContainer from '../../../components/Grid/GridContainer.js'; import Button from '@material-ui/core/Button'; import Table from '@material-ui/core/Table'; import TableBody from '@material-ui/core/TableBody'; diff --git a/src/ui/views/UserList/UserList.js b/src/ui/views/UserList/UserList.jsx similarity index 70% rename from src/ui/views/UserList/UserList.js rename to src/ui/views/UserList/UserList.jsx index b2070252b..eec7e42b8 100644 --- a/src/ui/views/UserList/UserList.js +++ b/src/ui/views/UserList/UserList.jsx @@ -2,12 +2,12 @@ /* eslint-disable require-jsdoc */ import React from 'react'; import Icon from '@material-ui/core/Icon'; -import GridItem from '../../components/Grid/GridItem.js'; -import GridContainer from '../../components/Grid/GridContainer.js'; -import Card from '../../components/Card/Card.js'; -import CardIcon from '../../components/Card/CardIcon.js'; -import CardBody from '../../components/Card/CardBody.js'; -import CardHeader from '../../components/Card/CardHeader.js'; +import GridItem from '../../components/Grid/GridItem.jsx'; +import GridContainer from '../../components/Grid/GridContainer.jsx'; +import Card from '../../components/Card/Card.jsx'; +import CardIcon from '../../components/Card/CardIcon.jsx'; +import CardBody from '../../components/Card/CardBody.jsx'; +import CardHeader from '../../components/Card/CardHeader.jsx'; import TabList from './Components/TabList'; export default function UserList(props) { diff --git a/vite.config.js b/vite.config.js index 4e690eb8d..7feab4494 100644 --- a/vite.config.js +++ b/vite.config.js @@ -6,6 +6,9 @@ export default defineConfig(() => { build: { outDir: 'build', }, + server: { + port: 3000, + }, plugins: [react()], }; }); \ No newline at end of file