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.

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

Link to NewDot concierge from HelpDot #10416

Merged
merged 23 commits into from
Aug 24, 2022
Merged

Link to NewDot concierge from HelpDot #10416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b12d103
Create sass mixin for card-border
roryabraham Aug 17, 2022
563d997
Create liquid constants file
roryabraham Aug 17, 2022
fd21066
Add help card to default layout
roryabraham Aug 17, 2022
f58744c
Implement floating concierge button in LHN
roryabraham Aug 17, 2022
2f72ad0
Implement concierge utility route
roryabraham Aug 17, 2022
395c506
Use localhost:8080 not new.expensify.com.dev
roryabraham Aug 17, 2022
93762a8
Open concierge chat in new tab
roryabraham Aug 17, 2022
9bc81f1
Make floating concierge button work on mobile
roryabraham Aug 17, 2022
66773e3
Fix borderWidth in mixin
roryabraham Aug 17, 2022
67cb42c
Fix off-by-one error in media query
roryabraham Aug 17, 2022
7400f43
Make cards more responsive
roryabraham Aug 19, 2022
0c6c00d
Create constant for concierge URL
roryabraham Aug 19, 2022
831bed6
Use h3 and p instead of just divs
roryabraham Aug 19, 2022
96f61a8
Alphabetical order colors
roryabraham Aug 19, 2022
312fc35
Move mixins to separate partial
roryabraham Aug 19, 2022
b39915b
Get rid of unnecessary breakpoint
roryabraham Aug 19, 2022
c267c3a
Make mixins for breakpoints
roryabraham Aug 19, 2022
ef99706
Fix concierge icon in LHN
roryabraham Aug 19, 2022
a09d198
Fix LHN height
roryabraham Aug 19, 2022
e70d2e6
Fix LHN display
roryabraham Aug 19, 2022
ac14bb8
Merge branch 'main' into Rory-HelpDotConcierge
roryabraham Aug 19, 2022
e781fad
Use icon class instead of id
roryabraham Aug 19, 2022
ab1f839
Use title class instead of just h3
roryabraham Aug 19, 2022
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 docs/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
lhn_content: '404'
---
<div class="centered-content with-lhn">
<img id="icon" src="/assets/images/circle-hourglass.svg" />
<img class="icon" src="/assets/images/circle-hourglass.svg" />
<strong>Hmm it's not here...</strong>
<div>That page is nowhere to be found.</div>
</div>
6 changes: 3 additions & 3 deletions docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ There are 3 main components in the hub page: 1. Stage title, 2. Row of Card butt

<a class="card" href="/articles/request-money/SmartScan">
<div class="body">
<div class="title">SmartScan</div>
<h3 class="title">SmartScan</h3>
</div>
<div class="right-icon">
<i class="fa-solid fa-angle-right icon"></i>
Expand All @@ -79,7 +79,7 @@ There are 3 main components in the hub page: 1. Stage title, 2. Row of Card butt

<a class="card" href="/articles/request-money/AnotherArticle">
<div class="body">
<div class="title">Another Article</div>
<h3 class="title">Another Article</h3>
</div>
<div class="right-icon">
<i class="fa-solid fa-angle-right icon"></i>
Expand Down Expand Up @@ -121,7 +121,7 @@ In order to add a new Card button in the respective hub page ([send-money/index.
```html
<a class="card" href="/articles/request-money/SmartScan">
<div class="body">
<div class="title">SmartScan</div>
<h3 class="title">SmartScan</h3>
</div>
<div class="right-icon">
<i class="fa-solid fa-angle-right icon"></i>
Expand Down
7 changes: 7 additions & 0 deletions docs/_includes/CONST.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{% if jekyll.environment == "production" %}
{% assign MAIN_SITE_URL = "https://new.expensify.com" %}
{% else %}
{% assign MAIN_SITE_URL = "http://localhost:8080" %}
{% endif %}

{% capture CONCIERGE_CHAT_URL %}{{MAIN_SITE_URL}}/concierge{% endcapture %}
3 changes: 3 additions & 0 deletions docs/_includes/floating-concierge-button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<a id="{{ include.id }}" class="floating-concierge-button" href="{{ CONCIERGE_CHAT_URL }}" target="_blank">
<img src="/assets/images/concierge-avatar.svg" alt="Chat with concierge" />
</a>
20 changes: 13 additions & 7 deletions docs/_layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<!doctype html>
<html>

{% include CONST.html %}

<head>
<meta charset="utf-8">
<title>Expensify Help</title>
Expand Down Expand Up @@ -53,10 +55,8 @@
</div>


<!-- Concierge button anchored at the bottom of the LHN-->
<div class="floating-concierge-button">
<!-- Floating button content -->
</div>
<!-- Concierge button anchored at the bottom of the LHN (rendered on wider screens) -->
{% include floating-concierge-button.html id="floating-concierge-button-lhn" %}
</div>

<div id="content-area">
Expand All @@ -73,9 +73,15 @@ <h1 class="title">
</div>

<!-- Concierge button at the bottom of the page -->
<div class="footer-concierge-button">
<!-- Footer button content -->
</div>
<a class="card get-help" href="{{ CONCIERGE_CHAT_URL }}" target="_blank">
<div class="body">
<h3 class="title">Didn't find what you were looking for?</h3>
<p class="description">Concierge is here to answer all your questions.</p>
</div>
<div class="submit-button">
<button class="success">Send a message</button>
</div>
</a>
</div>
{% endif %}

Expand Down
9 changes: 9 additions & 0 deletions docs/_sass/_breakpoints.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
$breakpoint-tablet: 800px;
$breakpoint-desktop: 1120px;
$breakpoint-wide: 1600px;

@mixin breakpoint($breakpoint) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

@media screen and (min-width: $breakpoint) {
@content
}
}
3 changes: 2 additions & 1 deletion docs/_sass/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ $color-dark: #0B1B34;
$color-gray1: #FAFAFA;
$color-gray2: #ECECEC;
$color-gray3: #C6C9CA;
$color-white: #FFFFFF;
$color-green: #07d973;
$color-pink: #F68DFE;
$color-white: #FFFFFF;
Loading