v0.7.5

Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>

.gitignore

@@ -1,7 +1,12 @@
 module/
-storybook-static/
+node_modules/
+*.mjs
 *.js
+!src/dzeio/stylusUtils.js
+*.d.ts
+types/
+!rollup.config.js
+!src/stylus.d.ts
+!.storybook/*.js
 style.css
-yarn-error.log
-node_modules
-types
+yarn-error.log

.npmignore

@@ -1,11 +1,8 @@
 .storybook/
-src/
-storybook-static/
+node_modules/
+*.stories.js
+.gitattributes
 .gitignore
 .npmignore
-rollup.config.js
-tsconfig.json
 yarn.lock
-yarn-error.log
-tsconfig.json
 yarn-error.log

.storybook/main.js

@@ -2,7 +2,7 @@ const path = require("path");
 
 module.exports = {
 	"stories": [
-		"../src/dzeio/**/*.stories.@(js|jsx|ts|tsx)",
+		"../src/dzeio/**/*.stories.@(ts|tsx)",
 	],
 	"addons": [
 		"@storybook/addon-essentials"

.storybook/mockNextRouter.js

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

.storybook/next.js

@@ -18,7 +18,7 @@ module.exports = {
 		});
 		newConfig.resolve.extensions.push('.ts', '.tsx');
 
-		// SCSS
+		// Stylus
 		newConfig.module.rules.push({
 		test: /\.styl$/,
 		use: ['style-loader', {

.storybook/preview.js

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

package.json

@@ -1,16 +1,13 @@
 {
 	"name": "@dzeio/components",
-	"version": "0.3.0",
+	"version": "0.7.5",
 	"license": "MIT",
 	"main": "./index.js",
-	"module": "./module/index.js",
 	"types": "./types/index.d.ts",
-	"dependencies": {},
 	"devDependencies": {
 		"@babel/core": "^7.12.16",
 		"@babel/preset-env": "^7.12.16",
 		"@babel/preset-react": "^7.12.13",
-		"@rollup/plugin-typescript": "^8.2.0",
 		"@storybook/addon-essentials": "^6.1.14",
 		"@storybook/cli": "^6.1.14",
 		"@storybook/react": "^6.1.14",
@@ -23,25 +20,31 @@
 		"react": "^17.0.1",
 		"react-dom": "^17.0.1",
 		"react-feather": "^2.0.9",
-		"rollup": "^2.39.0",
-		"rollup-plugin-styles": "^3.14.1",
 		"style-loader": "^2.0.0",
 		"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-storybook": "build-storybook",
-		"build": "tsc && rollup --config",
-		"prepublishOnly": "yarn build"
+		"dev": "rm -rf src/dzeio/**/*.js && start-storybook -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"
 	}
 }

rollup.config.js

@@ -1,4 +1,4 @@
-import typescript from '@rollup/plugin-typescript';
+import typescript from 'rollup-plugin-typescript2';
 import styles from 'rollup-plugin-styles'
 import pkg from './package.json';
 
@@ -12,20 +12,17 @@ export default [
 				url: false,
 				autoModules: true,
 				mode: 'extract',
-
+				modules: {
+					generateScopedName: '[local][hash:5]'
+				}
 			}),
-			typescript(), // so Rollup can convert TypeScript to JavaScript
+			typescript({useTsconfigDeclarationDir: true}), // so Rollup can convert TypeScript to JavaScript
 		],
 		output: [
 			{
-				dir: './',
+				file: pkg.main,
 				format: 'cjs',
 				assetFileNames: 'style.css'
-			},
-			{
-				file: pkg.module,
-				format: 'es',
-				assetFileNames: 'style.css'
 			}
 		]
 	}

src/dzeio/Box/BoxHeader/BoxHeader.module.styl

@@ -3,19 +3,11 @@
 .header
 	padding 16px
 
-.delimiter
-	border-bottom 2px solid grey
-	padding-bottom 2px
-
-.img
-	border-top-left-radius 4px
-	border-top-right-radius 4px
-
 .title
 	font-weight bold
-	font-size rem(20)
+	font-size rem(18)
 	margin 0 0 8px
 
 .subtitle
-	font-size rem(14)
+	font-size rem(16)
 	margin 0

src/dzeio/Box/BoxHeader/index.tsx

@@ -11,21 +11,15 @@ export interface Props {
 	title?: string
 	titleColSize?: number
 	subtitle?: string
-	delimiter?: boolean
 	titleClassName?: string
-	// image?: ImageProps
 }
 
 export default class BoxHeader extends React.Component<Props> {
 
 	public render = () => (
 		<>
-			{/* {this.props.image && (
-				<Image {...this.props.image} />
-			)} */}
 			<div className={buildClassName(
-				[css.header],
-				[css.delimiter, this.props.delimiter]
+				css.header
 			)}>
 				<Row>
 					<Col size={this.props.titleColSize as 1 || 8}>

src/dzeio/Box/BoxWrapper/BoxWrapper.module.styl

@@ -1,21 +1,12 @@
 @import "../../config"
 
 .box
-	background white
+	background $foregroundLight
+	@media (prefers-color-scheme dark)
+		background $foregroundDark
 	border-radius 8px
-	box-shadow 0px 2px 4px 0px rgba(black, .33)
-	transition all $transition
 
 .outline
-	border 2px solid #E0E0E0
-	box-shadow none
-	transition border-color $transition
-
-	&:hover
-		border-color darken(@border[2], 20%)
-
-@media (prefers-color-scheme dark)
-	.box
-		background #202020
-	.outline
-		border-color #1F1F1F
+	border 2px solid $grayDark
+	@media (prefers-color-scheme dark)
+		border-color $grayLight

src/dzeio/Box/index.tsx

@@ -32,7 +32,6 @@ export default class Box extends React.Component<Props> {
 					title={this.props.title}
 					titleColSize={this.props.titleColSize}
 					subtitle={this.props.subtitle}
-					delimiter={this.props.delimiter}
 					titleClassName={this.props.titleClassName}
 				>
 					{this.props.headerButtons}

src/dzeio/Code/Code.module.styl

@@ -3,3 +3,11 @@
 	background #E8EAF6
 	padding 4px 8px
 	border-radius 8px
+
+.pre
+	border-radius 8px
+	padding 4px 8px
+	background #E8EAF6
+	display block
+	.code
+		padding 0

src/dzeio/Code/index.tsx

@@ -19,7 +19,7 @@ export default class Code extends React.Component<Props> {
 		}
 
 		return (
-			<pre>
+			<pre className={css.pre}>
 				{code}
 			</pre>
 		)

src/dzeio/Col/DebugCols.tsx

@@ -3,7 +3,7 @@ import Row from '../Row'
 
 import css from './DebugCols.module.styl'
 
-import Col from '.'
+import Col from '../Col'
 
 enum Breakpoint {
 	MOBILE,

src/dzeio/Footer/Footer.module.styl

@@ -2,22 +2,27 @@
 
 .footer
 	padding 24px 16px
+	background $foregroundLight
+	@media (prefers-color-scheme dark)
+		background $foregroundDark
+
+	ul
+		list-type none
+		li
+			display inline-block
 
 .animation
 	animation grow 1s linear infinite
 	display inline-block
+	vertical-align middle
+	margin 0 2px
 
 @keyframes grow
 	0%
-		transform scale(1)
-
 	40%
-		transform scale(1)
-	50%
-		transform scale(1.2)
 	60%
-		transform scale(1)
-	70%
-		transform scale(1.2)
 	95%
 		transform scale(1)
+	50%
+	70%
+		transform scale(1.2)

src/dzeio/Footer/Footer.stories.tsx

@@ -0,0 +1,15 @@
+import { Meta, Story } from '@storybook/react/types-6-0'
+import React from 'react'
+import Component from '.'
+
+export default {
+	title: 'DZEIO/Footer',
+	component: Component,
+} as Meta
+
+export const Basic: Story<any> = (args: any) => <Component {...args} />
+
+let tmp = Basic.bind({})
+tmp.args = {links: [{name: 'test1', path: '/'}, {name: 'test2', path: '/'}, {name: 'test3', path: '/'}]}
+
+export const Normal = tmp

src/dzeio/Footer/index.tsx

@@ -1,13 +1,32 @@
 import React from 'react'
+import { Heart } from 'react-feather'
+import Link from '../Link'
 
 import Text from '../Text'
 import css from './Footer.module.styl'
 
-export default class Footer extends React.Component {
+interface Props {
+	text?: string
+	company?: string
+	links?: Array<{
+		path: string
+		name: string
+	}>
+}
+
+export default class Footer extends React.Component<Props> {
 	public render = () => (
 		<footer className={css.footer}>
-			<Text align="center">Made with <span className={css.animation}>💗</span> by Dzeio</Text>
-			<Text align="center">Copyright © 2020 Dzeio. All rights reserved.</Text>
+			{this.props.text ? (
+				<Text align="center">{this.props.text}</Text>
+			) : (
+				<Text align="center">Made with <span className={css.animation}><Heart color={'#E6808A'} fill={'#E6808A'} size={16} fillOpacity={0.5} /></span> by {this.props.company || 'Dzeio'}</Text>
+			)}
+			{this.props.links && (
+				<ul>{this.props.links.map((l, index) => (
+					<li key={l.path}><Text>{index !== 0 && (<>&nbsp;- </>)}<Link href={l.path}>{l.name}</Link></Text></li>
+				))}</ul>
+			)}
 		</footer>
 	)
-}
+}

src/dzeio/GradientBackground/GradientBackground.module.styl

@@ -1,34 +1,29 @@
 @import "../config"
 
-$transparent = 75%
+$transparent = 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 left, $color, lighten($color, $transparent))
 
 .success
 	$color = $success
-	background linear-gradient(to left, $color, transparentify($color, $transparent))
+	background linear-gradient(to left, $color, lighten($color, $transparent))
 
 .danger
 	$color = $danger
-	background linear-gradient(to left, $color, transparentify($color, $transparent))
+	background linear-gradient(to left, $color, lighten($color, $transparent))
 
 .warning
 	$color = $warning
-	background linear-gradient(to left, $color, transparentify($color, $transparent))
+	background linear-gradient(to left, $color, lighten($color, $transparent))
 
 @media (prefers-color-scheme dark)
 	.back

src/dzeio/GradientBackground/index.tsx

@@ -8,12 +8,18 @@ interface Props {
 	color?: ColorType
 	className?: string
 	children: React.ReactNode
+	fullscreen?: boolean
 }
 
+/**
+ * Make the background a linear-gradient
+ * 
+ * @version 1.0.0
+ */
 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)}>
 			{this.props.children}
 		</div>
 	)

src/dzeio/Link/Link.module.styl

@@ -1,3 +1,12 @@
+@import '../config'
+
+.link
+	color $infoDark
+	@media (prefers-color-scheme dark)
+		color $infoLight
+	&:hover
+		text-decoration underline
+
 .icon
 	vertical-align sub
 	margin 2px

src/dzeio/Link/index.tsx

@@ -3,22 +3,34 @@ import NextLink from 'next/link'
 import { ExternalLink } from 'react-feather'
 
 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
-	forceNewTab?: boolean
+	/**
+	 * Remove styling
+	 */
+	noStyle?: boolean
+
+	/**
+	 * Override external detection system
+	 */
+	external?: boolean
 }
 
 export default class Link extends React.Component<Props> {
 
 	public render() {
-		if (!this.props.href.startsWith('/')) {
+		const external = this.props.external ?? this.props.href.startsWith('http')
+		if (external) {
 			// external link
 			return (
 				<a
-					className={this.props.className}
+					{...this.props.linkProps}
+					className={buildClassName(this.props.className, [css.link, !this.props.noStyle])}
 					href={this.props.href}
 					rel="noreferrer nofollow"
 					target="_blank"
@@ -30,9 +42,8 @@ export default class Link extends React.Component<Props> {
 		return (
 			<NextLink href={this.props.href}>
 				<a
-					className={this.props.className}
-					target={this.props.forceNewTab ? '_blank' : undefined}
-					rel={this.props.forceNewTab ? 'noreferrer nofollow' : undefined}
+					{...this.props.linkProps}
+					className={buildClassName(this.props.className, [css.link, !this.props.noStyle])}
 				>{this.props.children}</a>
 			</NextLink>
 		)

src/dzeio/Navbar/Navbar.module.styl

@@ -1,49 +1,233 @@
-@import "../config"
+@import '../config'
+
+// $transition = 10s linear
+// $transitionTime = 10s
+// $transitionFunction = linear
+.body-sidebar
+		margin-left 300px
+		transition margin-left $transition
+		&.short
+			margin-left 56px
+
+.body-navbar
+		margin-top 70px
 
 .navbar
-	width 100%
-	height 70px
-	padding 16px
-	position absolute
-	top 0
+	background $foregroundLight
+	@media (prefers-color-scheme dark)
+		background $foregroundDark
+	position fixed
 	left 0
-	border-bottom 1px solid white
-
-	&.small
-		padding-left 216px
-
-.alignRight
-	text-align right
-
-.favicon img
-	height 38px
-	border-radius 8px
-	border 2px solid white
-	padding 2px
-	background white
-	width 38px
-
-.userIcon img
-	padding 0
-	cursor pointer
-
-.text
-	display inline-block
-	margin 0
-	height 38px
-	line-height 1
-	font-weight bold
-	font-size rem(20)
-	padding 7px 0 11px 16px
-	text-decoration none
-	color white
-	cursor pointer
-
-.spacer
+	top 0
 	height 70px
+	width 100%
+	z-index 100
+	display flex
+	padding 16px
 
-.icon
-	padding 7px 16px
-	color white
-	box-sizing content-box
-	cursor pointer
+	> ul, .userSpaceParent ul
+		display flex
+
+		li:first-child p
+			margin-left 0
+
+	> ul p, .userSpaceParent > ul p
+		padding 8px
+
+		margin-left 16px
+		border-radius 4px
+
+		&.active
+			background $mainGradient
+			color $textOnMain
+
+	.userSpace
+
+		height 100%
+		display flex
+		align-items center
+		cursor pointer
+		user-select none
+		svg
+			margin-left 16px
+			vertical-align top
+
+	.userMenu
+		position fixed
+		top 70px
+		right 0
+		padding 16px
+		border-bottom-left-radius 4px
+		transform translateX(100%)
+		background inherit
+		transition transform $transition
+		&.menuActive
+			transform translateX(0%)
+
+
+.sidebar
+	background $foregroundLight
+	@media (prefers-color-scheme dark)
+		background $foregroundDark
+	position fixed
+	left 0
+	top 0
+	height 100vh
+	width 300px
+	z-index 100
+	display flex
+	flex-direction column
+
+	&.mobile
+		width 100%
+		z-index 101
+
+	&
+		transition width $transition
+	.header
+	.userSpace
+	.header .imgContainer
+	> ul span
+		// transition all $transition
+		transition-property width, padding, margin, max-width
+		transition-duration $transitionTime
+		transition-timing-function $transitionFunction
+		overflow hidden
+	> ul span
+		width calc(100% - 40px)
+		max-width 100%
+	.header p
+		cursor pointer
+
+	.userSpaceParent
+		background $backgroundLight
+		@media (prefers-color-scheme dark)
+			background $backgroundDark
+
+		> ul, .userSpaceParent ul
+				display flex
+				padding 16px
+				justify-content center
+
+				li:first-child p
+					margin-left 0
+
+			> ul p, .userSpaceParent > ul p
+				padding 8px
+
+				margin-left 16px
+				border-radius 4px
+
+				&.active
+					background $mainGradient
+					color $textOnMain
+
+	.userSpace
+		cursor pointer
+		user-select none
+		padding 16px
+		width 100%
+		max-width 100%
+		min-height 86px
+		p
+			overflow hidden
+			white-space nowrap
+		p:last-child:not(:first-child)
+			margin-top 8px
+			font-style italic
+			font-size rem(14)
+
+		p:first-child
+			font-weight 500
+			svg
+				vertical-align top
+				transition transform $transition
+				&.menuActive
+					transform rotateX(180deg)
+
+	.userMenu
+		max-height 0px
+		transition all $transition
+
+		&.menuActive
+			// TODO find better way to animate this shit
+			max-height 100%
+
+	&.short
+		width 56px
+		.header > div
+			padding 0
+		.header .imgContainer
+		.userSpace
+		> ul span
+			width 0
+			padding-left 0
+			padding-right 0
+			margin 0
+			max-width 0
+
+
+	.header
+		min-height 70px
+		padding 0
+		margin 0
+		> div p > div
+		> div:first-child
+			padding 16px
+		> div:last-child
+			padding 0
+
+	hr
+		margin 0
+
+	> ul li
+			width 100%
+			p
+				padding 16px 0
+				display flex
+				align-items center
+				z-index 111
+				position relative
+
+				// Temporary fix the transition for linear-gradient
+				&::before
+					transition opacity $transition
+					opacity 0
+					width 100%
+					height 100%
+					content " "
+					position absolute
+					z-index -1
+					background-image $mainGradient
+				&:hover
+				&.active
+					color $textOnMain
+					&::before
+						opacity 1
+				svg
+					margin-left 16px
+				span
+					padding-left 16px
+					height inherit
+
+.navbar, .sidebar
+	ul
+		list-style none
+		margin 0
+		padding 0
+
+.userMenu
+		// padding-bottom 16px
+		a
+			padding 16px 0
+
+
+.mobileMenu
+	opacity 0
+	transition opacity $transition
+	&.shown
+		opacity 1
+
+.mainGradient
+	//WIP
+	fill $mainGradient

src/dzeio/Navbar/Navbar.stories.tsx

@@ -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: '/assets/logo.svg', width: 90, height: 38}
+}

src/dzeio/Navbar/NavbarSpace.tsx

@@ -1,11 +0,0 @@
-import React from 'react'
-
-import css from './Navbar.module.styl'
-
-export default class NavbarSpace extends React.Component {
-
-	public render = () => (
-		<div className={css.spacer}></div>
-	)
-
-}

src/dzeio/Navbar/index.tsx

@@ -1,48 +1,273 @@
-import React from 'react'
-import Link from 'next/link'
-import Row from '../Row'
+import Router from 'next/router'
+
+import Image, { ImageProps } from 'next/image'
+import React, { FC } from 'react'
+import { ChevronDown, ChevronsRight, Menu, X } from 'react-feather'
+import Text from '../Text'
 import Col from '../Col'
-import Image from '../Image'
+import Row from '../Row'
+import Link from '../Link'
+import { buildClassName } from '../Util'
+
 import css from './Navbar.module.styl'
 
-
 interface Props {
-	logo?: {
-		link?: string
-		label?: string
-		src: string
-		alt?: string
+	/**
+	 * Type of Navbar
+	 * _note: when in mobile it is not listened_
+	 */
+	type: 'navbar' | 'sidebar'
+
+	/**
+	 * 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
+		/**
+		 * 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
+		name: string
+	}>
+	/**
+	 * Internal Usem don't use it !
+	 */
+	mobileMenu?: () => void
 }
 
-export default class Navbar extends React.Component<Props> {
+interface State {
+	path?: string
+	short: boolean
+	isMobile: boolean
+	menuActive: boolean
+}
+
+/**
+ * Navbar/Sidebar Component
+ * @version 1.0.1
+ */
+export default class Navbar extends React.Component<Props, State> {
+
+	public state: State = {
+		short: false,
+		isMobile: false,
+		menuActive: false
+	}
+
+	public componentDidMount() {
+		this.setState({
+			path: Router.asPath,
+			menuActive: !!this.props.mobileMenu
+		})
+		Router.events.on('routeChangeComplete', () => {
+			this.setState({path: Router.asPath, menuActive: false})
+		})
+		Router.events.on('routeChangeError', () => {
+			this.setState({path: Router.asPath, menuActive: false})
+		})
+		if (!this.props.mobileMenu) {
+			window.addEventListener('resize', this.onResize)
+			this.onResize()
+		}
+	}
+
+	public onResize = () => {
+		const isMobile = window.innerWidth <= 768
+		if (this.state.isMobile !== isMobile) {
+			this.setState({isMobile})
+		}
+	}
+
+	public componentDidUpdate() {
+		if (!this.props.mobileMenu) {
+			if (this.state.short) {
+				document.body.classList.add(css.short)
+			} else {
+				document.body.classList.remove(css.short)
+			}
+			if (this.getType() === 'sidebar') {
+				document.body.classList.add(css['body-sidebar'])
+				document.body.classList.remove(css['body-navbar'])
+			} else {
+				document.body.classList.remove(css['body-sidebar'])
+				document.body.classList.add(css['body-navbar'])
+			}
+		}
+
+	}
+
+	public componentWillUnmount() {
+		if (!this.props.mobileMenu) {
+			document.body.classList.remove(css.short, css[`body-${this.getType()}`])
+			window.removeEventListener('resize', this.onResize)
+		}
+	}
+
+	public onSidebarButton = () => {
+		if (!this.props.mobileMenu) {
+			this.setState({short: !this.state.short, menuActive: false})
+		} else {
+			this.props.mobileMenu()
+		}
+	}
+
+	public menuCloseCallback = () => {
+		this.setState({menuActive: false})
+	}
+
+	public getType(): 'sidebar' | 'navbar' {
+		if (this.props.mobileMenu) {
+			return 'sidebar'
+		}
+		return this.state.isMobile ? 'navbar' : this.props.type
+	}
 
 	public render = () => (
-		<nav className={css.navbar}>
-			<Row nomargin>
-				{this.props.logo && (
-					<Col>
-						<Row align="center">
-							<Link href={this.props.logo.link || '/'}>
-								<a aria-label={this.props.logo.label || 'Homepage'}>
-									<Image
-										alt={this.props.logo.alt}
-										src={this.props.logo.src}
-										height={38}
-										width={120}
-									/>
-								</a>
+		<>
+			<nav className={buildClassName(css[this.getType()], [css.short, this.state.short && !this.props.mobileMenu], [css.mobile, this.props.mobileMenu])}>
+				<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>
-						</Row>
-					</Col>
+						</Col>
+					)}
+					{this.getType() === 'sidebar' && (
+						<Col nogrow><Text><div onClick={this.onSidebarButton}>
+							{this.state.short ? (
+								<ChevronsRight size={30} />
+							) : (
+								<X size={30} />
+							)}
+						</div></Text></Col>
+					)}
+				</Row>
+				{this.getType() === 'sidebar' && (
+					<hr/>
 				)}
+				<ul>
+					{!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' && item.icon && (
+									<item.icon />
+								)}
+								<span>{item.name}</span>
+							</Text>
+						</a></Link></li>
+					))}
+				</ul>
+				<div style={{flex: 1}}></div>
+				{/* Spacer */}
+				{this.state.isMobile && (
+					<div className={css.userSpaceParent}>
+						<div onClick={() => this.setState({menuActive: !this.state.menuActive})} className={css.userSpace}>
+							<Text>
+								<Menu size={38} className={css.mainGradient} />
+							</Text>
+						</div>
+					</div>
+				)}
+				{!this.state.isMobile && this.props.user ? (
+					<>
+						<div className={css.userSpaceParent}>
+							{this.getType() === 'sidebar' && (
+								<hr/>
+							)}
+							<div onClick={() => this.setState({menuActive: !this.state.menuActive})} className={css.userSpace}>
+								<Text>
+									{this.props.user.name}
+									<ChevronDown className={buildClassName([css.menuActive, this.state.menuActive])} />
+								</Text>
+								{this.getType() === 'sidebar' && this.props.user.description && (
+									<Text>{this.props.user.description}</Text>
+								)}
+							</div>
+						</div>
+						<div className={buildClassName(css.userMenu, [css.menuActive, !this.state.isMobile && this.state.menuActive])}>
+							<Row>
+								{this.props.user.menu?.informations && (
+									<Col>{this.props.user.menu?.informations}</Col>
+								)}
+								<Col>
+									<ul>
+										{this.props.user.menu?.links.map((l) => (
+											<li key={l.path}><Text><Link noStyle href={l.path}>{l.name}</Link></Text></li>
+										))}
+									</ul>
+								</Col>
+							</Row>
+						</div>
+					</>
+				) : !this.state.isMobile ? (
+					<div className={css.userSpaceParent}>
+						{this.getType() === 'sidebar' && (
+							<hr/>
+						)}
+						<ul>
+							{this.props.registerUrl && (
+								<li><Link noStyle href={this.props.registerUrl}><a>
+									<Text className={buildClassName(css.active)}>
+										<span>Register</span>
+									</Text>
+								</a></Link></li>
+							)}
+							{this.props.loginUrl && (
+								<li><Link noStyle href={this.props.loginUrl}><a>
+									<Text>
+										<span>Login</span>
+									</Text>
+								</a></Link></li>
+							)}
+						</ul>
+					</div>
+				) : undefined}
+			</nav>
 
-				<Col>
-					<Row justify="flex-end" align="center">
-						{this.props.children}
-					</Row>
-				</Col>
-			</Row>
-		</nav>
+			{!this.props.mobileMenu && this.state.isMobile && (
+				<div className={buildClassName(css.mobileMenu, [css.shown, this.state.menuActive])}>
+					<Navbar {...this.props} type="sidebar" mobileMenu={this.menuCloseCallback} />
+				</div>
+			)}
+		</>
 	)
 }

src/dzeio/Popup/Popup.module.styl

@@ -6,22 +6,38 @@
 	width 100%
 	top 0
 	left 0
-	background rgba(black, .3)
+	background rgba($backgroundLight, .7)
+	@media (prefers-color-scheme dark)
+		background rgba($backgroundDark, .7)
 	cursor pointer
-	z-index 1000
+	z-index 200
+	animation fadeIn .3s ease-in-out 1 forwards
+
+@keyframes fadeIn
+	from
+		opacity 0
+	to
+		opacity 1
+
 
 .popupChild
 	cursor initial
-	z-index 1001
+	z-index 201
 
 	min-width 50%
+	animation popin .3s ease-in-out 1
 
 	@media (max-width $tablet)
 		min-width 70%
 
 	@media (max-width $mobile)
 		min-width 90%
-	// min-height 50vh
+
+@keyframes popin
+	from
+		margin-top 50px
+	to
+		margin-top 0
 
 .exit
 	cursor pointer

src/dzeio/SidebarContainer/SidebarContainer.module.styl

@@ -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

src/dzeio/SidebarContainer/index.tsx

@@ -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>
-		</>
-	)
-
-}

src/dzeio/Tag/Tag.module.styl

@@ -1,139 +0,0 @@
-@import '../config'
-
-.tag
-	padding 8px 12px
-	border-radius 8px
-	margin-left 8px
-	height 32px
-	line-height 1
-	display inline-block
-	color white
-
-	background $default
-	outline none
-	&:hover
-		background darken($default, 10%)
-	&:focus
-		background darken($default, 20%)
-
-	&.outline
-		border 2px solid $default
-		padding 6px 10px
-		background transparent
-		&:hover
-			background rgba($default, .5)
-		&:focus
-			background rgba($default, .7)
-
-.primary
-	$color = $primary
-	color white
-	background $color
-	&:hover
-		background lighten($color, 30%)
-	&:focus
-		background lighten($color, 15%)
-
-	&.outline
-		color black
-		border 2px solid $color
-		background transparent
-		&:hover
-			color white
-			background rgba($color, .5)
-		&:focus
-			color white
-			background rgba($color, .7)
-.secondary
-	$color = $secondary
-	background $color
-	&:hover
-		background lighten($color, 30%)
-	&:focus
-		background lighten($color, 15%)
-	&.outline
-		color white
-		border 2px solid $color
-		background transparent
-		&:hover
-			color black
-			background rgba($color, .5)
-		&:focus
-			color black
-			background rgba($color, .7)
-
-.info
-	$color = $info
-	color white
-	background $color
-	&:hover
-		background lighten($color, 30%)
-	&:focus
-		background lighten($color, 15%)
-	&.outline
-		color black
-		border 2px solid $color
-		background transparent
-		&:hover
-			color white
-			background rgba($color, .5)
-		&:focus
-			color white
-			background rgba($color, .7)
-
-.success
-	$color = $success
-	color white
-	background $color
-	&:hover
-		background lighten($color, 30%)
-	&:focus
-		background lighten($color, 15%)
-	&.outline
-		color black
-		border 2px solid $color
-		background transparent
-		&:hover
-			color white
-			background rgba($color, .5)
-		&:focus
-			color white
-			background rgba($color, .7)
-
-.danger
-	$color = $danger
-	color white
-	background $color
-	&:hover
-		background lighten($color, 30%)
-	&:focus
-		background lighten($color, 15%)
-	&.outline
-		color black
-		border 2px solid $color
-		background transparent
-		&:hover
-			color white
-			background rgba($color, .5)
-		&:focus
-			color white
-			background rgba($color, .7)
-
-.warning
-	$color = $warning
-	color white
-	background $color
-	&:hover
-		background lighten($color, 30%)
-	&:focus
-		background lighten($color, 15%)
-	&.outline
-		color black
-		border 2px solid $color
-		background transparent
-		&:hover
-			color white
-			background rgba($color, .5)
-		&:focus
-			color white
-			background rgba($color, .7)

src/dzeio/Tag/Tag.stories.tsx

@@ -1,17 +0,0 @@
-import { Meta } from '@storybook/react/types-6-0'
-import React from 'react'
-import Component from '.'
-
-export default {
-	title: 'DZEIO/Tag',
-	component: Component
-} as Meta
-
-export const Basic = (args: any) => {
-	const content = args.content
-	delete args.content
-
-	return (
-		<Component {...args}>{content}</Component>
-	)
-}

src/dzeio/Tag/index.tsx

@@ -1,42 +0,0 @@
-import React from 'react'
-
-import { ColorType } from '../interfaces'
-import { buildClassName } from '../Util'
-import Link from '../Link'
-
-import css from './Tag.module.styl'
-import Text from '../Text'
-
-interface Props {
-	text: string
-	color?: ColorType
-	href?: string
-	outline?: boolean
-}
-
-export default class Tag extends React.Component<Props> {
-
-	public render() {
-		const classes = buildClassName(
-			css.tag,
-			[css[this.props.color as string], this.props.color],
-			[css.outline, this.props.outline]
-		)
-		if (!this.props.href) {
-			return (
-				<Text
-					className={classes}
-				>{this.props.text}</Text>
-			)
-		}
-		return (
-			<Link
-				href={this.props.href}
-				className={classes}
-			>
-				{this.props.text}
-			</Link>
-		)
-	}
-
-}

src/dzeio/Text/index.tsx

@@ -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})
 	}
 }

src/dzeio/config.styl

@@ -52,3 +52,9 @@ $success = $successLight
 $danger = $errorLight
 $warning = $warningLight
 $darkBackground = $backgroundDark
+
+
+// See https://github.com/stylus/stylus/issues/1872#issuecomment-86553717
+use('stylusUtils.js')
+
+@import '../../../../../../theme' if file-exists('../../../../../../theme.styl')

src/dzeio/interfaces.ts

@@ -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

src/dzeio/stylusUtils.js

@@ -0,0 +1,11 @@
+
+// See https://github.com/stylus/stylus/issues/1872#issuecomment-86553717
+var stylus = require('stylus');
+
+module.exports = function() {
+	return function(style) {
+		style.define('file-exists', function(path) {
+		return !!stylus.utils.lookup(path.string, this.paths);
+		});
+	};
+};

src/index.ts

@@ -1,4 +1,12 @@
-import Box, { BoxBody, BoxHeader, BoxWrapper } from './dzeio/Box'
+/**
+ * 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'
 import Code from './dzeio/Code'
@@ -7,28 +15,21 @@ import Container from './dzeio/Container'
 import Fieldset from './dzeio/Fieldset'
 import Footer from './dzeio/Footer'
 import GradientBackground from './dzeio/GradientBackground'
-import Input from './dzeio/Input'
 import Image from './dzeio/Image'
+import Input from './dzeio/Input'
 import Link from './dzeio/Link'
+import Loader from './dzeio/Loader'
 import Menu from './dzeio/Menu'
 import Navbar from './dzeio/Navbar'
-import NavbarSpace from './dzeio/Navbar/NavbarSpace'
 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 Tag from './dzeio/Tag'
 import Text from './dzeio/Text'
 import * as Util from './dzeio/Util'
 
-import './dzeio/general.styl'
-
 export {
 	Box,
-	BoxBody,
-	BoxHeader,
-	BoxWrapper,
 	Button,
 	Checkbox,
 	Code,
@@ -40,15 +41,13 @@ export {
 	Image,
 	Input,
 	Link,
+	Loader,
 	Menu,
 	Navbar,
-	NavbarSpace,
 	Overflow,
 	Popup,
 	Row,
-	SidebarContainer,
 	Table,
-	Tag,
 	Text,
 	Util
 }

tsconfig.json

@@ -17,7 +17,7 @@
 		// "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'). */
 
@@ -65,6 +65,6 @@
 	"exclude": [
 		"node_modules",
 		"build",
-		"*.stories.tsx"
+		"src/**/*.stories.tsx"
 	]
 }