Merge pull request #135 from cinxdy/master

Merge
KUBIC-HGU · Jun 23, 2022 · 1e45e15 · 1e45e15
2 parents f015b37 + 45ad59e
commit 1e45e15
Show file tree

Hide file tree

Showing 9 changed files with 14,228 additions and 30 deletions.
diff --git a/src/app/features/article-analysis/analysis-style.less b/src/app/features/article-analysis/analysis-style.less
@@ -172,7 +172,8 @@ td {
 .option-header{
     margin: 1.0rem;
     font-size: 1.5rem;
-    font-weight:500;
+    //font-weight:500;
+    font-weight: bold;
 }
 
 .option-info{
@@ -185,7 +186,7 @@ td {
     font-size: 1.3rem;
     display: flex;
     margin-left: 1.1rem;
-    margin-bottom: -5rem;
+    margin-bottom: -3rem;
     margin-top: -1rem;
     padding-top: 0.5rem;
     text-align: center;
@@ -195,7 +196,7 @@ td {
 }
 
 .option-dict>strong{
-  margin-top: 4.8rem;
+  margin-top: 4.0rem;
 }
 
 .upload-dict{
@@ -206,12 +207,17 @@ td {
   border: 1px solid #DDDDDD;
   box-sizing: border-box;
   border-radius: 5px;
-  font-size: 1.2rem;
+  //font-size: 1.2rem;
+  font-size: 0.9em;
   padding: 0.4rem 0.35rem 0.4rem 0.35rem;
   cursor: pointer;
   width: 100%;
 }
 
+//사전 미리보기
+.download-dict{ font-size: 1.2rem; }
+#title{ font-size: 1.2rem; }
+
 .select-option{
     margin:30px 0px;
 }
@@ -287,6 +293,7 @@ td {
         padding-left: 1.6em;
         padding-right: 1.6em;
         padding-bottom: 3.0em;
+        font-size: 0.9em;
     }
 
     input[type="radio"] + label {

diff --git a/src/app/features/article-analysis/components/analysis/ldavis.v3.0.0.js b/src/app/features/article-analysis/components/analysis/ldavis.v3.0.0.js
@@ -560,6 +560,7 @@ var LDAvis = function(to_select, data_or_file_name, color1, color2) {
                 return (termID + d.Term);
             })
             .style("text-anchor", "end") // right align text - use 'middle' for center alignment
+            .style("text-size", "11px")
             .text(function(d) {
                 return d.Term;
             })

diff --git a/src/app/features/article-analysis/components/preprocessing/preprocessing.component.html b/src/app/features/article-analysis/components/preprocessing/preprocessing.component.html
@@ -11,7 +11,6 @@
     <hr>
     <div class="select-option">
     <span class="option-header">{{'analysis.preprocessing.option1-userDictionary'|translate}}</span>
-      <br>
     <span class="option-info">{{'analysis.preprocessing.chooseUserDictionary'|translate}}</span>
 
     <div class="option-dict-box">
@@ -74,11 +73,11 @@
           </button>
       </li>
     </div>
-    <br><br><br><br>
+    <br><br><br>
     <strong id="title"></strong>
     <figure id="table"></figure>
     <button class="download-dict" id="download-dict" (click)="downloadDict()">{{'analysis.preprocessing.downloadDictionary'|translate}}</button>
-
+    <br><br>
 
 
     <!-- <button *ngIf="isSynonymLoaded" (click)="preview('synonym')">미리보기</button> -->

diff --git a/src/app/features/article-analysis/components/preprocessing/preprocessing.component.ts b/src/app/features/article-analysis/components/preprocessing/preprocessing.component.ts
@@ -264,23 +264,23 @@ export class PreprocessingComponent extends abstractAnalysis implements OnInit {
 
   showDictData( dictType: string, data : any ){
     d3.selectAll('.show-dict > *').remove();
-    let text : string;
+    let title : string;
     if(data.userEmail == 'default'){
-      text = "기본 사전: ";
+      title = "기본 사전: ";
       if(dictType == 'synonym')
-        text += "유의어";
+        title += "유의어";
       else if(dictType == 'stopword')
-        text += "불용어";
+        title += "불용어";
       else if(dictType == 'compound')
-        text += "복합어";
+        title += "복합어";
     }else{
-      text = "내 사전: ";
+      title = "내 사전: ";
       if(dictType == 'synonym')
-        text += "유의어";
+        title += "유의어";
       else if(dictType == 'stopword')
-        text += "불용어";
+        title += "불용어";
       else if(dictType == 'compound')
-        text += "복합어";
+        title += "복합어";
     }
     /*
     let obj = document.getElementById("table");
@@ -289,14 +289,16 @@ export class PreprocessingComponent extends abstractAnalysis implements OnInit {
     obj.appendChild(title);
     */
 
-    document.getElementById("title").innerHTML=text;
+    document.getElementById("title").innerHTML=title;
 
     const table = d3.select("figure#table")
       .attr('class','show-dict')
       .append("table")
       .attr('width','100%')
       //.attr('height','200px')
 
+    table.style('font-size','14px')
+
     const th = table.append("tr")
         .style('padding','15px 0px')
         .style('font-weight','500')

diff --git a/src/app/features/open-api/components/gotoapi/gotoapi.component.html b/src/app/features/open-api/components/gotoapi/gotoapi.component.html
@@ -1,3 +1,5 @@
+<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-0evHe/X+R7YkIZDRvuzKMRqM+OrBnVFBL6DOitfPri4tjfHxaWutUpFmBp4vmVor" crossorigin="anonymous">
+
 <div class="content-container">
   <app-open-api-menu></app-open-api-menu>
 
@@ -21,7 +23,11 @@
     <div class="jp-Cell-inputWrapper"><div class="jp-InputPrompt jp-InputArea-prompt">
     </div><div class="jp-RenderedHTMLCommon jp-RenderedMarkdown jp-MarkdownOutput " data-mime-type="text/markdown">
 
-    <h1 id="Open-API-&#51228;&#44277;-&#45936;&#51060;&#53552;-&#48143;-&#49436;&#48708;&#49828;">Open API &#51228;&#44277; &#45936;&#51060;&#53552; &#48143; &#49436;&#48708;&#49828;<a class="anchor-link" href="#Open-API-&#51228;&#44277;-&#45936;&#51060;&#53552;-&#48143;-&#49436;&#48708;&#49828;">&#182;</a></h1><ul>
+    <h1 id="Open-API-&#51228;&#44277;-&#45936;&#51060;&#53552;-&#48143;-&#49436;&#48708;&#49828;">Open API &#51228;&#44277; &#45936;&#51060;&#53552; &#48143; &#49436;&#48708;&#49828;
+      <!-- <a class="anchor-link" href="#Open-API-&#51228;&#44277;-&#45936;&#51060;&#53552;-&#48143;-&#49436;&#48708;&#49828;">&#182;</a> -->
+    </h1>
+
+    <ul>
     <li>단순 검색(simple_search)</li>
     <li>상세 검색(detailed_search)</li>
     <li>내 보관함 내 검색(my_doc)</li>
@@ -31,10 +37,12 @@ <h1 id="Open-API-&#51228;&#44277;-&#45936;&#51060;&#53552;-&#48143;-&#49436;&#48
     </div>
     <div class="jp-Cell-inputWrapper"><div class="jp-InputPrompt jp-InputArea-prompt">
     </div><div class="jp-RenderedHTMLCommon jp-RenderedMarkdown jp-MarkdownOutput " data-mime-type="text/markdown">
-    <h1 id="&#50836;&#52397;-&#48320;&#49688;-&#47785;&#47197;">&#50836;&#52397; &#48320;&#49688; &#47785;&#47197;<a class="anchor-link" href="#&#50836;&#52397;-&#48320;&#49688;-&#47785;&#47197;">&#182;</a></h1><ul>
+    <h1 id="&#50836;&#52397;-&#48320;&#49688;-&#47785;&#47197;">&#50836;&#52397; &#48320;&#49688; &#47785;&#47197;
+      <!-- <a class="anchor-link" href="#&#50836;&#52397;-&#48320;&#49688;-&#47785;&#47197;">&#182;</a> -->
+    </h1><ul>
     <li>단순 검색(simple_search)</li>
     </ul>
-    <table>
+    <table class="table table-hover">
     <thead><tr>
     <th style="text-align:center">변수명(영문)</th>
     <th style="text-align:center">변수명(국문)</th>
@@ -82,7 +90,7 @@ <h1 id="&#50836;&#52397;-&#48320;&#49688;-&#47785;&#47197;">&#50836;&#52397; &#4
     <ul>
     <li>상세 검색(detailed_search) 또는 내 보관함 내 검색(my_doc)</li>
     </ul>
-    <table>
+    <table class="table table-hover">
     <thead><tr>
     <th style="text-align:center">변수명(영문)</th>
     <th style="text-align:center">변수명(국문)</th>
@@ -188,7 +196,9 @@ <h1 id="&#50836;&#52397;-&#48320;&#49688;-&#47785;&#47197;">&#50836;&#52397; &#4
     </div>
     <div class="jp-Cell-inputWrapper"><div class="jp-InputPrompt jp-InputArea-prompt">
     </div><div class="jp-RenderedHTMLCommon jp-RenderedMarkdown jp-MarkdownOutput " data-mime-type="text/markdown">
-    <h1 id="&#51025;&#45813;-&#48320;&#49688;-&#47785;&#47197;">&#51025;&#45813; &#48320;&#49688; &#47785;&#47197;<a class="anchor-link" href="#&#51025;&#45813;-&#48320;&#49688;-&#47785;&#47197;">&#182;</a></h1><table>
+    <h1 id="&#51025;&#45813;-&#48320;&#49688;-&#47785;&#47197;">&#51025;&#45813; &#48320;&#49688; &#47785;&#47197;
+      <!-- <a class="anchor-link" href="#&#51025;&#45813;-&#48320;&#49688;-&#47785;&#47197;">&#182;</a> -->
+    </h1><table class="table table-hover">
     <thead><tr>
     <th style="text-align:center">변수명(영문)</th>
     <th style="text-align:center">변수명(국문)</th>
@@ -266,7 +276,11 @@ <h1 id="&#51025;&#45813;-&#48320;&#49688;-&#47785;&#47197;">&#51025;&#45813; &#4
     </div>
     <div class="jp-Cell-inputWrapper"><div class="jp-InputPrompt jp-InputArea-prompt">
     </div><div class="jp-RenderedHTMLCommon jp-RenderedMarkdown jp-MarkdownOutput " data-mime-type="text/markdown">
-    <h1 id="&#50696;&#51228;-&#53076;&#46300;">&#50696;&#51228; &#53076;&#46300;<a class="anchor-link" href="#&#50696;&#51228;-&#53076;&#46300;">&#182;</a></h1><h2 id="&#50896;&#54616;&#45716;-&#47928;&#49436;&#46308;&#51012;-&#48520;&#47084;&#50752;&#49436;-data-frame&#50640;-&#46916;&#50864;&#44592;">&#50896;&#54616;&#45716; &#47928;&#49436;&#46308;&#51012; &#48520;&#47084;&#50752;&#49436; data frame&#50640; &#46916;&#50864;&#44592;<a class="anchor-link" href="#&#50896;&#54616;&#45716;-&#47928;&#49436;&#46308;&#51012;-&#48520;&#47084;&#50752;&#49436;-data-frame&#50640;-&#46916;&#50864;&#44592;">&#182;</a></h2>
+    <h1 id="&#50696;&#51228;-&#53076;&#46300;">&#50696;&#51228; &#53076;&#46300;
+      <!-- <a class="anchor-link" href="#&#50696;&#51228;-&#53076;&#46300;">&#182;</a> -->
+    </h1><h2 id="&#50896;&#54616;&#45716;-&#47928;&#49436;&#46308;&#51012;-&#48520;&#47084;&#50752;&#49436;-data-frame&#50640;-&#46916;&#50864;&#44592;">&#50896;&#54616;&#45716; &#47928;&#49436;&#46308;&#51012; &#48520;&#47084;&#50752;&#49436; data frame&#50640; &#46916;&#50864;&#44592;
+      <!-- <a class="anchor-link" href="#&#50896;&#54616;&#45716;-&#47928;&#49436;&#46308;&#51012;-&#48520;&#47084;&#50752;&#49436;-data-frame&#50640;-&#46916;&#50864;&#44592;">&#182;</a> -->
+    </h2>
     </div>
     </div><div class="jp-Cell jp-CodeCell jp-Notebook-cell jp-mod-noOutputs  ">
     <div class="jp-Cell-inputWrapper">
@@ -290,7 +304,9 @@ <h1 id="&#50696;&#51228;-&#53076;&#46300;">&#50696;&#51228; &#53076;&#46300;<a c
     </div>
     <div class="jp-Cell-inputWrapper"><div class="jp-InputPrompt jp-InputArea-prompt">
     </div><div class="jp-RenderedHTMLCommon jp-RenderedMarkdown jp-MarkdownOutput " data-mime-type="text/markdown">
-    <h3 id="&#49324;&#50857;&#51088;&#50640;-&#47582;&#44172;-&#49688;&#51221;&#54624;-&#48512;&#48516;">&#49324;&#50857;&#51088;&#50640; &#47582;&#44172; &#49688;&#51221;&#54624; &#48512;&#48516;<a class="anchor-link" href="#&#49324;&#50857;&#51088;&#50640;-&#47582;&#44172;-&#49688;&#51221;&#54624;-&#48512;&#48516;">&#182;</a></h3>
+    <h3 id="&#49324;&#50857;&#51088;&#50640;-&#47582;&#44172;-&#49688;&#51221;&#54624;-&#48512;&#48516;">&#49324;&#50857;&#51088;&#50640; &#47582;&#44172; &#49688;&#51221;&#54624; &#48512;&#48516;
+      <!-- <a class="anchor-link" href="#&#49324;&#50857;&#51088;&#50640;-&#47582;&#44172;-&#49688;&#51221;&#54624;-&#48512;&#48516;">&#182;</a> -->
+    </h3>
     </div>
     </div><div class="jp-Cell jp-CodeCell jp-Notebook-cell jp-mod-noOutputs  ">
     <div class="jp-Cell-inputWrapper">
@@ -428,7 +444,7 @@ <h3 id="&#49324;&#50857;&#51088;&#50640;-&#47582;&#44172;-&#49688;&#51221;&#5462
             text-align: right;
         }
     </style>
-    <table border="1" class="dataframe">
+    <table border="1" class="dataframe table table-hover">
       <thead>
         <tr style="text-align: right;">
           <th></th>