From d45ccbbb2992027bbc36e193fa807ca222ec9850 Mon Sep 17 00:00:00 2001 From: Meina Zhou Date: Wed, 5 Dec 2018 15:08:40 +0800 Subject: [PATCH] add developer center in swagger ui way Signed-off-by: Meina Zhou --- make/photon/portal/Dockerfile | 5 + make/photon/portal/entrypoint.sh | 7 +- src/portal/angular.json | 6 +- .../lib/src/log/recent-log.component.html | 3 +- src/portal/package-lock.json | 705 ++++++++++++++++-- src/portal/package.json | 8 + src/portal/src/app/app.module.ts | 7 +- .../harbor-shell/harbor-shell.component.html | 50 +- .../app/dev-center/dev-center.component.html | 2 + .../app/dev-center/dev-center.component.scss | 8 + .../dev-center/dev-center.component.spec.ts | 26 + .../app/dev-center/dev-center.component.ts | 37 + .../src/app/dev-center/dev-center.module.ts | 23 + src/portal/src/app/harbor-routing.module.ts | 7 +- src/portal/src/i18n/lang/en-us-lang.json | 3 +- src/portal/src/i18n/lang/es-es-lang.json | 3 +- src/portal/src/i18n/lang/fr-fr-lang.json | 3 +- src/portal/src/i18n/lang/pt-br-lang.json | 3 +- src/portal/src/i18n/lang/zh-cn-lang.json | 3 +- src/portal/src/polyfills.ts | 3 + src/portal/src/tsconfig.app.json | 4 + src/portal/tsconfig.json | 2 +- 22 files changed, 834 insertions(+), 84 deletions(-) create mode 100644 src/portal/src/app/dev-center/dev-center.component.html create mode 100644 src/portal/src/app/dev-center/dev-center.component.scss create mode 100644 src/portal/src/app/dev-center/dev-center.component.spec.ts create mode 100644 src/portal/src/app/dev-center/dev-center.component.ts create mode 100644 src/portal/src/app/dev-center/dev-center.module.ts diff --git a/make/photon/portal/Dockerfile b/make/photon/portal/Dockerfile index c011dc0de..e3fd9b3bb 100644 --- a/make/photon/portal/Dockerfile +++ b/make/photon/portal/Dockerfile @@ -5,6 +5,7 @@ RUN mkdir -p /build_dir COPY make/photon/portal/entrypoint.sh / COPY src/portal /portal_src +COPY ./docs/swagger.yaml /portal_src WORKDIR /portal_src @@ -24,7 +25,11 @@ RUN tdnf install -y nginx >> /dev/null \ EXPOSE 80 VOLUME /var/cache/nginx /var/log/nginx /run + COPY --from=nodeportal /build_dir/dist /usr/share/nginx/html +COPY --from=nodeportal /build_dir/swagger.yaml /usr/share/nginx/html +COPY --from=nodeportal /build_dir/swagger.json /usr/share/nginx/html + COPY make/photon/portal/nginx.conf /etc/nginx/nginx.conf STOPSIGNAL SIGQUIT diff --git a/make/photon/portal/entrypoint.sh b/make/photon/portal/entrypoint.sh index 3b1350906..c00b5e0dc 100644 --- a/make/photon/portal/entrypoint.sh +++ b/make/photon/portal/entrypoint.sh @@ -5,6 +5,11 @@ cd /build_dir cp -r /portal_src/* . ls -la +# Update +apt-get update +apt-get install -y ruby +ruby -ryaml -rjson -e 'puts JSON.pretty_generate(YAML.load(ARGF))' swagger.yaml>swagger.json + cat ./package.json npm install @@ -13,4 +18,4 @@ npm run build_lib npm run link_lib ## Build production -npm run release \ No newline at end of file +npm run release diff --git a/src/portal/angular.json b/src/portal/angular.json index 63e3fda46..157657038 100644 --- a/src/portal/angular.json +++ b/src/portal/angular.json @@ -24,6 +24,7 @@ "styles": [ "node_modules/@clr/icons/clr-icons.min.css", "node_modules/@clr/ui/clr-ui.min.css", + "node_modules/swagger-ui/dist/swagger-ui.css", "node_modules/prismjs/themes/prism-solarizedlight.css", "src/styles.css" ], @@ -35,7 +36,10 @@ "node_modules/web-animations-js/web-animations.min.js", "node_modules/marked/lib/marked.js", "node_modules/prismjs/prism.js", - "node_modules/prismjs/components/prism-yaml.min.js" + "node_modules/prismjs/components/prism-yaml.min.js", + "node_modules/jquery/dist/jquery.slim.js", + "node_modules/popper.js/dist/umd/popper.js", + "node_modules/bootstrap/dist/js/bootstrap.js" ] }, "configurations": { diff --git a/src/portal/lib/src/log/recent-log.component.html b/src/portal/lib/src/log/recent-log.component.html index c9fd5e5d6..e5cf0e3bc 100644 --- a/src/portal/lib/src/log/recent-log.component.html +++ b/src/portal/lib/src/log/recent-log.component.html @@ -1,8 +1,7 @@
-

{{'SIDE_NAV.LOGS' | translate}}

-
+