Skip to content

Commit

Permalink
login/signup tested, registration hidden for now
Browse files Browse the repository at this point in the history
  • Loading branch information
ashleyleal committed Jul 4, 2024
1 parent 1d8a1d0 commit 1ede00b
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 29 deletions.
29 changes: 15 additions & 14 deletions client/src/pages/Home/Home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,29 +77,30 @@ const HomeHeaderButton = () => {
<Button
label={loggedIn ? 'View Profile' : 'Register Now!'}
isSecondary
// style={{
// margin: '0px',
// height: '100%',
// fontSize: 'unset',
// display: 'flex',
// justifyContent: 'center',
// alignItems: 'center',
// }}
style={{
width: '0.px',
height: '0.px',
fontSize: '0px',
opacity: '0',
margin: '0px',
height: '100%',
fontSize: 'unset',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
}}
// hidden button xD
// style={{
// width: '0.px',
// height: '0.px',
// fontSize: '0px',
// opacity: '0',
// }}
/>
</div>
{/* <div className="mobile-only">
<div className="mobile-only">
<Button
label={loggedIn ? 'View Profile' : 'Register Now!'}
isSecondary
style={{ margin: '0px' }}
/>
</div> */}
</div>
</div>
</Link>
</>
Expand Down
7 changes: 4 additions & 3 deletions client/src/pages/Profile/PageProfileFrosh.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,16 @@ const ProfilePageFroshHeader = ({ editButton }) => {

{!isRegistered ? (
<div className={'profile-not-registered'}>
<h1>You are not registered!</h1>
<h2>You will not be able to participate in F!rosh week events until you register.</h2>
<h1>YOU ARE NOT REGISTERED!</h1>
{/* <h2>You will not be able to participate in F!rosh week events until you register.</h2> */}
<h2>Registration opens soon. Stay tuned!</h2>
<Link
key={'/registration'}
to={'/registration'}
style={{ textDecoration: 'none' }}
className={'no-link-style'}
>
<Button label="Register" style={{}} />
{/* <Button label="Register" style={{}} /> */}
</Link>
</div>
) : null}
Expand Down
24 changes: 12 additions & 12 deletions client/src/util/profile-pages.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ function logoutFunction({ dispatch, navigate }) {

export const profilePages = {
notLogin: [
// {
// label: 'Log in',
// icon: LoginIcon,
// iconDark: LoginIconDarkMode,
// path: '/login',
// },
],
login: [
{
label: 'Register',
icon: RegisterIcon,
iconDark: RegisterIconDarkMode,
path: '/registration',
label: 'Log in',
icon: LoginIcon,
iconDark: LoginIconDarkMode,
path: '/login',
},
],
login: [
// {
// label: 'Register',
// icon: RegisterIcon,
// iconDark: RegisterIconDarkMode,
// path: '/registration',
// },
{
label: 'Profile',
icon: ProfileIcon,
Expand Down

0 comments on commit 1ede00b

Please sign in to comment.