From f5837913215a16672ee7a03d0d83d7aa93dc09f3 Mon Sep 17 00:00:00 2001 From: Gene Jones Date: Thu, 18 Jan 2018 21:06:13 -0700 Subject: [PATCH] visual fixes to footer, other fixes. Console.log plug for me looking for work. The footer is always at the bottom of the page with a small gap between it now. The footer is more visually distinct as well. Introduced cards to do the features area. Changes to code which align the rest of the codebase with the seperation of excel helpers. Fully functional and ready to merge back into the primary project. --- .gitignore | 1 + client-handler.js | 19 +-- custom.css | 45 +++--- essentials-setup.js | 2 +- excel-handler.js | 15 +- export.html | 309 ++++++++++++++++++++++------------------- index.html | 95 +++++++------ package.json | 7 +- select_rsid.handlebars | 16 ++- sitemap.xml | 8 +- 10 files changed, 271 insertions(+), 246 deletions(-) diff --git a/.gitignore b/.gitignore index fec724a..61edc7e 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ adobe-export.js #ignore jest test stuff jest_0/ +assets/js/essentials.js diff --git a/client-handler.js b/client-handler.js index 1f452b1..4357622 100644 --- a/client-handler.js +++ b/client-handler.js @@ -19,6 +19,9 @@ omnibus.request = request; omnibus.excel = excel; window.omnibus = omnibus; +console.log("Welcome to this site. I hope you find it useful. If you do, I'm currently looking for work.\r\nEmail me at iam@genejon.es with any opportunities"); +console.log("Please also visit the Github for this page if you can think of anyway to improve it. https://github.com/genejones/reportsuites.com"); + var processInitialOptions = function () { window.fileName = jQuery('input#filename').val() + '.xlsx'; window.username = jQuery('input#adobe-username').val(); @@ -33,7 +36,7 @@ jQuery('#action-initial').click(processInitialOptions); var getNewAuthToken = function () { var token = wsse({ username: window.username, password: window.pass }); currentTokenWSSE = token.getWSSEHeader({ nonceBase64: true }); - console.debug(currentTokenWSSE); + console.info(currentTokenWSSE); }; var getHeaders = function () { getNewAuthToken(); @@ -105,8 +108,8 @@ var handleUserSelectionOfRSID = function (event) { } } window.adobe_vars.selected_report_suites = window.selected_report_suites; - formData = constructRequestBodyRSID(listOfSelectedRSID); - console.debug(formData); + let formData = constructRequestBodyRSID(listOfSelectedRSID); + console.info(formData); //update the ui displayProgressBar(); getListOfEvars(formData); @@ -161,7 +164,7 @@ var determineAnalyticsInformation = function (adobeVar) { 'rsSelected': analytics.selectedReportSuites }); //GA may use the Company/User unique hash as an user identifier in the future - console.debug(report_suites); + console.info(report_suites); }; var getListOfEvars = function (form) { displayProgress(15, "Fetching evars"); @@ -174,7 +177,7 @@ var getListOfEvars = function (form) { if (!err) { var evarsRaw = body; window.adobe_vars.evars = JSON.parse(evarsRaw); - console.debug("succesfully got eVars"); + console.info("succesfully got eVars"); getListOfProps(form); } else { @@ -196,7 +199,7 @@ var getListOfProps = function (form) { if (!err) { var propsRaw = body; window.adobe_vars.props = JSON.parse(propsRaw); - console.debug("successfully got props"); + console.info("successfully got props"); getListOfEvents(form); } else { @@ -208,11 +211,11 @@ var getListOfProps = function (form) { }; var handleExcelSuccess = function (input) { if (input === true) { - displayProgress(100, "Excel export complete"); + displayProgress(100, "Excel export complete. Reload page to export again."); window.dataLayer.push({ 'event': 'export-complete', 'fileSize': window.analytics.fileSize }); jQuery('#progress-view div').removeClass("progress-bar-info progress-bar-striped active"); jQuery('#progress-view div').addClass("progress-bar-success"); - jQuery('.jumbotron .display-3').text("All done"); + jQuery('.jumbotron .display-5').text("All done"); } else { console.error(input); diff --git a/custom.css b/custom.css index fc72350..1265f0f 100644 --- a/custom.css +++ b/custom.css @@ -1,27 +1,10 @@ /* Space out content a bit */ body { - padding-top: 1.5rem; - padding-bottom: 1.5rem; + display:flex; + min-height: 100vh; + flex-direction: column; } -/* -h1 { - font-family: 'Allerta', Helvetica, Arial, sans-serif; - font-size: 50px!important; - line-height: 55px!important; -} - -h3 { - font-family: 'Allerta', Helvetica, Arial, sans-serif; -} - -p { - font-family: 'Crimson Text', Georgia, Times, serif; - font-size: 16px; - line-height: 25px; -} -*/ - /* Everything but the jumbotron gets side spacing for mobile first views */ .header, .footer { @@ -40,23 +23,27 @@ form #rsid-selection { float: left; } +.content-container{ + flex: 1; + padding-bottom: 1rem; +} + /* Custom page header */ .header { padding-bottom: 1rem; border-bottom: .05rem solid #e5e5e5; } -/* Make the masthead heading the same height as the navigation */ -.header h3 { - margin-top: 0; - margin-bottom: 0; - line-height: 3rem; -} /* Custom page footer */ .footer { - padding-top: 1.5rem; - color: #777; - border-top: .05rem solid #e5e5e5; + padding-top: 0.2rem; + color: #e9ecef; + background-color: #666; + border-color: #666; +} + +.footer a, .footer strong { + color: #e5e5e5; } /* Customize container */ diff --git a/essentials-setup.js b/essentials-setup.js index b024d02..39c0905 100644 --- a/essentials-setup.js +++ b/essentials-setup.js @@ -1,3 +1,3 @@ window.jQuery = require('jquery'); window.$ = jQuery; -var bootstrap = require('./assets/bootstrap/js/bootstrap.js'); \ No newline at end of file +var bootstrap = require('bootstrap'); \ No newline at end of file diff --git a/excel-handler.js b/excel-handler.js index 0975714..8fcd284 100644 --- a/excel-handler.js +++ b/excel-handler.js @@ -50,15 +50,14 @@ function createSummarySheet(wb, report_suites, allAvailableReportSuites){ } } - var sheetToPopulate = excelHelpers.makeNewSheet(wb, array, "Summary"); - var ws = excelHelpers.populate_sheet_from_array_of_arrays(sheetToPopulate, array); - fileSummaryStyling(sheets.Summary); - return ws; + var sheet = excelHelpers.makeNewSheet(wb, array, "Summary", true); + console.log(sheet); + fileSummaryStyling(sheet); + return sheet; } -function fileSummaryStyling(worksheetObj){ - excelHelpers.applyStylesToTheWholeSheet(worksheetObj, styles['grey-navy']); - let ws = worksheetObj.sheet; +function fileSummaryStyling(ws){ + excelHelpers.applyStylesToTheWholeSheet(ws, styles['grey-navy']); ws.width(1, 38); //set the first column to be wider ws.width(2, 30); ws.width(3, 30); @@ -79,7 +78,7 @@ var createOverviewOfSlot = function(report_suites, inputNVP, slotName, workbook) var allKeys = []; //create a global list of keys for comparison for (let i=0; i - + + - - @@ -44,7 +43,9 @@ })(window,document,'script','dataLayer','GTM-NG5QWXV'); - + + + @@ -56,14 +57,14 @@ -
+
-

Adobe Configuration Export

+

Adobe Configuration Export

-
+

Lost in your eVars?

-

Find all your configuration details easily

+

Find all your configuration details easily

Your Adobe credentials are not stored. No changes to your Adobe Analytics account will be enacted by this code.

@@ -89,145 +90,169 @@

Find all your configuration details easily

- -
-
-

Easy

-

View all your configuration options in Excel quickly across several report suites.

- -

Secure

-

All requests take place in your browser. I never have access to your Adobe credentials.

- -
- -
-

Community

-

Basic stats about your report suite will be used to create community utilization reports.

- -

Premium Upgrades

-

A premier option, coming soon, will let you schedule monthly pulls of your config.

- -
-
- - - -
- -