Merge pull request #11 from bomzheg/test

added tg color scheme
bomzheg · Jun 14, 2024 · dd5f1d6 · dd5f1d6
2 parents 4da54cf + df24bdb
commit dd5f1d6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -2,7 +2,7 @@ name: ShvatkaUIBuild
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, test ]
     tags: ["*.*.*"]
 
 jobs:

diff --git a/src/app/games/games.component.scss b/src/app/games/games.component.scss
@@ -14,7 +14,7 @@
 
 .games-list-item a {
   text-decoration: none;
-  color: #000;
+  color: var(--tg-theme-text-color);
   box-sizing: border-box;
   display: block;
 }

diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts
@@ -57,9 +57,10 @@ export class HeaderComponent implements OnInit {
       console.debug("let's try to auth with webapp")
       this.authService.authenticateWebApp(this.tgWa)
         .subscribe({
-          next: () => {
+          next: async () => {
             console.debug("success webapp auth, let's load profile")
-            this.userService.loadMe()
+            await this.userService.loadMe()
+            this.tgWa.ready()
           },
           error: async (err) => {
             console.error("webapp auth error " + err.message);

diff --git a/src/styles.scss b/src/styles.scss
@@ -13,4 +13,11 @@ $shvatka_green: #4CAF50;
 }
 
 html, body { height: 100%; }
-body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
+body {
+  margin: 0;
+  font-family: Roboto, "Helvetica Neue", sans-serif;
+
+  color: var(--tg-theme-text-color);
+  background-color: var(--tg-theme-bg-color);
+}
+