diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 1d9bd69..3b476e5 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -17,8 +17,8 @@ import { PageUser } from './pages/user/user.page'; import { PageUserComments } from './pages/user/usercomments/usercomments.page'; import { PageUserEntries } from './pages/user/userentries/userentries.page'; -import { PageUserPageEdit } from './pages/userpage/edit/edit.page'; -import { PageUserPage } from './pages/userpage/userpage.page'; +import { PageViewEdit } from './pages/view/edit/edit.page'; +import { PageView } from './pages/view/view.page'; import { UiMain } from './ui/main/main.ui'; @@ -40,10 +40,10 @@ const routes: Routes = [ { path: 'u/c/:username', component: PageUserComments, canActivate: [ AuthenticatedGuard ] }, { path: 'u/e/:username', component: PageUserEntries, canActivate: [ AuthenticatedGuard ] }, { path: 'unavailable', component: PageUnavailable }, - { path: 'p', component: PageUserPageEdit, canActivate: [ AuthenticatedGuard ] }, - { path: 'p/:name', component: PageUserPage, canActivate: [ AuthenticatedGuard ] }, - { path: 'p/:name/edit', component: PageUserPageEdit, canActivate: [ AuthenticatedGuard ] }, - { path: 'p/:name/:username', component: PageUserPage, canActivate: [ AuthenticatedGuard ] }, + { path: 'p', component: PageViewEdit, canActivate: [ AuthenticatedGuard ] }, + { path: 'p/:name', component: PageView, canActivate: [ AuthenticatedGuard ] }, + { path: 'p/:name/edit', component: PageViewEdit, canActivate: [ AuthenticatedGuard ] }, + { path: 'p/:name/:username', component: PageView, canActivate: [ AuthenticatedGuard ] }, { path: '**', component: PageNotFound, pathMatch: 'full', canActivate: [ AuthUpdateGuard ] }, ] }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d1870cd..3268643 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -45,9 +45,9 @@ import { I18nService, I18nPaginatorIntl } from './services/i18n.service'; import { ServiceWorkerModule } from '@angular/service-worker'; import { environment } from '../environments/environment'; import { UiTagsPicker } from './ui/tags/tagspicker.ui'; -import { UiUserPageMenu } from './ui/userpagemenu/userpagemenu.ui'; -import { PageUserPage } from './pages/userpage/userpage.page'; -import { PageUserPageEdit } from './pages/userpage/edit/edit.page'; +import { UiViewMenu } from './ui/viewmenu/viewmenu.ui'; +import { PageView } from './pages/view/view.page'; +import { PageViewEdit } from './pages/view/edit/edit.page'; import { PageSearch } from './pages/search/search.page'; @@ -99,8 +99,8 @@ export class XhrInterceptor implements HttpInterceptor { PageSettings, PageUnavailable, PageUser, PageUserComments, PageUserEntries, - PageUserPage, - PageUserPageEdit, + PageView, + PageViewEdit, UiComment, UiCommentCount, UiCommentForm, @@ -110,7 +110,7 @@ export class XhrInterceptor implements HttpInterceptor { UiMain, UiPoints, UiTagsPicker, - UiUserPageMenu, + UiViewMenu, ConfirmDialog ], imports: [ diff --git a/src/app/pages/userpage/edit/edit.page.html b/src/app/pages/view/edit/edit.page.html similarity index 61% rename from src/app/pages/userpage/edit/edit.page.html rename to src/app/pages/view/edit/edit.page.html index c4f70fc..8d259bd 100644 --- a/src/app/pages/userpage/edit/edit.page.html +++ b/src/app/pages/view/edit/edit.page.html @@ -1,21 +1,21 @@