Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Theme update #1863

Merged
merged 53 commits into from
Apr 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
28a9ca5
kup-planner: scrollable task list and hour mode
Hiren12345 Feb 27, 2024
44049ea
Merge branch 'develop' into kup-editor
dev01prishusoft Feb 28, 2024
1681eb1
Update kup-horizontal-scroll.tsx
dev01prishusoft Feb 28, 2024
77f1bcd
Update kup-horizontal-scroll.tsx
Hiren12345 Feb 28, 2024
4a9eac1
Update kup-horizontal-scroll.tsx
Hiren12345 Feb 28, 2024
b9f8adc
kup-planner: Phase D&D
Hiren12345 Mar 1, 2024
e3e139f
kup-planner: added visual dropzone on phase drag
Hiren12345 Mar 4, 2024
388d706
kup-planner: added visual drop zone on element
Hiren12345 Mar 5, 2024
ac3481c
kup-planner: fixed phase d&d overlap with double view
Hiren12345 Mar 6, 2024
8148532
Kup-planner: Updated showcase
Hiren12345 Mar 14, 2024
87148dd
Kup-planner: Sec Hours fixed
Hiren12345 Mar 15, 2024
9df0a88
Merge branch 'develop' into kup-editor
dev01prishusoft Mar 15, 2024
8d7a1d6
kup-planner: phase drop event fix
Hiren12345 Apr 4, 2024
ada2861
feat: handled layout
p-bemportato Apr 5, 2024
c0549a6
feat: handle options from tree structure
p-bemportato Apr 8, 2024
38f15b4
Merge pull request #1784 from dev01prishusoft/kup-editor
lucafoscili Apr 8, 2024
26c079e
feat: handle options from table structure
p-bemportato Apr 8, 2024
3c7b7de
refactoring
Apr 9, 2024
85250cc
rework
Apr 9, 2024
79834b1
devcontainer extensions added
Apr 9, 2024
bcc2926
feat
Apr 9, 2024
2a03b21
feat: return submit with after updated
p-bemportato Apr 9, 2024
738394a
fix: clone cell in mapping
p-bemportato Apr 9, 2024
441b83f
fix: remove comments
p-bemportato Apr 9, 2024
95c8311
Kup-image-list : KupImageListFix
Leonardo-Signorelli Apr 10, 2024
7498a88
Merge pull request #1852 from smeup/ImageListFix
lucafoscili Apr 10, 2024
f8de1f4
kup-image-list: emit event contextmenu on hold.
lucafoscili Apr 10, 2024
cee5f0b
Merge pull request #1853 from smeup/iml-cm-emit
delbono-smeup Apr 10, 2024
e0ed26b
kup-image-list: removed double listener.
lucafoscili Apr 11, 2024
b5060ea
Merge pull request #1855 from smeup/imlcxmenu
lucafoscili Apr 11, 2024
5c2bf16
update readme
p-bemportato Apr 11, 2024
c11b262
Merge branch 'smeup:develop' into inputpanel
p-bemportato Apr 11, 2024
6b49fbd
fix: layout condition
p-bemportato Apr 11, 2024
857de78
fix: update e2e
p-bemportato Apr 11, 2024
b4cf8ff
wip options handler
p-bemportato Apr 11, 2024
60ecf5b
Merge pull request #1856 from apuliasoft/inputpanel
lucafoscili Apr 11, 2024
1a21e33
Kup-Switcher : Redesign
Leonardo-Signorelli Apr 10, 2024
c6478e3
Kup-Switcher : Redesign
Leonardo-Signorelli Apr 11, 2024
dd76987
Merge pull request #1857 from smeup/Kup-switcher-fix
lucafoscili Apr 11, 2024
452f3a4
fix: options handler impl
Apr 11, 2024
afdbe8e
chore: max-old-space setted in Dockerfile
Apr 11, 2024
58d8430
chore: pre-push hook
Apr 11, 2024
0802f2d
chore: typo on pre-push
Apr 11, 2024
0ff9519
Merge branch 'develop' into inputpanel
p-bemportato Apr 12, 2024
6260d19
Merge pull request #1860 from apuliasoft/inputpanel
lucafoscili Apr 12, 2024
f10dd6a
Update themes.json
Leonardo-Signorelli Apr 12, 2024
bfde783
Update themes.json
Leonardo-Signorelli Apr 12, 2024
e907fb0
Update kup-switcher.scss
Leonardo-Signorelli Apr 12, 2024
78d8428
Update kup-switcher.scss
Leonardo-Signorelli Apr 12, 2024
1532235
Update kup-switcher.scss
Leonardo-Signorelli Apr 12, 2024
ad24ad1
kup-image-list : fix mask sizes and image-list
Leonardo-Signorelli Apr 16, 2024
8bcca6c
kup-badge : Fix position
Leonardo-Signorelli Apr 16, 2024
7ad86ac
Merge branch 'staging' into themeUpdate
Leonardo-Signorelli Apr 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint",
"firsttris.vscode-jest-runner",
"elltg.elltg-npm-script-run",
"octref.vetur"
],
"settings": {
Expand Down
4 changes: 4 additions & 0 deletions .devcontainer/scripts/git/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh

yarn run k:build
yarn run k:test:all
5 changes: 5 additions & 0 deletions .devcontainer/scripts/postCreateCommand.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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:
Expand Down Expand Up @@ -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',
Expand All @@ -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:
Expand All @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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:
Expand Down
229 changes: 227 additions & 2 deletions packages/ketchup/src/assets/image-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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');
Expand Down
Loading