-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* refactor: 이미지에 width와 Height 설정 * refactor: 검색창에 aria-label 추가 * design: 에러 페이지 디자인 수정 * test: Calendar에 props 추가 * refactor: loading 이미지 크기 설정 * refactor: 지원하지 않는 파일 제거 * chore: msw logout 기능 수정 * refactor: reminder 카드 클릭시 상세보기로 이동 * refactor: 테스트를 위한 aria-label 작성 * test: reminder cypress 테스트 작성 * test: 되지 않는 테스트 주석처리 * feat: 리마인더에 데이터가 없을 경우 바로가기 추가 * refactor: font missing glyphs 해결 * chore: seo 설정 * style: 오타 수정 * style: html text와 중복되는 aria-label 제거 * refactor: generateSiteMap 위치 수정 * chore: 폰트 라이센스 적용 및 이름 변경 * feat: 의견 남기기 기능 추가 * chore: font file name 변경 적용
- Loading branch information
1 parent
fc594eb
commit 0cae357
Showing
41 changed files
with
395 additions
and
85 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| import { convertDateKorYear } from 'utils/date'; | ||
| import login from '../utils/login'; | ||
|
|
||
| describe('리마인더 테스트', () => { | ||
| beforeEach(() => { | ||
| login(); | ||
| cy.visit('/reminder'); | ||
| }); | ||
|
|
||
| it('리마인더 페이지로 이동할 수 있다.', () => { | ||
| cy.visit('/'); | ||
|
|
||
| cy.get('a').contains('리마인더').click().location('pathname').should('equal', '/reminder'); | ||
| }); | ||
|
|
||
| it('내 반려 식물 상세보기로 이동할 수 있다.', () => { | ||
| cy.get('a[aria-label="참새 나무 상세로 이동"]') | ||
| .click() | ||
| .location('pathname') | ||
| .should('equal', '/pet/1'); | ||
| }); | ||
|
|
||
| it('물 주기 등록을 할 수 있다.', () => { | ||
| const today = convertDateKorYear(new Date()); | ||
| cy.get('div[aria-label="참새 나무의 정보"]') | ||
| .find('button[aria-label="물 준 날짜 선택"]') | ||
| .click() | ||
| .get('div[aria-label="달력"') | ||
| .should('be.visible') | ||
| .get(`span[aria-label="${today}"]`) | ||
| .click() | ||
|
|
||
| .get('#toast-root') | ||
| .contains('물주기 완료'); | ||
| }); | ||
|
|
||
| it('물 주기 날짜를 다음달 1일로 변경할 수 있다.', () => { | ||
| const curMonth = new Date().getMonth(); | ||
| const nextMonth = curMonth === 11 ? 1 : curMonth + 2; | ||
| cy.get('div[aria-label="참새 나무의 정보"]') | ||
| .find('button[aria-label="알림을 줄 날짜 선택"]') | ||
| .click() | ||
| .get('div[aria-label="달력"') | ||
| .should('be.visible') | ||
| .get(`button[aria-label="다음 달 보기"]`) | ||
| .click() | ||
|
|
||
| .get('section[aria-live="assertive"]') | ||
| .find('span') | ||
| .contains(1) | ||
| .click() | ||
|
|
||
| .get('#toast-root') | ||
| .contains('01일로 물주기 날짜 변경') | ||
|
|
||
| .get(`section[aria-label="${Number(nextMonth)}월의 리마인더 정보"]`) | ||
| .find('div[aria-label="참새 나무의 정보"]') | ||
| .siblings('div[aria-label="01일"]') | ||
| .should('be.visible'); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* eslint-disable no-undef */ | ||
| /* eslint-disable @typescript-eslint/no-var-requires */ | ||
| const fs = require('fs'); | ||
|
|
||
| const prettier = require('prettier'); | ||
|
|
||
| const SitemapGeneratedDate = new Date().toISOString(); | ||
| const DOMAIN = 'https://pium.life.com'; | ||
|
|
||
| const formatting = (target) => prettier.format(target, { parser: 'html' }); | ||
|
|
||
| const pages = ['/', '/login', '/garden', '/dict', '/dict/:id', '/dict/new-plant-request'].map( | ||
| (page) => DOMAIN + page | ||
| ); | ||
|
|
||
| const pageSitemap = pages | ||
| .map( | ||
| (page) => ` | ||
| <url> | ||
| <loc>${page}</loc> | ||
| <lastmod>${SitemapGeneratedDate}</lastmod> | ||
| </url> | ||
| ` | ||
| ) | ||
| .join(''); | ||
|
|
||
| const generateSiteMap = ` | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <urlset | ||
| xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"> | ||
| ${pageSitemap} | ||
| </urlset>`; | ||
|
|
||
| const formattedSitemap = formatting(generateSiteMap); | ||
|
|
||
| fs.writeFileSync('public/seo/sitemap.xml', formattedSitemap, 'utf8'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| @font-face { | ||
| font-family: 'NanumSquareRound'; | ||
| font-weight: 500; | ||
| font-style: normal; | ||
| font-display: swap; | ||
| src: url('/fonts/NanumSquareRoundMissingGlyph.woff2') format('woff2'); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| # * | ||
| User-agent: * | ||
| Disallow: /404 | ||
|
|
||
| # * | ||
| User-agent: * | ||
| Allow: / | ||
|
|
||
| # Host | ||
| Host: https://pium.life/ | ||
|
|
||
| # Sitemaps | ||
| Sitemap: https://pium.life/sitemap.xml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <urlset | ||
| xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" | ||
| > | ||
| <url> | ||
| <loc>https://pium.life.com/</loc> | ||
| <lastmod>2023-09-20T03:44:49.995Z</lastmod> | ||
| </url> | ||
|
|
||
| <url> | ||
| <loc>https://pium.life.com/login</loc> | ||
| <lastmod>2023-09-20T03:44:49.995Z</lastmod> | ||
| </url> | ||
|
|
||
| <url> | ||
| <loc>https://pium.life.com/garden</loc> | ||
| <lastmod>2023-09-20T03:44:49.995Z</lastmod> | ||
| </url> | ||
|
|
||
| <url> | ||
| <loc>https://pium.life.com/dict</loc> | ||
| <lastmod>2023-09-20T03:44:49.995Z</lastmod> | ||
| </url> | ||
|
|
||
| <url> | ||
| <loc>https://pium.life.com/dict/:id</loc> | ||
| <lastmod>2023-09-20T03:44:49.995Z</lastmod> | ||
| </url> | ||
|
|
||
| <url> | ||
| <loc>https://pium.life.com/dict/new-plant-request</loc> | ||
| <lastmod>2023-09-20T03:44:49.995Z</lastmod> | ||
| </url> | ||
| </urlset> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.