Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Angular 18 #9

Merged
merged 2 commits into from
Apr 30, 2024
Merged

Angular 18 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbc8bbd
angular 18 update complete
ct-dixit Apr 25, 2024
8d3a74b
version change
ct-dixit Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 27 additions & 26 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mantis-free-angular-admin-template",
"version": "3.0.0",
"version": "4.0.0",
"author": "CodedThemes",
"license": "MIT",
"scripts": {
Expand All @@ -15,15 +15,16 @@
},
"private": false,
"dependencies": {
"@angular/animations": "^17.1.1",
"@angular/cdk": "^17.1.1",
"@angular/common": "^17.1.1",
"@angular/compiler": "^17.1.1",
"@angular/core": "^17.1.1",
"@angular/forms": "^17.1.1",
"@angular/platform-browser": "^17.1.1",
"@angular/platform-browser-dynamic": "^17.1.1",
"@angular/router": "^17.1.1",
"@angular/animations": "^18.0.0-next.3",
"@angular/cdk": "^18.0.0-next.3",
"@angular/common": "^18.0.0-next.3",
"@angular/compiler": "^18.0.0-next.3",
"@angular/core": "^18.0.0-next.3",
"@angular/forms": "^18.0.0-next.3",
"@angular/platform-browser": "^18.0.0-next.3",
"@angular/platform-browser-dynamic": "^18.0.0-next.3",
"@angular/router": "^18.0.0-next.3",
"@ant-design/icons-angular": "^17.0.0",
"@ng-bootstrap/ng-bootstrap": "^16.0.0",
"@popperjs/core": "^2.11.8",
"apexcharts": "^3.45.2",
Expand All @@ -32,29 +33,29 @@
"ngx-scrollbar": "^13.0.3",
"rxjs": "~7.8.1",
"tslib": "^2.6.2",
"zone.js": "~0.14.3"
"zone.js": "~0.14.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "^17.1.1",
"@angular-eslint/builder": "17.2.1",
"@angular-eslint/eslint-plugin": "17.2.1",
"@angular-eslint/eslint-plugin-template": "17.2.1",
"@angular-eslint/schematics": "17.2.1",
"@angular-eslint/template-parser": "17.2.1",
"@angular/cli": "~17.1.1",
"@angular/compiler-cli": "^17.1.1",
"@angular-devkit/build-angular": "^18.0.0-next.3",
"@angular-eslint/builder": "17.3.0",
"@angular-eslint/eslint-plugin": "17.3.0",
"@angular-eslint/eslint-plugin-template": "17.3.0",
"@angular-eslint/schematics": "17.3.0",
"@angular-eslint/template-parser": "17.3.0",
"@angular/cli": "~18.0.0-next.3",
"@angular/compiler-cli": "^18.0.0-next.3",
"@types/jasmine": "~5.1.4",
"@types/node": "^20.4.2",
"@typescript-eslint/eslint-plugin": "6.19.1",
"@typescript-eslint/parser": "6.19.1",
"@types/node": "^20.12.7",
"@typescript-eslint/eslint-plugin": "7.7.1",
"@typescript-eslint/parser": "7.7.1",
"eslint": "^8.56.0",
"jasmine-core": "~5.1.1",
"karma": "~6.4.2",
"jasmine-core": "~5.1.2",
"karma": "~6.4.3",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.1",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"prettier": "3.2.4",
"typescript": "5.2.2"
"prettier": "3.2.5",
"typescript": "5.4"
}
}
16 changes: 2 additions & 14 deletions src/app/app-routing.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';

// Project import
import { AdminComponent } from './theme/layouts/admin/admin.component';
import { AdminComponent } from './theme/layouts/admin-layout/admin-layout.component';
import { GuestComponent } from './theme/layouts/guest/guest.component';

const routes: Routes = [
Expand All @@ -18,24 +18,12 @@ const routes: Routes = [
},
{
path: 'dashboard/default',
loadComponent: () => import('./demo/default/dashboard/dashboard.component')
loadComponent: () => import('./demo/default/dashboard/dashboard.component').then((c) => c.DefaultComponent)
},
{
path: 'typography',
loadComponent: () => import('./demo/ui-component/typography/typography.component')
},
{
path: 'card',
loadComponent: () => import('./demo/component/card/card.component')
},
{
path: 'breadcrumb',
loadComponent: () => import('./demo/component/breadcrumb/breadcrumb.component')
},
{
path: 'spinner',
loadComponent: () => import('./demo/component/spinner/spinner.component')
},
{
path: 'color',
loadComponent: () => import('./demo/ui-component/ui-color/ui-color.component')
Expand Down
24 changes: 1 addition & 23 deletions src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,9 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { SharedModule } from './theme/shared/shared.module';
import { AdminComponent } from './theme/layouts/admin/admin.component';
import { GuestComponent } from './theme/layouts/guest/guest.component';
import { NavigationComponent } from './theme/layouts/admin/navigation/navigation.component';
import { NavBarComponent } from './theme/layouts/admin/nav-bar/nav-bar.component';
import { NavLeftComponent } from './theme/layouts/admin/nav-bar/nav-left/nav-left.component';
import { NavRightComponent } from './theme/layouts/admin/nav-bar/nav-right/nav-right.component';
import { NavContentComponent } from './theme/layouts/admin/navigation/nav-content/nav-content.component';
import { NavCollapseComponent } from './theme/layouts/admin/navigation/nav-content/nav-collapse/nav-collapse.component';
import { NavGroupComponent } from './theme/layouts/admin/navigation/nav-content/nav-group/nav-group.component';
import { NavItemComponent } from './theme/layouts/admin/navigation/nav-content/nav-item/nav-item.component';

@NgModule({
declarations: [
AppComponent,
AdminComponent,
GuestComponent,
NavigationComponent,
NavBarComponent,
NavLeftComponent,
NavRightComponent,
NavContentComponent,
NavCollapseComponent,
NavGroupComponent,
NavItemComponent
],
declarations: [AppComponent],
imports: [BrowserModule, AppRoutingModule, SharedModule, BrowserAnimationsModule],
bootstrap: [AppComponent]
})
Expand Down
112 changes: 112 additions & 0 deletions src/app/demo/authentication/login/login.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
@import '../../../../scss/settings/color-variables.scss';

.auth-main {
position: relative;

.auth-wrapper {
height: 100%;
width: 100%;
min-height: 100vh;

.saprator {
position: relative;
display: flex;
align-self: center;
justify-content: center;

&:after {
content: '';
position: absolute;
top: 50%;
left: 0;
width: 100%;
height: 1px;
background: var(--bs-border-color);
z-index: 1;
}

span {
font-size: 0.875rem;
padding: 8px 24px;
background: $white;
z-index: 5;
text-transform: capitalize;
color: $gray-800;
font-weight: 500;
}
}

&.v3 {
display: flex;
align-items: center;

.auth-form {
flex-direction: column;
background: url('../../../../assets/images/authentication/img-auth-bg.svg');
min-height: 100vh;
padding: 24px;
background-repeat: no-repeat;
background-size: auto 82%;
background-position: left bottom;
position: relative;
justify-content: space-between;
> * {
position: relative;
z-index: 5;
}
&:after {
content: '';
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba($white, 0.2);
backdrop-filter: blur(16px);
}
}
}
.auth-form {
display: flex;
align-items: center;
justify-content: center;
flex-grow: 1;

.card {
width: 100%;
max-width: 495px;
box-shadow: none;
}

img + span {
padding-left: 15px;
}

h5 {
span {
text-decoration: underline;
}
}
}
.auth-footer,
.auth-header {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
}
}
}

form i {
display: inline-flex;
align-items: center;
justify-content: center;
margin: 0px -12px 0px 0px;
cursor: pointer;
padding: 12px;
font-size: 18px;
position: absolute;
top: 203px;
right: 45px;
}
99 changes: 99 additions & 0 deletions src/app/demo/authentication/register/register.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
@import '../../../../scss/settings/color-variables.scss';

.auth-main {
position: relative;

.auth-wrapper {
height: 100%;
width: 100%;
min-height: 100vh;

.saprator {
position: relative;
display: flex;
align-self: center;
justify-content: center;

&:after {
content: '';
position: absolute;
top: 50%;
left: 0;
width: 100%;
height: 1px;
background: var(--bs-border-color);
z-index: 1;
}

span {
font-size: 0.875rem;
padding: 8px 24px;
background: $white;
z-index: 5;
text-transform: capitalize;
color: $gray-800;
font-weight: 500;
}
}

&.v3 {
display: flex;
align-items: center;

.auth-form {
flex-direction: column;
background: url('../../../../assets/images/authentication/img-auth-bg.svg');
min-height: 100vh;
padding: 24px;
background-repeat: no-repeat;
background-size: auto 82%;
background-position: left bottom;
position: relative;
justify-content: space-between;
> * {
position: relative;
z-index: 5;
}
&:after {
content: '';
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba($white, 0.2);
backdrop-filter: blur(16px);
}
}
}
.auth-form {
display: flex;
align-items: center;
justify-content: center;
flex-grow: 1;

.card {
width: 100%;
max-width: 495px;
box-shadow: none;
}

img + span {
padding-left: 15px;
}

h5 {
span {
text-decoration: underline;
}
}
}
.auth-footer,
.auth-header {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
}
}
}
Loading
Loading