new version

This commit is contained in:
silas 2021-06-10 10:32:06 +02:00
parent 71eda197fe
commit 9704cf012e
18 changed files with 4064 additions and 2947 deletions

View File

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8'?>
<widget android-versionCode="18" id="link.silas.wordrotator" version="1.3.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>WordRotator</name>
<widget android-versionCode="19" id="test.link.silas.wordrotator" version="1.3.2" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>WordRotator - Test</name>
<description>
A word-game
</description>
@ -21,6 +21,7 @@
<allow-intent href="market:*" />
<edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
</edit-config>
<preference name="android-targetSdkVersion" value="29" />
<icon src="src/client/img/logo.png" />
</platform>
<platform name="ios">

View File

@ -7,7 +7,7 @@
"run browser": "cordova run browser",
"prepare browser": "cordova prepare browser",
"run android": "cordova run android --device",
"release android": "cordova build android --release",
"release android": "cordova build android --release --packageType=bundle",
"appium": "appium",
"appium-doctor": "appium-doctor",
"test browser": "wdio tests/wdio.config.browser.js",
@ -107,4 +107,4 @@
"android >= 4.4",
"ios >= 7"
]
}
}

View File

@ -30,7 +30,7 @@
<div class = 'step-3 hidden translation' data-translation="tutorial-step-3"></div>
<div class = 'step-4 hidden translation' data-translation="tutorial-step-4"></div>
</div>
<div class='height-20 show-when-won center flex-center fill-me' style = 'min-height: 45px'>
<div class='height-20 show-when-won center flex-center fill-me' style = 'min-height: 60px'>
<div class = 'grow max-width'>
<b class="translation" data-translation="won" id="won-text"></b>
</div>
@ -51,4 +51,4 @@
<div class = 'tutorial-blanket'></div>
</div>
</div>

View File

@ -12,7 +12,7 @@
content="default-src 'self' data: gap: cdvfile: * 'unsafe-eval';
style-src 'self' 'unsafe-inline';
media-src *; img-src 'self' * data: cdvfile: content:;
script-src 'self' data: 'unsafe-eval'" ;>
script-src 'self' data: 'unsafe-eval'">
<!--Element, mit dem Foundation die ViewQueries mitteilt-->
<meta class='foundation-mq'>

View File

@ -133,7 +133,7 @@ export class LevelSite extends MenuSite {
let scaleHelper = new ScaleHelper();
this.continueButtonScaler = await scaleHelper.scaleToFull(continueButton, continueButton.parentElement, false, true, 2);
this.wonTextScaler = await scaleHelper.scaleToFull(wonText, wonText.parentElement, false, false, 2, null, 5);
this.wonTextScaler = await scaleHelper.scaleTo(0.9, wonText, wonText.parentElement, false, false, 2, null, 5);
this.wonText = wonText;
this.wonText.style.fontSize = "0";
@ -216,6 +216,8 @@ export class LevelSite extends MenuSite {
this.showLoadingSymbol();
try {
let levelData = await LevelPlayed.getNextLevelData(LevelSite.RENDERER_TYPES);
// let levelData = await LevelData.findById(34);
// this.level = null;
if (Helper.isNull(levelData)) {
this.startEndSite();
@ -375,6 +377,10 @@ export class LevelSite extends MenuSite {
this.continueButtonScaler();
this.levelScaler();
// Promise.all([this.wonTextScaler(), this.continueButtonScaler()]).then(() => {
// this.levelScaler();
// });
Matomo.push(["trackEvent", "LevelSite", "LevelWon", "Coins", parseInt(Helper.nonNull(await NativeStoragePromise.getItem("coins"), "0"))]);
let leafs = level.getLeafSegments();

View File

@ -12,10 +12,13 @@
}
.jump-animation {
animation-name: jump-animation;
animation-duration: 0.4s;
animation-fill-mode: none;
animation-timing-function: linear;
//> .leaf-element {
animation-name: jump-animation;
animation-duration: 0.4s;
animation-fill-mode: none;
animation-timing-function: linear;
animation-delay: inherit;
//}
}
$deg: 10deg;
@ -42,4 +45,4 @@ $deg: 10deg;
/* When the animation is finished, start again */
animation-iteration-count: infinite;
}
}

View File

@ -13,6 +13,9 @@ $accentColor: #d3e7eb;
$textColor: white;
$svgColor: black;
$secondaryBackgroundColor: rgba(66, 112, 129, 1);
$secondaryBackgroundColor: rgba(66, 112, 129, 0.95);
// Blau Invers
//$primaryColor: #4d575a;
//$secondaryColor: #427081;
@ -49,7 +52,16 @@ $svgColor: black;
//$svgColor: white;
body.theme-blue{
background: $primaryColor;
background: repeating-linear-gradient(
300deg,
$primaryColor,
$primaryColor 9%,
$secondaryBackgroundColor 13.5%,
$secondaryBackgroundColor 21.5%,
$primaryColor 26%,
);
//background: $primaryColor;
color: $textColor;
label{

View File

@ -401,6 +401,28 @@ $coinTowerDimension: 28px;
text-shadow: $text-shadow;
}
.segment:not(.segment-row):not(.segment-triangle):not(.rotating) {
@for $i from 1 through length($rotationDegrees) {
&.rotate-#{nth($rotationDegrees, $i)} {
//transform: rotate(#{nth($rotationDegrees, $i)}deg);
transform: none;
> .child-container {
> .segment {
//transform: rotate(#{360- nth($rotationDegrees, $i)}deg);
transform: none;
@for $j from 1 through length($rotationDegrees) {
&.rotate-#{nth($rotationDegrees, $j)} {
transform: none;
}
}
}
}
}
}
}
}
.text-right {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8'?>
<widget android-versionCode="18" id="link.silas.wordrotator" version="1.3.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>WordRotator</name>
<widget android-versionCode="19" id="link.silas.wordrotator" version="1.3.2" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>WordRotator - Test</name>
<description>
A word-game
</description>

View File

@ -0,0 +1 @@
<div class="image-selection"> <div class="flex-container"> <div class="image-selection-category-container grow"> <div class="image-selection-category"> <div class="image-selection-category-name"></div> <div class="image-selection-image-container"> <img class="image-selection-image"> <span class="image-selection-image-name"></span> </div> </div> </div> <div class="image-selection-preview"><button class="button height-100">Drag & Drop Image for own upload</button></div> </div> <input type="hidden" class="image-selection-value"> </div>

View File

@ -1 +1 @@
<div class="max-height overflow-hidden"> <div id="segment-leaf-template" class="segment segment-leaf"> <div class="leaf-element"></div> </div> <div id="segment-parent-template" class="segment segment-parent"> <div class="child-container"></div> </div> <div id="segment-row-template" class="segment segment-row"> <div class="child-container"></div> </div> <div id="segment-column-template" class="segment segment-column"> <div class="child-container"></div> </div> <div id="segment-triangle-template" class="segment segment-triangle"> <div class="child-container"></div> </div> <div id="tutorial-pointer"></div> <div class="max-height fill-me"> <div class="height-20 no-transition tutorial-text center flex-center hidden"> <div class="step-1 hidden translation" data-translation="tutorial-step-1"></div> <div class="step-2 hidden translation" data-translation="tutorial-step-2"></div> <div class="step-3 hidden translation" data-translation="tutorial-step-3"></div> <div class="step-4 hidden translation" data-translation="tutorial-step-4"></div> </div> <div class="height-20 show-when-won center flex-center fill-me" style="min-height:45px"> <div class="grow max-width"> <b class="translation" data-translation="won" id="won-text"></b> </div> <div id="coin-container"> <div id="coin-template" class="coin" style="opacity:0"> <img src="img/coin.png"/> </div> </div> </div> <div class="flex-center level-container grow"> <div id="level"> </div> </div> <div class="show-when-won flex-center height-20"> <button class="button max-width translation" id="continue-button" data-translation="continue"></button> </div> </div> <div class="tutorial-blanket"></div> </div>
<div class="max-height overflow-hidden"> <div id="segment-leaf-template" class="segment segment-leaf"> <div class="leaf-element"></div> </div> <div id="segment-parent-template" class="segment segment-parent"> <div class="child-container"></div> </div> <div id="segment-row-template" class="segment segment-row"> <div class="child-container"></div> </div> <div id="segment-column-template" class="segment segment-column"> <div class="child-container"></div> </div> <div id="segment-triangle-template" class="segment segment-triangle"> <div class="child-container"></div> </div> <div id="tutorial-pointer"></div> <div class="max-height fill-me"> <div class="height-20 no-transition tutorial-text center flex-center hidden"> <div class="step-1 hidden translation" data-translation="tutorial-step-1"></div> <div class="step-2 hidden translation" data-translation="tutorial-step-2"></div> <div class="step-3 hidden translation" data-translation="tutorial-step-3"></div> <div class="step-4 hidden translation" data-translation="tutorial-step-4"></div> </div> <div class="height-20 show-when-won center flex-center fill-me" style="min-height:60px"> <div class="grow max-width"> <b class="translation" data-translation="won" id="won-text"></b> </div> <div id="coin-container"> <div id="coin-template" class="coin" style="opacity:0"> <img src="img/coin.png"/> </div> </div> </div> <div class="flex-center level-container grow"> <div id="level"> </div> </div> <div class="show-when-won flex-center height-20"> <button class="button max-width translation" id="continue-button" data-translation="continue"></button> </div> </div> <div class="tutorial-blanket"></div> </div>

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
<!doctype html><html><head><link rel="icon" type="image/png" href="img/logo.png"><meta charset="utf-8"/><meta name="format-detection" content="telephone=no"><meta name="msapplication-tap-highlight" content="no"><meta name="viewport" content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: cdvfile: * 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *; img-src 'self' * data: cdvfile: content:; script-src 'self' data: 'unsafe-eval'" ;><meta class="foundation-mq"><link rel="stylesheet" href="index.css"><title>WordRotator</title><script src="scripts/sql-wasm.js"></script><script src="scripts/localforage.js"></script></head><body class="theme-blue"><div id="toast-container"><div class="toast toast-template" style="opacity:0"><span class="message"></span></div></div><div id="site"><div class="loader overlay"><svg viewBox="0 0 32 32" width="32" height="32"><circle class="spinner" cx="16" cy="16" r="14" fill="none" style="stroke:#000"></circle></svg></div></div><script src="cordova.js"></script><script src="bundle.js"></script></body></html>
<!doctype html><html><head><link rel="icon" type="image/png" href="img/logo.png"><meta charset="utf-8"/><meta name="format-detection" content="telephone=no"><meta name="msapplication-tap-highlight" content="no"><meta name="viewport" content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: cdvfile: * 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *; img-src 'self' * data: cdvfile: content:; script-src 'self' data: 'unsafe-eval'"><meta class="foundation-mq"><link rel="stylesheet" href="index.css"><title>WordRotator</title><script src="scripts/sql-wasm.js"></script><script src="scripts/localforage.js"></script></head><body class="theme-blue"><div id="toast-container"><div class="toast toast-template" style="opacity:0"><span class="message"></span></div></div><div id="site"><div class="loader overlay"><svg viewBox="0 0 32 32" width="32" height="32"><circle class="spinner" cx="16" cy="16" r="14" fill="none" style="stroke:#000"></circle></svg></div></div><script src="cordova.js"></script><script src="bundle.js"></script></body></html>

View File

@ -1,8 +1,8 @@
{
"background_color": "#FFF",
"display": "standalone",
"name": "WordRotator",
"short_name": "WordRotator",
"name": "WordRotator - Test",
"short_name": "WordRotator - Test",
"version": "link.silas.wordrotator",
"description": "A word-game",
"author": "Silas Günther",

Binary file not shown.

View File

@ -32,7 +32,7 @@ exports.config = {
bail: 0,
baseUrl: "http://127.0.0.1:8000",
baseUrl: "http://127.0.0.1:8001",
waitforTimeout: 10000,