Skip to content
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.

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

Stage -> main Oct 29th #271

Merged
merged 20 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
117e72f
[MWPW-159826] Check image type based on binary starting signatures (#…
qiyundai Oct 3, 2024
f3c6244
Expect ESL error format difference (#249)
qiyundai Oct 4, 2024
30b7152
[MWPW-160113] Prevent invalid input caused by leading / trailing spac…
qiyundai Oct 9, 2024
c5ffcef
updated error handling for venue component (#248)
qiyundai Oct 9, 2024
e2fc768
[MWPW-159557] Prompt SUSI for logged out users before showing them th…
qiyundai Oct 9, 2024
ce8c55f
Update esp-controller.js (#257)
qiyundai Oct 15, 2024
0dfff85
Revert "Update esp-controller.js (#257)" (#258)
qiyundai Oct 16, 2024
65a821e
Merge pull request #259 from adobecom/dev
apganapa-adobe Oct 19, 2024
8bcb543
[MWPW-158803] Attendee Console 1.5 (#255)
qiyundai Oct 21, 2024
360db51
[MWPW-160113] Patch#1 - Add email type to hostEmail input (#251)
qiyundai Oct 21, 2024
9c3a8a8
[MWPW-160285] Endpoint Mapping Update + branch sync job (#253)
qiyundai Oct 21, 2024
3953e9d
linting
qiyundai Oct 21, 2024
bef3aca
[MWPW-160931] Don't save unfinished agenda (#260)
qiyundai Oct 23, 2024
4142ce8
[MWPW-160481] Allow RSVP description unsetting (#262)
qiyundai Oct 23, 2024
f14c287
[MISC.] Update sync-branches.yml (#261)
qiyundai Oct 23, 2024
327fedc
Update esp-controller.js
qiyundai Oct 23, 2024
5f05d35
Merge pull request #263 from adobecom/security-update-2
qiyundai Oct 23, 2024
7054655
Fixing RSVP status column (#264)
qiyundai Oct 23, 2024
ffda0d0
Adding request-id header to ECC (#265)
qiyundai Oct 24, 2024
b276ef9
Merge pull request #267 from adobecom/dev
rayyank10 Oct 24, 2024
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
81 changes: 81 additions & 0 deletions .github/workflows/sync-branches.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
name: Sync 02 branches

on:
push:
branches:
- dev
- stage
- main

jobs:
sync-dev02:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/dev'
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Git
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"

- name: Fetch all branches
run: git fetch --all

- name: Check out dev02 branch
run: git checkout dev02

- name: Merge dev into dev02 with theirs strategy
run: git merge origin/dev --strategy-option theirs --allow-unrelated-histories

- name: Push changes to dev02
run: git push origin dev02

sync-stage02:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/stage'
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Git
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"

- name: Fetch all branches
run: git fetch --all

- name: Check out stage02 branch
run: git checkout stage02

- name: Merge stage into stage02 with theirs strategy
run: git merge origin/stage --strategy-option theirs --allow-unrelated-histories

- name: Push changes to stage02
run: git push origin stage02

sync-main02:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/main'
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Git
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"

- name: Fetch all branches
run: git fetch --all

- name: Check out main02 branch
run: git checkout main02

- name: Merge main into main02 with theirs strategy
run: git merge origin/main --strategy-option theirs --allow-unrelated-histories

- name: Push changes to main02
run: git push origin main02
142 changes: 114 additions & 28 deletions ecc/blocks/attendee-management-table/attendee-management-table.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
.attendee-management-table {
font-family: var(--body-font-family);
padding: 40px;
max-width: 1440px;
padding: 0 40px 40px;
margin: auto;

--color-red: #EB1000;
--table-col-width: 120px;
--table-col-padding: 16px;
}

.attendee-management-table .loading-screen {
Expand All @@ -22,10 +27,82 @@
font-size: var(--type-body-s-size);
}

.attendee-management-table .dashboard-main-container {
.attendee-management-table .dashboard-header-heading {
display: flex;
align-items: center;
gap: 8px;
}

.attendee-management-table .dashboard-header-heading sp-action-button {
padding: 0;
background: none;
border: none;
cursor: help;
}

.attendee-management-table .dashboard-main-container .dashboard-body-container {
margin-top: 24px;
display: flex;
gap: 24px;
gap: 2rem;
}

.attendee-management-table .dashboard-header-event-info {
display: flex;
align-items: center;
gap: 2rem;
}

.attendee-management-table .event-info-container {
width: 100%;
}

.attendee-management-table .dashboard-main-container .event-image {
max-height: 167px;
max-width: 224px;
}

.attendee-management-table .dashboard-main-container .event-info-row {
display: flex;
justify-content: flex-start;
gap: 25%;
border-bottom: 1px solid var(--color-gray-500);
}

.attendee-management-table .dashboard-main-container .event-info-label {
font-weight: 700;
margin-right: 1rem;
}

.attendee-management-table .dashboard-main-container .event-stats-col-wrapper {
display: flex;
align-items: flex-start;
}

.attendee-management-table .dashboard-main-container .event-stats-row {
height: 64px;
display: flex;
align-items: center;
justify-content: flex-start;
gap: 25%;
margin-top: 1rem;
}

.attendee-management-table .dashboard-main-container .event-stats-label {
margin: 0;
margin-right: 1rem;
color: var(--color-gray-500)
}

.attendee-management-table .dashboard-main-container .event-stats-value {
font-size: var(--type-heading-xl-size);
font-weight: 700;
color: var(--color-red);
margin: 0;
}

.attendee-management-table .dashboard-main-container .event-stats-subtext {
font-size: var(--type-body-xxs-size);
margin: 0;
}

.attendee-management-table .dashboard-main-container .dashboard-side-panel {
Expand Down Expand Up @@ -64,15 +141,8 @@
margin: 16px 0;
}

.attendee-management-table .dashboard-header {
display: flex;
flex-direction: column;
gap: 16px;
justify-content: space-between;
align-items: flex-start;
}

.attendee-management-table .dashboard-table-container {
width: 100%;
max-width: calc(100% - 250px);
position: relative;
}
Expand Down Expand Up @@ -159,10 +229,6 @@
gap: 16px;
}

.attendee-management-table .dashboard-header-text h1 {
margin: 0;
}

.attendee-management-table .dashboard-header-text p {
margin: 6px 0;
}
Expand All @@ -171,6 +237,11 @@
display: flex;
align-items: center;
gap: 16px;
justify-content: flex-end;
}

.attendee-management-table.no-results .dashboard-actions-container {
visibility: hidden;
}

.attendee-management-table .dashboard-actions-container .search-input-wrapper {
Expand Down Expand Up @@ -205,20 +276,44 @@
}

.attendee-management-table table .table-header-row {
height: 40;
height: 56px;
border-bottom: 2px solid var(--color-gray-600);
}

.attendee-management-table.no-results table .table-header-row {
display: none;
}

.attendee-management-table table .table-header-row th {
padding: 0 16px;
padding: 0 var(--table-col-padding);
font-weight: 700;
text-align: left;
font-size: var(--type-body-xxs-size);
color: var(--spectrum-color-gray-500);
width: 100px;
width: var(--table-col-width);
white-space: nowrap;
}

.attendee-management-table table .table-header-row th.sticky-right-1,
.attendee-management-table table .attendee-row td.sticky-right-1 {
position: sticky;
right: 0;
background-color: var(--color-gray-100);
max-width: var(--table-col-width);
min-width: var(--table-col-width);
z-index: 1;
}

.attendee-management-table table .table-header-row th.sticky-right-2,
.attendee-management-table table .attendee-row td.sticky-right-2 {
position: sticky;
right: calc(var(--table-col-width) + (var(--table-col-padding) * 2));
background-color: var(--color-gray-100);
max-width: var(--table-col-width);
min-width: var(--table-col-width);
z-index: 1;
}

.attendee-management-table table .table-header-row th span {
white-space: nowrap;
width: 60px;
Expand Down Expand Up @@ -249,17 +344,14 @@

.attendee-management-table table .attendee-row {
height: 40px;
border-bottom: 1px solid var(--color-gray-200);
}

.attendee-management-table table .no-search-results-row td {
padding: 40px 0;
text-align: center;
}

.attendee-management-table table .attendee-row:nth-of-type(even) {
background-color: var(--color-gray-100);
}

.attendee-management-table table .attendee-row .attendee-title-link {
font-weight: 700;
text-decoration: none;
Expand Down Expand Up @@ -351,9 +443,3 @@
gap: 16px;
z-index: 9;
}

@media screen and (min-width: 900px) {
.attendee-management-table .dashboard-header {
flex-direction: row;
}
}
Loading
Loading