v0.1.1

add config
remove cfg
2025-10-30 21:27:13 +01:00 · 2022-10-31 13:40:29 +01:00 · 2022-10-30 15:49:21 +01:00 · 2022-10-30 15:48:50 +01:00 · 2022-10-30 15:09:48 +01:00 · 2022-10-30 15:09:35 +01:00
13 changed files with 131 additions and 34 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +0,0 @@
-config.js
--- a/config.js
+++ b/config.js
@@ -1,3 +1,4 @@
 const CONFIG = {
 	apiKey: "",
+	twitchOAuth: "",
 };
--- a/css/animations.css
+++ b/css/animations.css
@@ -1,13 +1,5 @@
@keyframes subAnimation {
 	0% {
-		border-image: linear-gradient(
-				to top,
-				var(--border-color-1),
-				var(--border-color-2)
-			)
-			1;
-	}
-	10% {
 		border-image: linear-gradient(
 				to top,
 				var(--border-color-flash-1),
@@ -23,7 +15,7 @@
 			)
 			1;
 	}
-	80% {
+	100% {
 		border-image: linear-gradient(
 				to top,
 				var(--border-color-flash-1),
@@ -31,14 +23,6 @@
 			)
 			1;
 	}
-	100% {
-		border-image: linear-gradient(
-				to top,
-				var(--border-color-2),
-				var(--border-color-1)
-			)
-			1;
-	}
 }

@keyframes borderAnimation {
@@ -82,18 +66,21 @@

@keyframes backgroundSubAnimation {
 	0% {
-		background: var(--border-color-1);
-	}
-	10% {
 		background: var(--border-color-flash-1);
 	}
 	50% {
 		background: var(--border-color-flash-2);
 	}
-	80% {
+	100% {
 		background: var(--border-color-flash-1);
 	}
-	100% {
-		background: var(--border-color-2);
+}
+
+@keyframes tfBannerAnimation {
+	from {
+		margin-top: -200px;
+	}
+	to {
+		margin-top: 0px;
 	}
 }
--- a/css/style.css
+++ b/css/style.css
@@ -55,3 +55,27 @@ html {
 	animation-duration: 20s;
 	animation-name: backgroundAnimation;
 }
+
+#teafire-banner {
+	height: 50px;
+	width: 180px;
+	padding: 20px;
+	margin-top: -200px;
+	z-index: 1;
+	animation-timing-function: linear;
+	float: right;
+}
+
+#teafire-banner p {
+	color: teal;
+	float: left;
+	font-size: 23pt;
+	font-weight: bolder;
+	padding-top: 8px;
+	padding-left: 5px;
+}
+#teafire-banner img {
+	color: teal;
+	height: 50px;
+	float: left;
+}
--- a/css/variables.css
+++ b/css/variables.css
@@ -1,7 +1,7 @@
 :root {
-	--border-color-1: rgb(139, 0, 0);
-	--border-color-2: rgb(255, 74, 74);
+	--border-color-1: rgb(113, 0, 0);
+	--border-color-2: rgb(235, 19, 19);

-	--border-color-flash-1: rgb(220, 32, 15);
-	--border-color-flash-2: rgb(210, 220, 15);
+	--border-color-flash-1: rgb(255, 27, 6);
+	--border-color-flash-2: rgb(208, 218, 20);
 }
--- a/frame.html
+++ b/frame.html
@@ -11,6 +11,10 @@
 	</head>
 	<body>
 		<div id="frame"></div>
+		<div id="teafire-banner">
+			<img src="img/logo128x128.png" alt="" />
+			<p>TealFire</p>
+		</div>
 		<div id="subCount">0</div>
 		<script src="config.js"></script>
 		<script src="js/socket.io.min.js"></script>
--- a/img/logo128x128.png
+++ b/img/logo128x128.png
--- a/js/app.js
+++ b/js/app.js
@@ -1,5 +1,6 @@
 const subCount = document.getElementById("subCount");
 const frame = document.getElementById("frame");
+const tfBanner = document.getElementById("teafire-banner");

 let subCountNumber = 0;

@@ -16,21 +17,51 @@ function updateSubCount() {

 function sub(subName) {
 	frame.style.animationName = "subAnimation";
-	frame.style.animationDuration = "11s";
+	frame.style.animationDuration = "2s";

 	subCount.style.animationName = "backgroundSubAnimation";
-	subCount.style.animationDuration = "11s";
+	subCount.style.animationDuration = "2s";

 	subCount.innerText = subName + " " + subCountNumber;

 	setTimeout(() => {
 		frame.style.animationName = "borderAnimation";
-		frame.style.animationDuration = "5s";
+		frame.style.animationDuration = "20s";

 		subCount.style.animationName = "backgroundAnimation";
-		subCount.style.animationDuration = "5s";
+		subCount.style.animationDuration = "20s";
 		subCount.innerText = subCountNumber;
 		updateSubCount();
 	}, 11000);
 }
+
+function showTealFireBanner() {
+	tfBanner.style.animationName = "tfBannerAnimation";
+	tfBanner.style.animationDuration = "3s";
+	tfBanner.style.animationDirection = "normal";
+	setTimeout(() => {
+		tfBanner.style.marginTop = "0px";
+		tfBanner.style.animationName = "";
+		tfBanner.style.animationDuration = "";
+	}, 3000);
+}
+
+function closeTealFireBanner() {
+	tfBanner.style.animationName = "tfBannerAnimation";
+	tfBanner.style.animationDuration = "3s";
+	tfBanner.style.animationDirection = "reverse";
+
+	setTimeout(() => {
+		tfBanner.style.marginTop = "-200px";
+		tfBanner.style.animationName = "";
+		tfBanner.style.animationDuration = "";
+	}, 3000);
+}
+
+setInterval(() => {
+	showTealFireBanner();
+	setTimeout(() => {
+		closeTealFireBanner();
+	}, 20000);
+}, 300000);
 updateSubCount();
--- a/js/socket.js
+++ b/js/socket.js
@@ -16,6 +16,7 @@ fetch("https://api.tipeeestream.com/v2.0/site/socket")
 				});
 			});
 			socket.on("new-event", (data) => {
+				console.log(data);
 				if (data.event.type == "subscription") {
 					sub(data.event.parameters.username);
 				}
--- a/meta.json
+++ b/meta.json
@@ -1,3 +1,3 @@
 {
-	"version": "v0.0.7"
+	"version": "v0.1.1"
 }
--- a/update.ps1
+++ b/update.ps1
@@ -32,7 +32,16 @@ if ($newestVersionString -ne "") {
  else {
    Write-Output "Updating to newer version..."

-    Remove-Item * -Recurse -Force -Confirm
+    if (Test-Path "./config.js") {
+      if (Test-Path "./config-old.js") {
+        Remove-Item config-old.js
+      }
+      Copy-Item "./config.js" -Destination "./config-old.js"
+      Write-Output "config.js has been copied"
+    }
+    
+    
+    Remove-Item *  -Recurse -Force -Exclude config-old.js

    mkdir ./temp
    attrib +h ./temp
--- a/update_force.bat
+++ b/update_force.bat
@@ -0,0 +1,2 @@
+powershell ./update_force.ps1
+pause
--- a/update_force.ps1
+++ b/update_force.ps1
@@ -0,0 +1,39 @@
+Write-Output "Starting update..."
+
+$newestVersionString = ""
+$req = Invoke-WebRequest https://github.com/DerTyp876/obs-twitch-camera-frame/releases/latest
+
+foreach ($tag in $req.ParsedHtml.body.getElementsByTagName('h1')) {
+  if ($tag.innerText[0] -eq "v") {
+    $newestVersionString = $tag.innerText
+  }
+}
+
+Write-Output "Updating to newer version..."
+
+if (Test-Path "./config.js") {
+  if (Test-Path "./config-old.js") {
+    Remove-Item config-old.js
+  }
+  Copy-Item "./config.js" -Destination "./config-old.js"
+  Write-Output "config.js has been copied"
+}
+
+
+Remove-Item *  -Recurse -Force -Exclude config-old.js
+
+mkdir ./temp
+attrib +h ./temp
+Write-Output "Downloading newer version..."
+Invoke-WebRequest -Uri "https://github.com/DerTyp876/obs-twitch-camera-frame/archive/refs/tags/$newestVersionString.zip" -OutFile "./temp/$newestVersionString.zip"
+Write-Output "Extracting archive..."
+Expand-Archive -Path "./temp/$newestVersionString.zip" -DestinationPath "./temp/"
+
+Get-ChildItem -Path "./temp/obs-twitch-camera-frame-$($newestVersionString -replace 'v')" -Recurse | Move-Item -Destination "./"
+
+Remove-Item "./temp" -Recurse -Force -Confirm
+
+Write-Output "You are now up to date again!"
+
+Write-Output "You need to add your API-Key again to the config.js!"
+pause
Author	SHA1	Message	Date
Janis	53555aad6a	v0.1.1	2022-10-31 13:40:29 +01:00
Janis	a4f9697b6c	add config	2022-10-30 15:49:21 +01:00
Janis	c0d72b8e43	remove cfg	2022-10-30 15:48:50 +01:00
Janis	80ea3c297e	v0.1.0	2022-10-30 15:09:48 +01:00
Janis	c5e597ef58	added tf banner ;)	2022-10-30 15:09:35 +01:00
Janis	5dd6bbf290	v0.0.9	2022-10-29 17:12:44 +02:00
Janis	a45f99ecd3	v0.0.9	2022-10-29 17:12:10 +02:00
Janis	14079a997e	v0.0.8	2022-10-29 16:53:39 +02:00
Janis	23044c320d	v0.0.8	2022-10-29 16:53:35 +02:00