백오피스 커스톰 화면 적용

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")
 }
 

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

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'
 }
 
 

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")
 }
 

front/bo/client/assets/font/fontagon-icons.css

@@ -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"; }

front/bo/client/assets/font/fontagon-icons.less

@@ -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");
-    }
-  }

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

front/bo/client/assets/font/fontagon-icons.styl

@@ -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"

front/bo/client/layouts/default.vue

@@ -0,0 +1,17 @@
+<script lang="ts">
+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
+}
+</script>
+<style lang="scss"></style>

front/bo/client/layouts/empty.vue

@@ -0,0 +1,17 @@
+<script lang="ts">
+import { Component } from 'vue-property-decorator'
+import EmptyLayout from '@ustra/nuxt-dx-mng-bo/src/components/default/layouts/empty.vue'
+
+@Component
+export default class extends EmptyLayout {
+  // #region variables
+  // #endregion
+  // #region hooks
+  // #endregion
+  // #region methods
+  // #endregion
+  // #region watches
+  // #endregion
+}
+</script>
+<style lang="scss"></style>

front/bo/client/pages/index.vue

@@ -0,0 +1,63 @@
+<template>
+  <div id="login-box">
+    <div class="inner">
+      <img src="@ustra/nuxt-dx-mng-bo/src/static/img/gsitm.png" style="margin-bottom: 25px" />
+      <div class="top-text">{{ appTitle }}</div>
+
+      <div class="login-form">
+        <dx-validation-group ref="validator">
+          <dx-text-box ref="idBox" v-model="inputData.userNm" :height="30" placeholder="ID" @initialized="e => e.component.focus()" @enter-key="() => $refs.passBox.instance.focus()">
+            <dx-validator>
+              <dx-required-rule />
+            </dx-validator>
+          </dx-text-box>
+          <dx-text-box
+            ref="passBox"
+            v-model="inputData.userPw"
+            :height="30"
+            placeholder="Password"
+            mode="password"
+            :input-attr="{
+              autocomplete: 'off',
+            }"
+            @enter-key="() => login()"
+          >
+            <dx-validator>
+              <dx-required-rule />
+            </dx-validator>
+          </dx-text-box>
+
+          <dx-button text="Login" icon="check" type="default" :height="30" width="100%" @click="login"></dx-button>
+        </dx-validation-group>
+        <div class="password-link"><a @click="showPasswordEditPopup = true">Change Password</a></div>
+      </div>
+      <div style="margin: 5px; color: #7ab8eb; text-decoration: underline">※ 테스트 시, 사용자 삭제 및 비밀번호 변경에 주의하시기 바랍니다.</div>
+      <div class="bottom-text">㉿ GSITM 2020-2021</div>
+    </div>
+    <password-edit-popup :show.sync="showPasswordEditPopup" :usr-id="passwordUsrId" @closed="() => idBox.instance.focus()" />
+    <approval-popup ref="approvalPopup" />
+  </div>
+</template>
+<script lang="ts">
+import { Component } from 'vue-property-decorator'
+import LoginComponent from '@ustra/nuxt-dx-mng-bo/src/components/default/login.vue'
+
+@Component
+export default class extends LoginComponent {
+  // #region variables
+  // #endregion
+  // #region hooks
+  created() {
+    this.$data.inputData = {
+      userNm: 'admin',
+      userPw: 'admin',
+    }
+  }
+  // #endregion
+  // #region methods
+  // #endregion
+  // #region watches
+  // #endregion
+}
+</script>
+<style lang="scss"></style>

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: [
           {

front/bo/package.json

@@ -17,9 +17,9 @@
     "test": "jest --detectOpenHandles --forceExit"
   },
   "dependencies": {
-    "@ustra/nuxt": "^2.0.17-stable",
+    "@ustra/nuxt": "^2.0.19-stable",
-    "@ustra/nuxt-dx-mng-bo": "^2.0.17-stable",
+    "@ustra/nuxt-dx-mng-bo": "^2.0.19-stable",
-    "@ustra/nuxt-mng-bo": "^2.0.17-stable",
+    "@ustra/nuxt-mng-bo": "^2.0.19-stable",
     "@ustra-sample/cmm": "1.0.0"
   }
 }

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"
   }
 }

front/fo/package.json

@@ -18,8 +18,8 @@
   },
   "dependencies": {
     "@ustra-sample/cmm": "1.0.0",
-    "@ustra/nuxt": "^2.0.17-stable",
+    "@ustra/nuxt": "^2.0.19-stable",
-    "@ustra/nuxt-buefy": "^2.0.17-stable",
+    "@ustra/nuxt-buefy": "^2.0.19-stable",
     "animejs": "^3.2.1"
   }
 }

front/yarn.lock

@@ -2460,17 +2460,10 @@
     "@typescript-eslint/types" "4.28.5"
     eslint-visitor-keys "^2.0.0"
 
-<<<<<<< HEAD
+"@ustra/core@^2.0.19-stable":
-"@ustra/core@^2.0.17-stable":
+  version "2.0.19-stable"
-  version "2.0.17-stable"
+  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/core/-/core-2.0.19-stable.tgz#01f69e81d321bfed6bb58334e019c286d4d74213"
-  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/core/-/core-2.0.17-stable.tgz#723b91a7f1f268f6f5f133de82dfe87cd31a6e94"
+  integrity sha512-ga0HbN9fjBc2IKFOnsF33BulvDglvIL7BXwlEo17z4xSg5iMvqVIVYjNC/3Jqh90QqXl7Nzy2qzbZuMV6wNoZQ==
-  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
   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.19-stable":
-"@ustra/data@^2.0.17-stable":
+  version "2.0.19-stable"
-  version "2.0.17-stable"
+  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/data/-/data-2.0.19-stable.tgz#e42405336ab12d048b64b41abf0d453b638ead51"
-  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/data/-/data-2.0.17-stable.tgz#38ed92b63ddaa393eec98fdd63b34fcbfbc783d1"
+  integrity sha512-t3J/m+mafF5ZqVPSwp9yaXjiWf8gLFdOrnVtr+ommZOhawtOdsg5SsdWHkgRRD37R2iqH5T3zdREtvsCStzCBA==
-  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
   dependencies:
-<<<<<<< HEAD
+    "@ustra/core" "^2.0.19-stable"
-    "@ustra/core" "^2.0.17-stable"
-=======
-    "@ustra/core" "^2.0.15-stable"
->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
 
-<<<<<<< HEAD
+"@ustra/nuxt-buefy@^2.0.19-stable":
-"@ustra/nuxt-buefy@^2.0.17-stable":
+  version "2.0.19-stable"
-  version "2.0.17-stable"
+  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-buefy/-/nuxt-buefy-2.0.19-stable.tgz#f448cadbf2ea0e86d152dc974144b66d3dfbf08e"
-  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-buefy/-/nuxt-buefy-2.0.17-stable.tgz#cb9dd7706adf1515452e0660c29421a0a890258f"
+  integrity sha512-AmEIqK4NOSpyrnzrU9hwAmGRbe+IwShxX/Dfagd5Herbk5PxcD/N3btthAl1xGpEWxCqEsTzMKtKeaMcTu7vCA==
-  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
   dependencies:
-<<<<<<< HEAD
+    "@ustra/nuxt" "^2.0.19-stable"
-    "@ustra/nuxt" "^2.0.17-stable"
-=======
-    "@ustra/nuxt" "^2.0.15-stable"
->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
     nuxt-buefy "^0.4.7"
 
-<<<<<<< HEAD
+"@ustra/nuxt-dx-mng-bo@^2.0.19-stable":
-"@ustra/nuxt-dx-mng-bo@^2.0.17-stable":
+  version "2.0.19-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.19-stable.tgz#1d0c4e3442af32e3928fc53b0b2b73d694fb802d"
-  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-lCLhIH+nkGMv4TnprQIpneAEOME19/ZOxewFgJXE7K4RhIz+cVxEj8bIlf8nwOCt9IP9oiJFo6oWyWqdtmsFfA==
-  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
   dependencies:
-<<<<<<< HEAD
+    "@ustra/nuxt-dx" "^2.0.19-stable"
-    "@ustra/nuxt-dx" "^2.0.17-stable"
+    "@ustra/nuxt-mng-bo" "^2.0.19-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
 
-<<<<<<< HEAD
+"@ustra/nuxt-dx@^2.0.19-stable":
-"@ustra/nuxt-dx@^2.0.17-stable":
+  version "2.0.19-stable"
-  version "2.0.17-stable"
+  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-dx/-/nuxt-dx-2.0.19-stable.tgz#1529258564bcd66f2671ae126e0deb68511be3cc"
-  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-dx/-/nuxt-dx-2.0.17-stable.tgz#e5377f32b62e939b7919f62f862ab79c4214ba8e"
+  integrity sha512-7Px/c5pM367sEKIzx2RhXRJ+l+zmfHzkmXfrYzTHMYo/0EKlBMARL4ANiCgKfaM6lFFdnjyAiQUTiDlgOqKVFw==
-  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
   dependencies:
-<<<<<<< HEAD
+    "@ustra/nuxt" "^2.0.19-stable"
-    "@ustra/nuxt" "^2.0.17-stable"
-=======
-    "@ustra/nuxt" "^2.0.15-stable"
->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
     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.19-stable":
-"@ustra/nuxt-mng-bo@^2.0.17-stable":
+  version "2.0.19-stable"
-  version "2.0.17-stable"
+  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-mng-bo/-/nuxt-mng-bo-2.0.19-stable.tgz#24ceeb2c0ac4b00376c4e9ad4243da81dbd8b175"
-  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-mng-bo/-/nuxt-mng-bo-2.0.17-stable.tgz#7b8e37d4b24c48d825c01c98a44cbe5d77448543"
+  integrity sha512-yDz/fZe3gXtAYs/Mx/jJ39fmwKTsQPHZGJKxOW7A0tO22T1ktiSrqiASutbgZ7s4258t1lok2heNtvOhUrWU6Q==
-  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
   dependencies:
-<<<<<<< HEAD
+    "@ustra/nuxt-mng" "^2.0.19-stable"
-    "@ustra/nuxt-mng" "^2.0.17-stable"
-=======
-    "@ustra/nuxt-mng" "^2.0.15-stable"
->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
 
-<<<<<<< HEAD
+"@ustra/nuxt-mng@^2.0.19-stable":
-"@ustra/nuxt-mng@^2.0.17-stable":
+  version "2.0.19-stable"
-  version "2.0.17-stable"
+  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-mng/-/nuxt-mng-2.0.19-stable.tgz#39ddf1c3a2a4886cec1887203ad90ac335591913"
-  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-mng/-/nuxt-mng-2.0.17-stable.tgz#4c8363c00df7921a1ace5f6f9afb01866fe575bd"
+  integrity sha512-XkszBlMyytMs30I38d3qyGuJEhWR0z2iD8nWVrUgiy4Tu1EmeEJlrxnz8Q2mOVJzecNTr5uY6vk7H2uXgepIbw==
-  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
   dependencies:
-<<<<<<< HEAD
+    "@ustra/nuxt" "^2.0.19-stable"
-    "@ustra/nuxt" "^2.0.17-stable"
-=======
-    "@ustra/nuxt" "^2.0.15-stable"
->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
 
-<<<<<<< HEAD
+"@ustra/nuxt@^2.0.19-stable":
-"@ustra/nuxt@^2.0.17-stable":
+  version "2.0.19-stable"
-  version "2.0.17-stable"
+  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt/-/nuxt-2.0.19-stable.tgz#b96d9a5f26492818ad0f5a3ecb858df605064573"
-  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt/-/nuxt-2.0.17-stable.tgz#4e175a6d2509c0e6f0f545dfeb1e6212fc1ff291"
+  integrity sha512-doR0+hDIobDZCaK8/lcjxjSBpBmSbYbHak/Zl14gU15SU2oOYkcXZPUSdc2p4TOf3qwq19KfPnOP7cyrn/vDEw==
-  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
   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.19-stable"
-    "@ustra/core" "^2.0.17-stable"
+    "@ustra/data" "^2.0.19-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
     add "2.0.6"
     bluebird "3.7.2"
     body-parser "1.19.0"