@eturnity/eturnity_reusable_components 7.20.0--EPDM-10564.2 → 7.20.0--EPDM-5518.4

package/babel.config.js

@@ -1,3 +1,5 @@
 module.exports = {
-  presets: ['@vue/cli-plugin-babel/preset']
-}
+  presets: [
+    '@vue/cli-plugin-babel/preset'
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.20.0--EPDM-10564.2",
+  "version": "7.20.0--EPDM-5518.4",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",
@@ -23,6 +23,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.12.16",
+    "@babel/eslint-parser": "7.12.16",
     "@vue/cli-plugin-babel": "5.0.8",
     "@vue/cli-plugin-eslint": "5.0.8",
     "@vue/cli-service": "5.0.8",

package/src/assets/svgIcons/clock_full.svg

@@ -0,0 +1,3 @@
+<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 10C7.76142 10 10 7.76142 10 5C10 2.23858 7.76142 0 5 0C2.23858 0 0 2.23858 0 5C0 7.76142 2.23858 10 5 10ZM5.875 5.05243V2.125H4.125V5.92743L6.19061 7.47663L7.24061 6.07663L5.875 5.05243Z" fill="white"/>
+</svg>

package/src/components/filter/filterSettings.vue

@@ -268,6 +268,12 @@
         :text="buttonText.cancel"
         @click="$emit('on-cancel-view')"
       />
+      <reset-container v-if="!filterViews || !filterViews.length">
+        <reset-button @click="$emit('on-reset-filters')">
+          <icon :name="'update'" size="14px" :color="theme.colors.blue" />
+          <div>{{ $gettext('reset_filters') }}</div>
+        </reset-button>
+      </reset-container>
     </button-container>
   </container-wrapper>
 </template>
@@ -329,6 +335,16 @@ const ButtonContainer = styled.div`
   padding: 15px;
 `
 
+const ResetContainer = styled.div`
+  display: grid;
+  align-content: center;
+  margin-left: auto;
+  div {
+    margin-top: 0;
+    align-self: center;
+  }
+`
+
 const ColumnContainer = styled.div``
 
 const DragContainer = styled.div`
@@ -455,6 +471,7 @@ export default {
     DeleteIcon,
     UpperContainer,
     ResetButton,
+    ResetContainer,
     VueDatePicker
   },
   props: {

package/src/components/infoText/index.vue

@@ -26,7 +26,7 @@
 //To use:
 // <info-text
 //     text="Veritatis et quasi architecto beatae vitae"
-//     size="20px"
+//     size="20"
 //     alignArrow="right" // which side the arrow should be on
 // />
 import theme from '../../assets/theme.js'

package/src/components/inputs/checkbox/index.vue

@@ -3,10 +3,11 @@
     <container
       :checkColor="checkColor"
       :size="size"
-      :hasLabel="hasLabel"
+      :hasLabel="label && !!label.length"
       :backgroundColor="backgroundColor"
       :isChecked="isChecked"
       :isDisabled="isDisabled"
+      :cursorType="cursorType"
     >
       <input-checkbox
         type="checkbox"
@@ -17,7 +18,7 @@
       <check-wrapper :hasLabel="hasLabel">
         <span class="checkmark"></span>
       </check-wrapper>
-      <label-text v-if="hasLabel">{{ label }}</label-text>
+      <label-text v-if="label && !!label.length">{{ label }}</label-text>
     </container>
   </component-wrapper>
 </template>
@@ -33,6 +34,7 @@
 //     size="small"
 //     backgroundColor="red"
 //     :isDisabled="true"
+//     cursorType="default"
 // />
 import styled from 'vue3-styled-components'
 
@@ -55,7 +57,8 @@ const containerAttrs = {
   hasLabel: Boolean,
   backgroundColor: String,
   isChecked: Boolean,
-  isDisabled: Boolean
+  isDisabled: Boolean,
+  cursorType: String
 }
 const Container = styled('label', containerAttrs)`
   display: grid;
@@ -64,7 +67,7 @@ const Container = styled('label', containerAttrs)`
   align-content: center;
   color: ${(props) => props.theme.colors.black};
   position: relative;
-  cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'pointer')};
+  cursor: ${(props) => (props.isDisabled ? 'not-allowed' : props.cursorType)};
   font-size: 16px;
   user-select: none;
 
@@ -89,7 +92,7 @@ const Container = styled('label', containerAttrs)`
           : props.theme.colors.green
         : props.isDisabled
         ? props.theme.colors.lightGray
-        : '#fff'};
+        : props.theme.colors.white};
     border-radius: 4px;
     border: 1px solid
       ${(props) =>
@@ -183,6 +186,10 @@ export default {
     dataId: {
       type: String,
       default: ''
+    },
+    cursorType: {
+      type: String,
+      default: 'pointer'
     }
   },
   computed: {

package/src/components/inputs/inputText/index.vue

@@ -328,7 +328,7 @@ export default {
     }
   },
   methods: {
-    onEnterPress(event){
+    onEnterPress() {
       this.$emit('on-enter-click')
       this.$refs.inputElement.$el.blur()
     },

package/src/components/inputs/select/index.vue

@@ -1,16 +1,18 @@
 <template>
   <Container
     :selectWidth="selectWidth"
-    :noRelative="noRelative"
     @mouseenter="mouseEnterHandler"
     @mouseleave="mouseLeaveHandler"
   >
     <input-wrapper
       :hasLabel="!!label && label.length > 0"
       :alignItems="alignItems"
-      :noRelative="noRelative"
     >
-      <label-wrapper v-if="label" :data-id="labelDataId">
+      <label-wrapper
+        v-if="label"
+        :data-id="labelDataId"
+        :shownDropdown="shownDropdown"
+      >
         <input-label
           :fontColor="
             labelFontColor || colorMode == 'dark' ? 'white' : 'eturnityGrey'
@@ -49,9 +51,7 @@
           :showBorder="showBorder"
           :data-id="dataId"
           :paddingLeft="paddingLeft"
-          :tablePaddingLeft="tablePaddingLeft"
-          :noRelative="noRelative"
-          :showDisabledBackground="showDisabledBackground"
+          :shownDropdown="shownDropdown"
         >
           <draggableInputHandle
             v-if="isDraggable && !isSearchBarVisible"
@@ -75,13 +75,14 @@
           />
           <selector
             v-else
-            :showBorder="showBorder"
             :selectWidth="selectWidth"
             :paddingLeft="paddingLeft"
+            :noMaxWidth="noMaxWidth"
+            :showBorder="showBorder"
           >
             <slot name="selector" :selectedValue="selectedValue"></slot>
           </selector>
-          <Caret @click.stop="toggleCaretDropdown" class="caret_dropdown">
+          <Caret @click.stop="toggleCaretDropdown">
             <icon
               v-if="isDropdownOpen"
               name="arrow_up"
@@ -104,7 +105,7 @@
             />
           </Caret>
         </selectButton>
-        <DropdownWrapper ref="dropdownWrapperRef" :noRelative="noRelative">
+        <DropdownWrapper ref="dropdownWrapperRef">
           <Teleport to="#portal-target">
             <selectDropdown
               ref="dropdown"
@@ -123,13 +124,10 @@
               :fontColor="
                 dropdownFontColor || colorMode == 'dark' ? 'white' : 'black'
               "
-              :noRelative="noRelative"
               :fontSize="fontSize"
-              :minWidth="minWidth"
               :selectedValue="selectedValue"
               @option-selected="optionSelected"
               @option-hovered="optionHovered"
-              @mouseleave="optionLeave"
             >
               <slot name="dropdown"></slot>
             </selectDropdown>
@@ -188,22 +186,17 @@ const Caret = styled.div`
 const selectorProps = {
   selectWidth: String,
   paddingLeft: String,
-  showBorder: Boolean
+  showBorder: Boolean,
+  noMaxWidth: Boolean
 }
 const Selector = styled('div', selectorProps)`
-  ${(props) =>
-    props.selectWidth === '100%'
-      ? 'width: 100%;'
-      : `width: calc(${props.selectWidth} -
-      (
-        ${CARET_WIDTH} +
-        ${props.paddingLeft}
-        ${props.showBorder ? `+ (${BORDER_WIDTH} * 2)` : ''}
-      )
-    );
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;`}
+  max-width: ${(props) =>
+    props.noMaxWidth
+      ? '100%'
+      : `calc(${props.selectWidth} - (${CARET_WIDTH} + ${props.paddingLeft} + (${BORDER_WIDTH} * 2)))`};
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
 `
 
 const labelAttrs = { fontSize: String, fontColor: String }
@@ -220,18 +213,19 @@ const optionalLabel = styled.span`
 `
 const inputProps = {
   selectWidth: String,
-  optionWidth: String,
-  noRelative: Boolean
+  optionWidth: String
 }
 const Container = styled('div', inputProps)`
   width: ${(props) => props.selectWidth};
-  position: ${(props) => (props.noRelative ? 'static' : 'relative')};
+  position: relative;
   display: inline-block;
 `
-const LabelWrapper = styled.div`
+
+const LabelAttrs = { shownDropdown: Boolean }
+const LabelWrapper = styled('div', LabelAttrs)`
   display: inline-grid;
   grid-template-columns: auto auto;
-  grid-gap: 12px;
+  grid-gap: ${(props) => (props.shownDropdown ? '0' : '12px')};
   align-items: center;
   justify-content: start;
 `
@@ -255,23 +249,17 @@ const selectButtonAttrs = {
   hasNoPadding: Boolean,
   showBorder: Boolean,
   paddingLeft: String,
-  noRelative: Boolean,
-  tablePaddingLeft: String,
-  showDisabledBackground: Boolean
+  shownDropdown: Boolean
 }
 const selectButton = styled('div', selectButtonAttrs)`
-  position: ${(props) => (props.noRelative ? 'static' : 'relative')};
+  position: relative;
   box-sizing: border-box;
   border-radius: 4px;
   max-width: ${(props) => (props.selectWidth ? props.selectWidth : '100%')};
   ${(props) =>
-    props.isSearchBarVisible
+    props.isSearchBarVisible || props.hasNoPadding
       ? ''
-      : `padding-left: ${
-          props.tablePaddingLeft ? props.tablePaddingLeft : props.paddingLeft
-        }`};
-  ${(props) =>
-    props.hasNoPadding ? '' : `padding-left: ${props.paddingLeft}`};
+      : `padding-left: ${props.shownDropdown ? '0' : props.paddingLeft}`};
   text-align: left;
   min-height: ${(props) =>
     props.selectHeight
@@ -292,7 +280,7 @@ const selectButton = styled('div', selectButtonAttrs)`
     }
   `}
   background-color:${(props) =>
-    props.disabled && props.showDisabledBackground
+    props.disabled
       ? props.theme.colors.grey5
       : props.theme.colors[props.bgColor]
       ? props.theme.colors[props.bgColor]
@@ -318,16 +306,13 @@ const selectDropdownAttrs = {
   fontSize: String,
   dropdownPosition: Object,
   hoveredValue: Number | String,
-  selectedValue: Number | String,
-  noRelative: Boolean,
-  minWidth: String
+  selectedValue: Number | String
 }
 const selectDropdown = styled('div', selectDropdownAttrs)`
   box-sizing: border-box;
   z-index: ${(props) => (props.isActive ? '2' : '99999')};
   position: absolute;
-  top: ${(props) =>
-    props.noRelative ? 'auto' : props.dropdownPosition?.top + 'px'};
+  top: ${(props) => props.dropdownPosition?.top}px;
   left: ${(props) => props.dropdownPosition?.left}px;
   border: ${BORDER_WIDTH} solid ${(props) => props.theme.colors.grey4};
   border-radius: 4px;
@@ -337,7 +322,6 @@ const selectDropdown = styled('div', selectDropdownAttrs)`
   padding: 0px;
   box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
   width: ${(props) => (props.optionWidth ? props.optionWidth : '100%')};
-  min-width: ${(props) => (props.minWidth ? props.minWidth : '100%')};
   background-color: ${(props) =>
     props.theme.colors[props.bgColor]
       ? props.theme.colors[props.bgColor]
@@ -357,17 +341,12 @@ const selectDropdown = styled('div', selectDropdownAttrs)`
   font-size: ${(props) => props.fontSize};
 `
 selectDropdown.emits = ['option-hovered', 'option-selected']
-const DropdownAttrs = { noRelative: Boolean }
-const DropdownWrapper = styled('div', DropdownAttrs)`
-  position: ${(props) => (props.noRelative ? 'static' : 'relative')};
+const DropdownWrapper = styled('div')`
+  position: relative;
 `
-const inputAttrs = {
-  alignItems: String,
-  hasLabel: Boolean,
-  noRelative: Boolean
-}
+const inputAttrs = { alignItems: String, hasLabel: Boolean }
 const InputWrapper = styled('div', inputAttrs)`
-  position: ${(props) => (props.noRelative ? 'static' : 'relative')};
+  position: relative;
   display: grid;
   align-items: center;
   gap: 8px;
@@ -396,10 +375,6 @@ export default {
       required: false,
       default: '13px'
     },
-    noRelative: {
-      required: false,
-      default: false
-    },
     label: {
       required: false
     },
@@ -432,9 +407,6 @@ export default {
       required: false,
       default: '36px'
     },
-    minWidth: {
-      required: false
-    },
     optionWidth: {
       required: false,
       default: null
@@ -510,12 +482,13 @@ export default {
       type: Boolean,
       default: false
     },
-    tablePaddingLeft: {
-      required: false
+    noMaxWidth: {
+      type: Boolean,
+      default: false
     },
-    showDisabledBackground: {
-      required: false,
-      default: true
+    shownDropdown: {
+      type: Boolean,
+      default: false
     },
     minOptionLength: {
       type: Number,
@@ -632,15 +605,22 @@ export default {
     searchChange(value) {
       this.textSearch = value
       this.$emit('search-change', value)
-      const dropdownChildren = [...this.$refs.dropdown.$el.children]
-      dropdownChildren.forEach((el) => {
-        if (!el.textContent.toLowerCase().includes(value.toLowerCase())) {
-          el.style.display = 'none'
-
-          return
-        }
-        el.style.display = 'inherit'
-      })
+      const children =
+        this.$refs.dropdown.$children &&
+        this.$refs.dropdown.$children[0] &&
+        this.$refs.dropdown.$children.length === 1 &&
+        this.$refs.dropdown.$children[0].$children.length
+          ? this.$refs.dropdown.$children[0].$children
+          : this.$refs.dropdown.$children
+      children
+        .map((component) => component.$el)
+        .forEach((el) => {
+          if (!el.textContent.toLowerCase().includes(value.toLowerCase())) {
+            el.style.display = 'none'
+          } else {
+            el.style.display = 'grid'
+          }
+        })
     },
     clickOutside(event) {
       const dropdownRef = this.$refs.dropdown

package/src/components/inputs/select/option/index.vue

@@ -16,7 +16,6 @@
     :disabledTextColor="disabledTextColor"
     :backgroundColor="colorMode == 'dark' ? '#000000' : backgroundColor"
     :title="hoverText"
-    :minWidth="minWidth"
     :padding="padding"
   >
     <slot></slot>
@@ -32,7 +31,6 @@ const optionProps = {
   hoveredBgColor: String,
   cursorType: String,
   backgroundColor: String,
-  minWidth: String,
   disabledBgColor: String,
   disabledTextColor: String,
   padding: String
@@ -46,7 +44,6 @@ const optionContainer = styled('div', optionProps)`
   padding: ${(props) => props.padding};
   gap: 14px;
   width: 100%;
-  min-width: ${(props) => (props.minWidth ? props.minWidth : '100%')};
   background-color: ${(props) =>
     props.isDisabled
       ? props.theme.colors[props.disabledBgColor]
@@ -109,9 +106,6 @@ export default {
       required: false,
       default: false
     },
-    minWidth: {
-      required: false
-    },
     disabledBgColor: {
       required: false,
       default: 'white'

package/src/components/inputs/textAreaInput/index.vue

@@ -49,7 +49,7 @@
 //     label="Question 5"
 //     alignItems="horizontal" // horizontal, vertical
 //     :isDisabled="true"
-// .   fontSize="13px"
+//     fontSize="13px"
 // />
 import styled from 'vue3-styled-components'
 import InfoText from '../../infoText'

package/src/components/markerItem/index.vue

@@ -27,8 +27,13 @@
 //   cursor="pointer"
 // />
 
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import Icon from '../icon'
+import Modal from '../modals/modal'
+import PageTitle from '../pageTitle'
+import DeleteIcon from '../deleteIcon'
+import PageSubtitle from '../pageSubtitle'
+import MainButton from '../buttons/mainButton'
 
 const PageContainer = styled.div`
   display: flex;
@@ -60,6 +65,11 @@ const MarkerContainer = styled('div', MarkerAttrs)`
   cursor: ${(props) => (props.isEditionAllowed ? 'pointer' : props.cursor)};
 `
 
+// const IconContainer = styled.div`
+//   padding: 8px;
+//   line-height: 0;
+// `
+
 export default {
   name: 'project-marker',
   components: {

package/src/components/pageTitle/index.vue

@@ -3,7 +3,11 @@
     <title-text :color="color" :fontSize="fontSize" :uppercase="uppercase">
       {{ text }}
     </title-text>
-    <info-text v-if="!!infoText" :text="infoText" :alignArrow="infoAlign" />
+    <info-text
+      v-if="!!infoText"
+      :text="infoText"
+      :alignArrow="infoAlign"
+    />
   </title-wrap>
 </template>
 
@@ -14,16 +18,16 @@
 //   text="My Page Title"
 //   color="red"
 // />
-import styled from 'vue3-styled-components'
-import InfoText from '../infoText'
+import styled from "vue3-styled-components"
+import InfoText from "../infoText"
 
 const wrapAttrs = { hasInfoText: Boolean }
-const TitleWrap = styled('div', wrapAttrs)`
+const TitleWrap = styled("div", wrapAttrs)`
   display: grid;
   align-items: center;
   grid-gap: 12px;
   grid-template-columns: ${(props) =>
-    props.hasInfoText ? 'auto auto 1fr' : '1fr'};
+    props.hasInfoText ? "auto auto 1fr" : "1fr"};
   margin-bottom: 20px;
 `
 
@@ -31,7 +35,7 @@ const titleAttrs = { color: String, fontSize: String, uppercase: Boolean }
 const TitleText = styled('span', titleAttrs)`
   color: ${(props) => (props.color ? props.color : props.theme.colors.black)};
   font-weight: bold;
-  font-size: ${(props) => (props.fontSize ? props.fontSize : '18px')};
+  font-size: ${(props) => (props.fontSize ? props.fontSize : '16px')};
   text-transform: ${(props) => (props.uppercase ? 'uppercase' : 'none')};
 `
 
@@ -50,7 +54,8 @@ export default {
       required: false
     },
     fontSize: {
-      required: false
+      required: false,
+      default: '16px'
     },
     uppercase: {
       required: false,
@@ -58,11 +63,11 @@ export default {
     },
     infoText: {
       required: false,
-      default: null
+      default: null,
     },
     infoAlign: {
-      required: false
+      required: false,
     }
-  }
+  },
 }
 </script>

package/src/components/pagination/index.vue

@@ -81,8 +81,6 @@ const paginationWrapper = styled.nav`
   flex-wrap: wrap;
   justify-content: flex-end;
   align-items: center;
-  margin-bottom: 2px;
-  margin-top: 10px;
 `
 const paginationLink = styled.div`
   display: flex;
@@ -92,15 +90,18 @@ const paginationLink = styled.div`
   border-radius: 3px;
   white-space: nowrap;
   cursor: pointer;
+  color: ${(props) => props.theme.colors.brightBlue};
 
   &.active {
-    color: #fff;
+    color: ${(props) => props.theme.colors.white};
     background-color: ${(props) => props.theme.colors.brightBlue};
     padding: 7px 12px;
     border-radius: 4px;
   }
 `
-const arrowText = styled.div``
+const arrowText = styled.div`
+  color: ${(props) => props.theme.colors.brightBlue};
+`
 const arrowIconContainer = styled.div`
   margin: 0 10px;
   display: flex;

package/src/components/projectMarker/index.vue

@@ -69,7 +69,7 @@
 </template>
 
 <script>
-// import ThreeDots from "@eturnity/eturnity_reusable_components/src/components/projectMarker"
+// import ProjectMarker from "@eturnity/eturnity_reusable_components/src/components/projectMarker"
 // To use:
 // <project-marker
 //   :activeLanguage="'en-us'"

package/src/components/selectedOptions/index.vue

@@ -0,0 +1,145 @@
+<template>
+  <page-container>
+    <box-container>
+      <selected-container
+        >{{ numberSelected }} {{ $gettext('selected') }}</selected-container
+      >
+      <list-container v-if="optionsList.length">
+        <list-item
+          v-for="item in optionsList"
+          :key="item.type"
+          :hoverColor="item.hoverColor"
+          @click="$emit('on-' + item.type)"
+        >
+          {{ item.name }}
+        </list-item>
+      </list-container>
+      <empty-text v-if="!optionsList.length">
+        {{ $gettext('no_batch_actions_available') }}
+      </empty-text>
+      <icon-container @click="$emit('on-close')">
+        <icon
+          name="close_for_modals,_tool_tips"
+          color="white"
+          size="14px"
+          cursor="pointer"
+        />
+      </icon-container>
+    </box-container>
+  </page-container>
+</template>
+
+<script>
+// import SelectedOptions from "@eturnity/eturnity_reusable_components/src/components/selectedOptions"
+// optionsList = [
+//   {
+//     type: 'export',
+//     name: 'Export'
+//   },
+//   {
+//     type: 'delete',
+//     name: 'Delete',
+//     hoverColor: 'red' // default is green
+//   }
+// ]
+// @on-${type}="function" should $emit the callback for the 'type' in the optionsList
+// <selected-options
+//   :numberSelected="numberSelected"
+//   :optionsList="optionsList"
+//   @on-close="onCloseFunction()"
+//   @on-export="function()" @on-delete="function()"
+// />
+import styled from 'vue-styled-components'
+import Icon from '../icon'
+
+const PageContainer = styled.div`
+  position: fixed;
+  bottom: 30px;
+  left: 50%;
+  transform: translateX(-50%);
+`
+
+const SelectedContainer = styled.div`
+  display: grid;
+  align-items: center;
+  height: 100%;
+  padding-right: 20px;
+  border-right: 1px solid rgba(255, 255, 255, 0.2);
+`
+
+const BoxContainer = styled.div`
+  display: flex;
+  align-items: center;
+  background-color: ${(props) => props.theme.colors.black};
+  opacity: 90%;
+  color: ${(props) => props.theme.colors.white};
+  border-radius: 4px;
+  padding: 8px 10px 8px 20px;
+  font-size: 14px;
+  height: 40px;
+`
+
+const ListContainer = styled.div`
+  padding: 0 20px;
+  display: flex;
+  gap: 20px;
+  color: ${(props) => props.theme.colors.white};
+`
+
+const ListAttrs = {
+  hoverColor: String
+}
+const ListItem = styled('div', ListAttrs)`
+  cursor: pointer;
+  &:hover {
+    color: ${(props) =>
+      props.hoverColor
+        ? props.theme.colors[props.hoverColor]
+        : props.theme.colors.green};
+  }
+`
+
+const IconContainer = styled.div`
+  display: grid;
+  align-items: center;
+  justify-items: center;
+  height: 30px;
+  width: 30px;
+  cursor: pointer;
+  margin-left: 20px;
+
+  &:hover {
+    background: rgba(255, 255, 255, 0.1);
+    border-radius: 4px;
+  }
+`
+
+const EmptyText = styled.div`
+  color: ${(props) => props.theme.colors.white};
+  font-size: 13px;
+  padding-left: 16px;
+`
+
+export default {
+  name: 'selected-options',
+  components: {
+    PageContainer,
+    BoxContainer,
+    SelectedContainer,
+    ListContainer,
+    ListItem,
+    Icon,
+    IconContainer,
+    EmptyText
+  },
+  props: {
+    optionsList: {
+      required: true
+    },
+    numberSelected: {
+      required: true,
+      default: 0
+    }
+  }
+}
+</script>