-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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.
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
Feature - Added Optional Google Analytics tag for Status Page. #2567
Merged
Merged
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
29e24e0
Feature - Added Optional Google Analytics tag for Status Page.
99c0b8c
Feature - Google Analytics - Addressing PR Comments.
2b3a389
Feature - Google Analytics - Use Regex to validate UA as per https://…
fb29997
Feature - Google Analytics - Added JSDoc to Google Analytics functions.
3ff0cbe
Feature - Google Analytics - Simplified Module & Escaped the Script t…
c08d8a5
Google Analytics - Simplified retrieving Tag ID from Status Page.
5a94a3f
Google Analytics - Moved string to updated file.
3afe801
Feature - Google Analytics - Change TEXT type to VARCHAR.
913bb61
Feature - Google Analytics - Removed regex to validate a Google Analy…
f153082
Drop en.js
louislam a823ed8
Feature - Google Analytics - Removed unused import.
10c6f3b
Merge remote-tracking branch 'origin/master' into feature-google-anal…
louislam 5f2affb
Relocate and fix jsesc issue
louislam afadfe3
Trim
louislam File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
-- You should not modify if this have pushed to Github, unless it does serious wrong with the db. | ||
BEGIN TRANSACTION; | ||
ALTER TABLE status_page ADD google_analytics_tag_id VARCHAR; | ||
COMMIT; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
/** | ||
* Returns a string that represents the javascript that is required to insert the Google Analytics scripts | ||
* into a webpage. | ||
* @param tagId Google UA/G/AW/DC Property ID to use with the Google Analytics script. | ||
* @returns {string} | ||
*/ | ||
function getGoogleAnalyticsScript(tagId) { | ||
return "<script async src=\"https://www.googletagmanager.com/gtag/js?id=" + tagId + "\"></script>" + | ||
"<script>window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date());gtag('config', '" + tagId + "'); </script>"; | ||
} | ||
|
||
module.exports = { | ||
getGoogleAnalyticsScript, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think jsesc is wrongly used, as
getGoogleAnalyticsScript()
returns with <script> tag which is not purely a javascript. I will fix it