Create about us page #18
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| import React from 'react' | ||
| import styled, { useTheme, keyframes, FontType, css } from 'styled-components' | ||
| import { fontTypeCss } from '@/styles/sample-rhdevs-website/index.styled' | ||
|
|
||
| const fadeIn = keyframes` | ||
| 0% { | ||
| opacity: 0; | ||
| } | ||
| 100% { | ||
| opacity: 1; | ||
| } | ||
| ` | ||
|
|
||
| const PreviewText = styled.div<{ hasAnimation?: boolean; fontType: FontType }>` | ||
| ${fontTypeCss} | ||
| margin-top: 20px; | ||
| color: ${(props) => props.theme.palette.common.gray}; | ||
|
|
||
| ${(props) => | ||
| props.hasAnimation && | ||
| css` | ||
| animation-name: ${fadeIn}; | ||
| animation-delay: 1s; | ||
| animation-duration: 1.5s; | ||
| animation-fill-mode: both; | ||
| `} | ||
| ` | ||
|
|
||
| const PreviewTitle = styled.label<{ fontType: FontType }>` | ||
| ${fontTypeCss} | ||
| color: ${(props) => props.theme.palette.common.black}; | ||
| background-color: ${(props) => props.theme.palette.common.white}; | ||
| transition: background-image 0.4s ease-in-out; | ||
| width: fit-content; | ||
| &:hover { | ||
| text-decoration: underline; | ||
| } | ||
| ` | ||
|
|
||
| const PreviewWrapper = styled.div` | ||
| display: flex; | ||
| flex-direction: column; | ||
| background-color: ${(props) => props.theme.palette.common.white}; | ||
| cursor: default; | ||
| flex: 1 1 100%; | ||
| margin: 0 0 3% 0; | ||
| ` | ||
|
|
||
| type Props = { | ||
| title: string | ||
| text: string | ||
| hasAnimation?: boolean | ||
| onClick?: React.MouseEventHandler<HTMLDivElement> | ||
| } | ||
|
|
||
| const defaultProps = { | ||
| hasAnimation: false, | ||
| onClick: undefined, | ||
| } | ||
|
|
||
| export default function Preview(props: Props) { | ||
|
Contributor
There was a problem hiding this comment. Rename the component to something useful e.g. |
||
| const theme = useTheme() | ||
| const { h4, previewTitle } = { ...theme.typography.fontSize } | ||
| return ( | ||
| <PreviewWrapper onClick={props.onClick}> | ||
| <PreviewTitle fontType={previewTitle}>{props.title}</PreviewTitle> | ||
| <PreviewText fontType={h4} hasAnimation={props.hasAnimation}> | ||
| {props.text} | ||
| </PreviewText> | ||
| </PreviewWrapper> | ||
| ) | ||
| } | ||
|
|
||
| Preview.defaultProps = defaultProps | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,30 @@ | ||||||
| import styled from 'styled-components' | ||||||
|
|
||||||
| const FollowUsContainer = styled.div` | ||||||
| display: flex; | ||||||
| justify-content: flex-end; | ||||||
| align-items: center; | ||||||
| margin: 5px 100px 20px 100px; | ||||||
| ` | ||||||
| const Icon = styled.div` | ||||||
| background-color: ${(props) => props.theme.palette.common.gray}; | ||||||
| border-radius: 50%; | ||||||
| margin-left: 20px; | ||||||
| width: 50px; | ||||||
| height: 50px; | ||||||
| ` | ||||||
|
|
||||||
| const StyledText = styled.text` | ||||||
| color: ${(props) => props.theme.palette.common.black}; | ||||||
| ` | ||||||
|
|
||||||
| export default function FollowUs() { | ||||||
|
Contributor
There was a problem hiding this comment. rename to like SocialMediaLinks or smthg
Contributor
There was a problem hiding this comment. use arrow notation for functions!
Suggested change
|
||||||
| return ( | ||||||
| <FollowUsContainer> | ||||||
| <StyledText>Follow Us</StyledText> | ||||||
| <Icon></Icon> | ||||||
| <Icon></Icon> | ||||||
| <Icon></Icon> | ||||||
|
|
||||||
| </FollowUsContainer> | ||||||
| ) | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| /** | ||
| * # Create About Us Page | ||
| * | ||
| * Path: `/aboutus` | ||
| * | ||
| * ## Page Description | ||
| * This page is accessed after the user has clicked on the About Us button on the navigation bar. | ||
| * | ||
|
Contributor
There was a problem hiding this comment. Ok for now, but when the page is filled do describe more on what the page shows (e.g. shows a brief intro to hall etc.) |
||
| */ | ||
|
Contributor
There was a problem hiding this comment. Good job! However docs should be placed just above the main export function, not at the top of the file |
||
|
|
||
| import Image from 'next/image' | ||
| import styled from 'styled-components' | ||
|
|
||
| import Preview from '@/components/AboutUsPreview' | ||
| import FollowUs from '@/components/FollowUs' | ||
| import { | ||
| facilityBooking, | ||
| supperCollation, | ||
| announcementBot, | ||
| } from '@/texts/sample-rhdevs-website/descriptions/projects' | ||
| import { MainContainer } from '@/styles/sample-rhdevs-website/GlobalStyledComponents' | ||
|
|
||
| import logoBackground from '@/assets/sample-rhdevs-website/logo_background.png' | ||
| import logo from '@/assets/sample-rhdevs-website/RHDevs_Logo2.png' | ||
|
|
||
| const AboutUsMainContainer = styled(MainContainer)` | ||
| display: grid; | ||
| grid-template-rows: 1fr max-content; | ||
| grid-template-columns: 1fr; | ||
| ` | ||
|
|
||
| const ImageContainer = styled.div` | ||
| background-color: ${(props) => props.theme.palette.common.gray}; | ||
| background-repeat: no-repeat; | ||
| background-size: cover; | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| position: relative; | ||
| ` | ||
|
|
||
| const ImageMask = styled.div` | ||
| mask-image: linear-gradient(black 40%, transparent); | ||
| text-align: center; | ||
| ` | ||
|
|
||
| const StyledImage = styled(Image)` | ||
| height: 20%; | ||
| width: 15%; | ||
| ` | ||
| const Arrow = styled.div<{ isRight: boolean }>` | ||
| border: solid ${(props) => props.theme.palette.common.white}; | ||
| border-width: 0 3px 3px 0; | ||
| display: inline-block; | ||
| padding: 3px; | ||
| transform: rotate(${(props) => (props.isRight ? -45 : 135)}deg); | ||
| -webkit-transform: rotate(${(props) => (props.isRight ? -45 : 135)}deg); | ||
| position: absolute; | ||
| left: ${(props) => (props.isRight ? 'auto' : 16)}px; | ||
| right: ${(props) => (props.isRight ? 16 : 'auto')}px; | ||
| ` | ||
|
|
||
| const PageDotsContainer = styled.div` | ||
| position: absolute; | ||
| bottom: 16px; | ||
| display: flex; | ||
| ` | ||
| const PageDots = styled.div` | ||
| background-color: ${(props) => props.theme.palette.common.white}; | ||
| border-radius: 50%; | ||
| width: 10px; | ||
| height: 10px; | ||
| margin-left: 5px; | ||
| ` | ||
| const DividerContainer = styled.div` | ||
| display: flex; | ||
| justify-content: center; | ||
| margin-left: 40px; | ||
| margin-right: 40px; | ||
| ` | ||
|
|
||
| const Divider = styled.hr` | ||
| width: 60%; | ||
| border: 1.4px solid ${(props) => props.theme.palette.common.gray}; | ||
| ` | ||
|
|
||
| const PreviewContainer = styled.div` | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: space-evenly; | ||
| gap: 50px; | ||
| margin: 120px 100px 100px 120px; | ||
| ` | ||
|
|
||
| function Projects() { | ||
| return ( | ||
| <AboutUsMainContainer> | ||
| <ImageContainer> | ||
| <Arrow isRight={false}></Arrow> | ||
| <Arrow isRight={true}></Arrow> | ||
|
|
||
| <PageDotsContainer> | ||
| <PageDots></PageDots> | ||
| <PageDots></PageDots> | ||
| </PageDotsContainer> | ||
| </ImageContainer> | ||
|
|
||
| <PreviewContainer> | ||
| <Preview | ||
| title={facilityBooking.projectTitle} | ||
| text={facilityBooking.projectDescription} | ||
| hasAnimation | ||
| /> | ||
| <DividerContainer> | ||
| <Divider /> | ||
| </DividerContainer> | ||
| <Preview | ||
| title={supperCollation.projectTitle} | ||
| text={supperCollation.projectDescription} | ||
| hasAnimation | ||
| /> | ||
| <DividerContainer> | ||
| <Divider /> | ||
| </DividerContainer> | ||
| <Preview | ||
| title={announcementBot.projectTitle} | ||
| text={announcementBot.projectDescription} | ||
| hasAnimation | ||
| /> | ||
| </PreviewContainer> | ||
| <FollowUs></FollowUs> | ||
| </AboutUsMainContainer> | ||
| ) | ||
| } | ||
|
|
||
| export default Projects | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| export const navTitles = ['Home', 'About Us', 'Events', 'Yearbook'] |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cool!