playbook_ui 6.1.0.pre.alpha2 → 7.0.0.pre.alpha1

data/app/pb_kits/playbook/tokens/index.scss

@@ -0,0 +1,11 @@
+@import "animation-curves";
+@import "border_radius";
+@import "colors";
+@import "line_height";
+@import "opacity";
+@import "positioning";
+@import "screen_sizes";
+@import "shadows";
+@import "spacing";
+@import "transition";
+@import "typography";

data/app/pb_kits/playbook/vendor.js

@@ -5,10 +5,6 @@ window.pbChart = pbChart
 // Forms
 import './pb_form/pb_form_validation'
 
-// Date Picker
-import datePickerHelper from './pb_date_picker/date_picker_helper.js'
-window.datePickerHelper = datePickerHelper
-
 // Lazy image loading
 import 'lazysizes'
 
@@ -24,4 +20,7 @@ PbTypeahead.start()
 import PbTable from './pb_table'
 PbTable.start()
 
-import 'flatpickr'
+// React-Rendered Rails Kits =====
+import WebpackerReact from 'webpacker-react'
+import * as ReactRailsPBKits from './react_rails_kits.js'
+WebpackerReact.setup({ ...ReactRailsPBKits })

data/lib/generators/kit/templates/kit_jsx.erb.tt

@@ -9,9 +9,9 @@ props_types = @kit_props.map do |key, val|
   prop_name = key == "classname" ? "className" : key.camelize(:lower)
   prop_type = case val
               when "enum", "one_of" then "'option_1' | 'option_2'"
-              when "boolean", "bool" then "Boolean"
+              when "boolean", "bool" then "boolean"
               when "object", "obj" then "object"
-              else "String"
+              else "string"
               end
 
   "#{prop_name}?: #{prop_type}"

data/lib/playbook/engine.rb

@@ -21,6 +21,7 @@ module Playbook
     initializer "playbook_ui.add_view_paths", after: :add_view_paths do |_app|
       ActiveSupport.on_load(:action_controller) do
         append_view_path "#{Gem.loaded_specs['playbook_ui'].full_gem_path}/app/pb_kits/playbook"
+        append_view_path "#{Gem.loaded_specs['playbook_ui'].full_gem_path}/app/pb_kits/playbook/config"
       end
     end
 

data/lib/playbook/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Playbook
-  VERSION = "6.1.0.pre.alpha2"
+  VERSION = "7.0.0.pre.alpha1"
 end

data/lib/tasks/pb_release.rake

@@ -39,6 +39,9 @@ namespace :pb_release do
       puts "Updated Gemfile.lock"
       puts "\n\n"
 
+      puts "\nCreating dist files"
+      `yarn release`
+
       puts "Commit your changes and create a PR to merge to master"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playbook_ui
 version: !ruby/object:Gem::Version
-  version: 6.1.0.pre.alpha2
+  version: 7.0.0.pre.alpha1
 platform: ruby
 authors:
 - Power UX
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -387,9 +387,6 @@ files:
 - app/assets/images/pb-check.svg
 - app/assets/images/pb.logo.svg
 - app/controllers/playbook/application_controller.rb
-- app/controllers/playbook/guides_controller.rb
-- app/controllers/playbook/pages_controller.rb
-- app/controllers/playbook/samples_controller.rb
 - app/helpers/playbook/application_helper.rb
 - app/helpers/playbook/layout_helper.rb
 - app/helpers/playbook/pb_doc_helper.rb
@@ -403,22 +400,6 @@ files:
 - app/pb_kits/playbook/config/_pb_kit_api.html.erb
 - app/pb_kits/playbook/data/menu.yml
 - app/pb_kits/playbook/index.js
-- app/pb_kits/playbook/packs/application.js
-- app/pb_kits/playbook/packs/examples.js
-- app/pb_kits/playbook/packs/main.scss
-- app/pb_kits/playbook/packs/samples.js
-- app/pb_kits/playbook/packs/site_styles/_samples.scss
-- app/pb_kits/playbook/packs/site_styles/_scaffold.scss
-- app/pb_kits/playbook/packs/site_styles/_site-style.scss
-- app/pb_kits/playbook/packs/site_styles/docs/_all.scss
-- app/pb_kits/playbook/packs/site_styles/docs/_bg_light_doc_example.scss
-- app/pb_kits/playbook/packs/site_styles/docs/_code_snippet.scss
-- app/pb_kits/playbook/packs/site_styles/docs/_color_utilities.scss
-- app/pb_kits/playbook/packs/site_styles/docs/_flex_examples.scss
-- app/pb_kits/playbook/packs/site_styles/docs/_kit_doc.scss
-- app/pb_kits/playbook/packs/site_styles/docs/_kits_examples.scss
-- app/pb_kits/playbook/packs/site_styles/docs/_markdown.scss
-- app/pb_kits/playbook/packs/site_styles/docs/_spacing_tokens.scss
 - app/pb_kits/playbook/pb_avatar/_avatar.html.erb
 - app/pb_kits/playbook/pb_avatar/_avatar.jsx
 - app/pb_kits/playbook/pb_avatar/_avatar.scss
@@ -680,29 +661,6 @@ files:
 - app/pb_kits/playbook/pb_date/docs/_description.md
 - app/pb_kits/playbook/pb_date/docs/example.yml
 - app/pb_kits/playbook/pb_date/docs/index.js
-- app/pb_kits/playbook/pb_date_picker/_date_picker.html.erb
-- app/pb_kits/playbook/pb_date_picker/_date_picker.jsx
-- app/pb_kits/playbook/pb_date_picker/_date_picker.scss
-- app/pb_kits/playbook/pb_date_picker/date_picker.rb
-- app/pb_kits/playbook/pb_date_picker/date_picker_helper.js
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_default.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_default.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_default_date.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_default_date.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_disabled.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_disabled.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_error.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_error.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_format.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_format.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_label.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_label.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_min_max.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_min_max.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_range.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_range.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/example.yml
-- app/pb_kits/playbook/pb_date_picker/docs/index.js
 - app/pb_kits/playbook/pb_date_range_inline/_date_range_inline.html.erb
 - app/pb_kits/playbook/pb_date_range_inline/_date_range_inline.jsx
 - app/pb_kits/playbook/pb_date_range_inline/_date_range_inline.scss
@@ -868,7 +826,6 @@ files:
 - app/pb_kits/playbook/pb_form/form_builder.rb
 - app/pb_kits/playbook/pb_form/form_builder/action_area.rb
 - app/pb_kits/playbook/pb_form/form_builder/collection_select_field.rb
-- app/pb_kits/playbook/pb_form/form_builder/date_picker_field.rb
 - app/pb_kits/playbook/pb_form/form_builder/form_field_builder.rb
 - app/pb_kits/playbook/pb_form/form_builder/form_with_form_builder.rb
 - app/pb_kits/playbook/pb_form/form_builder/select_field.rb
@@ -1788,6 +1745,7 @@ files:
 - app/pb_kits/playbook/props/percentage.rb
 - app/pb_kits/playbook/props/proc.rb
 - app/pb_kits/playbook/props/string.rb
+- app/pb_kits/playbook/react_rails_kits.js
 - app/pb_kits/playbook/tokens/_animation-curves.scss
 - app/pb_kits/playbook/tokens/_border_radius.scss
 - app/pb_kits/playbook/tokens/_colors.scss
@@ -1800,6 +1758,7 @@ files:
 - app/pb_kits/playbook/tokens/_spacing.scss
 - app/pb_kits/playbook/tokens/_transition.scss
 - app/pb_kits/playbook/tokens/_typography.scss
+- app/pb_kits/playbook/tokens/index.scss
 - app/pb_kits/playbook/types.js
 - app/pb_kits/playbook/utilities/_background_colors.scss
 - app/pb_kits/playbook/utilities/_colors.scss
@@ -1808,47 +1767,6 @@ files:
 - app/pb_kits/playbook/utilities/props.js
 - app/pb_kits/playbook/utilities/text.js
 - app/pb_kits/playbook/vendor.js
-- app/views/layouts/playbook/_mobile_hamburger.html.erb
-- app/views/layouts/playbook/_nav.html.erb
-- app/views/layouts/playbook/_sidebar.html.erb
-- app/views/layouts/playbook/application.html.slim
-- app/views/layouts/playbook/fullscreen.html.slim
-- app/views/layouts/playbook/grid.html.slim
-- app/views/layouts/playbook/samples.html.erb
-- app/views/playbook/guides/create_kit.html.slim
-- app/views/playbook/guides/create_kit/_file_naming.html.md
-- app/views/playbook/guides/create_kit/_generator.html.md
-- app/views/playbook/guides/create_kit/_kit_examples.html.md
-- app/views/playbook/guides/create_kit/_kit_rails.html.md
-- app/views/playbook/guides/create_kit/_kit_react.html.md
-- app/views/playbook/guides/create_kit/_layout.html.md
-- app/views/playbook/guides/create_kit/_view_objects.html.md
-- app/views/playbook/guides/create_kit/_writing_sass.md
-- app/views/playbook/guides/use_nitro.html.slim
-- app/views/playbook/guides/use_nitro/_local.html.md
-- app/views/playbook/guides/use_nitro/_nitro_components.html.md
-- app/views/playbook/guides/use_nitro/_versions.html.md
-- app/views/playbook/pages/fullscreen.html.slim
-- app/views/playbook/pages/grid.html.slim
-- app/views/playbook/pages/home.html.slim
-- app/views/playbook/pages/kit_category_show.html.erb
-- app/views/playbook/pages/kit_show.html.erb
-- app/views/playbook/pages/kits.html.erb
-- app/views/playbook/pages/principals/_getting_started.html.md
-- app/views/playbook/pages/principles.html.slim
-- app/views/playbook/pages/tokens.html.slim
-- app/views/playbook/pages/tokens/_pb_doc_spacing.html.slim
-- app/views/playbook/pages/utilities.html.slim
-- app/views/playbook/pages/utilities/_pb_doc_color.html.slim
-- app/views/playbook/samples/collection_detail/index.html.erb
-- app/views/playbook/samples/collection_detail/index.jsx
-- app/views/playbook/samples/dashboards/index.html.erb
-- app/views/playbook/samples/dashboards/index.jsx
-- app/views/playbook/samples/filter_table/index.html.erb
-- app/views/playbook/samples/filter_table/index.jsx
-- app/views/playbook/samples/registration/index.html.erb
-- app/views/playbook/samples/registration/index.jsx
-- app/views/playbook/samples/sample_show.html.erb
 - fonts/fontawesome-min.js
 - fonts/regular-min.js
 - lib/generators/kit/USAGE

data/app/controllers/playbook/guides_controller.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency "playbook/application_controller"
-
-module Playbook
-  class GuidesController < ApplicationController
-    def create_kit; end
-
-    def use_nitro; end
-  end
-end

data/app/controllers/playbook/pages_controller.rb

@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency "playbook/application_controller"
-require "yaml"
-
-module Playbook
-  class PagesController < ApplicationController
-    before_action :set_kit, only: %i[kit_show_rails kit_show_react]
-    before_action :ensure_kit_type_exists, only: %i[kit_show_rails kit_show_react]
-    before_action :set_category, only: %i[kit_category_show_rails kit_category_show_react]
-
-    def home; end
-
-    def utilities; end
-
-    def tokens; end
-
-    def kits
-      params[:type] ||= "react"
-      @type = params[:type]
-    end
-
-    def principles; end
-
-    def grid
-      render layout: "layouts/playbook/grid"
-    end
-
-    def kit_show_rails
-      render template: "playbook/pages/kit_show"
-    end
-
-    def kit_show_react
-      render template: "playbook/pages/kit_show"
-    end
-
-    def kit_category_show_rails
-      params[:type] ||= "rails"
-      @type = params[:type]
-      render template: "playbook/pages/kit_category_show"
-    end
-
-    def kit_category_show_react
-      render template: "playbook/pages/kit_category_show"
-    end
-
-  private
-
-    def set_category
-      categories = MENU["kits"].map { |link| link.first.first if link.is_a?(Hash) }.compact
-      @category = params[:name]
-      if categories.flatten.include?(@category)
-        @category_kits = MENU["kits"].map { |link| link.first.last if link.is_a?(Hash) && link.first.first == @category }.compact.flatten
-        @kits = params[:name]
-      else
-        redirect_to root_path, flash: { error: "That kit does not exist" }
-      end
-    end
-
-    def set_kit
-      menu = MENU["kits"].map { |link| link.is_a?(Hash) ? link.first.last : link }
-      if menu.flatten.include?(params[:name])
-        @kit = params[:name]
-      else
-        redirect_to root_path, flash: { error: "That kit does not exist" }
-      end
-    end
-
-    def ensure_kit_type_exists
-      # TODO: unsure why we cannot simply use the helpers that are included in ApplicationController - fix this
-      is_rails_kit = action_name == "kit_show_rails"
-      files = is_rails_kit ? File.join("**", "*.erb") : File.join("**", "*.jsx")
-      kit_files = Dir.glob(files, base: "#{Playbook::Engine.root}/app/pb_kits/playbook/pb_#{@kit}/docs").present?
-      if !kit_files.present?
-        redirect_to action: is_rails_kit ? "kit_show_react" : "kit_show_rails"
-      end
-    end
-  end
-end

data/app/controllers/playbook/samples_controller.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency "playbook/application_controller"
-require "yaml"
-
-module Playbook
-  class SamplesController < ApplicationController
-    before_action :set_sample, only: %i[sample_show_rails sample_show_react]
-
-    layout "playbook/samples"
-
-    def samples
-      params[:type] ||= "rails"
-      @type = params[:type]
-    end
-
-    def sample_show_rails
-      params[:type] ||= "rails"
-      @type = params[:type]
-      render template: "playbook/samples/sample_show"
-    end
-
-    def sample_show_react
-      params[:type] ||= "react"
-      @type = params[:type]
-      render template: "playbook/samples/sample_show"
-    end
-
-  private
-
-    def set_sample
-      menu = MENU["samples"].map { |link| link.is_a?(Hash) ? link.first.last : link }
-      if menu.flatten.include?(params[:name])
-        @sample = params[:name]
-      else
-        redirect_to root_path, flash: { error: "That kit does not exist" }
-      end
-    end
-  end
-end

data/app/pb_kits/playbook/packs/application.js

@@ -1,55 +0,0 @@
-import '../../../../fonts/fontawesome-min.js'
-import '../../../../fonts/regular-min.js'
-import './main.scss'
-import '../vendor.js'
-
-// Move to separate file
-window.$(document).on('click', '[data-toggle]', function(e) {
-  e.preventDefault()
-
-  var kitContainer = window.$(this).closest('.pb--doc')
-  var toggleTarget = window.$(this).data('toggle')
-
-  window
-    .$(kitContainer)
-    .find('[data-action="toggle"]')
-    .hide()
-  window
-    .$(kitContainer)
-    .find('[data-togglable="' + toggleTarget + '"]')
-    .show()
-})
-
-window.$(document).ready(() => {
-  $('.compress').hide()
-
-  window.$(document).on('click', '.toggle-button', (e) => {
-    e.preventDefault()
-    $('.pb--codeCopy').toggleClass('close')
-  })
-
-  $('.expand').click(() => {
-    $('.sample-nav').hide()
-    $('.compress').show()
-  })
-
-  $('.compress').click(() => {
-    $('.sample-nav').show()
-    $('.compress').hide()
-  })
-
-  const setClipboard = (value) => {
-    var tempInput = document.createElement('textarea')
-    tempInput.style = 'position: absolute; left: -1000px; top: -1000px'
-    tempInput.value = value
-    document.body.appendChild(tempInput)
-    tempInput.select()
-    document.execCommand('copy')
-    document.body.removeChild(tempInput)
-  }
-
-  $('.copy-clipboard').click(() => {
-    var copyText = document.querySelector('.hiddenCodeforCopy').textContent
-    setClipboard(copyText)
-  })
-})

data/app/pb_kits/playbook/packs/examples.js

@@ -1,177 +0,0 @@
-// ===========================================
-// Generated file from kit generator.
-//
-// KIT EXAMPLES
-// ===========================================
-
-import WebpackerReact from 'webpacker-react'
-
-//
-// ===========================================
-// ===========================================
-// Generated file from kit generator.
-// KIT EXAMPLES
-
-import '../pb_form/pb_form_validation'
-import * as Avatar from 'pb_avatar/docs'
-import * as AvatarActionButton from 'pb_avatar_action_button/docs'
-import * as Badge from 'pb_badge/docs'
-import * as BarGraph from 'pb_bar_graph/docs'
-import * as Body from 'pb_body/docs'
-import * as Button from 'pb_button/docs'
-import * as ButtonToolbar from 'pb_button_toolbar/docs'
-import * as Caption from 'pb_caption/docs'
-import * as Card from 'pb_card/docs'
-import * as Checkbox from 'pb_checkbox/docs'
-import * as CircleIconButton from 'pb_circle_icon_button/docs'
-import * as Contact from 'pb_contact/docs'
-import * as Currency from 'pb_currency/docs'
-import * as DashboardValue from 'pb_dashboard_value/docs'
-import * as Date from 'pb_date/docs'
-import * as DatePicker from 'pb_date_picker/docs'
-import * as DateRangeInline from 'pb_date_range_inline/docs'
-import * as DateRangeStacked from 'pb_date_range_stacked/docs'
-import * as DateStacked from 'pb_date_stacked/docs'
-import * as DateTimeStacked from 'pb_date_time_stacked/docs'
-import * as DateYearStacked from 'pb_date_year_stacked/docs'
-import * as DistributionBar from 'pb_distribution_bar/docs'
-import * as FileUpload from 'pb_file_upload/docs'
-import * as Filter from 'pb_filter/docs'
-import * as FixedConfirmationToast from 'pb_fixed_confirmation_toast/docs'
-import * as Flex from 'pb_flex/docs'
-import * as FormPill from 'pb_form_pill/docs'
-import * as Gauge from 'pb_gauge/docs'
-import * as Hashtag from 'pb_hashtag/docs'
-import * as Highlight from 'pb_highlight/docs'
-import * as HomeAddressStreet from 'pb_home_address_street/docs'
-import * as Icon from 'pb_icon/docs'
-import * as IconCircle from 'pb_icon_circle/docs'
-import * as IconValue from 'pb_icon_value/docs'
-import * as Image from 'pb_image/docs'
-import * as LabelPill from 'pb_label_pill/docs'
-import * as LabelValue from 'pb_label_value/docs'
-import * as Layout from 'pb_layout/docs'
-import * as Legend from 'pb_legend/docs'
-import * as LineGraph from 'pb_line_graph/docs'
-import * as List from 'pb_list/docs'
-import * as LoadingInline from 'pb_loading_inline/docs'
-import * as Message from 'pb_message/docs'
-import * as MultipleUsers from 'pb_multiple_users/docs'
-import * as MultipleUsersStacked from 'pb_multiple_users_stacked/docs'
-import * as Nav from 'pb_nav/docs'
-import * as OnlineStatus from 'pb_online_status/docs'
-import * as PbReactPopover from 'pb_popover/docs'
-import * as Person from 'pb_person/docs'
-import * as PersonContact from 'pb_person_contact/docs'
-import * as Pill from 'pb_pill/docs'
-import * as ProgressPills from 'pb_progress_pills/docs'
-import * as ProgressSimple from 'pb_progress_simple/docs'
-import * as ProgressStep from 'pb_progress_step/docs'
-import * as Radio from 'pb_radio/docs'
-import * as SectionSeparator from 'pb_section_separator/docs'
-import * as Select from 'pb_select/docs'
-import * as SelectableCard from 'pb_selectable_card/docs'
-import * as SelectableCardIcon from 'pb_selectable_card_icon/docs'
-import * as SelectableIcon from 'pb_selectable_icon/docs'
-import * as Source from 'pb_source/docs'
-import * as StarRating from 'pb_star_rating/docs'
-import * as StatChange from 'pb_stat_change/docs'
-import * as StatValue from 'pb_stat_value/docs'
-import * as Table from 'pb_table/docs'
-import * as Textarea from 'pb_textarea/docs'
-import * as TextInput from 'pb_text_input/docs'
-import * as Time from 'pb_time/docs'
-import * as Timeline from 'pb_timeline/docs'
-import * as TimeStacked from 'pb_time_stacked/docs'
-import * as Timestamp from 'pb_timestamp/docs'
-import * as TimeRangeInline from 'pb_time_range_inline/docs'
-import * as Title from 'pb_title/docs'
-import * as TitleCount from 'pb_title_count/docs'
-import * as TitleDetail from 'pb_title_detail/docs'
-import * as Toggle from 'pb_toggle/docs'
-import * as User from 'pb_user/docs'
-import * as UserBadge from 'pb_user_badge/docs'
-import * as WeekdayStacked from 'pb_weekday_stacked/docs'
-
-WebpackerReact.setup({
-  ...Avatar,
-  ...AvatarActionButton,
-  ...Badge,
-  ...BarGraph,
-  ...Body,
-  ...Button,
-  ...ButtonToolbar,
-  ...Caption,
-  ...Card,
-  ...Checkbox,
-  ...CircleIconButton,
-  ...Contact,
-  ...Currency,
-  ...DashboardValue,
-  ...Date,
-  ...DatePicker,
-  ...DateRangeInline,
-  ...DateRangeStacked,
-  ...DateStacked,
-  ...DateTimeStacked,
-  ...DateYearStacked,
-  ...DistributionBar,
-  ...FileUpload,
-  ...Filter,
-  ...FixedConfirmationToast,
-  ...Flex,
-  ...FormPill,
-  ...Gauge,
-  ...Hashtag,
-  ...Highlight,
-  ...HomeAddressStreet,
-  ...Icon,
-  ...IconCircle,
-  ...IconValue,
-  ...Image,
-  ...LabelPill,
-  ...LabelValue,
-  ...Layout,
-  ...Legend,
-  ...LineGraph,
-  ...List,
-  ...LoadingInline,
-  ...Message,
-  ...MultipleUsers,
-  ...MultipleUsersStacked,
-  ...Nav,
-  ...OnlineStatus,
-  ...PbReactPopover,
-  ...Person,
-  ...PersonContact,
-  ...Pill,
-  ...ProgressPills,
-  ...ProgressSimple,
-  ...ProgressStep,
-  ...Radio,
-  ...SectionSeparator,
-  ...Select,
-  ...SelectableCard,
-  ...SelectableIcon,
-  ...SelectableCardIcon,
-  ...Source,
-  ...StarRating,
-  ...StatChange,
-  ...StatValue,
-  ...Table,
-  ...Textarea,
-  ...TextInput,
-  ...Time,
-  ...Timeline,
-  ...TimeStacked,
-  ...Timestamp,
-  ...TimeRangeInline,
-  ...Title,
-  ...TitleCount,
-  ...TitleDetail,
-  ...Toggle,
-  ...User,
-  ...UserBadge,
-  ...WeekdayStacked,
-})
-