From 2702bc0d557c9634289f1a5a3a2b345211b5ac26 Mon Sep 17 00:00:00 2001 From: Jang Haemin Date: Fri, 13 Dec 2019 00:25:35 +0900 Subject: [PATCH 1/4] fix: api url --- src/modules/eodiro-api/api-host.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/eodiro-api/api-host.js b/src/modules/eodiro-api/api-host.js index 9f9e7579..ca8d9f5f 100644 --- a/src/modules/eodiro-api/api-host.js +++ b/src/modules/eodiro-api/api-host.js @@ -5,7 +5,7 @@ export default class ApiHost { */ static setHost(host) { if (host.startsWith('eodiro')) { - host = 'https://' + host + host = 'https://api.' + host } else { host = 'http://' + host.split(':')[0] + ':4000' } From f009f125b6114a934540b9d36f4f432b9adb0acf Mon Sep 17 00:00:00 2001 From: Jang Haemin Date: Fri, 13 Dec 2019 00:33:25 +0900 Subject: [PATCH 2/4] fix: validate e.key property --- src/components/auth/AuthCommonForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/auth/AuthCommonForm.vue b/src/components/auth/AuthCommonForm.vue index c88bf91e..fe58a7ba 100644 --- a/src/components/auth/AuthCommonForm.vue +++ b/src/components/auth/AuthCommonForm.vue @@ -191,7 +191,7 @@ export default { * @param {KeyboardEvent} e */ handleKeydown(e) { - if (e.key.match(/[@ ]/)) { + if (e && e.key && e.key.match(/[@ ]/)) { e.preventDefault() } }, From e6cbb90f501a3e026c01e577ca4dce868b6ccba6 Mon Sep 17 00:00:00 2001 From: Jang Haemin Date: Fri, 13 Dec 2019 00:35:16 +0900 Subject: [PATCH 3/4] fix: api url --- src/modules/eodiro-api/api-host.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/eodiro-api/api-host.js b/src/modules/eodiro-api/api-host.js index ca8d9f5f..65d51c14 100644 --- a/src/modules/eodiro-api/api-host.js +++ b/src/modules/eodiro-api/api-host.js @@ -5,7 +5,7 @@ export default class ApiHost { */ static setHost(host) { if (host.startsWith('eodiro')) { - host = 'https://api.' + host + host = 'https://api2.' + host } else { host = 'http://' + host.split(':')[0] + ':4000' } From 04ad187e8ac8c2c2fcfccac799c4ca77db64da2f Mon Sep 17 00:00:00 2001 From: Jang Haemin Date: Fri, 13 Dec 2019 00:40:07 +0900 Subject: [PATCH 4/4] fix: overflowing --- src/components/cafeteria/MealTimeGroup.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/cafeteria/MealTimeGroup.vue b/src/components/cafeteria/MealTimeGroup.vue index 38b29d4b..66958c21 100644 --- a/src/components/cafeteria/MealTimeGroup.vue +++ b/src/components/cafeteria/MealTimeGroup.vue @@ -135,6 +135,7 @@ export default { flex-wrap: wrap; justify-content: space-evenly; padding: s(3) s(2); + word-break: break-all; .menu-item { margin: 0 s(2) s(1) s(2);