Commit f207805ffef59fc719c5eb587d09cfa082291fe5

Authored by 杨鑫
1 parent 59e51671

修改

Showing 112 changed files with 46 additions and 4 deletions
lefthook.yml 0 → 100644
  1 +# EXAMPLE USAGE:
  2 +#
  3 +# Refer for explanation to following link:
  4 +# https://lefthook.dev/configuration/
  5 +#
  6 +# pre-push:
  7 +# jobs:
  8 +# - name: packages audit
  9 +# tags:
  10 +# - frontend
  11 +# - security
  12 +# run: yarn audit
  13 +#
  14 +# - name: gems audit
  15 +# tags:
  16 +# - backend
  17 +# - security
  18 +# run: bundle audit
  19 +#
  20 +# pre-commit:
  21 +# parallel: true
  22 +# jobs:
  23 +# - run: yarn eslint {staged_files}
  24 +# glob: "*.{js,ts,jsx,tsx}"
  25 +#
  26 +# - name: rubocop
  27 +# glob: "*.rb"
  28 +# exclude:
  29 +# - config/application.rb
  30 +# - config/routes.rb
  31 +# run: bundle exec rubocop --force-exclusion {all_files}
  32 +#
  33 +# - name: govet
  34 +# files: git ls-files -m
  35 +# glob: "*.go"
  36 +# run: go vet {files}
  37 +#
  38 +# - script: "hello.js"
  39 +# runner: node
  40 +#
  41 +# - script: "hello.go"
  42 +# runner: go run
... ...
泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/.env.development
... ... @@ -11,7 +11,7 @@ VITE_INJECT_APP_LOADING=true
11 11  
12 12 # 后台请求路径 具体在vite.config.mts配置代理
13 13 VITE_GLOB_API_URL="/dev-api"
14   -VITE_APP_URL="http://localhost:19001/api/app"
  14 +VITE_APP_URL="http://flus-test.3ffoodsafety.com/api/app"
15 15  
16 16 # 全局加密开关(即开启了加解密功能才会生效 不是全部接口加密 需要和后端对应)
17 17 VITE_GLOB_ENABLE_ENCRYPT=false
... ...
泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/.env.production
... ... @@ -15,8 +15,8 @@ VITE_INJECT_APP_LOADING=true
15 15 # 打包后是否生成dist.zip
16 16 VITE_ARCHIVER=true
17 17  
18   -# 后端接口地址
19   -VITE_GLOB_API_URL=/prod-api
  18 +# 后端接口地址(ABP 动态 API:/api/app)
  19 +VITE_GLOB_API_URL=http://flus-test.3ffoodsafety.com/api/app
20 20  
21 21 # 全局加密开关(即开启了加解密功能才会生效 不是全部接口加密 需要和后端对应)
22 22 VITE_GLOB_ENABLE_ENCRYPT=false
... ...
泰额版/Food Labeling Management Platform/.npmrc renamed to 泰额版/Food Labeling Management Platform-废弃/.npmrc 100755 → 100644
泰额版/Food Labeling Management Platform/LabelTemplateEditor_Full.md renamed to 泰额版/Food Labeling Management Platform-废弃/LabelTemplateEditor_Full.md
泰额版/Food Labeling Management Platform/README.md renamed to 泰额版/Food Labeling Management Platform-废弃/README.md 100755 → 100644
泰额版/Food Labeling Management Platform/build/assets/773f0c39e1986271e9144596caac519f934a6ae6-IDRCy9hk.png renamed to 泰额版/Food Labeling Management Platform-废弃/build/assets/773f0c39e1986271e9144596caac519f934a6ae6-IDRCy9hk.png

25.3 KB

泰额版/Food Labeling Management Platform/build/assets/FreightSans Bold-CftzBXfG.ttf renamed to 泰额版/Food Labeling Management Platform-废弃/build/assets/FreightSans Bold-CftzBXfG.ttf
No preview for this file type
泰额版/Food Labeling Management Platform/build/assets/index-Casc5CPp.js renamed to 泰额版/Food Labeling Management Platform-废弃/build/assets/index-Casc5CPp.js
No preview for this file type
泰额版/Food Labeling Management Platform/build/assets/index-j-TrTQbz.css renamed to 泰额版/Food Labeling Management Platform-废弃/build/assets/index-j-TrTQbz.css
泰额版/Food Labeling Management Platform/build/index.html renamed to 泰额版/Food Labeling Management Platform-废弃/build/index.html
泰额版/Food Labeling Management Platform/index.html renamed to 泰额版/Food Labeling Management Platform-废弃/index.html 100755 → 100644
泰额版/Food Labeling Management Platform/package-lock.json renamed to 泰额版/Food Labeling Management Platform-废弃/package-lock.json
泰额版/Food Labeling Management Platform/package.json renamed to 泰额版/Food Labeling Management Platform-废弃/package.json 100755 → 100644
泰额版/Food Labeling Management Platform/src/App.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/App.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/Attributions.md renamed to 泰额版/Food Labeling Management Platform-废弃/src/Attributions.md 100755 → 100644
泰额版/Food Labeling Management Platform/src/assets/773f0c39e1986271e9144596caac519f934a6ae6.png renamed to 泰额版/Food Labeling Management Platform-废弃/src/assets/773f0c39e1986271e9144596caac519f934a6ae6.png

25.3 KB

泰额版/Food Labeling Management Platform/src/assets/FreightSans Bold.ttf renamed to 泰额版/Food Labeling Management Platform-废弃/src/assets/FreightSans Bold.ttf 100755 → 100644
No preview for this file type
泰额版/Food Labeling Management Platform/src/components/PlaceholderView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/PlaceholderView.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/alerts/AlertsView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/alerts/AlertsView.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/dashboard/AlertsWidget.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/dashboard/AlertsWidget.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/dashboard/Dashboard.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/dashboard/Dashboard.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/dashboard/FoodWasteChart.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/dashboard/FoodWasteChart.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/dashboard/InfoChart.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/dashboard/InfoChart.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/dashboard/RightPanel.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/dashboard/RightPanel.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/dashboard/SensorsNetwork.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/dashboard/SensorsNetwork.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/dashboard/TasksWidget.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/dashboard/TasksWidget.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/devices/DevicesView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/devices/DevicesView.tsx
泰额版/Food Labeling Management Platform/src/components/figma/ImageWithFallback.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/figma/ImageWithFallback.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/invoices/InvoicesView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/invoices/InvoicesView.tsx
泰额版/Food Labeling Management Platform/src/components/labels/LabelBatchesView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/labels/LabelBatchesView.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/labels/LabelCategoriesView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/labels/LabelCategoriesView.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/labels/LabelTemplateEditor/ElementsPanel.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/labels/LabelTemplateEditor/ElementsPanel.tsx
泰额版/Food Labeling Management Platform/src/components/labels/LabelTemplateEditor/LabelCanvas.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/labels/LabelTemplateEditor/LabelCanvas.tsx
泰额版/Food Labeling Management Platform/src/components/labels/LabelTemplateEditor/PropertiesPanel.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/labels/LabelTemplateEditor/PropertiesPanel.tsx
泰额版/Food Labeling Management Platform/src/components/labels/LabelTemplateEditor/index.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/labels/LabelTemplateEditor/index.tsx
泰额版/Food Labeling Management Platform/src/components/labels/LabelTemplatesView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/labels/LabelTemplatesView.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/labels/LabelTypesView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/labels/LabelTypesView.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/labels/LabelsList.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/labels/LabelsList.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/labels/LabelsView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/labels/LabelsView.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/labels/MultipleOptionsView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/labels/MultipleOptionsView.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/layout/Header.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/layout/Header.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/layout/Layout.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/layout/Layout.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/layout/Sidebar.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/layout/Sidebar.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/locations/LocationsView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/locations/LocationsView.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/people/PeopleView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/people/PeopleView.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/products/ProductsView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/products/ProductsView.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/qrcodes/QRCodesView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/qrcodes/QRCodesView.tsx
泰额版/Food Labeling Management Platform/src/components/reports/ReportsView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/reports/ReportsView.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/training/TrainingView.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/training/TrainingView.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/accordion.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/accordion.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/alert-dialog.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/alert-dialog.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/alert.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/alert.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/aspect-ratio.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/aspect-ratio.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/avatar.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/avatar.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/badge.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/badge.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/breadcrumb.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/breadcrumb.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/button.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/button.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/calendar.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/calendar.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/card.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/card.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/carousel.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/carousel.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/chart.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/chart.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/checkbox.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/checkbox.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/collapsible.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/collapsible.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/command.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/command.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/context-menu.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/context-menu.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/dialog.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/dialog.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/drawer.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/drawer.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/dropdown-menu.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/dropdown-menu.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/form.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/form.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/hover-card.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/hover-card.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/input-otp.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/input-otp.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/input.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/input.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/label.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/label.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/menubar.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/menubar.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/navigation-menu.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/navigation-menu.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/pagination.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/pagination.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/popover.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/popover.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/progress.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/progress.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/radio-group.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/radio-group.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/resizable.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/resizable.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/scroll-area.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/scroll-area.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/select.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/select.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/separator.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/separator.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/sheet.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/sheet.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/sidebar.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/sidebar.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/skeleton.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/skeleton.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/slider.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/slider.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/sonner.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/sonner.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/switch.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/switch.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/table.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/table.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/tabs.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/tabs.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/textarea.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/textarea.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/toggle-group.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/toggle-group.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/toggle.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/toggle.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/tooltip.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/tooltip.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/use-mobile.ts renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/use-mobile.ts 100755 → 100644
泰额版/Food Labeling Management Platform/src/components/ui/utils.ts renamed to 泰额版/Food Labeling Management Platform-废弃/src/components/ui/utils.ts 100755 → 100644
泰额版/Food Labeling Management Platform/src/guidelines/Guidelines.md renamed to 泰额版/Food Labeling Management Platform-废弃/src/guidelines/Guidelines.md 100755 → 100644
泰额版/Food Labeling Management Platform/src/index.css renamed to 泰额版/Food Labeling Management Platform-废弃/src/index.css 100755 → 100644
泰额版/Food Labeling Management Platform/src/lib/labelTemplateStorage.ts renamed to 泰额版/Food Labeling Management Platform-废弃/src/lib/labelTemplateStorage.ts
泰额版/Food Labeling Management Platform/src/lib/presetLabelTemplates.ts renamed to 泰额版/Food Labeling Management Platform-废弃/src/lib/presetLabelTemplates.ts
泰额版/Food Labeling Management Platform/src/lib/supabaseClient.ts renamed to 泰额版/Food Labeling Management Platform-废弃/src/lib/supabaseClient.ts 100755 → 100644
泰额版/Food Labeling Management Platform/src/main.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/main.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/services/dashboardService.ts renamed to 泰额版/Food Labeling Management Platform-废弃/src/services/dashboardService.ts 100755 → 100644
泰额版/Food Labeling Management Platform/src/styles/globals.css renamed to 泰额版/Food Labeling Management Platform-废弃/src/styles/globals.css 100755 → 100644
泰额版/Food Labeling Management Platform/src/supabase/functions/server/index.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/supabase/functions/server/index.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/supabase/functions/server/kv_store.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/supabase/functions/server/kv_store.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/src/types/labelTemplate.ts renamed to 泰额版/Food Labeling Management Platform-废弃/src/types/labelTemplate.ts
泰额版/Food Labeling Management Platform/src/utils/supabase/info.tsx renamed to 泰额版/Food Labeling Management Platform-废弃/src/utils/supabase/info.tsx 100755 → 100644
泰额版/Food Labeling Management Platform/vite.config.ts renamed to 泰额版/Food Labeling Management Platform-废弃/vite.config.ts 100755 → 100644
美国版/Food Labeling Management Platform/src/components/dashboard/Dashboard.tsx
... ... @@ -492,7 +492,7 @@ export function Dashboard({ onViewReports, onViewAllRecentLabels }: DashboardPro
492 492 <CardHeader>
493 493 <CardTitle className="text-base font-bold text-gray-800 flex items-center gap-2">
494 494 <FileText className="w-5 h-5 text-gray-500" />
495   - Template Print Statistics
  495 + Printed labels byTemplates
496 496 </CardTitle>
497 497 <CardDescription>By template — labels printed in the last 30 days</CardDescription>
498 498 </CardHeader>
... ...