Compare commits

..

8 Commits

Author SHA1 Message Date
victorAnumudu cacb32b319 single blog page displayed 2025-01-27 23:14:31 +01:00
CHIEFSOFT\ameye ed72ce43a1 Pahe fix 2025-01-27 11:48:27 -05:00
CHIEFSOFT\ameye e713b91689 Fix page contents 2025-01-27 11:19:50 -05:00
victor.ebuka e6970dbfaf Merge branch 'img-replacement' of MERMS/MermsWebsite2025 into master 2025-01-16 12:12:32 +00:00
victorAnumudu d0aed5ee24 about image replacement 2025-01-16 13:10:53 +01:00
victor.ebuka ac51fc9e1b Merge branch 'image-replacement' of MERMS/MermsWebsite2025 into master 2025-01-12 04:18:14 +00:00
victorAnumudu 1203a45682 replaced some about images 2025-01-12 05:10:30 +01:00
victor.ebuka 1d21dc7740 Merge branch 'about-top' of MERMS/MermsWebsite2025 into master 2025-01-10 20:47:17 +00:00
16 changed files with 229 additions and 215 deletions
+5 -5
View File
@@ -8,7 +8,7 @@ export default function MermsFooter() {
{/* FOOTER CONTENT */}
<div className="row">
{/* FOOTER LOGO */}
<div className="col-xl-4">
<div className="col-md-6 col-xl-4">
<div className="footer-info">
<img className="footer-logo" src="/images/logo-pink.png" alt="footer-logo" />
</div>
@@ -18,9 +18,9 @@ export default function MermsFooter() {
</p>
</div>
</div>
<div className="row col-xl-8">
<div className="col-12 col-md-6 col-xl-8 row">
{/* FOOTER LINKS */}
<div className="col-xl-4">
<div className="col-6 col-sm-4 col-md-4 col-xl-4">
<div className="footer-links fl-1">
{/* Title */}
<h6 className="s-17 w-700">Company</h6>
@@ -39,7 +39,7 @@ export default function MermsFooter() {
</div>
</div> {/* END FOOTER LINKS */}
{/* FOOTER LINKS */}
<div className="col-xl-4">
<div className="col-6 col-sm-4 col-md-4 col-xl-4">
<div className="footer-links fl-2">
{/* Title */}
<h6 className="s-17 w-700">Product</h6>
@@ -61,7 +61,7 @@ export default function MermsFooter() {
</div>
</div> {/* END FOOTER LINKS */}
{/* FOOTER LINKS */}
<div className="col-xl-4">
<div className="col-6 col-sm-4 col-md-4 col-xl-4">
<div className="footer-links fl-3">
{/* Title */}
<h6 className="s-17 w-700">Legal</h6>
+45
View File
@@ -0,0 +1,45 @@
import Link from "next/link";
export default function MermsBlogFix() {
return (
<>
<div className="blog-post square-post">
<div className="row">
<div className="col">
<div className="square-post-wrapper bg--black-400 block-shadow r-16 wow fadeInUp">
<div className="row d-flex align-items-center">
<div className="col-md-6 order-last order-md-2">
<div className="blog-post-txt color--white">
<h4 className="s-34 w-700 mb-20">
<Link href="/merms-blogview">Lipsum sodales sapien Martex aliquet blandit
augue gravida posuere
</Link>
</h4>
<p>Aliqum mullam blandit vitae and tempor sapien and donec lipsum gravida porta
undo velna dolor libero risus aliquet tempus posuere vitae tempor
</p>
<div className="blog-post-meta mt-30">
<ul className="post-meta-list ico-10">
<li><p className="w-500">MermsEmr Team</p></li>
<li className="meta-list-divider"><p><span className="flaticon-minus" /></p></li>
</ul>
</div>
</div>
</div>
<div className="col-md-6 order-first order-md-2">
<div className="blog-post-img video-preview">
<img className="img-fluid" src="/images/blog/post-10-img.jpg" alt="video-preview" />
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</>
)
}
+1 -29
View File
@@ -80,35 +80,7 @@ export default function Home() {
<hr className="divider" />
{/* NEWSLETTER-1
============================================= */}
<section id="newsletter-1" className="newsletter-section">
<div className="newsletter-overlay">
<div className="container">
<div className="row d-flex align-items-center row-cols-1 row-cols-lg-2">
{/* NEWSLETTER TEXT */}
<div className="col">
<div className="newsletter-txt">
<h4 className="s-34 w-700">Stay up to date with our news, ideas and updates</h4>
</div>
</div>
{/* NEWSLETTER FORM */}
<div className="col">
<form className="newsletter-form">
<div className="input-group">
<input type="email" autoComplete="off" className="form-control" placeholder="Your email address" required id="s-email" />
<span className="input-group-btn">
<button type="submit" className="btn btn--theme hover--theme">Subscribe Now</button>
</span>
</div>
{/* Newsletter Form Notification */}
<label htmlFor="s-email" className="form-notification" />
</form>
</div> {/* END NEWSLETTER FORM */}
</div> {/* End row */}
</div> {/* End container */}
</div> {/* End newsletter-overlay */}
</section> {/* END NEWSLETTER-1 */}
{/* DIVIDER LINE */}
<hr className="divider" />
</div>
</Layout>
+15 -47
View File
@@ -4,6 +4,7 @@ import VideoPopup from "../components/elements/VidepPopup"
import Layout from "../components/layout/Layout"
import Link from "next/link"
import queryKeys from "../components/queryclientProvider/queryKeys";
import MermsBlogFix from "../components/sections/MermsBlogFix";
export default function Home() {
@@ -61,7 +62,12 @@ export default function Home() {
<div className="blog-post-txt">
<h3 className="s-38 w-700">
<Link href={data?.payload?.blogdata[0].guid}> {data?.payload?.blogdata[0].post_title}</Link>
{/*<Link href={data?.payload?.blogdata[0].guid}> {data?.payload?.blogdata[0].post_title}</Link>*/}
<Link
href={{pathname: '/merms-blogview', query:{...data?.payload?.blogdata[0], image_url:data?.payload?.image_url}}}
>
{data?.payload?.blogdata[0].post_title}
</Link>
</h3>
{/* Text */}
{/* <p>{data?.payload?.blogdata[0].post_content.substring(0, 250)}</p> */}
@@ -83,7 +89,7 @@ export default function Home() {
<div className="row">
{/* BLOG POST #1 */}
{data?.payload?.blogdata.map((item, index)=>{
if(index > 0){
if(index > 0 && index < 10){
return (
<div key={item.id || index} className="col-md-6 col-lg-4">
<div className="blog-post mb-40 wow fadeInUp clearfix">
@@ -101,7 +107,12 @@ export default function Home() {
{/* <span className="post-tag color--red-400">Product News</span> */}
{/* Post Link */}
<h6 className="s-20 w-700">
<Link href={item.guid}> {item.post_title}</Link>
{/* <Link href={item.guid}> {item.post_title}</Link> */}
<Link
href={{pathname: '/merms-blogview', query:{...item, image_url:data?.payload?.image_url}}}
>
{item.post_title}
</Link>
</h6>
{/* Text */}
<p dangerouslySetInnerHTML={{ __html: item.post_content.length > 250 ? item.post_content.substring(0, 250) + ' ...' : item.post_content.substring(0, 250) }} />
@@ -122,50 +133,7 @@ export default function Home() {
{/* END BLOG POST #1 */}
</div>
</div> {/* END POSTS WRAPPER */}
<div className="blog-post square-post">
<div className="row">
<div className="col">
{/* SQUARE BLOG POST WRAPPER */}
<div className="square-post-wrapper bg--black-400 block-shadow r-16 wow fadeInUp">
<div className="row d-flex align-items-center">
{/* BLOG POST TEXT */}
<div className="col-md-6 order-last order-md-2">
<div className="blog-post-txt color--white">
<h4 className="s-34 w-700 mb-20">
<Link href="/single-post">Lipsum sodales sapien Martex aliquet blandit
augue gravida posuere
</Link>
</h4>
{/* Text */}
<p>Aliqum mullam blandit vitae and tempor sapien and donec lipsum gravida porta
undo velna dolor libero risus aliquet tempus posuere vitae tempor
</p>
{/* Post Meta */}
<div className="blog-post-meta mt-30">
<ul className="post-meta-list ico-10">
<li><p className="w-500">MermsEmr Team</p></li>
<li className="meta-list-divider"><p><span className="flaticon-minus" /></p></li>
<li><p>Feb 12, 2023</p></li>
</ul>
</div>
</div>
</div>
{/* BLOG POST IMAGE */}
<div className="col-md-6 order-first order-md-2">
<div className="blog-post-img video-preview">
{/* Play Icon */}
<VideoPopup style={1}/>
{/* Preview Image */}
<img className="img-fluid" src="/images/blog/post-10-img.jpg" alt="video-preview" />
</div>
</div>
</div> {/* End row */}
</div> {/* END SQUARE BLOG POST WRAPPER */}
</div>
</div> {/* End row */}
</div> {/* END SQUARE BLOG POST */}
<MermsBlogFix />
</>
:
<div className="">
+159
View File
@@ -0,0 +1,159 @@
import { usePathname } from "next/navigation"
import { useRouter } from "next/router"
import VideoPopup from "../components/elements/VidepPopup"
import Layout from "../components/layout/Layout"
import Link from "next/link"
export default function Home() {
let {query} = useRouter()
return (
<>
<Layout headerStyle={1} footerStyle={3} headerCls="navbar-dark inner-page-header">
<div>
<section id="single-post" className="pb-90 inner-page-hero blog-page-section">
<div className="container">
<div className="row justify-content-center">
{/* SINGLE POST CONTENT */}
<div className="col-xl-10">
<div className="post-content">
{/* SINGLE POST TITLE */}
<div className="single-post-title text-center">
{/* Post Tag */}
{/* <span className="post-tag color--green-400">Community</span> */}
{/* Title */}
<h2 className="s-46 w-700">{query.post_title}</h2>
{/* Post Meta */}
<div className="blog-post-meta mt-35">
<ul className="post-meta-list ico-10">
<li><p className="w-500">MERMS </p></li>
<li className="meta-list-divider"><p><span className="flaticon-minus" /></p></li>
<li><p>{new Date(query?.post_date).toDateString()}</p></li>
</ul>
</div>
</div> {/* END SINGLE POST TITLE */}
{/* SINGLE POST IMAGE */}
<div className="blog-post-img py-50">
<img className="img-fluid r-16" src={`${query?.image_url}/${query.meta_value}`} alt="blog-post-image" />
</div>
{/* SINGLE POST TEXT */}
<p dangerouslySetInnerHTML={{ __html: query.post_content }} />
{/* END SINGLE POST TEXT */}
</div>
</div> {/* END SINGLE POST CONTENT */}
</div> {/* End row */}
</div> {/* End container */}
</section> {/* END SINGLE POST */}
{/* BLOG-1
============================================= */}
<section id="blog-1" className="bg--white-300 py-100 blog-section division">
<div className="container">
{/* SECTION TITLE */}
<div className="row justify-content-center">
<div className="col-md-10 col-lg-9">
<div className="section-title mb-70">
<h2 className="s-50 w-700">Recent Postings</h2>
</div>
</div>
</div>
<div className="row">
{/* BLOG POST #1 */}
<div className="col-md-6 col-lg-4">
<div id="bp-1-1" className="blog-post wow fadeInUp">
{/* BLOG POST IMAGE */}
<div className="blog-post-img mb-35">
<img className="img-fluid r-16" src="/images/blog/post-8-img.jpg" alt="blog-post-image" />
</div>
{/* BLOG POST TEXT */}
<div className="blog-post-txt">
{/* Post Tag */}
<span className="post-tag color--pink-400">Product News</span>
{/* Post Link */}
<h6 className="s-20 w-700">
<Link href="/single-post">Aliqum mullam porta blandit: tempor sapien and gravida</Link>
</h6>
{/* Text */}
<p>Egestas luctus vitae augue and ipsum ultrice quisque in cursus lacus feugiat congue
diam ultrice laoreet sagittis
</p>
{/* Post Meta */}
<div className="blog-post-meta mt-20">
<ul className="post-meta-list ico-10">
<li><p className="p-sm w-500">By Helen J.</p></li>
<li className="meta-list-divider"><p><span className="flaticon-minus" /></p></li>
<li><p className="p-sm">Apr 28, 2023</p></li>
</ul>
</div>
</div> {/* END BLOG POST TEXT */}
</div>
</div> {/* END BLOG POST #1 */}
{/* BLOG POST #2 */}
<div className="col-md-6 col-lg-4">
<div id="bp-1-2" className="blog-post wow fadeInUp">
{/* BLOG POST IMAGE */}
<div className="blog-post-img mb-35">
<img className="img-fluid r-16" src="/images/blog/post-2-img.jpg" alt="blog-post-image" />
</div>
{/* BLOG POST TEXT */}
<div className="blog-post-txt">
{/* Post Tag */}
<span className="post-tag color--green-400">Community</span>
{/* Post Link */}
<h6 className="s-20 w-700">
<Link href="/single-post">Porttitor cursus fusce egestas CEO cursus at magna sapien
suscipit and egestas ipsum
</Link>
</h6>
{/* Text */}
<p>Aliqum mullam ipsum vitae and blandit vitae tempor sapien and donec lipsum</p>
{/* Post Meta */}
<div className="blog-post-meta mt-20">
<ul className="post-meta-list ico-10">
<li><p className="p-sm w-500">By Martex Team</p></li>
<li className="meta-list-divider"><p><span className="flaticon-minus" /></p></li>
<li><p className="p-sm">Apr 14, 2023</p></li>
</ul>
</div>
</div> {/* END BLOG POST TEXT */}
</div>
</div> {/* END BLOG POST #2 */}
{/* BLOG POST #3 */}
<div className="col-md-12 col-lg-4">
<div id="bp-1-3" className="blog-post wow fadeInUp">
{/* BLOG POST IMAGE */}
<div className="blog-post-img mb-35">
<img className="img-fluid r-16" src="/images/blog/post-5-img.jpg" alt="blog-post-image" />
</div>
{/* BLOG POST TEXT */}
<div className="blog-post-txt">
{/* Post Tag */}
<span className="post-tag color--purple-400">Freelancer Tips</span>
{/* Post Link */}
<h6 className="s-20 w-700">
<Link href="/single-post">Cubilia laoreet augue egestas and Martex magna impedit</Link>
</h6>
{/* Text */}
<p>Luctus vitae egestas augue and ipsum ultrice quisque in cursus lacus feugiat egets
congue ultrice sagittis laoreet
</p>
{/* Post Meta */}
<div className="blog-post-meta mt-20">
<ul className="post-meta-list ico-10">
<li><p className="p-sm w-500">By Miranda Green</p></li>
<li className="meta-list-divider"><p><span className="flaticon-minus" /></p></li>
<li><p className="p-sm">Mar 27, 2023</p></li>
</ul>
</div>
</div> {/* END BLOG POST TEXT */}
</div>
</div> {/* END BLOG POST #3 */}
</div> {/* End row */}
</div> {/* End container */}
</section>
</div>
</Layout>
</>
)
}
+4 -134
View File
@@ -19,9 +19,9 @@ export default function Home() {
<div className="rel">
<span className="version-data">4.13.019</span>
<span className="release-date">2023-05-31 <span>68.91 MB</span></span>
<Link href="download/example.zip" download="example.zip" className="btn btn--theme hover--tra-grey ico-20 ico-left release-download">
<span className="flaticon-down-arrow-1" /> Download 4.13.019
</Link>
{/*<Link href="download/example.zip" download="example.zip" className="btn btn--theme hover--tra-grey ico-20 ico-left release-download">*/}
{/* <span className="flaticon-down-arrow-1" /> Download 4.13.019*/}
{/*</Link>*/}
</div>
</div>
{/* Release Highlights */}
@@ -35,137 +35,7 @@ export default function Home() {
</ul>
</div>
</div> {/* END VERSION RELEASE */}
{/* VERSION RELEASE */}
<div className="version-release">
{/* Release Data */}
<div className="release-data">
<h5 className="s-28 w-700">Older Versions</h5>
{/* Version Data */}
<div className="rel">
<span className="version-data">4.11.020</span>
<span className="release-date">2023-05-18 <span>62.46 MB</span></span>
<Link href="download/example.zip" download="example.zip" className="btn btn--tra-grey hover--theme ico-20 ico-left release-download">
<span className="flaticon-down-arrow-1" /> Download 4.11.020
</Link>
</div>
</div>
{/* Release Highlights */}
<div className="release-highlights">
<ul className="simple-list">
<li className="list-item">
<p>Quaerat sodales sapien undo euismod purus and blandit egestas magna on macOS 10.12.*</p>
</li>
<li className="list-item">
<p>Fixed suscipit lectus auctor integer cursus orci vitae auctor integer</p>
</li>
<li className="list-item">
<p>Fixed Fringilla risus nec, luctus mauris auctor integer an auctor cursus euismod</p>
</li>
<li className="list-item"><p>Fixed Crash#8341682687</p></li>
</ul>
</div>
</div> {/* END VERSION RELEASE */}
{/* VERSION RELEASE */}
<div className="version-release">
{/* Release Data */}
<div className="release-data">
{/* Version Data */}
<div className="rel">
<span className="version-data">4.08.106</span>
<span className="release-date">2023-04-12 <span>58.83 MB</span></span>
<Link href="download/example.zip" download="example.zip" className="btn btn--tra-grey hover--theme ico-20 ico-left release-download">
<span className="flaticon-down-arrow-1" /> Download 4.08.106
</Link>
</div>
</div>
{/* Release Highlights */}
<div className="release-highlights">
<ul className="simple-list">
<li className="list-item">
<p>Quaerat sodales sapien undo euismod magna on 10.12 (Sierra)</p>
</li>
<li className="list-item">
<p>Fixed suscipit lectus auctor integer cursus orci vitae auctor integer</p>
</li>
<li className="list-item">
<p>Fixed risus nec luctus mauris auctor integer an integera congue magna</p>
</li>
<li className="list-item">
<p>Fixed cubilia laoreet magna at auctor integer congue egestas</p>
</li>
<li className="list-item">
<p>Fringilla risus nec, luctus mauris auctor integer an auctor cursus euismod purus
pretium efficitur ipsum ligula undo cubilia laoreet magna and dolor suscipit
</p>
</li>
<li className="list-item">
<p>Fixes other minor bugs</p>
</li>
</ul>
</div>
</div> {/* END VERSION RELEASE */}
{/* VERSION RELEASE */}
<div className="version-release">
{/* Release Data */}
<div className="release-data">
{/* Version Data */}
<div className="rel">
<span className="version-data">4.0.018</span>
<span className="release-date">2023-02-26 <span>64.95 MB</span></span>
<Link href="download/example.zip" download="example.zip" className="btn btn--tra-grey hover--theme ico-20 ico-left release-download">
<span className="flaticon-down-arrow-1" /> Download 4.0.018
</Link>
</div>
</div>
{/* Release Highlights */}
<div className="release-highlights">
<ul className="simple-list">
<li className="list-item">
<p>Fixes integer cursus orci bugs on 10.13 (High Sierra)</p>
</li>
<li className="list-item">
<p>Fixed auctor integer cursus orci vitae auctor integer</p>
</li>
<li className="list-item">
<p>Fixed Crash#8341689840</p>
</li>
<li className="list-item">
<p>Fixes other minor bugs</p>
</li>
</ul>
</div>
</div> {/* END VERSION RELEASE */}
{/* VERSION RELEASE */}
<div className="version-release">
{/* Release Data */}
<div className="release-data">
{/* Version Data */}
<div className="rel">
<span className="version-data">3.76.231</span>
<span className="release-date">2022-12-08 <span>57.39 MB</span></span>
<Link href="download/example.zip" download="example.zip" className="btn btn--tra-grey hover--theme ico-20 ico-left release-download">
<span className="flaticon-down-arrow-1" /> Download 3.76.231
</Link>
</div>
</div>
{/* Release Highlights */}
<div className="release-highlights">
<ul className="simple-list">
<li className="list-item">
<p>Quaerat sodales sapien undo euismod magna on 10.12 (Sierra)</p>
</li>
<li className="list-item">
<p>Fixed suscipit lectus auctor integer cursus orci vitae auctor integer</p>
</li>
<li className="list-item">
<p>Fixes integer cursus orci bugs on 10.13 (High Sierra)</p>
</li>
<li className="list-item">
<p>Fixed auctor integer cursus orci vitae auctor integer</p>
</li>
</ul>
</div>
</div> {/* END VERSION RELEASE */}
</div>
</div> {/* End row */}
</div> {/* End container */}
Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 106 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 181 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 194 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 138 KiB