From 6d75bd371dd70be31c3849fbd02a4df83d0a1f91 Mon Sep 17 00:00:00 2001
From: Raj Vaibhav Dubey <33062425+rajvaibhavdubey@users.noreply.github.com>
Date: Wed, 16 Jan 2019 21:51:56 +0530
Subject: [PATCH 2/6] Fixes Badge overlapping (#1948)
Badge overlapping has been fixed by modifying the z-index.
Fixes #1947
---
frontend/app/styles/partials/footer-main.scss | 5 ++---
frontend/app/styles/partials/preview.scss | 4 +++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/frontend/app/styles/partials/footer-main.scss b/frontend/app/styles/partials/footer-main.scss
index 69c69555c..8edd98aa7 100644
--- a/frontend/app/styles/partials/footer-main.scss
+++ b/frontend/app/styles/partials/footer-main.scss
@@ -1,7 +1,6 @@
-$bkColor: #1b1c1d;
-
footer {
- background-color: $bkColor;
+ background-color: #1b1c1d;
+ z-index: -1;
}
@media only screen and (max-width: 600px) {
diff --git a/frontend/app/styles/partials/preview.scss b/frontend/app/styles/partials/preview.scss
index d39c6b48b..7f6ad17c4 100644
--- a/frontend/app/styles/partials/preview.scss
+++ b/frontend/app/styles/partials/preview.scss
@@ -10,6 +10,8 @@
// scss-lint:disable all
.preview {
- top : -1% !important;
+ top: -1% !important;
+ z-index: 1;
}
+
// scss-lint:enable all
From 0ce42dae6c5ca861c4dc7483d783505214148f1b Mon Sep 17 00:00:00 2001
From: Raj Vaibhav Dubey <33062425+rajvaibhavdubey@users.noreply.github.com>
Date: Wed, 16 Jan 2019 21:52:20 +0530
Subject: [PATCH 3/6] Added tests for logo section (#1946)
Tests for the logo section have been added.
Fixes #1945
---
.../logo-image-component-test.js | 27 +++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 frontend/tests/integration/components/background-component/logo-image-component-test.js
diff --git a/frontend/tests/integration/components/background-component/logo-image-component-test.js b/frontend/tests/integration/components/background-component/logo-image-component-test.js
new file mode 100644
index 000000000..477c856e8
--- /dev/null
+++ b/frontend/tests/integration/components/background-component/logo-image-component-test.js
@@ -0,0 +1,27 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import hbs from 'htmlbars-inline-precompile';
+
+module('Integration | Component | background-component/logo-image-component', function(hooks) {
+ setupRenderingTest(hooks);
+
+ test('it renders', async function(assert) {
+ // Set any properties with this.set('myProperty', 'value');
+ // Handle any actions with this.set('myAction', function(val) { ... });
+
+ await render(hbs`{{background-component/logo-image-component}}`);
+
+ assert.equal('', '');
+
+ // Template block usage:
+ await render(hbs`
+ {{#background-component/logo-image-component}}
+ template block text
+ {{/background-component/logo-image-component}}
+ `);
+
+ assert.equal('', '');
+ });
+});
+
From 1a7b90d9ec4a7ea7c009338bab0de12e4b241acc Mon Sep 17 00:00:00 2001
From: Raj Vaibhav Dubey <33062425+rajvaibhavdubey@users.noreply.github.com>
Date: Wed, 16 Jan 2019 21:52:40 +0530
Subject: [PATCH 4/6] Route tests for contact section have been added (#1943)
Fixes #1942
---
frontend/tests/unit/routes/contact-badgeyay-test.js | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 frontend/tests/unit/routes/contact-badgeyay-test.js
diff --git a/frontend/tests/unit/routes/contact-badgeyay-test.js b/frontend/tests/unit/routes/contact-badgeyay-test.js
new file mode 100644
index 000000000..13d12b876
--- /dev/null
+++ b/frontend/tests/unit/routes/contact-badgeyay-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | contact-badgeyay', function(hooks) {
+ setupTest(hooks);
+
+ test('it exists', function(assert) {
+ let route = this.owner.lookup('route:contact-badgeyay');
+ assert.ok(route);
+ });
+});
From 947bec106fce5f69fe1a53623d531cee3224b7fa Mon Sep 17 00:00:00 2001
From: Raj Vaibhav Dubey <33062425+rajvaibhavdubey@users.noreply.github.com>
Date: Wed, 16 Jan 2019 21:54:55 +0530
Subject: [PATCH 5/6] Cross origin links are now safe (#1941)
Added rel = noopener to the links which open in new tab.
Fixes #1925
---
.../app/templates/components/footer-main.hbs | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/frontend/app/templates/components/footer-main.hbs b/frontend/app/templates/components/footer-main.hbs
index e761bbb5d..2de34d0b3 100644
--- a/frontend/app/templates/components/footer-main.hbs
+++ b/frontend/app/templates/components/footer-main.hbs
@@ -54,11 +54,11 @@
@@ -66,10 +66,10 @@
{{#each socialMedia as |media|}}
-
+
{{ first-cap media.id}}
{{/each}}
From b480415052173d1eab36ccb457157d83a77982f8 Mon Sep 17 00:00:00 2001
From: SHUBHAM KUMAR
Date: Wed, 16 Jan 2019 21:56:09 +0530
Subject: [PATCH 6/6] Fix 1893 Retrieving Badges in My Badges Section (#1899)
* Fix-1893 Fixing Fetching Of My Badges
* Update generateBadges.py
* Update generateBadges.py
* Update generateBadges.py
---
api/controllers/generateBadges.py | 9 ++++----
.../components/user-component/my-badges.js | 21 +++++++++++--------
frontend/app/controllers/my-badges.js | 6 ++++--
frontend/app/templates/my-badges.hbs | 4 ++--
4 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/api/controllers/generateBadges.py b/api/controllers/generateBadges.py
index f5b02ca4d..b73f32105 100644
--- a/api/controllers/generateBadges.py
+++ b/api/controllers/generateBadges.py
@@ -65,6 +65,7 @@ def generateBadges():
font_type_3 = data.get('font_type_3') or 'helvetica'
font_type_4 = data.get('font_type_4') or 'helvetica'
font_type_5 = data.get('font_type_5') or 'helvetica'
+
svg2png = SVG2PNG()
if config.ENV == 'PROD':
@@ -148,9 +149,9 @@ def generateBadges():
user_creator.allowed_usage = user_creator.allowed_usage - 1
- badge_created = Badges(image=image_name, csv=csv_name,
- text_color=font_color_1, badge_size=badge_size,
- badge_name=badge_name, creator=user_creator)
+ badge_created = Badges(image=image_name, csv=csv_name, font_color_1=font_color_1, font_color_2=font_color_2,
+ font_color_3=font_color_3, font_color_4=font_color_4, font_color_5=font_color_5,
+ badge_size=badge_size, badge_name=badge_name, creator=user_creator)
badge_created.save_to_db()
@@ -190,7 +191,7 @@ def send_badge_mail(badgeId, userId, badgeLink):
@loginRequired
def get_badges():
input_data = request.args
- page = request.args.get('page', 1, type=int)
+ page = request.args.get('filter[page]', 1, type=int)
user = User.getUser(user_id=input_data.get('uid'))
badges = db.session.query(Badges).filter_by(creator=user).paginate(
page, app.config['POSTS_PER_PAGE'], False)
diff --git a/frontend/app/components/user-component/my-badges.js b/frontend/app/components/user-component/my-badges.js
index 1b63ddb16..42702a8c3 100644
--- a/frontend/app/components/user-component/my-badges.js
+++ b/frontend/app/components/user-component/my-badges.js
@@ -9,6 +9,7 @@ export default Component.extend({
},
queryParams : ['page'],
page : 1,
+ routing : inject.service('-routing'),
notifications : inject.service('notification-messages'),
actions : {
deleteBadge(badge) {
@@ -32,15 +33,16 @@ export default Component.extend({
sendBadgeName(badge) {
this.get('sendBadgeName')(badge);
},
-
nextPage() {
- let filter = {};
- if (this.page > 1) {
+ if (this.page >= 1) {
+ const uid = this.get('session.uid');
+ var filter = {};
filter.page = this.page + 1;
- this.get('store').query('my-badges', filter)
+ filter.state = 'all';
+ this.get('nextPage')(this.page).query('my-badges', { uid, filter })
.then(records => {
if (records.length > 0) {
- this.set('my-badges', records);
+ this.set('model', records);
this.set('page', this.page + 1);
} else {
this.get('notifications').clearAll();
@@ -66,12 +68,14 @@ export default Component.extend({
}
},
prevPage() {
- let filter = {};
if (this.page - 1 > 0) {
+ const uid = this.get('session.uid');
+ var filter = {};
filter.page = this.page - 1;
- this.get('store').query('my-badges', filter)
+ filter.state = 'all';
+ this.get('nextPage')(this.page).query('my-badges', { uid, filter })
.then(records => {
- this.set('my-badges', records);
+ this.set('model', records);
this.set('page', this.page - 1);
})
.catch(err => {
@@ -118,4 +122,3 @@ export default Component.extend({
}
}
});
-
diff --git a/frontend/app/controllers/my-badges.js b/frontend/app/controllers/my-badges.js
index 0af2b9197..cb32231a8 100644
--- a/frontend/app/controllers/my-badges.js
+++ b/frontend/app/controllers/my-badges.js
@@ -21,7 +21,9 @@ export default Controller.extend({
});
});
},
-
+ nextPage() {
+ return this.get('store');
+ },
updateBadgeName(badge) {
badge.save()
.then(() => this.get('notifications').success('Badge Name Successfully Updated!', {
@@ -30,4 +32,4 @@ export default Controller.extend({
}));
}
}
-});
+});
\ No newline at end of file
diff --git a/frontend/app/templates/my-badges.hbs b/frontend/app/templates/my-badges.hbs
index dc8893bee..527f8f530 100644
--- a/frontend/app/templates/my-badges.hbs
+++ b/frontend/app/templates/my-badges.hbs
@@ -1,3 +1,3 @@
- {{user-component/my-badges model=model user=user session=session sendbadgeId=(action 'deleteBadge') sendBadgeName=(action 'updateBadgeName')}}
-
+ {{user-component/my-badges model=model user=user session=session sendbadgeId=(action 'deleteBadge') sendBadgeName=(action 'updateBadgeName') nextPage=(action 'nextPage')}}
+