Merge branch 'old-dev' into old-production

gtech-mulearn · Jun 27, 2023 · a58ae6b · a58ae6b
2 parents bb9a940 + 364d337
commit a58ae6b
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 20 deletions.
diff --git a/src/Components/Navbar/Mobile.jsx b/src/Components/Navbar/Mobile.jsx
@@ -150,7 +150,9 @@ export const MobileNavHeader = ({ visible, test1 }) => {
  test1(link);
  }}
  >
- <h1 className="text-[13px]">{link.name}</h1>
+ <a href={link.link}>
+ <h1 className="text-[13px]">{link.name}</h1>
+ </a>
  <span
  className="text-[13px] flex items-center"
  onClick={() => {
@@ -219,7 +221,14 @@ export const MobileSubHeader = ({ currentLink, goBack }) => {
  <span className="text-xl flex items-center" onClick={() => goBack()}>
  <ion-icon name="chevron-back-outline" />
  </span>
- <div className="text-[13px]">{currentLink.name}</div>
+ {currentLink.link ? (
+ <a class="text-orange-400" href={currentLink.link}>
+ <div className="text-[13px]">{currentLink.name}</div>
+ </a>
+ ) : (
+ <div className="text-[13px]">{currentLink.name}</div>
+ )}
+
  <div></div>
  </div>
  );

diff --git a/src/Components/Navbar/Mylinks.jsx b/src/Components/Navbar/Mylinks.jsx
@@ -184,8 +184,15 @@ export const links = [
  link: "/campuschapters",
  sublinks: [
  {
- name: "User Journey",
- link: "/journey",
+ name: "Lead a Campus",
+ link: "https://airtable.com/shrmtngt3zopg8eVh",
+ submenu: false,
+ sublinks: [],
+ foreign: false,
+ },
+ {
+ name: "Find Your Campus",
+ link: "/campuschapters#findchapter",
  submenu: false,
  sublinks: [],
  foreign: false,
@@ -211,13 +218,6 @@ export const links = [
  name: "The Orientation",
  submenu: true,
  sublinks: [
- {
- name: "Lead a Campus",
- link: "https://airtable.com/shrmtngt3zopg8eVh",
- submenu: false,
- sublinks: [],
- foreign: false,
- },
  {
  name: "Typing Mastery",
  link: mainlink + "/challenge/typing",

diff --git a/src/Pages/CampusChapters/CampusChapters.jsx b/src/Pages/CampusChapters/CampusChapters.jsx
@@ -119,7 +119,7 @@ const CampusChapters = () => {
  </div>
  {/*Added updated contents from levels component*/}
  <Levels />
- <div className={styles.search_view_container}>
+ <div id="findchapter" className={styles.search_view_container}>
  <div className={styles.search_view}>
  <div className={styles.sv_texts}>
  <p className={styles.sv_heading}>

diff --git a/src/Pages/Home/Home.jsx b/src/Pages/Home/Home.jsx
@@ -27,13 +27,22 @@ const Home = () => {
  shackles you have grounded yourself in.
  </p>
  </div>
- <a
- target="_blank"
- rel="noopener noreferrer"
- href="https://app.mulearn.org/register"
- >
- <button className={styles.primary}>Join Us</button>
- </a>
+ <div className={styles.buttons}>
+ <a
+ target="_blank"
+ rel="noopener noreferrer"
+ href="https://app.mulearn.org/register"
+ >
+ <button className={styles.primary}>Join Us</button>
+ </a>
+ <a
+ target="_blank"
+ rel="noopener noreferrer"
+ href="https://mulearn.org/journey"
+ >
+ <button className={styles.secondary}>Your Journey</button>
+ </a>
+ </div>
  </div>
  <img
  className={styles.fv_image}

diff --git a/src/Pages/Home/Home.module.css b/src/Pages/Home/Home.module.css
@@ -63,7 +63,17 @@ a {
  font-family: "Poppins", sans-serif;
 }
 
-.primary {
+.buttons{
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: center;
+ align-items: center;
+ row-gap: 1rem;
+ column-gap: 1rem;
+}
+
+.primary,
+.secondary {
  background-color: #f78c40;
  padding: 0.7rem 2.75rem;
  border: none;
@@ -74,6 +84,13 @@ a {
  border-radius: 5px;
 }
 
+.secondary {
+ background-color: #ffffff;
+ color: #f78c40;
+ padding: 0.6rem 2.75rem;
+ border: 2px solid #f59d5e;
+}
+
 @media only screen and (min-width: 1000px) {
  .firstview_container {
  max-width: 1000px;