diff --git a/interactive-mining-angular-frontend/src/app/app-routing.module.ts b/interactive-mining-angular-frontend/src/app/app-routing.module.ts index d77161b..7ac27ba 100644 --- a/interactive-mining-angular-frontend/src/app/app-routing.module.ts +++ b/interactive-mining-angular-frontend/src/app/app-routing.module.ts @@ -5,7 +5,7 @@ import {ConfigurationComponent} from './configuration/configuration.component'; import {SaveprofileComponent} from './saveprofile/saveprofile.component'; import {ManageprofilesComponent} from './manageprofiles/manageprofiles.component'; -const routes: Routes = [ +export const InteractiveMiningRoutes: Routes = [ { path: '', redirectTo: '/manage-profiles', pathMatch: 'full' }, { path: 'manage-profiles', component: ManageprofilesComponent }, { path: 'upload-content', component: ContentComponent }, @@ -14,7 +14,7 @@ const routes: Routes = [ ]; @NgModule({ - imports: [ RouterModule.forRoot(routes) ], + imports: [ RouterModule.forRoot(InteractiveMiningRoutes) ], exports: [ RouterModule ] }) export class AppRoutingModule { } diff --git a/interactive-mining-angular-frontend/src/app/configuration/configuration.component.ts b/interactive-mining-angular-frontend/src/app/configuration/configuration.component.ts index 34da76c..abf7a36 100644 --- a/interactive-mining-angular-frontend/src/app/configuration/configuration.component.ts +++ b/interactive-mining-angular-frontend/src/app/configuration/configuration.component.ts @@ -55,7 +55,7 @@ export class ConfigurationComponent implements OnInit, AfterViewInit { document.getElementById("enableStickyBarScript").remove(); var enableStickyBarScript = document.createElement("script"); enableStickyBarScript.setAttribute("id", "enableStickyBarScript"); - enableStickyBarScript.setAttribute("src", "assets/js/enableStickyBar.js"); + enableStickyBarScript.innerHTML = "$(\"#child1\").stickySidebar();\n"; document.body.appendChild(enableStickyBarScript); } diff --git a/interactive-mining-angular-frontend/src/app/configuration/settings/settings.component.ts b/interactive-mining-angular-frontend/src/app/configuration/settings/settings.component.ts index 67cfa5e..032eca5 100644 --- a/interactive-mining-angular-frontend/src/app/configuration/settings/settings.component.ts +++ b/interactive-mining-angular-frontend/src/app/configuration/settings/settings.component.ts @@ -225,18 +225,22 @@ export class SettingsComponent implements OnInit { return; } localStorage.setItem('wordssplitnum', value); + this.settings.wordssplitnum = value; } stopwordsCheckBoxChange(value: boolean): void { localStorage.setItem('stopwords', value ? '1' : '0'); + this.settings.stopwords = value ? 1 : 0; } punctuationCheckBoxChange(value: boolean): void { localStorage.setItem('punctuation', value ? '1' : '0'); + this.settings.punctuation = value ? 1 : 0; } letterCaseChange(lettercase): void { localStorage.setItem('lettercase', lettercase); + this.settings.lettercase = lettercase; } saveProfile(): void { diff --git a/interactive-mining-angular-frontend/src/assets/css/custom.css b/interactive-mining-angular-frontend/src/assets/css/custom.css index 5b89990..1e6e1db 100644 --- a/interactive-mining-angular-frontend/src/assets/css/custom.css +++ b/interactive-mining-angular-frontend/src/assets/css/custom.css @@ -88,18 +88,18 @@ line-height: 18px; } .OPEN { - background: rgba(0, 0, 0, 0) url("/static/openAccess.png") no-repeat scroll right center; + background: rgba(0, 0, 0, 0) url("/assets/openAccess.png") no-repeat scroll right center; padding-right: 18px; min-height: 18px; } .EMBARGO, .CLOSED, .RESTRICTED { - background: rgba(0, 0, 0, 0) url("/static/closedAccess.png") no-repeat scroll right center; + background: rgba(0, 0, 0, 0) url("/assets/closedAccess.png") no-repeat scroll right center; padding-right: 18px; } .sc39 { - background: rgba(0, 0, 0, 0) url("/static/sc39.png") no-repeat scroll right center; + background: rgba(0, 0, 0, 0) url("/assets/sc39.png") no-repeat scroll right center; padding-right: 24px; } diff --git a/interactive-mining-angular-frontend/src/assets/img/OA CONNECT_A.png b/interactive-mining-angular-frontend/src/assets/img/OA CONNECT_A.png new file mode 100644 index 0000000..08fd7cd Binary files /dev/null and b/interactive-mining-angular-frontend/src/assets/img/OA CONNECT_A.png differ diff --git a/interactive-mining-angular-frontend/src/assets/img/OA CONNECT_B.png b/interactive-mining-angular-frontend/src/assets/img/OA CONNECT_B.png new file mode 100644 index 0000000..ebedd4e Binary files /dev/null and b/interactive-mining-angular-frontend/src/assets/img/OA CONNECT_B.png differ diff --git a/interactive-mining-angular-frontend/src/assets/js/enableStickyBar.js b/interactive-mining-angular-frontend/src/assets/js/enableStickyBar.js deleted file mode 100644 index 768142c..0000000 --- a/interactive-mining-angular-frontend/src/assets/js/enableStickyBar.js +++ /dev/null @@ -1 +0,0 @@ -$("#child1").stickySidebar(); diff --git a/interactive-mining-angular-frontend/src/index.html b/interactive-mining-angular-frontend/src/index.html index ff55006..76d011b 100644 --- a/interactive-mining-angular-frontend/src/index.html +++ b/interactive-mining-angular-frontend/src/index.html @@ -24,7 +24,7 @@
@@ -52,7 +52,7 @@
- European Commission + European Commission
@@ -189,10 +189,10 @@
- OpenAIRE + OpenAIRE