diff --git a/public/global.css b/public/global.css index 00a732c9..b7b93cbe 100644 --- a/public/global.css +++ b/public/global.css @@ -3,6 +3,16 @@ src: url("/fonts/Montserrat-Regular.ttf"); } +@font-face { + font-family: MontserratBold; + src: url("/fonts/Montserrat-Bold.ttf"); +} + + * { font-family: Montserrat; } + +h1, h2, h3, h4, h5 { + font-family: MontserratBold; +} diff --git a/public/img/feed-no-video.png b/public/img/feed-no-video.png new file mode 100644 index 00000000..a91900dd Binary files /dev/null and b/public/img/feed-no-video.png differ diff --git a/src/components/FeedPage.vue b/src/components/FeedPage.vue index 9eb515ef..081cf5d8 100644 --- a/src/components/FeedPage.vue +++ b/src/components/FeedPage.vue @@ -70,6 +70,19 @@ > + +
+ +

No videos in My feed yet

+

+ Subscribe to channels to be
+ the first to see new videos. +

+
@@ -85,6 +98,7 @@ export default { data() { return { currentVideoCount: 0, + loading: true, videoStep: 100, videosStore: [], videos: [], @@ -100,6 +114,7 @@ export default { }, mounted() { this.fetchFeed().then(videos => { + this.loading = false; this.videosStore = videos; this.loadMoreVideos(); this.updateWatched(this.videos); diff --git a/src/components/MenuDesktop.vue b/src/components/MenuDesktop.vue index b2e5f829..a9ee7a87 100644 --- a/src/components/MenuDesktop.vue +++ b/src/components/MenuDesktop.vue @@ -60,13 +60,13 @@ -
  • +
  • -
  • +
  • @@ -132,7 +132,8 @@ export default { }, methods: { logout() { - alert("logging out"); + this.removePreference("authToken" + this.hashCode(this.apiUrl())); + window.location = "/"; // done to bypass cache }, }, computed: { diff --git a/src/components/MenuMobile.vue b/src/components/MenuMobile.vue index eacc8388..cf7b76cd 100644 --- a/src/components/MenuMobile.vue +++ b/src/components/MenuMobile.vue @@ -82,7 +82,8 @@ export default { }, methods: { logout() { - alert("logging out"); + this.removePreference("authToken" + this.hashCode(this.apiUrl())); + window.location = "/"; // done to bypass cache }, }, computed: { diff --git a/src/main.js b/src/main.js index ab31cea2..d6c67e30 100644 --- a/src/main.js +++ b/src/main.js @@ -114,6 +114,9 @@ const mixin = { setPreference(key, value) { if (localStorage) localStorage.setItem(key, value); }, + removePreference(key) { + if (localStorage) localStorage.removeItem(key); + }, getPreferenceBoolean(key, defaultVal) { var value; if (