Skip to content
This repository has been archived by the owner on Aug 13, 2020. It is now read-only.

Conversion Pixel #1310

Merged
merged 12 commits into from
Jun 11, 2020
Merged

Conversion Pixel #1310

merged 12 commits into from
Jun 11, 2020

Conversation

coderberry
Copy link
Contributor

@coderberry coderberry commented May 27, 2020

Type of PR

  • feature
  • enhancement
  • bug fix
  • other

Description

https://jsbin.com/dawagiyeda/edit?html,console,output

Checklist

  • My code follows the style guidelines of this project & the tests are passing
  • I have performed a self-review of my own code
  • I have requested a review from another developer(s)

Screenshots

Eric Berry added 2 commits May 27, 2020 13:05
@github-actions github-actions bot added the has conflicts Assigned to pull requests that have conflicts with master label May 29, 2020
@codecov
Copy link

codecov bot commented May 29, 2020

Codecov Report

Merging #1310 into master will increase coverage by 0.12%.
The diff coverage is 44.53%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1310      +/-   ##
==========================================
+ Coverage   34.76%   34.88%   +0.12%     
==========================================
  Files         345      352       +7     
  Lines        7989     8104     +115     
==========================================
+ Hits         2777     2827      +50     
- Misses       5212     5277      +65     
Impacted Files Coverage Δ
app/controllers/pixels_controller.rb 0.00% <0.00%> (ø)
app/helpers/application_helper.rb 39.21% <0.00%> (ø)
app/helpers/organizations_helper.rb 39.13% <ø> (ø)
app/components/page_component.rb 100.00% <100.00%> (ø)
app/controllers/pixel_conversions_controller.rb 100.00% <100.00%> (ø)
app/helpers/organization_pixels_helper.rb 100.00% <100.00%> (ø)
app/helpers/pixel_conversions_helper.rb 100.00% <100.00%> (ø)
app/jobs/create_pixel_conversion_job.rb 100.00% <100.00%> (ø)
app/models/campaign.rb 79.15% <100.00%> (+0.06%) ⬆️
app/models/creative.rb 65.51% <100.00%> (+0.29%) ⬆️
... and 13 more

@hopsoft hopsoft marked this pull request as draft June 8, 2020 02:09
@hopsoft hopsoft changed the title [WIP] Conversion Pixel Conversion Pixel Jun 8, 2020
@hopsoft hopsoft added the in progress This is actively being worked on label Jun 8, 2020
const date = new Date(Date.parse(dateString)) // => Tue Jun 09 2020 14:33:59 GMT-0400 (EDT)
let expiresAt = new Date()
expiresAt.setTime(date.getTime())
const setAt = expiresAt.setDate(expiresAt.getDate() + this.daysToLive)
Copy link
Contributor

Choose a reason for hiding this comment

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

This needs a look (and the comment can be removed) but I am pretty sure this is what we want. We may be able to make it a bit cleaner but this works.

app/models/pixel.rb Outdated Show resolved Hide resolved
config/routes.rb Show resolved Hide resolved
@hopsoft hopsoft marked this pull request as ready for review June 10, 2020 23:54
Copy link
Contributor

@andrewmcodes andrewmcodes left a comment

Choose a reason for hiding this comment

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

Other than those failing tests nothing is sticking out to me.

@github-actions github-actions bot added the approved Pull request is approved label Jun 11, 2020
@andrewmcodes andrewmcodes removed has conflicts Assigned to pull requests that have conflicts with master in progress This is actively being worked on labels Jun 11, 2020
@andrewmcodes andrewmcodes merged commit 2fd3e8c into master Jun 11, 2020
@andrewmcodes andrewmcodes deleted the berry/conversion-pixel branch June 11, 2020 23:14
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Pull request is approved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants