From 4bc86d091b1e9b2de3402a8bda22e25f001ec097 Mon Sep 17 00:00:00 2001 From: keymasroy Date: Mon, 2 Aug 2021 22:55:45 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=B1=EC=98=A4=ED=94=BC=EC=8A=A4=20?= =?UTF-8?q?=EC=BB=A4=EC=8A=A4=ED=86=B0=20=ED=99=94=EB=A9=B4=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/root/bo/build.gradle | 2 +- .../bo/src/main/resources/application.yml | 6 +- back/root/cmm/build.gradle | 2 +- back/root/fo/build.gradle | 2 +- .../bo/client/assets/font/fontagon-icons.css | 52 ------ .../bo/client/assets/font/fontagon-icons.eot | Bin 0 -> 2620 bytes .../bo/client/assets/font/fontagon-icons.less | 60 ------- .../bo/client/assets/font/fontagon-icons.sass | 6 - .../bo/client/assets/font/fontagon-icons.styl | 52 ------ .../bo/client/assets/font/fontagon-icons.ttf | Bin 0 -> 2428 bytes .../bo/client/assets/font/fontagon-icons.woff | Bin 1352 -> 1352 bytes .../client/assets/font/fontagon-icons.woff2 | Bin 936 -> 944 bytes front/bo/client/layouts/default.vue | 17 ++ front/bo/client/layouts/empty.vue | 17 ++ front/bo/client/pages/index.vue | 63 +++++++ front/bo/nuxt.config.ts | 4 +- front/bo/package.json | 6 +- front/cmm/package.json | 2 +- front/fo/package.json | 4 +- front/yarn.lock | 168 +++++------------- 20 files changed, 149 insertions(+), 314 deletions(-) delete mode 100644 front/bo/client/assets/font/fontagon-icons.css delete mode 100644 front/bo/client/assets/font/fontagon-icons.less delete mode 100644 front/bo/client/assets/font/fontagon-icons.styl create mode 100644 front/bo/client/layouts/default.vue create mode 100644 front/bo/client/layouts/empty.vue create mode 100644 front/bo/client/pages/index.vue diff --git a/back/root/bo/build.gradle b/back/root/bo/build.gradle index a3246aa..e8b8e07 100644 --- a/back/root/bo/build.gradle +++ b/back/root/bo/build.gradle @@ -7,7 +7,7 @@ repositories { dependencies { - compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-bo:2.0.15.RELEASE' + compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-bo:2.0.19.RELEASE' compile project(":cmm") } diff --git a/back/root/bo/src/main/resources/application.yml b/back/root/bo/src/main/resources/application.yml index 7a9af5a..eea0428 100644 --- a/back/root/bo/src/main/resources/application.yml +++ b/back/root/bo/src/main/resources/application.yml @@ -48,11 +48,6 @@ ustra: driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy username: ENC(p6rIPoShJklFLPxHKNJYFLooNCd2xnkayNZ2f+GexyA17qEMS77u8g==) password: ENC(ohS/a1/Q/lKriwUq3rqJqht76fQ0Bnge) - rds2: - url: jdbc:log4jdbc:oracle:thin:@framework-oracle.c0uiyan5ae24.ap-northeast-2.rds.amazonaws.com:1521/GSITMSI - driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - username: gsitm_si_admin - password: gsitmsi6700! file: enabled: true include-default: true @@ -67,6 +62,7 @@ ustra: app: use-auth-approval: true use-user-approval: true + password-change-days: 0 authentication: enabled: true allow-anoymous-athentication: true diff --git a/back/root/cmm/build.gradle b/back/root/cmm/build.gradle index c8f46aa..b82c88b 100644 --- a/back/root/cmm/build.gradle +++ b/back/root/cmm/build.gradle @@ -7,7 +7,7 @@ repositories { dependencies { - compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-front:2.0.15.RELEASE' + compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-front:2.0.19.RELEASE' } diff --git a/back/root/fo/build.gradle b/back/root/fo/build.gradle index faa6d94..4cffde9 100644 --- a/back/root/fo/build.gradle +++ b/back/root/fo/build.gradle @@ -7,7 +7,7 @@ repositories { dependencies { - compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-front:2.0.15.RELEASE' + compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-front:2.0.19.RELEASE' compile project(":cmm") } diff --git a/front/bo/client/assets/font/fontagon-icons.css b/front/bo/client/assets/font/fontagon-icons.css deleted file mode 100644 index f377ac9..0000000 --- a/front/bo/client/assets/font/fontagon-icons.css +++ /dev/null @@ -1,52 +0,0 @@ -@font-face { - font-family: 'fontagon-icons'; - font-style: normal; - font-weight: 400; - src: url("fontagon-icons.eot?a9543d4ea110ea765b1b11f272d4f96f?#iefix") format("embedded-opentype"), -url("fontagon-icons.woff2?a9543d4ea110ea765b1b11f272d4f96f") format("woff2"), -url("fontagon-icons.woff?a9543d4ea110ea765b1b11f272d4f96f") format("woff"); -} - -.fontagon-icons, .ft-icons { - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - display: inline-flex; - align-items: center; - justify-content: center; - vertical-align: middle; -} - -.ft-icons { - width: 1em; - height: 1em; - position: relative; - fill: currentColor; -} - -.fontagon-icons { - font-family: 'fontagon-icons'; - font-weight: normal; - font-style: normal; - display: inline-block; - line-height: 1; - text-transform: none; - letter-spacing: normal; - word-wrap: normal; - white-space: nowrap; - direction: ltr; - - /* Support for all WebKit browsers. */ - -webkit-font-smoothing: antialiased; - /* Support for Safari and Chrome. */ - text-rendering: optimizeLegibility; - - /* Support for Firefox. */ - -moz-osx-font-smoothing: grayscale; - - /* Support for IE. */ - font-feature-settings: 'liga'; -} - -.ft-favicon:before { content: "\f101"; } diff --git a/front/bo/client/assets/font/fontagon-icons.eot b/front/bo/client/assets/font/fontagon-icons.eot index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d695adfa200d0217a5d259d8c848058750930092 100644 GIT binary patch literal 2620 zcmeHJOKe+36utNPZwKQf{v?qby~Ozxxp88TY z7!@fiQ5{BpI!8HZ)~N)G8kjIGfvHg)cA}?FNlMTJG=Jv{CL$OgZIX>9=FeYvN#7p+ z807O{OJ~oIrN-f@p=(MqYETM~UpSXm76OjFss3A8o^S z2a;I@;d<5fEAW?)q1Cc=#q}K!@go$+OJ>$^+;#xkkD~~ejVo2|r>oHSpsiPoa?ba` z1FWZW3;y4#nsrOtc^4D&=tT5}h~4%8s8ue@*$ASQypn;P|7Nyp`PrG@$k*)gE07HijHD%4^?wiC;qqIZD0ki}>&cyeMb+*kob&d#>=zX!yqVghn3kJvRNu?YW> z)FI=js%S)fh7xhAvPv)qtbS9(ZWNV>Syhza?!u+f6yc|#1e4vxY71$fm)kshFheK5 z5Bc?YsGCMojmC0U_Yl$@nmc&nLar(>Y7S$jDPXFogJax z@K37No@4u0n&xosjRYc*fOahq+3V;_`&^m+c(SMCnJ)yMJSOq|7c-|n|MM2#_qjjY z`y{>)k1t$Yh~Ej{>5E*x+%v8JuFZ2W)~!l*JATkKjU$0adEvUz%NHIxx;@7_hl2a? z^w!o`Qmb#feS1Z|B^|~WPV^4UgfG@2;+Fe={r=hdiM!@&bwU|`j;+%wZc@MEZ9pM~ z?Z7dG9r)){X>{8b@x8-?C502Ui)Vsrjr^-znOMlb1ENv7H_4WEZ>H!(R50D{nN! WUV2nLmgGDe+~6W-*<^9~68!~YE@b!s literal 0 HcmV?d00001 diff --git a/front/bo/client/assets/font/fontagon-icons.less b/front/bo/client/assets/font/fontagon-icons.less deleted file mode 100644 index 5a851f5..0000000 --- a/front/bo/client/assets/font/fontagon-icons.less +++ /dev/null @@ -1,60 +0,0 @@ -.fontagon-contents(@value) { - content: @value; -} - -@font-face { - font-family: "fontagon-icons"; - src: url("fontagon-icons.eot?a9543d4ea110ea765b1b11f272d4f96f?#iefix") format("embedded-opentype"); - src: url("fontagon-icons.woff2?a9543d4ea110ea765b1b11f272d4f96f") format("woff2"); - src: url("fontagon-icons.woff?a9543d4ea110ea765b1b11f272d4f96f") format("woff"); -} - - -.fontagon-icons, .ft-icons { - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - display: inline-flex; - align-items: center; - justify-content: center; - vertical-align: middle; -} - -.ft-icons { - width: 1em; - height: 1em; - position: relative; - fill: currentColor; -} - - -.fontagon-icons { - font-family: 'fontagon-icons'; - font-weight: normal; - font-style: normal; - display: inline-block; - line-height: 1; - text-transform: none; - letter-spacing: normal; - word-wrap: normal; - white-space: nowrap; - direction: ltr; - - /* Support for all WebKit browsers. */ - -webkit-font-smoothing: antialiased; - /* Support for Safari and Chrome. */ - text-rendering: optimizeLegibility; - - /* Support for Firefox. */ - -moz-osx-font-smoothing: grayscale; - - /* Support for IE. */ - font-feature-settings: 'liga'; -} - - .ft-favicon { - &:before { - .fontagon-contents("\f101"); - } - } diff --git a/front/bo/client/assets/font/fontagon-icons.sass b/front/bo/client/assets/font/fontagon-icons.sass index 38a32e8..1348c80 100644 --- a/front/bo/client/assets/font/fontagon-icons.sass +++ b/front/bo/client/assets/font/fontagon-icons.sass @@ -3,15 +3,9 @@ @font-face font-family: "fontagon-icons" -<<<<<<< HEAD src: url("fontagon-icons.eot?0cd077f02bfb5caa99153ccb5d0d7d6e?#iefix") format("embedded-opentype") src: url("fontagon-icons.woff2?0cd077f02bfb5caa99153ccb5d0d7d6e") format("woff2") src: url("fontagon-icons.woff?0cd077f02bfb5caa99153ccb5d0d7d6e") format("woff") -======= - src: url("fontagon-icons.eot?a9543d4ea110ea765b1b11f272d4f96f?#iefix") format("embedded-opentype") - src: url("fontagon-icons.woff2?a9543d4ea110ea765b1b11f272d4f96f") format("woff2") - src: url("fontagon-icons.woff?a9543d4ea110ea765b1b11f272d4f96f") format("woff") ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git .nf-icons, .nft-icons -webkit-user-select: none diff --git a/front/bo/client/assets/font/fontagon-icons.styl b/front/bo/client/assets/font/fontagon-icons.styl deleted file mode 100644 index 7e05993..0000000 --- a/front/bo/client/assets/font/fontagon-icons.styl +++ /dev/null @@ -1,52 +0,0 @@ -fontagon-contents(value) - content value - -@font-face - font-family "fontagon-icons" - src url("fontagon-icons.eot?a9543d4ea110ea765b1b11f272d4f96f?#iefix") format("embedded-opentype") - src url("fontagon-icons.woff2?a9543d4ea110ea765b1b11f272d4f96f") format("woff2") - src url("fontagon-icons.woff?a9543d4ea110ea765b1b11f272d4f96f") format("woff") - -.fontagon-icons, .ft-icons - -webkit-user-select none - -moz-user-select none - -ms-user-select none - user-select none - display inline-flex - align-items center - justify-content center - vertical-align middle - -.ft-icons - width 1em - height 1em - position relative - fill currentColor - -.fontagon-icons - font-family 'fontagon-icons' - font-weight normal - font-style normal - display inline-block - line-height 1 - text-transform none - letter-spacing normal - word-wrap normal - white-space nowrap - direction ltr - - /* Support for all WebKit browsers. */ - -webkit-font-smoothing antialiased - /* Support for Safari and Chrome. */ - text-rendering optimizeLegibility - - /* Support for Firefox. */ - -moz-osx-font-smoothing grayscale - - /* Support for IE. */ - font-feature-settings 'liga' - - -.ft-favicon - &:before - fontagon-contents "\f101" diff --git a/front/bo/client/assets/font/fontagon-icons.ttf b/front/bo/client/assets/font/fontagon-icons.ttf index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..05ebd6020872fa9f46ba89cca59ff93dae6146ea 100644 GIT binary patch literal 2428 zcmeHJO>7%Q6n=00ZwKQv{z)P?+Qj)Oa^u8yQhYIz80CB01TB#B@4n4qyL%2|KK^!@N6mC@|gd&6xQc3w{JvL2L<${nnFzYw- z%{On}ym>SG*2F{V5?^@Oy!DO=iWvCHu^=qrqzF5|HC3u zMj=YMx>-{E8%ZMf0{UBPhPImg{=*&U?m`M{Abc;neg*y#GP+i?ull|NB7T7CMAgzY z&rJ`Y`vj_ZO}kp>A$l9*{phQvRx?8H-E$Fnw_*SFy4AFm-M6NR0xA)`O7Puv52#bG z2g-veS*u>ohTfH*Z25rqFp>2dt1OK*gKniO%XbSc;aqTd#A8WkyGSEiHz zTD;MY2s6r;k-Qo>Z1vor6oE`uh1&33!7sjzF0h;E1Vin zbrFwG;in9bcw@cMcz!rnm>Kh?MkZpZnL<977~)toai~9=!eDA9Kh`@Oi^iYfULFZ^ zbcl1Oc_uZR&7T^d@Xcm8#lM98-k#V%{3qEePqF(eMe%s|$0LbEM7b78?Dq`jL%zaL zI@{m##1{h39Cz^DXA5UO|MLdl4f#LY|0KPfPA^|tPTz{(8cbZd(m$vEt}Jmh)hBEA zdwx(9g%gnnC1JWXz!&d(`U1y$N27nkGuzvfS*5w-5A9d@hGQ_jd~#rTK7Of@5Lxd3 z`2Dl^iCpuwyrE3t?rjyBG%R@+P)uSsa7tnizI<7Uz2N614pN$yB@W?MZy*)0TV&%T zU6WXW{%wg};O|K62L4uJ55?)e#9m6`RchM_QjwDqhiIG|CCjw6vSm(Ibjxg>H_97T z?GSlTrD!yo70Xn!ndyTAONMDQG}~BJFK?>NRyk+eCAHMBYU(1^FsfBctv9T7L$@<) zwq2i_niBH`pV6%vvW11rU?ZE99W;rYp*yHa=g9!OK~;=4j?_HLN)c8X)O5ZHCaH*j zhNh3SwuBj`GfRVK1~Q9EmuVAq6WOXvIj}Y?sE`JHtpP2{eHiez3asKwF2>d|Ux#*v z)|^>&nxiQ^9gjQu8E4lu+@{X|f%g9Z5Qj>T6?UbDL#CPI!QvbYOduWr M9NP)GvwQ>00ll~wGXMYp delta 54 zcmV-60LlNz3djnOjRVSsF|m-!0wPV>tK#`>zA|t#zW|Cb+*Mm(giJHXgT*-*m_R%L M9(@UJvwQ>00jOpd4FCWD diff --git a/front/bo/client/assets/font/fontagon-icons.woff2 b/front/bo/client/assets/font/fontagon-icons.woff2 index 7566b9532cabe24ec4a197e9ff9092198e25e7a7..c21c72ada83c577fa530cc7f699cb5ea75e0bba0 100644 GIT binary patch delta 903 zcmV;219<$X2e1bicTYw#00961000B901E&B000Sm000AFkr+6C9tXK;^j7jJmtqQ@ zk2b6Ku@D#+MpbAUGMP$4hR_+;llV#8cl~63+v?luak~{DRoyi}fLVN>xOeTqZivkO?xC?BIZLmbT3P~us#nLrYfRDzf{O65hz`m+p|4od{R zPOxQ;+d9vBNW_R8>Q(U{b;P!nVBc3? zZTb4^{oj6nD|8Zj>z$6X=Uw^Ks%zl?Ra-S~dX>7{Th0949Mzsw?^i$8tT|%(4>f`s zCuL&KCV!V7?`1Ea)3@TQPCepBpVw^tptgtGr{di)ABK*2)%Vq~E)Pn(7e4yL%)D`| zTv@H&zFmW?c*d^;>YlWG9rab2clyN;`t{)e&QRwvO+CA`;aenB>ZsM0Z zC2O5RG1D_i0w;*0GG}a>-TYiGa`JJs()W_CE0QEXuv@p_HLmtjG z7R=;-+Fvfm6{o5?ym&5OtRQ=9zoUn)x~C>)#_7Wx;;w|RG+JUUhgU1g=qZs1I0CUq z85_rz<@M!6ZNyZ*(@H*1qN^1-qIm;#qgp{)eb<_eWox-6r=$8a-V#Mr(L@(RQesN_ doQaVN+~Q0a)A|}+dPpFy6eTO3L=pl3000uHta<9-6e4z3aQ}BG> zX8pNX$YWd>RiSA}D`W_rshO3Td~sQs?^Kq*8z8_ezE9jc{;STrfa)~>Y|N?C#-c@m zg<0GMHpVtsB3*`oTbA|!&v0P^uR#Dse`9Hrr_NqXy(%w_XvILN7qBy>syydm-|ZMN z>4J^WMvoe3WK^$ziG|nLWDx`%;cYpB3EF1udEfv%U%q2N8fch0!o>NTQp$MV(|-U~ zlA`wR04AUVz1!)OW1;#3^~pXQ9rap+^`L8GN4 ziL>?5o{N`%-FsKnHSo9p>TQ@dzfRNbofdv?j_OWk@XKE|Y&c>57Y)J&=VW5fCV$tQ z8RV>AGW4g9dJRaPe!pSoCmVaXLwV+Q0DDJN7;M!P6z@dd=wB zbH*}BqUn~IUw7}T%emU&e2`z7-%vd5Qn_P2!J)5zJ3-{Sat(F)|Ix~O>*|mG*LK1i zzV3QuASu&3Y}Qp!AiqL2uRD!YXi_nX*lLAT0TlVvZnU+^t_?QuX4yfZ9_cw{jrDA; zZW@~+VKALw;xGUf^%xCBFEeL5G*&}Lj4VPMdjJ~sxB;Cu9wiLsLzp!46D-;U6iaI} z)S+vCNf<||my4r5PfbkIM>)h^J*hxxw8SPZuU3>ZP%0I2g%Yu9HclkYsF;n?Y6#~9gUu8L>c_a0sT47p!- +import { Component } from 'vue-property-decorator' +import DefaultLayout from '@ustra/nuxt-dx-mng-bo/src/components/default/layouts/default.vue' + +@Component +export default class extends DefaultLayout { + // #region variables + // #endregion + // #region hooks + // #endregion + // #region methods + // #endregion + // #region watches + // #endregion +} + + diff --git a/front/bo/client/layouts/empty.vue b/front/bo/client/layouts/empty.vue new file mode 100644 index 0000000..045e00a --- /dev/null +++ b/front/bo/client/layouts/empty.vue @@ -0,0 +1,17 @@ + + diff --git a/front/bo/client/pages/index.vue b/front/bo/client/pages/index.vue new file mode 100644 index 0000000..f09ebb5 --- /dev/null +++ b/front/bo/client/pages/index.vue @@ -0,0 +1,63 @@ + + + diff --git a/front/bo/nuxt.config.ts b/front/bo/nuxt.config.ts index 030a011..021e8c0 100644 --- a/front/bo/nuxt.config.ts +++ b/front/bo/nuxt.config.ts @@ -23,15 +23,12 @@ export default async () => { }, logger: { level: configProperties.LogLevel.Debug, - file: true, - datePattern: 'YYYY-MM-DD-HH', }, server: { type: configProperties.ServerType.NONE, middleware: { compress: true, bodyParser: true, - multipart: { enabled: true, excludeUrlPatterns: ['/external-if/billkey-register-result*'] }, }, }, nuxt: { @@ -48,6 +45,7 @@ export default async () => { }, useUstraDxMngBo: { importSystemPage: true, + useDefaultScreen: false, }, extends: [ { diff --git a/front/bo/package.json b/front/bo/package.json index eb59319..1a074b0 100644 --- a/front/bo/package.json +++ b/front/bo/package.json @@ -17,9 +17,9 @@ "test": "jest --detectOpenHandles --forceExit" }, "dependencies": { - "@ustra/nuxt": "^2.0.17-stable", - "@ustra/nuxt-dx-mng-bo": "^2.0.17-stable", - "@ustra/nuxt-mng-bo": "^2.0.17-stable", + "@ustra/nuxt": "^2.0.19-stable", + "@ustra/nuxt-dx-mng-bo": "^2.0.19-stable", + "@ustra/nuxt-mng-bo": "^2.0.19-stable", "@ustra-sample/cmm": "1.0.0" } } diff --git a/front/cmm/package.json b/front/cmm/package.json index 6c5ab46..dd005f2 100644 --- a/front/cmm/package.json +++ b/front/cmm/package.json @@ -15,6 +15,6 @@ "test": "jest --detectOpenHandles --forceExit" }, "dependencies": { - "@ustra/nuxt": "^2.0.17-stable" + "@ustra/nuxt": "^2.0.19-stable" } } diff --git a/front/fo/package.json b/front/fo/package.json index 87c6755..9255c2c 100644 --- a/front/fo/package.json +++ b/front/fo/package.json @@ -18,8 +18,8 @@ }, "dependencies": { "@ustra-sample/cmm": "1.0.0", - "@ustra/nuxt": "^2.0.17-stable", - "@ustra/nuxt-buefy": "^2.0.17-stable", + "@ustra/nuxt": "^2.0.19-stable", + "@ustra/nuxt-buefy": "^2.0.19-stable", "animejs": "^3.2.1" } } diff --git a/front/yarn.lock b/front/yarn.lock index 697252d..3c5c3ca 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -2460,17 +2460,10 @@ "@typescript-eslint/types" "4.28.5" eslint-visitor-keys "^2.0.0" -<<<<<<< HEAD -"@ustra/core@^2.0.17-stable": - version "2.0.17-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/core/-/core-2.0.17-stable.tgz#723b91a7f1f268f6f5f133de82dfe87cd31a6e94" - integrity sha512-KUs+L/ChQdCq2J2AaF8i1Dr5x8TfPSKmCEh818A6Rj9ShlF0XBuG05qJrQS/dXYGznPAbjhPBEwfY0W607+D/w== -======= -"@ustra/core@^2.0.15-stable": - version "2.0.15-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/core/-/core-2.0.15-stable.tgz#aba759b8f56089acb38b88ca1447c59f3fb525ee" - integrity sha512-PsYCCUpQy0hZd9pbX0zPs7XysdkQklixLDD4v8xSW8KaGuR+HT3F/Irs8+kcv56DbhsUFyOoX1oxoyrqApxXtw== ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git +"@ustra/core@^2.0.19-stable": + version "2.0.19-stable" + resolved "https://repo.gsitm.com/repository/npm-private/@ustra/core/-/core-2.0.19-stable.tgz#01f69e81d321bfed6bb58334e019c286d4d74213" + integrity sha512-ga0HbN9fjBc2IKFOnsF33BulvDglvIL7BXwlEo17z4xSg5iMvqVIVYjNC/3Jqh90QqXl7Nzy2qzbZuMV6wNoZQ== dependencies: axios "0.21.1" axios-jsonp-pro "1.1.8" @@ -2494,133 +2487,59 @@ winston "3.3.3" winston-daily-rotate-file "4.5.2" -<<<<<<< HEAD -"@ustra/data@^2.0.17-stable": - version "2.0.17-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/data/-/data-2.0.17-stable.tgz#38ed92b63ddaa393eec98fdd63b34fcbfbc783d1" - integrity sha512-1VMIVmxoPHmKvT3Aec2KOCw1NyHWPebFTOlB/ZqSo9sB+gosMOElY/iLYNzTysMc4mWvyOl1g5IR+23cZbdhMQ== -======= -"@ustra/data@^2.0.15-stable": - version "2.0.15-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/data/-/data-2.0.15-stable.tgz#bafef43117385e18fb48099a1ac178f778e64090" - integrity sha512-6p/nRlPNxl88CS7o+6qdeqMlDPYHDN4H+LhFeUNLuuHjPu28L18dCPgcpn0/H0soUa/A8AOcO2GXx9bT50gZOA== ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git +"@ustra/data@^2.0.19-stable": + version "2.0.19-stable" + resolved "https://repo.gsitm.com/repository/npm-private/@ustra/data/-/data-2.0.19-stable.tgz#e42405336ab12d048b64b41abf0d453b638ead51" + integrity sha512-t3J/m+mafF5ZqVPSwp9yaXjiWf8gLFdOrnVtr+ommZOhawtOdsg5SsdWHkgRRD37R2iqH5T3zdREtvsCStzCBA== dependencies: -<<<<<<< HEAD - "@ustra/core" "^2.0.17-stable" -======= - "@ustra/core" "^2.0.15-stable" ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git + "@ustra/core" "^2.0.19-stable" -<<<<<<< HEAD -"@ustra/nuxt-buefy@^2.0.17-stable": - version "2.0.17-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-buefy/-/nuxt-buefy-2.0.17-stable.tgz#cb9dd7706adf1515452e0660c29421a0a890258f" - integrity sha512-KTYlCCb9mJWIF8RvV2JR7/oLneTv8+Xg9HcetZCqrPAa3l6WmompeVRn4pTg5BPTNp7cNUfttsBWMmN1LGe0Xw== -======= -"@ustra/nuxt-buefy@^2.0.15-stable": - version "2.0.15-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-buefy/-/nuxt-buefy-2.0.15-stable.tgz#0f6bb02fc76679fc250f416663b68c31735d82db" - integrity sha512-nDD8K/gMFWQCfwM/BoM6Nawclqe/7yV7RVJczew4k1ZGaggFkik+p2Cz8nqbgImB9wePyPOllAM0YDZTMA8anQ== ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git +"@ustra/nuxt-buefy@^2.0.19-stable": + version "2.0.19-stable" + resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-buefy/-/nuxt-buefy-2.0.19-stable.tgz#f448cadbf2ea0e86d152dc974144b66d3dfbf08e" + integrity sha512-AmEIqK4NOSpyrnzrU9hwAmGRbe+IwShxX/Dfagd5Herbk5PxcD/N3btthAl1xGpEWxCqEsTzMKtKeaMcTu7vCA== dependencies: -<<<<<<< HEAD - "@ustra/nuxt" "^2.0.17-stable" -======= - "@ustra/nuxt" "^2.0.15-stable" ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git + "@ustra/nuxt" "^2.0.19-stable" nuxt-buefy "^0.4.7" -<<<<<<< HEAD -"@ustra/nuxt-dx-mng-bo@^2.0.17-stable": - version "2.0.17-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-dx-mng-bo/-/nuxt-dx-mng-bo-2.0.17-stable.tgz#eebb58f986784d69caa269e0beae50e215e16f6d" - integrity sha512-1S9nz+GaJKErjp9lGkctwMPqqHHWRl5tXuG9LUpCUCJ32SX6tnHtcgdyyqj/8Z/Qhd7WldHevHSgC2cm7EjLsw== -======= -"@ustra/nuxt-dx-mng-bo@^2.0.15-stable": - version "2.0.15-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-dx-mng-bo/-/nuxt-dx-mng-bo-2.0.15-stable.tgz#944e083be6ab8f925ad69ca0522ed2d4ac9c7e93" - integrity sha512-IrwZg+q7CfvBY/+ZQP2Mt2nJOvExwIZ7hxz1+/+usB0932VK4FmuxYsD3NUypygGwm4H0GfRkyYGI9akVjakow== ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git +"@ustra/nuxt-dx-mng-bo@^2.0.19-stable": + version "2.0.19-stable" + resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-dx-mng-bo/-/nuxt-dx-mng-bo-2.0.19-stable.tgz#1d0c4e3442af32e3928fc53b0b2b73d694fb802d" + integrity sha512-lCLhIH+nkGMv4TnprQIpneAEOME19/ZOxewFgJXE7K4RhIz+cVxEj8bIlf8nwOCt9IP9oiJFo6oWyWqdtmsFfA== dependencies: -<<<<<<< HEAD - "@ustra/nuxt-dx" "^2.0.17-stable" - "@ustra/nuxt-mng-bo" "^2.0.17-stable" -======= - "@ustra/nuxt-dx" "^2.0.15-stable" - "@ustra/nuxt-mng-bo" "^2.0.15-stable" ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git + "@ustra/nuxt-dx" "^2.0.19-stable" + "@ustra/nuxt-mng-bo" "^2.0.19-stable" -<<<<<<< HEAD -"@ustra/nuxt-dx@^2.0.17-stable": - version "2.0.17-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-dx/-/nuxt-dx-2.0.17-stable.tgz#e5377f32b62e939b7919f62f862ab79c4214ba8e" - integrity sha512-WHvOD1uDfIM8xfoRQw+I8v00NzWo8QP1mfttix2BLmAXkl0/jNVDM6un/USDqNAxkwCSRMEg1qsAak5iexeS4Q== -======= -"@ustra/nuxt-dx@^2.0.15-stable": - version "2.0.15-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-dx/-/nuxt-dx-2.0.15-stable.tgz#f7ca7df2a93dd98ce39175b4dac06a8c73cccfcb" - integrity sha512-gUsAqgI6FHRT1HP2EZ/73FOlN9onY1QuDmy2GN2OazfrrUqzOPVoo0P2/TCtPj/msuZ2kv+aaIThiKBN3sscEg== ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git +"@ustra/nuxt-dx@^2.0.19-stable": + version "2.0.19-stable" + resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-dx/-/nuxt-dx-2.0.19-stable.tgz#1529258564bcd66f2671ae126e0deb68511be3cc" + integrity sha512-7Px/c5pM367sEKIzx2RhXRJ+l+zmfHzkmXfrYzTHMYo/0EKlBMARL4ANiCgKfaM6lFFdnjyAiQUTiDlgOqKVFw== dependencies: -<<<<<<< HEAD - "@ustra/nuxt" "^2.0.17-stable" -======= - "@ustra/nuxt" "^2.0.15-stable" ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git + "@ustra/nuxt" "^2.0.19-stable" devextreme "20.1-stable" devextreme-cldr-data "^1.0.3" devextreme-vue "20.1-stable" globalize "^1.6.0" material-icons "^0.3.1" -<<<<<<< HEAD -"@ustra/nuxt-mng-bo@^2.0.17-stable": - version "2.0.17-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-mng-bo/-/nuxt-mng-bo-2.0.17-stable.tgz#7b8e37d4b24c48d825c01c98a44cbe5d77448543" - integrity sha512-F+NdwnlS4LmHzpuDp99kIak+pehrXu5NQyDn7hmSekhwMNEYtNiMDqAVQRUb8EBp5yNJRnfbELLrsEJF6IrGlg== -======= -"@ustra/nuxt-mng-bo@^2.0.15-stable": - version "2.0.15-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-mng-bo/-/nuxt-mng-bo-2.0.15-stable.tgz#0d22b0159426799c9b4c46c55400c0383ea08b37" - integrity sha512-ghqY1WgnYbBw7C1CTZ57k2xNRoth1C20gECAhyAhiusmml8SOf4IKCKt0GMs4w0Cg1PFD8dlz1FBh6xXDapZew== ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git +"@ustra/nuxt-mng-bo@^2.0.19-stable": + version "2.0.19-stable" + resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-mng-bo/-/nuxt-mng-bo-2.0.19-stable.tgz#24ceeb2c0ac4b00376c4e9ad4243da81dbd8b175" + integrity sha512-yDz/fZe3gXtAYs/Mx/jJ39fmwKTsQPHZGJKxOW7A0tO22T1ktiSrqiASutbgZ7s4258t1lok2heNtvOhUrWU6Q== dependencies: -<<<<<<< HEAD - "@ustra/nuxt-mng" "^2.0.17-stable" -======= - "@ustra/nuxt-mng" "^2.0.15-stable" ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git + "@ustra/nuxt-mng" "^2.0.19-stable" -<<<<<<< HEAD -"@ustra/nuxt-mng@^2.0.17-stable": - version "2.0.17-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-mng/-/nuxt-mng-2.0.17-stable.tgz#4c8363c00df7921a1ace5f6f9afb01866fe575bd" - integrity sha512-bMu/xRy/4bMjMf+pgTmBTQI2CjYyK7H+Sp4zd1OXotC0VrWdzy2twbmyI5rObfnB667XX+/4SVmDmX/ctx0ZiQ== -======= -"@ustra/nuxt-mng@^2.0.15-stable": - version "2.0.15-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-mng/-/nuxt-mng-2.0.15-stable.tgz#9288deb217d8d42dcc1e18e366030912e72f777c" - integrity sha512-TjQDeUUHTxW60er6KSIlcE9rVrnkBdaOxEi+vV5am6v1EhEpax1aOFQ3gUMvbTOyv3mZUgiDaA8xFJ77ON09qg== ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git +"@ustra/nuxt-mng@^2.0.19-stable": + version "2.0.19-stable" + resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-mng/-/nuxt-mng-2.0.19-stable.tgz#39ddf1c3a2a4886cec1887203ad90ac335591913" + integrity sha512-XkszBlMyytMs30I38d3qyGuJEhWR0z2iD8nWVrUgiy4Tu1EmeEJlrxnz8Q2mOVJzecNTr5uY6vk7H2uXgepIbw== dependencies: -<<<<<<< HEAD - "@ustra/nuxt" "^2.0.17-stable" -======= - "@ustra/nuxt" "^2.0.15-stable" ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git + "@ustra/nuxt" "^2.0.19-stable" -<<<<<<< HEAD -"@ustra/nuxt@^2.0.17-stable": - version "2.0.17-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt/-/nuxt-2.0.17-stable.tgz#4e175a6d2509c0e6f0f545dfeb1e6212fc1ff291" - integrity sha512-mHIVDqK+Yx3NYIxGO/SADD4cSKdzLRk9v4/hSar05l+J6NTeigNCbiLrRSSm+obBRUNGzm20fCh+8s+U6+xLqA== -======= -"@ustra/nuxt@^2.0.15-stable": - version "2.0.15-stable" - resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt/-/nuxt-2.0.15-stable.tgz#aa1d6018df96182a15e12dd12bd86dec54e81123" - integrity sha512-9flipaRPMuAo9zuZH6mK7HifN6LeNOcrxqRiQ8uYKLvswLhvNBSegzk/T80SyfMkiAB0tJ5m+6AN+Tt5QQTDlA== ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git +"@ustra/nuxt@^2.0.19-stable": + version "2.0.19-stable" + resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt/-/nuxt-2.0.19-stable.tgz#b96d9a5f26492818ad0f5a3ecb858df605064573" + integrity sha512-doR0+hDIobDZCaK8/lcjxjSBpBmSbYbHak/Zl14gU15SU2oOYkcXZPUSdc2p4TOf3qwq19KfPnOP7cyrn/vDEw== dependencies: "@nuxt/typescript-runtime" "0.4.10" "@nuxtjs/axios" "5.13.1" @@ -2628,13 +2547,8 @@ "@nuxtjs/proxy" "2.1.0" "@nuxtjs/redirect-module" "0.3.1" "@nuxtjs/router" "1.6.1" -<<<<<<< HEAD - "@ustra/core" "^2.0.17-stable" - "@ustra/data" "^2.0.17-stable" -======= - "@ustra/core" "^2.0.15-stable" - "@ustra/data" "^2.0.15-stable" ->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git + "@ustra/core" "^2.0.19-stable" + "@ustra/data" "^2.0.19-stable" add "2.0.6" bluebird "3.7.2" body-parser "1.19.0"