diff --git a/api/models/badges.py b/api/models/badges.py index ea3edf359..bbf5bc25e 100644 --- a/api/models/badges.py +++ b/api/models/badges.py @@ -9,7 +9,11 @@ class Badges(db.Model): id = db.Column(db.String(100), primary_key=True) image = db.Column(db.String(100), nullable=False) csv = db.Column(db.String(100), nullable=False) - text_color = db.Column(db.String(100), nullable=False) + font_color_1 = db.Column(db.String(100), nullable=False) + font_color_2 = db.Column(db.String(100), nullable=False) + font_color_3 = db.Column(db.String(100), nullable=False) + font_color_4 = db.Column(db.String(100), nullable=False) + font_color_5 = db.Column(db.String(100), nullable=False) badge_size = db.Column(db.String(100), nullable=False) download_link = db.Column(db.String) image_link = db.Column(db.String) diff --git a/api/requirements.txt b/api/requirements.txt index 235536b22..7f642713a 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -52,7 +52,7 @@ rsa==3.4.2 six==1.11.0 SQLAlchemy==1.2.7 tinycss2==0.6.1 -urllib3==1.22 +urllib3==1.24.1 webencodings==0.5.1 Werkzeug==0.14.1 marshmallow-jsonapi diff --git a/frontend/app/components/forms/signup-form.js b/frontend/app/components/forms/signup-form.js index 2345d7e4c..72d50b819 100644 --- a/frontend/app/components/forms/signup-form.js +++ b/frontend/app/components/forms/signup-form.js @@ -128,6 +128,13 @@ export default Component.extend({ $('#feedback').html(''); } } + if (document.getElementById('pwd').value == document.getElementById('pwdConfirm').value) { + document.getElementById('msg').style.color = 'green'; + document.getElementById('msg').innerHTML = 'Password match'; + } else { + document.getElementById('msg').style.color = 'red'; + document.getElementById('msg').innerHTML = 'Passwords do not match'; + } }, keyDown(event) { if (event.target.name === 'password') { diff --git a/frontend/app/templates/components/forms/signup-form.hbs b/frontend/app/templates/components/forms/signup-form.hbs index 75f971848..131289851 100644 --- a/frontend/app/templates/components/forms/signup-form.hbs +++ b/frontend/app/templates/components/forms/signup-form.hbs @@ -35,14 +35,14 @@
- {{input type="password" id="pwdConfirm" value=password_repeat name="password_repeat" - placeholder="Re-enter Password"}} + {{input type="password" id="pwdConfirm" value=password_repeat name="password_repeat" placeholder="Re-enter Password" }}
+
-{{/if}} +{{/if}} \ No newline at end of file diff --git a/frontend/app/templates/components/user-component/my-profile.hbs b/frontend/app/templates/components/user-component/my-profile.hbs index 4223d0b2e..8b0042ede 100644 --- a/frontend/app/templates/components/user-component/my-profile.hbs +++ b/frontend/app/templates/components/user-component/my-profile.hbs @@ -1,6 +1,6 @@
-
+
@@ -19,7 +19,8 @@
-
+
+
{{user-component/user-account session=session isLoading=isLoadingName user=user sendUserName=(action 'updateUserName')}}
diff --git a/frontend/app/templates/components/user-component/user-guide.hbs b/frontend/app/templates/components/user-component/user-guide.hbs index 8934b5970..f438a3b4a 100644 --- a/frontend/app/templates/components/user-component/user-guide.hbs +++ b/frontend/app/templates/components/user-component/user-guide.hbs @@ -4,6 +4,28 @@ Please check what is the "Correct Format"?
+
+
+
+ +
+ Logo Format +
+
+
+
+
The logo can be uploaded in two types. +
+
Image type logo
+
Text type logo
+
+
+
The image type logo allows you to upload any image as your logo provided it has + dimensions of size(width x height): 749 X 211px & Resolution: 300 DPI
+
The text type logo allows you to choose any text as your logo. You can also choose + text color and background color
+
+
@@ -17,54 +39,54 @@
The CSV must be uploaded with 5 columns of data.
Five comma (',') seperated values should be present in the CSV
See Example Below
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
First LineSecond LineThird LineFourth LineFifth Line
First NameLast NamePositionOrganisation/ProjectSocial Handle
DeepjyotiMondalMentorFOSSASIA@djmgit
YashLadhaDeveloperBadgeyay@yashladha
ManishDevganDeveloperBadgeyay@gabru-md
ParthShandilyaDeveloperBadgeyay@ParthS007
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
First LineSecond LineThird LineFourth LineFifth Line
First NameLast NamePositionOrganisation/ProjectSocial Handle
DeepjyotiMondalMentorFOSSASIA@djmgit
YashLadhaDeveloperBadgeyay@yashladha
ManishDevganDeveloperBadgeyay@gabru-md
ParthShandilyaDeveloperBadgeyay@ParthS007
@@ -89,4 +111,4 @@
-
+
\ No newline at end of file diff --git a/frontend/app/templates/create-badges.hbs b/frontend/app/templates/create-badges.hbs index be024b264..d90f082af 100644 --- a/frontend/app/templates/create-badges.hbs +++ b/frontend/app/templates/create-badges.hbs @@ -1,12 +1,12 @@
-{{!----Event Listeners For Perview----}} +{{!----Event Listeners For Perview----}}+ {{#create-badge}} {{/create-badge}}
@@ -36,13 +36,13 @@

Select from one of the Input Sources - +

-
- +
+
@@ -146,7 +153,7 @@

- +
@@ -186,13 +195,16 @@
- {{ text-component/font-size fontsizeall=fontsizeall fonttypeall=fonttypeall sendDefSize=(action 'mutateFontSize') sendDefFontCol=(action 'mutateFontCol') sendDefFont=(action + {{ text-component/font-size fontsizeall=fontsizeall fonttypeall=fonttypeall + sendDefSize=(action 'mutateFontSize') sendDefFontCol=(action 'mutateFontCol') + sendDefFont=(action 'mutateCustomFont')}}
- + {{#each userError as |error|}}

{{error.message}}

{{/each}} {{#if showProgress}} @@ -233,11 +245,15 @@
- {{ user-component/preview fn=firstName ln=lastName org=organization sh=socialHandle desg=designation defColor=defFontColor - font_fn=defFont1Size font_ln=defFont2Size font_desg=defFont3Size font_org=defFont4Size font_sh=defFont5Size fontcol_fn=defFontCol1 + {{ user-component/preview fn=firstName ln=lastName org=organization sh=socialHandle desg=designation + defColor=defFontColor + font_fn=defFont1Size font_ln=defFont2Size font_desg=defFont3Size font_org=defFont4Size font_sh=defFont5Size + fontcol_fn=defFontCol1 fontcol_ln=defFontCol2 fontcol_desg=defFontCol3 fontcol_org=defFontCol4 fontcol_sh=defFontCol5 defFont=defFont - defImageName=defImageName backImg=imageData backColor=backColor custLogoImage=custLogoImage logoImageData=logoImageData - logoBackColor=logoBackColor logoFontColor=logoFontColor logo_text=logo_text defImage=defImage custImage=custImage previewHeight=previewHeight + defImageName=defImageName backImg=imageData backColor=backColor custLogoImage=custLogoImage + logoImageData=logoImageData + logoBackColor=logoBackColor logoFontColor=logoFontColor logo_text=logo_text defImage=defImage + custImage=custImage previewHeight=previewHeight }}
{{overlay-welcome user=user removeFTL=(action 'removeFTL')}}