diff --git a/src/components/containers/pages/feed/BaseFeedPageContainer.vue b/src/components/containers/pages/feed/BaseFeedPageContainer.vue new file mode 100644 index 000000000..77809790b --- /dev/null +++ b/src/components/containers/pages/feed/BaseFeedPageContainer.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/src/components/layout/TheBrowserTabs.vue b/src/components/layout/TheBrowserTabs.vue index cd1dc621d..7490f32bc 100644 --- a/src/components/layout/TheBrowserTabs.vue +++ b/src/components/layout/TheBrowserTabs.vue @@ -235,7 +235,7 @@ export default { getNewTabData () { return { uuid: generateKey(), - path: 'feed' + path: 'home' } } } diff --git a/src/helpers/data/plugins/i18n/locales/en.json b/src/helpers/data/plugins/i18n/locales/en.json index dbc10cedf..19a670558 100644 --- a/src/helpers/data/plugins/i18n/locales/en.json +++ b/src/helpers/data/plugins/i18n/locales/en.json @@ -1,5 +1,6 @@ { "navigation": { + "home": "Home page", "artists": "Artists", "artist": "Artist", "albums": "Albums", diff --git a/src/helpers/data/plugins/i18n/locales/ru.json b/src/helpers/data/plugins/i18n/locales/ru.json index fd6ba3ef4..3fda654d5 100644 --- a/src/helpers/data/plugins/i18n/locales/ru.json +++ b/src/helpers/data/plugins/i18n/locales/ru.json @@ -1,5 +1,6 @@ { "navigation": { + "home": "Домашняя страница", "artists": "Исполнители", "artist": "Исполнитель", "albums": "Альбомы", diff --git a/src/helpers/data/plugins/router/routes.js b/src/helpers/data/plugins/router/routes.js index c0f612f58..85ac63e0a 100644 --- a/src/helpers/data/plugins/router/routes.js +++ b/src/helpers/data/plugins/router/routes.js @@ -1,6 +1,9 @@ const RootPage = () => import( '*/views/RootPage.vue' ) +const HomePage = () => import( + '*/views/HomePage.vue' +) const FeedPage = () => import( '*/views/FeedPage.vue' ) @@ -175,6 +178,13 @@ export default [ component: RootPage, props: true }, + { + path: '/home', + exact: true, + name: 'HomePage', + component: HomePage, + props: true + }, { path: '/feed', exact: true, diff --git a/src/helpers/formatters/navigation.js b/src/helpers/formatters/navigation.js index 14ad26eca..df1bc33b0 100644 --- a/src/helpers/formatters/navigation.js +++ b/src/helpers/formatters/navigation.js @@ -1,3 +1,5 @@ +import formatHomeSection + from '*/helpers/formatters/navigation/sections/home' import formatFeedSection from '*/helpers/formatters/navigation/sections/feed' import formatProfilesSection @@ -13,6 +15,16 @@ import formatConversationsSection import formatCommunitiesSection from '*/helpers/formatters/navigation/sections/communities' +export function home () { + return [ + formatHomeSection( + { + isActive: true + } + ) + ] +} + export function feed () { return [ formatFeedSection( diff --git a/src/helpers/formatters/navigation/sections/home.js b/src/helpers/formatters/navigation/sections/home.js new file mode 100644 index 000000000..0d50893ea --- /dev/null +++ b/src/helpers/formatters/navigation/sections/home.js @@ -0,0 +1,14 @@ +import i18n from '*/plugins/i18n' + +export default function ( + { + isActive + } +) { + return { + name: i18n.global.t( + 'navigation.home' + ), + isActive + } +} diff --git a/src/helpers/formatters/tabs.js b/src/helpers/formatters/tabs.js index c64a89048..ee2f4f04f 100644 --- a/src/helpers/formatters/tabs.js +++ b/src/helpers/formatters/tabs.js @@ -1,5 +1,17 @@ import i18n from '*/plugins/i18n' +export function home () { + const title = i18n.global.t( + 'navigation.home' + ) + + return { + title, + path: 'home', + icon: 'home' + } +} + export function feed () { const title = i18n.global.t( 'navigation.feed' diff --git a/src/views/FeedPage.vue b/src/views/FeedPage.vue index 6287f09e2..60b347fa6 100644 --- a/src/views/FeedPage.vue +++ b/src/views/FeedPage.vue @@ -1,57 +1,46 @@ - + diff --git a/src/views/FeedPage/FeedSegment.vue b/src/views/FeedPage/FeedSegment.vue deleted file mode 100644 index 375aefcd3..000000000 --- a/src/views/FeedPage/FeedSegment.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - diff --git a/src/views/HomePage.vue b/src/views/HomePage.vue new file mode 100644 index 000000000..ad47b71b9 --- /dev/null +++ b/src/views/HomePage.vue @@ -0,0 +1,55 @@ + + + + +