1
0
mirror of https://github.com/kremalicious/portfolio.git synced 2025-01-05 19:25:33 +01:00
This commit is contained in:
Matthias Kretschmann 2019-06-10 23:06:55 +02:00
parent 8d6037ac3c
commit 80ff1f7f19
Signed by: m
GPG Key ID: 606EEEF3C479A91F
6 changed files with 37 additions and 41 deletions

View File

@ -1,6 +1,6 @@
import React, { PureComponent } from 'react' import React, { PureComponent } from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { StaticQuery, graphql } from 'gatsby' import { Link, StaticQuery, graphql } from 'gatsby'
import posed from 'react-pose' import posed from 'react-pose'
import classNames from 'classnames' import classNames from 'classnames'
import { moveInBottom } from '../atoms/Transitions' import { moveInBottom } from '../atoms/Transitions'
@ -38,20 +38,15 @@ export default class LogoUnit extends PureComponent {
const { title, tagline } = data.metaYaml const { title, tagline } = data.metaYaml
return ( return (
<div className={wrapClasses}> <this.Animation>
<this.Animation> <Link className={wrapClasses} to={'/'}>
<Logo className={styles.logo} /> <Logo className={styles.logo} />
<h1 data-testid="logo-title" className={this.nameClasses}> <h1 className={this.nameClasses}>{title.toLowerCase()}</h1>
{title.toLowerCase()} <p className={this.descriptionClasses}>
</h1>
<p
data-testid="logo-tagline"
className={this.descriptionClasses}
>
{tagline.toLowerCase()} {tagline.toLowerCase()}
</p> </p>
</this.Animation> </Link>
</div> </this.Animation>
) )
}} }}
/> />

View File

@ -1,7 +1,9 @@
@import 'variables'; @import 'variables';
.logounit { .logounit {
pointer-events: none;
display: block; display: block;
width: 100%;
} }
.logo { .logo {
@ -46,9 +48,16 @@
} }
.minimal { .minimal {
transform: scale(.7); pointer-events: all;
transform-origin: top center; width: auto;
transform-box: border-box;
&,
&:hover,
&:focus {
transform: scale(.7);
transform-origin: top center;
transform-box: border-box;
}
.title, .title,
.description { .description {

View File

@ -11,17 +11,23 @@ beforeEach(() => {
describe('LogoUnit', () => { describe('LogoUnit', () => {
it('renders correctly from data file values', () => { it('renders correctly from data file values', () => {
const { title, tagline } = data.metaYaml const { title, tagline } = data.metaYaml
const { container, getByTestId } = render(<LogoUnit />) const { container } = render(<LogoUnit />)
expect(container.firstChild).toBeInTheDocument() expect(container.firstChild).toBeInTheDocument()
expect(getByTestId('logo-title')).toHaveTextContent(title.toLowerCase()) expect(container.querySelector('.title')).toHaveTextContent(
expect(getByTestId('logo-tagline')).toHaveTextContent(tagline.toLowerCase()) title.toLowerCase()
)
expect(container.querySelector('.description')).toHaveTextContent(
tagline.toLowerCase()
)
}) })
it('renders in minimal variant', () => { it('renders in minimal variant', () => {
const { container } = render(<LogoUnit minimal={true} />) const { container } = render(<LogoUnit minimal={true} />)
expect(container.firstChild).toBeInTheDocument() expect(container.firstChild).toBeInTheDocument()
expect(container.firstChild.className).toMatch(/logounit minimal/) expect(container.querySelector('.logounit').className).toMatch(
/logounit minimal/
)
}) })
}) })

View File

@ -1,6 +1,6 @@
import React, { PureComponent } from 'react' import React, { PureComponent } from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { Link, StaticQuery, graphql } from 'gatsby' import { StaticQuery, graphql } from 'gatsby'
import classNames from 'classnames' import classNames from 'classnames'
import Vcard from '../atoms/Vcard' import Vcard from '../atoms/Vcard'
import LogoUnit from '../molecules/LogoUnit' import LogoUnit from '../molecules/LogoUnit'
@ -27,9 +27,7 @@ const FooterMarkup = ({ pkg, meta, year }) => {
return ( return (
<footer className={classes}> <footer className={classes}>
<Link to={'/'}> <LogoUnit minimal />
<LogoUnit minimal />
</Link>
<Networks minimal /> <Networks minimal />

View File

@ -1,6 +1,6 @@
import React, { PureComponent } from 'react' import React, { PureComponent } from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { Link, StaticQuery, graphql } from 'gatsby' import { StaticQuery, graphql } from 'gatsby'
import classNames from 'classnames' import classNames from 'classnames'
import Networks from '../molecules/Networks' import Networks from '../molecules/Networks'
import Availability from '../molecules/Availability' import Availability from '../molecules/Availability'
@ -25,21 +25,20 @@ export default class Header extends PureComponent {
render() { render() {
const { minimal } = this.props const { minimal } = this.props
const headerClasses = classNames([styles.header], {
[styles.minimal]: minimal
})
return ( return (
<StaticQuery <StaticQuery
query={query} query={query}
render={data => { render={data => {
const meta = data.metaYaml const meta = data.metaYaml
const headerClasses = classNames([styles.header], {
[styles.minimal]: minimal
})
return ( return (
<header className={headerClasses}> <header className={headerClasses}>
<ThemeSwitch /> <ThemeSwitch />
<Link className={styles.link} to={'/'}> <LogoUnit minimal={minimal} />
<LogoUnit minimal={minimal} />
</Link>
<Networks hide={minimal} /> <Networks hide={minimal} />
<Availability hide={minimal && !meta.availability.status} /> <Availability hide={minimal && !meta.availability.status} />
</header> </header>

View File

@ -12,19 +12,8 @@
justify-content: flex-start; justify-content: flex-start;
} }
.link {
pointer-events: none;
display: block;
width: 100%;
}
.minimal { .minimal {
min-height: 0; min-height: 0;
padding-top: $spacer * 2; padding-top: $spacer * 2;
padding-bottom: 0; padding-bottom: 0;
.link {
pointer-events: all;
width: auto;
}
} }