Skip to content

Commit

Permalink
feat: adds tjenesteområder to header (#425)
Browse files Browse the repository at this point in the history 
* remove sommerjobb link

* removes say hi and job from meny, show services

* removes unused

* removes unused
  • Loading branch information
@mikaelbr
mikaelbr committed Nov 10, 2023
1 parent 54cb0c6 commit ff93a1b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 70 deletions.
16 changes: 4 additions & 12 deletions src/components/page-header/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default function PageHeader({
closeRef,
isNotHamburgerMode,
);

useEffect(() => {
onVisibleChange?.(isMenuVisible);
}, [isMenuVisible, onVisibleChange]);
Expand Down Expand Up @@ -109,8 +109,8 @@ export default function PageHeader({
ref={navRef}
>
<li>
<Link href="/jobs">
<a>Bli en variant</a>
<Link href="/tjenesteomrader">
<a>Tjenester</a>

Check warning on line 113 in src/components/page-header/index.tsx

View workflow job for this annotation

GitHub Actions / eslint 

The href attribute is required for an anchor to be keyboard accessible. Provide a valid, navigable address as the href value. If you cannot provide an href, but still need the element to resemble a link, use a button and change it with appropriate styles. Learn more: https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/HEAD/docs/rules/anchor-is-valid.md
</Link>
</li>
<li>
Expand All @@ -119,7 +119,7 @@ export default function PageHeader({
</a>
</li>
<li>
<a href="http://variant.blog" rel="noopener">
<a href="http://blog.variant.no" rel="noopener">
Blogg
</a>
</li>
Expand All @@ -133,14 +133,6 @@ export default function PageHeader({
<a>Lønnskalkulator</a>

Check warning on line 133 in src/components/page-header/index.tsx

View workflow job for this annotation

GitHub Actions / eslint 

The href attribute is required for an anchor to be keyboard accessible. Provide a valid, navigable address as the href value. If you cannot provide an href, but still need the element to resemble a link, use a button and change it with appropriate styles. Learn more: https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/HEAD/docs/rules/anchor-is-valid.md
</Link>
</li>
<li id="dont_show">
<a
href="https://twitter.com/intent/tweet?screen_name=variant_as"
rel="noopener"
>
Si hallo!
</a>
</li>
</ul>
</nav>
</>
Expand Down
4 changes: 0 additions & 4 deletions src/components/page-header/page-header.module.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@
transition: 0.4s;
}

.header__nav__ul li:last-child {
display: none;
}

.header__nav a {
display: block;
color: var(--color-standard__white--text);
Expand Down
34 changes: 1 addition & 33 deletions src/index/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import Layout from 'src/layout';
import List from 'src/rss/feed/List';
import style from './index.module.css';
import PageTitle from '@components/page-title';
import sommerjobbImg from './images/section1Blob.png';
import Arrow from '@components/arrow';
import { Heading3 } from '@components/heading';
import Tjenesteomrader from 'src/tjenesteomrader';
import { EmployeeItem } from 'src/employees/types';
Expand Down Expand Up @@ -68,7 +66,7 @@ const Home = ({ randomEmployee, randomCases, feeds }: HomeProps) => {
}, [randomCases]);

return (
<Layout crazy homepage>
<Layout homepage>
<Head>
<meta
property="og:description"
Expand Down Expand Up @@ -116,10 +114,6 @@ const Home = ({ randomEmployee, randomCases, feeds }: HomeProps) => {
</div>
</section>

<section className={style.bergen}>
<JobLandingpage />
</section>

<section className={style.join}>
<h2 className={style.join_title}>Bli en Variant!</h2>

Expand Down Expand Up @@ -330,30 +324,4 @@ const Home = ({ randomEmployee, randomCases, feeds }: HomeProps) => {
);
};

function JobLandingpage() {
return (
<div className={style.infoBlock}>
<Image
src={sommerjobbImg}
className={style.infoBlock__blob}
alt="Varianter under felles variantdag"
width={774}
height={631}
loading="lazy"
decoding="async"
/>

<h2 className={style.infoBlock__title}>
<Link href="/nyutdannet">
<a className={style.infoBlock__link}>
<span className={style.infoBlock__text}>
Info om jobb for studenter
</span>
<Arrow className={style.infoBlock__arrow} color="standard__white" />
</a>
</Link>
</h2>
</div>
);
}
export default Home;
2 changes: 1 addition & 1 deletion src/layout/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const Layout = ({
<a href="https://handbook.variant.no">Håndbok</a>
</li>
<li>
<a href="http://variant.blog" rel="noopener">
<a href="http://blog.variant.no" rel="noopener">
Blogg
</a>
</li>
Expand Down
24 changes: 4 additions & 20 deletions src/summersplash2022/components/header/header.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ const Header = (props: { white: boolean }) => {
ref={navRef}
>
<li>
<Link href="/jobs">
<a>Bli en variant</a>
<Link href="/tjenesteomrader">
<a>Tjenester</a>
</Link>
</li>
<li>
Expand All @@ -122,14 +122,6 @@ const Header = (props: { white: boolean }) => {
<a>Lønnskalkulator</a>
</Link>
</li>
<li id="dont_show">
<a
href="https://twitter.com/intent/tweet?screen_name=variant_as"
rel="noopener"
>
Si hallo!
</a>
</li>
</ul>
</nav>
</>
Expand Down Expand Up @@ -205,8 +197,8 @@ const Header = (props: { white: boolean }) => {
ref={navRef}
>
<li>
<Link href="/jobs">
<a>Bli en variant</a>
<Link href="/tjenesteomrader">
<a>Tjenester</a>
</Link>
</li>
<li>
Expand All @@ -229,14 +221,6 @@ const Header = (props: { white: boolean }) => {
<a>Lønnskalkulator</a>
</Link>
</li>
<li id="dont_show">
<a
href="https://twitter.com/intent/tweet?screen_name=variant_as"
rel="noopener"
>
Si hallo!
</a>
</li>
</ul>
</nav>
</>
Expand Down

1 comment on commit ff93a1b

@vercel
Copy link

@vercel vercel bot commented on ff93a1b Nov 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

variant-no – ./

variant-no-git-main-variant1.vercel.app
variant-no-variant1.vercel.app
www.variant.no

Please sign in to comment.