Skip to content
Merged
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
13 changes: 13 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"editor.formatOnSave": false,
"eslint.format.enable": true,
"editor.codeActionsOnSave": {
"source.fixAll.stylelint": "explicit",
"source.fixAll.eslint": "explicit"
},
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"scss.lint.unknownAtRules": "ignore",
"eslint.validate": ["json"],
}
3 changes: 1 addition & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@
"maximumError": "16kB"
}
],
"outputHashing": "all",
"serviceWorker": "ngsw-config.json"
"outputHashing": "all"
},
"development": {
"optimization": false,
Expand Down
2 changes: 1 addition & 1 deletion bun.lock
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@

"@angular/router": ["@angular/router@19.2.7", "", { "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/common": "19.2.7", "@angular/core": "19.2.7", "@angular/platform-browser": "19.2.7", "rxjs": "^6.5.3 || ^7.4.0" } }, "sha512-tbvDz/gkifgdeQ9CazoLLfSRqHE4FQcwMOglzEE9gNCIFohpcUwRnxqZMRhZ3RE4BVLqUmzk2LmJ3VYDf6RbqA=="],

"@angular/service-worker": ["@angular/service-worker@19.2.7", "", { "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/core": "19.2.7", "rxjs": "^6.5.3 || ^7.4.0" }, "bin": { "ngsw-config": "ngsw-config.js" } }, "sha512-zSgq7Vg65VMbPYUZDohNbmrMohulfAbH1CjJU9QdaGg7FbPSJfrN8noi6XnfHl2HqI4QMqvk+jqNNjalhMj0Gw=="],
"@angular/service-worker": ["@angular/service-worker@19.2.7", "", { "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/core": "19.2.7", "rxjs": "^6.5.3 || ^7.4.0" } }, "sha512-zSgq7Vg65VMbPYUZDohNbmrMohulfAbH1CjJU9QdaGg7FbPSJfrN8noi6XnfHl2HqI4QMqvk+jqNNjalhMj0Gw=="],

"@babel/code-frame": ["@babel/code-frame@7.26.2", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.25.9", "js-tokens": "^4.0.0", "picocolors": "^1.0.0" } }, "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ=="],

Expand Down
48 changes: 47 additions & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
const eslint = require("@eslint/js");
const tseslint = require("typescript-eslint");
const angular = require("angular-eslint");
const pluginImport = require("eslint-plugin-import");
const pluginSimpleImportSort = require("eslint-plugin-simple-import-sort");
const pluginUnusedImports = require("eslint-plugin-unused-imports");

module.exports = tseslint.config(
{
Expand All @@ -13,6 +16,11 @@ module.exports = tseslint.config(
...angular.configs.tsRecommended,
],
processor: angular.processInlineTemplates,
plugins: {
import: pluginImport,
"simple-import-sort": pluginSimpleImportSort,
"unused-imports": pluginUnusedImports,
},
rules: {
"@typescript-eslint/no-unused-vars": "warn",
"@angular-eslint/directive-selector": [
Expand All @@ -31,6 +39,44 @@ module.exports = tseslint.config(
style: "kebab-case",
},
],
"import/first": "error",
"import/no-duplicates": "warn",
"import/newline-after-import": "warn",
"simple-import-sort/imports": [
"warn",
{
groups: [
// NGXS packages
["^@ngxs"],

// NGX packages (ngx-... or @ngx/...)
["^ngx-", "^@ngx"],

// Third-party packages (primeng)
["^primeng"],

// RxJS packages (rxjs or @rxjs/...)
["^rxjs", "^rxjs/operators"],

// Angular packages
["^@angular"],

// Internal aliases (customize as needed)
["^@core/", "^@osf/", "^@shared/"],

// Side effect imports
["^\\u0000"],

// Parent imports
["^\\.\\.(?!/?$)", "^\\.\\./?$"],

// Sibling and current directory imports
["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
],
},
],
"simple-import-sort/exports": "warn",
"unused-imports/no-unused-imports": "warn",
},
},
{
Expand All @@ -40,5 +86,5 @@ module.exports = tseslint.config(
...angular.configs.templateAccessibility,
],
rules: {},
}
},
);
30 changes: 0 additions & 30 deletions ngsw-config.json

This file was deleted.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
"@types/jasmine": "~5.1.0",
"angular-eslint": "19.1.0",
"eslint": "^9.20.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-unused-imports": "^4.1.4",
"fantasticon": "^3.0.0",
"husky": "^9.1.7",
"jasmine-core": "~5.6.0",
Expand Down
Binary file modified public/favicon.ico
Binary file not shown.
Binary file removed public/icons/icon-128x128.png
Binary file not shown.
Binary file removed public/icons/icon-144x144.png
Binary file not shown.
Binary file removed public/icons/icon-152x152.png
Binary file not shown.
Binary file removed public/icons/icon-192x192.png
Binary file not shown.
Binary file removed public/icons/icon-384x384.png
Binary file not shown.
Binary file removed public/icons/icon-512x512.png
Binary file not shown.
Binary file removed public/icons/icon-72x72.png
Binary file not shown.
Binary file removed public/icons/icon-96x96.png
Binary file not shown.
59 changes: 0 additions & 59 deletions public/manifest.webmanifest

This file was deleted.

1 change: 1 addition & 0 deletions src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { TestBed } from '@angular/core/testing';

import { AppComponent } from './app.component';

describe('AppComponent', () => {
Expand Down
5 changes: 3 additions & 2 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { Store } from '@ngxs/store';

import {
ChangeDetectionStrategy,
Component,
inject,
OnInit,
} from '@angular/core';
import { RouterOutlet } from '@angular/router';
import { Store } from '@ngxs/store';

import { GetCurrentUser } from '@core/store/user';

@Component({
Expand All @@ -18,7 +20,6 @@ import { GetCurrentUser } from '@core/store/user';
})
export class AppComponent implements OnInit {
#store = inject(Store);
title = 'osf';

ngOnInit(): void {
this.#store.dispatch(GetCurrentUser);
Expand Down
26 changes: 16 additions & 10 deletions src/app/app.config.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
import { withNgxsReduxDevtoolsPlugin } from '@ngxs/devtools-plugin';
import { provideStore } from '@ngxs/store';

import { TranslateModule } from '@ngx-translate/core';

import { ConfirmationService } from 'primeng/api';
import { providePrimeNG } from 'primeng/config';

import { provideHttpClient } from '@angular/common/http';
import {
ApplicationConfig,
importProvidersFrom,
provideZoneChangeDetection,
} from '@angular/core';
import { provideRouter } from '@angular/router';
import { routes } from './app.routes';
import { provideStore } from '@ngxs/store';
import { withNgxsReduxDevtoolsPlugin } from '@ngxs/devtools-plugin';
import { providePrimeNG } from 'primeng/config';
import Aura from '@primeng/themes/aura';
import { provideAnimations } from '@angular/platform-browser/animations';
import { provideHttpClient } from '@angular/common/http';
import { ConfirmationService } from 'primeng/api';
import { STATES } from '@core/constants/ngxs-states.constant';
import { provideRouter } from '@angular/router';
import { provideServiceWorker } from '@angular/service-worker';

import { STATES } from '@core/constants/ngxs-states.constant';
import { provideTranslation } from '@core/helpers/i18n.helper';
import { TranslateModule } from '@ngx-translate/core';

import { routes } from './app.routes';

import Aura from '@primeng/themes/aura';

export const appConfig: ApplicationConfig = {
providers: [
Expand Down
6 changes: 4 additions & 2 deletions src/app/app.routes.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { Routes } from '@angular/router';
import { provideStates } from '@ngxs/store';
import { ResourceFiltersState } from '@shared/components/resources/resource-filters/store/resource-filters.state';

import { Routes } from '@angular/router';

import { ResourceFiltersOptionsState } from '@shared/components/resources/resource-filters/filters/store/resource-filters-options.state';
import { ResourceFiltersState } from '@shared/components/resources/resource-filters/store/resource-filters.state';

export const routes: Routes = [
{
Expand Down
2 changes: 1 addition & 1 deletion src/app/core/components/breadcrumb/breadcrumb.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, computed, DestroyRef, inject, signal } from '@angular/core';
import { NavigationEnd, Router } from '@angular/router';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { NavigationEnd, Router } from '@angular/router';

@Component({
selector: 'osf-breadcrumb',
Expand Down
10 changes: 6 additions & 4 deletions src/app/core/components/footer/footer.component.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { TranslateModule } from '@ngx-translate/core';

import { NgOptimizedImage } from '@angular/common';
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
import { SocialIcon } from '@osf/shared/entities/social-icon.interface';
import { toSignal } from '@angular/core/rxjs-interop';
import { RouterLink } from '@angular/router';

import { SocialIcon } from '@osf/shared/entities/social-icon.interface';
import { IS_PORTRAIT, IS_XSMALL } from '@shared/utils/breakpoints.tokens';
import { toSignal } from '@angular/core/rxjs-interop';
import { NgOptimizedImage } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';

@Component({
standalone: true,
Expand Down
17 changes: 11 additions & 6 deletions src/app/core/components/header/header.component.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
import { Store } from '@ngxs/store';

import { TranslatePipe } from '@ngx-translate/core';

import { ButtonModule } from 'primeng/button';
import { MenuModule } from 'primeng/menu';

import { map } from 'rxjs';

import {
ChangeDetectionStrategy,
Component,
computed,
inject,
} from '@angular/core';
import { Router } from '@angular/router';
import { toSignal } from '@angular/core/rxjs-interop';
import { map } from 'rxjs';
import { Router } from '@angular/router';

import { BreadcrumbComponent } from '@core/components/breadcrumb/breadcrumb.component';
import { MenuModule } from 'primeng/menu';
import { ButtonModule } from 'primeng/button';
import { Store } from '@ngxs/store';
import { UserSelectors } from '@core/store/user/user.selectors';
import { TranslatePipe } from '@ngx-translate/core';

@Component({
standalone: true,
Expand Down
1 change: 1 addition & 0 deletions src/app/core/components/nav-menu/nav-menu.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
item.label === 'navigation.settings' ||
item.label === 'navigation.myProjects'
"
(click)="goToLink()"
>
@if (item.icon) {
<i [class]="item.icon" class="nav-icon"></i>
Expand Down
20 changes: 12 additions & 8 deletions src/app/core/components/nav-menu/nav-menu.component.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
import { TranslatePipe } from '@ngx-translate/core';

import { MenuItem } from 'primeng/api';
import { PanelMenuModule } from 'primeng/panelmenu';

import { filter, map } from 'rxjs';

import { Component, computed, inject, output } from '@angular/core';
import { toSignal } from '@angular/core/rxjs-interop';
import {
ActivatedRoute,
NavigationEnd,
Router,
RouterLink,
RouterLinkActive,
Router,
NavigationEnd,
ActivatedRoute,
} from '@angular/router';

import {
NAV_ITEMS,
PROJECT_MENU_ITEMS,
} from '@core/constants/nav-items.constant';
import { PanelMenuModule } from 'primeng/panelmenu';
import { MenuItem } from 'primeng/api';
import { toSignal } from '@angular/core/rxjs-interop';
import { filter, map } from 'rxjs';
import { NavItem } from '@shared/entities/nav-item.interface';
import { TranslatePipe } from '@ngx-translate/core';

@Component({
selector: 'osf-nav-menu',
Expand Down
1 change: 1 addition & 0 deletions src/app/core/components/root/root.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { RootComponent } from './root.component';

describe('RootComponent', () => {
Expand Down
Loading