Merge pull request #227 from nextcloud/bugfix/224/video-polish

Firstrun video polishing
nextcloud · Dec 22, 2019 · d9cc399 · d9cc399
2 parents 793b15e + 3a3939c
commit d9cc399
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/img/Nextcloud.mp4 b/img/Nextcloud.mp4
diff --git a/js/firstrunwizard.js b/js/firstrunwizard.js
diff --git a/js/firstrunwizard.js.map b/js/firstrunwizard.js.map
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -81,17 +81,17 @@ protected function registerScripts() {
 			if ($config->getUserValue($user->getUID(), 'firstrunwizard', 'show', '1') !== '0') {
 				\OC_Util::addScript('firstrunwizard', 'activate');
 
-				/** @var IInitialStateService $initialState */
-				$initialState = $server->query(IInitialStateService::class);
-				$initialState->provideLazyInitialState('firstrunwizard', 'hasVideo', function () use ($server) {
-					$userHome = $server->getUserFolder();
-					return $userHome->nodeExists('/Nextcloud intro.mp4');
-				});
-
 				$jobList = $this->getContainer()->getServer()->getJobList();
 				$jobList->add('OCA\FirstRunWizard\Notification\BackgroundJob', ['uid' => $userSession->getUser()->getUID()]);
 			}
 			$appHint->sendAppHintNotifications();
+
+			/** @var IInitialStateService $initialState */
+			$initialState = $server->query(IInitialStateService::class);
+			$initialState->provideLazyInitialState('firstrunwizard', 'hasVideo', function () use ($server) {
+				// currently unused but let's keep this for now as it might be used later for theming
+				return true;
+			});
 		});
 	}
 

diff --git a/src/App.vue b/src/App.vue
@@ -364,7 +364,7 @@ export default {
 	data() {
 		return {
 			showModal: false,
-			withIntro: false,
+			withIntro: true,
 			hasVideo,
 			slides: [],
 			currentSlide: 0,
@@ -416,7 +416,7 @@ export default {
 				console.error('Failed to load slides')
 			}
 		},
-		async open(withIntro = false) {
+		async open(withIntro = true) {
 			await this.loadStaticSlides()
 			this.withIntro = withIntro
 			this.showModal = true

diff --git a/src/components/IntroVideo.vue b/src/components/IntroVideo.vue
@@ -33,13 +33,13 @@
 </template>
 
 <script>
-import { generateFilePath, generateRemoteUrl } from '@nextcloud/router'
+import { generateFilePath } from '@nextcloud/router'
 
 export default {
 	name: 'IntroVideo',
 	data() {
 		return {
-			videoMp4: generateRemoteUrl('webdav') + 'Nextcloud%20intro.mp4',
+			videoMp4: generateFilePath('firstrunwizard', 'img', 'Nextcloud.mp4'),
 			videoWebm: generateFilePath('firstrunwizard', 'img', 'Nextcloud.webm'),
 		}
 	},