Skip to content

Commit

Permalink
Merge pull request #232 from WE-ARE-RACCOONS/develop
Browse files Browse the repository at this point in the history
리뷰 폼 연결 main에 반영
  • Loading branch information
leehyewon0531 authored Apr 18, 2024
2 parents 1608865 + ac7b7e1 commit cbec570
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/app/senior/edit-profile/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ function EditProfilePage() {
if (!tempFields.includes(el)) tempFields.push(el);
});

setTimeData(res.data.times ? res.data.times: []);
setTimeData(res.data.times ? res.data.times : []);
setTotalField(tempFields);
setSelectedField(res.data.field);
setTotalKeyword(res.data.keyword);
Expand Down Expand Up @@ -419,7 +419,7 @@ function EditProfilePage() {
)}
</div>
<SetDataBox>
{(timeData && timeData.length > 0) ? (
{timeData && timeData.length > 0 ? (
<>
{timeData &&
timeData.map((el, idx) => (
Expand Down
7 changes: 7 additions & 0 deletions src/components/Bar/TapBar/JuniorTab/JTabBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import FullModal from '@/components/Modal/FullModal';
import { useRouter } from 'next/navigation';
import findExCode from '@/utils/findExCode';
import { JMCancelAtom } from '@/stores/condition';
import { REVIEW_FORM_URL } from '@/constants/form/reviewForm';

function convertDateType(date: string) {
if (!date) return new Date();
Expand Down Expand Up @@ -185,6 +186,12 @@ function TabBar() {
onClick={() => {
setModalType('junior');
setSelectedMentoringId(el.mentoringId);
if (typeof window !== undefined)
window.open(
REVIEW_FORM_URL,
'_blank',
'noopener, noreferrer',
);
}}
/>
)}
Expand Down
4 changes: 2 additions & 2 deletions src/components/GA/GA.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Script from "next/script";
import Script from 'next/script';

const GoogleAnalytics = () => (
<>
Expand All @@ -21,4 +21,4 @@ const GoogleAnalytics = () => (
></Script>
</>
);
export default GoogleAnalytics;
export default GoogleAnalytics;
1 change: 1 addition & 0 deletions src/constants/form/reviewForm.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const REVIEW_FORM_URL = 'https://tally.so/r/wa6WW9';

0 comments on commit cbec570

Please sign in to comment.