From 664bce5bdd5bcb1cb2d34d2e1314ec59568a38fa Mon Sep 17 00:00:00 2001 From: Matt Yoder Date: Fri, 28 Jun 2024 09:46:04 -0400 Subject: [PATCH] refactor(api): update mock API structure --- .../api/{resourceGroup.json => resource-group/1.json} | 0 public/api/resource-group/2.json | 11 +++++++++++ .../api/{resourceGroups.json => resource-groups.json} | 0 .../api/{resourceSlides.json => resource-slides.json} | 0 src/resource-catalog.jsx | 4 ++-- src/resource-group-description.jsx | 4 ++-- src/resource-group-detail.jsx | 4 ++-- 7 files changed, 17 insertions(+), 6 deletions(-) rename public/api/{resourceGroup.json => resource-group/1.json} (100%) create mode 100644 public/api/resource-group/2.json rename public/api/{resourceGroups.json => resource-groups.json} (100%) rename public/api/{resourceSlides.json => resource-slides.json} (100%) diff --git a/public/api/resourceGroup.json b/public/api/resource-group/1.json similarity index 100% rename from public/api/resourceGroup.json rename to public/api/resource-group/1.json diff --git a/public/api/resource-group/2.json b/public/api/resource-group/2.json new file mode 100644 index 0000000..f6c9d44 --- /dev/null +++ b/public/api/resource-group/2.json @@ -0,0 +1,11 @@ +{ + "name": "Jetstream2", + "resourceProvider": { + "resourceProviderId": 2, + "name": "Indiana University", + "iconUri": "https://www.iu.edu/favicon.ico" + }, + "imageUri": "https://jetstream-cloud.org/images/home/jetstream-2.png", + "description": "Jetstream2 is a user-friendly cloud computing environment for researchers and educators running on OpenStack and featuring Exosphere as the primary user interface. It is built on the successes of Jetstream1 and continues the main features of that system while extending to a broader range of hardware and services, including GPUs, large memory nodes, virtual clustering, programmable cyberinfrastructure with OpenStack Heat and Terraform, and many other features. It is designed to provide both infrastructure for gateways and other “always on” services as well as giving researchers access to interactive computing and data analysis resources on demand.", + "userGuideUri": "https://docs.jetstream-cloud.org/" +} diff --git a/public/api/resourceGroups.json b/public/api/resource-groups.json similarity index 100% rename from public/api/resourceGroups.json rename to public/api/resource-groups.json diff --git a/public/api/resourceSlides.json b/public/api/resource-slides.json similarity index 100% rename from public/api/resourceSlides.json rename to public/api/resource-slides.json diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx index f72bee4..99646e9 100644 --- a/src/resource-catalog.jsx +++ b/src/resource-catalog.jsx @@ -16,8 +16,8 @@ export function ResourceCatalog({ title = "Resource Catalog", showTitle = false, baseUri = "/access-ci-ui", - groupsURI = "/api/resourceGroups.json", - slidesURI = "/api/resourceSlides.json", + groupsURI = "/api/resource-groups.json", + slidesURI = "/api/resource-slides.json", }) { return ( <> diff --git a/src/resource-group-description.jsx b/src/resource-group-description.jsx index 14aa142..2239279 100644 --- a/src/resource-group-description.jsx +++ b/src/resource-group-description.jsx @@ -2,9 +2,9 @@ import { useJSON } from "./utils"; import Icon from "./icon"; -export default function ResourceGroupDescription({ resourceId }) { +export default function ResourceGroupDescription({ baseUri, resourceId }) { const data = useJSON( - `/access-ci-ui/api/resourceGroup.json?resourceId=${resourceId}`, + `${baseUri}/api/resource-group/${resourceId}.json`, null ); if (!data) return; diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx index ccdea36..7972bb1 100644 --- a/src/resource-group-detail.jsx +++ b/src/resource-group-detail.jsx @@ -1,9 +1,9 @@ import ResourceGroupDescription from "./resource-group-description"; -export default function ResourceGroupDetail({ resourceId }) { +export default function ResourceGroupDetail({ baseUri, resourceId }) { return (
- +
); }