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

feat: add sign in button #425

Merged
merged 8 commits into from
Aug 19, 2023
Merged

feat: add sign in button #425

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0e5683c
feat: add sign in button
anish-patro Feb 8, 2023
4868ffe
fix: conflict resolve
anish-patro Feb 8, 2023
ddd9ad6
fix: resolve all conflicts
anish-patro Feb 8, 2023
e3b0d43
Merge branch 'main' into feat/signin_button
anish-patro Feb 8, 2023
934cb0c
fix
anish-patro Feb 8, 2023
661ec75
Merge branch 'feat/signin_button' of https://github.com/anish-patro/p…
anish-patro Feb 8, 2023
4d14343
fixed
anish-patro Feb 8, 2023
98b3817
feat: add signIn button in mobile view
anish-patro Apr 7, 2023
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
64 changes: 46 additions & 18 deletions client/src/components/marginals/DesktopNavbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useRouter } from 'next/router';
import InputAdornment from '@mui/material/InputAdornment';
import SearchIcon from '@mui/icons-material/Search';
import makeStyles from '@mui/styles/makeStyles';
import { Container, Typography, TextField, Fade } from '@mui/material';
import { Container, Typography, TextField, ButtonBase, Fade } from '@mui/material';
// import TrendingUpSharpIcon from '@mui/icons-material/TrendingUpSharp';

// Utils
Expand Down Expand Up @@ -120,21 +120,29 @@ const DesktopNavbar = () => {
objectFit='cover'
/>
</div>

<TextField
variant='standard'
label='Search for articles'
placeholder='Enter related words'
onClick={searchActive}
disabled={true}
InputProps={{
endAdornment: (
<InputAdornment position='start'>
<SearchIcon />
</InputAdornment>
),
}}
/>
<div className={classes.searchAndSign}>
<TextField
variant='standard'
label='Search for articles'
placeholder='Enter related words'
onClick={searchActive}
disabled={true}
InputProps={{
endAdornment: (
<InputAdornment position='start'>
<SearchIcon />
</InputAdornment>
),
}}
/>
<div className={classes.signIn}>
<Link href='/onboarding' passHref>
<ButtonBase type='button' className={classes.button}>
<span className={classes.label}> Sign In </span>
</ButtonBase>
</Link>
</div>
</div>
</div>

<ul aria-label='Navbar' className={classes.menuContainer}>
Expand Down Expand Up @@ -166,16 +174,29 @@ const useStyles = makeStyles((theme) => ({
width: '100%',
marginTop: '10px',
},

detailsContainer: {
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',

paddingTop: '10px',
paddingBottom: '25px',
borderBottom: `3px solid ${theme.palette.secondary.neutral50}`,
},
button: {
textAlign: 'center',
borderRadius: '4px',
border: 'solid black 0.5px',
margin: '8px 8px 0px 0px',
padding: '10px 20px',
},
label: {
fontFamily: 'Source Sans Pro',
fontSize: '20px',
fontWeight: '400',
lineHeight: '1.2rem',
textDecoration: 'none',
color: theme.palette.secondary.main,
},
imgContainer: {
width: '33%',
height: 'auto',
Expand All @@ -188,6 +209,13 @@ const useStyles = makeStyles((theme) => ({
width: 'auto !important',
height: 'auto !important',
},
searchAndSign: {
display: 'flex',
alignItems: 'center',
},
signIn: {
paddingLeft: '30px',
},
menuContainer: {
width: '100%',
marginTop: '20px',
Expand Down
0 ...t/src/components/onboarding/Pagination.js → ...t/src/components/onboarding/pagination.js
View file
Open in desktop
File renamed without changes.
5 changes: 0 additions & 5 deletions client/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6809,11 +6809,6 @@ reusify@^1.0.4:
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==

rifm@^0.12.1:
version "0.12.1"
resolved "https://registry.yarnpkg.com/rifm/-/rifm-0.12.1.tgz#8fa77f45b7f1cda2a0068787ac821f0593967ac4"
integrity sha512-OGA1Bitg/dSJtI/c4dh90svzaUPt228kzFsUkJbtA2c964IqEAwWXeL9ZJi86xWv3j5SMqRvGULl7bA6cK0Bvg==

rimraf@^3.0.0, rimraf@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
Expand Down