From cffd4207c893575165a2c79f73605669099e962e Mon Sep 17 00:00:00 2001 From: piyumaldk Date: Tue, 19 Nov 2024 14:10:23 +0530 Subject: [PATCH 01/23] Load applications from mock data --- mock/Applications/applications.json | 40 ++++++ src/pages/applications/page.hbs | 4 + .../partials/applications-listing.hbs | 114 ++++++++++++++++++ 3 files changed, 158 insertions(+) create mode 100644 mock/Applications/applications.json create mode 100644 src/pages/applications/page.hbs create mode 100644 src/pages/applications/partials/applications-listing.hbs diff --git a/mock/Applications/applications.json b/mock/Applications/applications.json new file mode 100644 index 0000000..29e443a --- /dev/null +++ b/mock/Applications/applications.json @@ -0,0 +1,40 @@ +{ + "count": 2, + "list": [ + { + "applicationId": "49231188-5d7e-46e1-9651-7e7905d4d836", + "name": "DefaultApplication", + "throttlingPolicy": "Unlimited", + "description": "This is the default application", + "status": "APPROVED", + "groups": [], + "subscriptionCount": 0, + "attributes": {}, + "owner": "admin", + "tokenType": "JWT", + "createdTime": "1731993412405", + "updatedTime": "1731993412405" + }, + { + "applicationId": "554791bd-783e-45cb-b77c-88dba3766365", + "name": "New Application", + "throttlingPolicy": "10PerMin", + "description": "This is a sample description", + "status": "APPROVED", + "groups": [], + "subscriptionCount": 0, + "attributes": {}, + "owner": "admin", + "tokenType": "JWT", + "createdTime": "1731994070857", + "updatedTime": "1731994070857" + } + ], + "pagination": { + "offset": 0, + "limit": 25, + "total": 2, + "next": "", + "previous": "" + } +} \ No newline at end of file diff --git a/src/pages/applications/page.hbs b/src/pages/applications/page.hbs new file mode 100644 index 0000000..9c01b25 --- /dev/null +++ b/src/pages/applications/page.hbs @@ -0,0 +1,4 @@ +
+ {{> applications-listing }} + {{> community }} +
\ No newline at end of file diff --git a/src/pages/applications/partials/applications-listing.hbs b/src/pages/applications/partials/applications-listing.hbs new file mode 100644 index 0000000..7ca9ba9 --- /dev/null +++ b/src/pages/applications/partials/applications-listing.hbs @@ -0,0 +1,114 @@ +
+
+
+
+
+

Explore + best APIs + and join us in building innovative applications. +

+
+
+

+ Utilize our APIs to automate processes, drive innovation, and reach + millions of customers.

+
+
+
+ + +
+
+
+
+
+
+
+
+
Filter By
+
+
Explore
+ +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+
Category
+ +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+
+
+ {{#applicationsMetadata}} +
+
+
{{name}}
+

V {{throttlingPolicy}}

+

{{description}}

+ {{status}} +

{{owner}}

+
+
+
+
+ Overview +
+
+
+
+ {{/applicationsMetadata}} +
+
+
+
+
+
+
\ No newline at end of file From 0bd9c64794bb28652d7409531d833806d02aef0b Mon Sep 17 00:00:00 2001 From: piyumaldk Date: Tue, 19 Nov 2024 15:53:34 +0530 Subject: [PATCH 02/23] Add new styling and search function --- .../partials/applications-listing.hbs | 165 ++++++-------- src/partials/header.hbs | 2 +- src/styles/applications-listing.css | 208 ++++++++++++++++++ src/styles/main.css | 1 + 4 files changed, 278 insertions(+), 98 deletions(-) create mode 100644 src/styles/applications-listing.css diff --git a/src/pages/applications/partials/applications-listing.hbs b/src/pages/applications/partials/applications-listing.hbs index 7ca9ba9..2d737cd 100644 --- a/src/pages/applications/partials/applications-listing.hbs +++ b/src/pages/applications/partials/applications-listing.hbs @@ -1,114 +1,85 @@
-
-
-
-
-

Explore - best APIs - and join us in building innovative applications. +
+
+
+
+

Subscribe to + APIs + by creating applications.

-
-

- Utilize our APIs to automate processes, drive innovation, and reach - millions of customers.

+
+

Create, manage, or remove applications here.

- +
-
-
-
-
Filter By
-
-
Explore
- -
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
- -
-
Category
- -
-
-
- - -
-
-
-
- - +
+
+ {{#applicationsMetadata}} +
+
+
+ {{name}} +
+

{{description}}

+
+

+ Created: {{createdTime}} +

+

+ Updated: {{updatedTime}} +

+

+ Owner: {{owner}} +

+

+ Subscriptions: {{subscriptionCount}} +

+

+ Throttling Policy: {{throttlingPolicy}} +

+ {{status}}
-
-
-
- - +
+ +
-
-
-
-
-
-
- {{#applicationsMetadata}} -
-
-
{{name}}
-

V {{throttlingPolicy}}

-

{{description}}

- {{status}} -

{{owner}}

-
-
-
-
- Overview -
-
-
-
- {{/applicationsMetadata}} -
-
-
+ {{/applicationsMetadata}}
-
-

\ No newline at end of file + + + + + diff --git a/src/partials/header.hbs b/src/partials/header.hbs index d49535c..51558ce 100644 --- a/src/partials/header.hbs +++ b/src/partials/header.hbs @@ -10,7 +10,7 @@ APIs {{!-- Pricing Get started - Application --}} + Applications {{#if profile}}
diff --git a/src/styles/applications-listing.css b/src/styles/applications-listing.css new file mode 100644 index 0000000..d147e40 --- /dev/null +++ b/src/styles/applications-listing.css @@ -0,0 +1,208 @@ +body { + background-color: var(--main-bg-color); +} + +.hero-section-applicationlisting { + display: flex; + justify-content: center; + align-items: center; + padding: 10px 0; + background-color: var(--primary-color); + height: auto; +} + +.applicationlist-hero-container { + width: 100%; + max-width: 1000px; + text-align: center; + margin-top: 30px; +} + +.applicationlist-hero-content h1, +.applicationlist-hero-content p, +.applicationlist-hero-content span { + color: var(--font-colour-primary); +} + +.applicationlist-hero-content h1 { + font-size: 35px; + font-weight: bold; +} + +.applicationlist-hero-content p { + font-size: 14px; + line-height: 24px; +} + +.applicationlist-hero-header{ + max-width: 800px; +} +.applicationlist-hero-content span { + font-size: 35px; + margin-bottom: 20px; + color: var(--light-color); +} + +.applicationlist-hero-content { + margin: 40px 0; + text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; +} + +.search-container { + display: flex; + justify-content: center; + margin-top: 20px; +} + +.search-input { + display: flex; + align-items: center; + background-color: transparent; + border: 1px solid var(--border-colour-secondary); + padding: 10px 15px; + border-radius: 25px; + width: 100%; + height: 40px; +} + +.search-input input { + border: none; + outline: none; + width: 100%; + margin-left: 10px; + font-size: 14px; + background-color: transparent; + color: var(--main-bg-color); +} + +#query::placeholder { + color: var(--main-bg-color); + opacity: 0.6; +} + +.bi-search { + color: var(--main-bg-color); + font-size: 20px; + position: relative; + top: -2px; +} + +.applicationlist-container { + padding: 10px 20px; + margin-top: 45px; +} + +.application-card { + display: flex; + flex-direction: column; + border: 1px solid var(--border-colour-secondary); + border-radius: 8px; + background-color: var(--main-bg-color); + padding: 15px; + height: 100%; + transition: transform 0.3s ease, box-shadow 0.3s ease; +} + +.application-card:hover { + transform: translateY(-5px); + box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.2); +} + +.application-card-body { + display: flex; + flex-direction: column; + justify-content: space-between; + height: 100%; +} + +.application-card-title { + font-size: 18px; + font-weight: bold; + color: var(--main-text-color); + margin-bottom: 10px; +} + +.application-name-link { + color: var(--primary-color); + text-decoration: none; +} + +.application-name-link:hover { + text-decoration: underline; +} + +.application-card-description { + font-size: 14px; + color: var(--secondary-text-color); + margin-bottom: 15px; +} + +.application-card-meta p { + display: flex; + align-items: center; + font-size: 12px; + color: var(--secondary-text-color); + margin: 5px 0; +} + +.application-card-meta i { + margin-right: 8px; + color: var(--primary-color); +} + +.badge-custom1 { + padding: 5px 10px; + border-radius: 12px; + font-size: 12px; + font-weight: bold; +} + +.application-card-actions { + display: flex; + justify-content: flex-start; + margin-top: 10px; + gap: 10px; +} + +.btn-icon { + display: inline-flex; + align-items: center; + justify-content: center; + border: none; + background-color: transparent; + color: var(--primary-color); + font-size: 18px; + cursor: pointer; +} + +.btn-icon:hover { + color: var(--warning-color); +} + +@media (max-width: 1200px) { + .col-lg-2 { + flex: 0 0 33.3333%; + max-width: 33.3333%; + } +} + +@media (max-width: 768px) { + .col-lg-2, + .col-md-4 { + flex: 0 0 50%; + max-width: 50%; + } +} + +@media (max-width: 576px) { + .col-lg-2, + .col-md-4, + .col-sm-6 { + flex: 0 0 100%; + max-width: 100%; + } +} diff --git a/src/styles/main.css b/src/styles/main.css index a94611b..3a72232 100644 --- a/src/styles/main.css +++ b/src/styles/main.css @@ -9,6 +9,7 @@ @import '/styles/documentation-banner.css'; @import '/styles/community.css'; @import '/styles/api-listing.css'; +@import '/styles/applications-listing.css'; @import '/styles/pagination.css'; @import '/styles/api-detail-banner.css'; @import '/styles/tryout-banner.css'; From 75e03a07677c4724fd962691abbd5dbc0931f6a5 Mon Sep 17 00:00:00 2001 From: piyumaldk Date: Tue, 19 Nov 2024 15:58:35 +0530 Subject: [PATCH 03/23] Fix formatting --- .../partials/applications-listing.hbs | 136 ++++++++++-------- src/styles/applications-listing.css | 2 +- 2 files changed, 76 insertions(+), 62 deletions(-) diff --git a/src/pages/applications/partials/applications-listing.hbs b/src/pages/applications/partials/applications-listing.hbs index 2d737cd..6f44bc5 100644 --- a/src/pages/applications/partials/applications-listing.hbs +++ b/src/pages/applications/partials/applications-listing.hbs @@ -1,85 +1,99 @@
-
-
-
-
+
+
+
+

Subscribe to APIs by creating applications.

-
+

Create, manage, or remove applications here.

-
-
- - +
+
+ +
-
-
- {{#applicationsMetadata}} -
-
-
- {{name}} +
+
+ {{#applicationsMetadata}} +
+
+
+ {{name}}
-

{{description}}

-
-

- Created: {{createdTime}} -

-

- Updated: {{updatedTime}} -

-

- Owner: {{owner}} -

-

- Subscriptions: {{subscriptionCount}} -

-

- Throttling Policy: {{throttlingPolicy}} -

- {{status}} +

{{description}}

+
+

+ + Created: + {{createdTime}} +

+

+ + Updated: + {{updatedTime}} +

+

+ + Owner: + {{owner}} +

+

+ + Subscriptions: + {{subscriptionCount}} +

+

+ + Throttling Policy: + {{throttlingPolicy}} +

+ {{status}}
-
- - +
+ +
+
-
- {{/applicationsMetadata}} -
+ {{/applicationsMetadata}}
+
+ \ No newline at end of file diff --git a/src/styles/applications-listing.css b/src/styles/applications-listing.css index d147e40..05ccbbc 100644 --- a/src/styles/applications-listing.css +++ b/src/styles/applications-listing.css @@ -34,7 +34,7 @@ body { line-height: 24px; } -.applicationlist-hero-header{ +.applicationlist-hero-header { max-width: 800px; } .applicationlist-hero-content span { From ad29fba6374cc8ede429e36c046f096b5efa79a5 Mon Sep 17 00:00:00 2001 From: piyumaldk Date: Wed, 20 Nov 2024 11:52:33 +0530 Subject: [PATCH 04/23] Change the layout of the cards --- .../partials/applications-listing.hbs | 122 +++++++++--------- src/styles/applications-listing.css | 10 +- 2 files changed, 65 insertions(+), 67 deletions(-) diff --git a/src/pages/applications/partials/applications-listing.hbs b/src/pages/applications/partials/applications-listing.hbs index 6f44bc5..0856f22 100644 --- a/src/pages/applications/partials/applications-listing.hbs +++ b/src/pages/applications/partials/applications-listing.hbs @@ -20,69 +20,65 @@
-
-
- {{#applicationsMetadata}} -
-
-
- {{name}} -
-

{{description}}

-
-

- - Created: - {{createdTime}} -

-

- - Updated: - {{updatedTime}} -

-

- - Owner: - {{owner}} -

-

- - Subscriptions: - {{subscriptionCount}} -

-

- - Throttling Policy: - {{throttlingPolicy}} -

- {{status}} -
-
- - +
+
+
+
+ {{#applicationsMetadata}} +
+
+
+ {{name}} +
+ +
+
+ {{status}} + Owner: {{owner}} +
+
+ +
+

+ + Subscriptions: + {{subscriptionCount}} +

+

+ + Throttling Policy: + {{throttlingPolicy}} +

+ +
+
+ + +
+
-
+ {{/applicationsMetadata}}
- {{/applicationsMetadata}} +
@@ -91,8 +87,8 @@ \ No newline at end of file + \ No newline at end of file diff --git a/src/styles/applications-listing.css b/src/styles/applications-listing.css index 8fde254..7814c01 100644 --- a/src/styles/applications-listing.css +++ b/src/styles/applications-listing.css @@ -91,22 +91,27 @@ body { top: -2px; } -.applicationlist-container { - padding: 10px 20px; +.applicationspage-container { + padding: 10px 65px; margin-top: 45px; - gap: 20px; - grid-template-columns: repeat(auto-fill, minmax(240px, 1fr)); + margin-bottom: 20px; +} + +.applicationlist-container { + display: flex; + flex-wrap: wrap; + justify-content: left; } .application-card { display: flex; flex-direction: column; border: 1px solid var(--border-colour-secondary); - border-radius: 8px; - background-color: white; - padding: 15px; + border-radius: 12px; + background-color: var(--light-bg-color); + padding: 20px; height: 100%; - box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1); + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); transition: transform 0.3s ease, box-shadow 0.3s ease; } @@ -124,7 +129,6 @@ body { .application-card-title { font-size: 18px; - font-weight: bold; color: var(--main-text-color); margin-bottom: 10px; } @@ -135,7 +139,7 @@ body { } .application-name-link:hover { - text-decoration: underline; + color: var(--warning-color); } .application-card-description { @@ -185,6 +189,25 @@ body { color: var(--warning-color); } +.applicationsbtn-container { + margin: 20px; + width: 100%; +} + +.applicationsaddbtn-primary { + padding: 5px 30px; + border-radius: 20px; + font-size: 14px; + background-color: transparent; + color: var(--border-colour-primary); + border: 1px solid var(--border-colour-primary); +} + +.applicationsaddbtn-primary:hover { + background-color: var(--primary-color); + color: var(--font-colour-primary); +} + @media (max-width: 1200px) { .col-lg-2 { flex: 0 0 33.3333%; From 0f896862a4eb1876a5d716dc1a7fcae6b9b06fa6 Mon Sep 17 00:00:00 2001 From: piyumaldk Date: Thu, 21 Nov 2024 14:24:45 +0530 Subject: [PATCH 06/23] Fix the compilation bug --- src/partials/header.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/partials/header.hbs b/src/partials/header.hbs index 51558ce..a361e23 100644 --- a/src/partials/header.hbs +++ b/src/partials/header.hbs @@ -9,7 +9,7 @@
APIs {{!-- Pricing - Get started + Get started --}} Applications
{{#if profile}} From f72e8617a9f14a52035fffef5482f961bfe05ade Mon Sep 17 00:00:00 2001 From: piyumaldk Date: Thu, 21 Nov 2024 15:07:27 +0530 Subject: [PATCH 07/23] Add Default Application Mock Data --- mock/Applications/DefaultApplication.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 mock/Applications/DefaultApplication.json diff --git a/mock/Applications/DefaultApplication.json b/mock/Applications/DefaultApplication.json new file mode 100644 index 0000000..57341b0 --- /dev/null +++ b/mock/Applications/DefaultApplication.json @@ -0,0 +1,17 @@ +{ + "applicationId": "49231188-5d7e-46e1-9651-7e7905d4d836", + "name": "DefaultApplication", + "throttlingPolicy": "Unlimited", + "description": "This is the default application", + "tokenType": "JWT", + "status": "APPROVED", + "groups": [], + "subscriptionCount": 1, + "keys": [], + "attributes": {}, + "subscriptionScopes": [], + "owner": "admin", + "hashEnabled": false, + "createdTime": "1731993412405", + "updatedTime": "1731993412405" +} \ No newline at end of file From ad1091069e836d7cf0e6176fa985d89377b730f8 Mon Sep 17 00:00:00 2001 From: piyumaldk Date: Thu, 21 Nov 2024 15:08:47 +0530 Subject: [PATCH 08/23] Move Default Application Mock Data --- .../Applications/{ => DefaultApplication}/DefaultApplication.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mock/Applications/{ => DefaultApplication}/DefaultApplication.json (100%) diff --git a/mock/Applications/DefaultApplication.json b/mock/Applications/DefaultApplication/DefaultApplication.json similarity index 100% rename from mock/Applications/DefaultApplication.json rename to mock/Applications/DefaultApplication/DefaultApplication.json From 5724dfed90ecf444ea089373e0447b647e6a2400 Mon Sep 17 00:00:00 2001 From: piyumaldk Date: Fri, 22 Nov 2024 13:41:41 +0530 Subject: [PATCH 09/23] Remove tech pages pages and add border color --- src/pages/applications/page.hbs | 4 - .../partials/applications-listing.hbs | 104 -------- src/styles/applications-listing.css | 233 ------------------ src/styles/main.css | 2 +- 4 files changed, 1 insertion(+), 342 deletions(-) delete mode 100644 src/pages/applications/page.hbs delete mode 100644 src/pages/applications/partials/applications-listing.hbs delete mode 100644 src/styles/applications-listing.css diff --git a/src/pages/applications/page.hbs b/src/pages/applications/page.hbs deleted file mode 100644 index 9c01b25..0000000 --- a/src/pages/applications/page.hbs +++ /dev/null @@ -1,4 +0,0 @@ -
- {{> applications-listing }} - {{> community }} -
\ No newline at end of file diff --git a/src/pages/applications/partials/applications-listing.hbs b/src/pages/applications/partials/applications-listing.hbs deleted file mode 100644 index 31fe165..0000000 --- a/src/pages/applications/partials/applications-listing.hbs +++ /dev/null @@ -1,104 +0,0 @@ -
-
-
-
-
-

Subscribe to - APIs - by creating applications. -

-
-
-

Create, manage, or remove applications here.

-
-
-
- - -
-
-
-
-
-
-
-
-
-
-
- + New Application -
-
-
-
-
-
-
-
- {{#applicationsMetadata}} -
-
-
- {{name}} -
- -
-
- {{status}} - Owner: - {{owner}} -
-
- -
-

- - Subscriptions: - {{subscriptionCount}} -

-

- - Throttling Policy: - {{throttlingPolicy}} -

- -
-
- - -
-
-
- {{/applicationsMetadata}} -
-
-
-
-
-
-
\ No newline at end of file diff --git a/src/styles/applications-listing.css b/src/styles/applications-listing.css deleted file mode 100644 index 7814c01..0000000 --- a/src/styles/applications-listing.css +++ /dev/null @@ -1,233 +0,0 @@ -body { - background-color: var(--main-bg-color); -} - -.hero-section-applicationlisting { - display: flex; - justify-content: center; - align-items: center; - padding: 10px 0; - background-color: var(--primary-color); - height: auto; -} - -.applicationlist-hero-container { - width: 100%; - max-width: 1000px; - text-align: center; - margin-top: 30px; -} - -.applicationlist-hero-content h1, -.applicationlist-hero-content p, -.applicationlist-hero-content span { - color: var(--font-colour-primary); -} - -.applicationlist-hero-content h1 { - font-size: 35px; - font-weight: bold; -} - -.applicationlist-hero-content p { - font-size: 14px; - line-height: 24px; -} - -.applicationlist-hero-header { - max-width: 800px; -} -.applicationlist-hero-content span { - font-size: 35px; - margin-bottom: 20px; - color: var(--light-color); -} - -.applicationlist-hero-content { - margin: 40px 0; - text-align: center; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; -} - -.search-container { - display: flex; - justify-content: center; - margin-top: 20px; -} - -.search-input { - display: flex; - align-items: center; - background-color: transparent; - border: 1px solid var(--border-colour-secondary); - padding: 10px 15px; - border-radius: 25px; - width: 100%; - height: 40px; -} - -.search-input input { - border: none; - outline: none; - width: 100%; - margin-left: 10px; - font-size: 14px; - background-color: transparent; - color: var(--main-bg-color); -} - -#query::placeholder { - color: var(--main-bg-color); - opacity: 0.6; -} - -.bi-search { - color: var(--main-bg-color); - font-size: 20px; - position: relative; - top: -2px; -} - -.applicationspage-container { - padding: 10px 65px; - margin-top: 45px; - margin-bottom: 20px; -} - -.applicationlist-container { - display: flex; - flex-wrap: wrap; - justify-content: left; -} - -.application-card { - display: flex; - flex-direction: column; - border: 1px solid var(--border-colour-secondary); - border-radius: 12px; - background-color: var(--light-bg-color); - padding: 20px; - height: 100%; - box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); - transition: transform 0.3s ease, box-shadow 0.3s ease; -} - -.application-card:hover { - transform: translateY(-5px); - box-shadow: 0px 6px 15px rgba(0, 0, 0, 0.2); -} - -.application-card-body { - display: flex; - flex-direction: column; - justify-content: space-between; - height: 100%; -} - -.application-card-title { - font-size: 18px; - color: var(--main-text-color); - margin-bottom: 10px; -} - -.application-name-link { - color: var(--primary-color); - text-decoration: none; -} - -.application-name-link:hover { - color: var(--warning-color); -} - -.application-card-description { - font-size: 14px; - color: var(--secondary-text-color); - margin-bottom: 15px; -} - -.application-card-meta p { - display: flex; - align-items: center; - font-size: 12px; - color: var(--secondary-text-color); - margin: 5px 0; -} - -.application-card-meta i { - margin-right: 8px; - color: var(--primary-color); -} - -.badge-custom1 { - padding: 5px 10px; - border-radius: 12px; - font-size: 12px; - font-weight: bold; -} - -.application-card-actions { - display: flex; - justify-content: flex-end; - margin-top: 10px; -} - -.btn-icon { - display: inline-flex; - align-items: center; - justify-content: center; - border: none; - background-color: transparent; - color: var(--primary-color); - font-size: 18px; - cursor: pointer; -} - -.btn-icon:hover { - color: var(--warning-color); -} - -.applicationsbtn-container { - margin: 20px; - width: 100%; -} - -.applicationsaddbtn-primary { - padding: 5px 30px; - border-radius: 20px; - font-size: 14px; - background-color: transparent; - color: var(--border-colour-primary); - border: 1px solid var(--border-colour-primary); -} - -.applicationsaddbtn-primary:hover { - background-color: var(--primary-color); - color: var(--font-colour-primary); -} - -@media (max-width: 1200px) { - .col-lg-2 { - flex: 0 0 33.3333%; - max-width: 33.3333%; - } -} - -@media (max-width: 768px) { - .col-lg-2, - .col-md-4 { - flex: 0 0 50%; - max-width: 50%; - } -} - -@media (max-width: 576px) { - .col-lg-2, - .col-md-4, - .col-sm-6 { - flex: 0 0 100%; - max-width: 100%; - } -} diff --git a/src/styles/main.css b/src/styles/main.css index 3a72232..2a71142 100644 --- a/src/styles/main.css +++ b/src/styles/main.css @@ -9,7 +9,6 @@ @import '/styles/documentation-banner.css'; @import '/styles/community.css'; @import '/styles/api-listing.css'; -@import '/styles/applications-listing.css'; @import '/styles/pagination.css'; @import '/styles/api-detail-banner.css'; @import '/styles/tryout-banner.css'; @@ -34,6 +33,7 @@ --border-colour-primary: #1a73e8; --border-colour-secondary: #ffffff; --notselect-star-color: #bebec0; + --border-color: #ddd; --font-family-sans: "Poppins", sans-serif; --font-family-serif: "Sofia Sans", serif; From 2a78f225a19d6dae0ae32f446b9f81a4f5882c2d Mon Sep 17 00:00:00 2001 From: piyumaldk Date: Mon, 2 Dec 2024 12:23:33 +0530 Subject: [PATCH 10/23] Throttle Policy Mock --- mock/Applications/throttlingPolicies.json | 124 ++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 mock/Applications/throttlingPolicies.json diff --git a/mock/Applications/throttlingPolicies.json b/mock/Applications/throttlingPolicies.json new file mode 100644 index 0000000..0891a6e --- /dev/null +++ b/mock/Applications/throttlingPolicies.json @@ -0,0 +1,124 @@ +{ + "count": 4, + "list": [ + { + "name": "10PerMin", + "description": "Allows 10 request per minute", + "policyLevel": "APPLICATION", + "attributes": {}, + "requestCount": 10, + "dataUnit": null, + "unitTime": 1, + "timeUnit": "min", + "rateLimitCount": 0, + "rateLimitTimeUnit": null, + "quotaPolicyType": "REQUESTCOUNT", + "tierPlan": null, + "stopOnQuotaReach": true, + "monetizationAttributes": { + "billingType": null, + "billingCycle": null, + "fixedPrice": null, + "pricePerRequest": null, + "currencyType": null + }, + "throttlingPolicyPermissions": { + "type": "ALLOW", + "roles": [ + "Internal/everyone" + ] + } + }, + { + "name": "20PerMin", + "description": "Allows 20 request per minute", + "policyLevel": "APPLICATION", + "attributes": {}, + "requestCount": 20, + "dataUnit": null, + "unitTime": 1, + "timeUnit": "min", + "rateLimitCount": 0, + "rateLimitTimeUnit": null, + "quotaPolicyType": "REQUESTCOUNT", + "tierPlan": null, + "stopOnQuotaReach": true, + "monetizationAttributes": { + "billingType": null, + "billingCycle": null, + "fixedPrice": null, + "pricePerRequest": null, + "currencyType": null + }, + "throttlingPolicyPermissions": { + "type": "ALLOW", + "roles": [ + "Internal/everyone" + ] + } + }, + { + "name": "50PerMin", + "description": "Allows 50 request per minute", + "policyLevel": "APPLICATION", + "attributes": {}, + "requestCount": 50, + "dataUnit": null, + "unitTime": 1, + "timeUnit": "min", + "rateLimitCount": 0, + "rateLimitTimeUnit": null, + "quotaPolicyType": "REQUESTCOUNT", + "tierPlan": null, + "stopOnQuotaReach": true, + "monetizationAttributes": { + "billingType": null, + "billingCycle": null, + "fixedPrice": null, + "pricePerRequest": null, + "currencyType": null + }, + "throttlingPolicyPermissions": { + "type": "ALLOW", + "roles": [ + "Internal/everyone" + ] + } + }, + { + "name": "Unlimited", + "description": "Allows unlimited requests", + "policyLevel": "APPLICATION", + "attributes": {}, + "requestCount": 2147483647, + "dataUnit": null, + "unitTime": 0, + "timeUnit": "ms", + "rateLimitCount": 0, + "rateLimitTimeUnit": null, + "quotaPolicyType": null, + "tierPlan": "FREE", + "stopOnQuotaReach": true, + "monetizationAttributes": { + "billingType": null, + "billingCycle": null, + "fixedPrice": null, + "pricePerRequest": null, + "currencyType": null + }, + "throttlingPolicyPermissions": { + "type": "ALLOW", + "roles": [ + "Internal/everyone" + ] + } + } + ], + "pagination": { + "offset": 0, + "limit": 25, + "total": 4, + "next": "", + "previous": "" + } +} \ No newline at end of file From ca9a13ad0156f4d82ad8d1d7353acb229d74297e Mon Sep 17 00:00:00 2001 From: Divya Premanantha Date: Tue, 3 Dec 2024 19:41:59 +0530 Subject: [PATCH 11/23] Add readme --- README.md | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..58bef9b --- /dev/null +++ b/README.md @@ -0,0 +1,40 @@ +# Devportal Developer App + +## Steps to Set Up the Project + +**Fork and Clone the Repository** + - Fork the repository to your GitHub account. + - Clone the repository using: + ```bash + git clone https://github.com/wso2/api-developer-portal.git + ``` + +**Install Dependencies** + - Navigate to the project directory and execute: + ```bash + npm install + ``` + +**Start the Project** + + - To start the project and explore with mock data, run the following command. + ```bash + npm start + ``` + +## Project Structure and Layout + +**Project Structure** + - The `src` folder contains the page layout and content. + - The `/src/layout` folder includes the main layout of the dev portal. + - Other pages inherit this layout. + - The `/src/pages` folder holds the content for the pages. + - The `/src/partials` folder holds the common content for the pages. + - The header and footer are injected as partials into the layout. + - The `/src/images` folder contains the images. + - The `/src/styles` folder contains the styles applied for each component. + - The `mock` directory includes the mock API information. + +**Mock APIs** + - Mock APIs are displayed to define the structure. + - In a production scenario, these will be replaced by actual published APIs. \ No newline at end of file From ce9a3893f0714a7df4ee72d6a71a7a15530b51c8 Mon Sep 17 00:00:00 2001 From: Divya Premanantha Date: Thu, 5 Dec 2024 13:14:35 +0530 Subject: [PATCH 12/23] Add subscription changes --- .../partials/api-detail-banner.hbs | 1 + .../partials/subscription-plans.hbs | 21 +++++++ src/partials/header.hbs | 1 + src/styles/main.css | 1 + src/styles/subscription.css | 62 +++++++++++++++++++ 5 files changed, 86 insertions(+) create mode 100644 src/pages/api-landing/partials/subscription-plans.hbs create mode 100644 src/styles/subscription.css diff --git a/src/pages/api-landing/partials/api-detail-banner.hbs b/src/pages/api-landing/partials/api-detail-banner.hbs index 9a7dc55..f05c36a 100644 --- a/src/pages/api-landing/partials/api-detail-banner.hbs +++ b/src/pages/api-landing/partials/api-detail-banner.hbs @@ -25,6 +25,7 @@ {{else}} Download {{/in}} + Subscribe
diff --git a/src/pages/api-landing/partials/subscription-plans.hbs b/src/pages/api-landing/partials/subscription-plans.hbs new file mode 100644 index 0000000..0aec0ed --- /dev/null +++ b/src/pages/api-landing/partials/subscription-plans.hbs @@ -0,0 +1,21 @@ +
+
+
+

Available Subscription Plans

+
+
+ {{#each subscriptionPlans}} +
+
+
+
{{name}}
+

Tier plan: {{tierPlan}}

+

{{description}}

+ Subscribe +
+
+
+ {{/each}} +
+
\ No newline at end of file diff --git a/src/partials/header.hbs b/src/partials/header.hbs index d49535c..5feaf82 100644 --- a/src/partials/header.hbs +++ b/src/partials/header.hbs @@ -8,6 +8,7 @@
APIs + MyAPIs {{!-- Pricing Get started Application --}} diff --git a/src/styles/main.css b/src/styles/main.css index a94611b..d5725d9 100644 --- a/src/styles/main.css +++ b/src/styles/main.css @@ -14,6 +14,7 @@ @import '/styles/tryout-banner.css'; @import '/styles/api-content.css'; @import '/styles/pricing.css'; +@import '/styles/subscription.css'; :root { --main-bg-color: #f7f8fb; --light-bg-color: #ffffff; diff --git a/src/styles/subscription.css b/src/styles/subscription.css new file mode 100644 index 0000000..b27cba2 --- /dev/null +++ b/src/styles/subscription.css @@ -0,0 +1,62 @@ +.custom-api-card { + min-height: 100px; +} + +.container { + text-align: left; + margin-top: 50px; +} + +.modal { + display: none; + position: fixed; + z-index: 1; + left: 0; + top: 0; + width: 100%; + height: 100%; + overflow: auto; + background-color: rgb(0, 0, 0); + background-color: rgba(0, 0, 0, 0.4); + padding-top: 60px; +} + +.modal-dialog { + position: relative; + margin: auto; + padding: 20px; +} + +.app-label { + padding: 10px 0px 10px; +} + +.input-content { + margin: 10px 0px; +} + +.modal-content { + background-color: #fff; + padding: 20px; + border-radius: 4px; + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2); +} + +.modal-header, .modal-footer { + display: flex; + justify-content: space-between; + align-items: center; +} + +.modal-header .close { + font-size: 30px; + color: #000; +} + +.modal-footer button { + margin: 5px; +} + +.app-selection{ + display: none; +} From b93e619aa747883d160706fdd9dae2f1b687c344 Mon Sep 17 00:00:00 2001 From: Divya Premanantha Date: Thu, 5 Dec 2024 15:40:35 +0530 Subject: [PATCH 13/23] Fix issues --- src/pages/api-landing/page.hbs | 1 + src/styles/subscription.css | 38 +++++++++++++++++----------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/pages/api-landing/page.hbs b/src/pages/api-landing/page.hbs index d4919ca..011213c 100644 --- a/src/pages/api-landing/page.hbs +++ b/src/pages/api-landing/page.hbs @@ -1,6 +1,7 @@
{{> api-detail-banner }} {{> api-content }} + {{> subscription-plans }} {{> tryout-banner }} {{> community}}
\ No newline at end of file diff --git a/src/styles/subscription.css b/src/styles/subscription.css index b27cba2..d57c6d2 100644 --- a/src/styles/subscription.css +++ b/src/styles/subscription.css @@ -7,21 +7,7 @@ margin-top: 50px; } -.modal { - display: none; - position: fixed; - z-index: 1; - left: 0; - top: 0; - width: 100%; - height: 100%; - overflow: auto; - background-color: rgb(0, 0, 0); - background-color: rgba(0, 0, 0, 0.4); - padding-top: 60px; -} - -.modal-dialog { +.custom-modal-dialog { position: relative; margin: auto; padding: 20px; @@ -35,25 +21,39 @@ margin: 10px 0px; } -.modal-content { +.custom-modal-content { background-color: #fff; padding: 20px; border-radius: 4px; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2); } -.modal-header, .modal-footer { +.custom-modal { + display: none; + position: fixed; + z-index: 1; + left: 0; + top: 0; + width: 100%; + height: 100%; + overflow: auto; + background-color: rgb(0, 0, 0); + background-color: rgba(0, 0, 0, 0.4); + padding-top: 60px; +} + +.custom-modal-header, .custom-modal-footer { display: flex; justify-content: space-between; align-items: center; } -.modal-header .close { +.custom-modal-header .close { font-size: 30px; color: #000; } -.modal-footer button { +.custom-modal-footer button { margin: 5px; } From abc2dfcb061e84a0104f2929ee3d9c42f9c3784c Mon Sep 17 00:00:00 2001 From: piyumaldk Date: Fri, 6 Dec 2024 16:47:34 +0530 Subject: [PATCH 14/23] Mock for Key Managers --- .../DefaultApplication/AllKeyManagers.json | 177 ++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 mock/Applications/DefaultApplication/AllKeyManagers.json diff --git a/mock/Applications/DefaultApplication/AllKeyManagers.json b/mock/Applications/DefaultApplication/AllKeyManagers.json new file mode 100644 index 0000000..b707e74 --- /dev/null +++ b/mock/Applications/DefaultApplication/AllKeyManagers.json @@ -0,0 +1,177 @@ +{ + "count": 2, + "list": [ + { + "id": "aa899ef9-df1a-44c6-940c-dfe1bc2a8c5a", + "name": "Resident Key Manager", + "type": "default", + "displayName": null, + "description": "This is Resident Key Manager", + "enabled": true, + "availableGrantTypes": [ + "refresh_token", + "urn:ietf:params:oauth:grant-type:saml2-bearer", + "password", + "client_credentials", + "iwa:ntlm", + "urn:ietf:params:oauth:grant-type:device_code", + "authorization_code", + "urn:ietf:params:oauth:grant-type:token-exchange", + "urn:ietf:params:oauth:grant-type:jwt-bearer" + ], + "tokenEndpoint": "https://localhost:9443/oauth2/token", + "revokeEndpoint": "https://localhost:9443/oauth2/revoke", + "userInfoEndpoint": null, + "enableTokenGeneration": true, + "enableTokenEncryption": false, + "enableTokenHashing": false, + "enableOAuthAppCreation": true, + "enableMapOAuthConsumerApps": false, + "applicationConfiguration": [ + { + "name": "application_access_token_expiry_time", + "label": "Application Access Token Expiry Time ", + "type": "input", + "required": false, + "mask": false, + "multiple": false, + "tooltip": "Type Application Access Token Expiry Time in seconds ", + "values": [], + "default": "N/A" + }, + { + "name": "user_access_token_expiry_time", + "label": "User Access Token Expiry Time ", + "type": "input", + "required": false, + "mask": false, + "multiple": false, + "tooltip": "Type User Access Token Expiry Time in seconds ", + "values": [], + "default": "N/A" + }, + { + "name": "refresh_token_expiry_time", + "label": "Refresh Token Expiry Time ", + "type": "input", + "required": false, + "mask": false, + "multiple": false, + "tooltip": "Type Refresh Token Expiry Time in seconds ", + "values": [], + "default": "N/A" + }, + { + "name": "id_token_expiry_time", + "label": "Id Token Expiry Time", + "type": "input", + "required": false, + "mask": false, + "multiple": false, + "tooltip": "Type ID Token Expiry Time in seconds ", + "values": [], + "default": "N/A" + }, + { + "name": "pkceMandatory", + "label": "Enable PKCE", + "type": "checkbox", + "required": false, + "mask": false, + "multiple": false, + "tooltip": "Enable PKCE", + "values": [], + "default": "false" + }, + { + "name": "pkceSupportPlain", + "label": "Support PKCE Plain text", + "type": "checkbox", + "required": false, + "mask": false, + "multiple": false, + "tooltip": "S256 is recommended, plain text too can be used.", + "values": [], + "default": "false" + }, + { + "name": "bypassClientCredentials", + "label": "Public client", + "type": "checkbox", + "required": false, + "mask": false, + "multiple": false, + "tooltip": "Allow authentication without the client secret.", + "values": [], + "default": "false" + } + ], + "alias": null, + "additionalProperties": {}, + "tokenType": "DIRECT" + }, + { + "id": "94d37d2f-7d83-471c-87f7-9421692ddeaa", + "name": "dummy", + "type": "Auth0", + "displayName": "dummy", + "description": "", + "enabled": true, + "availableGrantTypes": [], + "tokenEndpoint": "https://localhost:9443/admin/settings/key-managers/create", + "revokeEndpoint": "https://localhost:9443/admin/settings/key-managers/create", + "userInfoEndpoint": null, + "enableTokenGeneration": true, + "enableTokenEncryption": false, + "enableTokenHashing": false, + "enableOAuthAppCreation": true, + "enableMapOAuthConsumerApps": true, + "applicationConfiguration": [ + { + "name": "app_type", + "label": "Application Type", + "type": "select", + "required": false, + "mask": false, + "multiple": false, + "tooltip": "Type of the application to create", + "values": [ + "regular_web", + "native", + "spa", + "non_interactive" + ], + "default": "regular_web" + }, + { + "name": "token_endpoint_auth_method", + "label": "Token Endpoint Authentication Method", + "type": "select", + "required": true, + "mask": true, + "multiple": false, + "tooltip": "How to Authenticate Token Endpoint", + "values": [ + "client_secret_basic", + "client_secret_post" + ], + "default": "client_secret_basic" + }, + { + "name": "audience_of_api", + "label": "Audience of the API", + "type": "text", + "required": true, + "mask": false, + "multiple": false, + "tooltip": "The audience of the API which intended to use this application", + "values": [], + "default": "" + } + ], + "alias": null, + "additionalProperties": {}, + "tokenType": "DIRECT" + } + ] +} \ No newline at end of file From 4be0424a4dea8f58f74fb28b5655459dad60a984 Mon Sep 17 00:00:00 2001 From: sachinisiriwardene Date: Wed, 11 Dec 2024 09:34:44 +0530 Subject: [PATCH 15/23] add configure and portal routes --- src/partials/header.hbs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/partials/header.hbs b/src/partials/header.hbs index 6ad8a3c..4a6645b 100644 --- a/src/partials/header.hbs +++ b/src/partials/header.hbs @@ -12,6 +12,8 @@ {{!-- Pricing Get started --}} Applications + Add content + Add corganization
{{#if profile}}
From 1aa3a52e1fad8bba65b925c716661e32a8b43748 Mon Sep 17 00:00:00 2001 From: sachinisiriwardene Date: Wed, 11 Dec 2024 16:13:42 +0530 Subject: [PATCH 16/23] remove portal link --- config.json | 50 +++++++++++++++++++++++++++++++++++++++-- src/partials/header.hbs | 1 - 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/config.json b/config.json index f0cf22f..7ef5fab 100644 --- a/config.json +++ b/config.json @@ -1,12 +1,58 @@ { "port": 3000, - "pathToContent": "./src/", + "pathToContent": "../src/", "mode": "development", + "controlPlane" : { + "url": "https://127.0.0.1:9443/api/am/devportal/v3", + "disableCertValidation": true, + "pathToCertificate": "../api-developer-portal/conf/security/client-truststore.pem" + }, "db": { "username": "postgres", "password": "postgres", "database": "devportal", "host": "localhost", "dialect": "postgres" - } + }, + "providerURL": { + "AWS": "https://aws.amazon.com" + }, + "identityProvider" : { + "name": "IS", + "issuer": "https://127.0.0.1:9443/oauth2/token", + "authorizationURL": "https://localhost:9443/oauth2/authorize", + "tokenURL": "https://127.0.0.1:9443/oauth2/token", + "userInfoURL": "https://localhost:9443/oauth2/userinfo", + "clientId": "meVRlVAkUoVufXXjN3aUk72PVF8a", + "callbackURL": "http://localhost:3000/ACME/callback", + "scope": "openid email profile apim:subscribe role", + "signUpURL": "", + "logoutURL": "https://localhost:9443/oidc/logout", + "logoutRedirectURI": "http://localhost:3000/ACME" +}, +"roleClaim": "roles", +"orgIDClaim": "organizationID", +"groupsClaim": "groups", +"adminRole": "admin", +"subscriberRole": "Interna/subscriber", +"superAdminRole": "superAdmin", + "authenticatedPages": [ + "/*/configure", + "/portal", + "/*/applications", + "/*/applications/*", + "/*/api/*", + "/*/myAPIs", + "/*/myAPIs/*" + + ], + "authorizedPages": [ + "/*/applications", + "/*/applications/*", + "/*/configure", + "/portal", + "/*/api/*", + "/*/myAPIs", + "/*/myAPIs/*" + ] } diff --git a/src/partials/header.hbs b/src/partials/header.hbs index 4a6645b..bed2296 100644 --- a/src/partials/header.hbs +++ b/src/partials/header.hbs @@ -13,7 +13,6 @@ Get started --}} Applications Add content - Add corganization
{{#if profile}}
From f50b49b13564031dbcb5d4a1cb28e05002bed198 Mon Sep 17 00:00:00 2001 From: Divya Premanantha Date: Thu, 12 Dec 2024 08:44:04 +0530 Subject: [PATCH 17/23] Add mock subscriptions --- mock/subscriptions.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 mock/subscriptions.json diff --git a/mock/subscriptions.json b/mock/subscriptions.json new file mode 100644 index 0000000..e8bbc42 --- /dev/null +++ b/mock/subscriptions.json @@ -0,0 +1,9 @@ +[{ + "apiName": "AccommodationAPI", + "applicationName": "DefaultApplication", + "throttlingTier": "Unlimited" +}, { + "apiName": "CountriesAPI", + "applicationName": "New Application", + "throttlingTier": "Gold" +}] \ No newline at end of file From cc19d9ad22683854c7bb06892ccef35e4415a5c8 Mon Sep 17 00:00:00 2001 From: Divya Premanantha Date: Thu, 12 Dec 2024 09:02:49 +0530 Subject: [PATCH 18/23] Modify subsscription development flow --- config.json | 23 ++++++-- mock/AccommodationAPI/apiMetadata.json | 14 +++++ mock/CountriesAPI/apiMetadata.json | 14 +++++ mock/LeisureActivitiesAPI/apiMetadata.json | 14 +++++ mock/NavigationAPI/apiMetadata.json | 14 +++++ package-lock.json | 62 ++++++++++++++++++++-- package.json | 2 +- 7 files changed, 135 insertions(+), 8 deletions(-) diff --git a/config.json b/config.json index f0cf22f..628261a 100644 --- a/config.json +++ b/config.json @@ -1,12 +1,29 @@ { "port": 3000, - "pathToContent": "./src/", + "pathToContent": "../src/", "mode": "development", + "controlPlane": { + "url": "https://127.0.0.1:9443/api/am/devportal/v3", + "disableCertValidation": true, + "pathToCertificate": "../api-developer-portal/conf/security/client-truststore.pem" + }, "db": { "username": "postgres", "password": "postgres", "database": "devportal", "host": "localhost", "dialect": "postgres" - } -} + }, + "providerURL": { + "AWS": "https://aws.amazon.com" + }, + "identityProvider": {}, + "roleClaim": "roles", + "orgIDClaim": "organizationID", + "groupsClaim": "groups", + "adminRole": "admin", + "subscriberRole": "Internal/subscriber", + "superAdminRole": "superAdmin", + "authenticatedPages": [], + "authorizedPages": [] +} \ No newline at end of file diff --git a/mock/AccommodationAPI/apiMetadata.json b/mock/AccommodationAPI/apiMetadata.json index 9c55375..1e1abf5 100644 --- a/mock/AccommodationAPI/apiMetadata.json +++ b/mock/AccommodationAPI/apiMetadata.json @@ -18,6 +18,20 @@ "api-icon": "https://devportal-content.s3.amazonaws.com/ACBOrganization/resources/images/hotel-availability.jpeg" } }, + "subscriptionPolicies": [ + { + "policyName": "Gold" + }, + { + "policyName": "Silver" + }, + { + "policyName": "Bronze" + }, + { + "policyName": "Unlimited" + } + ], "serverUrl": { "sandboxUrl": "https://accommodation.api.sandbox.abc.com", "productionUrl": "https://accommodation.api.abc.com" diff --git a/mock/CountriesAPI/apiMetadata.json b/mock/CountriesAPI/apiMetadata.json index c702664..23d8a97 100644 --- a/mock/CountriesAPI/apiMetadata.json +++ b/mock/CountriesAPI/apiMetadata.json @@ -21,6 +21,20 @@ "description": "Allows up to 1000 requests per day." } ], + "subscriptionPolicies": [ + { + "policyName": "Gold" + }, + { + "policyName": "Silver" + }, + { + "policyName": "Bronze" + }, + { + "policyName": "Unlimited" + } + ], "serverUrl": { "sandboxUrl": "https://countries.trevorblades.com/graphql", "productionUrl": "https://countries.trevorblades.com/graphql" diff --git a/mock/LeisureActivitiesAPI/apiMetadata.json b/mock/LeisureActivitiesAPI/apiMetadata.json index 83166e4..b022bd9 100644 --- a/mock/LeisureActivitiesAPI/apiMetadata.json +++ b/mock/LeisureActivitiesAPI/apiMetadata.json @@ -18,6 +18,20 @@ "api-icon": "https://devportal-content.s3.amazonaws.com/ACBOrganization/resources/images/leisure.jpeg" } }, + "subscriptionPolicies": [ + { + "policyName": "Gold" + }, + { + "policyName": "Silver" + }, + { + "policyName": "Bronze" + }, + { + "policyName": "Unlimited" + } + ], "serverUrl": { "sandboxUrl": "https://leisure.api.sandbox.abc.com", "productionUrl": "https://leisure.api.abc.com" diff --git a/mock/NavigationAPI/apiMetadata.json b/mock/NavigationAPI/apiMetadata.json index 1f024c5..8dade51 100644 --- a/mock/NavigationAPI/apiMetadata.json +++ b/mock/NavigationAPI/apiMetadata.json @@ -21,6 +21,20 @@ "description": "Limits requests to 500 per hour." } ], + "subscriptionPolicies": [ + { + "policyName": "Gold" + }, + { + "policyName": "Silver" + }, + { + "policyName": "Bronze" + }, + { + "policyName": "Unlimited" + } + ], "serverUrl": { "sandboxUrl": "https://sandbox.acme.com/api/v1/navigation", "productionUrl": "https://api.acme.com/v1/navigation" diff --git a/package-lock.json b/package-lock.json index 754624a..9409190 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "devportal-webapp": "^1.0.65" + "devportal-webapp": "^1.0.67" }, "bin": { "app": "src/app.js" @@ -1938,6 +1938,16 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz", "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==" }, + "node_modules/axios": { + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", + "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -2436,22 +2446,25 @@ "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==" }, "node_modules/devportal-webapp": { - "version": "1.0.65", - "resolved": "https://registry.npmjs.org/devportal-webapp/-/devportal-webapp-1.0.65.tgz", - "integrity": "sha512-BvpDSEVU2iazHNfjtOzBhcogMwOjpO/8SdIQBRhD3TURRG3PMdzC0owc5lPqTiaIzFnWPPkrRp7r95qkNyJ2Kg==", + "version": "1.0.67", + "resolved": "https://registry.npmjs.org/devportal-webapp/-/devportal-webapp-1.0.67.tgz", + "integrity": "sha512-OaYBc+XRrIfwq97mcmZi0Az1tEzyrV92CriClenpR8zdOD1KVZ4xzTlO5ql7sdL26qRrnFZZjSFLUr6N3EogHA==", "dependencies": { "@asyncapi/react-component": "^2.3.4", + "axios": "^1.7.8", "bootstrap-icons": "^1.11.3", "chokidar": "^3.6.0", "crypto": "^1.0.1", "express": "^4.21.0", "express-handlebars": "^7.1.3", "express-session": "^1.18.0", + "express-validator": "^7.2.0", "fs-extra": "^11.2.0", "graphiql": "^3.7.1", "graphql": "^16.9.0", "handlebars": "^4.7.8", "hbs": "^4.2.0", + "https": "^1.0.0", "js-yaml": "^4.1.0", "jsonwebtoken": "^9.0.2", "marked": "^13.0.3", @@ -2794,6 +2807,18 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==" }, + "node_modules/express-validator": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/express-validator/-/express-validator-7.2.0.tgz", + "integrity": "sha512-I2ByKD8panjtr8Y05l21Wph9xk7kk64UMyvJCl/fFM/3CTJq8isXYPLeKW/aZBCdb/LYNv63PwhY8khw8VWocA==", + "dependencies": { + "lodash": "^4.17.21", + "validator": "~13.12.0" + }, + "engines": { + "node": ">= 8.0.0" + } + }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -2898,6 +2923,25 @@ "node": ">= 0.8" } }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/for-each": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", @@ -3514,6 +3558,11 @@ "npm": ">=1.3.7" } }, + "node_modules/https": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/https/-/https-1.0.0.tgz", + "integrity": "sha512-4EC57ddXrkaF0x83Oj8sM6SLQHAWXw90Skqu2M4AEWENZ3F02dFJE/GARA8igO79tcgYqGrD7ae4f5L3um2lgg==" + }, "node_modules/https-proxy-agent": { "version": "7.0.5", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", @@ -5149,6 +5198,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/psl": { "version": "1.15.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz", diff --git a/package.json b/package.json index 71f7f99..0cab975 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "homepage": "https://github.com/api-developer-portal#readme", "dependencies": { - "devportal-webapp": "^1.0.65" + "devportal-webapp": "^1.0.67" }, "bin": { "app": "src/app.js" From 426db50378579d103a6581271fc0c1609da5be24 Mon Sep 17 00:00:00 2001 From: Divya Premanantha Date: Thu, 12 Dec 2024 09:08:12 +0530 Subject: [PATCH 19/23] update config.json --- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json b/config.json index 628261a..35df830 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "port": 3000, - "pathToContent": "../src/", + "pathToContent": "./src/", "mode": "development", "controlPlane": { "url": "https://127.0.0.1:9443/api/am/devportal/v3", From 133493335461554b56a523d9935269920318a638 Mon Sep 17 00:00:00 2001 From: sachinisiriwardene Date: Thu, 12 Dec 2024 13:31:04 +0530 Subject: [PATCH 20/23] Add mock data for settings page --- config.json | 2 +- mock/IdentityProvider/identityProvider.json | 13 +++++++++ mock/Organization/organizations.json | 32 +++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 mock/IdentityProvider/identityProvider.json create mode 100644 mock/Organization/organizations.json diff --git a/config.json b/config.json index 628261a..35df830 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "port": 3000, - "pathToContent": "../src/", + "pathToContent": "./src/", "mode": "development", "controlPlane": { "url": "https://127.0.0.1:9443/api/am/devportal/v3", diff --git a/mock/IdentityProvider/identityProvider.json b/mock/IdentityProvider/identityProvider.json new file mode 100644 index 0000000..2baf685 --- /dev/null +++ b/mock/IdentityProvider/identityProvider.json @@ -0,0 +1,13 @@ +{ + "name": "IS", + "issuer": "https://127.0.0.1:9443/oauth2/token", + "authorizationURL": "https://localhost:9443/oauth2/authorize", + "tokenURL": "https://127.0.0.1:9443/oauth2/token", + "userInfoURL": "https://localhost:9443/oauth2/userinfo", + "clientId": "meVRlVAkUoVufXXjN3aUk72PVF8a", + "callbackURL": "http://localhost:3000/ACME/callback", + "scope": "openid email profile apim:subscribe role", + "signUpURL": "", + "logoutURL": "https://localhost:9443/oidc/logout", + "logoutRedirectURI": "http://localhost:3000/ACME" +} \ No newline at end of file diff --git a/mock/Organization/organizations.json b/mock/Organization/organizations.json new file mode 100644 index 0000000..47ea160 --- /dev/null +++ b/mock/Organization/organizations.json @@ -0,0 +1,32 @@ +[ + { + "orgId": "4454545", + "orgName": "ACME", + "businessOwner": "Joe", + "businessOwnerContact": "0112345678", + "businessOwnerEmail": "joe@gmail.com", + "devPortalURLIdentifier": "ACME", + "roleClaimName": "roles", + "groupsClaimName": "groups", + "organizationClaimName": "organizationID", + "organizationIdentifier": "ACME", + "adminRole": "admin", + "subscriberRole": "subscriber", + "superAdminRole": "superAdmin" +}, +{ + "orgId": "4454545", + "orgName": "DEPT", + "businessOwner": "Jane", + "businessOwnerContact": "0112345678", + "businessOwnerEmail": "joe@gmail.com", + "devPortalURLIdentifier": "DEPT", + "roleClaimName": "roles", + "groupsClaimName": "groups", + "organizationClaimName": "organizationID", + "organizationIdentifier": "DEPT", + "adminRole": "admin", + "subscriberRole": "subscriber", + "superAdminRole": "superAdmin" +} +] \ No newline at end of file From ab9132a457a79cb4a1af0b20da8ea9905645a794 Mon Sep 17 00:00:00 2001 From: sachinisiriwardene Date: Thu, 12 Dec 2024 13:33:08 +0530 Subject: [PATCH 21/23] format code --- mock/Organization/organizations.json | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/mock/Organization/organizations.json b/mock/Organization/organizations.json index 47ea160..c8699a5 100644 --- a/mock/Organization/organizations.json +++ b/mock/Organization/organizations.json @@ -13,20 +13,20 @@ "adminRole": "admin", "subscriberRole": "subscriber", "superAdminRole": "superAdmin" -}, -{ - "orgId": "4454545", - "orgName": "DEPT", - "businessOwner": "Jane", - "businessOwnerContact": "0112345678", - "businessOwnerEmail": "joe@gmail.com", - "devPortalURLIdentifier": "DEPT", - "roleClaimName": "roles", - "groupsClaimName": "groups", - "organizationClaimName": "organizationID", - "organizationIdentifier": "DEPT", - "adminRole": "admin", - "subscriberRole": "subscriber", - "superAdminRole": "superAdmin" -} + }, + { + "orgId": "4454545", + "orgName": "DEPT", + "businessOwner": "Jane", + "businessOwnerContact": "0112345678", + "businessOwnerEmail": "joe@gmail.com", + "devPortalURLIdentifier": "DEPT", + "roleClaimName": "roles", + "groupsClaimName": "groups", + "organizationClaimName": "organizationID", + "organizationIdentifier": "DEPT", + "adminRole": "admin", + "subscriberRole": "subscriber", + "superAdminRole": "superAdmin" + } ] \ No newline at end of file From dbdda9c740c0bc04212fe796f8b8c02546bf7748 Mon Sep 17 00:00:00 2001 From: sachinisiriwardene Date: Thu, 12 Dec 2024 13:38:15 +0530 Subject: [PATCH 22/23] add mock data --- mock/IdentityProvider/identityProvider.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mock/IdentityProvider/identityProvider.json b/mock/IdentityProvider/identityProvider.json index 2baf685..5d1523f 100644 --- a/mock/IdentityProvider/identityProvider.json +++ b/mock/IdentityProvider/identityProvider.json @@ -4,7 +4,7 @@ "authorizationURL": "https://localhost:9443/oauth2/authorize", "tokenURL": "https://127.0.0.1:9443/oauth2/token", "userInfoURL": "https://localhost:9443/oauth2/userinfo", - "clientId": "meVRlVAkUoVufXXjN3aUk72PVF8a", + "clientId": "ClientId", "callbackURL": "http://localhost:3000/ACME/callback", "scope": "openid email profile apim:subscribe role", "signUpURL": "", From f75328707306d5df03323cdf74bcbc958bd88623 Mon Sep 17 00:00:00 2001 From: sachinisiriwardene Date: Thu, 12 Dec 2024 14:59:29 +0530 Subject: [PATCH 23/23] add style change for footer --- package-lock.json | 8 ++++---- package.json | 2 +- src/partials/footer.hbs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9409190..ee3b706 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "devportal-webapp": "^1.0.67" + "devportal-webapp": "^1.0.70" }, "bin": { "app": "src/app.js" @@ -2446,9 +2446,9 @@ "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==" }, "node_modules/devportal-webapp": { - "version": "1.0.67", - "resolved": "https://registry.npmjs.org/devportal-webapp/-/devportal-webapp-1.0.67.tgz", - "integrity": "sha512-OaYBc+XRrIfwq97mcmZi0Az1tEzyrV92CriClenpR8zdOD1KVZ4xzTlO5ql7sdL26qRrnFZZjSFLUr6N3EogHA==", + "version": "1.0.70", + "resolved": "https://registry.npmjs.org/devportal-webapp/-/devportal-webapp-1.0.70.tgz", + "integrity": "sha512-jpVJNhH2FObIIzck1DAaYTfOEv4zsjM3eV7NSQnp2aJ3F+63bmX3kM2TayfGohxzdF4RCY5mIL3eE/BLVtzS2Q==", "dependencies": { "@asyncapi/react-component": "^2.3.4", "axios": "^1.7.8", diff --git a/package.json b/package.json index 0cab975..339ac3e 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "homepage": "https://github.com/api-developer-portal#readme", "dependencies": { - "devportal-webapp": "^1.0.67" + "devportal-webapp": "^1.0.70" }, "bin": { "app": "src/app.js" diff --git a/src/partials/footer.hbs b/src/partials/footer.hbs index 4811011..e5eb020 100644 --- a/src/partials/footer.hbs +++ b/src/partials/footer.hbs @@ -1,4 +1,4 @@ -
+