From 4ae252ba1584af1c8c58f2ba732b550a09cdf9a3 Mon Sep 17 00:00:00 2001
From: Paulina Nogal <pnogal@wisc.edu>
Date: Fri, 31 May 2019 18:20:35 +0000
Subject: [PATCH] Add Subheader with Logout link to myuw-drawer component
---
package.json | 4 ++--
src/app/core/header/header.component.html | 13 +++++++++++++
src/app/core/header/header.component.scss | 13 +++++++++++++
.../term-container/term-container.component.scss | 1 +
src/environments/environment.prod.ts | 2 +-
5 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 4c17966..54c2e52 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "course-search-enroll-fe",
- "version": "1.0.19",
+ "version": "1.0.20",
"scripts": {
"ng": "ng",
"start": "ng serve --proxy-config proxy.json --open",
@@ -29,7 +29,7 @@
"@angular/router": "^7.2.15",
"@myuw-web-components/myuw-app-bar": "^1.5.4",
"@myuw-web-components/myuw-app-styles": "^1.2.3",
- "@myuw-web-components/myuw-drawer": "^1.0.6",
+ "@myuw-web-components/myuw-drawer": "^1.2.0",
"@myuw-web-components/myuw-help": "^1.3.1",
"@myuw-web-components/myuw-profile": "^1.3.1",
"@myuw-web-components/myuw-search": "^1.3.1",
diff --git a/src/app/core/header/header.component.html b/src/app/core/header/header.component.html
index 18b1637..e914d2f 100644
--- a/src/app/core/header/header.component.html
+++ b/src/app/core/header/header.component.html
@@ -54,6 +54,18 @@
href="/dars">
</myuw-drawer-link>
</ng-template>
+ <myuw-drawer-subheader
+ slot="myuw-drawer-links"
+ divider
+ name="Profile">
+ </myuw-drawer-subheader>
+ <myuw-drawer-link
+ slot="myuw-drawer-links"
+ name="Logout"
+ icon="person"
+ aria-label="log out"
+ href="http://login.wisc.edu/logout">
+ </myuw-drawer-link>
</myuw-drawer>
<myuw-help
@@ -78,6 +90,7 @@
ngClass.sm="show-sidenav-toggle-btn"
ngClass.xs="show-sidenav-toggle-btn">
<myuw-profile
+ id="myuw-profile"
slot="myuw-profile"
alt="User profile"
matTooltip="Profile"
diff --git a/src/app/core/header/header.component.scss b/src/app/core/header/header.component.scss
index 985dfeb..16b7e2e 100644
--- a/src/app/core/header/header.component.scss
+++ b/src/app/core/header/header.component.scss
@@ -53,3 +53,16 @@ myuw-profile,
outline: -webkit-focus-ring-color auto 5px;
}
}
+
+@media screen and (max-width: 960px) {
+ button#sidenav-toggle-btn {
+ left: 0px;
+ }
+
+ #profile-and-menu-wrapper.show-sidenav-toggle-btn {
+ width: 52px;
+ }
+ #myuw-profile {
+ display: none;
+ }
+}
diff --git a/src/app/degree-planner/term-container/term-container.component.scss b/src/app/degree-planner/term-container/term-container.component.scss
index deabfd2..a1fecde 100644
--- a/src/app/degree-planner/term-container/term-container.component.scss
+++ b/src/app/degree-planner/term-container/term-container.component.scss
@@ -85,6 +85,7 @@
}
h3 {
font-weight: 400;
+ padding-left: 6px;
}
.mat-icon-button {
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 2efdd1c..26a0ffa 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,6 +1,6 @@
export const environment = {
production: true,
- version: '1.0.19',
+ version: '1.0.20',
apiPlannerUrl: '/api/planner/v1',
apiSearchUrl: '/api/search/v1',
apiEnrollUrl: '/api/enroll/v1',
--
GitLab