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

Jump to bottom

current view #735

Merged
merged 16 commits into from
Jul 24, 2023
Merged

current view #735

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fa75169
removed tutorial button
emre2038 Jun 26, 2023
0b1611d
adding tutorial react component
emre2038 Jun 26, 2023
8795873
tutorial button positioning
emre2038 Jun 27, 2023
c842374
positioning tutorial button if feedback button is hidden
emre2038 Jul 3, 2023
4e128e5
working on dropdown
emre2038 Jul 3, 2023
b00863b
Merge branch 'staging' into current-view
emre2038 Jul 6, 2023
f7fa4f2
view selection dropdown
emre2038 Jul 7, 2023
d9f9570
fixed default
emre2038 Jul 7, 2023
fe53c3e
fixed a bug
emre2038 Jul 10, 2023
777a864
Merge branch 'staging' into current-view
goyal1092 Jul 19, 2023
c8d2446
Updated css of tutorial button
goyal1092 Jul 19, 2023
8e5cdf2
fixed tutorial button css & failing automated test
emre2038 Jul 20, 2023
0594899
fixed e2e test
emre2038 Jul 20, 2023
109522e
fixed e2e test js
emre2038 Jul 21, 2023
730a395
fixed a bug and used the url key
emre2038 Jul 24, 2023
46a89e5
Merge branch 'staging' into current-view
goyal1092 Jul 24, 2023
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 __tests__/elements/tutorial.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import html from '../../src/index.html';
import {Tutorial} from '../../src/js/elements/tutorial';
import {Tutorial} from '../../src/js/elements/tutorial/tutorial';
import {Component} from "../../src/js/utils";

describe('Tutorials', () => {
Expand Down
4 changes: 4 additions & 0 deletions __tests__/gui/data_whitelist.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Feature: Data Whitelist
Given I am on the Wazimap Homepage
Then I wait until map is ready

Then I confirm that the view dropdown displays "Default"

# Choropleth default filter
When I expand Data Mapper
And I click on "Demographics" in Data Mapper
Expand All @@ -26,6 +28,8 @@ Feature: Data Whitelist
Given I am on the Wazimap Homepage Test View
Then I wait until map is ready

Then I confirm that the view dropdown displays "test"

# Choropleth default filter
When I expand Data Mapper
And I click on "Demographics" in Data Mapper
Expand Down
4 changes: 4 additions & 0 deletions __tests__/gui/data_whitelist/data_whitelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,7 @@ Given('I am on the Wazimap Homepage Test View', () => {
setupInterceptions(profiles, all_details, profile, themes, {}, [], profile_indicator_summary, profile_indicator_data);
cy.visit("/?view=test");
})

Then(/^I confirm that the view dropdown displays "([^"]*)"$/, function (word) {
cy.get('.current-view-container').should('contain.text', word)
});
6 changes: 2 additions & 4 deletions src/401.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html><!-- This site was created in Webflow. https://www.webflow.com -->
<!-- Last Published: Fri Mar 17 2023 07:30:57 GMT+0000 (Coordinated Universal Time) -->
<!-- Last Published: Mon Jun 26 2023 14:15:13 GMT+0000 (Coordinated Universal Time) -->
<html data-wf-page="63918cd6b8bb216e9bd9ea6f" data-wf-site="5fd05e808ba6609d12285571">
<head>
<meta charset="utf-8">
Expand All @@ -15,7 +15,6 @@
<link href="https://fonts.gstatic.com" rel="preconnect" crossorigin="anonymous">
<script src="https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js" type="text/javascript"></script>
<script type="text/javascript">WebFont.load({ google: { families: ["Inconsolata:400,700","Roboto:300,regular,italic,500,500italic,700,900"] }});</script>
<!-- [if lt IE 9]><script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js" type="text/javascript"></script><![endif] -->
<script type="text/javascript">!function(o,c){var n=c.documentElement,t=" w-mod-";n.className+=t+"js",("ontouchstart"in o||o.DocumentTouch&&c instanceof DocumentTouch)&&(n.className+=t+"touch")}(window,document);</script>
<link href="images/favicon.png" rel="shortcut icon" type="image/x-icon">
<link href="images/webclip.png" rel="apple-touch-icon">
Expand All @@ -24,7 +23,7 @@
<body>
<div class="utility-page-wrap">
<div class="utility-page-content w-password-page w-form">
<form action="/.wf_auth" method="post" id="email-form" name="email-form" data-name="Email Form" class="utility-page-form w-password-page"><img src="https://d3e54v103j8qbb.cloudfront.net/static/password-page-lock.832ca8e2c9.svg" alt="">
<form action="/.wf_auth" method="post" id="email-form" name="email-form" data-name="Email Form" class="utility-page-form w-password-page" data-wf-page-id="63918cd6b8bb216e9bd9ea6f" data-wf-element-id="5eb26ca21471fffe18bb29f700000000000c"><img src="https://d3e54v103j8qbb.cloudfront.net/static/password-page-lock.832ca8e2c9.svg" alt="">
<h2>Protected Page</h2><input type="password" class="w-password-page w-input" autofocus="true" maxlength="256" name="pass" data-name="field" placeholder="Enter your password" id="field"><input type="submit" value="Submit" data-wait="Please wait..." class="w-password-page w-button">
<div class="w-password-page w-form-fail">
<div>Incorrect password. Please try again.</div>
Expand All @@ -42,6 +41,5 @@ <h2>Protected Page</h2><input type="password" class="w-password-page w-input" au
</div>
<script src="https://d3e54v103j8qbb.cloudfront.net/js/jquery-3.5.1.min.dc5e7f18c8.js?site=5fd05e808ba6609d12285571" type="text/javascript" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
<script src="js/webflow.js" type="text/javascript"></script>
<!-- [if lte IE 9]><script src="https://cdnjs.cloudflare.com/ajax/libs/placeholders/3.0.2/placeholders.min.js"></script><![endif] -->
</body>
</html>
6 changes: 2 additions & 4 deletions src/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html><!-- This site was created in Webflow. https://www.webflow.com -->
<!-- Last Published: Fri Mar 17 2023 07:30:57 GMT+0000 (Coordinated Universal Time) -->
<!-- Last Published: Mon Jun 26 2023 14:15:13 GMT+0000 (Coordinated Universal Time) -->
<html data-wf-page="63918cd6b8bb215095d9ea7e" data-wf-site="5fd05e808ba6609d12285571">
<head>
<meta charset="utf-8">
Expand All @@ -15,7 +15,6 @@
<link href="https://fonts.gstatic.com" rel="preconnect" crossorigin="anonymous">
<script src="https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js" type="text/javascript"></script>
<script type="text/javascript">WebFont.load({ google: { families: ["Inconsolata:400,700","Roboto:300,regular,italic,500,500italic,700,900"] }});</script>
<!-- [if lt IE 9]><script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js" type="text/javascript"></script><![endif] -->
<script type="text/javascript">!function(o,c){var n=c.documentElement,t=" w-mod-";n.className+=t+"js",("ontouchstart"in o||o.DocumentTouch&&c instanceof DocumentTouch)&&(n.className+=t+"touch")}(window,document);</script>
<link href="images/favicon.png" rel="shortcut icon" type="image/x-icon">
<link href="images/webclip.png" rel="apple-touch-icon">
Expand All @@ -32,7 +31,7 @@
<div id="w-node-f25982b9-693e-74dc-9a2f-7590f031f5c3-95d9ea7e" class="nav__content_search hidden">
<div class="nav__search_input">
<div data-w-id="f25982b9-693e-74dc-9a2f-7590f031f5c5" class="search__input w-form">
<form id="email-form" name="email-form" data-name="Email Form" method="post" class="form"><input type="text" class="location__search_input w-input" autocomplete="off" maxlength="256" name="Location" data-name="Location" placeholder="Search for a location..." id="Location">
<form id="email-form" name="email-form" data-name="Email Form" method="post" class="form" data-wf-page-id="63918cd6b8bb215095d9ea7e" data-wf-element-id="f25982b9-693e-74dc-9a2f-7590f031f5c6"><input type="text" class="location__search_input w-input" autocomplete="off" maxlength="256" name="Location" data-name="Location" placeholder="Search for a location..." id="Location">
<div class="location__search_loading hidden"><img src="images/loading.gif" alt=""></div>
</form>
<div class="w-form-done">
Expand Down Expand Up @@ -161,6 +160,5 @@ <h4>How to customize formatting for each rich text</h4>
</div>
<script src="https://d3e54v103j8qbb.cloudfront.net/js/jquery-3.5.1.min.dc5e7f18c8.js?site=5fd05e808ba6609d12285571" type="text/javascript" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
<script src="js/webflow.js" type="text/javascript"></script>
<!-- [if lte IE 9]><script src="https://cdnjs.cloudflare.com/ajax/libs/placeholders/3.0.2/placeholders.min.js"></script><![endif] -->
</body>
</html>
Loading
Loading