spree_admin 5.0.0.rc1

data/app/javascript/spree/admin/controllers/webhook_subscriber_events_controller.js

@@ -0,0 +1,19 @@
+import { Controller } from '@hotwired/stimulus'
+
+export default class extends Controller {
+  static targets = ['eventsCheckboxesContainer', 'subscribeToAll']
+
+  hideCheckboxes() {
+    this.eventsCheckboxesContainerTarget.classList.add('d-none')
+  }
+
+  showCheckboxes() {
+    this.eventsCheckboxesContainerTarget.classList.remove('d-none')
+  }
+
+  initialize() {
+    if (this.subscribeToAllTarget.checked) {
+      this.hideCheckboxes()
+    }
+  }
+}

data/app/javascript/spree/admin/helpers/bootstrap.js

@@ -0,0 +1,49 @@
+import 'jquery'
+import 'bootstrap'
+import { lockScroll, unlockScroll } from 'spree/core/helpers/scroll_lock'
+
+
+const initTooltips = () => {
+  $('.with-tip').each(function() {
+    $(this).tooltip()
+  })
+
+  $('.with-tip').on('show.bs.tooltip', function(event) {
+    if (('ontouchstart' in window)) {
+      event.preventDefault()
+    }
+  })
+}
+
+const removeTooltips = () => {
+  $('.with-tip').each(function() {
+    $(this).tooltip('dispose')
+  })
+}
+
+const resetDialogModal = () => {
+  const modalElement = document.getElementById('dialog_modal')
+  const modalTitle = modalElement ? modalElement.querySelector('.modal-title') : null
+  const modalBody = modalElement ? modalElement.querySelector('.modal-body') : null
+  if (modalBody) {
+    modalBody.innerHTML = '<div class="spinner-border text-light mx-auto my-5" role="status"><span class="sr-only">Loading...</span></div>'
+  }
+  if (modalTitle) {
+    modalTitle.innerHTML = 'Loading...'
+  }
+}
+
+const fixModalAutofocus = () => {
+  $('.modal').on('shown.bs.modal', function (e) {
+    $('[autofocus]', e.target).focus();
+  });
+}
+
+$('.modal').on('show.bs.modal', lockScroll)
+$('.modal').on('hide.bs.modal', unlockScroll)
+$('.modal').on('hidden.bs.modal	', resetDialogModal)
+
+document.addEventListener("turbo:click", removeTooltips)
+document.addEventListener("turbo:load", initTooltips)
+document.addEventListener('turbo:frame-render', initTooltips)
+document.addEventListener('turbo:frame-render', fixModalAutofocus)

data/app/javascript/spree/admin/helpers/canvas.js

@@ -0,0 +1,29 @@
+// ugly JS copied from a tutorial :)
+const initOffcanvas = () => {
+  document.querySelectorAll('.pull-bs-canvas-right, .pull-bs-canvas-left').forEach((element) => {
+    element.addEventListener('click', () => {
+      document.body.insertAdjacentHTML('afterbegin', '<div class="bs-canvas-overlay bg-dark position-fixed w-100 h-100"></div>');
+      if(element.classList.contains('pull-bs-canvas-right'))
+        document.querySelector('.bs-canvas-right').classList.add('mr-0');
+      else
+        document.querySelector('.bs-canvas-left').classList.add('ml-0');
+    })
+  })
+
+  document.querySelectorAll('.bs-canvas-close, .bs-canvas-overlay').forEach((element) => {
+    element.addEventListener('click', () => {
+      let elm = element.classList.contains('bs-canvas-close') ? element.closest('.bs-canvas') : document.querySelector('.bs-canvas');
+      elm.classList.remove('mr-0', 'ml-0');
+      document.querySelector('.bs-canvas-overlay').remove();
+    })
+  })
+}
+
+const hideOffcanvas = () => {
+  document.querySelector('.bs-canvas')?.classList?.remove('mr-0', 'ml-0');
+  document.querySelector('.bs-canvas-overlay')?.remove();
+}
+
+document.addEventListener("turbo:load", initOffcanvas)
+document.addEventListener("turbo:click", hideOffcanvas)
+

data/app/javascript/spree/admin/helpers/tinymce.js

@@ -0,0 +1,65 @@
+document.addEventListener('turbo:before-render', initializeTinmce)
+document.addEventListener('turbo:load', initializeTinmce)
+document.addEventListener('turbo:frame-render', initializeTinmce)
+
+function initializeTinmce() {
+  tinymce.remove()
+
+  tinymce.init({
+    content_style: 'body { font-family: Inter, sans-serif; font-size: 14px; }',
+    selector: '.spree-rte',
+    height: 300,
+    extended_valid_elements: 'span',
+    indent: false,
+    plugins: ['image', 'table', 'code', 'link', 'lists'],
+    menubar: false,
+    inline_boundaries: false,
+    toolbar: 'undo redo | formatselect | bold italic link forecolor backcolor | bullist numlist outdent indent | alignleft aligncenter alignright alignjustify | table | code',
+    // Default styles without heading 1
+    style_formats: [
+      {
+        title: 'Headings',
+        items: [
+          { title: 'Heading 2', format: 'h2' },
+          { title: 'Heading 3', format: 'h3' },
+          { title: 'Heading 4', format: 'h4' },
+          { title: 'Heading 5', format: 'h5' },
+          { title: 'Heading 6', format: 'h6' }
+        ]
+      },
+      {
+        title: 'Inline',
+        items: [
+          { title: 'Bold', format: 'bold' },
+          { title: 'Italic', format: 'italic' },
+          { title: 'Underline', format: 'underline' },
+          { title: 'Strikethrough', format: 'strikethrough' },
+          { title: 'Superscript', format: 'superscript' },
+          { title: 'Subscript', format: 'subscript' },
+          { title: 'Code', format: 'code' }
+        ]
+      },
+      {
+        title: 'Blocks',
+        items: [
+          { title: 'Paragraph', format: 'p' },
+          { title: 'Blockquote', format: 'blockquote' },
+          { title: 'Div', format: 'div' },
+          { title: 'Pre', format: 'pre' }
+        ]
+      },
+      {
+        title: 'Align',
+        items: [
+          { title: 'Left', format: 'alignleft' },
+          { title: 'Center', format: 'aligncenter' },
+          { title: 'Right', format: 'alignright' },
+          { title: 'Justify', format: 'alignjustify' }
+        ]
+      }
+    ],
+    setup: function (ed) {
+      if (document.getElementById(ed.id).hasAttribute('readonly')) ed.mode.set('readonly')
+    }
+  })
+}

data/app/javascript/spree/admin/helpers/trix/video_embed.js

@@ -0,0 +1,182 @@
+import { post, destroy } from '@rails/request.js'
+
+const lang = Trix.config.lang
+lang['embed'] = 'Embed'
+lang['embedVideo'] = 'Embed a video'
+
+Trix.config.toolbar.getDefaultHTML = function() {
+  return `<div class="trix-button-row">
+      <span class="trix-button-group trix-button-group--text-tools" data-trix-button-group="text-tools">
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-bold" data-trix-attribute="bold" data-trix-key="b" title="${lang.bold}" tabindex="-1">${lang.bold}</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-italic" data-trix-attribute="italic" data-trix-key="i" title="${lang.italic}" tabindex="-1">${lang.italic}</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-strike" data-trix-attribute="strike" title="${lang.strike}" tabindex="-1">${lang.strike}</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-link" data-trix-attribute="href" data-trix-action="link" data-trix-key="k" title="${lang.link}" tabindex="-1">${lang.link}</button>
+      </span>
+
+      <span class="trix-button-group trix-button-group--block-tools" data-trix-button-group="block-tools">
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-heading-1" data-trix-attribute="heading1" title="${lang.heading1}" tabindex="-1">${lang.heading1}</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-quote" data-trix-attribute="quote" title="${lang.quote}" tabindex="-1">${lang.quote}</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-code" data-trix-attribute="code" title="${lang.code}" tabindex="-1">${lang.code}</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-bullet-list" data-trix-attribute="bullet" title="${lang.bullets}" tabindex="-1">${lang.bullets}</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-number-list" data-trix-attribute="number" title="${lang.numbers}" tabindex="-1">${lang.numbers}</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-decrease-nesting-level" data-trix-action="decreaseNestingLevel" title="${lang.outdent}" tabindex="-1">${lang.outdent}</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-increase-nesting-level" data-trix-action="increaseNestingLevel" title="${lang.indent}" tabindex="-1">${lang.indent}</button>
+      </span>
+
+      <span class="trix-button-group trix-button-group--file-tools" data-trix-button-group="file-tools">
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-attach" data-trix-action="attachFiles" title="${lang.attachFiles}" tabindex="-1">${lang.attachFiles}</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-embed" data-trix-action="x-video-embed" title="${lang.embedVideo}" tabindex="-1">${lang.embedVideo}</button>
+      </span>
+
+      <span class="trix-button-group-spacer"></span>
+
+      <span class="trix-button-group trix-button-group--history-tools" data-trix-button-group="history-tools">
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-undo" data-trix-action="undo" data-trix-key="z" title="${lang.undo}" tabindex="-1">${lang.undo}</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-redo" data-trix-action="redo" data-trix-key="shift+z" title="${lang.redo}" tabindex="-1">${lang.redo}</button>
+      </span>
+    </div>
+
+    <div class="trix-dialogs" data-trix-dialogs>
+      <div class="trix-dialog trix-dialog--link" data-trix-dialog="href" data-trix-dialog-attribute="href">
+        <div class="trix-dialog__link-fields">
+          <input type="url" name="href" class="trix-input trix-input--dialog" placeholder="${lang.urlPlaceholder}" aria-label="${lang.url}" data-trix-input>
+          <div class="trix-button-group">
+            <input type="button" class="trix-button trix-button--dialog" value="${lang.link}" data-trix-method="setAttribute">
+            <input type="button" class="trix-button trix-button--dialog" value="${lang.unlink}" data-trix-method="removeAttribute">
+          </div>
+        </div>
+      </div>
+
+      <div class="trix-dialog trix-dialog--x-video-embed" data-trix-dialog="href" data-trix-dialog-attribute="href">
+        <div class="trix-dialog__link-fields">
+          <input type="url" name="href" class="trix-input trix-input--dialog" placeholder="${lang.urlPlaceholder}" aria-label="${lang.url}" data-trix-input>
+          <div class="trix-button-group">
+            <input type="button" class="trix-button trix-button--dialog" value="${lang.embed}">
+          </div>
+        </div>
+
+        <div class="trix-dialog--error-container mt-2 d-none">
+          <small class="trix-dialog--error-message text-danger"></small>
+        </div>
+      </div>
+    </div>`
+}
+
+// Show a dialog for embedding a video after clicking the video embed button
+document.addEventListener("trix-action-invoke", function(event) {
+  const { invokingElement, actionName } = event
+
+  if (actionName == "x-video-embed") {
+    const dialog = invokingElement.closest("trix-toolbar").querySelector(".trix-dialog--x-video-embed")
+    const input = dialog.querySelector('.trix-input--dialog')
+
+    if (!invokingElement.classList.contains("trix-active")) {
+      activateTrixElement(invokingElement)
+      activateTrixElement(dialog)
+
+      input.disabled = false
+      input.focus()
+    } else {
+      input.disabled = true
+
+      deactivateTrixElement(dialog)
+      deactivateTrixElement(invokingElement)
+    }
+  }
+})
+
+// Clean up the video embed attachment after removing it from the rich text content
+document.addEventListener("trix-attachment-remove", async function(event) {
+  const { attachment } = event
+  const { sgid } = attachment.attachment.attributes.values
+
+  destroy(`/admin/action_text/video_embeds/${sgid}`, { responseKind: 'json' })
+})
+
+function initializeTrixEditor(editor) {
+  // Deactivate video embed button after clicking on the editor window
+  editor.addEventListener("click", function(_event) {
+    const toolbar = editor.previousElementSibling
+
+    if (toolbar.tagName == "TRIX-TOOLBAR") {
+      const videoEmbedButton = toolbar.querySelector('[data-trix-action="x-video-embed"]')
+
+      if (videoEmbedButton && videoEmbedButton.classList.contains("trix-active")) {
+        deactivateTrixElement(videoEmbedButton)
+      }
+    }
+  })
+
+  // Attach a video embed
+  const toolbar = editor.previousElementSibling
+
+  if (toolbar.tagName == "TRIX-TOOLBAR") {
+    const dialog = toolbar.querySelector(".trix-dialog--x-video-embed")
+    const embedButton = dialog.querySelector(".trix-button--dialog")
+
+    embedButton.addEventListener("click", async function(event) {
+      const input = event.target.closest('.trix-dialog--x-video-embed').querySelector('.trix-input--dialog')
+
+      input.disabled = true
+      embedButton.disabled = true
+
+      const errorContainer = dialog.querySelector(".trix-dialog--error-container")
+      const errorMessage = errorContainer.querySelector(".trix-dialog--error-message")
+
+      if (!errorContainer.classList.contains('d-none')) {
+        errorContainer.classList.add('d-none')
+      }
+
+      errorMessage.innerHTML = ''
+
+      const response = await post('/admin/action_text/video_embeds', { body: JSON.stringify({ url: input.value }), responseKind: 'json' })
+
+      if (response.ok) {
+        const { sgid, content } = await response.json
+
+        const attachment = new Trix.Attachment({ content, sgid })
+        editor.editor.insertAttachment(attachment)
+
+        const videoEmbedButton = toolbar.querySelector('[data-trix-action="x-video-embed"]')
+        deactivateTrixElement(videoEmbedButton)
+
+        input.value = ''
+        embedButton.disabled = false
+      } else {
+        const { error } = await response.json
+
+        if (errorContainer.classList.contains('d-none')) {
+          errorContainer.classList.remove('d-none')
+        }
+
+        errorMessage.innerHTML = error
+
+        input.disabled = false
+        embedButton.disabled = false
+      }
+    })
+  }
+}
+
+function activateTrixElement(element) {
+  element.classList.add("trix-active")
+  element.setAttribute("data-trix-active", "")
+}
+
+function deactivateTrixElement(element) {
+  element.classList.remove("trix-active")
+  element.removeAttribute("data-trix-active")
+}
+
+// On page reload, trix-initialize event is not fired, so we need to initialize the toolbar and editor here
+const toolbars = document.querySelectorAll('trix-toolbar')
+toolbars.forEach(toolbar => toolbar.innerHTML = Trix.config.toolbar.getDefaultHTML())
+
+const trixEditors = document.querySelectorAll('trix-editor')
+trixEditors.forEach(editor => initializeTrixEditor(editor))
+
+// This will be used to initialize the editor after the page is loaded and the editor is added later, eg. in the page builder
+document.addEventListener("trix-initialize", function(event) {
+  const editor = event.target
+  initializeTrixEditor(editor)
+})

data/app/javascript/spree/admin/helpers/uppy_active_storage.js

@@ -0,0 +1,210 @@
+/* eslint-disable no-undef */
+import BasePlugin from "@uppy/core/lib/BasePlugin.js"
+import { createId } from "@paralleldrive/cuid2"
+// const Translator = require('@uppy/utils/lib/Translator');
+// const { Provider, Socket } = require('@uppy/companion-client');
+// const emitSocketProgress = require('@uppy/utils/lib/emitSocketProgress');
+// const getSocketHost = require('@uppy/utils/lib/getSocketHost');
+import { RateLimitedQueue } from '@uppy/utils/lib/RateLimitedQueue'
+import { DirectUpload } from "@rails/activestorage"
+
+export default class ActiveStorageUpload extends BasePlugin {
+  constructor(uppy, opts) {
+    super(uppy, opts)
+
+    this.id = opts.id || "ActiveStorageUpload"
+    this.title = opts.title || "ActiveStorageUpload"
+    this.type = "uploader"
+
+    const defaultOptions = {
+      limit: 0,
+      timeout: 30 * 1000,
+      directUploadUrl: null,
+      headers: {}
+    }
+
+    this.opts = Object.assign({}, defaultOptions, opts)
+
+    // Simultaneous upload limiting is shared across all uploads with this plugin.
+    if (typeof this.opts.limit === "number" && this.opts.limit !== 0) {
+      this.limitUploads = new RateLimitedQueue(this.opts.limit)
+    } else {
+      this.limitUploads = fn => fn
+    }
+
+    this.handleUpload = this.handleUpload.bind(this)
+  }
+
+  install() {
+    this.uppy.addUploader(this.handleUpload)
+  }
+
+  uninstall() {
+    this.uppy.removeUploader(this.handleUpload)
+  }
+
+  handleUpload(fileIDs) {
+    if (fileIDs.length === 0) {
+      this.uppy.log("[ActiveStorage] No files to upload!")
+      return Promise.resolve()
+    }
+
+    this.uppy.log("[ActiveStorage] Uploading...")
+    const files = fileIDs.map(fileID => this.uppy.getFile(fileID))
+
+    return this.uploadFiles(files).then(() => null)
+  }
+
+  upload(file, current, total) {
+    this.uppy.log(`uploading ${current} of ${total}`)
+
+    return new Promise((resolve, reject) => {
+      const timer = this.createProgressTimeout(this.opts.timeout, error => {
+        //xhr.abort();
+        this.uppy.emit("upload-error", file, error)
+        reject(error)
+      })
+
+      var directHandlers = {
+        directUploadWillStoreFileWithXHR: null,
+        directUploadDidProgress: null,
+      }
+      directHandlers.directUploadDidProgress = ev => {
+        this.uppy.log(`[XHRUpload] ${id} progress: ${ev.loaded} / ${ev.total}`)
+        timer.progress()
+
+        if (ev.lengthComputable) {
+          this.uppy.emit("upload-progress", file, {
+            uploader: this,
+            bytesUploaded: ev.loaded,
+            bytesTotal: ev.total,
+          })
+        }
+      }
+      directHandlers.directUploadWillStoreFileWithXHR = request => {
+        request.upload.addEventListener("progress", event =>
+          directHandlers.directUploadDidProgress(event)
+        )
+      }
+
+      const { data, meta } = file
+
+      if (!data.name && meta.name) {
+        data.name = meta.name
+      }
+
+      const upload = new DirectUpload(data, this.opts.directUploadUrl, directHandlers, this.opts.headers);
+      const id = createId()
+
+      upload.create((error, blob) => {
+        this.uppy.log(`[XHRUpload] ${id} finished`)
+        timer.done()
+
+        if (error) {
+          const response = {
+            status: "error",
+          }
+
+          this.uppy.setFileState(file.id, { response })
+
+          this.uppy.emit("upload-error", file, error)
+          return reject(error)
+        } else {
+          const response = {
+            status: "success",
+            directUploadSignedId: blob.signed_id,
+          }
+
+          this.uppy.setFileState(file.id, { response })
+
+          this.uppy.emit("upload-success", file, blob)
+
+          return resolve(file)
+        }
+      })
+
+      this.uppy.on("file-removed", removedFile => {
+        if (removedFile.id === file.id) {
+          timer.done()
+          upload.abort && upload.abort()
+        }
+      })
+
+      this.uppy.on("upload-cancel", fileID => {
+        if (fileID === file.id) {
+          timer.done()
+          upload.abort && upload.abort()
+        }
+      })
+
+      this.uppy.on("cancel-all", () => {
+        timer.done()
+        upload.abort && upload.abort()
+      })
+    })
+  }
+
+  uploadFiles(files) {
+    const actions = files.map((file, i) => {
+      const current = parseInt(i, 10) + 1
+      const total = files.length
+
+      if (file.error) {
+        return () => Promise.reject(new Error(file.error))
+      } else {
+        this.uppy.emit("upload-start", [file])
+        return this.upload.bind(this, file, current, total)
+      }
+    })
+
+    const promises = actions.map(action => {
+      const limitedAction = this.limitUploads(action)
+      return limitedAction()
+    })
+
+    return Promise.allSettled(promises)
+  }
+
+  // Helper to abort upload requests if there has not been any progress for `timeout` ms.
+  // Create an instance using `timer = createProgressTimeout(10000, onTimeout)`
+  // Call `timer.progress()` to signal that there has been progress of any kind.
+  // Call `timer.done()` when the upload has completed.
+  createProgressTimeout(timeout, timeoutHandler) {
+    const uppy = this.uppy
+    const self = this
+    let isDone = false
+
+    function onTimedOut() {
+      uppy.log("[XHRUpload] timed out")
+      const error = new Error(self.i18n("timedOut", { seconds: Math.ceil(timeout / 1000) }))
+      timeoutHandler(error)
+    }
+
+    let aliveTimer = null
+    function progress() {
+      // Some browsers fire another progress event when the upload is
+      // cancelled, so we have to ignore progress after the timer was
+      // told to stop.
+      if (isDone) return
+
+      if (timeout > 0) {
+        if (aliveTimer) clearTimeout(aliveTimer)
+        aliveTimer = setTimeout(onTimedOut, timeout)
+      }
+    }
+
+    function done() {
+      uppy.log("[XHRUpload] timer done")
+      if (aliveTimer) {
+        clearTimeout(aliveTimer)
+        aliveTimer = null
+      }
+      isDone = true
+    }
+
+    return {
+      progress,
+      done,
+    }
+  }
+}

data/app/models/spree/admin/resource.rb

@@ -0,0 +1,36 @@
+module Spree
+  module Admin
+    class Resource
+      def initialize(controller_path, controller_name, parent_model, object_name = nil)
+        @controller_path = controller_path
+        @controller_name = controller_name
+        @parent_model = parent_model
+        @object_name = object_name
+      end
+
+      def sub_namespace_parts
+        @controller_path.split('/')[2..-2]
+      end
+
+      def model_class
+        sub_namespace = sub_namespace_parts.map(&:capitalize).join('::')
+        sub_namespace = "#{sub_namespace}::" unless sub_namespace.empty?
+        "Spree::#{sub_namespace}#{@controller_name.classify}".constantize
+      end
+
+      def model_name
+        sub_namespace = sub_namespace_parts.join('/')
+        sub_namespace = "#{sub_namespace}/" unless sub_namespace.empty?
+        @parent_model.gsub("spree/#{sub_namespace}", '')
+      end
+
+      def object_name
+        return @object_name if @object_name
+
+        sub_namespace = sub_namespace_parts.join('_')
+        sub_namespace = "#{sub_namespace}_" unless sub_namespace.empty?
+        "#{sub_namespace}#{@controller_name.singularize}"
+      end
+    end
+  end
+end

data/app/models/spree/admin/updater.rb

@@ -0,0 +1,42 @@
+require 'net/http'
+require 'json'
+require 'uri'
+
+module Spree
+  module Admin
+    class Updater
+      SPREE_CLOUD_UPDATES_URL = 'https://spreecloud.io/updates.json'
+
+      @updates = nil
+
+      def self.update_available?
+        fetch_updates.any?
+      end
+
+      def self.latest_version
+        @latest_version ||= fetch_updates.first&.dig('version')
+      end
+
+      def self.fetch_updates
+        @updates ||= Rails.cache.fetch("spree/admin/updater/fetch_updates/#{Spree.version}", expires_in: 1.day) do
+          uri = URI(SPREE_CLOUD_UPDATES_URL)
+          params = { version: Spree.version, environment: Rails.env, url: Spree::Store.current.url_or_custom_domain }
+          uri.query = URI.encode_www_form(params)
+
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = uri.scheme == 'https'
+          http.open_timeout = 1 # 1s timeout for opening the connection
+          http.read_timeout = 1 # 1s timeout for reading the response
+
+          response = http.get(uri)
+          return {} unless response.is_a?(Net::HTTPSuccess)
+
+          JSON.parse(response.body)
+        end
+      rescue Net::OpenTimeout, Net::ReadTimeout, SocketError, Errno::ECONNREFUSED, JSON::ParserError => e
+        Rails.logger.error("Failed to fetch Spree updates: #{e.message}")
+        {}
+      end
+    end
+  end
+end