Skip to content

Commit

Permalink
Refactor GitHub Actions workflow and enhance Canvas component
Browse files Browse the repository at this point in the history 
- Updated the GitHub Actions workflow to include a new job for merging the master branch into the nphdigital.vn branch before deployment.
- Improved deployment scripts for both nphdigital.com and nphdigital.vn, ensuring correct branch handling and error management.
- Refactored the Canvas component for better readability and consistency in JSX formatting, while maintaining existing functionality.
- Updated contact information in the Canvas component to ensure accuracy and consistency across the application.
  • Loading branch information
@Tedydev-web
Tedydev-web committed Jan 15, 2025
1 parent ae7f5a6 commit b316867
Show file tree
Hide file tree
Showing 3 changed files with 453 additions and 462 deletions.
52 changes: 47 additions & 5 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,33 @@
name: NPH Digital Deplotment
name: NPH Digital Deployment

on:
push:
branches: [master]
branches:
- master
- nphdigital.vn

jobs:
deploy:
merge-to-vn:
if: github.ref == 'refs/heads/master'
runs-on: ubuntu-latest
steps:
- name: Deploy using ssh
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Merge master -> nphdigital.vn
run: |
git config --global user.name 'GitHub Actions'
git config --global user.email 'actions@github.com'
git checkout nphdigital.vn
git merge origin/master -m "Auto-merge master into nphdigital.vn"
git push origin nphdigital.vn
deploy-com:
if: github.ref == 'refs/heads/master'
runs-on: ubuntu-latest
needs: merge-to-vn
steps:
- name: Deploy to nphdigital.com
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.HOST }}
Expand All @@ -20,11 +39,34 @@ jobs:
echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S -v
if [ $? -eq 0 ]; then
echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S git pull origin master
# echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S npm install
echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S npm run build
pm2 reload 0
pm2 restart 0
else
echo "Mật khẩu sudo không chính xác."
exit 1
fi
deploy-vn:
if: github.ref == 'refs/heads/nphdigital.vn'
runs-on: ubuntu-latest
steps:
- name: Deploy to nphdigital.vn
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.HOST }}
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}
port: 22
script: |
cd /var/www/nphdigital/nphdigital.vn/nphdigitalvn
echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S -v
if [ $? -eq 0 ]; then
echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S git pull origin nphdigital.vn
echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S npm run build
pm2 reload 1
pm2 restart 1
else
echo "Mật khẩu sudo không chính xác."
exit 1
fi
263 changes: 135 additions & 128 deletions src/components/canvas/Canvas.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,134 +85,141 @@ const Canvas = ({ bladeMode = '', ofCanvasArea }) => {
};

return (
<>
<div
className="offcanvas__area"
ref={ofCanvasArea}>
<div className="offcanvas__body">
<div className="offcanvas__left">
<div className="offcanvas__logo">
<Link href="https://nphdigital.com/">
<Image
priority
style={{ width: '200px', height: 'auto' }}
src={logoWhite2}
alt="Offcanvas Logo"
/>
</Link>
</div>
<div className="offcanvas__social">
<h3 className="social-title">{t('canvas.title')}</h3>
<ul>
<li>
<a href="https://zalo.me/2599746016148700210?src=qr&f=1">{t('canvas.social.zalo')}</a>
</li>
<li>
<a href="https://www.facebook.com/nphdigital838">{t('canvas.social.facebook')}</a>
</li>
<li>
<a href="https://t.me/Nphdigital">{t('canvas.social.telegram')}</a>
</li>
</ul>
</div>
</div>
<div className="offcanvas__mid">
<div className="offcanvas__menu-wrapper">
<nav className="offcanvas__menu">
<ul
className="menu-anim title"
ref={menu}>
<li>
<div className="header_title">
<Link
href={'https://nphdigital.com/'}
onClick={(e) => handleLinkClick(e, 'https://nphdigital.com/')}>
{t('canvas.menu.home')}
</Link>
</div>
</li>
<li>
<div className="header_title">
<Link
href={'/gioi-thieu'}
onClick={(e) => handleLinkClick(e, '/gioi-thieu')}>
{t('canvas.menu.about')}
</Link>
</div>
</li>
<li>
<div className="header_title d-flex">
<Link
href={'/dich-vu'}
onClick={(e) => handleLinkClick(e, '/dich-vu')}>
{t('canvas.menu.service')}
</Link>
</div>
</li>
<li>
<div className="header_title">
<Link
href={'/bai-viet'}
onClick={(e) => handleLinkClick(e, '/bai-viet')}>
{t('canvas.menu.blog')}
</Link>
</div>
</li>
<li>
<div className="header_title">
<Link
href={'/lien-he'}
onClick={(e) => handleLinkClick(e, '/lien-he')}>
{t('canvas.menu.contact')}
</Link>
</div>
</li>
</ul>
</nav>
</div>
</div>
<div className="offcanvas__right">
<div className="offcanvas__search">
<SwitcherLang />
</div>
<div className="offcanvas__contact">
<h3>{t('canvas.contact.title')}</h3>
<ul>
<li>
<a href="tel:02094980547">+(84) - 1900088883</a>
</li>
<li>
<a href="mailto:info@extradesign.com">hi@nphdigital.com</a>
</li>
<li>{t('canvas.contact.address')}</li>
</ul>
</div>
<Image
priority
style={{ width: 'auto', height: 'auto' }}
src={Shape11}
alt="shape"
className="shape-1"
/>
<Image
priority
style={{ width: 'auto', height: 'auto' }}
src={Shape12}
alt="shape"
className="shape-2"
/>
</div>
<div className="offcanvas__close">
<button
type="button"
onClick={closeCanvas}>
<FontAwesomeIcon icon={faXmark} />
</button>
</div>
</div>
</div>
</>
);
<>
<div className="offcanvas__area" ref={ofCanvasArea}>
<div className="offcanvas__body">
<div className="offcanvas__left">
<div className="offcanvas__logo">
<Link href="https://nphdigital.com/">
<Image
priority
style={{ width: "200px", height: "auto" }}
src={logoWhite2}
alt="Offcanvas Logo"
/>
</Link>
</div>
<div className="offcanvas__social">
<h3 className="social-title">{t("canvas.title")}</h3>
<ul>
<li>
<a href="https://zalo.me/2599746016148700210?src=qr&f=1">
{t("canvas.social.zalo")}
</a>
</li>
<li>
<a href="https://www.facebook.com/nphdigital838">
{t("canvas.social.facebook")}
</a>
</li>
<li>
<a href="https://t.me/Nphdigital">
{t("canvas.social.telegram")}
</a>
</li>
</ul>
</div>
</div>
<div className="offcanvas__mid">
<div className="offcanvas__menu-wrapper">
<nav className="offcanvas__menu">
<ul className="menu-anim title" ref={menu}>
<li>
<div className="header_title">
<Link
href={"https://nphdigital.com/"}
onClick={(e) =>
handleLinkClick(e, "https://nphdigital.com/")
}
>
{t("canvas.menu.home")}
</Link>
</div>
</li>
<li>
<div className="header_title">
<Link
href={"/gioi-thieu"}
onClick={(e) => handleLinkClick(e, "/gioi-thieu")}
>
{t("canvas.menu.about")}
</Link>
</div>
</li>
<li>
<div className="header_title d-flex">
<Link
href={"/dich-vu"}
onClick={(e) => handleLinkClick(e, "/dich-vu")}
>
{t("canvas.menu.service")}
</Link>
</div>
</li>
<li>
<div className="header_title">
<Link
href={"/bai-viet"}
onClick={(e) => handleLinkClick(e, "/bai-viet")}
>
{t("canvas.menu.blog")}
</Link>
</div>
</li>
<li>
<div className="header_title">
<Link
href={"/lien-he"}
onClick={(e) => handleLinkClick(e, "/lien-he")}
>
{t("canvas.menu.contact")}
</Link>
</div>
</li>
</ul>
</nav>
</div>
</div>
<div className="offcanvas__right">
<div className="offcanvas__search">
<SwitcherLang />
</div>
<div className="offcanvas__contact">
<h3>{t("canvas.contact.title")}</h3>
<ul>
<li>
<a href="tel:02094980547">1900088883</a>
</li>
<li>
<a href="mailto:info@extradesign.com">hi@nphdigital.com</a>
</li>
<li>{t("canvas.contact.address")}</li>
</ul>
</div>
<Image
priority
style={{ width: "auto", height: "auto" }}
src={Shape11}
alt="shape"
className="shape-1"
/>
<Image
priority
style={{ width: "auto", height: "auto" }}
src={Shape12}
alt="shape"
className="shape-2"
/>
</div>
<div className="offcanvas__close">
<button type="button" onClick={closeCanvas}>
<FontAwesomeIcon icon={faXmark} />
</button>
</div>
</div>
</div>
</>
);
};

export default Canvas;
Loading

0 comments on commit b316867

Please sign in to comment.