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.

Sign up for GitHub

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

feat: Icon picker component (WIP) #3487

Open
wants to merge 10 commits into
base: next
Choose a base branch
from
Open

feat: Icon picker component (WIP) #3487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
71d311f
feat: add basic config
neatbyte-vnobis Aug 21, 2023
5d102e2
feat: add Icon Picker UI
neatbyte-vnobis Sep 1, 2023
5b0402d
feat: custom icons support and requested changes
neatbyte-vnobis Sep 15, 2023
021ec43
fix: fix dependencies
neatbyte-vnobis Sep 15, 2023
ef2949c
fix: requested UX changes
neatbyte-vnobis Oct 18, 2023
5425ca9
Merge branch 'next' into neatbyte/icon-picker
neatbyte-vnobis Nov 22, 2023
214769f
Merge branch 'next' into neatbyte/icon-picker
neatbyte-vnobis Nov 27, 2023
22ee53d
refactor: change Icon Picker architecture (#3701)
neatbyte-vnobis Jan 4, 2024
a71a32a
Merge branch 'next' into neatbyte/icon-picker
neatbyte-vnobis Jan 5, 2024
cd5d286
refactor: replace Icon Picker (#3814)
neatbyte-vnobis Oct 14, 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
30 changes: 25 additions & 5 deletions apps/api/graphql/src/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ const createTestGroup = () => {
name: "Homepage",
description: "Homepage content model group",
slug: "homepage",
icon: "fas/house"
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
}
});
};
const createTestModel = () => {
Expand Down Expand Up @@ -49,7 +53,11 @@ const createTestModel = () => {
templates: [
{
description: "List of customer reviews",
icon: "far/face-smile",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
id: "homepage_customer_reviews",
name: "CustomerReviews",
fields: [
Expand Down Expand Up @@ -148,7 +156,11 @@ const createTestModel = () => {
},
{
description: "Hero component",
icon: "fas/bolt-lightning",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
id: "homepage_hero",
name: "Hero",
fields: [
Expand Down Expand Up @@ -200,7 +212,11 @@ const createTestModel = () => {
},
{
description: "Compare the good and bad",
icon: "fas/table",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
id: "homepage_compare_table",
name: "CompareTable",
fields: [
Expand Down Expand Up @@ -309,7 +325,11 @@ const createTestModel = () => {
},
{
description: "List of teachers on the homepage",
icon: "fas/chalkboard-teacher",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
id: "homepage_teachers",
name: "Teachers",
fields: [
Expand Down
9 changes: 8 additions & 1 deletion cypress-tests/cypress/e2e/admin/headlessCms/contentEntry/contentEntries.disabled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,14 @@ describe("Headless CMS - Content Entries", () => {
before(() => {
return cy
.cmsCreateContentModelGroup({
data: { name: uniqid("Group-"), icon: "fas/star" }
data: {
name: uniqid("Group-"),
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
}
}
})
.then(data => {
group = data;
Expand Down
9 changes: 8 additions & 1 deletion ...s-tests/cypress/e2e/admin/headlessCms/contentEntry/searchSortAndFilterEntries.disabled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,14 @@ context("Search, Sort and Filter Content Entries", () => {
// Runs once before all tests in the block
before(() => {
cy.cmsCreateContentModelGroup({
data: { name: uniqid("Group-"), icon: "fas/star" }
data: {
name: uniqid("Group-"),
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
}
}
}).then(group => {
createdGroup = group;
cy.cmsCreateContentModel({
Expand Down
9 changes: 8 additions & 1 deletion cypress-tests/cypress/e2e/admin/headlessCms/contentModel/searchSortModels.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ context("Headless CMS - Search and Sort Content Models", () => {
before(() => {
// Create content model group
cy.cmsCreateContentModelGroup({
data: { name: uniqid("Testing-"), icon: "fas/star" }
data: {
name: uniqid("Testing-"),
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
}
}
}).then(data => {
contentModelGroup = data;
// Create first content model
Expand Down
24 changes: 20 additions & 4 deletions cypress-tests/cypress/e2e/admin/pageBuilder/blocks/pageBlocks.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,44 @@ context("Page Builder - Blocks", () => {
const blockCategoryData1 = {
name: nanoid(10).toLowerCase(),
slug: nanoid(10).toLowerCase(),
icon: "icon-name",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
description: nanoid(10).toLowerCase()
};

const blockCategoryData2 = {
name: nanoid(10).toLowerCase(),
slug: nanoid(10).toLowerCase(),
icon: "icon-name",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
description: nanoid(10).toLowerCase()
};

const blockCategoryData3 = {
name: nanoid(10).toLowerCase(),
slug: nanoid(10).toLowerCase(),
icon: "icon-name",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
description: nanoid(10).toLowerCase()
};

const blockCategoryData4 = {
name: nanoid(10).toLowerCase(),
slug: nanoid(10).toLowerCase(),
icon: "icon-name",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
description: nanoid(10).toLowerCase()
};

Expand Down
18 changes: 15 additions & 3 deletions cypress-tests/cypress/e2e/admin/pageBuilder/blocks/pageBlocksExportImport.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,33 @@ context("Page Builder - Blocks Export/Import", () => {
const blockCategoryData1 = {
name: nanoid(10).toLowerCase(),
slug: nanoid(10).toLowerCase(),
icon: "icon-name",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
description: nanoid(10).toLowerCase()
};

const blockCategoryData2 = {
name: nanoid(10).toLowerCase(),
slug: nanoid(10).toLowerCase(),
icon: "icon-name",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
description: nanoid(10).toLowerCase()
};

const blockCategoryData3 = {
name: nanoid(10).toLowerCase(),
slug: nanoid(10).toLowerCase(),
icon: "icon-name",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
description: nanoid(10).toLowerCase()
};

Expand Down
18 changes: 15 additions & 3 deletions cypress-tests/cypress/integration/admin/pageBuilder/blocks/pageBlocksExportImport.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,33 @@ context("Page Builder - Blocks Export/Import", () => {
const blockCategoryData1 = {
name: nanoid(10).toLowerCase(),
slug: nanoid(10).toLowerCase(),
icon: "icon-name",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
description: nanoid(10).toLowerCase()
};

const blockCategoryData2 = {
name: nanoid(10).toLowerCase(),
slug: nanoid(10).toLowerCase(),
icon: "icon-name",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
description: nanoid(10).toLowerCase()
};

const blockCategoryData3 = {
name: nanoid(10).toLowerCase(),
slug: nanoid(10).toLowerCase(),
icon: "icon-name",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
description: nanoid(10).toLowerCase()
};

Expand Down
6 changes: 5 additions & 1 deletion packages/api-aco/__tests__/utils/useGraphQlHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,11 @@ export const useGraphQlHandler = (params: UseGQLHandlerParams = {}) => {
data: {
name: "Group",
slug: "group",
icon: "ico/ico",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
description: "description"
}
})
Expand Down
6 changes: 5 additions & 1 deletion packages/api-aco/src/createAcoModels.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ export const createAcoModels = (context: CmsContext) => {
slug: "aco",
name: "ACO",
description: "Group for Advanced Content Organisation and Search",
icon: "fas/folder",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
isPrivate: true
});

Expand Down
6 changes: 5 additions & 1 deletion packages/api-apw/__tests__/graphql/mocks/access/plugins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ export const accessTestGroup = createCmsGroup({
slug: "accessTestGroup",
name: "Access Test Group",
description: "",
icon: "fa/fas"
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
}
});

export const accessTestModel = createCmsModel({
Expand Down
6 changes: 5 additions & 1 deletion packages/api-apw/__tests__/utils/cms.helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ const createGroupData = () => {
return {
name: "Group",
slug: "group",
icon: "ico/ico",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
description: "description"
};
};
Expand Down
6 changes: 5 additions & 1 deletion packages/api-apw/src/storageOperations/models/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ export const createApwModels = (context: CmsContext) => {
slug: "apw",
name: "APW",
description: "Group for Advanced Publishing Workflow",
icon: "fas/star",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
isPrivate: true
});

Expand Down
6 changes: 5 additions & 1 deletion packages/api-file-manager/src/cmsFileStorage/createFileManagerPlugins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ export const createFileManagerPlugins = () => {
slug: "fileManager",
name: "File Manager",
description: "Group for File Manager models",
icon: "fas/folder",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
isPrivate: true
});

Expand Down
6 changes: 5 additions & 1 deletion packages/api-headless-cms-ddb-es/__tests__/converters/mocks/group.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ export const createGroup = () => {
return new CmsGroupPlugin({
id: "testing",
name: "Testing",
icon: "fas/star",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
slug: "testing",
description: ""
});
Expand Down
6 changes: 5 additions & 1 deletion packages/api-headless-cms-ddb-es/__tests__/graphql/index/create.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ const setupGroup = async (context: CmsContext) => {
return context.cms.createGroup({
name: "Test Group",
description: "Test Group Description",
icon: "fa/fas",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
slug: "test-group"
});
};
Expand Down
2 changes: 1 addition & 1 deletion packages/api-headless-cms-ddb-es/src/definitions/group.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const createGroupEntity = (params: CreateGroupEntityParams): Entity<any>
type: "string"
},
icon: {
type: "string"
type: "map"
},

createdBy: {
Expand Down
2 changes: 1 addition & 1 deletion packages/api-headless-cms-ddb-es/src/definitions/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const createModelEntity = (params: CreateModelEntityParams): Entity<any>
required: true
},
icon: {
type: "string"
type: "map"
},
description: {
type: "string"
Expand Down
2 changes: 1 addition & 1 deletion packages/api-headless-cms-ddb/src/definitions/group.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const createGroupEntity = (params: Params): Entity<any> => {
type: "string"
},
icon: {
type: "string"
type: "map"
},

createdBy: {
Expand Down
2 changes: 1 addition & 1 deletion packages/api-headless-cms-ddb/src/definitions/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const createModelEntity = (params: Params): Entity<any> => {
required: true
},
icon: {
type: "string"
type: "map"
},
description: {
type: "string"
Expand Down
6 changes: 5 additions & 1 deletion packages/api-headless-cms/__tests__/contentAPI/aco/setup/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ export const createGroupPlugin = () => {
name: "Group",
slug: "group",
description: "Group description",
icon: "fas/star",
icon: {
type: "emoji",
name: "thumbs_up",
value: "👍"
},
id: "group"
});
};
Expand Down
Loading