Skip to content

Commit

Permalink
일부 아이콘 svg로 변경 및 랩 제출 관련 UI 깨짐 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@kibum0405
kibum0405 committed Jan 8, 2025
1 parent 49f53c6 commit fea5aec
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 44 deletions.
1 change: 1 addition & 0 deletions public/assets/icon/add-picture.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icon/check-fill.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icon/file-document-alert.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icon/upload-picture.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icon/video-settings-rounded.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 1 addition & 6 deletions public/global-style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,6 @@
}

.gs-info-bg {
position: absolute;
top: 40%;
left: 50%;
margin-left: -101px;
transfrom: translate(-50%, -50%);
color: #1E88E5;
}

Expand Down Expand Up @@ -115,7 +110,7 @@
.gs-info-sub-bg {
background-color: #BDBDBD;
color: white;
border-radius: 20px;
border-radius: 10px;
width: 255px;
margin-top: 20px;
padding: 5px;
Expand Down
4 changes: 2 additions & 2 deletions src/components/designer/modeling/GitActionDialog.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
@click="onSelected(testIdx, codeIdx)"
>
<v-row>
<Icon
icon="mdi:file-document-alert-outline" width="20" height="20"
<Icons
:icon="'file-document-alert'" :width="20" :height="20"
style="color: white; position: relative; left: -30px; top: 20px;"
/>
<v-col style="margin-left:-35px; margin-right: 25px;">
Expand Down
7 changes: 4 additions & 3 deletions src/components/designer/modeling/generators/GeneratorUI.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
@click="openGeneratorUI=!openGeneratorUI"
>
<v-icon>mdi-auto-fix</v-icon>
<!-- <Icon icon="arcticons:openai-chatgpt" width="35" height="35" /> -->
</v-btn>
<v-row v-if="openGeneratorUI" style="position:absolute; right:30px; top:75px;">
<v-card style="text-align: center; z-index: 2;" width="auto">
Expand Down Expand Up @@ -75,7 +74,7 @@
color="primary"
>
<div v-if="generatorName === 'CJMGenerator' || generatorName === 'BMGenerator' || generatorName === 'UserStoryMapGenerator'">
<span><Icon style="float:left; margin-right:3px;" icon="ri:check-fill" width="16" height="16"/>complete</span>
<span><Icons :icon="'check-fill'" style="float:left; margin-right:3px;" :width="16" :height="16"/>complete</span>
</div>
<div v-else>
<span>CONTINUE<v-icon>mdi-arrow-right</v-icon></span>
Expand Down Expand Up @@ -300,6 +299,7 @@
import DDLDraftGenerator from './DDLDraftGenerator.js'
import DDLBoundedContextDistributeGenerator from './es-ddl-generators/DDLBoundedContextDistributeGenerator.js'
import PreProcessingFunctionsGenerator from './es-ddl-generators/PreProcessingFunctionsGenerator.js'
import Icons from '../../../ui/Icons.vue'
//import UserStoryGenerator from './UserStoryGenerator.js'
Expand Down Expand Up @@ -348,7 +348,8 @@
}
},
components: {
DebeziumLogsTab
DebeziumLogsTab,
Icons
},
created(){
Expand Down
60 changes: 27 additions & 33 deletions src/components/labs/LabLocator.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
large
>
<Icons :icon="'right'" :color="'#FFFFFF'"/>
<!-- <Icon color="white" icon="mingcute:right-fill" width="24" height="24" /> -->
</v-card>
</template>
<span>인스트럭션 크기 조절</span>
Expand Down Expand Up @@ -264,9 +263,7 @@
<template v-slot:activator="{ on, attrs }">
<v-btn style="margin-left:5px;" v-bind="attrs" v-on="on" @click="editLabVideo()"
color="primary" icon large>
<Icon icon="material-symbols:video-settings-rounded"
style="margin-top:-4px; width:30px; height:30px;"
/>
<Icons :icon="'video-settings-rounded'" :width="30" :height="30" style="margin-top:-4px;" />
</v-btn>
</template>
<span>유튜브 Url 수정</span>
Expand Down Expand Up @@ -307,12 +304,11 @@
<v-tooltip bottom>
<template v-slot:activator="{ on, attrs }">
<v-btn
style="margin-left:5px;" v-bind="attrs" v-on="on"
@click="uploadImage()"
color="primary" icon large>
<v-icon>
mdi-folder-upload
</v-icon>
style="margin-left:5px;" v-bind="attrs" v-on="on"
@click="uploadImage()"
color="primary" icon large
>
<Icons :icon="'add-picture'" :size="26" />
</v-btn>
</template>
<span>이미지 업로드</span>
Expand All @@ -321,8 +317,10 @@
<v-tooltip bottom>
<template v-slot:activator="{ on, attrs }">
<v-btn style="margin-left:5px;" v-bind="attrs" v-on="on" @click="screenCapture()"
color="primary" v-if="isAdmin || myId==userId" icon large>
<v-icon>{{setIcon}}</v-icon>
color="primary" v-if="isAdmin || myId==userId" icon large
>
<Icons v-if="!isCapturing" :icon="'upload-picture'" :size="26" />
<v-icon v-else>{{setIcon}}</v-icon>
</v-btn>
</template>
<span>제출</span>
Expand Down Expand Up @@ -899,38 +897,36 @@
v-model="imageWindow"
width="800"
>
<v-card width="800">
<v-card-title>결과 제출</v-card-title>
<div style="text-align: -webkit-center;">
<v-card class="pa-4 ma-0">
<v-row class="pa-0 ma-0">
<v-card-title class="pa-0 ma-0">결과 제출</v-card-title>
<v-spacer></v-spacer>
<v-icon @click="deleteImage()">mdi-close</v-icon>
</v-row>
<div>
<div v-if="!imgFile"
class="gs-info-bg"
style="position:relative;
left:8%;"
style="text-align: center;"
>
<div>이미지 업로드 방법 선택</div>
<div class="gs-info-sub-bg">
<div style="text-align: left; margin-left:10px;" class="gs-info-sub-title">
1.클립보드 이미지 붙여넣기 ctrl + V<br>
<div class="gs-info-sub-bg" style="margin: 0 auto;">
<div class="gs-info-sub-title" style="text-align: left;">
1. 클립보드 이미지 붙여넣기 ctrl + V<br>
2. 내 PC 이미지 클릭 후 업로드
</div>
</div>
</div>
<v-img class="img-file-style" :src="imgFile ? imgFile:null"
style="width: 90%; max-height: 600px;"></v-img>
<v-img class="img-file-style" :src="imgFile ? imgFile:null"></v-img>
</div>
<v-card-actions style="justify-content: right;">
<v-btn style="margin-right: 10px;"
text
@click="deleteImage()"
>취소
</v-btn>
<v-row class="ma-0 pa-0 pt-4">
<v-spacer></v-spacer>
<v-btn style="margin-right: 10px;" text @click="selectFile()">내 PC 이미지</v-btn>
<v-btn
color="primary" text
@click="submitResultByUser(imgFile)"
color="primary" text
@click="submitResultByUser(imgFile)"
>제출
</v-btn>
</v-card-actions>
</v-row>
</v-card>
</v-dialog>
<div class="modal">
Expand Down Expand Up @@ -1327,8 +1323,6 @@
setIcon() {
if (this.isCapturing) {
return 'mdi-spin mdi-loading'
} else {
return 'mdi-camera'
}
},
setClass() {
Expand Down

0 comments on commit fea5aec

Please sign in to comment.