diff --git a/resources/translation/ar.json b/resources/translation/ar.json index 0990c92..0e72c82 100644 --- a/resources/translation/ar.json +++ b/resources/translation/ar.json @@ -8,6 +8,7 @@ "contributors_title": null, "education_description": "قم بتطوير خبراتك المعرفية و تنمية مهاراتك من اجل مستقبل أفضل", "education_title": "تعليم", + "email_hint": null, "employment_description": "ابحث عن فرص شغل او تكوين مهني، التق بمهنيين بنفس اهتماماتك", "employment_title": "شغل", "follow_us": null, @@ -23,11 +24,14 @@ "language_title": "لغات", "media-and-communication_description": "تّعرف على قصص ملهمة، و تجارب مثيرة غيرت حياة الناس", "media-and-communication_title": "إعلام و مواصلات", + "newsletter_description": null, + "newsletter_title": null, "refugee_tech_info": "نقوم بتوحيد جهود المجتمع، من اجل مساعدة القادمين الجدد. نقوم بذلك من خلال توظيف تكنولجيات وخدم معدة لذلك ", "setelin_description": "تم إنشاء 'ستل إن' خلال هكاتون نظمته 'ريفوجي تك ' مع مصلحة الهجرة و 'ستكهولم تك '. خلال الهكاتون، تم توحيد جهود المبادرات التي تساعد اللاجئين في السويد من خلال إنشاء هذا التطبيق.\nقامت 'ريفوجي تك ' بعد ذلك بالسهر على إتمام التطبيق.", "setelin_footer": null, "setelin_header": null, "social_description": "قل لي من تعاشر، أقول لك من أنت. تعرف على أناس جدد و ابدأ صداقات جديدة", "social_title": "تواصل اجتماعي", + "subscribe_label": null, "visit_us": null } \ No newline at end of file diff --git a/resources/translation/en.json b/resources/translation/en.json index d32a4e8..30d8f70 100644 --- a/resources/translation/en.json +++ b/resources/translation/en.json @@ -8,6 +8,7 @@ "contributors_title": "contributors", "education_description": "Get smarter, develop new skills and continue growing", "education_title": "education", + "email_hint": "Sign up with your@email.com", "employment_description": "Start networking, get an internship, a job or start new business", "employment_title": "employment", "follow_us": "follow us", @@ -23,11 +24,14 @@ "language_title": "language", "media-and-communication_description": "Get inspired and learn from other people’s lives and experiences.", "media-and-communication_title": "media & communication", + "newsletter_description": "lorem ipsum in collaboration with this and that date", + "newsletter_title": "newsletter", "refugee_tech_info": "We build bridges between parts of the society to enable newcomers potential relying on efficiently designed and developed solutions", "setelin_description": "Setelin was created as a result of a hackathon that was organised by Refugee Tech, together with Migrationsverket and STHLM TECH. The hackathon joined forces of Swedish tech initiatives who deal with social topics.", "setelin_footer": null, "setelin_header": null, "social_description": "Friends make us who we are, find new friends and meet new folks.", - "social_title": "Social", + "social_title": "social", + "subscribe_label": "subscribe", "visit_us": "visit us" } \ No newline at end of file diff --git a/resources/translation/fa.json b/resources/translation/fa.json index 7e1c534..a870db5 100644 --- a/resources/translation/fa.json +++ b/resources/translation/fa.json @@ -1,6 +1,6 @@ { "about_us": "درباره ما", - "add_your_app": null, + "add_your_app": "اپليكشن خود را اضافه كنيد", "categories": "دسته بندی ها", "choose_language": "انتخاب زبان", "contact": null, @@ -8,6 +8,7 @@ "contributors_title": null, "education_description": "باهوش تر شوید و مهارت هایتان را بیافزایید", "education_title": "تحصیلات", + "email_hint": null, "employment_description": "با دیگران ارتباط برقرار کنید،تا کارآموزی ويا شغل ثابت بگیرید", "employment_title": "استخدام", "follow_us": null, @@ -23,11 +24,14 @@ "language_title": "زبان", "media-and-communication_description": "از زندگی وتجربیات دیگران الهام بگیرید", "media-and-communication_title": "رسانه و ارتباطات", - "refugee_tech_info": "نهج حصلت على أي أفكار التطبيق المباشر لهم RT إذا المطور يريد تحميل التطبيق .", + "newsletter_description": null, + "newsletter_title": null, + "refugee_tech_info": "ما پلى هستيم بين بخش هاى مختلف جامعه تا به وسيله ى تكنولوژى و راه حل هاى سازمان يافته، توانايى هاى مهاجران را شكوفا كنيم.", "setelin_description": "ستلین در یک هکتن با مدیریت رفیوجی تک و همکاری اداره ی مهاجرت و استکهلم تک شکل گرفت. این محفل پروژه هایی که هدف کمک کردن به مسائل اجتماعی دارند را دور هم جمع کرد.\nرفیوجی تک مسؤلیت توسعه وتکمیل کردن پلتفرم ستلین را ، با یاری داوطلبان و همکاران دیگر، به عهده گرفت.", "setelin_footer": null, "setelin_header": null, "social_description": "دوستان جدید بیابید و با مردمان جدید آشنا شوید", "social_title": "اجتماعي", + "subscribe_label": null, "visit_us": null } \ No newline at end of file diff --git a/resources/translation/sv.json b/resources/translation/sv.json index 10495dc..6575d4b 100644 --- a/resources/translation/sv.json +++ b/resources/translation/sv.json @@ -8,6 +8,7 @@ "contributors_title": "volontärer", "education_description": "Bli mer skicklig, utveckla nya kompetenser och fortsätt växa", "education_title": "utbildning", + "email_hint": null, "employment_description": "Börja nätverka, få ett internship, ett jobb eller starta eget företag", "employment_title": "jobb", "follow_us": "följ oss", @@ -23,11 +24,14 @@ "language_title": "språk", "media-and-communication_description": "Bli inspirerad och ta lärdom från andra människors liv och erfarenheter", "media-and-communication_title": "media & kommunikation", + "newsletter_description": null, + "newsletter_title": "nyhetsbrev", "refugee_tech_info": "Vi möjligör samarbete mellan alla delar av samhället med målet att tillvarata potentialen hos nyanlända genom effektivt designade och utvecklade lösningar", "setelin_description": "Setelin är resultatet från ett hackathon organiserat av Refugee Tech tillsammans med Migrationsverket och STHLM TECH.\nRefugee Tech tog på sig att vidareutveckla plattformen tillsammans med voluntärer.", "setelin_footer": null, "setelin_header": null, "social_description": "Vänner gör oss till dem vi är, hitta nya vänner och skapa nya bekantskaper", "social_title": "socialt", + "subscribe_label": null, "visit_us": "besök oss" } \ No newline at end of file diff --git a/scss/newsletter.scss b/scss/newsletter.scss new file mode 100644 index 0000000..c1bac68 --- /dev/null +++ b/scss/newsletter.scss @@ -0,0 +1,3 @@ +.newsletter-content { + margin: 0px 0px 0px 15px; +} diff --git a/www/js/configuration/translations.js b/www/js/configuration/translations.js index f823ea6..1242be0 100644 --- a/www/js/configuration/translations.js +++ b/www/js/configuration/translations.js @@ -9,6 +9,7 @@ $translateProvider.translations("ar", { "contributors_title": null, "education_description": "قم بتطوير خبراتك المعرفية و تنمية مهاراتك من اجل مستقبل أفضل", "education_title": "تعليم", + "email_hint": null, "employment_description": "ابحث عن فرص شغل او تكوين مهني، التق بمهنيين بنفس اهتماماتك", "employment_title": "شغل", "follow_us": null, @@ -24,12 +25,17 @@ $translateProvider.translations("ar", { "language_title": "لغات", "media-and-communication_description": "تّعرف على قصص ملهمة، و تجارب مثيرة غيرت حياة الناس", "media-and-communication_title": "إعلام و مواصلات", + "newsletter_description": null, + "newsletter_title": null, + "newsletter_registration_info": " تم تسجيل البريد الاكتروني ", + "newsletter_registration_exist": "ﻫﺬﺍ ﺍﻟﺒﺮﻳﺪ ﺍﻹﻟﻜﺘﺮﻭﻧﻰ ﻣﺴﺠﻞ", "refugee_tech_info": "نقوم بتوحيد جهود المجتمع، من اجل مساعدة القادمين الجدد. نقوم بذلك من خلال توظيف تكنولجيات وخدم معدة لذلك ", "setelin_description": "تم إنشاء 'ستل إن' خلال هكاتون نظمته 'ريفوجي تك ' مع مصلحة الهجرة و 'ستكهولم تك '. خلال الهكاتون، تم توحيد جهود المبادرات التي تساعد اللاجئين في السويد من خلال إنشاء هذا التطبيق.\nقامت 'ريفوجي تك ' بعد ذلك بالسهر على إتمام التطبيق.", "setelin_footer": null, "setelin_header": null, "social_description": "قل لي من تعاشر، أقول لك من أنت. تعرف على أناس جدد و ابدأ صداقات جديدة", "social_title": "تواصل اجتماعي", + "subscribe_label": null, "visit_us": null }); @@ -43,6 +49,7 @@ $translateProvider.translations("en", { "contributors_title": "contributors", "education_description": "Get smarter, develop new skills and continue growing", "education_title": "education", + "email_hint": "Sign up with your@email.com", "employment_description": "Start networking, get an internship, a job or start new business", "employment_title": "employment", "follow_us": "follow us", @@ -58,18 +65,23 @@ $translateProvider.translations("en", { "language_title": "language", "media-and-communication_description": "Get inspired and learn from other people’s lives and experiences.", "media-and-communication_title": "media & communication", + "newsletter_description": "lorem ipsum in collaboration with this and that date", + "newsletter_title": "newsletter", + "newsletter_registration_info": "Registration done", + "newsletter_registration_exist": "This email is already registered", "refugee_tech_info": "We build bridges between parts of the society to enable newcomers potential relying on efficiently designed and developed solutions", "setelin_description": "Setelin was created as a result of a hackathon that was organised by Refugee Tech, together with Migrationsverket and STHLM TECH. The hackathon joined forces of Swedish tech initiatives who deal with social topics.", "setelin_footer": null, "setelin_header": null, "social_description": "Friends make us who we are, find new friends and meet new folks.", - "social_title": "Social", + "social_title": "social", + "subscribe_label": "subscribe", "visit_us": "visit us" }); $translateProvider.translations("fa", { "about_us": "درباره ما", - "add_your_app": null, + "add_your_app": "اپليكشن خود را اضافه كنيد", "categories": "دسته بندی ها", "choose_language": "انتخاب زبان", "contact": null, @@ -77,6 +89,7 @@ $translateProvider.translations("fa", { "contributors_title": null, "education_description": "باهوش تر شوید و مهارت هایتان را بیافزایید", "education_title": "تحصیلات", + "email_hint": null, "employment_description": "با دیگران ارتباط برقرار کنید،تا کارآموزی ويا شغل ثابت بگیرید", "employment_title": "استخدام", "follow_us": null, @@ -92,12 +105,17 @@ $translateProvider.translations("fa", { "language_title": "زبان", "media-and-communication_description": "از زندگی وتجربیات دیگران الهام بگیرید", "media-and-communication_title": "رسانه و ارتباطات", - "refugee_tech_info": "نهج حصلت على أي أفكار التطبيق المباشر لهم RT إذا المطور يريد تحميل التطبيق .", + "newsletter_description": null, + "newsletter_title": null, + "newsletter_registration_info": null, + "newsletter_registration_exist": null, + "refugee_tech_info": "ما پلى هستيم بين بخش هاى مختلف جامعه تا به وسيله ى تكنولوژى و راه حل هاى سازمان يافته، توانايى هاى مهاجران را شكوفا كنيم.", "setelin_description": "ستلین در یک هکتن با مدیریت رفیوجی تک و همکاری اداره ی مهاجرت و استکهلم تک شکل گرفت. این محفل پروژه هایی که هدف کمک کردن به مسائل اجتماعی دارند را دور هم جمع کرد.\nرفیوجی تک مسؤلیت توسعه وتکمیل کردن پلتفرم ستلین را ، با یاری داوطلبان و همکاران دیگر، به عهده گرفت.", "setelin_footer": null, "setelin_header": null, "social_description": "دوستان جدید بیابید و با مردمان جدید آشنا شوید", "social_title": "اجتماعي", + "subscribe_label": null, "visit_us": null }); @@ -111,6 +129,7 @@ $translateProvider.translations("sv", { "contributors_title": "volontärer", "education_description": "Bli mer skicklig, utveckla nya kompetenser och fortsätt växa", "education_title": "utbildning", + "email_hint": null, "employment_description": "Börja nätverka, få ett internship, ett jobb eller starta eget företag", "employment_title": "jobb", "follow_us": "följ oss", @@ -126,12 +145,17 @@ $translateProvider.translations("sv", { "language_title": "språk", "media-and-communication_description": "Bli inspirerad och ta lärdom från andra människors liv och erfarenheter", "media-and-communication_title": "media & kommunikation", + "newsletter_description": null, + "newsletter_title": "nyhetsbrev", + "newsletter_registration_info": null, + "newsletter_registration_exist": null, "refugee_tech_info": "Vi möjligör samarbete mellan alla delar av samhället med målet att tillvarata potentialen hos nyanlända genom effektivt designade och utvecklade lösningar", "setelin_description": "Setelin är resultatet från ett hackathon organiserat av Refugee Tech tillsammans med Migrationsverket och STHLM TECH.\nRefugee Tech tog på sig att vidareutveckla plattformen tillsammans med voluntärer.", "setelin_footer": null, "setelin_header": null, "social_description": "Vänner gör oss till dem vi är, hitta nya vänner och skapa nya bekantskaper", "social_title": "socialt", + "subscribe_label": null, "visit_us": "besök oss" }); }]); diff --git a/www/js/controllers.js b/www/js/controllers.js index 174a72e..578e73f 100644 --- a/www/js/controllers.js +++ b/www/js/controllers.js @@ -153,6 +153,73 @@ angular.module('starter.controllers', []) $scope.closeapp() } + $ionicModal.fromTemplateUrl('templates/newsletter.html', { + scope: $scope + }).then(function(modal) { + $scope.newsletterModal = modal + }) + + // Triggered in the about modal to close it + $scope.closeNewsletter = function() { + $scope.newsletterModal.hide() + } + + // Open the about aboutModal + $scope.showNewsletter = function() { + $scope.newsletterModal.show() + } + + // Call email registration + $scope.newsletterEmail = null; + // by default hide info message + $scope.showInfo = "ng-hide" + $scope.messageInfo = "newsletter_registration_info" + + $scope.registerEmail = function(email) { + + API.registerEmail(email).$promise.then(function(res) { + //console.log(res); + if(res.status === "exists"){ + $scope.messageInfo = "newsletter_registration_exist" + } else if(res.status === "success") { + $scope.messageInfo = "newsletter_registration_info" + } + + $scope.hideForm = "ng-hide" + $scope.showInfo = "ng-show" + }) + + } + + + // Email validation + /*$scope.validEmail = function(email){ + console.log("newsletterEmail="+email) + var valid = angular.element($scope.binding('mailForm.input.$valid')) + var text = angular.element($scope.binding('newsletterEmail')) + var input = angular.element(email) + + it('should init to model', function(){ + expect(email).toContain('m@m.m') + expect(valid.getText()).toContain('true') + }) + + it('should be invalid if empty', function(){ + input.clear() + input.sendKeys('') + expect(text.getText()).toEqual('text=') + expect(valid.getText()).toContain('false') + }) + + it('should be invalid if not email', function(){ + input.clear() + input.sendKeys('xxx') + expect(valid.getText()).toContain('false') + }) + + }*/ + + $ionicModal.fromTemplateUrl('templates/about.html', { scope: $scope }).then(function(modal) { @@ -169,12 +236,6 @@ angular.module('starter.controllers', []) $scope.aboutModal.show() } - // Perform the about action when the user submits the app form - $scope.doapp = function() { - $scope.closeapp() - } - - /* Begin Favorite functions */ $scope.toggleFavorites = function() { diff --git a/www/js/controllers.js.rej b/www/js/controllers.js.rej new file mode 100644 index 0000000..19804f1 --- /dev/null +++ b/www/js/controllers.js.rej @@ -0,0 +1,14 @@ +diff a/www/js/controllers.js b/www/js/controllers.js (rejected hunks) +@@ -169,6 +169,12 @@ + $scope.newsletterModal.show() + } + ++ $scope.newsletterEmail = null; ++ $scope.registerEmail = function(email) { ++ console.log(email); ++ API.registerEmail(email) ++ } ++ + $ionicModal.fromTemplateUrl('templates/about.html', { + scope: $scope + }).then(function(modal) { diff --git a/www/js/services.js b/www/js/services.js index 33c1b0d..0381ab9 100644 --- a/www/js/services.js +++ b/www/js/services.js @@ -75,13 +75,20 @@ downv.get({id: projectId}) } + //for newsletter + var newsletter = $resource('https://refugeetech-projecthub-cms.meteorapp.com/api/v02/newsletter/:email', {email: '@email'}) + var registerEmail = function (mail) { + return newsletter.get({email: mail}) + } + return { favoriteStore: favoriteStore, categories: getCategories, projects: getProjects, projectById: getProjectById, upVote: upVote, - downVote: downVote + downVote: downVote, + registerEmail: registerEmail } } diff --git a/www/templates/about.html b/www/templates/about.html index 793e10b..8f5eb44 100644 --- a/www/templates/about.html +++ b/www/templates/about.html @@ -19,66 +19,32 @@

{{ 'about_us' | translate }}

--> +
+

{{ 'contributors_title' | translate }}

{{ 'contributors_description' | translate }}

-
-
-
-
-
-
- -
+ diff --git a/www/templates/newsletter.html b/www/templates/newsletter.html new file mode 100644 index 0000000..ba811b5 --- /dev/null +++ b/www/templates/newsletter.html @@ -0,0 +1,50 @@ + + +
+ +
+ +