Skip to content

Commit 29e4a0d

Browse files
authored
Merge branch 'develop' into feat/#92/todoBox
2 parents ef20480 + aade309 commit 29e4a0d

29 files changed

+631
-47
lines changed

public/svg/ic_streaker_dot.svg

Lines changed: 33 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

public/svg/ic_tomorrow.svg

Lines changed: 3 additions & 0 deletions
Loading

public/svg/ic_yesterday.svg

Lines changed: 3 additions & 0 deletions
Loading

src/assets/svg/IcStreakerDot.tsx

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
import type { SVGProps } from 'react';
2+
const SvgIcStreakerDot = (props: SVGProps<SVGSVGElement>) => (
3+
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 36 36" {...props}>
4+
<g filter="url(#ic_streaker_dot_svg__a)">
5+
<rect width={36} height={36} fill="url(#ic_streaker_dot_svg__b)" rx={18} />
6+
<foreignObject width={44} height={44} x={-4} y={-4}>
7+
<div
8+
style={{
9+
backdropFilter: 'blur(2px)',
10+
clipPath: 'url(#ic_streaker_dot_svg__c)',
11+
height: '100%',
12+
width: '100%',
13+
}}
14+
/>
15+
</foreignObject>
16+
<rect
17+
width={36}
18+
height={36}
19+
fill="url(#ic_streaker_dot_svg__d)"
20+
fillOpacity={0.1}
21+
data-figma-bg-blur-radius={4}
22+
rx={18}
23+
/>
24+
</g>
25+
<defs>
26+
<linearGradient
27+
id="ic_streaker_dot_svg__b"
28+
x1={18}
29+
x2={18}
30+
y1={0}
31+
y2={36}
32+
gradientUnits="userSpaceOnUse"
33+
>
34+
<stop stopColor="#3E72F3" />
35+
<stop offset={1} stopColor="#C3D9FF" />
36+
</linearGradient>
37+
<linearGradient
38+
id="ic_streaker_dot_svg__d"
39+
x1={18}
40+
x2={18}
41+
y1={0}
42+
y2={36}
43+
gradientUnits="userSpaceOnUse"
44+
>
45+
<stop stopColor="#508FFF" />
46+
<stop offset={1} stopColor="#8AB4FF" />
47+
</linearGradient>
48+
<clipPath id="ic_streaker_dot_svg__c" transform="translate(4 4)">
49+
<rect width={36} height={36} rx={18} />
50+
</clipPath>
51+
<filter
52+
id="ic_streaker_dot_svg__a"
53+
width={45.6}
54+
height={45.6}
55+
x={-4.8}
56+
y={-4.8}
57+
colorInterpolationFilters="sRGB"
58+
filterUnits="userSpaceOnUse"
59+
>
60+
<feFlood floodOpacity={0} result="BackgroundImageFix" />
61+
<feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
62+
<feColorMatrix
63+
in="SourceAlpha"
64+
result="hardAlpha"
65+
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
66+
/>
67+
<feOffset dx={-2.4} dy={2.4} />
68+
<feGaussianBlur stdDeviation={1.2} />
69+
<feComposite in2="hardAlpha" k2={-1} k3={1} operator="arithmetic" />
70+
<feColorMatrix values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.1 0" />
71+
<feBlend in2="shape" result="effect1_innerShadow_1979_1516" />
72+
<feColorMatrix
73+
in="SourceAlpha"
74+
result="hardAlpha"
75+
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
76+
/>
77+
<feOffset dx={2.4} dy={-2.4} />
78+
<feGaussianBlur stdDeviation={1.2} />
79+
<feComposite in2="hardAlpha" k2={-1} k3={1} operator="arithmetic" />
80+
<feColorMatrix values="0 0 0 0 0.582788 0 0 0 0 0.76 0 0 0 0 0.674348 0 0 0 0.1 0" />
81+
<feBlend in2="effect1_innerShadow_1979_1516" result="effect2_innerShadow_1979_1516" />
82+
</filter>
83+
</defs>
84+
</svg>
85+
);
86+
export default SvgIcStreakerDot;
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import type { SVGProps } from 'react';
2+
const SvgIcStreakerDotDefault = (props: SVGProps<SVGSVGElement>) => (
3+
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 36 36" {...props}>
4+
<rect width={36} height={36} fill="#282C33" rx={18} />
5+
</svg>
6+
);
7+
export default SvgIcStreakerDotDefault;

src/assets/svg/IcTomorrow.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import type { SVGProps } from 'react';
2+
const SvgIcTomorrow = (props: SVGProps<SVGSVGElement>) => (
3+
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 28 28" {...props}>
4+
<path d="M10.5 22.165 18.667 14 10.5 5.832" />
5+
</svg>
6+
);
7+
export default SvgIcTomorrow;

src/assets/svg/IcYesterday.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import type { SVGProps } from 'react';
2+
const SvgIcYesterday = (props: SVGProps<SVGSVGElement>) => (
3+
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 28 28" {...props}>
4+
<path d="M17.5 22.165 9.333 14 17.5 5.832" />
5+
</svg>
6+
);
7+
export default SvgIcYesterday;

src/assets/svg/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ export { default as IcPencil } from './IcPencil';
99
export { default as IcRadioChecked } from './IcRadioChecked';
1010
export { default as IcRadioDefault } from './IcRadioDefault';
1111
export { default as IcSmallTextdelete } from './IcSmallTextdelete';
12+
export { default as IcStreakerDot } from './IcStreakerDot';
13+
export { default as IcStreakerDotDefault } from './IcStreakerDotDefault';
1214
export { default as IcTextdelete } from './IcTextdelete';
15+
export { default as IcTomorrow } from './IcTomorrow';
1316
export { default as IcTooltipDelete } from './IcTooltipDelete';
1417
export { default as IcTriangle } from './IcTriangle';
18+
export { default as IcYesterday } from './IcYesterday';
1519
export { default as Vite } from './Vite';

src/common/util/format.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,26 @@ export function formatBirthDate(value: string): string {
88
}
99
return `${digits.slice(0, 4)}-${digits.slice(4, 6)}-${digits.slice(6)}`;
1010
}
11+
12+
export function formatDateDot(date: Date): string {
13+
const year = date.getFullYear();
14+
const month = String(date.getMonth() + 1).padStart(2, '0');
15+
const day = String(date.getDate()).padStart(2, '0');
16+
return `${year}.${month}.${day}`;
17+
}
18+
19+
export function createDate(year: number, month: number, day: number): Date {
20+
return new Date(year, month - 1, day);
21+
}
22+
23+
export function getYesterday(date: Date): Date {
24+
const yesterday = new Date(date);
25+
yesterday.setDate(yesterday.getDate() - 1);
26+
return yesterday;
27+
}
28+
29+
export function getTomorrow(date: Date): Date {
30+
const tomorrow = new Date(date);
31+
tomorrow.setDate(tomorrow.getDate() + 1);
32+
return tomorrow;
33+
}

0 commit comments

Comments
 (0)