Natlinux/DotNetAngular
Template
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix dropdown' (#12) from feature/haeder into develop

Browse Source 
Reviewed-on: #12
This commit was merged in pull request #12.
This commit is contained in:
Nathalie Eugler
2026-03-15 19:02:16 +00:00
parent ee46cf09f4 a9f29fff6e
commit 53190c2db0
5 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/.idea.DotNetAngular/.idea/shelf/Uncommitted_changes_before_Update_at_15_03_26__19_07__Changes_.xml generated
View File

@@ -1,4 +0,0 @@
<changelist name="Uncommitted_changes_before_Update_at_15_03_26,_19_07_[Changes]" date="1773598081015" recycled="true" deleted="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/.idea.DotNetAngular/.idea/shelf/Uncommitted_changes_before_Update_at_15_03_26,_19_07_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 15.03.26, 19:07 [Changes]" />
</changelist>

67
.idea/.idea.DotNetAngular/.idea/workspace.xml generated
View File

@@ -13,8 +13,11 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="1ac72a4a-52ad-4e70-9b15-c330b1ed3e7a" name="Changes" comment=""> <list default="true" id="1ac72a4a-52ad-4e70-9b15-c330b1ed3e7a" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/src/ClientApp/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/src/ClientApp/package-lock.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.DotNetAngular/.idea/shelf/Uncommitted_changes_before_Update_at_15_03_26__19_07__Changes_.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/ClientApp/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/src/ClientApp/package.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.DotNetAngular/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.DotNetAngular/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ClientApp/src/app/infrastructure/services/auth-service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ClientApp/src/app/infrastructure/services/auth-service.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ClientApp/src/app/presentation/components/header/header.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ClientApp/src/app/presentation/components/header/header.component.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ClientApp/src/main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ClientApp/src/main.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -37,6 +40,7 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="HighlightingSettingsPerFile"> <component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/dotnet-tools.json" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/ClientApp/package-lock.json" root0="SKIP_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/src/ClientApp/package-lock.json" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/ClientApp/package.json" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/src/ClientApp/package.json" root0="FORCE_HIGHLIGHTING" />
</component> </component>
@@ -45,6 +49,9 @@
<urls /> <urls />
</component> </component>
<component name="MetaFilesCheckinStateConfiguration" checkMetaFiles="true" /> <component name="MetaFilesCheckinStateConfiguration" checkMetaFiles="true" />
<component name="ProblemsViewState">
<option name="selectedTabId" value="Toolset" />
</component>
<component name="ProjectColorInfo">{ <component name="ProjectColorInfo">{
&quot;associatedIndex&quot;: 5 &quot;associatedIndex&quot;: 5
}</component> }</component>
@@ -53,28 +60,28 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
".NET Launch Settings Profile.API: Angular_dev.executor": "Run", &quot;.NET Launch Settings Profile.API: Angular_dev.executor&quot;: &quot;Run&quot;,
"RunOnceActivity.MCP Project settings loaded": "true", &quot;RunOnceActivity.MCP Project settings loaded&quot;: &quot;true&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true", &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
"RunOnceActivity.git.unshallow": "true", &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
"RunOnceActivity.typescript.service.memoryLimit.init": "true", &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
"com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true", &quot;com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1&quot;: &quot;true&quot;,
"git-widget-placeholder": "feature/angular", &quot;git-widget-placeholder&quot;: &quot;feature/haeder&quot;,
"junie.onboarding.icon.badge.shown": "true", &quot;junie.onboarding.icon.badge.shown&quot;: &quot;true&quot;,
"node.js.detected.package.eslint": "true", &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
"node.js.detected.package.tslint": "true", &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
"node.js.selected.package.eslint": "(autodetect)", &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
"node.js.selected.package.tslint": "(autodetect)", &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
"nodejs_package_manager_path": "npm", &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
"settings.editor.selected.configurable": "preferences.pluginManager", &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
"to.speed.mode.migration.done": "true", &quot;to.speed.mode.migration.done&quot;: &quot;true&quot;,
"ts.external.directory.path": "/home/natlinux/RiderProjects/DotNetAngular/src/ClientApp/node_modules/typescript/lib", &quot;ts.external.directory.path&quot;: &quot;/home/natlinux/RiderProjects/DotNetAngular/src/ClientApp/node_modules/typescript/lib&quot;,
"vue.rearranger.settings.migration": "true" &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
} }
}]]></component> }</component>
<component name="RecapUselessUpdatesCounter"> <component name="RecapUselessUpdatesCounter">
<option name="suspendCountdown" value="0" /> <option name="suspendCountdown" value="0" />
</component> </component>
@@ -214,6 +221,7 @@
<workItem from="1772664174287" duration="646000" /> <workItem from="1772664174287" duration="646000" />
<workItem from="1773053172796" duration="1432000" /> <workItem from="1773053172796" duration="1432000" />
<workItem from="1773597121547" duration="689000" /> <workItem from="1773597121547" duration="689000" />
<workItem from="1773599776473" duration="1496000" />
</task> </task>
<task id="LOCAL-00001" summary="updating template"> <task id="LOCAL-00001" summary="updating template">
<option name="closed" value="true" /> <option name="closed" value="true" />
@@ -263,7 +271,15 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1773597809588</updated> <updated>1773597809588</updated>
</task> </task>
<option name="localTasksCounter" value="7" /> <task id="LOCAL-00007" summary="update Angular core to new version">
<option name="closed" value="true" />
<created>1773598259701</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1773598259701</updated>
</task>
<option name="localTasksCounter" value="8" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@@ -305,7 +321,8 @@
<MESSAGE value="update to dotnet 10" /> <MESSAGE value="update to dotnet 10" />
<MESSAGE value="update nuget packages to new versions" /> <MESSAGE value="update nuget packages to new versions" />
<MESSAGE value="update NuGet Package to new Version" /> <MESSAGE value="update NuGet Package to new Version" />
<option name="LAST_COMMIT_MESSAGE" value="update NuGet Package to new Version" /> <MESSAGE value="update Angular core to new version" />
<option name="LAST_COMMIT_MESSAGE" value="update Angular core to new version" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>

2
src/ClientApp/src/app/infrastructure/services/auth-service.ts
View File

@@ -36,7 +36,7 @@ export class AuthService implements IAuthService {
} }
signOut() { signOut() {
if (!this.isBrowser) { if (this.isBrowser) {
localStorage.clear(); localStorage.clear();
this.router.navigate(['/login']).catch(error => { this.router.navigate(['/login']).catch(error => {
console.error('Navigation error:', error); console.error('Navigation error:', error);

9
src/ClientApp/src/app/presentation/components/header/header.component.ts
View File

@@ -1,7 +1,6 @@
import {Component, inject, OnInit, viewChild} from '@angular/core'; import {Component, inject, OnInit} from '@angular/core';
import {DarkModeService} from '../../../infrastructure/services/dark-mode.service'; import {DarkModeService} from '../../../infrastructure/services/dark-mode.service';
import {FormsModule, NgForm} from "@angular/forms"; import {FormsModule} from "@angular/forms";
import {ToastService} from "../../../infrastructure/services/toast.service";
import {ActivatedRoute, NavigationEnd, Router, RouterLink} from "@angular/router"; import {ActivatedRoute, NavigationEnd, Router, RouterLink} from "@angular/router";
import {AuthService} from "../../../infrastructure/services/auth-service"; import {AuthService} from "../../../infrastructure/services/auth-service";
import {UserStoreService} from "../../../infrastructure/services/user-store.service"; import {UserStoreService} from "../../../infrastructure/services/user-store.service";
@@ -19,7 +18,6 @@ import {filter} from "rxjs/operators";
}) })
export class HeaderComponent implements OnInit { export class HeaderComponent implements OnInit {
toastService = inject(ToastService);
darkModeService = inject(DarkModeService); darkModeService = inject(DarkModeService);
userStore = inject(UserStoreService); userStore = inject(UserStoreService);
@@ -50,7 +48,8 @@ export class HeaderComponent implements OnInit {
while (route.firstChild) route = route.firstChild; while (route.firstChild) route = route.firstChild;
// Header-Logic // Header-Logic
const headerRoutes = ['/login', '/register', '/legal' , '/start']; // TODO hide dropdown for login register and legal
const headerRoutes = ['/login', '/register', '/legal', '/startpage'];
this.showDropdown = headerRoutes.some(route => event.urlAfterRedirects.startsWith(route)); this.showDropdown = headerRoutes.some(route => event.urlAfterRedirects.startsWith(route));
this.showOverviewTools = event.urlAfterRedirects.startsWith('/rss-feed-overview'); this.showOverviewTools = event.urlAfterRedirects.startsWith('/rss-feed-overview');
}); });

1
src/ClientApp/src/main.ts
View File

@@ -1,6 +1,7 @@
import { bootstrapApplication } from '@angular/platform-browser'; import { bootstrapApplication } from '@angular/platform-browser';
import { appConfig } from './app/app.config'; import { appConfig } from './app/app.config';
import { AppComponent } from './app/app.component'; import { AppComponent } from './app/app.component';
import 'bootstrap';
bootstrapApplication(AppComponent, appConfig) bootstrapApplication(AppComponent, appConfig)
.catch((err) => console.error(err)); .catch((err) => console.error(err));