Merge pull request #1863 from smeup/themeUpdate

Theme update
smeup · Apr 16, 2024 · 742b31d · 742b31d
2 parents f6f5514 + 7ad86ac
commit 742b31d
Show file tree

Hide file tree

Showing 45 changed files with 2,558 additions and 571 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -6,6 +6,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 
 # Define env vars
 ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
+ENV NODE_OPTIONS=--max-old-space-size=8192
 
 # [Optional] Uncomment if you want to install an additional version of node using nvm
 ARG EXTRA_NODE_VERSION="lts/hydrogen"

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -38,6 +38,7 @@
                 "esbenp.prettier-vscode",
                 "dbaeumer.vscode-eslint",
                 "firsttris.vscode-jest-runner",
+                "elltg.elltg-npm-script-run",
                 "octref.vetur"
             ],
             "settings": {

diff --git a/.devcontainer/scripts/git/pre-push b/.devcontainer/scripts/git/pre-push
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+yarn run k:build
+yarn run k:test:all
diff --git a/.devcontainer/scripts/postCreateCommand.sh b/.devcontainer/scripts/postCreateCommand.sh
@@ -3,5 +3,10 @@
 echo "Set permissions"
 sudo chown -R node:node node_modules
 
+echo "Set Git hooks"
+echo "Set pre-push hook"
+cp .devcontainer/scripts/git/pre-push .git/hooks
+chmod +x .git/hooks/pre-push
+
 echo "Installing Deps"
 yarn install
diff --git a/packages/ketchup-showcase/src/views/components/advanced/planner/examples/PlannerDemo.vue b/packages/ketchup-showcase/src/views/components/advanced/planner/examples/PlannerDemo.vue
@@ -121,6 +121,15 @@ export default {
           default: 'undefined',
           try: 'field',
         },
+        {
+          prop: 'detailHours',
+          description:
+            'Columns containing detail duration, from (firstHour) to (secondHour)',
+          type: 'string',
+          default: 'undefined',
+          isArray: true,
+          try: 'field',
+        },
         {
           prop: 'detailIdCol',
           description: 'Column containing unique detail identifier',
@@ -135,6 +144,15 @@ export default {
           default: 'undefined',
           try: 'field',
         },
+        {
+          prop: 'detailPrevHours',
+          description:
+            'Columns containing fForecast detail duration, from (firstHour) to (secondHour)',
+          type: 'string',
+          default: 'undefined',
+          isArray: true,
+          try: 'field',
+        },
         {
           prop: 'detailPrevDates',
           description:
@@ -198,6 +216,15 @@ export default {
           try: 'field',
           isArray: true,
         },
+        {
+          prop: 'phaseHours',
+          description:
+            'Columns containing phase duration, from (firstHour) to (secondHour)',
+          type: 'string',
+          default: 'undefined',
+          try: 'field',
+          isArray: true,
+        },
         {
           prop: 'phaseIdCol',
           description: 'Column containing unique phase identifier',
@@ -212,6 +239,15 @@ export default {
           default: 'undefined',
           try: 'field',
         },
+        {
+          prop: 'phasePrevHours',
+          description:
+            'Columns containing forecast phase duration, from (firstHour) to (secondHour)',
+          type: 'string',
+          default: 'undefined',
+          try: 'json',
+          isArray: true,
+        },
         {
           prop: 'phasePrevDates',
           description:
@@ -228,6 +264,13 @@ export default {
           default: 'false',
           try: 'switch',
         },
+        {
+          prop: 'scrollableTaskList',
+          description: 'Enable/disable scrollbar for task list',
+          type: 'boolean',
+          default: 'false',
+          try: 'switch',
+        },
         {
           prop: 'showSecondaryDates',
           description: 'Enable/disable display of secondary dates',
@@ -260,6 +303,15 @@ export default {
           default: 'undefined',
           try: 'field',
         },
+        {
+          prop: 'taskHours',
+          description:
+            'Columns containing task duration, from (firstHour) to (secondHour)',
+          type: 'string',
+          default: 'undefined',
+          try: 'json',
+          isArray: true,
+        },
         {
           prop: 'taskIdCol',
           description: 'Column containing unique task identifier',
@@ -288,6 +340,15 @@ export default {
           default: 'undefined',
           try: 'field',
         },
+        {
+          prop: 'taskPrevHours',
+          description:
+            'Columns containing forecast task duration, from (firstHour) to (secondHour)',
+          type: 'string',
+          default: 'undefined',
+          try: 'json',
+          isArray: true,
+        },
         {
           prop: 'taskPrevDates',
           description:

diff --git a/packages/ketchup/src/assets/image-list.js b/packages/ketchup/src/assets/image-list.js
@@ -591,7 +591,7 @@ const data = [
             },
         ],
         expandable: true,
-        icon: 'web',
+        icon: 'https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Square_-_black_simple.svg/768px-Square_-_black_simple.svg.png',
         isExpanded: false,
         value: 'Framework',
         visible: true,
@@ -615,11 +615,236 @@ const data = [
             },
         ],
         expandable: true,
-        icon: 'library_books',
+        icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg',
         isExpanded: false,
         value: 'Guides',
         visible: true,
     },
+    {
+        children: [
+            {
+                cells: {
+                    ROUTE: {
+                        value: 'customization',
+                    },
+                },
+                icon: 'style',
+                value: 'Style customization',
+                visible: true,
+            },
+        ],
+        expandable: true,
+        icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg',
+        isExpanded: false,
+        value: 'Guides',
+        visible: true,
+    },
+    {
+        children: [
+            {
+                cells: {
+                    ROUTE: {
+                        value: 'customization',
+                    },
+                },
+                icon: 'style',
+                value: 'Style customization',
+                visible: true,
+            },
+        ],
+        expandable: true,
+        icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg',
+        isExpanded: false,
+        value: 'Guides',
+        visible: true,
+    },
+    {
+        children: [
+            {
+                cells: {
+                    ROUTE: {
+                        value: 'customization',
+                    },
+                },
+                icon: 'style',
+                value: 'Style customization',
+                visible: true,
+            },
+        ],
+        expandable: true,
+        icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg',
+        isExpanded: false,
+        value: 'Guides',
+        visible: true,
+    },
+    {
+        children: [
+            {
+                cells: {
+                    ROUTE: {
+                        value: 'customization',
+                    },
+                },
+                icon: 'style',
+                value: 'Style customization',
+                visible: true,
+            },
+        ],
+        expandable: true,
+        icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg',
+        isExpanded: false,
+        value: 'Guides',
+        visible: true,
+        badgeData: [
+            {
+                imageData: {
+                    resource:
+                        'https://ketchup.smeup.com/ketchup-showcase/header_logo_dark.svg',
+                    sizeX: '1.75rem',
+                    sizeY: 'auto',
+                    color: 'var(--kup-text-on-primary-color)',
+                },
+                position: 'BL',
+            },
+        ],
+    },
+    {
+        children: [
+            {
+                cells: {
+                    ROUTE: {
+                        value: 'customization',
+                    },
+                },
+                icon: 'style',
+                value: 'Style customization',
+                visible: true,
+            },
+        ],
+        expandable: true,
+        icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg',
+        isExpanded: false,
+        value: 'Guides',
+        visible: true,
+    },
+    {
+        children: [
+            {
+                cells: {
+                    ROUTE: {
+                        value: 'customization',
+                    },
+                },
+                icon: 'style',
+                value: 'Style customization',
+                visible: true,
+            },
+        ],
+        expandable: true,
+        icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg',
+        isExpanded: false,
+        value: 'Guides',
+        visible: true,
+        badgeData: [
+            {
+                imageData: {
+                    resource:
+                        'https://ketchup.smeup.com/ketchup-showcase/header_logo_dark.svg',
+                    sizeX: '1.75rem',
+                    sizeY: 'auto',
+                    color: 'var(--kup-text-on-primary-color)',
+                },
+                position: 'BL',
+            },
+        ],
+    },
+    {
+        children: [
+            {
+                cells: {
+                    ROUTE: {
+                        value: 'customization',
+                    },
+                },
+                icon: 'style',
+                value: 'Style customization',
+                visible: true,
+            },
+        ],
+        expandable: true,
+        icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg',
+        isExpanded: false,
+        value: 'Guides',
+        visible: true,
+    },
+    {
+        children: [
+            {
+                cells: {
+                    ROUTE: {
+                        value: 'customization',
+                    },
+                },
+                icon: 'style',
+                value: 'Style customization',
+                visible: true,
+            },
+        ],
+        expandable: true,
+        icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg',
+        isExpanded: false,
+        value: 'Guides',
+        visible: true,
+    },
+    {
+        children: [
+            {
+                cells: {
+                    ROUTE: {
+                        value: 'customization',
+                    },
+                },
+                icon: 'style',
+                value: 'Style customization',
+                visible: true,
+            },
+        ],
+        expandable: true,
+        icon: 'https://c8.alamy.com/compit/f4j1rh/verticale-di-tronchi-di-alberi-di-boschi-guardando-verso-l-alto-da-terra-con-il-sole-che-splende-attraverso-foglie-f4j1rh.jpg',
+        isExpanded: false,
+        value: 'Guides',
+        visible: true,
+    },
+    {
+        cells: {
+            ROUTE: {
+                value: 'accordion',
+            },
+        },
+        icon: 'view-sequential',
+        value: 'Accordion',
+        visible: true,
+    },
+    {
+        cells: {
+            ROUTE: {
+                value: 'accordion',
+            },
+        },
+        icon: 'view-sequential',
+        value: 'Accordion',
+        visible: true,
+    },
+    {
+        cells: {
+            ROUTE: {
+                value: 'accordion',
+            },
+        },
+        icon: 'view-sequential',
+        value: 'Accordion',
+        visible: true,
+    },
 ];
 
 const imageList = document.querySelector('kup-image-list');