Finished Work On Navbar

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

src/dzeio/Loader/Loader.module.styl

@@ -6,6 +6,7 @@
 	width 100%
 	height 7px
 	pointer-events none
+	z-index 200
 
 	top 0
 	&.hide

src/dzeio/Navbar/Navbar.module.styl

@@ -1,12 +1,69 @@
 @import '../config'
 
-.body
+// $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
+	background $foregroundLight
+	@media (prefers-color-scheme dark)
+		background $foregroundDark
+	position fixed
+	left 0
+	top 0
+	height 70px
+	width 100%
+	z-index 100
+	display flex
+	padding 16px
+
+	> 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
+
+	.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)
@@ -19,6 +76,11 @@
 	z-index 100
 	display flex
 	flex-direction column
+
+	&.mobile
+		width 100%
+		z-index 101
+
 	&
 		transition width $transition
 	.header
@@ -33,21 +95,41 @@
 	> 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
+
 	.userSpace
 		cursor pointer
 		user-select none
 		padding 16px
 		width 100%
 		max-width 100%
-		min-height 56px
+		min-height 86px
 		p
 			overflow hidden
+			white-space nowrap
 		p:last-child:not(:first-child)
 			margin-top 8px
 			font-style italic
@@ -65,11 +147,6 @@
 		max-height 0px
 		transition all $transition
 
-		ul
-			padding-bottom 16px
-			a
-				padding 16px 0
-
 		&.menuActive
 			// TODO find better way to animate this shit
 			max-height 100%
@@ -82,43 +159,72 @@
 		.userSpace
 		> ul span
 			width 0
-			padding 0
+			padding-left 0
+			padding-right 0
 			margin 0
 			max-width 0
 
+
 	.header
 		min-height 70px
 		> div
 			padding 0
 			&:first-child
-				padding 16px
+				padding-left 16px
 		p > div
 			padding 16px
 
 	hr
 		margin 0
 
-	ul
-		list-style none
-		margin 0
-		padding 0
-
 	> ul li
 			width 100%
 			p
 				padding 16px 0
 				display flex
 				align-items center
-				// TODO Currently Gradient aren't supported by Transition
+				z-index 111
-				// transition-property background-image, color
+				position relative
-				// transition-duration $transitionTime
+
-				// transition-timing-function $transitionFunction
+				// 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
-					background-image $mainGradient
 					color white
+					&::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/index.tsx

@@ -2,7 +2,7 @@ import Router from 'next/router'
 
 import Image, { ImageProps } from 'next/image'
 import React, { FC } from 'react'
-import { ChevronDown, ChevronsRight, X } from 'react-feather'
+import { ChevronDown, ChevronsRight, Menu, X } from 'react-feather'
 import Text from '../Text'
 import Col from '../Col'
 import Row from '../Row'
@@ -13,7 +13,9 @@ import css from './Navbar.module.styl'
 
 interface Props {
 	type: 'navbar' | 'sidebar'
-	logo: ImageProps
+	logo: ImageProps & {height: number, width: number}
+	loginUrl?: string
+	registerUrl?: string
 	user?: {
 		name: string
 		description?: string
@@ -31,11 +33,13 @@ interface Props {
 		icon: FC
 		name: string
 	}>
+	mobileMenu?: () => void
 }
 
 interface State {
 	path?: string
 	short: boolean
+	isMobile: boolean
 	menuActive: boolean
 }
 
@@ -43,51 +47,103 @@ 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})
+		this.setState({
-		Router.events.on('routeChangeComplete', () => {
+			path: Router.asPath,
-			this.setState({path: Router.asPath})
+			menuActive: !!this.props.mobileMenu
 		})
-		document.body.classList.add(css.body)
+		Router.events.on('routeChangeComplete', () => {
-		if (this.state.short) {
+			this.setState({path: Router.asPath, menuActive: false})
-			document.body.classList.add(css.short)
+		})
+		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() {
-		document.body.classList.remove(css.body, css.short)
+		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={buildClassName(css.sidebar, [css.short, this.state.short])}>
+		<>
-			<Row nomargin className={css.header} align="center">
+			<nav className={buildClassName(css[this.getType()], [css.short, this.state.short && !this.props.mobileMenu], [css.mobile, this.props.mobileMenu])}>
-				<Col className={css.imgContainer}><Link href="/"><Image {...this.props.logo} /></Link></Col>
+				<Row nowrap nomargin={this.getType() === 'sidebar'} className={css.header} align="center">
-				<Col nogrow><Text><div onClick={() => this.setState({short: !this.state.short, menuActive: false})}>
+					<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 ? (
 								<ChevronsRight size={30} />
 							) : (
 								<X size={30} />
 							)}
 						</div></Text></Col>
+					)}
 				</Row>
+				{this.getType() === 'sidebar' && (
 					<hr/>
+				)}
 				<ul>
-				{this.props.items.map((item) => (
+					{!this.state.isMobile && this.props.items.map((item) => (
-					<li key={item.path}><Link href={item.path}><a>
+						<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 />
+								)}
 								<span>{item.name}</span>
 							</Text>
 						</a></Link></li>
@@ -95,34 +151,78 @@ export default class Navbar extends React.Component<Props, State> {
 				</ul>
 				<div style={{flex: 1}}></div>
 				{/* Spacer */}
-			{this.props.user && (
+				{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} />
+								{/* {this.props.user.name} */}
+								{/* <ChevronDown className={buildClassName([css.menuActive, this.state.menuActive])} /> */}
+							</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.props.user.description && (
+								{this.getType() === 'sidebar' && this.props.user.description && (
 									<Text>{this.props.user.description}</Text>
 								)}
 							</div>
 						</div>
-					<div className={buildClassName(css.userMenu, [css.menuActive, this.state.menuActive])}>
+						<div className={buildClassName(css.userMenu, [css.menuActive, !this.state.isMobile && this.state.menuActive])}>
 							<Row nomargin>
-							<Col></Col>
+								{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 href={l.path}>{l.name}</Link></Text></li>
+											<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>
+
+			{!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>
+			)}
+		</>
 	)
 }