Skip to content

Commit

Permalink
update modules and deps
Browse files Browse the repository at this point in the history
  • Loading branch information
TehWazzard committed Jan 17, 2025
1 parent df23f34 commit 87e00ec
Show file tree
Hide file tree
Showing 9 changed files with 1,807 additions and 112 deletions.
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"tsConfig": "src/tsconfig.app.json",
"assets": [
"src/favicon.ico",
"src/assets"
Expand Down
1,823 changes: 1,749 additions & 74 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"@angular/platform-browser": "^18.2.13",
"@angular/platform-browser-dynamic": "^18.2.13",
"@angular/router": "^18.2.13",
"@ckeditor/ckeditor5-angular": "^1.2.3",
"@ckeditor/ckeditor5-build-classic": "^20.0.0",
"@ckeditor/ckeditor5-angular": "^9.1.0",
"@ckeditor/ckeditor5-build-classic": "^44.1.0",
"@fortawesome/angular-fontawesome": "^1.0.0",
"@fortawesome/fontawesome-svg-core": "^6.7.2",
"@fortawesome/free-solid-svg-icons": "^6.7.2",
Expand All @@ -32,11 +32,11 @@
"@popperjs/core": "^2.11.8",
"@sentry/browser": "^5.20.1",
"@worldskills/bootstrap": "^4.10.1",
"@worldskills/worldskills-angular-lib": "^13.2.2",
"@worldskills/worldskills-angular-lib": "^14.0.1",
"angular-oauth2-oidc": "^19.0.0",
"jquery": "^3.5.1",
"json2typescript": "^1.4.1",
"moment": "^2.29.4",
"moment": "^2.30.1",
"popper.js": "^1.16.1",
"rxjs": "~6.5.4",
"tslib": "^2.0.0",
Expand Down
3 changes: 1 addition & 2 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@
<router-outlet></router-outlet>
</div>

<ws-auth-footer
></ws-auth-footer>
<ws-auth-footer></ws-auth-footer>
46 changes: 24 additions & 22 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {BrowserModule} from '@angular/platform-browser';
import {NgModule} from '@angular/core';
import {WorldskillsAngularLibModule, WsHttpInterceptor} from '@worldskills/worldskills-angular-lib';
import {AlertsComponent, WorldskillsAngularLibModule, WsHttpInterceptor} from '@worldskills/worldskills-angular-lib';
import {TranslateHttpLoader} from '@ngx-translate/http-loader';
import {AppRoutingModule} from './app-routing.module';
import {AppComponent} from './app.component';
Expand All @@ -13,7 +13,7 @@ import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
import { HTTP_INTERCEPTORS, HttpClient } from '@angular/common/http';
import {NgSelectModule} from '@ng-select/ng-select';
import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
import {DatePipe} from '@angular/common';
import {CommonModule, DatePipe} from '@angular/common';
import {HttpInterceptorService} from '../services/http-interceptor/http-interceptor.service';
import {WsSpinnerComponent} from './ws-spinner/ws-spinner.component';
import {EventsComponent} from './events/events.component';
Expand Down Expand Up @@ -67,6 +67,28 @@ export function HttpLoaderFactory(http: HttpClient) {
}

@NgModule({
imports: [
CommonModule,
NgModule,
BrowserModule,
AppRoutingModule,
FormsModule,
ReactiveFormsModule,
OAuthModule.forRoot(),
NgSelectModule,
NgbModule,
FontAwesomeModule,
TranslateModule.forRoot({
defaultLanguage: 'en',
loader: {
provide: TranslateLoader,
useFactory: HttpLoaderFactory,
deps: [HttpClient]
}
}),
CKEditorModule,
WorldskillsAngularLibModule,
],
declarations: [
AppComponent,
HomeComponent,
Expand Down Expand Up @@ -117,26 +139,6 @@ export function HttpLoaderFactory(http: HttpClient) {
BaseSkillTagsComponent,
BaseSkillSponsorsComponent,
],
imports: [
BrowserModule,
AppRoutingModule,
OAuthModule.forRoot(),
WorldskillsAngularLibModule,
NgSelectModule,
NgbModule,
FontAwesomeModule,
FormsModule,
ReactiveFormsModule,
TranslateModule.forRoot({
defaultLanguage: 'en',
loader: {
provide: TranslateLoader,
useFactory: HttpLoaderFactory,
deps: [HttpClient]
}
}),
CKEditorModule,
],
providers: [
DatePipe,
{provide: HTTP_INTERCEPTORS, useClass: WsHttpInterceptor, multi: true},
Expand Down
6 changes: 3 additions & 3 deletions src/app/skills-translations/skills-translations.component.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component, OnInit, Input } from '@angular/core';
import { RxjsUtil, WsComponent } from '@worldskills/worldskills-angular-lib';
import { EventService } from 'src/services/event/event.service';
import { SkillService } from 'src/services/skill/skill.service';
import { SkillsService } from 'src/services/skills/skills.service';
import { EventService } from '../../services/event/event.service';
import { SkillService } from '../../services/skill/skill.service';
import { SkillsService } from '../../services/skills/skills.service';
import { Skill } from '../../types/skill';
import { Event } from "../../types/event";

Expand Down
2 changes: 1 addition & 1 deletion src/app/ws-spinner/ws-spinner.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {Component, Input, OnInit} from '@angular/core';
// tslint:disable-next-line:component-selector
selector: 'ws-spinner',
templateUrl: './ws-spinner.component.html',
styleUrls: ['./ws-spinner.component.css']
styleUrls: ['./ws-spinner.component.css'],
})
export class WsSpinnerComponent implements OnInit {

Expand Down
14 changes: 14 additions & 0 deletions src/tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"types": []
},
"files": [
"main.ts",
"polyfills.ts"
],
"include": [
"src/**/*.d.ts"
]
}
15 changes: 10 additions & 5 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
{
"compileOnSave": false,
"compilerOptions": {
"paths": {
"*": [
"types/*"
]
},
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"module": "esnext",
"module": "es2020",
"moduleResolution": "node",
"experimentalDecorators": true,
"importHelpers": true,
"target": "ES2022",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2018",
"dom"
],
"useDefineForClassFields": false
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true
}
}

0 comments on commit 87e00ec

Please sign in to comment.