test field not needed

diff --git a/config.yaml.tmpl b/config.yaml.tmpl
index 34d57887acad40019a679207f361c45e2423232e..24670bdbadca67102aecb105c96083e3ab5a01f0 100644 (file)
--- a/config.yaml.tmpl
+++ b/config.yaml.tmpl
@@ -1,5 +1,3 @@
-# leave it
-test: -1
 # the actual serving address
 serveAddr: "0.0.0.0:8080"
 # needs to be external endpoint,

diff --git a/main.go b/main.go
index 720efa2e5cebd42e2a9501f4086c9f47308b2424..85b011062f931a1ba4628633417f5c423dd4636a 100644 (file)
--- a/main.go
+++ b/main.go
@@ -31,25 +31,6 @@ func main() {
 
        log.Printf("server running at: %s\n", pkgglob.G_CONF.ServeAddr)
 
-       if pkgglob.G_CONF.Test > -1 {
-
-               log.Printf("test mode: case: %d\n", pkgglob.G_CONF.Test)
-
-               if err := test(pkgglob.G_CONF.Test); err != nil {
-
-                       log.Printf("test failed: %v\n", err)
-
-                       os.Exit(-1)
-
-               } else {
-
-                       log.Printf("test success\n")
-               }
-
-               os.Exit(0)
-
-       }
-
        err = pkgdb.OpenDB(pkgglob.G_CONF.Db.Addr)
 
        if err != nil {

diff --git a/main_test_.go b/main_test_.go
deleted file mode 100644 (file)
index 7811ced..0000000
--- a/main_test_.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package main
-
-import (
-       "fmt"
-       pkgdb "lgtm-rsvp/pkg/db"
-       pkgglob "lgtm-rsvp/pkg/glob"
-)
-
-func test(tc int) error {
-
-       var reterr error = nil
-
-       switch tc {
-
-       case 0:
-
-               reterr = test_db()
-
-               break
-
-       default:
-
-               reterr = fmt.Errorf("invalid test case: %d", tc)
-
-       }
-
-       return reterr
-
-}
-
-func test_db() error {
-
-       err := pkgdb.OpenDB(pkgglob.G_CONF.Db.Addr)
-
-       if err != nil {
-               return err
-       }
-
-       err = pkgdb.Init(pkgglob.G_CONF.Db.InitFile, pkgglob.G_CONF.Admin.Id, pkgglob.G_CONF.Admin.Pw)
-
-       if err != nil {
-               return err
-       }
-
-       return nil
-}

diff --git a/pkg/glob/glob.go b/pkg/glob/glob.go
index 00397bcc0bc7a126c14c6df7b3e4d91299388087..2cfc9ac8272a50da4da5d9926607efbc964ccf66 100644 (file)
--- a/pkg/glob/glob.go
+++ b/pkg/glob/glob.go
@@ -1,7 +1,6 @@
 package glob
 
 type Config struct {
-       Test         int    `yaml:"test"`
        ServeAddr    string `yaml:"serveAddr"`
        Url          string `yaml:"url"`
        SessionStore string `yaml:"sessionStore"`

diff --git a/pkg/server/api/api.go b/pkg/server/api/api.go
index 31807cb73c70298849a1c41ad4a9414dde7b8bd2..9b940c00e2e4dab91b55b78b394cd6f8b24c3847 100644 (file)
--- a/pkg/server/api/api.go
+++ b/pkg/server/api/api.go
@@ -21,32 +21,9 @@ type SERVER_RESP struct {
 var USE_GOOGLE_COMMENT bool = false
 var USE_KAKAO_SHARE bool = false
 
-var GOOGLE_COMMENT_EL = `
-<div class="ww-section bg-light" id="comment">
-       <div class="ww-photo-gallery">
-               <div class="container">
-                       <div class="col text-center">
-                               <h2 class="h1 text-center pb-3 ww-title" style="font-family: 'Noto Serif KR', serif;">축하메시지</h2><br>
-                               <div class="row">
-                                       <div class="col text-center">
-                                               <button class="btn btn-primary btn-submit" type="submit" onclick="location.href='/comment'">메시지 남기러 가기</button>
-                                       </div>
-                               </div>
-                               <br>
-                               <div id="comment-rows"></div>
-                               <br>
-                       </div>
-               </div>
-       </div>
-</div>
-`
-
-var KAKAO_SHARE_EL = `
-<a id="kakaotalk-sharing-btn" href="javascript:;">
-       <img src="https://developers.kakao.com/assets/img/about/logos/kakaotalksharing/kakaotalk_sharing_btn_medium.png"
-               alt="카카오톡 공유 보내기 버튼" />
-</a> 
-`
+var GOOGLE_COMMENT_Y = "y"
+
+var KAKAO_SHARE_Y = "y"
 
 func InitAPI() error {
 
@@ -55,7 +32,7 @@ func InitAPI() error {
                USE_GOOGLE_COMMENT = true
        } else {
                log.Printf("not using google comment\n")
-               GOOGLE_COMMENT_EL = ""
+               GOOGLE_COMMENT_Y = ""
        }
 
        if pkgglob.G_CONF.Api.KakaoShare != nil {
@@ -63,7 +40,7 @@ func InitAPI() error {
                USE_KAKAO_SHARE = true
        } else {
                log.Printf("not using kakao share\n")
-               KAKAO_SHARE_EL = ""
+               KAKAO_SHARE_Y = ""
        }
        return nil
 }

diff --git a/pkg/server/server_view.go b/pkg/server/server_view.go
index 465b650fedcf43ea431782e9188df1a3605af851..2695ee0a14c7bf8b4213dba00dd3f0a99bbfd212 100644 (file)
--- a/pkg/server/server_view.go
+++ b/pkg/server/server_view.go
@@ -15,13 +15,13 @@ import (
 func getIndex(c *gin.Context) {
 
        c.HTML(200, "index.html", gin.H{
-               "title":             pkgglob.G_CONF.Title,
-               "groom":             pkgglob.G_CONF.Groom,
-               "bride":             pkgglob.G_CONF.Bride,
-               "comment":           pkgglob.G_CONF.Comment,
-               "message":           pkgglob.G_CONF.Message,
-               "google_comment_el": pkgserverapi.GOOGLE_COMMENT_EL,
-               "kakao_share_el":    pkgserverapi.KAKAO_SHARE_EL,
+               "title":            pkgglob.G_CONF.Title,
+               "groom":            pkgglob.G_CONF.Groom,
+               "bride":            pkgglob.G_CONF.Bride,
+               "comment":          pkgglob.G_CONF.Comment,
+               "message":          pkgglob.G_CONF.Message,
+               "google_comment_y": pkgserverapi.GOOGLE_COMMENT_Y,
+               "kakao_share_y":    pkgserverapi.KAKAO_SHARE_Y,
        })
 
 }

diff --git a/public/js/common.js b/public/js/common.js
index 8539fa3661060b78c283b023899aab9168706e1d..9c9ac144fdb2b543528eb8e5d3d37341e43e4dc9 100644 (file)
--- a/public/js/common.js
+++ b/public/js/common.js
@@ -325,7 +325,7 @@ async function registerComment(){
 
 async function getCommentList(){
 
-    if(GOOGLE_COMMENT_EL == ""){
+    if(GOOGLE_COMMENT_Y == ""){
         return
     }
 
@@ -376,13 +376,20 @@ async function getCommentList(){
 
 async function getAppShare(){
 
-    if(KAKAO_SHARE_EL == ""){
-        return
-    }
-
     let kse = document.getElementById("gift-shares")
 
-    kse.innerHTML += KAKAO_SHARE_EL
+    let innerhtml = SHARE_EL
+
+    if(KAKAO_SHARE_Y != ""){
+        
+        innerhtml += KAKAO_SHARE_EL
+    }
+
+    kse.innerHTML = innerhtml;
+    if(KAKAO_SHARE_Y == ""){
+        
+        return
+    }
 
     let resp = await fetch("/api/appkey", {
         method: "GET"

diff --git a/view/index.html b/view/index.html
index d94051c29ced691050ed3c20f6321474ec6a4739..6b328b3e8e5cc65dff6300066d384965fde45b53 100644 (file)
--- a/view/index.html
+++ b/view/index.html
@@ -23,8 +23,42 @@
     <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/remarkable/1.7.1/remarkable.js" type="text/javascript"></script>
     <script>
-        GOOGLE_COMMENT_EL="{{ .google_comment_el | HTMLnoesc }}"
-        KAKAO_SHARE_EL="{{ .kakao_share_el | HTMLnoesc }}"
+        GOOGLE_COMMENT_Y="{{ .google_comment_y }}"
+        GOOGLE_COMMENT_EL=`
+            <div class="ww-section bg-light" id="comment">
+                <div class="ww-photo-gallery">
+                    <div class="container">
+                        <div class="col text-center">
+                            <h2 class="h1 text-center pb-3 ww-title" style="font-family: 'Noto Serif KR', serif;">축하메시지</h2><br>
+                            <div class="row">
+                                <div class="col text-center">
+                                    <button class="btn btn-primary btn-submit" type="submit" onclick="location.href='/comment'">메시지 남기러 가기</button>
+                                </div>
+                            </div>
+                            <br>
+                            <div id="comment-rows"></div>
+                            <br>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        `
+        SHARE_EL = `
+            <a type="button" id="gift-info-btn" href="javascript:;" onclick="getGiftPage()">
+                <img src="/public/images/gift.png"
+                style="cursor: pointer;" width="68" height="69" alt="선물 버튼" />
+            </a>
+            <a type="button" id="clipboard-sharing-btn" href="javascript:;" onclick="copyUrlToClipboard()">
+                <img src="/public/images/copytoclipboard.png"
+                style="cursor: pointer;" width="68" height="69" alt="클립보드 공유 버튼" />
+            </a>`
+        KAKAO_SHARE_Y="{{ .kakao_share_y }}"
+        KAKAO_SHARE_EL=`
+            <a id="kakaotalk-sharing-btn" href="javascript:;">
+                <img src="https://developers.kakao.com/assets/img/about/logos/kakaotalksharing/kakaotalk_sharing_btn_medium.png"
+                    alt="카카오톡 공유 보내기 버튼" />
+            </a> 
+        `
     </script>
 </head>
 
@@ -115,14 +149,6 @@
                 <div class="form-group">
                     <div class="col-md-12">
                         <div class="my-3 text-center" id="gift-shares">
-                            <a type="button" id="gift-info-btn" href="javascript:;" onclick="getGiftPage()">
-                                <img src="/public/images/gift.png"
-                                style="cursor: pointer;" width="68" height="69" alt="선물 버튼" />
-                            </a>
-                            <a type="button" id="clipboard-sharing-btn" href="javascript:;" onclick="copyUrlToClipboard()">
-                                <img src="/public/images/copytoclipboard.png"
-                                style="cursor: pointer;" width="68" height="69" alt="클립보드 공유 버튼" />
-                            </a>
                         </div>
                     </div>
                 </div>