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: improve design of about page #290

Merged
merged 1 commit into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
8 changes: 8 additions & 0 deletions src/pages/about/About.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ul {
list-style: none;
padding: 0;
}

li img {
width: 1.9em;
}
47 changes: 18 additions & 29 deletions src/pages/About.tsx → src/pages/about/index.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import styled from 'styled-components'
import SlackIcon from '../resources/slack-icon.svg'
import SlackIcon from '../../resources/slack-icon.svg'
import { useTranslation } from 'react-i18next'
import Widget from 'src/shared/Widget'
import { Typography } from 'antd'

import './About.scss'
const { Title } = Typography
const About = () => {
return (
<AboutStyle>
<div className="about-center-container">
<Title level={3}> קצת עלינו</Title>
<WhatIsWebsite />
<DiscoveredMistake />
<Privacy />
Expand All @@ -21,33 +26,33 @@ const WhatIsWebsite = () => {
const { t } = useTranslation()

return (
<ParagraphStyle>
<Widget>
<h2>{t('what_is_website')}</h2>
<p>{t('what_is_website_paragraph')}</p>
<ul style={{ listStyle: 'disc', paddingRight: '40px' }}>
<li>{t('planning_information')}</li>
<li>{t('performance_information')}</li>
</ul>
</ParagraphStyle>
</Widget>
)
}

const DiscoveredMistake = () => {
const { t } = useTranslation()

return (
<ParagraphStyle>
<Widget>
<h2>{t('discovered_mistake')}</h2>
<p>{t('discovered_mistake_paragraph')}</p>
</ParagraphStyle>
</Widget>
)
}

const Privacy = () => {
const { t } = useTranslation()

return (
<ParagraphStyle>
<Widget>
<h2>{t('privacy')}</h2>
<p>
באתר מוטמע שירות{' '}
Expand All @@ -57,31 +62,31 @@ const Privacy = () => {
<a href="https://support.google.com/analytics/answer/6004245?hl=iw"> קראו כאן </a>
על מדיניות הפרטיות של השירות.
</p>
</ParagraphStyle>
</Widget>
)
}

const License = () => {
const { t } = useTranslation()

return (
<ParagraphStyle>
<Widget>
<h2>{t('license')}</h2>
<p>
כל המידע המוצג באתר מבוסס על נתונים המפורסמים במקורות המידע הממשלתיים. השימוש במידע כפוף ל
<a href="https://creativecommons.org/licenses/by-sa/4.0/">רישיון CC BY-SA 4.0 </a>
של
<a href="https://creativecommons.org/"> Creative Commons</a>.
</p>
</ParagraphStyle>
</Widget>
)
}

const Questions = () => {
const { t } = useTranslation()

return (
<ParagraphStyle>
<Widget>
<h2>{t('questions')}</h2>
<ul>
<li>
Expand All @@ -101,15 +106,15 @@ const Questions = () => {
</a>
</li>
</ul>
</ParagraphStyle>
</Widget>
)
}

const Funding = () => {
const { t } = useTranslation()

return (
<ParagraphStyle>
<Widget>
<h2>{t('funding')}</h2>
<div>
<p>
Expand All @@ -127,7 +132,7 @@ const Funding = () => {
</a>
</li>
</ul>
</ParagraphStyle>
</Widget>
)
}

Expand All @@ -144,20 +149,4 @@ const AboutStyle = styled.div`
}
`

const ParagraphStyle = styled.div`
& h2 {
font-size: 1.5em;
}
& p {
font-size: 1.15em;
}
& ul {
list-style: none;
padding: 0;
}
& img {
width: 5%;
}
`

export default About
2 changes: 1 addition & 1 deletion src/routes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const GapsPage = lazy(() => import('../pages/gaps'))
const GapsPatternsPage = lazy(() => import('../pages/gapsPatterns'))
const RealtimeMapPage = lazy(() => import('../pages/realtimeMap'))
const SingleLineMapPage = lazy(() => import('../pages/singleLineMap'))
const About = lazy(() => import('../pages/About'))
const About = lazy(() => import('../pages/about'))
const Profile = lazy(() => import('../pages/Profile'))
const BugReportForm = lazy(() => import('../pages/BugReportForm '))

Expand Down
Loading