Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions .github/workflows/jira-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Jira Integration

on:
issues:
types: [opened, closed]

jobs:
jira-integration:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Create Jira Issue
if: github.event.action == 'opened'
uses: atlassian/gajira-create-issue@v3
with:
issueType: '10001' # Story
projectKey: 'DASOMFE'
summary: ${{ github.event.issue.title }}
description: |
GitHub Issue: ${{ github.event.issue.html_url }}

${{ github.event.issue.body }}
fields: |
{
"customfield_10014": "${{ github.event.issue.number }}"
}
env:
JIRA_URL: ${{ secrets.JIRA_URL }}
JIRA_EMAIL: ${{ secrets.JIRA_EMAIL }}
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}

- name: Close Jira Issue
if: github.event.action == 'closed'
uses: atlassian/gajira-transition-issue@v3
with:
issueKey: DASOMFE-${{ github.event.issue.number }}
transition: 'Done'
env:
JIRA_URL: ${{ secrets.JIRA_URL }}
JIRA_EMAIL: ${{ secrets.JIRA_EMAIL }}
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TO KEN }}
13 changes: 13 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"semi": false,
"trailingComma": "es5",
"singleQuote": true,
"printWidth": 80,
"tabWidth": 2,
"useTabs": false,
"bracketSpacing": true,
"bracketSameLine": false,
"arrowParens": "avoid",
"endOfLine": "lf",
"jsxSingleQuote": true
}
159 changes: 115 additions & 44 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import React from 'react'
import './assets/styles/index.css'
import { BrowserRouter as Router, Routes, Route, useLocation } from 'react-router-dom'
import {
BrowserRouter as Router,
Routes,
Route,
useLocation,
} from 'react-router-dom'
import Main from './pages/Main'
import AdminMain from './pages/admin/AdminMain'
import Login from './pages/Login'
Expand Down Expand Up @@ -30,54 +35,120 @@ import ProtectedRoute from './components/layout/ProtectRoute'
import SomkatonApplicants from './pages/admin/SomkatonApplicants'

function App() {
return (
<div className='App'>
<Router>
<AppContent />
</Router>
</div>
)
return (
<div className='App'>
<Router>
<AppContent />
</Router>
</div>
)
}

function AppContent() {
const location = useLocation()
const hideHeader = ['/login'] // 헤더를 숨길 페이지
const location = useLocation()
const hideHeader = ['/login'] // 헤더를 숨길 페이지

return (
<>
{/* 지정한 페이지 header 숨기기 */}
{!hideHeader.includes(location.pathname) && <Header />}
<Routes>
<Route path='/' element={<Main />} />
<Route path='/login' element={<Login />} />
<Route path='/usermain' element={<UserMain />} />
<Route path='/news' element={<News />} />
<Route path='/news/:no' element={<NewsInfo />} />
<Route path='/coremember' element={<CoreMembers />} />
<Route path='/faq' element={<FAQ />} />
<Route path='/recruit' element={<Recruit />} />
<Route path='/recruit/submit' element={<RecruitSubmit />} />
<Route path='/recruit/result' element={<RecruitResult />} />
<Route path='/recruit/check' element={<RecruitCheck />} />
<Route path='/recruit/check/final' element={<RecruitCheckFinal />} />
<Route path='/recruit/meeting' element={<RecruitMeeting />} />
<Route path='/recruit/meeting/submit' element={<RecruitSubmitMeeting />} />
<Route path='/somkathon' element={<SomkathonRecruit />} />
<Route path='/somkathon/submit' element={<SomkathonSubmit />} />
return (
<>
{/* 지정한 페이지 header 숨기기 */}
{!hideHeader.includes(location.pathname) && <Header />}
<Routes>
<Route path='/' element={<Main />} />
<Route path='/login' element={<Login />} />
<Route path='/usermain' element={<UserMain />} />
<Route path='/news' element={<News />} />
<Route path='/news/:no' element={<NewsInfo />} />
<Route path='/coremember' element={<CoreMembers />} />
<Route path='/faq' element={<FAQ />} />
<Route path='/recruit' element={<Recruit />} />
<Route path='/recruit/submit' element={<RecruitSubmit />} />
<Route path='/recruit/result' element={<RecruitResult />} />
<Route path='/recruit/check' element={<RecruitCheck />} />
<Route path='/recruit/check/final' element={<RecruitCheckFinal />} />
<Route path='/recruit/meeting' element={<RecruitMeeting />} />
<Route
path='/recruit/meeting/submit'
element={<RecruitSubmitMeeting />}
/>
<Route path='/somkathon' element={<SomkathonRecruit />} />
<Route path='/somkathon/submit' element={<SomkathonSubmit />} />

{/* 관리자 페이지 */}
<Route path='/admin' element={<ProtectedRoute><AdminMain /></ProtectedRoute>} />
<Route path='/admin/applicants' element={<ProtectedRoute><ManApplicants /></ProtectedRoute>} />
<Route path='/admin/applicants/interviewee' element={<ProtectedRoute><ManInterviewee /></ProtectedRoute>} />
<Route path='/admin/date' element={<ProtectedRoute><ManRecruitDate /></ProtectedRoute>} />
<Route path='/admin/news' element={<ProtectedRoute><ManNewsList /></ProtectedRoute>} />
<Route path='/admin/news/:no' element={<ProtectedRoute><ManNewsDetail /></ProtectedRoute>} />
<Route path='/admin/news/post' element={<ProtectedRoute><ManNewsPost /></ProtectedRoute>} />
<Route path='/admin/news/edit/:no' element={<ProtectedRoute><ManNewsEdit /></ProtectedRoute>} />
<Route path='/admin/somkathon' element={<ProtectedRoute><SomkatonApplicants/></ProtectedRoute>}/>
</Routes>
</>
)
{/* 관리자 페이지 */}
<Route
path='/admin'
element={
<ProtectedRoute>
<AdminMain />
</ProtectedRoute>
}
/>
<Route
path='/admin/applicants'
element={
<ProtectedRoute>
<ManApplicants />
</ProtectedRoute>
}
/>
<Route
path='/admin/applicants/interviewee'
element={
<ProtectedRoute>
<ManInterviewee />
</ProtectedRoute>
}
/>
<Route
path='/admin/date'
element={
<ProtectedRoute>
<ManRecruitDate />
</ProtectedRoute>
}
/>
<Route
path='/admin/news'
element={
<ProtectedRoute>
<ManNewsList />
</ProtectedRoute>
}
/>
<Route
path='/admin/news/:no'
element={
<ProtectedRoute>
<ManNewsDetail />
</ProtectedRoute>
}
/>
<Route
path='/admin/news/post'
element={
<ProtectedRoute>
<ManNewsPost />
</ProtectedRoute>
}
/>
<Route
path='/admin/news/edit/:no'
element={
<ProtectedRoute>
<ManNewsEdit />
</ProtectedRoute>
}
/>
<Route
path='/admin/somkathon'
element={
<ProtectedRoute>
<SomkatonApplicants />
</ProtectedRoute>
}
/>
</Routes>
</>
)
}

export default App
Loading