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.

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

feat: preferences page, styling, and routing between onboarding #11

Merged
merged 4 commits into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { Metadata } from 'next';
import StyledComponentsRegistry from '@/lib/registry';
import { BespokeSans } from '../styles/fonts';
import '../styles/global.css';

// site metadata - what shows up on embeds
export const metadata: Metadata = {
Expand Down
24 changes: 13 additions & 11 deletions app/onboarding/page.tsx → app/onboarding/general/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,23 @@ import Back from '@/assets/images/back.svg';
import {
Background,
ButtonContainer,
Checkbox,
Container,
ContinueButton,
ContinueText,
Image,
InlineContainer,
Input,
Rectangle,
RedAsterisk,
StyledLink,
Title,
UpdateContainer,
UpdateText,
} from './styles';
} from '../styles';
import { Checkbox, RedAsterisk, UpdateContainer, UpdateText } from './styles';

export default function Onboarding() {
return (
<Background>
<InlineContainer>
<Image src={Back} alt="Back icon" />

<div>
<Rectangle variant="light" widthPercentage="25%" />
<Rectangle variant="dark" widthPercentage="75%" />
Expand Down Expand Up @@ -52,11 +49,16 @@ export default function Onboarding() {
</UpdateText>
</UpdateContainer>
</Container>
<ButtonContainer>
<ContinueButton>
<ContinueText>Continue</ContinueText>
</ContinueButton>
</ButtonContainer>

<StyledLink href="../onboarding/preferences">
<ButtonContainer>
<ContinueButton>
<ContinueText style={{ fontFamily: 'boo' }}>
me-liu marked this conversation as resolved.
Show resolved Hide resolved
Continue
</ContinueText>
</ContinueButton>
</ButtonContainer>
</StyledLink>
</InlineContainer>
</Background>
);
Expand Down
25 changes: 25 additions & 0 deletions app/onboarding/general/styles.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
'use client';

import styled from 'styled-components';

export const UpdateContainer = styled.main`
display: flex;
flex-direction: row;
align-items: flex-start;
margin-top: 0.5rem;
`;

export const Checkbox = styled.input`
width: 25px;
height: 25px;
border-style: solid;
`;

export const UpdateText = styled.text`
text-align: left;
margin-left: 15px;
`;

export const RedAsterisk = styled.span`
color: #b22222;
`;
51 changes: 51 additions & 0 deletions app/onboarding/preferences/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import Link from 'next/link';
import Back from '@/assets/images/back.svg';
import {
Background,
ButtonContainer,
Container,
ContinueButton,
ContinueText,
Image,
InlineContainer,
Input,
Rectangle,
Title,
} from '../styles';

export default function Onboarding() {
return (
<Background>
<InlineContainer>
<Link href="/onboarding/general" passHref>
<Image src={Back} alt="Back icon" />
</Link>

<div>
<Rectangle variant="light" widthPercentage="50%" />
<Rectangle variant="dark" widthPercentage="50%" />
</div>
<Container>
<Title>Help us tailor shows to you!</Title>
<text>Facility Type</text>
<Input />
<text>Preferred Location</text>
<Input />
<text>Audience</text>
<Input />
<text>Preferred Equipment</text>
<Input />
<text>Type of Act</text>
<Input />
<text>Genre</text>
<Input />
</Container>
<ButtonContainer>
<ContinueButton>
<ContinueText>Continue</ContinueText>
</ContinueButton>
</ButtonContainer>
</InlineContainer>
</Background>
);
}
39 changes: 14 additions & 25 deletions app/onboarding/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ export const InlineContainer = styled.main`
width: 30%;
height: 85%;
me-liu marked this conversation as resolved.
Show resolved Hide resolved
flex-direction: column;
margin-top: 2%;
margin-bottom: 2%;

@media (max-width: 1200px) {
width: 45%;
Expand Down Expand Up @@ -47,8 +49,6 @@ export const Rectangle = styled.main<{
`;

export const Container = styled.main`
width: 100%;
height: 53%;
display: flex;
flex-direction: column;
align-items: start;
Expand All @@ -61,36 +61,21 @@ export const Container = styled.main`

export const Input = styled.input`
width: 100%;
height: 22px;
height: 25px;
border-color: ${COLORS.gray4};
border-style: solid;
border-radius: 4px;
margin-bottom: 6%;
margin-bottom: 1.3rem;
margin-top: 0.25rem;
padding-left: 0.4rem;
`;

export const Title = styled.h1`
font-size: 28px;
text-align: start;
color: ${COLORS.gray11};
margin-top: 0;
margin-bottom: 5%;
`;

export const UpdateContainer = styled.main`
display: flex;
flex-direction: row;
align-items: flex-start;
`;

export const Checkbox = styled.input`
width: 25px;
height: 25px;
border-style: solid;
`;

export const UpdateText = styled.text`
text-align: left;
margin-left: 15px;
margin-bottom: 2rem;
`;

export const ButtonContainer = styled.div`
Expand All @@ -111,14 +96,18 @@ export const ContinueButton = styled.button`
justify-content: center;
align-items: center;
gap: 10px;
cursor: pointer;
text-decoration: none;
`;

export const ContinueText = styled.p`
export const ContinueText = styled.text`
me-liu marked this conversation as resolved.
Show resolved Hide resolved
color: white;
font-size: 14px;
padding: 10px;
text-decoration: none;
font-family: 'BespokeSans-Regular' !important;
me-liu marked this conversation as resolved.
Show resolved Hide resolved
`;

export const RedAsterisk = styled.span`
color: #b22222;
export const StyledLink = styled.a`
text-decoration: none;
`;
4 changes: 2 additions & 2 deletions app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Link from 'next/link';
import BPLogo from '@/assets/images/bp-logo.png';
import BPLogo from '@/public/images/bp-logo.png';
import { Container, Image } from './page.style';

export default function Home() {
Expand All @@ -8,7 +8,7 @@ export default function Home() {
<Image src={BPLogo} alt="Blueprint Logo" />
<p>Open up app/page.tsx to get started!</p>

<Link href="/onboarding">
<Link href="/onboarding/general">
<button>Onboarding</button>
</Link>
</Container>
Expand Down