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

Fix the positioning issue of the Facebook icon and the Apply button. #68

Merged
merged 8 commits into from
Jan 11, 2024
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,14 @@ Frontend dashboard of the scholarX platform
```

- Visit your app at http://localhost:5173


## Backend Server Setup

In order to run the application locally and connect the backend API, you need to set up the backend server URL.

1. Open the `constants.ts` file.
2. You will see a line of code that looks like this: `export const API_URL = 'http://localhost:4000/api';`
3. Replace `'http://localhost:4000/api'` with the URL of your backend server.

Please note that you should not commit this change to the repository. It's recommended to use environment variables for different environments.
20 changes: 12 additions & 8 deletions src/components/Home/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,18 @@ const Home: React.FC = () => (
Unlock Mentorship Opportunities with ScholarX
</Text>
<div style={{ marginTop: '40px' }}>
<Button
className={styles.homePageMainButton}
type={'primary'}
style={{ marginRight: '20px', marginBottom: '20px' }}
>
Apply
</Button>
<Button className={styles.homePageMainButton}>See more</Button>
<div className="flex mt-10">
<Button
className={`flex justify-center items-center mr-5 mb-5 bg-blue-500 hover:bg-blue-700 text-white py-1 px-16 rounded w-40 h-9 font-sans font-bold`}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
className={`flex justify-center items-center mr-5 mb-5 bg-blue-500 hover:bg-blue-700 text-white py-1 px-16 rounded w-40 h-9 font-sans font-bold`}
className="flex justify-center items-center mr-5 mb-5 bg-blue-500 hover:bg-blue-700 text-white py-1 px-16 rounded w-40 h-9 font-sans font-bold"

>
Apply
</Button>
<Button
className={`flex justify-center items-center mr-5 mb-5 text-black py-1 px-16 rounded w-40 h-9 font-sans font-bold`}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need template literals here.

Suggested change
className={`flex justify-center items-center mr-5 mb-5 text-black py-1 px-16 rounded w-40 h-9 font-sans font-bold`}
className="flex justify-center items-center mr-5 mb-5 text-black py-1 px-16 rounded w-40 h-9 font-sans font-bold"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok got it 👍

>
See more
</Button>
</div>
</div>
</Col>
<Col xs={24} md={24} xl={12} style={{ marginTop: '40px' }}>
Expand Down
9 changes: 4 additions & 5 deletions src/components/Layout/MenuDrawer/MenuDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
TwitterOutlined,
LinkedinFilled,
InstagramOutlined,
FacebookFilled,
} from '@ant-design/icons';
import { Avatar, Button, Drawer, Space, Typography } from 'antd';

Expand Down Expand Up @@ -55,11 +56,9 @@ const MenuDrawer: React.FC<MenuDrawerProps> = ({ openMenu, setOpenMenu }) => {
target="_blank"
rel="noreferrer"
>
<Button
className={styles.antButton}
shape="circle"
icon={<img src="/facebook-icon.png" width={20} />}
/>
<Button className={styles.antButton} shape="circle">
<FacebookFilled className={styles.antIcon} />
</Button>
</a>
<a
href="https://twitter.com/goasksef"
Expand Down
9 changes: 4 additions & 5 deletions src/components/Layout/Navbar/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
TwitterOutlined,
LinkedinFilled,
InstagramOutlined,
FacebookFilled,
} from '@ant-design/icons';
import { Button, Col, Row, Space, Typography } from 'antd';

Expand Down Expand Up @@ -110,11 +111,9 @@ const Navbar: React.FC = () => {
target="_blank"
rel="noreferrer"
>
<Button
className={styles.antButton}
shape="circle"
icon={<img src="/facebook-icon.png" width={20} />}
/>
<Button className={styles.antButton} shape="circle">
<FacebookFilled className={styles.antIcon} />
</Button>
</a>
<a
href="https://twitter.com/goasksef"
Expand Down
2 changes: 1 addition & 1 deletion src/constants.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const API_URL = 'http://localhost:3000/api';
export const API_URL = 'http://localhost:4000/api';