Skip to content

Commit 1e89d32

Browse files
authored
Feature stage sync (#67)
This pull request introduces several significant UI and workflow improvements, focusing on navigation, theming, and utility enhancements. The most substantial changes are a complete redesign of the navigation bar for better mobile and desktop experience, a new GitHub workflow for automated environment tagging, and a broad update to the application's theme and utility classes. **Navigation and Layout Improvements:** * [`components/AppNavbar.vue`](diffhunk://#diff-f5338ad3123fd5a2307b41d35b44ef3937f97b2cda5baae203d5dc80ba75109bL2-R411): Completely redesigned the navigation bar to support a responsive side-drawer menu on mobile devices, improved accessibility (keyboard navigation, focus management, Escape key support), and enhanced user profile/logout handling for both mobile and desktop. Updated branding and navigation links for clarity and consistency. * [`components/AppLogo.vue`](diffhunk://#diff-a3b5a2eb30621c64c88a28b95b89e1365ae22a64bdf983e2e137aba7657405f7L2-R2): Updated the logo image to use the new `tdei-logo.png` for consistent branding. **Theming and Utility Enhancements:** * `assets/scss/theme.scss`, `assets/scss/main.scss`: Overhauled theme variables with new brand colors, font families, and utility classes. Added CSS variables for colors and fonts, improved autofill handling, and added utility classes for common UI elements (headers, subtitles, hints). [[1]](diffhunk://#diff-3ca8bb2feea4e836c15314e7883fb708c1fbfac9be89b932659ac5be31b80823L6-R27) [[2]](diffhunk://#diff-6e542e5567dc3568b6ef395995b5897822a3f74fa7e12afcb413bc89f4347fd3R3-R41) [[3]](diffhunk://#diff-6e542e5567dc3568b6ef395995b5897822a3f74fa7e12afcb413bc89f4347fd3R75-R81) [[4]](diffhunk://#diff-6e542e5567dc3568b6ef395995b5897822a3f74fa7e12afcb413bc89f4347fd3R102-R141) **Workflow Automation:** * [`.github/workflows/tag.yml`](diffhunk://#diff-84dff8d1094ca39c02ac0e48d951ca22f4da29c76b50ae517f5bd2d50f94c2f6R1-R42): Added a new GitHub Actions workflow to automatically update environment tags (`dev`, `stage`, `prod`) when pull requests are merged into `develop`, `staging`, or `production` branches. **Component and UI Tweaks:** * [`components/DatasetTypeRadio.vue`](diffhunk://#diff-22e341fbd37362852438041432b32c9f56118cc6a4a423e1db60c575931ebad7L12-R12): Changed dataset type radio button styles from `btn-outline-primary` to `btn-outline-secondary` for better visual consistency with the new theme. [[1]](diffhunk://#diff-22e341fbd37362852438041432b32c9f56118cc6a4a423e1db60c575931ebad7L12-R12) [[2]](diffhunk://#diff-22e341fbd37362852438041432b32c9f56118cc6a4a423e1db60c575931ebad7L23-R23) * [`components/AppSpinner.vue`](diffhunk://#diff-3e0e987214827beb4127b0ef553325bf67336549c3f44babee21a6f932bada0cL2-R5): Minor markup adjustment for improved readability and accessibility. * [`components/AppImageViewer.vue`](diffhunk://#diff-6c814aa23949b1b55654ff0e34e7e3d974a5ef891952f1a949067897bef36bb4R1-R38): Added a new wrapper component for image viewing with customizable toolbar options.
2 parents d41aec5 + f92bcf3 commit 1e89d32

56 files changed

Lines changed: 3601 additions & 2407 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/tag.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Whenever there is a pull request merged into the branches, create tag
2+
name: Update Environment Tag
3+
on:
4+
pull_request:
5+
types: [closed]
6+
branches:
7+
- develop
8+
- staging
9+
- production
10+
jobs:
11+
update-tag:
12+
if: github.event.pull_request.merged == true
13+
runs-on: ubuntu-latest
14+
permissions:
15+
contents: write
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v4
19+
with:
20+
fetch-depth: 1
21+
- name: Get the current branch name
22+
id: get_branch
23+
run: |
24+
TARGET_BRANCH="${{ github.event.pull_request.base.ref }}"
25+
26+
if [ "$TARGET_BRANCH" = "develop" ]; then
27+
echo "ENV_TAG=dev" >> $GITHUB_ENV
28+
elif [ "$TARGET_BRANCH" = "staging" ]; then
29+
echo "ENV_TAG=stage" >> $GITHUB_ENV
30+
elif [ "$TARGET_BRANCH" = "production" ]; then
31+
echo "ENV_TAG=prod" >> $GITHUB_ENV
32+
else
33+
echo "ENV_TAG=" >> $GITHUB_ENV
34+
fi
35+
- name: Force update tag
36+
if: ${{ env.ENV_TAG != '' }}
37+
run: |
38+
git config user.name "github-actions[bot]"
39+
git config user.email "github-actions[bot]@users.noreply.github.com"
40+
echo "Targeting tag: ${{ env.ENV_TAG }}"
41+
git tag -f $ENV_TAG
42+
git push origin $ENV_TAG --force

assets/img/bg_login.png

492 KB
Loading

assets/img/flex-type.svg

Lines changed: 47 additions & 0 deletions
Loading

assets/img/osw-type.svg

Lines changed: 9 additions & 0 deletions
Loading

assets/img/pathways-type.svg

Lines changed: 80 additions & 0 deletions
Loading

assets/img/tdei-logo.png

152 KB
Loading

assets/scss/main.scss

Lines changed: 75 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,44 @@
11
@import "theme.scss";
22
@import "bootstrap/scss/bootstrap.scss";
3+
4+
input:-webkit-autofill,
5+
input:-webkit-autofill:hover,
6+
input:-webkit-autofill:focus {
7+
transition: background-color 600000s, color 600000s;
8+
}
39
@import "maplibre-gl/dist/maplibre-gl.css";
410
@import "vue3-toastify/dist/index.css";
511

612
:root {
7-
--ws-create-color: $review-create-color;
8-
--ws-modify-color: $review-modify-color;
9-
--ws-delete-color: $review-delete-color;
13+
--primary-font-family: "Open Sans", sans-serif;
14+
--secondary-font-family: "Montserrat", sans-serif;
15+
--brand-accent: #{$brand-accent};
16+
--secondary-color: #{$tdei-secondary};
17+
--text-navy: #{$text-navy};
18+
--tdei-blue: #{$tdei-blue};
19+
--tdei-green: #{$tdei-green};
20+
--tdei-cyan: #{$tdei-cyan};
21+
--purple-background-light: #{$purple-background-light};
22+
--purple-background-dark: #{$purple-background-dark};
23+
--purple-background-medium: #{$purple-background-medium};
24+
--ws-create-color: #{$review-create-color};
25+
--ws-modify-color: #{$review-modify-color};
26+
--ws-delete-color: #{$review-delete-color};
1027
}
1128

1229
html, body, #__nuxt {
1330
width: 100%;
1431
height: 100%;
1532
}
1633

34+
body {
35+
margin: 0;
36+
font-family: var(--primary-font-family);
37+
-webkit-font-smoothing: antialiased;
38+
-moz-osx-font-smoothing: grayscale;
39+
min-height: 100vh;
40+
}
41+
1742
/* Vue page transitions */
1843
.fade-enter-active, .fade-leave-active,
1944
.layout-enter-active, .layout-leave-active,
@@ -47,6 +72,13 @@ label > .form-select:first-child {
4772
box-shadow: $box-shadow;
4873
}
4974

75+
.dropdown-item.active,
76+
.dropdown-item:active {
77+
color: $text-navy;
78+
text-decoration: none;
79+
background-color: $dropdown-active-bg;
80+
}
81+
5082
/* Review */
5183

5284
.bg-create {
@@ -67,3 +99,43 @@ label > .form-select:first-child {
6799
.text-delete {
68100
color: #{darken($review-delete-color, 3%)};
69101
}
102+
103+
/* TDEI Utility Classes */
104+
105+
.page-header-title {
106+
font-family: var(--secondary-font-family);
107+
font-size: 24px;
108+
font-weight: 700;
109+
margin-bottom: 5px;
110+
}
111+
112+
.page-header-subtitle {
113+
font-family: var(--secondary-font-family);
114+
font-size: 14px;
115+
color: $tdei-secondary;
116+
}
117+
118+
.tdei-bold-name {
119+
font-size: 16px;
120+
font-weight: 700;
121+
margin-bottom: 8px;
122+
}
123+
124+
.tdei-name-desc {
125+
font-size: 14px;
126+
color: $tdei-secondary;
127+
}
128+
129+
.tdei-hint-text {
130+
font-size: 14px;
131+
color: $tdei-secondary;
132+
font-style: italic;
133+
}
134+
135+
.header {
136+
display: flex;
137+
justify-content: space-between;
138+
align-items: center;
139+
padding-bottom: 20px;
140+
}
141+

assets/scss/theme.scss

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,28 @@
33
/* Bootstrap Customization */
44
$border-radius: 0.15rem;
55
$card-height: 100%;
6-
$primary: #9b0092;
6+
$primary: #32006e;
7+
$secondary: #5f647a;
8+
$btn-font-weight: 600;
79

810
@import "bootstrap/scss/functions";
911
@import "bootstrap/scss/variables";
1012
@import "bootstrap/scss/mixins";
1113

1214
$navbar-height: 58px;
1315

16+
// TDEI brand colors
17+
$brand-accent: #4b2e83;
18+
$tdei-secondary: $secondary;
19+
$tdei-blue: #586ab5;
20+
$tdei-green: #479fa1;
21+
$tdei-cyan: #59c3c8;
22+
$purple-background-light: #f4f0fb;
23+
$purple-background-dark: #ddd2ee;
24+
$purple-background-medium: #ebe4f6;
25+
$text-navy: #2f3661;
26+
$dropdown-active-bg: #e2f0f8;
27+
1428
$review-create-color: #39dbc0;
1529
$review-modify-color: #db950a;
1630
$review-delete-color: #cc2c47;

0 commit comments

Comments
 (0)