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
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/node_modules
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@ server/api/**/*.nedb
server/static/javascript
server/static/react
client/node_modules/
Dockerfile
.vscode
site

5 changes: 4 additions & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"react-ga": "^3.2.0",
"react-helmet": "^6.1.0",
"react-live": "^2.2.3",
"react-loadable": "^5.5.0",
"react-redux": "^7.2.2",
"react-scripts": "4.0.0",
"react-sortable-hoc": "^1.11.0",
Expand All @@ -43,6 +44,7 @@
"redial": "^0.5.0",
"redux": "^4.0.5",
"redux-logger": "^3.0.6",
"source-map-explorer": "^2.5.0",
"web-vitals": "^0.2.4"
},
"devDependencies": {
Expand All @@ -52,7 +54,8 @@
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
"eject": "react-scripts eject",
"analyze": "source-map-explorer 'build/static/js/*.js'"
},
"eslintConfig": {
"extends": [
Expand Down
Binary file added client/public/android-icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/android-icon-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/android-icon-36x36.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/android-icon-48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/android-icon-72x72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/android-icon-96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/apple-icon-114x114.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/apple-icon-120x120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/apple-icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/apple-icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/apple-icon-180x180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/apple-icon-57x57.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/apple-icon-60x60.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/apple-icon-72x72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/apple-icon-76x76.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/apple-icon-precomposed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/apple-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions client/public/browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
Binary file added client/public/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/favicon-96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/public/favicon.ico
Binary file not shown.
Binary file modified client/public/logo192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/public/logo512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
75 changes: 51 additions & 24 deletions client/public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,52 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
"short_name": "Basic Primitives Diagrams",
"name": "Basic Primitives Diagrams - Data visualization diagramming Components for dependencies visualization and analysis",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "android-icon-36x36.png",
"sizes": "36x36",
"type": "image/png",
"density": "0.75"
},
{
"src": "android-icon-48x48.png",
"sizes": "48x48",
"type": "image/png",
"density": "1.0"
},
{
"src": "android-icon-72x72.png",
"sizes": "72x72",
"type": "image/png",
"density": "1.5"
},
{
"src": "android-icon-96x96.png",
"sizes": "96x96",
"type": "image/png",
"density": "2.0"
},
{
"src": "android-icon-144x144.png",
"sizes": "144x144",
"type": "image/png",
"density": "3.0"
},
{
"src": "android-icon-192x192.png",
"sizes": "192x192",
"type": "image/png",
"density": "4.0"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
]
}
Binary file added client/public/ms-icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/ms-icon-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/ms-icon-310x310.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/ms-icon-70x70.png
1 change: 1 addition & 0 deletions client/public/robots.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# https://www.robotstxt.org/robotstxt.html
User-agent: *
Disallow:
Sitemap: https://www.basicprimitives.com/sitemap.txt
14 changes: 7 additions & 7 deletions client/src/components/Options/OptionsPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import AccordionSummary from '@material-ui/core/AccordionSummary';
import AccordionDetails from '@material-ui/core/AccordionDetails';
import Typography from '@material-ui/core/Typography';
import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
import { RadioGroupOption } from 'components';
import { CheckboxOption } from 'components';
import { ComboBoxOption } from 'components';
import { SizeOption } from 'components';
import { ThicknessOption } from 'components';
import { TextOption } from 'components';
import { ItemsOrderOption } from 'components';
import RadioGroupOption from 'components/Options/RadioGroupOption';
import CheckboxOption from 'components/Options/CheckboxOption';
import ComboBoxOption from 'components/Options/ComboBoxOption';
import SizeOption from 'components/Options/SizeOption';
import ThicknessOption from 'components/Options/ThicknessOption';
import TextOption from 'components/Options/TextOption';
import ItemsOrderOption from 'components/Options/ItemsOrderOption';
import { makeStyles } from "@material-ui/core/styles";

const useStyles = makeStyles(theme => {
Expand Down
9 changes: 9 additions & 0 deletions client/src/components/PdfViewDialog/FamPdfViewDialog.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import React from 'react';
import PdfViewDialog from './PdfViewDialog';
import primitives from 'basicprimitives';

function FamPdfViewDialog(props) {
return <PdfViewDialog {...props} plugin={primitives.pdf.famdiagram.Plugin} />
}

export default FamPdfViewDialog;
11 changes: 11 additions & 0 deletions client/src/components/PdfViewDialog/FamPdfViewDialogLoadable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react"
import Loadable from "react-loadable"

const loadable = Loadable({
loader: () => import("./FamPdfViewDialog"),
loading() {
return <div>Loading...</div>
}
})

export default loadable;
9 changes: 9 additions & 0 deletions client/src/components/PdfViewDialog/OrgPdfViewDialog.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import React from 'react';
import PdfViewDialog from './PdfViewDialog';
import primitives from 'basicprimitives';

function OrgPdfViewDialog(props) {
return <PdfViewDialog {...props} plugin={primitives.pdf.orgdiagram.Plugin} />
}

export default OrgPdfViewDialog;
11 changes: 11 additions & 0 deletions client/src/components/PdfViewDialog/OrgPdfViewDialogLoadable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react"
import Loadable from "react-loadable"

const loadable = Loadable({
loader: () => import("./OrgPdfViewDialog"),
loading() {
return <div>Loading...</div>
}
})

export default loadable;
15 changes: 1 addition & 14 deletions client/src/components/PdfViewDialog/PdfViewDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,4 @@ function PdfViewDialog(props) {
);
}

function OrgPdfViewDialog(props) {
return <PdfViewDialog {...props} plugin={primitives.pdf.orgdiagram.Plugin} />
}

function FamPdfViewDialog(props) {
return <PdfViewDialog {...props} plugin={primitives.pdf.famdiagram.Plugin} />
}

const result = {
OrgPdfViewDialog,
FamPdfViewDialog
}

export default result;
export default PdfViewDialog;
7 changes: 4 additions & 3 deletions client/src/components/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import pdfViewDialog from './PdfViewDialog/PdfViewDialog';
import orgPdfViewDialog from './PdfViewDialog/OrgPdfViewDialogLoadable';
import famPdfViewDialog from './PdfViewDialog/FamPdfViewDialogLoadable';
import radioGroupOption from './Options/RadioGroupOption';
import checkboxOption from './Options/CheckboxOption';
import comboBoxOption from './Options/ComboBoxOption';
Expand All @@ -9,8 +10,8 @@ import itemsOrderOption from './Options/ItemsOrderOption';
import optionsPanel from './Options/OptionsPanel';
import options from './Options/options';

export const OrgPdfViewDialog = pdfViewDialog.OrgPdfViewDialog;
export const FamPdfViewDialog = pdfViewDialog.FamPdfViewDialog;
export const OrgPdfViewDialog = orgPdfViewDialog;
export const FamPdfViewDialog = famPdfViewDialog;
export const RadioGroupOption = radioGroupOption;
export const CheckboxOption = checkboxOption;
export const ComboBoxOption = comboBoxOption;
Expand Down
2 changes: 1 addition & 1 deletion client/src/containers/App/AppDrawer.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { withStyles } from '@material-ui/core/styles';
import List from '@material-ui/core/List';
import AppDrawerNavItem from './AppDrawerNavItem';
import {pageToTitle} from './helpers';
import { useSelector, useDispatch } from 'react-redux'
import { useSelector, useDispatch } from 'react-redux';
import { load } from 'redux/modules/pages';
import { useLocation } from "@reach/router"
import primitives from 'basicprimitives';
Expand Down
5 changes: 3 additions & 2 deletions client/src/containers/App/Version.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import primitives from 'basicprimitives';
import { makeStyles } from '@material-ui/core/styles';
import ListSubheader from '@material-ui/core/ListSubheader';
import List from '@material-ui/core/List';
import { useSelector } from 'react-redux';

const useStyles = makeStyles((theme) => ({
root: {
Expand All @@ -17,13 +17,14 @@ const useStyles = makeStyles((theme) => ({

export default function Navigation() {
const classes = useStyles();
const version = useSelector(state => state.pages.version);
return (
<List
component="nav"
aria-labelledby="current-version-subheader"
subheader={
<ListSubheader component="div" id="current-version-subheader">
Current Version: {primitives.common.version}
Current Version: {version}
</ListSubheader>
}
className={classes.root}
Expand Down
11 changes: 11 additions & 0 deletions client/src/containers/CrossTeamGroup/Loadable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react"
import Loadable from "react-loadable"

const loadable = Loadable({
loader: () => import("./CrossTeamGroup"),
loading() {
return <div>Loading...</div>
}
})

export default loadable;
11 changes: 11 additions & 0 deletions client/src/containers/Dependencies/Loadable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react"
import Loadable from "react-loadable"

const loadable = Loadable({
loader: () => import("./Dependencies"),
loading() {
return <div>Loading...</div>
}
})

export default loadable;
11 changes: 11 additions & 0 deletions client/src/containers/DynamicLoading/Loadable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react"
import Loadable from "react-loadable"

const loadable = Loadable({
loader: () => import("./DynamicLoading"),
loading() {
return <div>Loading...</div>
}
})

export default loadable;
11 changes: 11 additions & 0 deletions client/src/containers/FamilyChartItemsOrdering/Loadable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react"
import Loadable from "react-loadable"

const loadable = Loadable({
loader: () => import("./FamilyChartItemsOrdering"),
loading() {
return <div>Loading...</div>
}
})

export default loadable;
11 changes: 11 additions & 0 deletions client/src/containers/FamilyChartWithAnnotations/Loadable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react"
import Loadable from "react-loadable"

const loadable = Loadable({
loader: () => import("./FamilyChartWithAnnotations"),
loading() {
return <div>Loading...</div>
}
})

export default loadable;
11 changes: 11 additions & 0 deletions client/src/containers/FinancialOwnership/Loadable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react"
import Loadable from "react-loadable"

const loadable = Loadable({
loader: () => import("./FinancialOwnership"),
loading() {
return <div>Loading...</div>
}
})

export default loadable;
11 changes: 11 additions & 0 deletions client/src/containers/HighlightAnnotations/Loadable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react"
import Loadable from "react-loadable"

const loadable = Loadable({
loader: () => import("./HighlightAnnotations"),
loading() {
return <div>Loading...</div>
}
})

export default loadable;
11 changes: 11 additions & 0 deletions client/src/containers/LargeHierarchy/Loadable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react"
import Loadable from "react-loadable"

const loadable = Loadable({
loader: () => import("./LargeHierarchy"),
loading() {
return <div>Loading...</div>
}
})

export default loadable;
11 changes: 11 additions & 0 deletions client/src/containers/MutualFinancialOwnership/Loadable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react"
import Loadable from "react-loadable"

const loadable = Loadable({
loader: () => import("./MutualFinancialOwnership"),
loading() {
return <div>Loading...</div>
}
})

export default loadable;
11 changes: 11 additions & 0 deletions client/src/containers/OrgEditor/Loadable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react"
import Loadable from "react-loadable"

const loadable = Loadable({
loader: () => import("./OrgEditor"),
loading() {
return <div>Loading...</div>
}
})

export default loadable;
Loading