diff --git a/pokeR/ClientApp/src/app/app.component.html b/pokeR/ClientApp/src/app/app.component.html
index abf69c9..25ca444 100644
--- a/pokeR/ClientApp/src/app/app.component.html
+++ b/pokeR/ClientApp/src/app/app.component.html
@@ -1,3 +1,3 @@
-
\ No newline at end of file
+
diff --git a/pokeR/ClientApp/src/app/app.component.scss b/pokeR/ClientApp/src/app/app.component.scss
index 650a65c..e711242 100644
--- a/pokeR/ClientApp/src/app/app.component.scss
+++ b/pokeR/ClientApp/src/app/app.component.scss
@@ -1,8 +1,5 @@
-@import '../theme/variables';
+@import "../theme/variables";
-.corner-button {
- position: fixed;
- top: $mid;
- right: $mid;
- z-index: 30;
-}
\ No newline at end of file
+.hidden {
+ display: none;
+}
diff --git a/pokeR/ClientApp/src/app/shared-components/player-settings/player-settings.component.html b/pokeR/ClientApp/src/app/shared-components/player-settings/player-settings.component.html
index 97400c3..4fde305 100644
--- a/pokeR/ClientApp/src/app/shared-components/player-settings/player-settings.component.html
+++ b/pokeR/ClientApp/src/app/shared-components/player-settings/player-settings.component.html
@@ -1,5 +1,9 @@
+
Player Settings
+
+
Theme
+
diff --git a/pokeR/ClientApp/src/app/shared-components/player-settings/player-settings.component.scss b/pokeR/ClientApp/src/app/shared-components/player-settings/player-settings.component.scss
index 7f4a7e2..d6b33d6 100644
--- a/pokeR/ClientApp/src/app/shared-components/player-settings/player-settings.component.scss
+++ b/pokeR/ClientApp/src/app/shared-components/player-settings/player-settings.component.scss
@@ -4,4 +4,8 @@
justify-content: center;
align-items: stretch;
min-height: 100%;
+
+ .spacer {
+ height: 30px;
+ }
}
diff --git a/pokeR/ClientApp/src/app/shared-components/theme-switcher/theme-switcher.component.html b/pokeR/ClientApp/src/app/shared-components/theme-switcher/theme-switcher.component.html
index 41c8301..e090663 100644
--- a/pokeR/ClientApp/src/app/shared-components/theme-switcher/theme-switcher.component.html
+++ b/pokeR/ClientApp/src/app/shared-components/theme-switcher/theme-switcher.component.html
@@ -1,9 +1,4 @@
\ No newline at end of file
+
diff --git a/pokeR/ClientApp/src/app/shared-components/theme-switcher/theme-switcher.component.scss b/pokeR/ClientApp/src/app/shared-components/theme-switcher/theme-switcher.component.scss
index cc5f962..22c45ee 100644
--- a/pokeR/ClientApp/src/app/shared-components/theme-switcher/theme-switcher.component.scss
+++ b/pokeR/ClientApp/src/app/shared-components/theme-switcher/theme-switcher.component.scss
@@ -1,64 +1,43 @@
-@import '../../../theme/variables';
+@import "../../../theme/variables";
.switcher {
- color: var(--contrast-color);
- position: relative;
- z-index: 30;
-
- .switcher-icon {
- font-size: 18px;
- cursor: pointer;
- }
-
- .switcher-menu {
- position: absolute;
- pointer-events: none;
- transition: all .3s ease;
- opacity: 0;
- transform: translateX(20px);
- top: 0;
- right: 0;
- display: flex;
- flex-direction: column;
- background-color: var(--primary-color);
- border-radius: $slim;
- z-index: 35;
-
- .switcher-option {
- display: flex;
- flex-direction: row;
- align-items: center;
- padding: $mid;
- border-radius: $slim;
- cursor: pointer;
- box-shadow: 0 0 0 0 inset var(--accent-color);
- transition: all .3s ease;
- user-select: none;
-
- i.mdi {
- margin-right: $mid;
- }
-
- &:hover {
- background-color: var(--hover-color);
- }
-
- &:active {
- background-color: var(--active-color);
- transition: all .1s ease;
- }
-
- &.active {
- box-shadow: 0 0 0 $slim inset var(--accent-color);
- }
- }
- }
-
- &:hover {
- .switcher-menu {
- opacity: 1;
- transform: translateX(0);
- pointer-events: initial;
- }
+ color: var(--contrast-color);
+ position: relative;
+
+ .switcher-menu {
+ transition: all 0.3s ease;
+ display: flex;
+ flex-direction: column;
+ background-color: var(--primary-color);
+ border-radius: $slim;
+
+ .switcher-option {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ padding: $mid;
+ border-radius: $slim;
+ cursor: pointer;
+ box-shadow: 0 0 0 0 inset var(--accent-color);
+ transition: all 0.3s ease;
+ user-select: none;
+
+ i.mdi {
+ margin-right: $mid;
+ }
+
+ &:hover {
+ background-color: var(--hover-color);
+ }
+
+ &:active {
+ background-color: var(--active-color);
+ transition: all 0.1s ease;
+ }
+
+ &.active {
+ box-shadow: 0 0 0 $slim inset var(--accent-color);
+ }
}
-}
\ No newline at end of file
+ }
+}
diff --git a/pokeR/Hubs/RoomHub.cs b/pokeR/Hubs/RoomHub.cs
index da052ed..56a8b86 100644
--- a/pokeR/Hubs/RoomHub.cs
+++ b/pokeR/Hubs/RoomHub.cs
@@ -81,10 +81,6 @@ public async Task UpdateUser(JoinRoomRequest updated)
await db.SaveChangesAsync();
var roomId = user?.RoomId;
await Clients.Group(roomId).SendAsync("UserUpdated", new ListChange(user, await GetRoomUsers(roomId)));
- if (user.CurrentCardId.HasValue)
- {
- await PlayCard(user.CurrentCardId.Value);
- }
}
public async Task SwitchHost(Guid Id)
diff --git a/pokeR/PokeR.csproj b/pokeR/PokeR.csproj
index fdb908f..a670e82 100644
--- a/pokeR/PokeR.csproj
+++ b/pokeR/PokeR.csproj
@@ -13,7 +13,7 @@
false
Linux
2655f33f-2971-4c41-bf5e-0ad9afe6f19a
- 2.0.0
+ 2.1.0