Implement adding icon to categoryTitle

This commit is contained in:
Mindfreak9100 2022-09-28 16:17:37 -04:00
parent 78c9477669
commit 9916ae3372
4 changed files with 19 additions and 4 deletions

View file

@ -1,4 +1,5 @@
import classNames from "classnames"; import classNames from "classnames";
import Image from "next/future/image";
import List from "components/services/list"; import List from "components/services/list";
@ -11,7 +12,12 @@ export default function ServicesGroup({ services, layout }) {
"flex-1 p-1" "flex-1 p-1"
)} )}
> >
<h2 className="text-theme-800 dark:text-theme-300 text-xl font-medium">{services.name}</h2> <div className="flex select-none">
{services.icon &&
<Image src={services.icon} width={32} height={32} alt="logo" className="flex-shrink-0 flex items-center justify-center w-10"/>
}
<h2 className={services.icon ? "text-theme-800 dark:text-theme-300 text-xl font-medium flex-1 flex items-center justify-between rounded-r-md flex-1 px-2 py-2 text-sm text-left" : "text-theme-800 dark:text-theme-300 text-xl font-medium h2-title-noicon"}>{services.name}</h2>
</div>
<List services={services.services} layout={layout} /> <List services={services.services} layout={layout} />
</div> </div>
); );

View file

@ -33,11 +33,12 @@ export default async function handler(req, res) {
const mergedGroup = { const mergedGroup = {
name: groupName, name: groupName,
icon: configuredGroup.icon,
services: [...discoveredGroup.services, ...configuredGroup.services].filter((service) => service), services: [...discoveredGroup.services, ...configuredGroup.services].filter((service) => service),
}; };
mergedGroups.push(mergedGroup); mergedGroups.push(mergedGroup);
}); });
res.send(mergedGroups); res.send(mergedGroups);
} }

View file

@ -12,3 +12,8 @@
body { body {
font-family: "Poppins", sans-serif; font-family: "Poppins", sans-serif;
} }
.h2-title-noicon {
padding-top: 8px;
padding-bottom: 8px;
}

View file

@ -20,9 +20,11 @@ export async function servicesFromConfig() {
} }
// map easy to write YAML objects into easy to consume JS arrays // map easy to write YAML objects into easy to consume JS arrays
const servicesArray = services.map((servicesGroup) => ({ const servicesArray = services.map((servicesGroup) => (
{
name: Object.keys(servicesGroup)[0], name: Object.keys(servicesGroup)[0],
services: servicesGroup[Object.keys(servicesGroup)[0]].map((entries) => ({ icon: Object.prototype.hasOwnProperty.call(servicesGroup[Object.keys(servicesGroup)[0]], 'icon') ? servicesGroup[Object.keys(servicesGroup)[0]].icon : '',
services: servicesGroup[Object.keys(servicesGroup)[0]].services.map((entries) => ({
name: Object.keys(entries)[0], name: Object.keys(entries)[0],
...entries[Object.keys(entries)[0]], ...entries[Object.keys(entries)[0]],
})), })),
@ -106,6 +108,7 @@ export async function servicesFromDocker() {
export function cleanServiceGroups(groups) { export function cleanServiceGroups(groups) {
return groups.map((serviceGroup) => ({ return groups.map((serviceGroup) => ({
name: serviceGroup.name, name: serviceGroup.name,
icon: serviceGroup.icon,
services: serviceGroup.services.map((service) => { services: serviceGroup.services.map((service) => {
const cleanedService = { ...service }; const cleanedService = { ...service };