Skip to content

Commit 23e1374

Browse files
author
jleveugle
committed
feat: add beta warning message
1 parent 350e338 commit 23e1374

File tree

9 files changed

+149
-5
lines changed

9 files changed

+149
-5
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import controller from './beta-warning.controller';
2+
import template from './beta-warning.html';
3+
4+
export default {
5+
controller,
6+
template,
7+
};
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import illustration from './beta-warning.png';
2+
3+
const LOCALSTRORAGE_KEY = 'ovhManagerPublicCloud_hideBetaWarning';
4+
5+
export default class {
6+
/* @ngInject */
7+
8+
constructor() {
9+
this.checked = false;
10+
this.illustration = illustration;
11+
this.isHidden = localStorage.getItem(LOCALSTRORAGE_KEY) || false;
12+
}
13+
14+
hide() {
15+
if (this.checked) {
16+
localStorage.setItem(LOCALSTRORAGE_KEY, true);
17+
}
18+
this.isHidden = true;
19+
}
20+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<div class="p-4" data-ng-if="!$ctrl.isHidden">
2+
<h1 class="d-flex logo">
3+
<i class="oui-icon oui-icon-ovh" style="font-size: 5rem;"></i>
4+
<span class="ml-3 my-auto">OVH</span>
5+
</h1>
6+
<div class="container-fluid">
7+
<div class="row d-flex justify-content-center">
8+
<div class="col-xs-10 col-md-6 col-lg-5">
9+
<div class="text-center mb-4">
10+
<img class="mb-4" data-ng-src="{{ $ctrl.illustration }}" alt="" style="width: 8vw;" />
11+
<h1 data-translate="public_cloud_beta_warning_welcome"></h1>
12+
</div>
13+
<h2 data-translate="public_cloud_beta_warning_subtitle"></h2>
14+
<ul>
15+
<li>
16+
<h3 data-translate="public_cloud_beta_warning_test_new_feature"></h3>
17+
<p data-translate="public_cloud_beta_warning_test_new_feature_desc"></p>
18+
</li>
19+
<li>
20+
<h3 data-translate="public_cloud_beta_warning_help_develop"></h3>
21+
<p data-translate="public_cloud_beta_warning_help_develop_desc"></p>
22+
</li>
23+
</ul>
24+
<p class="my-4" data-translate="public_cloud_beta_warning_comment"></p>
25+
<oui-checkbox model="$ctrl.checked">
26+
<span data-translate="public_cloud_beta_warning_dont_show_again"></span>
27+
</oui-checkbox>
28+
<div class="text-center mt-4">
29+
<oui-button
30+
variant="primary"
31+
data-ng-click="$ctrl.hide()"
32+
>
33+
<span data-translate="public_cloud_beta_warning_lets_go"></span>
34+
</oui-button>
35+
</div>
36+
</div>
37+
</div>
38+
</div>
39+
</div>
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
@import '../../assets/theme/_variables.less';
2+
3+
beta-warning { /* stylelint-disable-line */
4+
> div {
5+
background-color: #fff;
6+
position: absolute;
7+
top: 0;
8+
left: 0;
9+
height: 100%;
10+
width: 100%;
11+
z-index: 9998;
12+
13+
.logo {
14+
&,
15+
.oui-icon {
16+
color: @primary-color;
17+
}
18+
}
19+
20+
&.ng-leave {
21+
-webkit-transition: opacity ease-in-out 200ms;
22+
-moz-transition: opacity ease-in-out 200ms;
23+
-ms-transition: opacity ease-in-out 200ms;
24+
-o-transition: opacity ease-in-out 200ms;
25+
transition: opacity ease-in-out 200ms;
26+
}
27+
28+
&.ng-leave.ng-leave-active {
29+
opacity: 0;
30+
}
31+
32+
&.ng-leave,
33+
&.ng-enter.ng-enter-active {
34+
opacity: 1;
35+
}
36+
37+
.container-fluid {
38+
z-index: 1;
39+
40+
ul {
41+
padding-left: 1.2rem;
42+
}
43+
}
44+
}
45+
}
32.8 KB
Loading
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import angular from 'angular';
2+
import 'ovh-ui-angular';
3+
import ngOvhSidebarMenu from '@ovh-ux/ng-ovh-sidebar-menu';
4+
5+
import component from './beta-warning.component';
6+
7+
import './beta-warning.less';
8+
9+
const moduleName = 'ovh-manager-betaWarning';
10+
11+
angular
12+
.module(moduleName, [
13+
'oui',
14+
ngOvhSidebarMenu,
15+
])
16+
.component('betaWarning', component)
17+
.run(/* @ngTranslationsInject:json ./translations */);
18+
19+
export default moduleName;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"public_cloud_beta_warning_welcome": "Bienvenue !",
3+
"public_cloud_beta_warning_subtitle": "Découvrez la version Preview de Public Cloud",
4+
"public_cloud_beta_warning_test_new_feature": "Testez les nouvelles fonctionnalités",
5+
"public_cloud_beta_warning_test_new_feature_desc": "Vous bénéficiez d’un accès anticipé à notre future interface de gestion de vos projets Public Cloud.",
6+
"public_cloud_beta_warning_help_develop": "Aidez-nous à développer Public Cloud",
7+
"public_cloud_beta_warning_help_develop_desc": "En utilisant la version Preview de Public Cloud et en partageant vos commentaires (à l’aide du bouton situé en bas à droite de votre manager), vous pourrez nous aider à améliorer les fonctionnalités.",
8+
"public_cloud_beta_warning_comment": "Tout n’est pas encore parfait, nous sommes au courant de l’existence de certains «&nbsp;bugs&nbsp;» mais faites-vous plaisir, testez et partagez :)",
9+
"public_cloud_beta_warning_dont_show_again": "Ne plus afficher",
10+
"public_cloud_beta_warning_lets_go": "C'est parti"
11+
}

packages/manager/apps/public-cloud/src/index.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
</div>
1919
<div class="h-100 position-relative" data-ng-class="{ 'col-md-10 p-0': $ctrl.shouldDisplaySidebar, 'col-md-12': !$ctrl.shouldDisplaySidebar }">
2020
<div class="position-absolute w-100 h-100 py-4 px-5" style="overflow: auto;">
21-
<ng-ovh-uirouter-breadcrumb></ng-ovh-uirouter-breadcrumb>
22-
<div class="mt-3" data-ui-view></div>
21+
<ng-ovh-uirouter-breadcrumb></ng-ovh-uirouter-breadcrumb>
22+
<div class="mt-3" data-ui-view></div>
23+
</div>
2324
</div>
2425
</div>
2526
</div>
2627
</div>
27-
</div>
28-
<div id="managerPreload"
28+
<div id="managerPreload"
2929
class="d-flex text-center"
3030
data-ng-class="managerPreloadHide">
3131
<div class="m-auto">
@@ -37,6 +37,7 @@ <h1 class="mt-3 mb-5" data-ng-if="('preload_manager_ovh' | translate) !== 'prelo
3737
</div>
3838
</div>
3939
</div>
40+
<beta-warning></beta-warning>
4041
</div>
4142
</body>
42-
</html>
43+
</html>

packages/manager/apps/public-cloud/src/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import ngUiRouterLineProgress from '@ovh-ux/ng-ovh-uirouter-line-progress';
2424
import 'ovh-ui-kit/dist/oui.css';
2525
import 'ovh-ui-kit-bs/dist/ovh-ui-kit-bs.css';
2626

27+
import betaWarning from './components/beta-warning';
2728
import preload from './components/manager-preload';
2829
import redirectTo from './components/redirectTo';
2930
import sidebar from './sidebar';
@@ -38,6 +39,7 @@ import routing from './index.routes';
3839
angular
3940
.module('ovhStack', [
4041
'ui.router',
42+
betaWarning,
4143
ngUiRouterBreadcrumb,
4244
ngUiRouterLineProgress,
4345
ovhManagerCore,

0 commit comments

Comments
 (0)