Skip to content

Commit

Permalink
chore(repo): Merge branch 'master' of github.com:layer5io/sistent int…
Browse files Browse the repository at this point in the history
…o 376-tooltipicon
  • Loading branch information
nebula-aac committed Dec 4, 2023
2 parents 08bc434 + b76b610 commit 863cfc2
Show file tree
Hide file tree
Showing 71 changed files with 1,795 additions and 2,676 deletions.
10 changes: 8 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,11 @@ vite.config.ts
.eslintrc.cjs
node_modules
dist
storybook-static
*.md
*.md
site
apps/next-12
.yarnrc.yml
.eslintrc.*js
*.config.*js
eslint-config-sistent
apps/design-system
25 changes: 25 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
module.exports = {
root: true,
env: {
browser: true,
es6: true
},
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:react-hooks/recommended',
'plugin:storybook/recommended'
],
plugins: ['react'],
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
requireConfigFile: false
},
settings: {
react: {
version: 'detect'
}
}
};
47 changes: 25 additions & 22 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,31 @@
name: Linting and formatting
name: Lint check

on:
push:
branches:
- "*"
pull_request:
branches:
- "*"
push:
branches:
- '*'
pull_request:
branches:
- '*'

jobs:
lint:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/[email protected]
lint:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16, 18, 20]

- name: Set up Node.js ${{ matrix.node-version }}
uses: actions/[email protected]
with:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: yarn install
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Run Lint
run: yarn lint && yarn format:check && yarn lint-staged
- name: Set up Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: yarn install

- name: Run Lint
run: yarn lint
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ packages/design-system/node_modules/**
**/storybook-static/**
lerna-debug.log
pub.sh
.eslintcache
7 changes: 6 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# Ignore artifacts:
**/dist/**
**/coverage/**
**/.cache/**
**/.cache/**
**/.github/**
**/.yarn/**
site/public
.yarnrc.yml
.eslintrc.*js
3 changes: 0 additions & 3 deletions apps/next-12/.eslintrc.json

This file was deleted.

111 changes: 55 additions & 56 deletions apps/next-12/components/DefaultModal/index.jsx
Original file line number Diff line number Diff line change
@@ -1,57 +1,56 @@
import {
Button,
Dialog,
DialogActions,
DialogContent,
DialogTitle,
IconButton,
Typography
} from '@layer5/sistent-components';
import { CloseIcon } from '@layer5/sistent-svg';
import React from 'react';

export default function DefaultModal() {
const [open, setOpen] = React.useState(false);

const handleClickOpen = () => {
setOpen(true);
};
const handleClose = () => {
setOpen(false);
};

return (
<React.Fragment>
<Button variant="contained" onClick={handleClickOpen}>
Open Dialog
</Button>
<Dialog onClose={handleClose} open={open}>
<DialogTitle>Modal Title</DialogTitle>
<IconButton onClick={handleClose} sx={{ position: 'absolute', right: 8, top: 8 }}>
<CloseIcon width={24} height={24} />
</IconButton>
<DialogContent dividers>
<Typography gutterBottom>
Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis
in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.
</Typography>
<Typography gutterBottom>
Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis
lacus vel augue laoreet rutrum faucibus dolor auctor.
</Typography>
<Typography gutterBottom>
Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel
scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus
auctor fringilla.
</Typography>
</DialogContent>
<DialogActions>
<Button variant="contained" autoFocus onClick={handleClose}>
Save changes
</Button>
</DialogActions>
</Dialog>
</React.Fragment>
);
}

Button,
Dialog,
DialogActions,
DialogContent,
DialogTitle,
IconButton,
Typography
} from '@layer5/sistent-components';
import { CloseIcon } from '@layer5/sistent-svg';
import React from 'react';

export default function DefaultModal() {
const [open, setOpen] = React.useState(false);

const handleClickOpen = () => {
setOpen(true);
};
const handleClose = () => {
setOpen(false);
};

return (
<React.Fragment>
<Button variant="contained" onClick={handleClickOpen}>
Open Dialog
</Button>
<Dialog onClose={handleClose} open={open}>
<DialogTitle>Modal Title</DialogTitle>
<IconButton onClick={handleClose} sx={{ position: 'absolute', right: 8, top: 8 }}>
<CloseIcon width={24} height={24} />
</IconButton>
<DialogContent dividers>
<Typography gutterBottom>
Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis
in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.
</Typography>
<Typography gutterBottom>
Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis
lacus vel augue laoreet rutrum faucibus dolor auctor.
</Typography>
<Typography gutterBottom>
Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel
scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus
auctor fringilla.
</Typography>
</DialogContent>
<DialogActions>
<Button variant="contained" autoFocus onClick={handleClose}>
Save changes
</Button>
</DialogActions>
</Dialog>
</React.Fragment>
);
}
4 changes: 2 additions & 2 deletions apps/next-12/components/ModeToggleButton.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { toggleTheme } from '@/lib/redux/theme/themeSlice';
import { IconButton } from '@mui/material';
import { useDispatch, useSelector } from 'react-redux';
import { toggleTheme } from '@/lib/redux/theme/themeSlice';

import DarkModeIcon from '@mui/icons-material/DarkMode';
import LightModeIcon from '@mui/icons-material/LightMode';
Expand All @@ -17,7 +17,7 @@ function ModeToggleButton() {
const dispatch = useDispatch(); // Initialize the useDispatch function

// Use useSelector to get the darkTheme state from your Redux store
const mode = useSelector((state) => state.theme.darkTheme ? 'dark' : 'light');
const mode = useSelector((state) => (state.theme.darkTheme ? 'dark' : 'light'));

const toggleMode = () => {
// Dispatch the toggleTheme action when the button is clicked
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import MUIDataTable from 'mui-datatables';
import { useEffect, useState } from 'react';

export function ResponsiveDataTable({
data,
columns,
options = {},
...props
}) {
export function ResponsiveDataTable({ data, columns, options = {}, ...props }) {
const [tableCols, updateCols] = useState(columns);
const [columnVisibility, ,] = useState({});

Expand All @@ -15,7 +10,7 @@ export function ResponsiveDataTable({
weekday: 'short',
day: 'numeric',
month: 'long',
year: 'numeric',
year: 'numeric'
};

return new Intl.DateTimeFormat('un-US', dateOptions).format(date);
Expand All @@ -42,7 +37,7 @@ export function ResponsiveDataTable({
break;
}
}
},
}
};

useEffect(() => {
Expand Down Expand Up @@ -81,7 +76,7 @@ export function ResponsiveDataTable({
}, [columnVisibility]);

const components = {
ExpandButton: () => '',
ExpandButton: () => ''
};

return (
Expand Down
2 changes: 1 addition & 1 deletion apps/next-12/components/ResponsiveDataTable/index.jsx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { ResponsiveDataTable } from "./ResponsiveDataTable";
export { ResponsiveDataTable } from './ResponsiveDataTable';
6 changes: 4 additions & 2 deletions apps/next-12/components/SistentModal/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ export default function SistentModal() {
};
return (
<React.Fragment>
<Button variant="contained" onClick={handleModalOpen}>Open</Button>
<Button variant="contained" onClick={handleModalOpen}>
Open
</Button>
<Modal
open={openModal}
modalTitle="Where do you want to start?"
Expand All @@ -42,4 +44,4 @@ export default function SistentModal() {
</Modal>
</React.Fragment>
);
}
}
2 changes: 1 addition & 1 deletion apps/next-12/components/index.jsx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './ResponsiveDataTable';
export * from './ResponsiveDataTable';
72 changes: 36 additions & 36 deletions apps/next-12/lib/providers/AppThemeProvider.jsx
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
import { useSelector, useDispatch } from "react-redux";
import createEmotionCache from "@/styles/createEmotionCache";
import createEmotionCache from '@/styles/createEmotionCache';
import { darkTheme, lightTheme } from '@/styles/themes/theme';
import { CacheProvider } from '@emotion/react';
import { CssBaseline, ThemeProvider, createTheme } from '@mui/material';
import { darkTheme, lightTheme } from "@/styles/themes/theme";
import { useMemo } from "react";
import { useMemo } from 'react';
import { useSelector } from 'react-redux';

const clientSideEmotionCache = createEmotionCache();

export function AppThemeProvider({ children, emotionCache = clientSideEmotionCache }) {
// const dispatch = useDispatch();
// const dispatch = useDispatch();

const mode = useSelector((state) => state.theme.darkTheme ? "dark" : "light")
const mode = useSelector((state) => (state.theme.darkTheme ? 'dark' : 'light'));

const theme = useMemo(
() =>
createTheme({
palette: {
mode,
primary: {
...(mode === 'light' ? lightTheme.palette.primary : darkTheme.palette.primary),
},
secondary: {
main: '#EE5351',
},
background: {
...(mode === 'light' ? lightTheme.palette.background : darkTheme.palette.background),
},
text: {
...(mode === 'light' ? lightTheme.palette.text : darkTheme.palette.text),
},
},
}),
[mode],
);
const theme = useMemo(
() =>
createTheme({
palette: {
mode,
primary: {
...(mode === 'light' ? lightTheme.palette.primary : darkTheme.palette.primary)
},
secondary: {
main: '#EE5351'
},
background: {
...(mode === 'light' ? lightTheme.palette.background : darkTheme.palette.background)
},
text: {
...(mode === 'light' ? lightTheme.palette.text : darkTheme.palette.text)
}
}
}),
[mode]
);

return (
<CacheProvider value={emotionCache}>
<ThemeProvider theme={theme}>
<CssBaseline />
{children}
</ThemeProvider>
</CacheProvider>
);
}
return (
<CacheProvider value={emotionCache}>
<ThemeProvider theme={theme}>
<CssBaseline />
{children}
</ThemeProvider>
</CacheProvider>
);
}
Loading

0 comments on commit 863cfc2

Please sign in to comment.