You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/09/13 08:21:03 UTC
[incubator-dlab] branch DLAB-1056 created (now 1cd5653)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 1cd5653 moved servise pages; separate service page module
This branch includes the following new commits:
new 6e4db18 [DLAB-1056]: added project data to reporting grid
new 794fd91 [DLAB-1031]: fixed names overlaping on billing detail dialog
new ba581b2 [DLAB-1094]: prevent extra scrollbar on create notebook dialog
new 1bb1214 moved servise pages
new cb1a557 moved servise pages; separate service page module
new 1cd5653 moved servise pages; separate service page module
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 04/06: moved servise pages
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 1bb12146b25e9a97cc5dc1ff08cc0269f07d4aa1
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Sep 13 11:20:12 2019 +0300
moved servise pages
---
.../app/access-denied/access-denied.component.html | 33 ------------
.../app/access-denied/access-denied.component.scss | 52 -------------------
.../app/access-denied/access-denied.component.ts | 29 -----------
.../src/app/access-denied/access-denied.module.ts | 29 -----------
.../src/app/not-found/not-found.component.html | 33 ------------
.../src/app/not-found/not-found.component.scss | 59 ----------------------
.../src/app/not-found/not-found.component.ts | 27 ----------
.../webapp/src/app/not-found/not-found.module.ts | 29 -----------
8 files changed, 291 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.html b/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.html
deleted file mode 100644
index dfd8599..0000000
--- a/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<div class="no-access-page">
- <div class="content">
- <a class="logo" href="#/resources_list">
- <img src="assets/img/security-screen.png" alt="">
- </a>
-
- <div class="message-block">
- <h3>Access Denied!</h3>
- <p>The page you were trying to reach has restricted access.
- <a href="#/resources_list">Go to the Homepage?</a>
- </p>
- </div>
- </div>
-</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.scss b/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.scss
deleted file mode 100644
index eb3eac2..0000000
--- a/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.scss
+++ /dev/null
@@ -1,52 +0,0 @@
-/*!
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.no-access-page {
- height: 100%;
- background: #f5f5f5;
- color: #8c8888;
- .content {
- position: absolute;
- top: 0;
- left: 0;
- bottom: 0;
- right: 0;
- max-width: 560px;
- max-height: 360px;
- margin: auto;
- }
- .logo {
- display: block;
- img {
- width: 100%;
- }
- }
- .message-block {
- width: 300px;
- margin: 0 auto;
- text-align: center;
- a {
- text-decoration: none;
- color: #36afd5;
- transition: all .35s ease-in-out;
- &:hover, &:active {
- color: #3392b0;
- }
- }
- }
-}
diff --git a/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.ts b/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.ts
deleted file mode 100644
index e14c894..0000000
--- a/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { Component, OnInit } from '@angular/core';
-
-@Component({
- selector: 'dlab-access-denied',
- templateUrl: './access-denied.component.html',
- styleUrls: ['./access-denied.component.scss']
-})
-export class AccessDeniedComponent implements OnInit {
- constructor() { }
- ngOnInit() { }
-}
diff --git a/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.module.ts b/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.module.ts
deleted file mode 100644
index d6d4438..0000000
--- a/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.module.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { AccessDeniedComponent } from './access-denied.component';
-
-@NgModule({
- imports: [CommonModule],
- declarations: [AccessDeniedComponent],
- exports: [AccessDeniedComponent]
-})
-export class AccessDeniedModule {}
diff --git a/services/self-service/src/main/resources/webapp/src/app/not-found/not-found.component.html b/services/self-service/src/main/resources/webapp/src/app/not-found/not-found.component.html
deleted file mode 100644
index 2eb5e74..0000000
--- a/services/self-service/src/main/resources/webapp/src/app/not-found/not-found.component.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<div class="not-found-page">
- <div class="content">
- <a class="logo" href="#/resources_list">
- <img src="assets/svg/not_found_page.svg" alt="">
- </a>
-
- <div class="message-block">
- <h3>Whooops... Page Not Found!</h3>
- <p>We couldn't seem to found the page you are looking for.
- <a href="#/resources_list">Go to the Homepage?</a>
- </p>
- </div>
- </div>
-</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/not-found/not-found.component.scss b/services/self-service/src/main/resources/webapp/src/app/not-found/not-found.component.scss
deleted file mode 100644
index 40c98e1..0000000
--- a/services/self-service/src/main/resources/webapp/src/app/not-found/not-found.component.scss
+++ /dev/null
@@ -1,59 +0,0 @@
-/*!
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-.not-found-page {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background: #f5f5f5;
- color: #8c8888;
- z-index: -1;
- .content {
- position: absolute;
- top: 0;
- left: 0;
- bottom: 0;
- right: 0;
- max-width: 560px;
- max-height: 360px;
- margin: auto;
- }
- .logo {
- display: block;
- img {
- width: 100%;
- }
- }
- .message-block {
- position: absolute;
- bottom: -20px;
- width: 300px;
- font-size: 14px;
- a {
- text-decoration: none;
- color: #36afd5;
- transition: all .35s ease-in-out;
- &:hover, &:active {
- color: #3392b0;
- }
- }
- }
-}
diff --git a/services/self-service/src/main/resources/webapp/src/app/not-found/not-found.component.ts b/services/self-service/src/main/resources/webapp/src/app/not-found/not-found.component.ts
deleted file mode 100644
index 34f860f..0000000
--- a/services/self-service/src/main/resources/webapp/src/app/not-found/not-found.component.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { Component } from '@angular/core';
-
-@Component({
- selector: 'not-found',
- templateUrl: 'not-found.component.html',
- styleUrls: ['not-found.component.scss']
-})
-export class NotFoundComponent { }
diff --git a/services/self-service/src/main/resources/webapp/src/app/not-found/not-found.module.ts b/services/self-service/src/main/resources/webapp/src/app/not-found/not-found.module.ts
deleted file mode 100644
index c1d063a..0000000
--- a/services/self-service/src/main/resources/webapp/src/app/not-found/not-found.module.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { NotFoundComponent } from './not-found.component';
-
-@NgModule({
- imports: [CommonModule],
- declarations: [NotFoundComponent],
- exports: [NotFoundComponent]
-})
-export class NotFoundModule {}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/06: [DLAB-1031]: fixed names overlaping on
billing detail dialog
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 794fd9137d47eac4e9ac0ddc763292d58c479c68
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Sep 12 15:17:13 2019 +0300
[DLAB-1031]: fixed names overlaping on billing detail dialog
---
.../cost-details-dialog.component.scss | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss
index 8bce082..64ef43c 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss
@@ -20,7 +20,9 @@
.billing-detail-dialog {
table {
width: 100%;
- th, td {
+
+ th,
+ td {
border: 1px solid #edf1f5;
padding: 18px 15px;
text-align: left;
@@ -32,10 +34,12 @@
.service {
width: 30%;
}
+
.resource-type,
.cost-currency {
width: 10%;
}
+
.resource-name,
.usage-date-start,
.usage-date-end {
@@ -43,14 +47,18 @@
overflow: hidden;
text-overflow: ellipsis;
padding-right: 10px;
+ white-space: nowrap;
}
+
.wide-name-field {
width: 25%;
}
+
.resource-name {
cursor: pointer;
width: 20%;
}
+
.total {
padding: 18px 20px 0;
text-align: right;
@@ -64,7 +72,12 @@
max-height: 285px;
overflow-y: auto;
}
+
.mat-list-item-content {
font-size: 15px !important;
justify-content: space-between;
}
+
+mat-tooltip-component>.mat-tooltip {
+ white-space: pre;
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 05/06: moved servise pages;
separate service page module
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit cb1a557d14b1d5759ccc2e71532272b154a83a2e
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Sep 13 11:20:29 2019 +0300
moved servise pages; separate service page module
---
.../access-denied/access-denied.component.scss | 52 +++++++++++++++++++
.../access-denied/access-denied.component.ts | 44 ++++++++++++++++
.../not-found/not-found.component.html | 33 ++++++++++++
.../not-found/not-found.component.scss | 59 ++++++++++++++++++++++
.../service-pages/not-found/not-found.component.ts | 27 ++++++++++
.../src/app/service-pages/service-pages.module.ts | 30 +++++++++++
6 files changed, 245 insertions(+)
diff --git a/services/self-service/src/main/resources/webapp/src/app/service-pages/access-denied/access-denied.component.scss b/services/self-service/src/main/resources/webapp/src/app/service-pages/access-denied/access-denied.component.scss
new file mode 100644
index 0000000..eb3eac2
--- /dev/null
+++ b/services/self-service/src/main/resources/webapp/src/app/service-pages/access-denied/access-denied.component.scss
@@ -0,0 +1,52 @@
+/*!
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+.no-access-page {
+ height: 100%;
+ background: #f5f5f5;
+ color: #8c8888;
+ .content {
+ position: absolute;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ max-width: 560px;
+ max-height: 360px;
+ margin: auto;
+ }
+ .logo {
+ display: block;
+ img {
+ width: 100%;
+ }
+ }
+ .message-block {
+ width: 300px;
+ margin: 0 auto;
+ text-align: center;
+ a {
+ text-decoration: none;
+ color: #36afd5;
+ transition: all .35s ease-in-out;
+ &:hover, &:active {
+ color: #3392b0;
+ }
+ }
+ }
+}
diff --git a/services/self-service/src/main/resources/webapp/src/app/service-pages/access-denied/access-denied.component.ts b/services/self-service/src/main/resources/webapp/src/app/service-pages/access-denied/access-denied.component.ts
new file mode 100644
index 0000000..5be53fd
--- /dev/null
+++ b/services/self-service/src/main/resources/webapp/src/app/service-pages/access-denied/access-denied.component.ts
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'dlab-access-denied',
+ template: `
+ <div class="no-access-page">
+ <div class="content">
+ <a class="logo" href="#/resources_list">
+ <img src="assets/img/security-screen.png" alt="">
+ </a>
+
+ <div class="message-block">
+ <h3>Access Denied!</h3>
+ <p>The page you were trying to reach has restricted access.
+ <a href="#/resources_list">Go to the Homepage?</a>
+ </p>
+ </div>
+ </div>
+ </div>
+ `,
+ styleUrls: ['./access-denied.component.scss']
+})
+export class AccessDeniedComponent implements OnInit {
+ constructor() { }
+ ngOnInit() { }
+}
diff --git a/services/self-service/src/main/resources/webapp/src/app/service-pages/not-found/not-found.component.html b/services/self-service/src/main/resources/webapp/src/app/service-pages/not-found/not-found.component.html
new file mode 100644
index 0000000..2eb5e74
--- /dev/null
+++ b/services/self-service/src/main/resources/webapp/src/app/service-pages/not-found/not-found.component.html
@@ -0,0 +1,33 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<div class="not-found-page">
+ <div class="content">
+ <a class="logo" href="#/resources_list">
+ <img src="assets/svg/not_found_page.svg" alt="">
+ </a>
+
+ <div class="message-block">
+ <h3>Whooops... Page Not Found!</h3>
+ <p>We couldn't seem to found the page you are looking for.
+ <a href="#/resources_list">Go to the Homepage?</a>
+ </p>
+ </div>
+ </div>
+</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/service-pages/not-found/not-found.component.scss b/services/self-service/src/main/resources/webapp/src/app/service-pages/not-found/not-found.component.scss
new file mode 100644
index 0000000..40c98e1
--- /dev/null
+++ b/services/self-service/src/main/resources/webapp/src/app/service-pages/not-found/not-found.component.scss
@@ -0,0 +1,59 @@
+/*!
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.not-found-page {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: #f5f5f5;
+ color: #8c8888;
+ z-index: -1;
+ .content {
+ position: absolute;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ max-width: 560px;
+ max-height: 360px;
+ margin: auto;
+ }
+ .logo {
+ display: block;
+ img {
+ width: 100%;
+ }
+ }
+ .message-block {
+ position: absolute;
+ bottom: -20px;
+ width: 300px;
+ font-size: 14px;
+ a {
+ text-decoration: none;
+ color: #36afd5;
+ transition: all .35s ease-in-out;
+ &:hover, &:active {
+ color: #3392b0;
+ }
+ }
+ }
+}
diff --git a/services/self-service/src/main/resources/webapp/src/app/service-pages/not-found/not-found.component.ts b/services/self-service/src/main/resources/webapp/src/app/service-pages/not-found/not-found.component.ts
new file mode 100644
index 0000000..34f860f
--- /dev/null
+++ b/services/self-service/src/main/resources/webapp/src/app/service-pages/not-found/not-found.component.ts
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'not-found',
+ templateUrl: 'not-found.component.html',
+ styleUrls: ['not-found.component.scss']
+})
+export class NotFoundComponent { }
diff --git a/services/self-service/src/main/resources/webapp/src/app/service-pages/service-pages.module.ts b/services/self-service/src/main/resources/webapp/src/app/service-pages/service-pages.module.ts
new file mode 100644
index 0000000..f3da2fe
--- /dev/null
+++ b/services/self-service/src/main/resources/webapp/src/app/service-pages/service-pages.module.ts
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { NotFoundComponent } from './not-found/not-found.component';
+import { AccessDeniedComponent } from './access-denied/access-denied.component';
+
+@NgModule({
+ imports: [CommonModule],
+ declarations: [NotFoundComponent, AccessDeniedComponent],
+ exports: [NotFoundComponent, AccessDeniedComponent]
+})
+export class ServicePagesModule { }
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 06/06: moved servise pages;
separate service page module
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 1cd5653cbab71c268271dd1aded39eeb670a26b7
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Sep 13 11:20:52 2019 +0300
moved servise pages; separate service page module
---
.../main/resources/webapp/src/app/app.module.ts | 38 ++++++++++------------
.../resources/webapp/src/app/app.routing.module.ts | 4 +--
2 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/app.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.module.ts
index 0caf8eb..82629e4 100644
--- a/services/self-service/src/main/resources/webapp/src/app/app.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/app.module.ts
@@ -37,8 +37,7 @@ import { LoginModule } from './login/login.module';
import { LayoutModule } from './layout/layout.module'
import { GuidesModule } from './help';
-import { NotFoundModule } from './not-found/not-found.module';
-import { AccessDeniedModule } from './access-denied/access-denied.module';
+import { ServicePagesModule } from './service-pages/service-pages.module';
import { ResourcesModule } from './resources/resources.module';
import { ReportingModule } from './reporting/reporting.module';
@@ -58,8 +57,7 @@ import { CoreModule } from './core/core.module';
LayoutModule,
ResourcesModule,
GuidesModule,
- NotFoundModule,
- AccessDeniedModule,
+ ServicePagesModule,
ReportingModule,
AdministrationModule,
WebterminalModule,
@@ -69,22 +67,22 @@ import { CoreModule } from './core/core.module';
ToastrModule.forRoot({ timeOut: 10000 })
],
providers: [{
- provide: LocationStrategy,
- useClass: HashLocationStrategy,
- useValue: '/'
- }, {
- provide: HTTP_INTERCEPTORS,
- useClass: HttpTokenInterceptor,
- multi: true
- }, {
- provide: HTTP_INTERCEPTORS,
- useClass: NoCacheInterceptor,
- multi: true,
- }, {
- provide: HTTP_INTERCEPTORS,
- useClass: ErrorInterceptor,
- multi: true,
- }
+ provide: LocationStrategy,
+ useClass: HashLocationStrategy,
+ useValue: '/'
+ }, {
+ provide: HTTP_INTERCEPTORS,
+ useClass: HttpTokenInterceptor,
+ multi: true
+ }, {
+ provide: HTTP_INTERCEPTORS,
+ useClass: NoCacheInterceptor,
+ multi: true,
+ }, {
+ provide: HTTP_INTERCEPTORS,
+ useClass: ErrorInterceptor,
+ multi: true,
+ }
],
bootstrap: [AppComponent]
})
diff --git a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
index a608deb..091217d 100644
--- a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
@@ -24,8 +24,8 @@ import { LoginComponent } from './login/login.module';
import { LayoutComponent } from './layout/layout.component'
import { ResourcesComponent } from './resources/resources.component';
import { AccessNotebookGuideComponent, PublicKeyGuideComponent } from './help';
-import { NotFoundComponent } from './not-found/not-found.component';
-import { AccessDeniedComponent } from './access-denied/access-denied.component';
+import { NotFoundComponent } from './service-pages/not-found/not-found.component';
+import { AccessDeniedComponent } from './service-pages/access-denied/access-denied.component';
import { ReportingComponent } from './reporting/reporting.component';
import { WebterminalComponent } from './webterminal/webterminal.component';
import { ManagementComponent } from './administration/management/management.component';
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/06: [DLAB-1056]: added project data to
reporting grid
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 6e4db186021a8f5a7694d50a65be5e5697e5b2a4
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Sep 11 15:52:37 2019 +0300
[DLAB-1056]: added project data to reporting grid
---
.../reporting/reporting-grid/reporting-grid.component.html | 11 +++++++++++
.../app/reporting/reporting-grid/reporting-grid.component.ts | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
index 46f5eae..09118de 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
@@ -32,6 +32,12 @@
<td mat-footer-cell *matFooterCellDef></td>
</ng-container>
+ <ng-container matColumnDef="project">
+ <th mat-header-cell *matHeaderCellDef class="th_project"> Project </th>
+ <td mat-cell *matCellDef="let element"> {{element.project}} </td>
+ <td mat-footer-cell *matFooterCellDef></td>
+ </ng-container>
+
<ng-container matColumnDef="type">
<th mat-header-cell *matHeaderCellDef class="th_type"> Resource Type </th>
<td mat-cell *matCellDef="let element"> {{element[DICTIONARY.billing.resourceType]}} </td>
@@ -90,6 +96,11 @@
[items]="filterConfiguration.user" [model]="filteredReportData.user"></multi-select-dropdown>
</th>
</ng-container>
+ <ng-container matColumnDef="project-filter">
+ <th mat-header-cell *matHeaderCellDef>
+
+ </th>
+ </ng-container>
<ng-container matColumnDef="type-filter">
<th mat-header-cell *matHeaderCellDef>
<multi-select-dropdown *ngIf="filterConfiguration" (selectionChange)="onUpdate($event)" [type]="'resource_type'"
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
index fffa8b5..a633f25 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
@@ -42,8 +42,8 @@ export class ReportingGridComponent implements OnInit {
@Output() filterReport: EventEmitter<{}> = new EventEmitter();
@Output() resetRangePicker: EventEmitter<boolean> = new EventEmitter();
- displayedColumns: string[] = ['name', 'user', 'type', 'status', 'shape', 'service', 'charge'];
- displayedFilterColumns: string[] = ['name-filter', 'user-filter', 'type-filter', 'status-filter', 'shape-filter', 'service-filter', 'actions'];
+ displayedColumns: string[] = ['name', 'user', 'project', 'type', 'status', 'shape', 'service', 'charge'];
+ displayedFilterColumns: string[] = ['name-filter', 'user-filter', 'project-filter', 'type-filter', 'status-filter', 'shape-filter', 'service-filter', 'actions'];
ngOnInit() { }
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/06: [DLAB-1094]: prevent extra scrollbar on
create notebook dialog
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit ba581b2932f90151f8427c98f5deb0dde2438340
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Sep 12 15:19:07 2019 +0300
[DLAB-1094]: prevent extra scrollbar on create notebook dialog
---
.../exploratory/create-environment/create-environment.component.scss | 2 +-
.../webapp/src/app/shared/time-picker/time-picker.component.scss | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.scss
index 0686401..0592248 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.scss
@@ -64,7 +64,7 @@
}
.content-box {
- max-height: 560px;
+ max-height: 580px;
overflow-y: auto;
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/time-picker/time-picker.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/time-picker/time-picker.component.scss
index f5e7b58..999d7d7 100755
--- a/services/self-service/src/main/resources/webapp/src/app/shared/time-picker/time-picker.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/time-picker/time-picker.component.scss
@@ -161,8 +161,6 @@
}
.ticker-wrap {
- height: 100%;
-
.ticker {
width: 200px;
height: 200px;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org