Skip to content
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

Deploy #6411

Merged
merged 30 commits into from
Oct 7, 2020
Merged

Deploy #6411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
461961a
deprecate unused artwork_rail component
eessex Oct 1, 2020
b528299
Merge branch 'master' of https://github.com/artsy/force into deprecat…
eessex Oct 1, 2020
2fd2118
Implements bare-bones show route
dzucconi Oct 5, 2020
69a3878
Merge pull request #6408 from artsy/feat/FX-2189--show-bones
dzucconi Oct 5, 2020
2a46ab3
Adds click tracking to rail
dzucconi Oct 5, 2020
4cdf380
Implements installation shot carousel
dzucconi Oct 5, 2020
adaeb73
Merge pull request #6410 from artsy/feat/FX-2191--show-carousel
dzucconi Oct 5, 2020
49959cc
[Fair] Load followed artists clientside, and enable checkboxes automa…
mzikherman Oct 5, 2020
b2bd9fd
chore: Add react-test-utils
damassi Oct 5, 2020
d2cfd48
chore(deps): update dep @artsy/cohesion from 1.40.0 to v1.41.0
renovate-bot Oct 5, 2020
8ea2ad7
Merge pull request #6414 from artsy/update-relay-test-tools
dzucconi Oct 6, 2020
b186ec6
Update metaphysics schema
artsyit Oct 6, 2020
953d162
Update metaphysics schema (#6415)
artsy-peril[bot] Oct 6, 2020
782e644
Merge pull request #6407 from artsy/chore/FX-2336--artists-i-follow-t…
sweir27 Oct 6, 2020
ba22e4a
fix: Review App Creation
icirellik Oct 6, 2020
14883e1
remove unused jquery analytics for artist page
eessex Oct 6, 2020
07c58db
Merge pull request #6393 from artsy/deprecate-artwork-rail
icirellik Oct 6, 2020
106b945
Merge pull request #6416 from artsy/review-app-fix-review-app
icirellik Oct 6, 2020
a6f9e85
deprecate unused jquery filter analytics
eessex Oct 6, 2020
94b8bbd
chore: Deprecate unused jquery filter analytics (#6418)
artsy-peril[bot] Oct 6, 2020
acbef8e
remove unused genes analytics files
eessex Oct 6, 2020
440fc80
migrate homepage analytics to view components
eessex Oct 6, 2020
90c6454
Merge pull request #6417 from artsy/deprecate-artist-analytics
Oct 6, 2020
c85c5f6
Merge pull request #6425 from artsy/homepage-analytics
Oct 6, 2020
4c3f8a6
merge conflicts
eessex Oct 6, 2020
06c8986
chore(FX-2330): Migrate mWeb /art_fairs to Metaphysics V2 (#6427)
dblandin Oct 6, 2020
c198c09
chore(FX-2329): Migrate desktop /fairs client to V2 (#6428)
dblandin Oct 6, 2020
8d6d5bb
Merge pull request #6412 from artsy/fair-followed-artists-nuance
mzikherman Oct 7, 2020
fc298c4
chore(deps): update dep @artsy/palette from 13.7.5 to v13.8.0 (#6431)
renovate[bot] Oct 7, 2020
dd68ea7
Merge pull request #6422 from artsy/gene-analytics
Oct 7, 2020
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
19 changes: 18 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,22 @@ jobs:

create_or_update_review_app:
executor: hokusai/deploy
parameters:
artsy_docker_host:
type: string
default: docker.artsy.net
artsy_docker_port:
type: integer
default: 2376
artsy_s3_path_root:
type: string
default: artsy-citadel/docker
steps:
- hokusai/setup-docker
- hokusai/setup
- artsy-remote-docker/setup-artsy-remote-docker:
artsy_docker_host: << parameters.artsy_docker_host >>
artsy_docker_port: << parameters.artsy_docker_port >>
artsy_s3_path_root: << parameters.artsy_s3_path_root >>
- hokusai/install-aws-iam-authenticator
- hokusai/configure-hokusai
- run:
Expand Down Expand Up @@ -283,3 +297,6 @@ workflows:
filters:
branches:
only: /^review-app-.*/
pre-steps:
- run:
command: echo 'export DOCKER_BUILDKIT=1; export BUILDKIT_PROGRESS=plain; export COMPOSE_DOCKER_CLI_BUILD=1;' >> $BASH_ENV
15 changes: 15 additions & 0 deletions data/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -5016,6 +5016,20 @@ type DeleteCreditCardPayload {
creditCardOrError: CreditCardMutationType
}

# Autogenerated input type of DeleteViewingRoom
input DeleteViewingRoomInput {
# A unique identifier for the client performing the mutation.
clientMutationId: String
viewingRoomID: ID!
}

# Autogenerated return type of DeleteViewingRoom
type DeleteViewingRoomPayload {
# A unique identifier for the client performing the mutation.
clientMutationId: String
viewingRoom: ViewingRoom!
}

# Autogenerated input type of DeliverSecondFactor
input DeliverSecondFactorInput {
# A unique identifier for the client performing the mutation.
Expand Down Expand Up @@ -7249,6 +7263,7 @@ type Mutation {

# Remove a credit card
deleteCreditCard(input: DeleteCreditCardInput!): DeleteCreditCardPayload
deleteViewingRoom(input: DeleteViewingRoomInput!): DeleteViewingRoomPayload
deliverSecondFactor(
input: DeliverSecondFactorInput!
): DeliverSecondFactorPayload
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@
},
"dependencies": {
"@artsy/backbone-mixins": "2.0.0",
"@artsy/cohesion": "1.40.0",
"@artsy/cohesion": "1.41.0",
"@artsy/express-reloadable": "1.4.8",
"@artsy/gemup": "0.1.0",
"@artsy/palette": "13.7.5",
"@artsy/palette": "13.8.0",
"@artsy/passport": "1.5.0",
"@artsy/reaction": "28.8.0",
"@artsy/stitch": "6.1.6",
Expand Down Expand Up @@ -335,6 +335,7 @@
"relay-compiler": "9.1.0",
"relay-compiler-language-typescript": "12.0.3",
"relay-config": "9.1.0",
"relay-test-utils": "9.1.0",
"rewire": "2.2.0",
"should": "11.2.1",
"simple-progress-webpack-plugin": "1.1.2",
Expand Down
66 changes: 0 additions & 66 deletions src/desktop/analytics/artist_page.js

This file was deleted.

38 changes: 0 additions & 38 deletions src/desktop/analytics/artwork_rail.js

This file was deleted.

48 changes: 0 additions & 48 deletions src/desktop/analytics/artworks_filter.js

This file was deleted.

11 changes: 0 additions & 11 deletions src/desktop/analytics/genes.js

This file was deleted.

68 changes: 0 additions & 68 deletions src/desktop/analytics/home.js

This file was deleted.

1 change: 0 additions & 1 deletion src/desktop/apps/consign/stylesheets/index.styl
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@require '../../../components/stylus_lib'
@require '../../../components/artwork_rail/stylesheets/index'

@require './landing/desktop'
@require './landing/faq'
Expand Down
2 changes: 1 addition & 1 deletion src/desktop/apps/fairs/client/index.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Backbone = require 'backbone'
CurrentUser = require '../../../models/current_user.coffee'
Profile = require '../../../models/profile.coffee'
initCarousel = require '../../../components/merry_go_round/bottom_nav_mgr.coffee'
metaphysics = require '../../../../lib/metaphysics.coffee'
metaphysics = require '../../../../lib/metaphysics2.coffee'
ViewHelpers = require '../helpers/view_helpers.coffee'
query = require '../query.coffee'
{ openAuthModal } = require '../../../lib/openAuthModal'
Expand Down
11 changes: 11 additions & 0 deletions src/desktop/apps/home/client/hero_unit_view.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ module.exports = class HeroUnitView extends Backbone.View

@$('.home-hero-unit').swipeleft => @onLeftArrow()
@$('.home-hero-unit').swiperight => @onRightArrow()
@trackHeroClick()

setRetinaHeroTitles: =>
@$('.hhu-title').each ->
Expand Down Expand Up @@ -72,6 +73,16 @@ module.exports = class HeroUnitView extends Backbone.View
.addClass('hhud-active')
@setBodyClass()

trackHeroClick: () ->
$heroUnits = $(".js-homepage-hero-unit")
window.analytics.trackLink($heroUnits, "Clicked homepage banner", (el) ->
$el = $(el)
return {
banner_link_path: el.href,
banner_position: $heroUnits.index($el),
}
)

onKeyUp: (e) ->
return if $(e.target).attr('id') is 'main-layout-search-bar-input'
switch e.keyCode
Expand Down
16 changes: 16 additions & 0 deletions src/desktop/apps/home/client/index.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,21 @@ sd = require('sharify').data
_ = require 'underscore'
_s = require 'underscore.string'

setupAnalytics = () ->
window.analytics.trackLink($("#hpm-recommended_works-6 a"), "Clicked recommendation on homepage")
window.analytics.trackLink(
$(".js-homepage-featured-links a"),
"Clicked homepage featured link",
(el) ->
$el = $(el)
return {
featured_link_path: $el.attr("href"),
context_type: $el
.closest(".js-homepage-featured-links")
.data("context"),
}
)

module.exports.HomeView = class HomeView extends Backbone.View

initialize: () ->
Expand Down Expand Up @@ -57,3 +72,4 @@ module.exports.init = ->
setupHomePageModules()
setupArtistsToFollow user
maybeShowBubble user
setupAnalytics()
Loading