From 29208958c940529389646f75cc62abc1f1efae55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marynowski?= Date: Sun, 4 Jun 2017 23:56:36 +0200 Subject: [PATCH 1/8] feat(main): it's 2017 --- client/app/components/main/main.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/components/main/main.tpl.html b/client/app/components/main/main.tpl.html index 3f04bb39..ed2ee215 100644 --- a/client/app/components/main/main.tpl.html +++ b/client/app/components/main/main.tpl.html @@ -48,7 +48,7 @@

- © 2016 + © 2017 Hatnote • About From d72a71026b8c9f87934f0d85d11eb2567a3c7cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marynowski?= Date: Sun, 4 Jun 2017 23:57:49 +0200 Subject: [PATCH 2/8] fix(dashboard): fix UTC problems for creating new campaign --- client/app/components/dashboard/dashboard.js | 8 ++-- .../dashboard/new-campaign.tpl.html | 39 ++++++------------- 2 files changed, 15 insertions(+), 32 deletions(-) diff --git a/client/app/components/dashboard/dashboard.js b/client/app/components/dashboard/dashboard.js index 69bd1f71..43455e28 100644 --- a/client/app/components/dashboard/dashboard.js +++ b/client/app/components/dashboard/dashboard.js @@ -39,16 +39,16 @@ const DashboardComponent = { campaign: { name: '', coordinators: [], - open_date: new Date(Date.UTC(2016, 8, 1)), - close_date: new Date(Date.UTC(2016, 8, 30)) + open_date: new Date(Date.UTC(2017, 8, 1)), + close_date: new Date(Date.UTC(2017, 8, 30)) }, today: new Date(), create: (campaign_, loading) => { let campaign = angular.copy(campaign_); campaign = angular.extend(campaign, { coordinators: campaign.coordinators.map((element) => element.name), - open_date: $filter('date')(campaign.open_date, 'yyyy-MM-ddTHH:mm:ss', 'UTC'), - close_date: $filter('date')(campaign.close_date, 'yyyy-MM-ddTHH:mm:ss', 'UTC') + open_date: $filter('date')(campaign.open_date, 'yyyy-MM-ddTHH:mm:ss'), + close_date: $filter('date')(campaign.close_date, 'yyyy-MM-ddTHH:mm:ss') }); loading.window = true; diff --git a/client/app/components/dashboard/new-campaign.tpl.html b/client/app/components/dashboard/new-campaign.tpl.html index dc1b30b2..34cc0ae7 100644 --- a/client/app/components/dashboard/new-campaign.tpl.html +++ b/client/app/components/dashboard/new-campaign.tpl.html @@ -24,22 +24,8 @@

Add new campaign

ng-model="campaign.open_date">
-

Open Date and Time

+

Open Date and Time (UTC)

- - info - - Once the images are imported to round 1,
- changing the campaign's date and time won't
- make a difference in the images your jury
- will be able to view. However, changing
- these values before the import to round 1
- will make sure that only photos that
- are uploaded (for the first time) after
- the start date and time specified here
- are viewed by your jury. - - date_range @@ -53,20 +39,17 @@

Add new campaign

ng-model="campaign.close_date"> -

Close Date and Time

+

Close Date and Time (UTC)

+ + + + info +
+

Once the images are imported to round 1, changing date and time won't make a difference in the images your jury + will be able to view. However, changing these values before the import to round 1 will make + sure that only photos that are uploaded (for the first time) before the end date and time + are viewed by your jury.

- - info - - Once the images are imported to round 1,
- changing date and time won't make a difference
- in the images your jury will be able to view.
- However, changing these values before the import
- to round 1 will make sure that only photos that
- are uploaded (for the first time) before the end
- date and time are viewed by your jury. - - Campaign coordinators From 16b0ab87018ded820a67ea5d472ae1310b45efc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marynowski?= Date: Sun, 4 Jun 2017 23:58:44 +0200 Subject: [PATCH 3/8] feat(campaign): show UTC label, just to make sure --- client/app/components/campaign/campaign-admin.tpl.html | 3 ++- client/app/components/campaign/edit-campaign.tpl.html | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/app/components/campaign/campaign-admin.tpl.html b/client/app/components/campaign/campaign-admin.tpl.html index ae00fcfd..feb2d846 100644 --- a/client/app/components/campaign/campaign-admin.tpl.html +++ b/client/app/components/campaign/campaign-admin.tpl.html @@ -20,7 +20,8 @@ cancel - {{$ctrl.campaign.open_date | date: 'd MMM yyyy'}} – {{$ctrl.campaign.close_date | date: 'd MMM yyyy'}} + {{$ctrl.campaign.open_date | date: 'd MMM yyyy'}} {{$ctrl.campaign.open_date | date: 'HH:mm'}} UTC – + {{$ctrl.campaign.close_date | date: 'd MMM yyyy'}} {{$ctrl.campaign.close_date | date: 'HH:mm'}} UTC Edit campaign

ng-model="campaign.open_date"> -

Open Date and Time

+

Open Date and Time (UTC)

@@ -39,7 +39,7 @@

Edit campaign

ng-model="campaign.close_date"> -

Close Date and Time

+

Close Date and Time (UTC)

 From b6e9126459748e9c7721bc3d6978cbab3713f197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marynowski?= Date: Sun, 4 Jun 2017 23:59:29 +0200 Subject: [PATCH 4/8] feat(campaign): add edit hour for round deadline --- client/app/components/campaign/edit-round.tpl.html | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/client/app/components/campaign/edit-round.tpl.html b/client/app/components/campaign/edit-round.tpl.html index 79afb0b7..ddc10d46 100644 --- a/client/app/components/campaign/edit-round.tpl.html +++ b/client/app/components/campaign/edit-round.tpl.html @@ -26,10 +26,15 @@

{{voteMethods[round.vote_method].label}}

date_range
- -

Deadline Date

+
+ + + + +
+

Close Date and Time (UTC)

 From cbf954ec09b063762bd7c18a2a243000a1dbae22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marynowski?= Date: Mon, 5 Jun 2017 00:01:45 +0200 Subject: [PATCH 5/8] feat(campaign): add edit hour for round deadline --- client/app/components/campaign/campaign.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/client/app/components/campaign/campaign.js b/client/app/components/campaign/campaign.js index 7dd6bae0..6b8eb083 100644 --- a/client/app/components/campaign/campaign.js +++ b/client/app/components/campaign/campaign.js @@ -349,8 +349,8 @@ const CampaignComponent = { let campaign_ = angular.extend(angular.copy(campaign), { coordinators: campaign.coordinators.map((element) => element.name), - open_date: $filter('date')(campaign.open_date, 'yyyy-MM-ddTHH:mm:ss', 'UTC'), - close_date: $filter('date')(campaign.close_date, 'yyyy-MM-ddTHH:mm:ss', 'UTC') + open_date: $filter('date')(campaign.open_date, 'yyyy-MM-ddTHH:mm:ss'), + close_date: $filter('date')(campaign.close_date, 'yyyy-MM-ddTHH:mm:ss') }); userService.admin.editCampaign(campaign_.id, campaign_).then((response) => { @@ -370,8 +370,12 @@ const CampaignComponent = { loading.window = true; round.new_jurors = round.jurors.map((user) => user.name); + const round_ = angular.extend({}, round, { + deadline_date: $filter('date')(round.deadline_date, 'yyyy-MM-ddTHH:mm:ss') + }) + $q.all({ - round: userService.admin.editRound(round.id, round) + round: userService.admin.editRound(round_.id, round_) }).then((response) => { if (response.round.error) { loading.window = false; From b92ea0de1314861b1a13f6fd3e42e9360e2c5061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marynowski?= Date: Mon, 5 Jun 2017 00:02:24 +0200 Subject: [PATCH 6/8] chore(webpack): add builds for dev and beta --- client/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/package.json b/client/package.json index 341d1482..f2835e58 100644 --- a/client/package.json +++ b/client/package.json @@ -9,7 +9,8 @@ "start": "webpack --watch --content-base app --progress --colors", "build": "webpack --content-base app --progress", "build-zip": "webpack --content-base app --progress && cd ../montage/static && zip -r app.zip .", - "build-all-win": "set NODE_ENV=dev&&webpack --content-base app --progress&&set NODE_ENV=beta&&webpack --content-base app --progress" + "build-dev": "set NODE_ENV=dev&&webpack --content-base app --progress", + "build-beta": "set NODE_ENV=beta&&webpack --content-base app --progress" }, "license": "BSD-3-Clause", "devDependencies": { From 89449a213f9a85797eb21ed8e57dd57b8d5a8f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marynowski?= Date: Mon, 5 Jun 2017 00:05:37 +0200 Subject: [PATCH 7/8] chore(gitignore): fix gitignore --- .gitignore | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 77fef510..32f4e3e3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,10 +5,7 @@ config*yaml *.log # Compiled front-end -montage/static/index.html -montage/static/assets -montage/static/dist - +montage/static/ # emacs *~ From 332ba67558288a4b50d3eebb79fcb5a30eb3ccbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marynowski?= Date: Mon, 5 Jun 2017 00:22:25 +0200 Subject: [PATCH 8/8] version 17.06.01 --- client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/package.json b/client/package.json index f2835e58..83b7ec14 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "montage", - "version": "16.11.03", + "version": "17.06.01", "description": "Photo evaluation tool for and by Wiki Loves competitions", "main": "app/index.js", "repository": "https://github.com/hatnote/montage",