Compare commits

...

44 Commits

Author SHA1 Message Date
be724ecf0d v0.8.3 2021-04-04 21:57:44 +02:00
58d1db14ae Fixed Error color not set
Signed-off-by: Avior <florian.bouillon@delta-wings.net>
2021-04-04 21:57:27 +02:00
7000d3ebac v0.8.2 2021-04-04 18:50:11 +02:00
3bde426325 Fixed Checkbox
Signed-off-by: Avior <florian.bouillon@delta-wings.net>
2021-04-04 18:47:49 +02:00
b13a40ef18 Fixed Color changing while input is disabled
Signed-off-by: Avior <florian.bouillon@delta-wings.net>
2021-04-02 00:50:34 +02:00
e481160528 Fixed padding being added to block Inputs
Signed-off-by: Avior <florian.bouillon@delta-wings.net>
2021-04-02 00:48:20 +02:00
a0342050db Removed Margin from the UserMenu if it's the Navbar
Signed-off-by: Avior <florian.bouillon@delta-wings.net>
2021-04-01 23:44:44 +02:00
c1f37b6e7c body will not display if there is no body to display
Signed-off-by: Avior <florian.bouillon@delta-wings.net>
2021-04-01 23:41:40 +02:00
d2fbe42db8 Updated Navbar storybook to include an Image
Signed-off-by: Avior <florian.bouillon@delta-wings.net>
2021-04-01 23:34:37 +02:00
031971b859 v0.8.1 2021-04-01 23:34:02 +02:00
1488386e1d Merge branch 'master' of github.com:dzeiocom/components 2021-04-01 20:43:51 +02:00
26c2c50f23 v0.8.0 2021-04-01 10:19:52 +02:00
c591c2f0a8 Made Loader Stable
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-04-01 10:19:32 +02:00
7fe816c997 v0.7.6 2021-04-01 10:09:59 +02:00
7e28baf2aa Fixed Text
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-04-01 10:09:26 +02:00
b19992b57c v0.7.5 2021-04-01 09:57:32 +02:00
0bb84f9946 Fixed rollup config
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-04-01 09:57:08 +02:00
8cddeab594 v0.7.4 2021-03-31 14:40:22 +02:00
68939d8390 Fixed External link
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-03-31 14:38:33 +02:00
8186284ded GradientBackground is now stable
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-03-31 13:51:04 +02:00
e173bd2a37 Changed generated classes names to be shorter
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-03-31 10:48:48 +02:00
754da58a68 v0.7.3 2021-03-31 10:41:12 +02:00
3b314d5307 Fixed missing global file
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-03-31 10:40:45 +02:00
4a55f00ff0 v0.7.2 2021-03-31 10:17:23 +02:00
d30ae95a0d Fixed everything :D
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-03-31 10:16:46 +02:00
264e9a4cad v0.7.1 2021-03-31 09:55:47 +02:00
6a8fb50b0e Made Logo optionnal
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-03-31 09:54:20 +02:00
8c64a57a16 Merge branch 'master' of github.com:dzeiocom/components
Signed-off-by: Avior <florian.bouillon@delta-wings.net>
2021-03-30 21:33:54 +02:00
d2b5181a60 v0.7.0 2021-03-30 17:04:37 +02:00
95657b147a Finalised Navbar
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-03-30 17:04:16 +02:00
2bfcc6f4ad Misc changes to Link
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-03-30 16:59:04 +02:00
40ce098d63 Removed SidebarContainer
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-03-30 16:57:57 +02:00
b35ab42cc5 v0.6.4 2021-03-30 15:43:02 +02:00
c7487f27b8 Finally Fixed normaly
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-03-30 15:42:46 +02:00
dd179edc2a v0.6.3 2021-03-30 15:38:45 +02:00
c6436d0914 Try to fix compilation errors
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-03-30 15:38:29 +02:00
847f7f2649 v0.6.2 2021-03-30 15:34:33 +02:00
c58918268a Fixed missing file part 2
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-03-30 15:34:11 +02:00
3b65de9103 v0.6.1 2021-03-30 15:32:23 +02:00
208d0f8c06 Fixed missing file
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-03-30 15:32:10 +02:00
75ed12efea v0.6.0 2021-03-30 15:31:00 +02:00
2569db42f8 Changed back to prebuilt but this time it will build on install to allow theme.styl
Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>
2021-03-30 15:30:26 +02:00
c1e40c6789 v0.5.4 2021-03-30 01:48:12 +02:00
bd0787d0ec Fixed Problems
Signed-off-by: Avior <florian.bouillon@delta-wings.net>
2021-03-30 01:47:40 +02:00
28 changed files with 2429 additions and 1517 deletions

2
.gitignore vendored
View File

@ -4,6 +4,8 @@ node_modules/
*.js
!src/dzeio/stylusUtils.js
*.d.ts
types/
!rollup.config.js
!src/stylus.d.ts
!.storybook/*.js
style.css

View File

@ -4,7 +4,5 @@ node_modules/
.gitattributes
.gitignore
.npmignore
rollup.config.js
tsconfig.json
yarn.lock
yarn-error.log

View File

@ -1,4 +1,5 @@
const path = require("path");
const webpack = require('webpack')
module.exports = {
"stories": [
@ -16,5 +17,18 @@ module.exports = {
propFilter: (prop) => (prop.parent ? !/node_modules/.test(prop.parent.fileName) : true),
},
},
presets: [path.resolve(__dirname, "./next.js")]
presets: [path.resolve(__dirname, "./next.js")],
// Allow to use Next/Image
webpackFinal: (config) => {
config.plugins.push(new webpack.DefinePlugin({
'process.env.__NEXT_IMAGE_OPTS': JSON.stringify({
deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
imageSizes: [16, 32, 48, 64, 96, 128, 256, 384],
domains: [],
path: '/',
loader: 'default',
})
}))
return config
}
}

View File

@ -0,0 +1,17 @@
// https://stackoverflow.com/a/64765638/7335674
import * as nextImage from 'next/image'
Object.defineProperty(nextImage, 'default', {
configurable: true,
value: (props) => {
return (
<div style={{display: 'inline-block', maxWidth: '100%', overflow: 'hidden', position: 'relative', boxSizing: 'border-box', margin: 0}}>
<div style={{boxSizing: 'border-box', display: 'block', maxWidth: '100%'}}>
<img {...props} alt="" aria-hidden="true" role="presentation" style={{maxWidth: '100%', display: 'block', margin: 0, border: 'none', padding: 0}} />
</div>
<img {...props} style={{position: 'absolute', inset: 0, boxSizing: 'border-box', padding: 0, border: 'none', margin: 'auto', display: 'block', width: 0, height: 0, minWidth: '100%', maxWidth: '100%', minHeight: '100%', maxHeight: '100%'}} />
</div>
)
},
})

View File

@ -0,0 +1,8 @@
import Router from 'next/router';
Router.router = {
push: async () => {},
replace: async () => {},
prefetch: () => {},
route: '/mock-route',
pathname: 'mock-path',};

View File

@ -1,4 +1,6 @@
import '../src/dzeio/general.styl'
import './mockNextRouter'
import './mockNextImage'
export const parameters = {
layout: 'centered'

View File

@ -0,0 +1,3 @@
<svg width="90" height="38" viewBox="0 0 90 38" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="90" height="38" fill="#C4C4C4"/>
</svg>

After

Width:  |  Height:  |  Size: 150 B

View File

@ -1,9 +1,9 @@
{
"name": "@dzeio/components",
"version": "0.5.3",
"version": "0.8.3",
"license": "MIT",
"main": "./src/index.mjs",
"types": "./src/index.d.ts",
"main": "./index.js",
"types": "./types/index.d.ts",
"devDependencies": {
"@babel/core": "^7.12.16",
"@babel/preset-env": "^7.12.16",
@ -24,18 +24,27 @@
"stylus": "^0.54.8",
"stylus-loader": "^4.3.3",
"ts-loader": "^8.0.17",
"typescript": "^4.1.3",
"typescript": "^4.2.3",
"webpack": "^4.44.2"
},
"peerDependencies": {
"next": "^10.0.5",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-feather": "^2.0.9"
"react-feather": "^2.0.9",
"stylus": "^0.54.8",
"typescript": "^4.2.3"
},
"scripts": {
"storybook": "rm -rf src/dzeio/**/*.js && start-storybook -p 6006",
"build": "tsc && mv src/index.js src/index.mjs",
"prepublishOnly": "yarn build"
"dev": "rm -rf src/dzeio/**/*.js && start-storybook -s ./.storybook/public -p 6006",
"build": "rollup --config",
"prepublishOnly": "yarn build",
"postinstall": "rollup --config"
},
"dependencies": {
"rollup": "^2.44.0",
"rollup-plugin-styles": "^3.14.1",
"rollup-plugin-typescript2": "^0.30.0",
"tslib": "^2.1.0"
}
}

29
rollup.config.js Normal file
View File

@ -0,0 +1,29 @@
import typescript from 'rollup-plugin-typescript2';
import styles from 'rollup-plugin-styles'
import pkg from './package.json';
export default [
{
input: 'src/index.ts',
external: ['ms'],
plugins: [
styles({
modules: true,
url: false,
autoModules: true,
mode: 'extract',
modules: {
generateScopedName: '[local][hash:5]'
}
}),
typescript({useTsconfigDeclarationDir: true}), // so Rollup can convert TypeScript to JavaScript
],
output: [
{
file: pkg.main,
format: 'cjs',
assetFileNames: 'style.css'
}
]
}
];

View File

@ -37,9 +37,11 @@ export default class Box extends React.Component<Props> {
{this.props.headerButtons}
</BoxHeader>
)}
{this.props.children && (
<BoxBody noPadding={this.props.noPadding}>
{this.props.children}
</BoxBody>
)}
</BoxWrapper>
)
}

View File

@ -5,28 +5,33 @@ $backColor = #757575
.label
position relative
display flex
padding-left 8px
margin 8px
user-select none
align-items center
+ .label
margin-top 8px
p
margin-left 18px
margin-left 8px
span
top 0
left 0
width 20px
height @width
position absolute
box-shadow inset 0 0 0 2px $backColor
position relative
box-shadow inset 0 0 0 2px $grayDark
border-radius 2px
transition all $transition
@media (prefers-color-scheme dark)
box-shadow inset 0 0 0 2px $grayLight
&::after
border-radius 20px
position absolute
transition all $transition
background $default
background $main
svg
transition $transition
@ -41,19 +46,9 @@ $backColor = #757575
left 0
opacity 0
&:focus + span
box-shadow inset 0 0 0 2px black, 0 0 0 2px rgba(black,.3)
@media (prefers-color-scheme dark)
box-shadow inset 0 0 0 2px white, 0 0 0 2px rgba(white,.3)
&:focus:checked + span
box-shadow inset 0 0 0 2px $default, 0 0 0 2px rgba($default,.3)
@media (prefers-color-scheme dark)
box-shadow inset 0 0 0 2px $default, 0 0 0 2px rgba($default,.3)
&:checked + span
background rgba($default, .5)
box-shadow inset 0 0 0 2px $default
background rgba($main, .5)
box-shadow inset 0 0 0 2px $main
svg
color white
@ -67,7 +62,6 @@ $backColor = #757575
box-shadow inset 0 0 0 2px white
.radio
margin-left 18px // Margin + margin for Circle
span
border-radius 20px
@ -86,20 +80,19 @@ $backColor = #757575
.switch
padding 2px 0 2px 10px // 2px base padding 10px circle padding
&:hover span
box-shadow none
&::after
&:hover span::after
background black
@media (prefers-color-scheme dark)
background white
span
width 28px
height 14px
border-radius 20px
top 50%
margin-right 10px
box-shadow none
background rgba($backColor, .5)
transform translateY(-50%)
&::after
content " "
@ -115,93 +108,39 @@ $backColor = #757575
width 20px
&:checked + span
box-shadow none
&::after
left 100%
transform translate(-50%, -50%)
background $default
.primary
$color = $primary
background $main
checkBox($color)
input:checked + span
background rgba($color, .5)
box-shadow inset 0 0 0 2px $color
&::after
background $color
input:focus:checked + span
box-shadow inset 0 0 0 2px $color, 0 0 0 2px rgba($color,.3)
&.switch
input:checked + span
box-shadow none
.secondary
$color = $secondary
input:checked + span
background rgba($color, .5)
box-shadow inset 0 0 0 2px $color
&::after
background $color
&.switch
input:checked + span
box-shadow none
.info
$color = $info
input:checked + span
background rgba($color, .5)
box-shadow inset 0 0 0 2px $color
&::after
background $color
&.switch
input:checked + span
box-shadow none
checkBox($infoLight)
@media (prefers-color-scheme dark)
checkBox($infoDark)
.success
$color = $success
checkBox($successLight)
@media (prefers-color-scheme dark)
checkBox($successDark)
input:checked + span
background rgba($color, .5)
box-shadow inset 0 0 0 2px $color
&::after
background $color
&.switch
input:checked + span
box-shadow none
.danger
$color = $danger
input:checked + span
background rgba($color, .5)
box-shadow inset 0 0 0 2px $color
&::after
background $color
&.switch
input:checked + span
box-shadow none
.error
checkBox($errorLight)
@media (prefers-color-scheme dark)
checkBox($errorDark)
.warning
$color = $warning
input:checked + span
background rgba($color, .5)
box-shadow inset 0 0 0 2px $color
&::after
background $color
&.switch
input:checked + span
box-shadow none
checkBox($warningLight)
@media (prefers-color-scheme dark)
checkBox($warningDark)

View File

@ -7,38 +7,32 @@ import css from './Checkbox.module.styl'
import Text from '../Text'
interface Props extends React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement> {
label?: string
id: string
type?: undefined
radio?: boolean
switch?: boolean
color?: ColorType
label: string
type?: 'checkbox' | 'radio' | 'switch'
}
export default class Checkbox extends React.Component<Props> {
public render() {
const props: Props = Object.assign({}, this.props)
const props: Partial<Props> = Object.assign({}, this.props)
delete props.label
delete props.type
delete props.color
delete props.switch
delete props.radio
const realType = this.props.radio ? 'radio' : 'checkbox'
const realType = this.props.type ?? 'checkbox'
return (
<label htmlFor={this.props.id} className={buildClassName(
<label htmlFor={this.props.id ?? this.props.label} className={buildClassName(
[css.label],
[css.radio, realType === 'radio'],
[css.switch, this.props.switch],
[css.switch, realType === 'switch'],
[css[this.props.color as string], this.props.color]
)}>
<input {...props}
type={realType}
id={this.props.id ?? this.props.label}
type={realType === 'switch' ? 'checkbox' : realType}
/>
<span>
{realType === 'checkbox' && ! this.props.switch && (
{realType === 'checkbox' && (
<Check strokeWidth={4} size={16}/>
)}
</span>

View File

@ -1,35 +1,31 @@
@import "../config"
$transparent = 75%
$percent = 15%
.back
transition all $transition
background linear-gradient(to left, $default, transparentify($default, $transparent))
background $mainGradient
.primary
$color = $primary
background linear-gradient(to left, $color, transparentify($color, $transparent))
.secondary
$color = $secondary
background linear-gradient(to left, $color, transparentify($color, $transparent))
&.fullscreen
min-height 100vh
.info
$color = $info
background linear-gradient(to left, $color, transparentify($color, $transparent))
background linear-gradient(to right, $infoLight, lighten($infoLight, $percent))
@media (prefers-color-scheme dark)
background linear-gradient(to right, $infoDark, darken($infoDark, $percent))
.success
$color = $success
background linear-gradient(to left, $color, transparentify($color, $transparent))
background linear-gradient(to right, $successLight, lighten($successLight, $percent))
@media (prefers-color-scheme dark)
background linear-gradient(to right, $successDark, darken($successDark, $percent))
.danger
$color = $danger
background linear-gradient(to left, $color, transparentify($color, $transparent))
.error
background linear-gradient(to right, $errorLight, lighten($errorLight, $percent))
@media (prefers-color-scheme dark)
background linear-gradient(to right, $errorDark, darken($errorDark, $percent))
.warning
$color = $warning
background linear-gradient(to left, $color, transparentify($color, $transparent))
@media (prefers-color-scheme dark)
.back
background $darkBackground
background linear-gradient(to right, $warningLight, lighten($warningLight, $percent))
@media (prefers-color-scheme dark)
background linear-gradient(to right, $warningDark, darken($warningDark, $percent))

View File

@ -8,12 +8,18 @@ interface Props {
color?: ColorType
className?: string
children: React.ReactNode
fullscreen?: boolean
}
/**
* Make the background a linear-gradient
*
* @version 1.0.1
*/
export default class GradientBackground extends React.Component<Props> {
public render = () => (
<div className={buildClassName([css.back], [css[this.props.color as string], this.props.color], [this.props.className])}>
<div className={buildClassName(css.back, [css[this.props.color as string], this.props.color], this.props.className, [css.fullscreen, this.props.fullscreen])}>
{this.props.children}
</div>
)

View File

@ -6,7 +6,7 @@
max-width 100%
display inline-block
+ .parent
&:not(.block) + .parent:not(.block)
margin-left 16px
label
@ -217,7 +217,7 @@
@media (prefers-color-scheme dark)
background #202020
&:hover
&:hover:not(:disabled)
background rgba(gray, .2)
@media (prefers-color-scheme dark)

View File

@ -6,24 +6,30 @@ import css from './Link.module.styl'
import { buildClassName } from '../Util'
interface Props {
linkProps?: React.DetailedHTMLProps<React.AnchorHTMLAttributes<HTMLAnchorElement>, HTMLAnchorElement>
href: string
children?: React.ReactNode
className?: string
/**
* Override external detection system
* Remove styling
*/
noStyle?: boolean
/**
* Override external detection system
*/
external?: boolean
}
export default class Link extends React.Component<Props> {
public render() {
const external = this.props.external ?? !this.props.href.startsWith('/')
const external = this.props.external ?? this.props.href.startsWith('http')
if (external) {
// external link
return (
<a
{...this.props.linkProps}
className={buildClassName(this.props.className, [css.link, !this.props.noStyle])}
href={this.props.href}
rel="noreferrer nofollow"
@ -36,6 +42,7 @@ export default class Link extends React.Component<Props> {
return (
<NextLink href={this.props.href}>
<a
{...this.props.linkProps}
className={buildClassName(this.props.className, [css.link, !this.props.noStyle])}
>{this.props.children}</a>
</NextLink>

View File

@ -4,9 +4,22 @@ import { buildClassName } from '../Util'
import css from './Loader.module.styl'
interface Props {
/**
* The new Percentage (if you calculate it yourself)
*/
percent?: number
/**
* Auto random loader
*/
auto?: {
/**
* the minimum and maximum interval between two increment
*/
interval: [number, number]
/**
* the minimum and maximum incrementation (MUST be an integer)
*/
increment: [number, number]
}
}
@ -15,6 +28,11 @@ interface State {
percent?: number
}
/**
* Display a simple loading animation at the top of the page
*
* @version 1.0.0
*/
export default class Loader extends React.Component<Props, State> {
public state: State = {}

View File

@ -39,6 +39,7 @@
&.active
background $mainGradient
color $textOnMain
.userSpace
@ -119,6 +120,7 @@
&.active
background $mainGradient
color $textOnMain
.userSpace
cursor pointer
@ -167,12 +169,13 @@
.header
min-height 70px
> div
padding 0
&:first-child
padding-left 16px
p > div
margin 0
> div p > div
> div:first-child
padding 16px
> div:last-child
padding 0
hr
margin 0
@ -198,7 +201,7 @@
background-image $mainGradient
&:hover
&.active
color white
color $textOnMain
&::before
opacity 1
svg
@ -213,9 +216,7 @@
margin 0
padding 0
.userMenu
padding-bottom 16px
a
.userMenu a
padding 16px 0

View File

@ -1,4 +1,4 @@
import { Meta } from '@storybook/react/types-6-0'
import { Meta, Story } from '@storybook/react/types-6-0'
import React from 'react'
import Component from '.'
@ -7,4 +7,24 @@ export default {
component: Component
} as Meta
export const Basic = (args: any) => <Component {...args} />
export const Basic: Story<any> = (args: any) => <Component {...args} />
Basic.args = {
items: [{
path: '/dashboard',
name: 'Dasboard'
}],
loginUrl: '/login',
registerUrl: '/register',
type: 'navbar',
user: {
name: 'Username',
description: 'User Description',
menu: {
links: [{
path: '/logout',
name: 'Logout'
}]
}
},
logo: {src: '/90-38.svg', width: 90, height: 38}
}

View File

@ -12,27 +12,64 @@ import { buildClassName } from '../Util'
import css from './Navbar.module.styl'
interface Props {
/**
* Type of Navbar
* _note: when in mobile it is not listened_
*/
type: 'navbar' | 'sidebar'
logo: ImageProps & {height: number, width: number}
/**
* Logo to display
*/
logo?: ImageProps & {height: number, width: number}
/**
* Login URL
*/
loginUrl?: string
/**
* Login URL
*/
registerUrl?: string
/**
* User Informations if loggedin
*/
user?: {
/**
* Username
*/
name: string
/**
* User Short description
*/
description?: string
settings?: string
/**
* User Menu
*/
menu?: {
/**
* Menu links
*/
links: Array<{
path: string
name: string
}>
/**
* Custom informations shown next to the links
*/
informations?: JSX.Element
}
}
/**
* Links to display
*/
items: Array<{
path: string
icon: FC
icon?: FC
name: string
}>
/**
* Internal Use don't use it !
*/
mobileMenu?: () => void
}
@ -43,6 +80,10 @@ interface State {
menuActive: boolean
}
/**
* Navbar/Sidebar Component
* @version 1.0.2
*/
export default class Navbar extends React.Component<Props, State> {
public state: State = {
@ -122,8 +163,14 @@ export default class Navbar extends React.Component<Props, State> {
public render = () => (
<>
<nav className={buildClassName(css[this.getType()], [css.short, this.state.short && !this.props.mobileMenu], [css.mobile, this.props.mobileMenu])}>
<Row nowrap nomargin={this.getType() === 'sidebar'} className={css.header} align="center">
<Col className={css.imgContainer}><Link href="/"><Image {...this.props.logo} height={34} width={this.props.logo.width*34/this.props.logo.height} /></Link></Col>
<Row nowrap className={css.header} align="center">
{this.props.logo && (
<Col className={css.imgContainer}>
<Link href="/">
<Image {...this.props.logo} height={34} width={this.props.logo.width*34/this.props.logo.height} />
</Link>
</Col>
)}
{this.getType() === 'sidebar' && (
<Col nogrow><Text><div onClick={this.onSidebarButton}>
{this.state.short ? (
@ -141,7 +188,7 @@ export default class Navbar extends React.Component<Props, State> {
{!this.state.isMobile && this.props.items.map((item) => (
<li key={item.path}><Link noStyle href={item.path}><a>
<Text className={buildClassName([css.active, this.state.path?.startsWith(item.path)])}>
{this.getType() === 'sidebar' && (
{this.getType() === 'sidebar' && item.icon && (
<item.icon />
)}
<span>{item.name}</span>
@ -156,8 +203,6 @@ export default class Navbar extends React.Component<Props, State> {
<div onClick={() => this.setState({menuActive: !this.state.menuActive})} className={css.userSpace}>
<Text>
<Menu size={38} className={css.mainGradient} />
{/* {this.props.user.name} */}
{/* <ChevronDown className={buildClassName([css.menuActive, this.state.menuActive])} /> */}
</Text>
</div>
</div>
@ -179,7 +224,7 @@ export default class Navbar extends React.Component<Props, State> {
</div>
</div>
<div className={buildClassName(css.userMenu, [css.menuActive, !this.state.isMobile && this.state.menuActive])}>
<Row nomargin>
<Row nomargin={this.getType() === 'navbar'}>
{this.props.user.menu?.informations && (
<Col>{this.props.user.menu?.informations}</Col>
)}

View File

@ -3,14 +3,12 @@
.row
display flex
flex-wrap wrap
&:not(.nomargin)
margin (0 - $gapSize) 0 0
padding 0 $gapSize * 2 0 $gapSize
.row:not(.nomargin)
padding 0
margin (0 - $gapSize) 0 0 (0 - $gapSize)
padding $gapSize
&.nomargin
.row
padding 0
.nowrap
flex-wrap nowrap

View File

@ -1,32 +0,0 @@
@import "../config.styl"
.sidebar
position fixed
width 200px
top 0
left 0
height 100%
background white
padding 16px
.content
padding-left 200px
.item
display flex
padding 8px 16px
margin-top 8px
transition $transition
border-radius 8px
svg
margin-right 8px
div
text-align center
flex-grow 1
margin-left -32px
&:hover
background $default
color white

View File

@ -1,45 +0,0 @@
import React, { FC } from 'react'
import { ChevronLeft, TrendingUp } from 'react-feather'
import Link from 'next/link'
import Image from '../Image'
import { IconProps } from '../interfaces'
import css from './SidebarContainer.module.styl'
interface Props {
domain: string
children: React.ReactNode
}
export default class SidebarContainer extends React.Component<Props> {
private menu: Array<{name: string, icon: FC<IconProps>, href: string, as?: string}> = [
{ name: 'back', icon: ChevronLeft, href: '/dashboard' },
{ name: 'Uptime', icon: TrendingUp, as: `/dashboard/${this.props.domain}/uptime`, href: '/dashboard/[domain]/uptime' }
]
public render = () => (
<>
<nav className={css.sidebar}>
<Link href="/dashboard">
<a>
<Image src="/assets/logo.svg" width={175} height={100} />
</a>
</Link>
{this.menu.map((item, index) => (
<Link key={index} href={item.href} as={item.as}>
<a className={css.item}>
<item.icon />
<div>{item.name}</div>
</a>
</Link>
))}
</nav>
<div className={css.content}>
{this.props.children}
</div>
</>
)
}

View File

@ -12,7 +12,6 @@ interface Props {
export default class Text extends React.Component<Props> {
public render() {
const classes = buildClassName(
css.text,
@ -23,16 +22,10 @@ export default class Text extends React.Component<Props> {
this.props.className
)
switch (this.props.type || 'p') {
case 'h1': return (<h1 className={classes}>{this.props.children}</h1>)
case 'h2': return (<h2 className={classes}>{this.props.children}</h2>)
case 'h3': return (<h3 className={classes}>{this.props.children}</h3>)
case 'h4': return (<h4 className={classes}>{this.props.children}</h4>)
case 'h5': return (<h5 className={classes}>{this.props.children}</h5>)
case 'h6': return (<h6 className={classes}>{this.props.children}</h6>)
case 'em': return (<p className={classes}><em>{this.props.children}</em></p>)
case 'span': return (<span className={classes}>{this.props.children}</span>)
default: return (<p className={classes}>{this.props.children}</p>)
if (this.props.type === 'em') {
return (<p className={classes}><em>{this.props.children}</em></p>)
}
return React.createElement(this.props.type || 'p', {className: classes, children: this.props.children})
}
}

View File

@ -1,6 +1,6 @@
import { SVGAttributes } from 'react'
export type ColorType = 'primary' | 'info' | 'success' | 'error' | 'warning'
export type ColorType = 'info' | 'success' | 'error' | 'warning'
export interface IconProps extends SVGAttributes<SVGElement> {
color?: string

View File

@ -1,3 +1,11 @@
/**
* Copyright (c) 2021
*
* @summary DZEIO Component Library
*/
import './dzeio/general.styl'
import Box from './dzeio/Box'
import Button from './dzeio/Button'
import Checkbox from './dzeio/Checkbox'
@ -16,7 +24,6 @@ import Navbar from './dzeio/Navbar'
import Overflow from './dzeio/Overflow'
import Popup from './dzeio/Popup'
import Row from './dzeio/Row'
import SidebarContainer from './dzeio/SidebarContainer'
import Table from './dzeio/Table'
import Text from './dzeio/Text'
import * as Util from './dzeio/Util'
@ -40,7 +47,6 @@ export {
Overflow,
Popup,
Row,
SidebarContainer,
Table,
Text,
Util

View File

@ -11,13 +11,13 @@
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
"declarationDir": "src",
"declarationDir": "types",
// "outDir": "./dist", /* Redirect output structure to the directory. */
// "rootDir": "./src", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
"importHelpers": false, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */

3374
yarn.lock

File diff suppressed because it is too large Load Diff