Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add banner and update public frontpage for fp-23 #4003

Merged
merged 1 commit into from
Jul 2, 2023
Merged

Add banner and update public frontpage for fp-23 #4003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/routes/overview/components/Overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import moment from 'moment-timezone';
import { useMemo, useState } from 'react';
import { Helmet } from 'react-helmet-async';
import { Link } from 'react-router-dom';
import Banner from 'app/components/Banner';
import Icon from 'app/components/Icon';
import { Container, Flex } from 'app/components/Layout';
import Poll from 'app/components/Poll';
Expand All @@ -20,7 +21,6 @@ import NextEvent from './NextEvent';
import styles from './Overview.css';
import Pinned from './Pinned';
import { itemUrl, renderMeta } from './utils';
// import Banner, { COLORS } from 'app/components/Banner';

type Props = {
frontpage: WithDocumentType<PublicArticle | FrontpageEvent>[];
Expand Down Expand Up @@ -95,12 +95,12 @@ const Overview = (props: Props) => {
return (
<Container>
<Helmet title="Hjem" />
{/* <Banner
header="Abakusrevyen har opptak!"
subHeader="Søk her"
link="https://opptak.abakus.no"
color={COLORS.red}
/> */}
<Banner
header="Velkommen til fadderperioden 2023!"
subHeader="Trykk her for mer informasjon til nye studenter"
link="https://ny.abakus.no"
color="red"
/>
<Flex className={styles.desktopContainer}>
<Flex column className={styles.leftColumn}>
<CompactEvents events={events} />
Expand Down
22 changes: 11 additions & 11 deletions app/routes/overview/components/PublicFrontpage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import readmeGraphic from 'app/assets/frontpage-graphic-readme.png';
import netcompany from 'app/assets/netcompany_dark.png';
import netcompanyLight from 'app/assets/netcompany_white.svg';
import AuthSection from 'app/components/AuthSection/AuthSection';
import Banner from 'app/components/Banner';
import Button from 'app/components/Button';
import Card from 'app/components/Card';
import { Image } from 'app/components/Image';
Expand All @@ -21,7 +22,6 @@ import { itemUrl, renderMeta } from 'app/routes/overview/components/utils';
import type { PublicEvent } from 'app/store/models/Event';
import CompactEvents from './CompactEvents';
import styles from './PublicFrontpage.css';
// import Banner, { COLORS } from 'app/components/Banner';

type Props = {
frontpage: (
Expand Down Expand Up @@ -57,12 +57,12 @@ const PublicFrontpage = ({ frontpage, readmes }: Props) => {

return (
<Container>
{/* <Banner
header="Abakusrevyen har opptak!"
subHeader="Søk her"
link="https://opptak.abakus.no"
color={COLORS.red}
/> */}
<Banner
header="Velkommen til fadderperioden 2023!"
subHeader="Trykk her for mer informasjon til nye studenter"
link="https://ny.abakus.no"
color="red"
/>
<Container className={styles.container}>
<Welcome />
<Card className={styles.login} style={{ gridArea: 'login' }}>
Expand Down Expand Up @@ -127,13 +127,13 @@ const HspInfo = () => (

const usefulLinksConf = [
{
title: 'Fadderperioden 2022',
title: 'Fadderperioden 2023',
image: buddyWeekGraphic,
description:
'Abakus arrangerer fadderperioden for alle nye studenter, og her finner du informasjon om fadderperioden 2022.',
'Abakus arrangerer fadderperioden for alle nye studenter, og her kan du lese mer om den og finne annen nyttig informasjon til studiestart.',
buttonText: 'Les deg opp',
link: '/articles/414',
isInternalLink: true,
link: 'https://ny.abakus.no',
isInternalLink: false,
},
{
title: 'Datateknologi',
Expand Down