js2ts: bossInfo, myPage

- convertFormData에서 null -> ''

hwe/ts/bossInfo.ts

@@ -3,6 +3,7 @@ import axios from 'axios';
 import { convertFormData } from './util/convertFormData';
 import { InvalidResponse } from './defs';
 import { unwrap_any } from './util/unwrap_any';
+import { setAxiosXMLHttpRequest } from './util/setAxiosXMLHttpRequest';
 
 type GeneralSelectorItem = {
     id: string|number,
@@ -52,6 +53,8 @@ async function changePermission(isAmbassador: boolean, rawGeneralList: GeneralSe
 }
 
 $(function () {
+    setAxiosXMLHttpRequest();
+    
     $('#selectAmbassador').select2({
         theme: 'bootstrap4',
         placeholder: "",

hwe/ts/myPage.ts

@@ -0,0 +1,199 @@
+import axios from 'axios';
+import $ from 'jquery';
+import { InvalidResponse } from './defs';
+import { convertFormData } from './util/convertFormData';
+import { setAxiosXMLHttpRequest } from './util/setAxiosXMLHttpRequest';
+import { unwrap } from './util/unwrap';
+import { unwrap_any } from './util/unwrap_any';
+
+
+type LogResponse = {
+    result: true;
+    log: Record<number, string>;
+};
+
+$(function ($) {
+    setAxiosXMLHttpRequest();
+
+    const initCustomCSSForm = function () {
+        let lastTimeOut: NodeJS.Timeout | undefined = undefined;
+        const $obj = $('#custom_css');
+        const key = 'sam_customCSS';
+
+        let text = localStorage.getItem(key);
+        if (text) {
+            $obj.val(text);
+            console.log(text);
+        }
+
+        $obj.on('change keyup paste', function () {
+            const newText = $obj.val();
+            if (text == newText) {
+                return;
+            }
+            if (lastTimeOut) {
+                clearTimeout(unwrap(lastTimeOut));
+            }
+            $obj.css('background-color', '#222222');
+            lastTimeOut = setTimeout(function () {
+                text = unwrap_any<string>($obj.val());
+                localStorage.setItem(key, text);
+                $obj.css('background-color', 'black');
+            }, 500);
+        })
+            ;
+    };
+
+    $('.load_old_log').on('click', async function (e) {
+        e.preventDefault();
+
+        const $thisBtn = $(this);
+        const logType = $thisBtn.data('log_type');
+        const $last = $(`.log_${logType}:last`);
+        let reqTo: number | null = null;
+        if ($last.length) {
+            reqTo = $last.data('seq');
+        }
+
+        let result: InvalidResponse | LogResponse;
+
+        try {
+            const response = await axios({
+                url: 'j_general_log_old.php',
+                method: 'post',
+                responseType: 'json',
+                data: convertFormData({
+                    to: reqTo,
+                    type: logType
+                })
+            });
+            result = response.data;
+        }
+        catch (e) {
+            console.log(e);
+            alert(`실패했습니다: ${e}`);
+            return;
+        }
+
+        if (!result.result) {
+            alert(`로그를 받아오지 못했습니다. : ${result.reason}`);
+            location.reload();
+            return;
+        }
+
+        const keys: string[] = Object.keys(result.log);
+        if (keys.length > 1 && keys[0] < keys[1]) {
+            keys.reverse();
+        }
+
+        if (keys.length == 0) {
+            $thisBtn.hide();
+            return;
+        }
+
+        const html: string[] = [];
+        for (const [key, item] of Object.entries(result.log)) {
+            if ($('#log_{0}_{1}'.format(logType, key)).length) {
+                return true;
+            }
+            html.push("<div class='log_{0}' id='log_{0}_{1}' data-seq='{1}'>{2}</div>".format(logType, key, item));
+        }
+        $(`#${logType}Plate`).append(html.join(''));
+    })
+
+    initCustomCSSForm();
+
+
+    $('#die_immediately').on('click', async function (e) {
+        e.preventDefault();
+
+        if (!confirm('정말로 삭제하시겠습니까?')) {
+            return false;
+        }
+
+        let result: InvalidResponse;
+
+        try {
+            const response = await axios({
+                url: 'j_die_immediately.php',
+                method: 'post',
+                responseType: 'json',
+            });
+            result = response.data;
+        }
+        catch (e) {
+            console.log(e);
+            alert(`실패했습니다: ${e}`);
+            location.reload();
+            return;
+        }
+
+        if (!result.result) {
+            alert(`실패했습니다: ${result.reason}`);
+            location.reload();
+            return;
+        }
+
+        location.replace('..');
+    });
+
+    $('#vacation').on('click', async function (e) {
+        e.preventDefault();
+        if (!confirm('휴가 기능을 신청할까요?')) {
+            return false;
+        }
+
+        let result: InvalidResponse;
+
+        try {
+            const response = await axios({
+                url: 'j_vacation.php',
+                method: 'post',
+                responseType: 'json',
+            });
+            result = response.data;
+        }
+        catch (e) {
+            console.log(e);
+            alert(`실패했습니다: ${e}`);
+            location.reload();
+            return;
+        }
+
+        if (!result.result) {
+            alert(`실패했습니다: ${result.reason}`);
+            location.reload();
+            return;
+        }
+
+        location.reload();
+    });
+
+    $('#set_my_setting').on('click', async function (e) {
+        let result: InvalidResponse;
+
+        try {
+            const response = await axios({
+                url: 'j_set_my_setting.php',
+                method: 'post',
+                responseType: 'json',
+                data: convertFormData({
+                    tnmt: unwrap_any<string>($('.tnmt:checked').val()),
+                    defence_train: parseInt(unwrap_any<string>($('#defence_train').val())),
+                    use_treatment: unwrap_any<string>($('#use_treatment').val()),
+                    use_auto_nation_turn: unwrap_any<string>($('#use_auto_nation_turn').val()),
+                })
+            });
+            result = response.data;
+        }
+        catch (e) {
+            console.log(e);
+            alert(`실패했습니다: ${e}`);
+            location.reload();
+            return;
+        }
+
+        location.reload();
+
+    });
+});

hwe/ts/util/convertFormData.ts

@@ -1,6 +1,6 @@
 import { isArray, isString, isNumber, isBoolean } from "lodash";
 
-export function convertFormData(values: Record<string, number[]|string[]|boolean[]|number|string|boolean>): FormData{
+export function convertFormData(values: Record<string, null|number[]|string[]|boolean[]|number|string|boolean>): FormData{
     const formData = new FormData();
 
     const simpleConv = (v: unknown):string=>{
@@ -13,6 +13,9 @@ export function convertFormData(values: Record<string, number[]|string[]|boolean
         if(isBoolean(v)){
             return v?'true':'false';
         }
+        if(v===null){
+            return '';
+        }
         throw new TypeError('지원하지 않는 formData Type');
     }
 

webpack.config.js

@@ -23,6 +23,7 @@ module.exports = [
             betting: './hwe/ts/betting.ts',
             board: './hwe/ts/board.ts',
             bossInfo: './hwe/ts/bossInfo.ts',
+            myPage: './hwe/ts/myPage.ts',
 
 
             //FORM 입력용, frontend 변경후 제거