Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
144 commits
Select commit Hold shift + click to select a range
4a2e497
Fix: 탭별 게시글 읽어오기 탭이름에 맞게 수정
gaberani Aug 18, 2020
47ffcaa
Merge branch 'frontend' of https://lab.ssafy.com/s03-webmobile1-sub3/…
gaberani Aug 18, 2020
7317bd0
Modify: 글 작성자 이름 넣는 부분 수정
gaberani Aug 18, 2020
4297363
Merge branch 'fe-feature/comment/child' into 'frontend'
gaberani Aug 18, 2020
ad3649a
Merge branch 'frontend' of https://lab.ssafy.com/s03-webmobile1-sub3/…
gaberani Aug 18, 2020
6a3668c
Feature : 프로필 이미지
MakJuho Aug 18, 2020
54bf72a
Merge branch 'fe-feature/user/nav_bar' into 'frontend'
MakJuho Aug 18, 2020
5f10658
Merge branch 'fe-feature/user/login' into 'frontend'
gaberani Aug 18, 2020
3acdc57
Feature : 공지사항 추가
MakJuho Aug 18, 2020
7995645
feature:피드 페이지 추가
cansoup Aug 18, 2020
18a15bd
Merge branch 'fe-feature/user/feed' into 'frontend'
cansoup Aug 18, 2020
65ab093
fix : main, feed 레이아웃 수정
cansoup Aug 18, 2020
beac558
Merge branch 'fe-feature/main/home' into 'frontend'
cansoup Aug 18, 2020
050934e
feature: tag페이지 생성
cansoup Aug 18, 2020
43e6ecb
Merge branch 'fe-feature/main/home' into 'frontend'
cansoup Aug 18, 2020
2ce21e0
fix:layout 조정
cansoup Aug 19, 2020
f28bf35
Merge branch 'fe-feature/user/login' into 'frontend'
cansoup Aug 19, 2020
f34586c
fix: font-family
cansoup Aug 19, 2020
ef2fa9b
Merge branch 'fe-feature/user/login' into 'frontend'
cansoup Aug 19, 2020
4676f50
fix: postdetail post방식으로 변경, setting.vue 수정
cansoup Aug 19, 2020
7b0d524
Merge branch 'fe-feature/user/login' into 'frontend'
cansoup Aug 19, 2020
d08d8e9
fix:postdetail 요청방식변경
cansoup Aug 19, 2020
ef3e024
Merge branch 'fe-feature/user/login' into 'frontend'
cansoup Aug 19, 2020
6b2c7bb
Feature: 댓글 수정 구현 중
gaberani Aug 19, 2020
11779ac
Pull frontend branch
gaberani Aug 19, 2020
7b24b4c
Modify: console.log 주석 처리
gaberani Aug 19, 2020
c05dcd9
Feature: 댓글 수정 구현
gaberani Aug 19, 2020
df495eb
Merge branch 'fe-feature/comment/update-delete' into 'frontend'
gaberani Aug 19, 2020
7f760f6
TEST : 공지사항
MakJuho Aug 19, 2020
40678fe
TEST : 공지사항
MakJuho Aug 19, 2020
ffc4767
Merge branch 'frontend' into 'fe-feature/user/nav_bar'
MakJuho Aug 19, 2020
38b46f2
Merge branch 'fe-feature/user/nav_bar' into 'frontend'
MakJuho Aug 19, 2020
bbe5e53
feature: setting
cansoup Aug 19, 2020
f67b44e
Merge branch 'fe-feature/user/login' into 'frontend'
cansoup Aug 19, 2020
c8218d8
fix : 회원탈퇴 시 홈으로
cansoup Aug 19, 2020
049c091
Merge branch 'fe-feature/user/login' into 'frontend'
cansoup Aug 19, 2020
3fd86c3
Fix: 수정 버튼으로 comment 업뎃 안되는 현상 해결
gaberani Aug 19, 2020
f5602ce
Test: 포스트 썸네일 테스트
gaberani Aug 19, 2020
432b037
Merge branch 'fe-feature/post/create' into 'frontend'
gaberani Aug 19, 2020
eeba550
Fix: storage 문제 해결
gaberani Aug 19, 2020
a1b7c32
Merge branch 'fe-feature/post/create' into 'frontend'
gaberani Aug 19, 2020
78eec90
FIX : ThumbNail
MakJuho Aug 19, 2020
b2b6e84
Merge branch 'fe-feature/post/thumbnail' into 'frontend'
MakJuho Aug 19, 2020
3bf7801
TEST : 이미지 업로드#1
MakJuho Aug 19, 2020
c4973bc
Merge branch 'fe-feature/post/thumbnail' into 'frontend'
MakJuho Aug 19, 2020
d6e6bcb
Modify: 주석 제거
gaberani Aug 19, 2020
0829fbe
Feature: 게시글 수정 삭제 구현중
gaberani Aug 19, 2020
b8c20ae
feature:비밀번호 변경 추가
cansoup Aug 19, 2020
5e5621b
Merge branch 'frontend' of https://lab.ssafy.com/s03-webmobile1-sub3/…
cansoup Aug 19, 2020
895b497
Modify: 글작성 시 uid 추가
gaberani Aug 19, 2020
2fe5523
Merge branch 'fe-feature/user/login' into 'frontend'
cansoup Aug 19, 2020
4756223
feature:블로그 페이지 작성, navbar 링크
cansoup Aug 19, 2020
723f731
Merge branch 'fe-feature/user/myblog' into 'frontend'
cansoup Aug 19, 2020
2c43f25
Modify: 중첩 라우팅 구현 중
gaberani Aug 20, 2020
4b9b0c2
Modify: 컨벤션 정리
gaberani Aug 20, 2020
24975c8
Fix: 중첩 라우팅 적용 중
gaberani Aug 20, 2020
2210da3
Merge branch 'frontend' of https://lab.ssafy.com/s03-webmobile1-sub3/…
gaberani Aug 20, 2020
c62636a
Feature: 대댓글 수정 삭제 구현중
gaberani Aug 20, 2020
49c21a6
Merge branch 'fe-feature/comment/update-delete' into 'frontend'
gaberani Aug 20, 2020
343626d
Feature: 대댓글 구현중
gaberani Aug 20, 2020
424415a
feature : 토스트 에디터에 글 불러오기
MakJuho Aug 20, 2020
dfcea1c
Test : 게시글 불러오기
MakJuho Aug 20, 2020
3050aa7
Merge branch 'frontend' of https://lab.ssafy.com/s03-webmobile1-sub3/…
MakJuho Aug 20, 2020
b9ae40c
feature : 게시글 임시 저장
MakJuho Aug 20, 2020
35997c1
feature:내 블로그 페이지
cansoup Aug 20, 2020
5f0a018
Merge branch 'frontend' into 'fe-feature/user/myblog'
cansoup Aug 20, 2020
93f5267
Merge branch 'fe-feature/user/myblog' into 'frontend'
cansoup Aug 20, 2020
6c00e89
Merge branch 'frontend' of https://lab.ssafy.com/s03-webmobile1-sub3/…
MakJuho Aug 20, 2020
f193f4d
Fix: 게시글 내용 안나오는 현상 수정
gaberani Aug 20, 2020
16d6c1f
fix:search.vue 레이아웃, 클릭이벤트
cansoup Aug 20, 2020
f15d949
Merge branch 'fe-feature/user/myblog' of https://lab.ssafy.com/s03-we…
cansoup Aug 20, 2020
3cb6b40
feature: 레이아웃 수정
cansoup Aug 20, 2020
f4c2f6e
Merge branch 'fe-feature/user/myblog' into 'frontend'
cansoup Aug 20, 2020
4eecedb
Feature: 대댓글 삭제 구현
gaberani Aug 20, 2020
95f2589
Merge branch 'fe-feature/comment/child' into 'frontend'
gaberani Aug 20, 2020
987dd4e
Feature: 대댓글 수정 구현 중
gaberani Aug 20, 2020
00139d5
Style: 대댓글 보기 숨기기 상태에 따라 아이콘 변경
gaberani Aug 20, 2020
4a132d2
Merge branch 'fe-feature/comment/child' into 'frontend'
gaberani Aug 20, 2020
37a7184
feature: 태그 클라우드
cansoup Aug 20, 2020
88dbf78
Merge branch 'fe-feature/main/forum' into 'frontend'
cansoup Aug 20, 2020
e347bb1
Modify: 대댓글 작성 배치 수정
gaberani Aug 20, 2020
0fc7515
Merge branch 'fe-feature/comment/child' into 'frontend'
gaberani Aug 20, 2020
3d14257
feature : 게시글 & 임시 저장
MakJuho Aug 20, 2020
7089273
feature : 임시저장 & TAG
MakJuho Aug 20, 2020
6116c15
Merge branch 'fe-feature/post/thumbnail' into 'frontend'
MakJuho Aug 20, 2020
930239a
feature : 콘솔 로그 삭제
MakJuho Aug 20, 2020
c39a793
Merge branch 'frontend' of https://lab.ssafy.com/s03-webmobile1-sub3/…
MakJuho Aug 20, 2020
7b95481
Merge branch 'fe-feature/post/thumbnail' into 'frontend'
MakJuho Aug 20, 2020
0b54f16
feature:공지사항
cansoup Aug 20, 2020
f723948
Merge branch 'fe-feature/main/forum' into 'frontend'
cansoup Aug 20, 2020
52c815f
Merge branch 'frontend' of https://lab.ssafy.com/s03-webmobile1-sub3/…
MakJuho Aug 20, 2020
281773e
feature:공지사항
MakJuho Aug 20, 2020
dad5ee0
Merge branch 'fe-feature/post/thumbnail' into 'frontend'
MakJuho Aug 20, 2020
d105067
mod:네브바순서
MakJuho Aug 20, 2020
e5e26b2
Merge branch 'fe-feature/post/thumbnail' into 'frontend'
MakJuho Aug 20, 2020
dd3648f
Style: postdetail css
gaberani Aug 20, 2020
62bc974
Merge branch 'frontend' into 'fe-feature/comment/child'
gaberani Aug 20, 2020
4bef265
Merge branch 'fe-feature/comment/child' into 'frontend'
gaberani Aug 20, 2020
0d1f6dd
Style: 삭제 버튼 text color 수정
gaberani Aug 20, 2020
d9d6824
Merge branch 'frontend' of https://lab.ssafy.com/s03-webmobile1-sub3/…
gaberani Aug 20, 2020
9d627eb
Merge branch 'fe-feature/comment/child' into 'frontend'
gaberani Aug 20, 2020
b5b4731
Feature: 워드클라우드 클릭 이벤트 구현
gaberani Aug 20, 2020
4040f74
Merge branch 'fe-feature/comment/child' into 'frontend'
gaberani Aug 20, 2020
a6cac8c
Modify: DB URI 수정에 따라 맞춤
gaberani Aug 20, 2020
18beae8
Merge branch 'fe-feature/post/update-delete' into 'frontend'
gaberani Aug 20, 2020
c276049
Feautre: 대댓글 수정 삭제 구현
gaberani Aug 20, 2020
c138f1c
Merge branch 'fe-feature/post/update-delete' into 'frontend'
gaberani Aug 20, 2020
dc547bf
Pull frontend branch
gaberani Aug 20, 2020
40083bf
Modify: console 주석 제거
gaberani Aug 20, 2020
ccb36ee
Merge branch 'fe-feature/post/update-delete' into 'frontend'
gaberani Aug 20, 2020
aca0d4c
feature:포럼
MakJuho Aug 20, 2020
af692a0
Merge branch 'fe-feature/main/forum' into 'frontend'
MakJuho Aug 20, 2020
0b99785
feature : postDetail 수정 By Juho
gaberani Aug 20, 2020
e9b8b18
Merge branch 'frontend' of https://lab.ssafy.com/s03-webmobile1-sub3/…
gaberani Aug 20, 2020
0aed0ed
feature:포럼 수정
MakJuho Aug 20, 2020
d612c98
Merge branch 'fe-feature/main/forum' into 'frontend'
MakJuho Aug 20, 2020
1b7e446
feature : QR코드 기본 이미지
gaberani Aug 20, 2020
b115d3e
Merge branch 'fe-feature/user/settings' into 'frontend'
gaberani Aug 20, 2020
9c2d0e1
Modify: URI 수정에 따라 맞춤
gaberani Aug 20, 2020
c9021de
Merge branch 'fe-feature/user/settings' into 'frontend'
gaberani Aug 20, 2020
7765113
mod: register.vue 수정
MakJuho Aug 20, 2020
176f5e9
Merge branch 'fe-feature/main/forum' into 'frontend'
MakJuho Aug 20, 2020
7271b32
Fix: 후원 qrImage 조건문 수정
gaberani Aug 20, 2020
b76152b
Merge branch 'fe-feature/user/settings' into 'frontend'
gaberani Aug 20, 2020
1417657
Add: PostDetail 태그 구현 & 후원 버튼 조건문 수정
gaberani Aug 20, 2020
0af3239
Merge branch 'fe-feature/user/settings' into 'frontend'
gaberani Aug 20, 2020
f64270f
mod: texteditor 레이아웃 수정
MakJuho Aug 20, 2020
5dfb742
Merge branch 'fe-feature/main/forum' into 'frontend'
MakJuho Aug 20, 2020
571791d
Fix: PostDetail 새로고침 현상 해결
gaberani Aug 20, 2020
81f65dd
Merge branch 'fe-feature/post/update-delete' into 'frontend'
gaberani Aug 20, 2020
f714887
Delete: 불필요한 vue 파일 삭제
gaberani Aug 20, 2020
0ff6ed6
Feature: 포럼 페이지 포스트 디테일 연결
gaberani Aug 20, 2020
d02a5bb
Modify: 주석처리된 콘솔 출력 삭제
gaberani Aug 20, 2020
6392aa4
Modify: 안쓰는 vue 파일 삭제
gaberani Aug 20, 2020
b43541c
Merge branch 'fe-feature/post/update-delete' into 'frontend'
gaberani Aug 20, 2020
9674eb5
Fix: Tag 검색 결과 리턴 값에 따른 작성자 썸네일 연결
gaberani Aug 20, 2020
60163da
Fix: 유저 이메일에 맞게 메뉴바 노출
gaberani Aug 20, 2020
b6b9a53
Fix: myblog에서 postdetail로 안넘어가는 현상 해결
gaberani Aug 20, 2020
bbbd547
feature:postdetail 수정
MakJuho Aug 20, 2020
f44acfc
Merge branch 'fe-feature/main/forum' into 'frontend'
MakJuho Aug 20, 2020
88a5685
mod: comment 레이아웃 수정
cansoup Aug 21, 2020
2b3f243
Merge branch 'fe-feature/user/settings' into 'frontend'
cansoup Aug 21, 2020
bc59ac6
feature: 좋아요, 글씨크기
cansoup Aug 21, 2020
3198c1d
Merge branch 'fe-feature/user/settings' into 'frontend'
cansoup Aug 21, 2020
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
797 changes: 686 additions & 111 deletions frontend/package-lock.json

Large diffs are not rendered by default.

14 changes: 12 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,30 @@
"@fortawesome/free-solid-svg-icons": "^5.14.0",
"@fortawesome/vue-fontawesome": "^0.1.10",
"@toast-ui/editor": "^2.3.1-alpha",
"@toast-ui/vue-editor": "^2.3.0",
"@toast-ui/vue-editor": "^2.3.1",
"aos": "^3.0.0-beta.6",
"axios": "^0.19.2",
"bootstrap": "^4.5.2",
"bootstrap-vue": "^2.16.0",
"core-js": "^3.6.5",
"jQuery": "^1.7.4",
"jquery": "^3.5.1",
"jsdom": "^16.4.0",
"location": "0.0.1",
"navigator": "^1.0.1",
"tui-editor": "^1.4.10",
"vee-validate": "^2.2.15",
"vue": "^2.6.11",
"vue-d3-cloud": "^0.2.0",
"vue-google-login": "^2.0.5",
"vue-infinite-loading": "^2.4.5",
"vue-position-sticky": "^0.2.1",
"vue-roller": "^1.12.3",
"vue-router": "^3.3.4",
"vuelidate": "^0.7.5",
"vuetify": "^2.2.11",
"vuex": "^3.5.1"
"vuex": "^3.5.1",
"xmlhttprequest": "^1.8.0"
},
"devDependencies": {
"@fortawesome/fontawesome-free": "^5.14.0",
Expand All @@ -39,6 +48,7 @@
"babel-eslint": "^10.1.0",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^6.2.2",
"expose-loader": "^1.0.0",
"sass": "^1.19.0",
"sass-loader": "^8.0.0",
"vue-cli-plugin-vuetify": "~2.0.7",
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/App.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<template>
<v-app>
<router-view />
<!-- <router-view :key="someVariableUnderYourControl"/> -->
<router-view :key="$route.fullPath"/>
</v-app>
</template>

Expand All @@ -14,7 +15,6 @@ export default {

}
},

}
</script>

Expand Down
118 changes: 118 additions & 0 deletions frontend/src/components/ChildComment.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
<template>
<div>
<div class="main_comment">
<div>
<h5>{{child.author}}</h5>
<div class="mc_content">
<p>{{ child.content }}</p>
</div>
</div>
<div class="btngrp">
<span
v-if="child.isauthor"
style="margin-right: 10px;"
@click="onCommentDelete(child)"
>삭제</span>
<span
v-if="child.isauthor"
style="margin-right: 10px;"
@click="ClickChildUpdateBtn(child)"
>수정</span>
</div>
</div>
<div>
<div v-if="ChildUpdateFlag" class="update-box">
<v-text-field
v-model="ChildUpdateInput"
solo
rows="2"
clearable
></v-text-field>
<v-btn @click="onChildUpdate(child)" class="update-btn">수정하기</v-btn>
</div>
</div>
</div>
</template>

<script>
import axios from 'axios'

const API_URL = 'http://i3a507.p.ssafy.io:8081/'
const storage = window.sessionStorage

export default {
name: 'ChildComment',
data() {
return {
child: this.$attrs.child,
ChildCommentInput: '',
ChildUpdateInput: '',
ChildUpdateFlag: false,
}
},
mounted() {
},
methods: {
// *** Child Comment ***
// 대댓글 수정 버튼 - ChildUpdateFlag 토글
ClickChildUpdateBtn(one_child) {
this.ChildUpdateInput = one_child.content
this.ChildUpdateFlag = !this.ChildUpdateFlag
},
onChildUpdate(one_child) {
if (one_child.author === storage.getItem("login_user") && one_child.uid === Number(storage.getItem("uid"))) {
const tmp_comment = {
content: this.ChildUpdateInput,
cid: one_child.cid
}
axios.put(API_URL + `api/v3/`, tmp_comment)
.then(() => {
alert('수정되었습니다.')
this.$emit('Click-Child-Update-Btn')
this.ChildUpdateInput = ''
this.ChildUpdateFlag = !this.ChildUpdateFlag
})
} else {
alert('비정상적인 접근입니다')
}
},
onCommentDelete(one_child) {
if (one_child.author === storage.getItem("login_user") && one_child.uid === Number(storage.getItem("uid"))) {
axios.delete(API_URL + `api/v3/${one_child.cid}`)
.then(() => this.$emit('Click-Child-Delete-Btn'))
} else {
alert('비정상적인 접근입니다')
}
},
}
}
</script>

<style scoped>
.main_comment {
width: 100%;
display: flex;
font-family: 'NanumSquare','나눔스퀘어','Noto Sans','Apple SD Gothic',sans-serif;
margin : 10px 0 10px 0;
}
.main_comment div h5{
font-weight: 800;
margin-right: 20px;
}
.mc_content {
max-height: 3.6rem;
overflow: hidden;
text-overflow: ellipsis;
}
.mc_content p{
font-size: 1rem;
line-height: 1.2rem;
}
.btngrp{
margin-top: -2px;
}
.btngrp span {
cursor: pointer;
font-size: 14px;
}
</style>
163 changes: 163 additions & 0 deletions frontend/src/components/Cloud.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
<template>
<div>
<div class="wordCloud" ref="wordCloud"></div>
<div>
{{onWordClick}}
</div>
</div>
</template>

<script>
import * as d3 from "d3";
import * as cloud from 'd3-cloud';
// const storage = window.sessionStorage;

export default {
data() {
return {
layout: {},
chart: {},
fill: null,
test: ''
}
},

props: {
data: {
type: Array,
required: true,
},
fontSizeMapper: {
type: Function,
required: true,
},
onWordClick: {
type: Function,
default: (word) => {
window.alert(`You clicked hi ${word.text}`)
}
},
rotate: {
type: [Function, String, Number],
default: 0,
},
font: {
type: [String, Function],
default: 'Roboto'
},
width: {
type: [Number, String],
default: 960,
},
height: {
type: [Number, String],
default: 500,
},
padding: {
type: [Number, String],
default: 0,
},
spiral: {
type: String,
default: "archimedean",
},
coloring: {
type: String,
default: "random",
},
colors: {
type: Array,
}
},

mounted() {
this.createCanvas()
},

watch: {
data() {
this.createCanvas()
},
rotate() {
this.createCanvas()
},
font() {
this.createCanvas()
},
padding() {
this.createCanvas()
},
spiral() {
this.createCanvas()
},
colors() {
this.createCanvas()
},
coloring() {
this.createCanvas()
}
},

methods: {
createCanvas: function() {
const wordCounts = this.data.map(
text => ({ ...text })
);

d3.select(this.$el).selectAll('*').remove();

const layout = cloud()
.size([this.width, this.height])
.words(wordCounts)
.padding(this.padding)
.spiral(this.spiral)
.rotate(this.rotate)
.font(this.font)
.fontSize(this.fontSizeMapper)
.on('end', this.end);

if(this.colors)
this.fill = d3.scaleOrdinal().range(this.colors)
else
this.fill = d3.scaleOrdinal(d3.schemeCategory10)

layout.start();
},
end: function(words) {
let _fill;
switch(this.coloring){
case "random":
_fill = (d, i) => this.fill(i);
break;
case "size":
_fill = (d) => this.fill(d.size);
break;
default:
_fill = (d, i) => this.fill(i);
}

d3.select(this.$el)
.append('svg')
.attr('width', this.width)
.attr('height', this.height)
.append('g')
.attr('transform', `translate(${this.width / 2},${this.height / 2})`)
.selectAll('text')
.data(words)
.enter()
.append('text')
.style('font-family', d => d.font)
.style('font-size', d => {
return `${d.size}px`
})
.style('fill', _fill)
.attr('text-anchor', 'middle')
.attr('transform',d => {
return `translate(${[d.x, d.y]})rotate(${d.rotate})`
})
.text(d => d.text)
.on('click', d => this.$emit("submit-tagname", d));
},
}
}
</script>
Loading