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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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'",
Expand Down Expand Up @@ -80,4 +80,4 @@
"last 1 safari version"
]
}
}
}
4 changes: 2 additions & 2 deletions src/index.js → src/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';


Expand Down
14 changes: 7 additions & 7 deletions src/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
{
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions src/ui/layouts/Admin.js → src/ui/layouts/Admin.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
14 changes: 4 additions & 10 deletions src/ui/variables/charts.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// ##############################
// // // javascript library for creating charts
// #############################
const Chartist = require('chartist');
import Chartist from 'chartist';

// ##############################
// // // variables used to create animation on charts
Expand All @@ -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]],
Expand Down Expand Up @@ -71,7 +71,7 @@ const dailySalesChart = {
// // // Email Subscriptions
// #############################

const emailsSubscriptionChart = {
export const emailsSubscriptionChart = {
data: {
labels: [
'Jan',
Expand Down Expand Up @@ -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]],
Expand Down Expand Up @@ -184,9 +184,3 @@ const completedTasksChart = {
},
},
};

module.exports = {
dailySalesChart,
emailsSubscriptionChart,
completedTasksChart,
};
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
14 changes: 7 additions & 7 deletions src/ui/views/Login/Login.js → src/ui/views/Login/Login.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Loading