Skip to content

Commit

Permalink
Merge branch 'gtech-mulearn:old-dev' into old-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Edwinliby authored Oct 11, 2023
2 parents 8473d66 + a01d531 commit 405ccc7
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions src/Pages/Pathway/Pathway.jsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import React from 'react'
import styles from './Pathway.module.css'
import Navbar from './components/Navbar/menubar'
import Mainpage from './components/HeroSection/mainpage'
import Whatispathway from './components/About/About'
import CourseOverview from './components/course Overview/CourseOverview'
import Mainpage from "./components/HeroSection/Mainpage"
import CourseOverview from './components/CourseOverview/CourseOverview'
import Whoshouldattend from './components/WhoShouldAttend/WhoShouldAttend'
import Contact from './components/contact/Contact'
import Contact from './components/Contact/Contact'
import Menubar from './components/Menubar/Menubar'

export default function Pathway() {
return (
<>
<Navbar />
<Menubar />
<Mainpage />
<div className={styles.pathway}>
<CourseOverview />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function Contact() {
<>
<div className={styles.ContactUs}>
<div className={styles.Contact}>
<img src={img4} alt="logo" />
<img alt="contact" src={img4} />
</div>
<div className={styles.ContactList}>
{links.map((link) => {
Expand All @@ -29,35 +29,35 @@ export default function Contact() {
<ul>
{link.l1 ? (
<li>
<a href="#">{link.l1}</a>
<a href="/">{link.l1}</a>
</li>
) : null}
{link.l2 ? (
<li>
<a href="#">{link.l2}</a>
<a href="/">{link.l2}</a>
</li>
) : null}
{link.l3 ? (
<li>
<a href="#">{link.l3}</a>
<a href="/">{link.l3}</a>
</li>
) : null}
{link.l4 ? (
<li>
<a href="#">{link.l4}</a>
<a href="/">{link.l4}</a>
</li>
) : null}
{link.l5 ? (
<li>
<a href="#">{link.l5}</a>
<a href="/">{link.l5}</a>
</li>
) : null}
{link.l6 ? (
<li
style={{ textDecoration: "underline", color: "#1C1CF0" }}
>
{" "}
<a href="#">{link.l6}</a>{" "}
<a href="/">{link.l6}</a>{" "}
</li>
) : null}
</ul>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react"
import styles from "./mainpage.module.css"
import styles from "./Mainpage.module.css"
import img2 from "../../assets/img2.webp";
import pre from "../../assets/pre.png";

Expand All @@ -9,7 +9,7 @@ export default function mainpage() {
<section className={styles.First}>
<div className={styles.Container}>
<div className={styles.Container_image_one}>
<img src={img2} />
<img alt="hero" src={img2} />
</div>
<div className={styles.Container_desc}>
<div className={styles.Container_head}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import styles from './menubar.module.css';
import styles from './Menubar.module.css';
import img4 from "../../assets/logo.webp";
import pre from '../../assets/pre.png';

Expand All @@ -22,7 +22,7 @@ export default function Menubar() {
return (
<div ref={navbar} className={styles.menu_bar}>
<div className={styles.logo}>
<a href="#"><img src={img4} alt="Logo" /></a>
<a href="/"><img src={img4} alt="Logo" /></a>
</div>
<div className={styles.menu}>
<a href="#heroSection">Home</a>
Expand All @@ -31,7 +31,7 @@ export default function Menubar() {
<a href="#about">About Pathway</a>
</div>
<div className={styles.pre_rg}>
<a href="#">
<a href="/">
<img src={pre} alt="Pre-register" />
Pre-register
</a>
Expand Down

0 comments on commit 405ccc7

Please sign in to comment.