Skip to content

Commit

Permalink
Merge pull request #743 from OpenUpSA/staging
Browse files Browse the repository at this point in the history 
merging current view into master
  • Loading branch information
@emre2038
emre2038 authored Jul 25, 2023
2 parents 74326dc + 08f7d4e commit d4bf545
Show file tree
Hide file tree
Showing 24 changed files with 3,000 additions and 6,477 deletions.
1 change: 1 addition & 0 deletions __tests__/e2e/tutorial.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Feature: Tutorial (?)
Scenario: Verify the sandbox information is displayed
# Enter steps here
Given I am on the Wazimap Homepage
Then I wait until map is ready
When I click on Tutorial
Then "Introduction:" should be displayed
And I click on Next
Expand Down
5 changes: 5 additions & 0 deletions __tests__/e2e/tutorial/Wazimap.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import { When, Given, Then } from "cypress-cucumber-preprocessor/steps";
import {waitUntilGeographyIsLoaded} from "../../gui/common_cy_functions/general";

Given('I am on the Wazimap Homepage', () => {
cy.visit("/")
})

Then('I wait until map is ready', () => {
waitUntilGeographyIsLoaded('South Africa');
})

When("I click on {word}", (link) => {
cy.findByText(link).click()
})
Expand Down
2 changes: 1 addition & 1 deletion __tests__/elements/tutorial.js
View file
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
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 @@ -27,6 +29,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
6 changes: 5 additions & 1 deletion __tests__/gui/data_whitelist/data_whitelist.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,14 @@ Given('I am on the Wazimap Homepage Test View', () => {
cy.visit("/?view=test");
})

Then(/^I confirm that the view dropdown displays "([^"]*)"$/, function (word) {
cy.get('.current-view-container').should('contain.text', word)
})

When(/^I confirm that available subindicators are "([^"]*)" in Data Mapper$/, function (options) {
let optionsArr = options.split(',');
cy.get('.data-mapper').find('.subIndicator-item').should('have.length', optionsArr.length)
cy.get('.subIndicator-item').each(($div, index) => {
expect($div.text()).equal(optionsArr[index]);
})
});
})
6 changes: 2 additions & 4 deletions src/401.html
View file
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
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

2 comments on commit d4bf545

@vercel
Copy link

@vercel vercel bot commented on d4bf545 Jul 25, 2023

Choose a reason for hiding this comment

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

Successfully deployed to the following URLs:

wazimap-ng-ui – ./

wazimap-ng-ui-git-master-openup.vercel.app
wazimap-ng-ui-openup.vercel.app
wazimap-ng-ui.vercel.app

@vercel
Copy link

@vercel vercel bot commented on d4bf545 Jul 25, 2023

Choose a reason for hiding this comment

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

Successfully deployed to the following URLs:

wazimap-ng-ui-express – ./

wazimap-ng-ui-express.vercel.app
wazimap-ng-ui-express-openup.vercel.app
wazimap-ng-ui-express-git-master-openup.vercel.app

Please sign in to comment.