Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8,253 changes: 5,238 additions & 3,015 deletions package-lock.json

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@
},
"private": true,
"dependencies": {
"@angular/common": "^15.0.0",
"@angular/core": "^15.0.0",
"@angular/forms": "^15.0.0",
"@angular/platform-browser": "^15.0.0",
"@angular/platform-browser-dynamic": "^15.0.0",
"@angular/router": "^15.0.0",
"@angular/service-worker": "^15.2.3",
"@angular-slider/ngx-slider": "^16.0.1",
"@angular/common": "^16.2.12",
"@angular/core": "^16.2.12",
"@angular/forms": "^16.2.12",
"@angular/platform-browser": "^16.2.12",
"@angular/platform-browser-dynamic": "^16.2.12",
"@angular/router": "^16.2.12",
"@angular/service-worker": "^16.2.12",
"@auth0/auth0-angular": "^1.11.1",
"@awesome-cordova-plugins/core": "^6.6.0",
"@awesome-cordova-plugins/file": "^6.2.0",
Expand All @@ -38,8 +39,8 @@
"@capacitor/keyboard": "4.1.0",
"@capacitor/splash-screen": "^4.1.2",
"@capacitor/status-bar": "^4.1.1",
"@ckeditor/ckeditor5-angular": "^4.0.0",
"@ckeditor/ckeditor5-build-classic": "^35.4.0",
"@ckeditor/ckeditor5-angular": "^6.0.1",
"@ckeditor/ckeditor5-build-classic": "^40.2.0",
"@codetrix-studio/capacitor-google-auth": "^3.4.0-rc.0",
"@ionic/angular": "^6.1.9",
"@ionic/storage-angular": "^3.0.6",
Expand All @@ -60,21 +61,20 @@
"ionicons": "^6.0.3",
"mixpanel-browser": "^2.45.0",
"moment": "^2.30.1",
"ng5-slider": "^1.2.6",
"rxjs": "~7.5.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
"zone.js": "~0.13.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "^15.0.0",
"@angular-devkit/build-angular": "^16.2.16",
"@angular-eslint/builder": "^14.0.0",
"@angular-eslint/eslint-plugin": "^14.0.0",
"@angular-eslint/eslint-plugin-template": "^14.0.0",
"@angular-eslint/template-parser": "^14.0.0",
"@angular/cli": "^15.0.4",
"@angular/compiler": "^15.0.0",
"@angular/compiler-cli": "^15.0.0",
"@angular/language-service": "^15.0.0",
"@angular/cli": "^16.2.16",
"@angular/compiler": "^16.2.12",
"@angular/compiler-cli": "^16.2.12",
"@angular/language-service": "^16.2.12",
Comment on lines +69 to +77

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "Current relevant devDependencies:"
node -e 'const d=require("./package.json").devDependencies; for (const k of ["`@angular/cli`","`@angular-eslint/builder`","`@angular-eslint/eslint-plugin`","`@angular-eslint/eslint-plugin-template`","`@angular-eslint/template-parser`"]) console.log(`${k}: ${d[k]}`)'

echo
echo "Peer dependencies for angular-eslint builder major 14:"
npm view `@angular-eslint/builder`@^14 peerDependencies --json

echo
echo "Peer dependencies for angular-eslint builder major 16:"
npm view `@angular-eslint/builder`@^16 peerDependencies --json

Repository: BAWES-Universe/studenthub-staff

Length of output: 1851


🌐 Web query:

angular-eslint 14 compatibility with Angular CLI 16

💡 Result:

The angular-eslint package version 14 is not compatible with Angular CLI 16 [1][2]. Since version 12, the angular-eslint project has aligned its major version numbers with the Angular and Angular CLI major versions [2]. To ensure compatibility, you must use the angular-eslint version that matches the major version of your Angular CLI [2][3]. For an Angular CLI 16 project, you should use angular-eslint version 16 [1]. Using mismatched versions will typically result in peer dependency errors during installation [4][1]. To update your project correctly, it is recommended to use the Angular CLI update command, which helps manage these dependencies automatically [5][4]: ng update @angular/core@16 @angular/cli@16 @angular-eslint/schematics@16

Citations:


🏁 Script executed:

#!/bin/bash
# Check if there's evidence of incompatibility in the codebase or common issues
# Search for any angular-eslint or ESLint configuration that might fail with version mismatch
rg -t json -i "angular-eslint|`@angular/cli`" package.json | head -20
rg "eslintConfig|angular-eslint" --type js --type ts --max-count=5

Repository: BAWES-Universe/studenthub-staff

Length of output: 304


Upgrade @angular-eslint/* to match Angular 16 major version.

Lines 70-73 specify @angular-eslint/* at ^14.0.0 while line 74 upgrades @angular/cli to 16.2.16. Since Angular-eslint v12, the project aligns major versions with Angular CLI. This mismatch will cause ng lint and related ESLint tooling to fail in runtime, even if npm install succeeds.

♻️ Suggested update
-    "`@angular-eslint/builder`": "^14.0.0",
-    "`@angular-eslint/eslint-plugin`": "^14.0.0",
-    "`@angular-eslint/eslint-plugin-template`": "^14.0.0",
-    "`@angular-eslint/template-parser`": "^14.0.0",
+    "`@angular-eslint/builder`": "^16.0.0",
+    "`@angular-eslint/eslint-plugin`": "^16.0.0",
+    "`@angular-eslint/eslint-plugin-template`": "^16.0.0",
+    "`@angular-eslint/template-parser`": "^16.0.0",
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
"@angular-devkit/build-angular": "^16.2.16",
"@angular-eslint/builder": "^14.0.0",
"@angular-eslint/eslint-plugin": "^14.0.0",
"@angular-eslint/eslint-plugin-template": "^14.0.0",
"@angular-eslint/template-parser": "^14.0.0",
"@angular/cli": "^15.0.4",
"@angular/compiler": "^15.0.0",
"@angular/compiler-cli": "^15.0.0",
"@angular/language-service": "^15.0.0",
"@angular/cli": "^16.2.16",
"@angular/compiler": "^16.2.12",
"@angular/compiler-cli": "^16.2.12",
"@angular/language-service": "^16.2.12",
"`@angular-devkit/build-angular`": "^16.2.16",
"`@angular-eslint/builder`": "^16.0.0",
"`@angular-eslint/eslint-plugin`": "^16.0.0",
"`@angular-eslint/eslint-plugin-template`": "^16.0.0",
"`@angular-eslint/template-parser`": "^16.0.0",
"`@angular/cli`": "^16.2.16",
"`@angular/compiler`": "^16.2.12",
"`@angular/compiler-cli`": "^16.2.12",
"`@angular/language-service`": "^16.2.12",
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@package.json` around lines 69 - 77, The `@angular-eslint` packages in
package.json are still at major version 14 while Angular CLI/compiler are at 16;
update the `@angular-eslint` packages (`@angular-eslint/builder`,
`@angular-eslint/eslint-plugin`, `@angular-eslint/eslint-plugin-template`,
`@angular-eslint/template-parser`) to the matching Angular 16 major (e.g. ^16.0.0
or the latest 16.x compatible release) so ESLint tooling aligns with
`@angular/cli` and `@angular/compiler` versions, then run npm install and verify ng
lint works.

"@capacitor/cli": "4.6.1",
"@ionic/angular-toolkit": "^6.0.0",
"@types/jasmine": "~4.0.0",
Expand All @@ -97,7 +97,7 @@
"postcss": "^8.4.49",
"tailwindcss": "^3.4.16",
"ts-node": "~8.3.0",
"typescript": "~4.8.4"
"typescript": "~5.1.6"
},
"description": "Staff portal of studenthub"
}
8 changes: 3 additions & 5 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { APP_INITIALIZER, ErrorHandler, Injector, NgModule } from '@angular/core';
import { BrowserModule, BrowserTransferStateModule } from '@angular/platform-browser';
import { BrowserModule } from '@angular/platform-browser';
import { RouteReuseStrategy } from '@angular/router';
import { TranslateHttpLoader } from '@ngx-translate/http-loader';
import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
Expand Down Expand Up @@ -111,16 +111,14 @@ declare global {

@NgModule({
declarations: [AppComponent],
entryComponents: [
ActionComponent
],

imports: [
BrowserModule,
IonicModule.forRoot(),
AppRoutingModule,
HttpClientModule,
CalendarModule,
BrowserTransferStateModule,

IonicStorageModule.forRoot({
name: '__payroll_staff',
// version: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
{{ value.upper | age }}
</ion-label>

<ng5-slider [(value)]="value.lower" [(highValue)]="value.upper"
<ngx-slider [(value)]="value.lower" [(highValue)]="value.upper"
(userChangeEnd)="handleChange()"
(userChange)="setLabel()" [options]="options"></ng5-slider>
(userChange)="setLabel()" [options]="options"></ngx-slider>
<!--
<ion-range debounce="500" dualKnobs="true" (ionChange)="handleChange($event)"
[value]="value"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { connectRange } from 'instantsearch.js/es/connectors';
import { RangeRenderState } from 'instantsearch.js/es/connectors/range/connectRange';
import { BaseWidget, NgAisIndex, NgAisInstantSearch } from 'angular-instantsearch';
import { parseNumberInput, noop } from 'angular-instantsearch/esm2015/utils';
import { Options } from 'ng5-slider';
import { Options } from '@angular-slider/ngx-slider';


@Component({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { Ng5SliderModule } from 'ng5-slider';
import { NgxSliderModule } from '@angular-slider/ngx-slider';
import { FormsModule } from '@angular/forms';
import { NgAisModule } from 'angular-instantsearch';
import { IonicModule } from '@ionic/angular';
Expand All @@ -18,7 +18,7 @@ import { AgeRefinementListComponent } from './age-refinement-list.component';
CommonModule,
FormsModule,
PipesModule,
Ng5SliderModule,
NgxSliderModule,
],
exports: [
AgeRefinementListComponent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { BaseWidget, NgAisIndex, NgAisInstantSearch } from 'angular-instantsearc
import { parseNumberInput, noop } from 'angular-instantsearch/esm2015/utils';
import {CalendarModal, CalendarModalOptions, CalendarResult} from 'ion2-calendar';
import { ModalController } from '@ionic/angular';
import {Options} from "ng5-slider";
import {Options} from "@angular-slider/ngx-slider";

@Component({
selector: 'date-range-refinement-list',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
{{ value.upper | age }}
</ion-label>

<ng5-slider [(value)]="value.lower" [(highValue)]="value.upper"
<ngx-slider [(value)]="value.lower" [(highValue)]="value.upper"
(userChangeEnd)="handleChange()"
(userChange)="setLabel()" [options]="options"></ng5-slider>
(userChange)="setLabel()" [options]="options"></ngx-slider>
<!--
<ion-range debounce="500" dualKnobs="true" (ionChange)="handleChange($event)"
[value]="value"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { FormsModule } from "@angular/forms";
import { RangeRefinementComponent } from './range-refinement-list';

import { NgAisModule } from 'angular-instantsearch';
import { Ng5SliderModule } from 'ng5-slider';
import { NgxSliderModule } from '@angular-slider/ngx-slider';

import { PipesModule } from '../../pipes/pipes.module';

Expand All @@ -21,7 +21,7 @@ import { PipesModule } from '../../pipes/pipes.module';
CommonModule,
FormsModule,
PipesModule,
Ng5SliderModule,
NgxSliderModule,
],
exports: [
RangeRefinementComponent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { connectRange } from 'instantsearch.js/es/connectors';
import { RangeRenderState } from 'instantsearch.js/es/connectors/range/connectRange';
import { BaseWidget, NgAisIndex, NgAisInstantSearch } from 'angular-instantsearch';
import { parseNumberInput, noop } from 'angular-instantsearch/esm2015/utils';
import { Options } from 'ng5-slider';
import { Options } from '@angular-slider/ngx-slider';


@Component({
Expand Down
1 change: 0 additions & 1 deletion src/app/components/select-search/select-search.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { SelectSearchInputComponent } from './select-search-input/select-search-

@NgModule({
declarations: [SelectSearchInputComponent, SelectSearchPageComponent],
entryComponents: [SelectSearchPageComponent],
imports: [IonicModule, FormsModule, CommonModule],
exports: [SelectSearchInputComponent]
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { ModalController, AlertController } from '@ionic/angular';
import * as ClassicEditor from '@ckeditor/ckeditor5-build-classic';
import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
//services
import { AuthService } from '../../../../providers/auth.service';
import { CandidateService } from 'src/app/providers/logged-in/candidate.service';
Expand All @@ -19,7 +19,7 @@ export class CandidateCommittedFormPage implements OnInit {

@Input() candidate;

@ViewChild('ckeditor', { static: false }) ckeditor: ClassicEditor;
@ViewChild('ckeditor', { static: false }) ckeditor: any;

public model: Note;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { ModalController, AlertController, PopoverController } from '@ionic/angular';
import * as ClassicEditor from '@ckeditor/ckeditor5-build-classic';
import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
//services
import { AuthService } from '../../../../providers/auth.service';
import { NoteService } from '../../../../providers/logged-in/note.service';
Expand All @@ -24,7 +24,7 @@ export class CandidateNoteFormPage implements OnInit {

@Input() note;

@ViewChild('ckeditor', { static: false }) ckeditor: ClassicEditor;
@ViewChild('ckeditor', { static: false }) ckeditor: any;

public model: Note = new Note();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
ToastController
} from '@ionic/angular';
import { ActivatedRoute, Router } from '@angular/router';
import * as ClassicEditor from '@ckeditor/ckeditor5-build-classic';
import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import {
CalendarModal,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import {AlertController, ToastController, ModalController, NavController} from '@ionic/angular';
import { ActivatedRoute } from '@angular/router';
import * as ClassicEditor from '@ckeditor/ckeditor5-build-classic';
import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
//validators
import { CustomValidator } from 'src/app/validators/custom.validator';
// services
Expand All @@ -22,8 +22,8 @@ import { CountryModalComponent } from 'src/app/components/country-modal/country-
})
export class CompanyFormPage implements OnInit {

@ViewChild('ckeditor', { static: false }) ckeditor: ClassicEditor;
@ViewChild('ckeditor_ar', { static: false }) ckeditor_ar: ClassicEditor;
@ViewChild('ckeditor', { static: false }) ckeditor: any;
@ViewChild('ckeditor_ar', { static: false }) ckeditor_ar: any;

public borderLimit = false;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { ModalController, AlertController, PopoverController } from '@ionic/angular';
import * as ClassicEditor from '@ckeditor/ckeditor5-build-classic';
import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
// models
import { Candidate } from 'src/app/models/candidate';
import { Fulltimer } from 'src/app/models/fulltimer';
Expand All @@ -27,7 +27,7 @@ import { AnalyticsService } from 'src/app/providers/analytics.service';
})
export class CompanyNoteFormPage implements OnInit {

@ViewChild('ckeditor', { static: false }) ckeditor: ClassicEditor;
@ViewChild('ckeditor', { static: false }) ckeditor: any;

@Input() note;
@Input() from;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { AlertController, ModalController } from '@ionic/angular';
import { ActivatedRoute, Router } from '@angular/router';
import * as ClassicEditor from '@ckeditor/ckeditor5-build-classic';
import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
//models
import { Company } from 'src/app/models/company';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { ModalController, AlertController, PopoverController } from '@ionic/angular';
import * as ClassicEditor from '@ckeditor/ckeditor5-build-classic';
import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
// services
import { CompanyRequestService } from 'src/app/providers/logged-in/company-request.service';
import { EventService } from "../../../../providers/event.service";
Expand All @@ -21,7 +21,7 @@ import { CompanyContactListPage } from "../company-contact/company-contact-list/
})
export class CompanyRequestFormPage implements OnInit {

@ViewChild('ckeditor', { static: false }) ckeditor: ClassicEditor;
@ViewChild('ckeditor', { static: false }) ckeditor: any;

@Input() company;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Location } from '@angular/common';
import { FormGroup, FormBuilder, Validators, FormArray } from '@angular/forms';
import { ModalController, AlertController, PopoverController, NavController } from '@ionic/angular';
import { ActivatedRoute } from '@angular/router';
import * as ClassicEditor from '@ckeditor/ckeditor5-build-classic';
import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
// services
import { EventService } from '../../../../../providers/event.service';
import { CompanyRequestService } from 'src/app/providers/logged-in/company-request.service';
Expand All @@ -24,7 +24,7 @@ import { CountryService } from 'src/app/providers/logged-in/country.service';
})
export class RequestFormPage implements OnInit {

@ViewChild('ckeditor', { static: false }) ckeditor: ClassicEditor;
@ViewChild('ckeditor', { static: false }) ckeditor: any;

public company;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { AlertController, ModalController } from '@ionic/angular';
import * as ClassicEditor from '@ckeditor/ckeditor5-build-classic';
import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
//models
import { RequestInterview } from 'src/app/models/request-interview';
//services
Expand All @@ -17,7 +17,7 @@ import { StaffService } from 'src/app/providers/logged-in/staff.service';
})
export class RequestInterviewFormPage implements OnInit {

@ViewChild('ckeditor', { static: false }) ckeditor: ClassicEditor;
@ViewChild('ckeditor', { static: false }) ckeditor: any;

public interviewRequest: RequestInterview;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import {ActionSheetController, AlertController, ModalController, NavController, Platform} from '@ionic/angular';
import * as ClassicEditor from '@ckeditor/ckeditor5-build-classic';
import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
//modals
import { Ticket } from 'src/app/models/ticket';
//services
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import * as ClassicEditor from '@ckeditor/ckeditor5-build-classic';
import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
import { ActionSheetController, AlertController, Platform } from '@ionic/angular';
import { ActivatedRoute } from '@angular/router';
// models
Expand Down
8 changes: 4 additions & 4 deletions src/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -432,13 +432,13 @@ ion-calendar-modal {
margin: 0 auto !important;
}

ng5-slider {
ngx-slider {
$handleSize: 12px;

background: var(--ion-color-custom-2) !important;
margin: 10px 0 15px !important;

.ng5-slider-pointer {
.ngx-slider-pointer {
width: 12px !important;
height: 12px !important;
top: -4px !important;
Expand All @@ -451,11 +451,11 @@ ng5-slider {
}
}

.ng5-slider-selection {
.ngx-slider-selection {
background: var(--ion-color-custom-3) !important;
}

.ng5-slider-bubble {
.ngx-slider-bubble {
display: none !important;
}
}
Expand Down
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"experimentalDecorators": true,
"moduleResolution": "node",
"importHelpers": true,
"skipLibCheck": true,
"target": "ES2022",
"module": "es2020",
"lib": [
Expand Down