diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 1e77297..6269369 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -65,7 +65,7 @@ import { AccessComponent } from './components/access/access.component'; {path:'pages/notfound', component: NotfoundComponent}, {path:'pages/access', component: AccessComponent}, {path: '**', redirectTo: 'pages/notfound'}, - ], {scrollPositionRestoration: 'enabled'}) + ], {scrollPositionRestoration: 'enabled', anchorScrolling:'enabled'}) ], exports: [RouterModule] }) diff --git a/src/app/app.menu.component.ts b/src/app/app.menu.component.ts index 6c203a8..3821838 100644 --- a/src/app/app.menu.component.ts +++ b/src/app/app.menu.component.ts @@ -47,7 +47,7 @@ export class AppMenuComponent implements OnInit { {label: 'Panel', icon: 'pi pi-fw pi-tablet', routerLink: ['/uikit/panel']}, {label: 'Overlay', icon: 'pi pi-fw pi-clone', routerLink: ['/uikit/overlay']}, {label: 'Media', icon: 'pi pi-fw pi-image', routerLink: ['/uikit/media']}, - {label: 'Menu', icon: 'pi pi-fw pi-bars', routerLink: ['/uikit/menu']}, + {label: 'Menu', icon: 'pi pi-fw pi-bars', routerLink: ['/uikit/menu/personal']}, {label: 'Message', icon: 'pi pi-fw pi-comment', routerLink: ['/uikit/message']}, {label: 'File', icon: 'pi pi-fw pi-file', routerLink: ['/uikit/file']}, {label: 'Chart', icon: 'pi pi-fw pi-chart-bar', routerLink: ['/uikit/charts']}, diff --git a/src/app/components/access/access.component.html b/src/app/components/access/access.component.html index c03f388..95a5123 100644 --- a/src/app/components/access/access.component.html +++ b/src/app/components/access/access.component.html @@ -1,10 +1,10 @@ -
+
Sakai logo
-
+
diff --git a/src/app/components/error/error.component.html b/src/app/components/error/error.component.html index f65429a..f49013c 100644 --- a/src/app/components/error/error.component.html +++ b/src/app/components/error/error.component.html @@ -1,13 +1,13 @@ -
+
Sakai logo
-
+
- +

Error Occured

Requested resource is not available. diff --git a/src/app/components/landing/landing.component.html b/src/app/components/landing/landing.component.html index 4f28362..97c8878 100644 --- a/src/app/components/landing/landing.component.html +++ b/src/app/components/landing/landing.component.html @@ -1,31 +1,31 @@ -
+
- + Sakai LogoSAKAI - -
+

Eu sem integereget magna fermentum

Sed blandit libero volutpat sed cras. Fames ac turpis egestas integer. Placerat in egestas erat...

- +
-
+

Marvelous Features

@@ -172,7 +172,7 @@
-
+

Powerful Everywhere

Amet consectetur adipiscing elit... @@ -180,11 +180,11 @@
- mockup mobile + mockup mobile
-
-
+
+

Congue Quisque Egestas

@@ -193,8 +193,8 @@
-
-
+
+

Celerisque Eu Ultrices

@@ -202,12 +202,12 @@
- mockup + mockup
-
+

Matchless Pricing

Amet consectetur adipiscing elit... @@ -215,9 +215,9 @@
-
-

Free

- +
+

Free

+ free
$0 per month @@ -246,9 +246,9 @@
-
-

Startup

- +
+

Startup

+ startup
$1 per month @@ -277,9 +277,9 @@
-
-

Free

- +
+

Enterprise

+ enterprise
$999 per month @@ -312,10 +312,10 @@
diff --git a/src/app/components/landing/landing.component.ts b/src/app/components/landing/landing.component.ts index a178afa..06d106b 100644 --- a/src/app/components/landing/landing.component.ts +++ b/src/app/components/landing/landing.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { ConfigService } from '../../service/app.config.service'; import { AppConfig } from '../../api/appconfig'; import { Subscription } from 'rxjs'; +import { Router } from '@angular/router'; @Component({ selector: 'app-landing', templateUrl: './landing.component.html', @@ -12,17 +13,23 @@ import { Subscription } from 'rxjs'; overflow:hidden; } + .pricing-card:hover{ + border:2px solid var(--cyan-200) !important; + } + @media screen and (min-width: 768px) { #hero{ -webkit-clip-path: ellipse(150% 87% at 93% 13%); clip-path: ellipse(150% 87% at 93% 13%); - height: 430px; + height: 530px; } } @media screen and (min-width: 1300px){ #hero > img { position: absolute; + transform:scale(1.2); + top:15%; } #hero > div > p { @@ -58,7 +65,7 @@ export class LandingComponent implements OnInit, OnDestroy { subscription: Subscription; - constructor(public configService: ConfigService) { } + constructor(public configService: ConfigService, public router: Router) { } ngOnInit(): void { this.config = this.configService.config; diff --git a/src/app/components/login/login.component.html b/src/app/components/login/login.component.html index 3b6922f..82aaac7 100644 --- a/src/app/components/login/login.component.html +++ b/src/app/components/login/login.component.html @@ -1,10 +1,10 @@ -
+
Sakai logo
-
+
Image
Welcome, Isabel!
@@ -13,7 +13,7 @@
- + diff --git a/src/app/components/notfound/notfound.component.html b/src/app/components/notfound/notfound.component.html index 242095f..3cca890 100644 --- a/src/app/components/notfound/notfound.component.html +++ b/src/app/components/notfound/notfound.component.html @@ -1,24 +1,24 @@ -
+
Sakai logo
-
+ + diff --git a/src/assets/layout/images/enterprise.png b/src/assets/layout/images/enterprise.png deleted file mode 100644 index 94917f7..0000000 Binary files a/src/assets/layout/images/enterprise.png and /dev/null differ diff --git a/src/assets/layout/images/enterprise.svg b/src/assets/layout/images/enterprise.svg new file mode 100644 index 0000000..66b5d81 --- /dev/null +++ b/src/assets/layout/images/enterprise.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/layout/images/free.png b/src/assets/layout/images/free.png deleted file mode 100644 index 217a50d..0000000 Binary files a/src/assets/layout/images/free.png and /dev/null differ diff --git a/src/assets/layout/images/free.svg b/src/assets/layout/images/free.svg new file mode 100644 index 0000000..dcc6ccf --- /dev/null +++ b/src/assets/layout/images/free.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/layout/images/mockup-desktop.png b/src/assets/layout/images/mockup-desktop.png deleted file mode 100644 index 9efec14..0000000 Binary files a/src/assets/layout/images/mockup-desktop.png and /dev/null differ diff --git a/src/assets/layout/images/mockup-desktop.svg b/src/assets/layout/images/mockup-desktop.svg new file mode 100644 index 0000000..7f4ee2b --- /dev/null +++ b/src/assets/layout/images/mockup-desktop.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/layout/images/mockup.png b/src/assets/layout/images/mockup.png deleted file mode 100644 index aafb00e..0000000 Binary files a/src/assets/layout/images/mockup.png and /dev/null differ diff --git a/src/assets/layout/images/mockup.svg b/src/assets/layout/images/mockup.svg new file mode 100644 index 0000000..b6d64be --- /dev/null +++ b/src/assets/layout/images/mockup.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/layout/images/startup.png b/src/assets/layout/images/startup.png deleted file mode 100644 index a43932c..0000000 Binary files a/src/assets/layout/images/startup.png and /dev/null differ diff --git a/src/assets/layout/images/startup.svg b/src/assets/layout/images/startup.svg new file mode 100644 index 0000000..bb8e4f6 --- /dev/null +++ b/src/assets/layout/images/startup.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +