diff options
-rw-r--r-- | .readthedocs.yaml | 18 | ||||
-rw-r--r-- | docs/_static/css/ribbon.css | 63 | ||||
-rwxr-xr-x | docs/_static/favicon.ico | bin | 0 -> 2102 bytes | |||
-rw-r--r-- | docs/_static/logo_onap_2017.png | bin | 0 -> 12278 bytes | |||
-rw-r--r-- | docs/conf.py | 58 | ||||
-rw-r--r-- | docs/index.rst | 2 | ||||
-rw-r--r-- | docs/requirements-docs.txt | 8 | ||||
-rw-r--r-- | docs/spelling_wordlist.txt | 10 | ||||
-rw-r--r-- | docs/tox.ini | 32 | ||||
-rw-r--r-- | releases/0.1.1-container-release.yaml | 7 | ||||
-rw-r--r-- | src/app/components/layout/header/header/header.component.ts | 2 | ||||
-rw-r--r-- | src/app/http-interceptors/caching-interceptor.ts | 2 | ||||
-rw-r--r-- | src/app/modules/auth/auth.config.ts | 2 | ||||
-rw-r--r-- | version.properties | 4 |
14 files changed, 203 insertions, 5 deletions
diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000..f56b3b7 --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,18 @@ +--- +# .readthedocs.yml +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details +# Required + +version: 2 +build: + os: ubuntu-20.04 + tools: + python: "3.8" + +python: + install: + - requirements: docs/requirements-docs.txt + +sphinx: + configuration: docs/conf.py diff --git a/docs/_static/css/ribbon.css b/docs/_static/css/ribbon.css new file mode 100644 index 0000000..afb9480 --- /dev/null +++ b/docs/_static/css/ribbon.css @@ -0,0 +1,63 @@ +.ribbon { + z-index: 1000; + background-color: #a00; + overflow: hidden; + white-space: nowrap; + position: fixed; + top: 25px; + right: -50px; + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + -webkit-box-shadow: 0 0 10px #888; + -moz-box-shadow: 0 0 10px #888; + box-shadow: 0 0 10px #888; + +} + +.ribbon a { + border: 1px solid #faa; + color: #fff; + display: block; + font: bold 81.25% 'Helvetica Neue', Helvetica, Arial, sans-serif; + margin: 1px 0; + padding: 10px 50px; + text-align: center; + text-decoration: none; + text-shadow: 0 0 5px #444; + transition: 0.5s; +} + +.ribbon a:hover { + background: #c11; + color: #fff; +} + + +/* override table width restrictions */ +@media screen and (min-width: 767px) { + + .wy-table-responsive table td, .wy-table-responsive table th { + /* !important prevents the common CSS stylesheets from overriding + this as on RTD they are loaded after this stylesheet */ + white-space: normal !important; + } + + .wy-table-responsive { + overflow: visible !important; + } +} + +@media screen and (max-width: 767px) { + .wy-table-responsive table td { + white-space: nowrap; + } +} + +/* fix width of the screen */ + +.wy-nav-content { + max-width: 800px; +} diff --git a/docs/_static/favicon.ico b/docs/_static/favicon.ico Binary files differnew file mode 100755 index 0000000..cb712eb --- /dev/null +++ b/docs/_static/favicon.ico diff --git a/docs/_static/logo_onap_2017.png b/docs/_static/logo_onap_2017.png Binary files differnew file mode 100644 index 0000000..5d064f4 --- /dev/null +++ b/docs/_static/logo_onap_2017.png diff --git a/docs/conf.py b/docs/conf.py new file mode 100644 index 0000000..8cdff9b --- /dev/null +++ b/docs/conf.py @@ -0,0 +1,58 @@ +project = "onap" +release = "master" +version = "master" + +author = "Open Network Automation Platform" +# yamllint disable-line rule:line-length +copyright = "ONAP. Licensed under Creative Commons Attribution 4.0 International License" + +pygments_style = "sphinx" +html_theme = "sphinx_rtd_theme" +html_theme_options = { + "style_nav_header_background": "white", + "sticky_navigation": "False" } +html_logo = "_static/logo_onap_2017.png" +html_favicon = "_static/favicon.ico" +html_static_path = ["_static"] +html_show_sphinx = False + +extensions = [ + 'sphinx.ext.intersphinx', + 'sphinx.ext.graphviz', + 'sphinxcontrib.blockdiag', + 'sphinxcontrib.seqdiag', + 'sphinxcontrib.swaggerdoc', + 'sphinxcontrib.plantuml' +] + +# +# Map to 'latest' if this file is used in 'latest' (master) 'doc' branch. +# Change to {releasename} after you have created the new 'doc' branch. +# + +branch = 'latest' + +intersphinx_mapping = {} +doc_url = 'https://docs.onap.org/projects' +master_doc = 'index' + +exclude_patterns = [ + '.tox' +] + +spelling_word_list_filename='spelling_wordlist.txt' +spelling_lang = "en_GB" + +# +# Example: +# intersphinx_mapping['onap-aai-aai-common'] = ('{}/onap-aai-aai-common/en/%s'.format(doc_url) % branch, None) +# + +html_last_updated_fmt = '%d-%b-%y %H:%M' + +def setup(app): + app.add_css_file("css/ribbon.css") + +linkcheck_ignore = [ + r'http://localhost:\d+/' +] diff --git a/docs/index.rst b/docs/index.rst new file mode 100644 index 0000000..746c925 --- /dev/null +++ b/docs/index.rst @@ -0,0 +1,2 @@ +portal-ng Documentation +#######################
\ No newline at end of file diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt new file mode 100644 index 0000000..097282b --- /dev/null +++ b/docs/requirements-docs.txt @@ -0,0 +1,8 @@ +sphinx>=4.2.0 # BSD +sphinx-rtd-theme>=1.0.0 # MIT +sphinxcontrib-blockdiag # BSD +sphinxcontrib-seqdiag # BSD +sphinxcontrib-swaggerdoc +sphinxcontrib-spelling +sphinxcontrib-plantuml +six diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt new file mode 100644 index 0000000..35c0468 --- /dev/null +++ b/docs/spelling_wordlist.txt @@ -0,0 +1,10 @@ +Goodger +Mär +docinfo +overlined +Docutils +csv +sectnum +reST +unicode +defs diff --git a/docs/tox.ini b/docs/tox.ini new file mode 100644 index 0000000..38771a6 --- /dev/null +++ b/docs/tox.ini @@ -0,0 +1,32 @@ +[tox] +minversion = 1.6 +envlist = docs,docs-linkcheck,docs-spellcheck +skipsdist = true + +[testenv:docs] +basepython = python3.8 +deps = + -r{toxinidir}/requirements-docs.txt + -chttps://releases.openstack.org/constraints/upper/yoga + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master +commands = + sphinx-build -W -q -b html -n -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/html + +[testenv:docs-linkcheck] +basepython = python3.8 +deps = + -r{toxinidir}/requirements-docs.txt + -chttps://releases.openstack.org/constraints/upper/yoga + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master +commands = + sphinx-build -W -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck + +[testenv:docs-spellcheck] +basepython = python3.8 +deps = + -r{toxinidir}/requirements-docs.txt + -chttps://releases.openstack.org/constraints/upper/yoga + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master +commands = + sphinx-build -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck +# sphinx-build -W -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck diff --git a/releases/0.1.1-container-release.yaml b/releases/0.1.1-container-release.yaml new file mode 100644 index 0000000..7275927 --- /dev/null +++ b/releases/0.1.1-container-release.yaml @@ -0,0 +1,7 @@ +distribution_type: container +container_release_tag: 0.1.1 +project: portal-ng/ui +ref: 24338bc2f78841a0475d91b49eb9458767ab97e9 +containers: + - name: portal-ng/ui + version: latest diff --git a/src/app/components/layout/header/header/header.component.ts b/src/app/components/layout/header/header/header.component.ts index b6c513f..57d4688 100644 --- a/src/app/components/layout/header/header/header.component.ts +++ b/src/app/components/layout/header/header/header.component.ts @@ -48,7 +48,7 @@ export class HeaderComponent implements OnInit { isOnapTheme = false; switchToMainContent: string = ''; isFullScreen = false; - changePasswordUrl = `${environment.keycloak.hostname}/auth/realms/${environment.keycloak.realm}/account/password`; + changePasswordUrl = `${environment.keycloak.hostname}/realms/${environment.keycloak.realm}/account/password`; shortcuts: Map<KeyboardShortcuts,string> = this.shortcutService.getShortcuts(); public ACCESS_KEY = KeyboardShortcuts; diff --git a/src/app/http-interceptors/caching-interceptor.ts b/src/app/http-interceptors/caching-interceptor.ts index df13376..d783a93 100644 --- a/src/app/http-interceptors/caching-interceptor.ts +++ b/src/app/http-interceptors/caching-interceptor.ts @@ -35,7 +35,7 @@ import { urlTileApi } from '../services/tileservice/tiles.service'; export class CachingInterceptor implements HttpInterceptor { private cachedUrls: Array<string> = [ urlTileApi, - window.location.origin + '/keycloak/auth/realms/ONAP/protocol/openid-connect/userinfo', + window.location.origin + '/keycloak/realms/ONAP/protocol/openid-connect/userinfo', ]; // cache is the cache service that supports get() and put() diff --git a/src/app/modules/auth/auth.config.ts b/src/app/modules/auth/auth.config.ts index 8f8035e..5a7ad9e 100644 --- a/src/app/modules/auth/auth.config.ts +++ b/src/app/modules/auth/auth.config.ts @@ -22,7 +22,7 @@ import { environment } from '../../../environments/environment'; export const authConfig: AuthConfig = { // Url of the Identity Provider - issuer: `${environment.keycloak.hostname}/auth/realms/${environment.keycloak.realm}`, + issuer: `${environment.keycloak.hostname}/realms/${environment.keycloak.realm}`, // URL of the SPA to redirect the user to after login redirectUri: environment.keycloak.redirectUri, diff --git a/version.properties b/version.properties index 5294d92..b179fec 100644 --- a/version.properties +++ b/version.properties @@ -4,10 +4,10 @@ major=0
minor=1
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins
release_version=${base_version}
-snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file +snapshot_version=${base_version}-SNAPSHOT
|