]> _ Git - fluidbook-toolbox-quiz.git/commitdiff
projects / fluidbook-toolbox-quiz.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d6c4428)
wip #6195 @0.5
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 16 Aug 2023 13:22:26 +0000 (15:22 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 16 Aug 2023 13:22:26 +0000 (15:22 +0200)
.idea/deployment.xml patch | blob | history
views/index.blade.php patch | blob | history
views/screens/intro.blade.php patch | blob | history
views/screens/outro.blade.php patch | blob | history
views/screens/question_draganddrop.blade.php patch | blob | history
views/screens/question_multiple.blade.php patch | blob | history

diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index a28af2beb993449de4f6fe5ec933999484415fc0..4cff5f51bddcfec8be2d1259413c26c5390ae20b 100644 (file)
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" serverName="dev.toolbox.fluidbook.com" remoteFilesAllowedToDisappearOnAutoupload="false">
+  <component name="PublishConfigData" autoUpload="Always" serverName="dev.toolbox.fluidbook.com" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false" autoUploadExternalChanges="true">
+    <option name="confirmBeforeUploading" value="false" />
     <serverData>
       <paths name="alphaville.cubedesigners.com">
         <serverdata>
@@ -96,7 +97,7 @@
       <paths name="dev.toolbox.fluidbook.com">
         <serverdata>
           <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
+            <mapping deploy="/resources/quiz/player/local/mobile" local="$PROJECT_DIR$" web="/" />
           </mappings>
         </serverdata>
       </paths>
@@ -416,5 +417,6 @@
         </serverdata>
       </paths>
     </serverData>
+    <option name="myAutoUpload" value="ALWAYS" />
   </component>
 </project>
\ No newline at end of file
diff --git a/views/index.blade.php b/views/index.blade.php
index a01d88afd7ff63b803e055b088861876befa40ec..1a501d7e153353846c88df79307260e97d209e49 100644 (file)
--- a/views/index.blade.php
+++ b/views/index.blade.php
@@ -10,7 +10,7 @@
     <link type="text/css" rel="stylesheet" href="css/style.css">
 </head>
 <body>
-@include("quizv2.sprite")
+@include("sprite")
 @php
     $totalQuestion = sizeof($data->questions);
     $alphabet = range('A', 'Z');
@@ -18,12 +18,12 @@
 <div class="container">
     <div id="quiz">
         @if($data->intro_enable)
-            @include('quizv2.screens.intro', ['data'=> $data])
+            @include('screens.intro', ['data'=> $data])
         @endif
         @foreach($data->questions as $key => $question)
-            @include('quizv2.screens.question_'.$question['type'], ['theme' => $data->theme, 'data'=> $question, 'max' => $totalQuestion, 'position' => $key, 'alphabet' => $alphabet])
+            @include('screens.question_'.$question['type'], ['theme' => $data->theme, 'data'=> $question, 'max' => $totalQuestion, 'position' => $key, 'alphabet' => $alphabet])
         @endforeach
-        @include('quizv2.screens.outro', ['data'=> $data])
+        @include('screens.outro', ['data'=> $data])
         <div id="anim"></div>
     </div>
 </div>
diff --git a/views/screens/intro.blade.php b/views/screens/intro.blade.php
index 291f435efa1bd4e257d007b724ca7237ded5fce1..fdb718c983d54d592d6ab6377042c7c163cf2bd7 100644 (file)
--- a/views/screens/intro.blade.php
+++ b/views/screens/intro.blade.php
@@ -2,9 +2,9 @@
     $absPath = \App\Models\Quiz::find($data->id)->getPreviewURL();
 @endphp
 <div class="container-screen active-screen next" id="welcome-screen">
-    @include('quizv2.header_title', ['data', $data])
+    @include('header_title', ['data', $data])
     <div class="screen" id="welcome">
-        <h2 class="none">{{$data->intro_title}}</h2>
+        <h2 class="none">Mobile local {{$data->intro_title}}</h2>
         <p class="none">{{$data->intro_text}}</p>
     </div>
     <div class="screen-image">
diff --git a/views/screens/outro.blade.php b/views/screens/outro.blade.php
index f2d6868f9cebad08a37fd51f06f45b66f2c65db5..e522665c33979509e9a80fc8ecd0499f464cabb8 100644 (file)
--- a/views/screens/outro.blade.php
+++ b/views/screens/outro.blade.php
@@ -1,5 +1,5 @@
 <div class="container-screen none">
-    @include('quizv2.header_title', ['data', $data])
+    @include('header_title', ['data', $data])
     <div class="screen score" id="score">
         <div class="score-content">
             <div class="score-content-wrapper">
diff --git a/views/screens/question_draganddrop.blade.php b/views/screens/question_draganddrop.blade.php
index 2052723fad9b6285954e0d6f7c84cbbe86c77d02..469b4bc7cd23c7744690c29ce657eb26f828ec1a 100644 (file)
--- a/views/screens/question_draganddrop.blade.php
+++ b/views/screens/question_draganddrop.blade.php
@@ -14,7 +14,7 @@
             </form>
         </div>
     </div>
-    @include('quizv2.header_question', ['data' => $data, 'max' => $max, 'position' => $position])
+    @include('header_question', ['data' => $data, 'max' => $max, 'position' => $position])
     <div class="screen question-draganddrop">
         <div class="controls left">
             <p>Move left</p>
@@ -46,5 +46,5 @@
             </form>
         </div>
     </div>
-    @include('quizv2.footer', ['data' => $data, 'reset' => true, 'text' => 'Validate answer', 'info' => true])
+    @include('footer', ['data' => $data, 'reset' => true, 'text' => 'Validate answer', 'info' => true])
 </div>
diff --git a/views/screens/question_multiple.blade.php b/views/screens/question_multiple.blade.php
index 6357f4897f8e1e52f87f96069a83c0b160cf0d3f..8606917900eab010dcb0041c25864516f77d4bfd 100644 (file)
--- a/views/screens/question_multiple.blade.php
+++ b/views/screens/question_multiple.blade.php
@@ -1,5 +1,5 @@
 <div class="container-screen none" data-position="{{$position}}">
-    @include('quizv2.header_question', ['data' => $data, 'max' => $max, 'position' => $position])
+    @include('header_question', ['data' => $data, 'max' => $max, 'position' => $position])
     <div class="screen question-multiple">
         <form id="form-{{$position}}">
             <ul class="list">
@@ -18,5 +18,5 @@
     <div class="screen-image">
         <img src="{{$theme->standardImage}}">
     </div>
-    @include('quizv2.footer', ['data' => $data, 'reset' => true, 'text' => 'Validate answer', 'info' => true])
+    @include('footer', ['data' => $data, 'reset' => true, 'text' => 'Validate answer', 'info' => true])
 </div>
Unnamed repository; edit this file 'description' to name the repository.