Skip to content

Add company name #167

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

Merged
merged 4 commits into from
Sep 10, 2018
Merged

Add company name #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b77a099
160 add companyName to configuration options
Aug 20, 2018
f918493
Merge pull request #161 from SupahNickie/160-company-name-field
SupahNickie Aug 29, 2018
fed91b5
Merge branch 'release'
Sep 10, 2018
b5d7ad8
Merge branch 'candidate' into master
SupahNickie Sep 10, 2018
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
12 changes: 12 additions & 0 deletions spec/configuration.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,16 @@ describe('different configurations', () => {
});
});

describe('Company Name', () => {
beforeEach(() => {
browser.get("/e2e/company_name.html");
browser.sleep(300);
});

it('title contains the company name specified in the config', () => {
const el = element.all(by.css('[class^=intro_title]')).first();
expect(el.getText()).toContain("Roadrunner and Coyote Enterprises");
});
});

});
4 changes: 3 additions & 1 deletion src/components/popup/intro/intro.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ export default class Intro extends Component {
}
<div class={style.title + " primaryText"}>
<LocalLabel providedValue={localization && localization.intro ? localization.intro.title : ''} localizeKey='title'>Thanks for visiting </LocalLabel>
<LocalLabel providedValue={localization && localization.intro ? localization.intro.domain : ''} localizeKey='domain'></LocalLabel>
{config && config.companyName &&
<span>{config.companyName}</span>
}
</div>
<div class={style.description + " primaryText"}>
<LocalLabel providedValue={localization && localization.intro ? localization.intro.description : ''} localizeKey='description'>Ads help us run this site. When you use our site selected companies may access and use information on your device for various purposes including to serve relevant ads or personalised content.</LocalLabel>
Expand Down
4 changes: 3 additions & 1 deletion src/components/popup/intro/introV2.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ export default class IntroV2 extends Component {
}
<div class={config.logoUrl ? style.title + " " + style.imagePadding : style.title}>
<LocalLabel providedValue={localization && localization.intro ? localization.intro.title : ''} localizeKey='title'>Thanks for visiting </LocalLabel>
<LocalLabel providedValue={localization && localization.intro ? localization.intro.domain : ''} localizeKey='domain'></LocalLabel>
{config && config.companyName &&
<span>{config.companyName}</span>
}
</div>
</div>
<div class={style.description + " primaryText"}>
Expand Down
61 changes: 61 additions & 0 deletions src/e2e/company_name.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>GDPR Documentation</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimal-ui">
<meta name="apple-mobile-web-app-capable" content="yes">
<script>
(function(window) {
window.__cmp = (function() {
window.addEventListener('message', function(event) {
window.__cmp.receiveMessage(event);
});

var commandQueue = [];
var cmp = function(command, parameter, callback) {
commandQueue.push({
command: command,
parameter: parameter,
callback: callback
});
};
cmp.commandQueue = commandQueue;
cmp.receiveMessage = function(event) {
var data = event && event.data && event.data.__cmpCall;
if (data) {
commandQueue.push({
callId: data.callId,
command: data.command,
parameter: data.parameter,
event: event
});
}
};
cmp.config = {
companyName: "Roadrunner and Coyote Enterprises",
customPurposeListLocation: '../../docs/purposes.json',
globalVendorListLocation: '../../docs/vendors.json',
globalConsentLocation: '../../docs/portal.html',
storeConsentGlobally: false,
storePublisherConsentGlobally: false,
storePublisherData: true,
logging: "debug",
blockBrowsing: false,
forceLocale: 'en',
testingMode: 'always show',
showFooterAfterSubmit: true,
};
return cmp;
}());
})(window);

window.__cmp('renderCmpIfNeeded');
</script>
</head>
<body>
<a href="#">Some Link</a>
<div><p>Some Text</p></div>
<script type="text/javascript" src="../../cmp.bundle.js"></script></body>
</body>
</html>
1 change: 1 addition & 0 deletions src/lib/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import log from './log';
const metadata = require('../../metadata.json');
const defaultConfig = {
companyName: null,
storePublisherData: true,
customPurposeListLocation: null,
storeConsentGlobally: true,
Expand Down
5 changes: 5 additions & 0 deletions webpack.config.babel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,11 @@ module.exports = [
template: 'e2e/layout-thin.html',
chunks: ['e2e']
}),
new HtmlWebpackPlugin({
filename: 'e2e/company_name.html',
template: 'e2e/company_name.html',
chunks: ['e2e']
}),
// Static assets copy
new CopyWebpackPlugin([
{ from: './geoip.json' }
Expand Down