npm - @things-factory/operato-tools - Versions diffs - 7.0.0-y.0 → 7.0.1-alpha.0 - Mend

@things-factory/operato-tools 7.0.0-y.0 → 7.0.1-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (63) hide show

package/client/index.js +0 -1
package/client/pages/generator/button-config-tab-mixin.js +336 -2
package/client/pages/generator/column-config-tab-mixin.js +647 -2
package/client/pages/generator/etc-config-tab-mixin.js +116 -2
package/client/pages/generator/form-config-tab-mixin.js +164 -2
package/client/pages/generator/graphql-config-tab-mixin.js +281 -15
package/client/pages/generator/grid-config-tab-mixin.js +190 -28
package/client/pages/generator/grid-emphasized-config-tab-mixin.js +295 -6
package/client/pages/generator/menu-config-tab-mixin.js +94 -8
package/client/pages/generator/meta-generator-page.js +512 -12
package/client/pages/generator/search-config-tab-mixin.js +188 -2
package/client/pages/generator/tab-config-tab-mixin.js +226 -2
package/client/pages/main.js +30 -7
package/client/route.js +5 -10
package/config/config.development.js +1 -1
package/config/config.production.js +1 -0
package/{server/errors → dist-server}/index.js +1 -1
package/dist-server/index.js.map +1 -0
package/{server → dist-server}/service/index.js +0 -2
package/dist-server/service/index.js.map +1 -0
package/dist-server/service/tool-entity/create-menu.js +321 -0
package/dist-server/service/tool-entity/create-menu.js.map +1 -0
package/dist-server/service/tool-entity/create-service.js +1053 -0
package/dist-server/service/tool-entity/create-service.js.map +1 -0
package/dist-server/service/tool-entity/index.js.map +1 -0
package/dist-server/tsconfig.tsbuildinfo +1 -0
package/package.json +21 -14
package/server/index.ts +1 -0
package/server/service/index.ts +15 -0
package/server/service/tool-entity/create-menu.ts +338 -0
package/server/service/tool-entity/create-service.ts +1128 -0
package/server/service/tool-entity/index.ts +4 -0
package/server/tsconfig.json +9 -0
package/things-factory.config.js +1 -3
package/tsconfig.json +9 -0
package/views/auth-page.html +1 -7
package/views/public/home.html +1 -6
package/client/actions/main.js +0 -1
package/client/bootstrap.js +0 -8
package/client/reducers/main.js +0 -1
package/client/themes/grist-theme.css +0 -200
package/client/themes/layout-theme.css +0 -92
package/client/themes/report-theme.css +0 -47
package/schema.graphql +0 -3646
package/server/constants/error-code.js +0 -1
package/server/controllers/index.js +0 -1
package/server/errors/license-error.js +0 -1
package/server/index.js +0 -8
package/server/middlewares/index.js +0 -19
package/server/migrations/index.js +0 -12
package/server/routes.js +0 -1
package/server/service/boxtype/boxtype-mutation.js +0 -1
package/server/service/boxtype/boxtype-query.js +0 -1
package/server/service/boxtype/boxtype-type.js +0 -1
package/server/service/boxtype/boxtype.js +0 -1
package/server/service/boxtype/index.js +0 -9
package/server/service/tool-entity/create-menu.js +0 -1
package/server/service/tool-entity/create-service.js +0 -1
package/server/service/tool-secret/index.js +0 -6
package/server/service/tool-secret/tool-permission.js +0 -1
package/server/service/tool-secret/tool-resolver.js +0 -1
package/translations/ja.json +0 -85
/package/{server → dist-server}/service/tool-entity/index.js +0 -0

package/server/service/tool-entity/index.ts ADDED Viewed

@@ -0,0 +1,4 @@
+import { OperatoToolCreateMenu } from './create-menu'
+import { OperatoToolCreateService } from './create-service'
+export const resolvers = [OperatoToolCreateMenu, OperatoToolCreateService]

package/server/tsconfig.json ADDED Viewed

@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig-base.json",
+  "compilerOptions": {
+    "outDir": "../dist-server",
+    "baseUrl": "./"
+  },
+  "include": ["./**/*"],
+  "exclude": ["**/*.spec.ts"]
+}

package/things-factory.config.js CHANGED Viewed

@@ -1,5 +1,4 @@
 import route from './client/route'
-import bootstrap from './client/bootstrap'
 export default {
   route,
@@ -12,6 +11,5 @@ export default {
       tagname: 'meta-generator-page',
       page: 'meta-generator'
     }
-  ],
-  bootstrap
+  ]
 }

package/tsconfig.json ADDED Viewed

@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig-base.json",
+  "compilerOptions": {
+    "outDir": "./dist-server",
+    "baseUrl": "./"
+  },
+  "include": ["./server/**/*"],
+  "exclude": ["**/*.spec.ts"]
+}

package/views/auth-page.html CHANGED Viewed

@@ -3,11 +3,9 @@
   <head>
     <meta charset="utf-8" />
     <title>Operato Tools</title>
     <meta name="generator" content="Things Factory Starter Kit" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="description" content="Heart of Logistics" />
-    <meta name="google" content="notranslate"/>
     <base href="/" />
@@ -61,14 +59,10 @@
         padding: 0;
         overflow: hidden;
-        overscroll-behavior-y: none;
         /* This is a font-stack that tries to use the system-default sans-serifs first */
         font-family: Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
         line-height: 1.5;
         -webkit-font-smoothing: antialiased;
-        accent-color: var(--primary-color);
       }
     </style>

package/views/public/home.html CHANGED Viewed

@@ -2,10 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <meta name="google" content="notranslate" />
     <title>Operato Tools</title>
     <meta name="generator" content="Things Factory Starter Kit" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="description" content="Heart of Logistics" />
     <base href="/" />
@@ -60,14 +59,10 @@
         padding: 0;
         overflow: hidden;
-        overscroll-behavior-y: none;
         /* This is a font-stack that tries to use the system-default sans-serifs first */
         font-family: Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
         line-height: 1.5;
         -webkit-font-smoothing: antialiased;
-        accent-color: var(--primary-color);
       }
     </style>

package/client/actions/main.js DELETED Viewed

	@@ -1 +0,0 @@
1	- export const UPDATE_OPERATO_TOOLS="UPDATE_OPERATO_TOOLS";

package/client/bootstrap.js DELETED Viewed

@@ -1,8 +0,0 @@
-import { store } from '@things-factory/shell'
-import operatoTools from './reducers/main'
-export default function bootstrap() {
-  store.addReducers({
-    operatoTools
-  })
-}

package/client/reducers/main.js DELETED Viewed

@@ -1 +0,0 @@

- import gql from"graphql-tag";import{i18next}from"@operato/i18n";import{store}from"@operato/shell";import{client,gqlContext}from"@operato/graphql";import{UPDATE_OPERATO_TOOLS}from"../actions/main";const INITIAL_STATE={operatoTools:"ABC",studioPermission:!1};export const UPDATE_OPERATO_TOOLS_PERMISSION="UPDATE_OPERATO_TOOLS_PERMISSION";(async()=>{var o=await client.query({query:gql`{studioPermission}`});let t=!1;o.errors||(t=o.data.studioPermission),store.dispatch({type:UPDATE_OPERATO_TOOLS_PERMISSION,state:{studioPermission:t}})})();const operatoTools=(o=INITIAL_STATE,t)=>{switch(t.type){case UPDATE_OPERATO_TOOLS:return{...o};case UPDATE_OPERATO_TOOLS_PERMISSION:return{...INITIAL_STATE,...t.state};default:return o}};export default operatoTools;

package/client/themes/grist-theme.css DELETED Viewed

@@ -1,200 +0,0 @@
-body {
-  --grid-container-border-color: 1px solid rgba(0, 0, 0, 0.09);
-  --grid-container-border-width: 1px 0;
-  --grist-background-color: var(--main-section-background-color);
-  --grist-title-margin: 0 0 0 10px;
-  --grist-title-border: none;
-  --grist-title-font: bold 16px var(--theme-font);
-  --grist-title-color: var(--secondary-color);
-  --grist-title-font: bold 16px var(--theme-font);
-  --grist-title-icon-color: var(--primary-color);
-  --grist-title-icon-margin: 0 3px 2px 0;
-  --grist-title-icon-size: var(--fontsize-default);
-  --grist-title-with-grid-padding: 0;
-  --grist-object-editor-font: normal 1em var(--theme-font);
-  --grist-object-editor-color: var(--secondary-color);
-  --grist-input-zoom: 1;
-  --grist-input-progress-border: 1px solid rgba(255, 255, 255, 0.5);
-  --grist-input-progress-background: rgba(121, 110, 110, 0.1);
-  --grist-input-progress-bar-background: #4ac5fd;
-  --grist-input-progress-bar-color: var(--theme-white-color);
-  --grid-header-background-color: transparent;
-  --grid-header-top-border: 2px solid rgba(var(--secondary-color-rgb), 0.7);
-  --grid-header-bottom-border: var(--grid-container-border-color);
-  --grid-header-border-color: rgba(var(--primary-color-rgb), 0.3);
-  --grid-header-padding: var(--padding-default) 0 var(--padding-narrow) var(--padding-default);
-  --grid-header-sorter-size: 18px;
-  --grid-header-splitter-border: var(--grid-container-border-color);
-  --grid-header-splitter-border-hover: 1px solid var(--primary-color);
-  --grid-header-color: rgba(var(--secondary-color-rgb), 0.8);
-  --grid-header-font: bold var(--fontsize-small) var(--theme-font);
-  --grid-header-filter-title-color: var(--primary-text-color);
-  --grid-header-filter-title-font: normal 12px var(--theme-font);
-  --grid-header-filter-title-icon-color: var(--primary-color);
-  --grid-gutter-padding: var(--padding-default) 0;
-  --grid-record-background-color: var(--theme-white-color);
-  --grid-record-odd-background-color: #f9f7f5;
-  --grid-record-padding: 0 5px 0 5px;
-  --grid-record-color: var(--secondary-color);
-  --grid-record-color-hover: var(--primary-color);
-  --grid-record-wide-fontsize: var(--fontsize-small);
-  --grid-record-selected-background-color: #f1f8e9;
-  --grid-record-selected-color: var(--grid-record-color);
-  --grid-record-focused-background-color: rgba(var(--primary-color-rgb), 0.2);
-  --grid-record-focused-border: 1px solid var(--primary-color);
-  --grid-record-focused-cell-background-color: rgba(var(--primary-color-rgb), 0.25);
-  --grid-record-focused-cell-border: 1px dashed var(--primary-color);
-  --grid-record-focused-color: var(--grid-record-color);
-  --grid-record-focused-box-shadow: 0px 2px 0px 0px rgb(0 0 0 / 10%);
-  --grid-record-emphasized-background-color: var(--primary-color);
-  --grid-record-emphasized-color: var(--theme-white-color);
-  --grid-record-editing-background-color: var(--theme-white-color);
-  --grid-record-editing-border: 1px dashed rgba(var(--primary-color-rgb), 0.4);
-  --grid-record-fontsize: var(--fontsize-large);
-  --grid-record-border-bottom: var(--grid-container-border-color);
-  --grid-record-dirty-border-top: 24px solid rgba(var(--primary-color-rgb), 0.6);
-  --grid-record-dirty-border-left: 24px solid transparent;
-  --grid-record-dirty-icon-font: bold 10px/12px var(--mdc-icon-font, 'Material Icons');
-  --grid-record-dirty-icon-size: var(--fontsize-large);
-  --grid-record-dirty-color: var(--theme-white-color);
-  --grid-footer-background-color: transparent;
-  --grid-footer-font-size: var(--fontsize-default);
-  --grid-footer-color: var(--secondary-color);
-  --grid-footer-limit-color: rgba(var(--secondary-color-rgb), 0.6);
-  --grid-footer-inactive-color: var(--grid-footer-limit-color);
-  --grid-footer-padding: var(--padding-default) var(--padding-narrow);
-  --data-list-background-color: var(--main-section-background-color);
-  --data-list-item-margin: var(--margin-default) 0 var(--margin-default) var(--margin-wide);
-  --data-list-item-padding: var(--padding-default) var(--padding-wide);
-  --data-list-item-border-bottom: var(--grid-container-border-color);
-  --data-list-item-name-font: bold 1em/1em var(--theme-font);
-  --data-list-item-name-color: var(--secondary-color);
-  --data-list-item-disc-font: normal 0.9em/1em var(--theme-font);
-  --data-list-item-disc-color: var(--secondary-text-color);
-  --data-list-item-etc-label-font: bold 1em/1em var(--theme-font);
-  --data-list-item-etc-font: normal 0.8em/1em var(--theme-font);
-  --data-list-item-etc-color: #585858;
-  --data-list-item-icon-font: normal 1em/1em;
-  --data-list-item-icon-color: var(--secondary-text-color);
-  --data-list-selected-background-color: var(--grid-record-selected-background-color);
-  --data-list-fab-position-horizontal: 15px;
-  --data-list-fab-position-vertical: 15px;
-  --data-list-fab-color: var(--primary-color);
-  --data-list-fab-shadow: var(--box-shadow);
-  --data-card-background-color: var(--main-section-background-color);
-  --data-card-record-card-background-color: var(--theme-white-color);
-  --data-card-record-card-border: var(--border-dark-color);
-  --data-card-record-card-border-hover: 1px solid var(--primary-color);
-  --data-card-record-card-boxshadow-hover: 1px 1px 2px 1px rgba(0, 0, 0, 0.15);
-  --data-card-record-card-selected-border: 1px solid var(--primary-color);
-  --data-card-record-card-border-radius: var(--border-radius);
-  --data-card-item-margin: var(--margin-default) 0 var(--margin-default) var(--margin-wide);
-  --data-card-item-padding: var(--padding-default) var(--padding-wide);
-  --data-card-item-border-bottom: var(--grid-container-border-color);
-  --data-card-item-name-font: bold 1.2em/1em var(--theme-font);
-  --data-card-item-name-color: var(--secondary-text-color);
-  --data-card-item-name-label-font: normal 0.65em/0.8em var(--theme-font);
-  --data-card-item-name-label-color: rgba(var(--secondary-color-rgb), 0.8);
-  --data-card-item-disc-font: normal 0.9em/1em var(--theme-font);
-  --data-card-item-disc-color: var(--primary-color);
-  --data-card-item-etc-label-font: normal 1em/1em var(--theme-font);
-  --data-card-item-etc-font: bold 0.8em/1em var(--theme-font);
-  --data-card-item-etc-color: var(--secondary-color);
-  --data-card-item-icon-font: normal 1em/1em;
-  --data-card-item-icon-color: var(--secondary-text-color);
-  --data-card-item-btn-border: var(--border-dark-color);
-  --data-card-item-btn-border-radius: var(--border-radius);
-  --data-card-item-btn-padding: var(--padding-narrow);
-  --data-card-selected-background-color: var(--grid-record-selected-background-color);
-  --data-card-fab-position-horizontal: 15px;
-  --data-card-fab-position-vertical: 15px;
-  --data-card-fab-color: var(--primary-color);
-  --data-card-fab-shadow: var(--box-shadow);
-  --data-card-template: repeat(auto-fit, minmax(32%, auto));
-  --data-card-thumbnail-height: 140px;
-  --data-card-thumbnail-border-bottom: var(--border-dark-color);
-  --data-card-attachimg-height: 70px;
-  --record-view-background-color: var(--main-section-background-color);
-  --record-view-gap: var(--margin-narrow) 0;
-  --record-view-padding: var(--padding-default);
-  --record-view-label-font: bold 15px var(--theme-font);
-  --record-view-label-color: var(--secondary-color);
-  --record-view-label-icon-size: var(--fontsize-small);
-  --record-view-font: normal 15px var(--theme-font);
-  --record-view-color: var(--secondary-color);
-  --record-view-focus-color: var(--primary-color);
-  --record-view-border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-  --record-view-edit-border-bottom: 2px solid var(--primary-color);
-  --record-view-item-padding: var(--padding-default);
-  --record-view-footer-background: #586272;
-  --record-view-footer-button-border: 1px solid rgba(0, 0, 0, 0.3);
-  --record-view-footer-button-border-width: 0 0 0 1px;
-  --record-view-footer-button-font: 17px;
-  --record-view-footer-button-color: var(--theme-white-color);
-  --record-view-footer-iconbutton-size: 35px;
-  --record-view-footer-focus-background: var(--primary-color);
-  --ox-grist-padding: var(--padding-default) var(--padding-default) 0 var(--padding-default);
-}
-@media only screen and (max-width: 460px) {
-  body {
-    --record-view-label-font: bold 15px/32px var(--theme-font);
-    --record-view-font: normal 15px/32px var(--theme-font);
-    --ox-grist-padding: 0;
-  }
-}
-@media print {
-  body {
-    --grist-input-zoom: 0.7;
-  }
-}
-@media only screen and (max-width: 460px) {
-  body {
-    --data-card-template: repeat(auto-fit, minmax(90%, auto));
-  }
-}
-@media (min-width: 461px) and (max-width: 700px) {
-  body {
-    --data-card-template: repeat(auto-fit, minmax(45%, auto));
-  }
-}
-@media (min-width: 461px) and (max-width: 1024px) {
-  body {
-    --data-card-create-form-padding: 7px;
-  }
-}
-@media (min-width: 1025px) and (max-width: 1400px) {
-  body {
-    --data-card-template: repeat(auto-fit, minmax(23%, auto));
-  }
-}
-@media (min-width: 1401px) and (max-width: 1800px) {
-  body {
-    --data-card-template: repeat(auto-fit, minmax(18%, auto));
-  }
-}
-@media (min-width: 1801px) and (max-width: 2200px) {
-  body {
-    --data-card-template: repeat(auto-fit, minmax(15%, auto));
-  }
-}
-@media only screen and (min-width: 2201px) {
-  body {
-    --data-card-template: repeat(auto-fit, minmax(13%, auto));
-  }
-}

package/client/themes/layout-theme.css DELETED Viewed

@@ -1,92 +0,0 @@
-body {
-  --header-bar-background-color: var(--secondary-color);
-  --header-bar-icon-size: var(--icon-default-size);
-  --header-bar-title: bold 17.5px var(--theme-font);
-  --header-bar-color: #fff;
-  --header-bar-height: 45px;
-  --header-bar-item-padding: 0px 5px 0 0;
-  --nav-bar-background-color: var(--primary-color);
-  --group-bar-background-color: var(--primary-color);
-  --group-bar-textbutton: 16px/32px var(--theme-font);
-  --group-bar-textbutton-active: bold var(--group-bar-textbutton);
-  --group-bar-active-line-color: var(--focus-color);
-  --group-bar-line: solid 3px rgba(0, 0, 0, 0.2);
-  --aside-background-color: var(--secondary-background-color);
-  --aside-list-textbtton: 18px var(--theme-font);
-  --aside-list-icon: var(--icon-default-size);
-  --aside-list-bottom-line: var(--border-dark-color);
-  --aside-list-detail-background-color: #fff;
-  --aside-list-detail-text: 14px var(--primary-background-color);
-  --footer-bar-border-top: 1px solid rgba(0, 0, 0, 0.2);
-  --button-container-margin: inintial;
-  --button-container-padding: 0 var(--padding-default) var(--padding-wide) var(--padding-default);
-  --button-container-background: transparent;
-  --button-container-height: initial;
-  --button-container-align: right;
-  --button-container-button-background-color: var(--secondary-color);
-  --button-container-button-border-radius: var(--button-border-radius);
-  --button-container-button-margin: var(--button-margin);
-  --button-container-button-font: bold var(--fontsize-large) var(--theme-font);
-  --button-container-button-color: var(--theme-white-color);
-  --button-container-button-height: initial;
-  --button-container-button-border: var(--button-border);
-  --popup-content-background-color: var(--main-section-background-color);
-  --popup-content-padding: 10px 20px;
-  /* components - floating overlay style */
-  --overlay-center-small-width: 30%;
-  --overlay-center-small-height: 30%;
-  --overlay-center-normal-width: 50%;
-  --overlay-center-normal-height: 50%;
-  --overlay-center-large-width: 75%;
-  --overlay-center-large-height: 75%;
-  --overlay-header-height: var(--header-bar-height);
-  --overlay-header-background-color: var(--header-bar-background-color);
-  --overlay-header-color: #fff;
-  --overlay-header-font: var(--header-bar-title);
-  --overlay-background-color: rgba(0, 0, 0, 0.5);
-  --overlay-margin-bottom: 0px;
-  /* components - resize splitter style */
-  --splitter-background-color: rgba(0, 0, 0, 0.1);
-  --splitter-hover-background-color: var(--primary-color);
-}
-@media only screen and (max-width: 460px) {
-  body {
-    --button-container-margin: 0 -15px;
-    --button-container-padding: 0 0 0 0;
-    --button-container-background: #586272;
-    --button-container-height: 50px;
-    --button-container-align: right;
-    --button-container-button-background-color: transparent;
-    --button-container-button-border-radius: 0;
-    --button-container-button-margin: 0;
-    --button-container-button-height: 50px;
-    --button-container-button-border: 1px solid rgba(0, 0, 0, 0.1);
-    --overlay-center-small-width: 100%;
-    --overlay-center-small-height: 100%;
-    --overlay-center-normal-width: 100%;
-    --overlay-center-normal-height: 100%;
-    --overlay-center-large-width: 100%;
-    --overlay-center-large-height: 100%;
-  }
-}
-@media (min-width: 461px) and (max-width: 1024px) {
-  body {
-    --overlay-center-small-width: 40%;
-    --overlay-center-small-height: 40%;
-    --overlay-center-normal-width: 60%;
-    --overlay-center-normal-height: 60%;
-    --overlay-center-large-width: 80%;
-    --overlay-center-large-height: 80%;
-  }
-}

package/client/themes/report-theme.css DELETED Viewed

@@ -1,47 +0,0 @@
-body {
-  --report-background-color: var(--main-section-background-color);
-  --report-padding: 15px;
-  --report-title-margin: 0 0 0 10px;
-  --report-title-border: none;
-  --report-title-color: var(--secondary-color);
-  --report-title-icon-color: var(--primary-color);
-  --report-title-icon-margin: 0 3px 2px 0;
-  --report-title-icon-size: 14px;
-  --report-title-with-grid-padding: 0;
-  --report-component-border-radius: var(--border-radius);
-  --report-header-background-color: rgba(var(--primary-color-rgb), 0.05);
-  --report-header-border: 1px solid var(--report-header-border-color);
-  --report-header-border-color: rgba(var(--primary-color-rgb), 0.3);
-  --report-header-padding: 5px 0 5px 5px;
-  --report-header-color: var(--secondary-text-color);
-  --report-header-font: normal 1em/1.5 var(--theme-font);
-  --report-header-fontsize: 13px;
-  --report-record-background-color: #fff;
-  --report-record-odd-background-color: #f6f6f6;
-  --report-record-field-padding: 7px 10px;
-  --report-record-field-border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-  --report-record-wide-fontsize: 13px;
-  --report-record-focused-background-color: #ffde3b47;
-  --report-record-focused-border: 1px dashed rgba(0, 0, 0, 0.5);
-  --report-totalized-background-color: #efefef;
-  --report-totalized-border: 1px solid rgba(0, 0, 0, 0.1);
-  --report-totalized-color: var(--secondary-text-color);
-  --report-grouped-background-color: #607d8bbf;
-  --report-grouped-border: 1px solid rgba(0, 0, 0, 0.2);
-  --report-grouped-color: #fff;
-}
-@media print {
-  body {
-    --report-header-padding: 5px;
-    --report-record-field-padding: 5px;
-    --report-record-wide-fontsize: 10px;
-    --report-grouped-background-color: #d7d7d7;
-    --report-grouped-color: #000;
-    --report-totalized-color: #000;
-  }
-}