Skip to content

Commit

Permalink
Merge pull request #212 from techstudioconsults/refix
Browse files Browse the repository at this point in the history
Refix
  • Loading branch information
koredeploy authored May 16, 2024
2 parents f151655 + 933e43f commit bc463bd
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 48 deletions.
17 changes: 9 additions & 8 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ import {
TeacherClassView,
TeacherDashboard,
} from './pages'
import InstagramMarketing from './pages/Externals/SingleCourse/InstagramMarketing'
// import InstagramMarketing from './pages/Externals/SingleCourse/DigitalMarketing'
import DigitalMarketing from './pages/Externals/SingleCourse/DigitalMarketing'
// import FrontendEngineering from './pages/Externals/Development/SingleCourse/FrontendEngineering'

const App = () => {
Expand Down Expand Up @@ -110,7 +111,7 @@ const App = () => {
localStorage.setItem('version', packageJson.version)
}, [])

const { fullStackDevelopment, datascience, UIUXDevelopment, frontendDevelopment, cyberSecurity, instagramMarketing } = DEVELOPMENT_CONTENT
const { fullStackDevelopment, datascience, UIUXDevelopment, frontendDevelopment, cyberSecurity, digitalMarketing } = DEVELOPMENT_CONTENT

const classes = useSelector(selectClasses)
const lessons = useSelector(selectLessons)
Expand Down Expand Up @@ -154,12 +155,12 @@ const App = () => {
courseName: course.title,
courseID: course.id,
}
case `instagram marketing`:
case `digital marketing`:
return {
content: instagramMarketing,
path: `/course/instagram-marketing`,
job: `Instagram Marketing Expert`,
query: `instagram marketing`,
content: digitalMarketing,
path: `/course/digital-marketing`,
job: `Digital Marketing Expert`,
query: `digital marketing`,
courseName: course.title,
courseID: course.id,
}
Expand Down Expand Up @@ -246,7 +247,7 @@ const App = () => {
<Route path='/blog/:id' element={<SingleBlogPage />} />
<Route path='/contact' element={<ContactUs />} />
<Route path='/course/frontend' element={<FrontendEngineering />} />
<Route path='/course/instagram-marketing' element={<InstagramMarketing />} />
<Route path='/course/digital-marketing' element={<DigitalMarketing />} />
<Route path='/course/cyber-security' element={<CyberSecurity />} />
<Route path='/course/data-science' element={<DataScience />} />
<Route path='/course/fullstack' element={<FullStackDevelopment />} />
Expand Down
6 changes: 3 additions & 3 deletions src/components/global/banners/CourseBanner.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { selectExternalCourses } from '../../../pages/Externals/api/externalSlic
import Button from '../Button'

const CourseBanner = ({ name, duration }) => {
const { pathname } = useLocation()
const uniqueCourse = pathname == '/course/instagram-marketing' ? 'd-none' : 'd-block'
// const { pathname } = useLocation()
// const uniqueCourse = pathname == '/course/instagram-marketing' ? 'd-none' : 'd-block'
// console.log(duration.weekday.date)
const weekday = duration.weekday.date
const weekend = duration.weekend.date
Expand Down Expand Up @@ -48,7 +48,7 @@ const CourseBanner = ({ name, duration }) => {
<h2 className='m-0 text-primary'>{!duration.weekend.date ? `N/A` : `${weekend}`}</h2>
<p className='m-0 text-dark small-text fw-bold'>Weekday Class: {duration?.span?.weekday} </p>
</div>
<div className={`${uniqueCourse}`}>
<div>
<h2 className='m-0 text-primary'>{!duration.weekend.date ? `N/A` : `${weekday}`}</h2>
<p className='m-0 text-dark small-text fw-bold'>Weekend Class, Online Class: {duration?.span?.weekend} </p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/layout/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ const Footer = () => {
</Link>
</li>
<li className='nav-item mb-0'>
<Link className='text-white cc-link-hover small-text' to='/course/instagram-marketing'>
Advanced IG Marketing
<Link className='text-white cc-link-hover small-text' to='/course/digital-marketing'>
Digital Marketing
</Link>
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions src/layout/Navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ const Navbar = ({ bg, keepColor, setTextColorBlack, isEmployersRoute }) => {
<Link className='dropdown-item fs-sm fw-semibold py-2 text-dark' to='/course/cyber-security'>
Cyber Security
</Link>
<Link className='dropdown-item fs-sm fw-semibold py-2 text-dark' to='/course/instagram-marketing'>
Advance IG Marketing
<Link className='dropdown-item fs-sm fw-semibold py-2 text-dark' to='/course/digital-marketing'>
Digital Marketing Immersive
</Link>
</ul>
</div>
Expand Down
48 changes: 23 additions & 25 deletions src/pages/Externals/Development/content/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -240,14 +240,14 @@ export const DEVELOPMENT_CONTENT = {
date: `N/A`,
price: `0`,
},
weekday: {
weekend: {
time: `12`,
date: `May 11, 2024`,
date: `June 15, 2024`,
price: `250000`,
},
weekend: {
weekday: {
time: `12`,
date: `May 13, 2024`,
date: `June 17, 2024`,
price: `250000`,
},
span: {
Expand Down Expand Up @@ -403,14 +403,14 @@ export const DEVELOPMENT_CONTENT = {
date: `N/A`,
price: `0`,
},
weekday: {
weekend: {
time: `12`,
date: `May 11, 2024`,
date: `June 17, 2024`,
price: `250000`,
},
weekend: {
weekday: {
time: `12`,
date: `May 13, 2024`,
date: `June 15, 2024`,
price: `250000`,
},
span: {
Expand Down Expand Up @@ -683,14 +683,14 @@ In object-oriented JavaScript, students will learn how to create objects, define
date: `February 5, 2024`,
price: `200000`,
},
weekday: {
weekend: {
time: `24`,
date: `May 11, 2024`,
date: `June 17, 2024`,
price: `500000`,
},
weekend: {
weekday: {
time: `16`,
date: `May 13, 2024`,
date: `June 15, 2024`,
price: `300000`,
},
span: {
Expand Down Expand Up @@ -899,14 +899,14 @@ In object-oriented JavaScript, students will learn how to create objects, define
date: `N/A`,
price: `0`,
},
weekday: {
weekend: {
time: `12`,
date: `May 11, 2024`,
date: `June 17, 2024`,
price: `250000`,
},
weekend: {
weekday: {
time: `12`,
date: `May 13, 2024`,
date: `June 15, 2024`,
price: `250000`,
},

Expand All @@ -922,7 +922,7 @@ In object-oriented JavaScript, students will learn how to create objects, define
subTitle: `The significance of cybersecurity in today's increasingly digital environment cannot be emphasized. This extensive course provides an overview of the basic ideas, approaches, and methods needed to protect networks, information systems, and digital assets.`,
img: `https://res.cloudinary.com/dkszgtapy/image/upload/v1687070589/techstudio-web-app/assets/images/Group_1000002401_tpwtbe.png`,
},

sectionTwo: {
header: {
title: `Our Process`,
Expand Down Expand Up @@ -1106,12 +1106,12 @@ In object-oriented JavaScript, students will learn how to create objects, define
},
weekday: {
time: `12`,
date: `May 11, 2024`,
date: `June 15, 2024`,
price: `250000`,
},
weekend: {
time: `12`,
date: `May 13, 2024`,
date: `June 17, 2024`,
price: `250000`,
},

Expand All @@ -1121,7 +1121,7 @@ In object-oriented JavaScript, students will learn how to create objects, define
},
},
},
instagramMarketing: {
digitalMarketing: {
hero: {
title: `Advanced Instagram Marketing for Content Creators & Entrepreneurs `,
subTitle: `Say Goodbye to IG marketing that brings you no customer. Tech Studio Academy is offering an exclusive two-week Advanced Instagram Marketing course that will increase your revenue!`,
Expand Down Expand Up @@ -1177,7 +1177,6 @@ In object-oriented JavaScript, students will learn how to create objects, define
desc: `The era of boring product/service marketing ended a long time ago. You will be left with little or no interested customers if you do not present your product in a way that will ‘WOOOOOOWWW’ your audience.`,
bgColor: `white`,
img: `https://res.cloudinary.com/doejcrfso/image/upload/v1713456181/IG%20Marketing%20gifs/MArketing_ng0p4c.gif`,

},
{
id: 6,
Expand Down Expand Up @@ -1207,7 +1206,6 @@ In object-oriented JavaScript, students will learn how to create objects, define
img: `https://res.cloudinary.com/doejcrfso/image/upload/v1713455605/IG%20Marketing%20gifs/Content_Creation_1_xrq4hd.gif`,
},
],

},

duration: {
Expand All @@ -1218,12 +1216,12 @@ In object-oriented JavaScript, students will learn how to create objects, define
},
weekend: {
time: `12`,
date: `April 29, 2024`,
date: `June 17, 2024`,
price: `250000`,
},
weekday: {
time: `N/A`,
date: `N/A`,
time: `12`,
date: ` June 15 2024`,
price: `N/A`,
},

Expand Down
6 changes: 3 additions & 3 deletions src/pages/Externals/Home/content/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ technologies for learning.`,
{
image: `https://res.cloudinary.com/doejcrfso/image/upload/v1713466711/IG%20Marketing%20gifs/igm_jxsem6.png`,
imageLow: `https://res.cloudinary.com/doejcrfso/image/upload/v1713466711/IG%20Marketing%20gifs/igm_jxsem6.png`,
title: `Advanced IG Marketing`,
description: ` You will learn the best practices of securing networks, systems and data. We will help you get hands-on experience with essential cybersecurity tools and technologies.`,
path: `/course/instagram-marketing`,
title: `Digital Marketing Immersive`,
description: ` Say Goodbye to IG marketing that brings you no customer. Tech Studio Academy is offering an exclusive two-week Advanced Instagram Marketing course that will increase your revenue!`,
path: `/course/digital-marketing`,
},
],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ import { HOME_CONTENT } from '../Home/content'
import SectionFour from '../Home/sections/sectionFour'

const baseUrl = import.meta.env.VITE_BASE_URL
const InstagramMarketing = () => {
const DigitalMarketing = () => {
const dispatch = useDispatch()
const upcomingCourse = useSelector(selectExternalCourses)

const filterCourse = (upcomingCourse, title) => {
return upcomingCourse?.filter((course) => course.title.toLowerCase().includes(title))
}
// const instagramMarketing = filterCourse(upcomingCourse, 'instagram marketing')
const instagramMarketing = filterCourse(upcomingCourse, 'advanced ig marketing')
const digitalMarketing = filterCourse(upcomingCourse, 'digital marketing ')
// console.log(cyberSecurity)
const [courseData] = instagramMarketing
const [courseData] = digitalMarketing
const name = 'Instagram marketing'

const courseID = courseData?.id
Expand All @@ -41,7 +41,7 @@ const InstagramMarketing = () => {
// const { hero, sectionTwo, sectionFour, duration } = DEVELOPMENT_CONTENT
// console.log(DEVELOPMENT_CONTENT.cyberSecurity)

const courseDetails = DEVELOPMENT_CONTENT.instagramMarketing
const courseDetails = DEVELOPMENT_CONTENT.digitalMarketing
const { hero, sectionTwo, sectionFour, duration } = courseDetails

// console.log(sectionTwo);
Expand Down Expand Up @@ -114,4 +114,4 @@ const InstagramMarketing = () => {
)
}

export default InstagramMarketing
export default DigitalMarketing

0 comments on commit bc463bd

Please sign in to comment.