Skip to content

move theme switcher to player settings pane #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 19, 2020
Merged

move theme switcher to player settings pane #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abc238c
move theme switcher to player settings pane
halomakes Aug 19, 2020
742d0f0
bump version
halomakes Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pokeR/ClientApp/src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<router-outlet></router-outlet>
<app-notification-feed></app-notification-feed>
<app-theme-switcher class="corner-button"></app-theme-switcher>
<app-theme-switcher class="hidden"></app-theme-switcher>
11 changes: 4 additions & 7 deletions pokeR/ClientApp/src/app/app.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
@import '../theme/variables';
@import "../theme/variables";

.corner-button {
position: fixed;
top: $mid;
right: $mid;
z-index: 30;
}
.hidden {
display: none;
}
4 changes: 4 additions & 0 deletions pokeR/ClientApp/src/app/shared-components/player-settings/player-settings.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<app-pane-drawer [label]="playerName" direction="right">
<div class="player-settings">
<h3>Player Settings</h3>
<app-join-room [isUpdate]="true" [roomId]="roomId"></app-join-room>
<div class="spacer"></div>
<h3>Theme</h3>
<app-theme-switcher></app-theme-switcher>
</div>
</app-pane-drawer>
4 changes: 4 additions & 0 deletions pokeR/ClientApp/src/app/shared-components/player-settings/player-settings.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@
justify-content: center;
align-items: stretch;
min-height: 100%;

.spacer {
height: 30px;
}
}
7 changes: 1 addition & 6 deletions pokeR/ClientApp/src/app/shared-components/theme-switcher/theme-switcher.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
<div class="switcher">
<div class="switcher-icon">
<i *ngIf="currentTheme==modes.automatic" class="mdi mdi-brightness-auto"></i>
<i *ngIf="currentTheme==modes.dark" class="mdi mdi-weather-night"></i>
<i *ngIf="currentTheme==modes.light" class="mdi mdi-white-balance-sunny"></i>
</div>
<div class="switcher-menu">
<div class="switcher-option" (click)="setTheme(modes.automatic)" [class.active]="currentTheme==modes.automatic">
<i class="mdi mdi-brightness-auto"></i>
Expand All @@ -19,4 +14,4 @@
<span>Light</span>
</div>
</div>
</div>
</div>
101 changes: 40 additions & 61 deletions pokeR/ClientApp/src/app/shared-components/theme-switcher/theme-switcher.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
}
}
}
}
4 changes: 0 additions & 4 deletions pokeR/Hubs/RoomHub.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>(user, await GetRoomUsers(roomId)));
if (user.CurrentCardId.HasValue)
{
await PlayCard(user.CurrentCardId.Value);
}
}

public async Task SwitchHost(Guid Id)
Expand Down
2 changes: 1 addition & 1 deletion pokeR/PokeR.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<BuildServerSideRenderer>false</BuildServerSideRenderer>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<UserSecretsId>2655f33f-2971-4c41-bf5e-0ad9afe6f19a</UserSecretsId>
<Version>2.0.0</Version>
<Version>2.1.0</Version>
</PropertyGroup>

<ItemGroup>
Expand Down