Merge pull request #28 from Difegue/v3.5

V3.5
Difegue · Oct 6, 2022 · 28f31bf · 28f31bf
2 parents 791c562 + 9677b1a
commit 28f31bf
Show file tree

Hide file tree

Showing 19 changed files with 385 additions and 86 deletions.
diff --git a/WebContent/WEB-INF/templates/admin.html b/WebContent/WEB-INF/templates/admin.html
@@ -12,14 +12,15 @@
 
 <script>
 
-	function testGame(id) {
+	async function testGame(id) {
 		$('#game-modal').modal('open');
-		// TODO remove this when we can use the player's data
-		$("#player-title").text(id);
 
 		// encode id for url use
 		var encodedId = encodeURIComponent(id);
-		playGame('./manage?preview=true&file=' + encodedId);
+
+		mioData = await _fetch(`./manage?preview=true&file=${encodedId}`);
+		buildMidiData(mioData);
+		playGame(mioData);
 	}
 
 	function easyFilter() {

diff --git a/WebContent/WEB-INF/templates/base.html b/WebContent/WEB-INF/templates/base.html
@@ -16,11 +16,12 @@
   <link href="https://fonts.googleapis.com/css?family=Karla|Material+Icons" rel="stylesheet">
   <link href="css/vendor/materialize.min.css" type="text/css" rel="stylesheet" media="screen,projection" />
   <link href="css/vendor/jquery.fileupload.css" type="text/css" rel="stylesheet" media="screen,projection" />
+  <link href="css/vendor/animate.min.css" type="text/css" rel="stylesheet" media="screen,projection" />
   <link href="css/style.css" type="text/css" rel="stylesheet" media="screen,projection" />
 
   <style>
     body {
-      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.4) 100%),
+      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.8) 0%, rgba(0, 0, 0, 0.5) 100%),
       url('{% block background %}./img/bg_gam.png{% endblock %}');
     }
   </style>
@@ -52,8 +53,8 @@
   <meta name="twitter:card" content="summary_large_image">
   <meta property="og:title" content="DoujinSoft Store" />
   <meta property="og:type" content="website" />
-  <meta property="og:description"
-    content="The DoujinSoft Store presents a selection of games, music and comics created with the 2010 Nintendo DS game WarioWare DIY, available for reading, listening, and transferring to your own copies of the game." />
+  <meta property="og:description" content="The DoujinSoft Store presents a selection of games, music and comics created with the 2010 Nintendo DS game WarioWare DIY, available to play with and
+    transfer to your own copies of the game." />
   <meta property="og:image" content="http://diy.tvc-16.science/meta.jpg" />
   <!-- Hardcoding the URL kinda sucks here -->
   {% endif %}
@@ -164,7 +165,7 @@ <h5 class="white-text">About DoujinSoft</h5>
               href="https://rc24.xyz/">RiiConnect24</a>, <a class="orange-text text-lighten-3"
               href="https://twitter.com/andrewk1024">andrewk1024</a> for the
             8-bit instrument samples, <br>and <a class="orange-text text-lighten-3"
-              href="https://github.com/yeahross0">yeahross0</a> for his amazing work on mio-micro.
+              href="https://yeahross.itch.io/">yeahross0</a> for his amazing work on mio-micro.
             <br /> This website is not affiliated with Nintendo in any way.
           </p>
 

diff --git a/WebContent/WEB-INF/templates/collection.html b/WebContent/WEB-INF/templates/collection.html
@@ -49,10 +49,43 @@
 	<ul class="pagination"></ul>
 </div>
 
+<div class="fixed-action-btn">
+	<!-- style="scale: 2;margin-right: 12px;margin-bottom: 24px;"-->
+	<a id="playbtn" class="waves-effect waves-light btn btn-floating tooltipped" data-tooltip="Play!"
+		data-position="top" onclick="startCollectionPlayer(collectionHashes)">
+		<i class="material-icons">play_arrow</i></a>
+</div>
+<div class="tap-target" data-target="playbtn">
+	<div class="tap-target-content">
+		<h5 style="font-family: warioware;">Fancy a game?</h5>
+		<p>You can play all the games in this collection randomly thrown at you, (mostly*) just like the real thing.
+			<br>4 lives and you're out!
+			<br><sub>* Some games may be unwinnable or behave weirdly.</sub>
+		</p>
+	</div>
+</div>
+
 {% endblock %}
 
 {% block extradata %}
+
+<!-- ew -->
+{% if collection.collection_type equals "manga" %}
+{% elseif collection.collection_type equals "record" %}
+{% else %}
 {% include "./modalPlayer.html" %}
+<script>
+	// Keep track of all the hashes in this collection
+	const collectionHashes = [{% for hash in collection.mios %} "{{hash}}", {% endfor %} ];
+	let tapTarget = $('.tap-target').tapTarget({
+		onClose: () => localStorage.sawCollectionInfo = true
+	});
+
+	//if (localStorage.getItem("sawCollectionInfo") === null) {
+	tapTarget.tapTarget('open');
+	//}
+</script>
+{% endif %}
 {% endblock %}
 
 {% block content %}

diff --git a/WebContent/WEB-INF/templates/home.html b/WebContent/WEB-INF/templates/home.html
@@ -8,7 +8,8 @@
 {% block desc %}
 
 <span style="font-size:20px;">👇 Latest News 👇</span>
-<div class="red darken-1 white-text z-depth-2" style="border-radius:16px; margin-top: 10px">
+<div class="white-text z-depth-2"
+	style="border-radius:16px; margin-top: 10px; background: linear-gradient(to bottom, #f44336 0%, #b43a3a 100%);">
 	<span style="font-size:18px"> {{ news }} </span>
 </div>