From a1fcc11ef572e8026aab2c09981cd6ed6326f9a2 Mon Sep 17 00:00:00 2001 From: Josh Worden Date: Tue, 24 Jul 2018 13:49:19 -0500 Subject: [PATCH 1/4] Update start:local port --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 37dcad1d..695875a9 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "terminal": "docker exec -it fortnightapp_app_1 /bin/bash", "prestart": "$npm_package_docker_dev_install", "start": "$npm_package_docker_dev_up", - "start:local": "ember s --proxy http://localhost:8100 --port 4209", + "start:local": "ember s --proxy http://localhost:8100 --port 8105", "stop": "$npm_package_docker_dev_down", "prelint": "$npm_package_docker_test_install", "lint": "$npm_package_docker_test_lint", From 4c4076a3dae015d315eea4ff95a1bd5e94bccc18 Mon Sep 17 00:00:00 2001 From: Josh Worden Date: Wed, 8 Aug 2018 13:57:09 -0500 Subject: [PATCH 2/4] Add hash back to query fixes both campaign reports --- app/gql/fragments/campaign/materials.graphql | 1 + 1 file changed, 1 insertion(+) diff --git a/app/gql/fragments/campaign/materials.graphql b/app/gql/fragments/campaign/materials.graphql index 7fc845db..7ff038cb 100644 --- a/app/gql/fragments/campaign/materials.graphql +++ b/app/gql/fragments/campaign/materials.graphql @@ -6,6 +6,7 @@ fragment CampaignMaterialsFragment on Campaign { description status url + hash criteria { start } From 4c662817a15b57320988d97e1186c11e9ce722b5 Mon Sep 17 00:00:00 2001 From: Josh Worden Date: Wed, 8 Aug 2018 14:05:47 -0500 Subject: [PATCH 3/4] Rename materials to portal --- .../campaign/{materials.graphql => portal.graphql} | 4 ++-- app/gql/queries/campaign/hash.graphql | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename app/gql/fragments/campaign/{materials.graphql => portal.graphql} (89%) diff --git a/app/gql/fragments/campaign/materials.graphql b/app/gql/fragments/campaign/portal.graphql similarity index 89% rename from app/gql/fragments/campaign/materials.graphql rename to app/gql/fragments/campaign/portal.graphql index 7ff038cb..ef4e36a8 100644 --- a/app/gql/fragments/campaign/materials.graphql +++ b/app/gql/fragments/campaign/portal.graphql @@ -1,12 +1,12 @@ #import 'fortnight/gql/fragments/campaign-creative' -fragment CampaignMaterialsFragment on Campaign { +fragment CampaignPortalFragment on Campaign { id name description status - url hash + url criteria { start } diff --git a/app/gql/queries/campaign/hash.graphql b/app/gql/queries/campaign/hash.graphql index cfcd06c0..aa7bd9ed 100644 --- a/app/gql/queries/campaign/hash.graphql +++ b/app/gql/queries/campaign/hash.graphql @@ -1,7 +1,7 @@ -#import 'fortnight/gql/fragments/campaign/materials' +#import 'fortnight/gql/fragments/campaign/portal' -query CampaignHash($input: CampaignHashInput!) { +query CampaignPortal($input: CampaignHashInput!) { campaignHash(input: $input) { - ...CampaignMaterialsFragment + ...CampaignPortalFragment } } From cebd42fe6510cb86e2256d1a357a93c5204a1a4e Mon Sep 17 00:00:00 2001 From: Josh Worden Date: Wed, 8 Aug 2018 14:13:17 -0500 Subject: [PATCH 4/4] Update patch version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6d9dbaf0..2b560f1d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fortnight", - "version": "1.0.0-rc.1", + "version": "1.0.0-rc.1.1", "private": true, "description": "Small description for fortnight goes here", "license": "MIT",