Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Refactor] 글씨체 적용, 워크스페이스 직원 추가 조건 설정, 안내 문구 추가 #71

Merged
merged 5 commits into from
Jun 13, 2024
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
9 changes: 9 additions & 0 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,19 @@ onMounted(() => {
</script>

<style>

@font-face {
font-family: 'Pretendard-Regular';
src: url('https://fastly.jsdelivr.net/gh/Project-Noonnu/[email protected]/Pretendard-Regular.woff') format('woff');
font-weight: 400;
font-style: normal;
}

#app {
display: flex;
flex-direction: column;
height: 100vh;
font-family: 'Pretendard-Regular';
}

header {
Expand Down
2 changes: 1 addition & 1 deletion src/components/post/CreateNewGeneralPost.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>

<p id="content-info">
<small>※ 마우스 오른쪽 버튼 클릭 시, 파일 업로드가 가능합니다.</small>
<small class="text-muted">※ 마우스 오른쪽 버튼 클릭 시, 파일 업로드가 가능합니다.</small>
<span><b-button variant="outline-secondary" data-bs-toggle="modal"
data-bs-target="#preview">미리보기</b-button></span>

Expand Down
5 changes: 3 additions & 2 deletions src/components/post/CreateNewPost.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</div>

<p id="content-info">
<small>※ 마우스 오른쪽 버튼 클릭 시, 파일 업로드가 가능합니다.</small>
<small class="text-muted">※ 마우스 오른쪽 버튼 클릭 시, 파일 업로드가 가능합니다.</small>

<div>
<span>
Expand Down Expand Up @@ -82,7 +82,7 @@
<b-badge class="ai-menu" @click="requestToAI($event)">맞춤법 교정</b-badge>
</p>
<div id="ai-content" class="card">
<p><span class="material-icons">info</span>&nbsp;<small>응답 메시지 박스 클릭 시, 내용 복사</small>
<p>&nbsp;<small>응답 메시지 박스 클릭 시, 내용 복사</small>
</p>

</div>
Expand Down Expand Up @@ -323,6 +323,7 @@ async function getPostById(originId) {
#content-info {
display: flex;
justify-content: space-between;
align-items: flex-end;
}

#container {
Expand Down
4 changes: 2 additions & 2 deletions src/components/post/SelectedPostDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
<div class="history" id="historyContent">
<h4 id="title"> {{ historyPost.title }} </h4>
<div id="date-restore">
<small> {{ convertToDate(historyPost.createdAt) }}</small>
<small class="text-muted"> {{ convertToDate(historyPost.createdAt) }}</small>
&nbsp;<b-button size="sm" variant="outline-secondary" @click="restorePost()">버전 복원하기</b-button>
</div>
<div id="tag-div">
Expand Down Expand Up @@ -156,7 +156,7 @@
<span> &nbsp;{{ history.author.name }}&nbsp; </span>
</h5>
</p>
<small>{{ convertToDate(history.createdAt) }}</small>
<small class="text-muted">{{ convertToDate(history.createdAt) }}</small>
</div>
</b-list-group-item>
</template>
Expand Down
1 change: 1 addition & 0 deletions src/components/user/EditMyInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<div class="form-group">
<label for="profileImg">프로필 이미지:</label>
<input type="file" id="profileImg" @change="handleProfileImgChange" />
<p class="text-muted"><small>이미지는 1mb 이하만 업로드 가능합니다.</small></p>
</div>
</form>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/components/user/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ async function login() {
}

await router.push('/wiki/1');
location.reload();
} else if (authResponse.status === 202) {
// MFA 인증 필요
mfaRequired.value = true;
Expand Down
22 changes: 11 additions & 11 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ axios.defaults.baseURL = 'http://triumers-back.ap-northeast-2.elasticbeanstalk.c
axios.defaults.withCredentials = true; // 쿠키를 포함하여 요청을 보내도록 설정합니다.

// Axios 인터셉터 설정
axios.interceptors.response.use(
response => response,
error => {
if (error.response && error.response.status === 403) {
alert('로그인 이후 이용해주세요.');
store.dispatch('logout'); // Vuex 스토어에서 로그아웃 액션을 호출합니다.
router.push('/login'); // 로그인 페이지로 리다이렉트합니다.
}
return Promise.reject();
}
);
// axios.interceptors.response.use(
// response => response,
// error => {
// if (error.response && error.response.status === 403) {
// alert('로그인 이후 이용해주세요.');
// store.dispatch('logout'); // Vuex 스토어에서 로그아웃 액션을 호출합니다.
// router.push('/login'); // 로그인 페이지로 리다이렉트합니다.
// }
// return Promise.reject();
// }
// );

import BootstrapVue3 from 'bootstrap-vue-3';
import 'bootstrap/dist/css/bootstrap.css';
Expand Down
3 changes: 2 additions & 1 deletion src/views/Study.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
</option>
</select>
</span>
&nbsp;&nbsp;<span v-if="studyTab && studyTab.length > 0" id="addEmployeeModal" data-bs-toggle="modal" data-bs-target="#addTab" class="text-muted"><small>+ 스터디원 추가</small></span>
<span v-else class="no-study-message">스터디가 존재하지 않습니다.</span>
&nbsp;&nbsp;<span id="addEmployeeModal" data-bs-toggle="modal" data-bs-target="#addTab"><small>+ 스터디원 추가</small></span>


<div class="addEmployee-modal">
<div class="modal fade" id="addTab" tabindex="-1" aria-labelledby="addTabLabel" aria-hidden="true">
Expand Down
6 changes: 3 additions & 3 deletions src/views/WorkspaceView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<router-link class="w-tab" active-class="active" :to="`/workspace/${route.params.id}/wiki`">WIKI</router-link>
&nbsp;
<router-link class="w-tab" active-class="active" :to="`/workspace/${route.params.id}/docs`">DOCS</router-link>
&nbsp;&nbsp;<span data-bs-toggle="modal" data-bs-target="#addTab"><small>+ 팀원 추가</small></span>
&nbsp;&nbsp;<span v-if="isAdmin" data-bs-toggle="modal" data-bs-target="#addTab"class="text-muted"><small>+ 팀원 추가</small></span>


<div class="addEmployee-modal">
Expand Down Expand Up @@ -62,7 +62,7 @@
</template>

<script setup>
import { ref } from 'vue';
import { ref, computed } from 'vue';
import { RouterView, useRoute } from "vue-router";
import axios from 'axios';

Expand All @@ -71,7 +71,7 @@ const selected = ref(null);
const addEmployee = ref(null);
const search = ref('');
const searchEmployeeList = ref(null);

const isAdmin = computed(() => ['ROLE_ADMIN', 'ROLE_HR_MANAGER', 'ROLE_LEADER'].includes(localStorage.getItem('userRole')));

async function saveNewTab() {
const requestData = {
Expand Down
Loading