Skip to content

added the js files for countrycode dropdown #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 383 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
383 commits
Select commit Hold shift + click to select a range
55e0c5d
added old_code dir to gitignore
fatimarafiqui Jun 6, 2017
aa0f369
Update README.md
fatimarafiqui Jun 6, 2017
eeeb13b
Updating vendor/README.md
fatimarafiqui Jun 6, 2017
ad4f2a4
Updated README.md
fatimarafiqui Jun 6, 2017
4e0b1db
Merge pull request #231 from fatimarafiqui/wip/mvt
AkankshaBodhankar Jun 7, 2017
5cbba6f
set session start and sanitized the get and post data
fatimarafiqui Jun 5, 2017
242309e
Reused mysqli using OOPs concepts
fatimarafiqui Jun 4, 2017
202613f
added csrf token at the bottom of all pages for session validation
fatimarafiqui Jun 4, 2017
58d02fd
Adding styles for login
fatimarafiqui Jun 5, 2017
37ba437
Added user authentication class modules and methods
fatimarafiqui Jun 5, 2017
83095d5
set HOST to localhost root
fatimarafiqui Jun 6, 2017
1a1c7a3
Added jsonify and email validation for login and sign up
fatimarafiqui Jun 6, 2017
d6ec821
UI for login and signup with firstaide logo
fatimarafiqui Jun 6, 2017
d0da538
updated routing urls and added country array
fatimarafiqui Jun 6, 2017
508016a
Added User module and move the relevant code from Authentication modu…
fatimarafiqui Jun 6, 2017
5e042d0
added country list json and js for login/signup
fatimarafiqui Jun 6, 2017
b2d11e1
Added gulp for minification of stylesheets and updated sign up UI
fatimarafiqui Jun 7, 2017
8f062e0
Added AJAX call handler for login and signup
fatimarafiqui Jun 7, 2017
9849a7f
Added node_modules directory to gitignore
fatimarafiqui Jun 7, 2017
1f8bda8
Updated readme section for node_modules directory
fatimarafiqui Jun 7, 2017
694c6d7
PSR-2 Standards Enforcement
fatimarafiqui Jun 7, 2017
47cdca0
Merge pull request #232 from fatimarafiqui/wip/auth
MehaKaushik Jun 9, 2017
619e3ac
Moved codesniffer dependency to require-dev
fatimarafiqui Jun 9, 2017
09fe4d9
PSR-2 Enforcement
fatimarafiqui Jun 9, 2017
06f7a45
Moved 'javascripts' variable to 'page' array
fatimarafiqui Jun 9, 2017
f80d64d
Removed console log
fatimarafiqui Jun 9, 2017
2246980
Adding routing and page rendering logic
fatimarafiqui Jun 9, 2017
112e600
Removing unnecessary code
fatimarafiqui Jun 9, 2017
b12daba
Added styles for various page layouts
fatimarafiqui Jun 9, 2017
bd94623
Changed Home user interface
fatimarafiqui Jun 9, 2017
9e07fad
Added page layouts
fatimarafiqui Jun 9, 2017
e294c7a
Added Page content twigs
fatimarafiqui Jun 9, 2017
b05c9df
Cleanup: Removing unnecessary code
fatimarafiqui Jun 9, 2017
1bfe479
Fixing login redirect routing logic
fatimarafiqui Jun 9, 2017
45f71ee
Merge pull request #233 from fatimarafiqui/wip/pages_week2
prathmeshranaut Jun 10, 2017
8ba5c32
Updated settings variables and added not empty
fatimarafiqui Jun 12, 2017
de91f47
added segment vertical scroll
fatimarafiqui Jun 12, 2017
8495d50
add pages to router
fatimarafiqui Jun 12, 2017
5fc2870
added styles for segments and other pages
fatimarafiqui Jun 12, 2017
dd1f4a0
updated layouts and added multi segment layout
fatimarafiqui Jun 13, 2017
6c3243f
Added common questions partial layouts
fatimarafiqui Jun 13, 2017
6d845bd
Added safety plan partial and other layouts
fatimarafiqui Jun 13, 2017
7020bcd
Added dependency installer bash script
fatimarafiqui Jun 13, 2017
a2325cb
PSR2 Enforcement
fatimarafiqui Jun 13, 2017
dd65fed
Fixing indentation in html files
fatimarafiqui Jun 14, 2017
745331b
Merge pull request #234 from fatimarafiqui/wip/pages_week3
AkankshaBodhankar Jun 14, 2017
6758d4e
Added glossary routes
fatimarafiqui Jun 14, 2017
6979fe4
Added stylesheets for glossary section
fatimarafiqui Jun 14, 2017
8fd34b7
Added Glossary page layout
fatimarafiqui Jun 14, 2017
d7349f3
Indentation fix
fatimarafiqui Jun 15, 2017
4d330fe
Merge pull request #235 from fatimarafiqui/wip/pages_glossary
MehaKaushik Jun 15, 2017
faf142d
Added routing logic for pages
fatimarafiqui Jun 15, 2017
2dbee32
Added stylesheets for corresponding pages
fatimarafiqui Jun 15, 2017
5d5e963
Added sub module pages
fatimarafiqui Jun 15, 2017
5772385
Fixing CSS format
fatimarafiqui Jun 16, 2017
e12277f
Reverting the CSS formatting
fatimarafiqui Jun 16, 2017
e155070
Cleanup
fatimarafiqui Jun 16, 2017
3a042bb
Merge pull request #236 from fatimarafiqui/wip/more_pages
MehaKaushik Jun 16, 2017
ecda3ce
Updated author details and url in package.json
fatimarafiqui Jun 19, 2017
fbd64c9
Adding contributors array
fatimarafiqui Jun 19, 2017
dccdacd
Revert contributors array
fatimarafiqui Jun 19, 2017
872d4bb
Merge pull request #237 from fatimarafiqui/bug/package
npari Jun 19, 2017
9622416
Added routing for all the modules
fatimarafiqui Jun 21, 2017
588b94d
Moved license from old_code to current directory
fatimarafiqui Jun 21, 2017
c4f1c3a
Added routing for coming soon page
fatimarafiqui Jun 21, 2017
24a2b88
PSR-2 Enforcement
fatimarafiqui Jun 21, 2017
afb1034
Added partial twig for coming soon
fatimarafiqui Jun 21, 2017
7035a43
Merge pull request #238 from fatimarafiqui/wip/under_development
prathmeshranaut Jun 22, 2017
e170f0e
Mapping circle of trust to menu
fatimarafiqui Jun 19, 2017
a0a7c14
Added responsiveness for menubar for smaller screen resolutions
fatimarafiqui Jun 20, 2017
bc69fb9
Added client side validation for password length
fatimarafiqui Jun 20, 2017
9dc6862
Created user object for system wide usage
fatimarafiqui Jun 23, 2017
3e9d533
Added routing for circle of trust
fatimarafiqui Jun 23, 2017
be16f48
Added stylesheets for circle of trust
fatimarafiqui Jun 23, 2017
e150379
Added method for updating comrade details for user
fatimarafiqui Jun 23, 2017
b6a8c93
Added handler for circle of trust
fatimarafiqui Jun 23, 2017
fb9144b
added images for circle of trust icons
fatimarafiqui Jun 23, 2017
e5a5d3a
Added partial template
fatimarafiqui Jun 23, 2017
e99c31d
Added js for circle of trust
fatimarafiqui Jun 23, 2017
3c4da27
Merge branch 'develop' of github.com:systers/FirstAide-web into wip/c…
fatimarafiqui Jun 23, 2017
2ac1f77
Removing dump and cleanup
fatimarafiqui Jun 29, 2017
987172a
Merge pull request #239 from fatimarafiqui/wip/circle_of_trust
prathmeshranaut Jun 29, 2017
13ac9ca
Added getHelpNow section to menu
fatimarafiqui Jun 29, 2017
6b8f513
Added routing Twig structure for GetHelpNow
fatimarafiqui Jun 29, 2017
83f2735
Added stylesheets for Get Help Now
fatimarafiqui Jun 29, 2017
c156469
Added templated for the module
fatimarafiqui Jun 29, 2017
401f1c1
Added js for the module
fatimarafiqui Jun 29, 2017
4edb76d
Indentation fix
fatimarafiqui Jun 29, 2017
6500afa
Merge pull request #240 from fatimarafiqui/wip/get_help_now
prathmeshranaut Jul 2, 2017
3241758
Added session token validation for application wide users
fatimarafiqui Jul 3, 2017
0837a93
Added object creation using session id and other methods
fatimarafiqui Jul 3, 2017
860a95d
Added object creation using user_id and other get methods
fatimarafiqui Jul 4, 2017
c0feaee
Added session management functionality on login and logout
fatimarafiqui Jul 4, 2017
a5af2ed
Create .travis.yml
fatimarafiqui Jul 5, 2017
bd7470b
Adding comments
fatimarafiqui Jul 6, 2017
393d49a
comment for lint
fatimarafiqui Jul 6, 2017
c50b748
updated gitignore old_code
fatimarafiqui Jul 9, 2017
edbf5b5
updated composer
fatimarafiqui Jul 9, 2017
d1acd1f
enforced psr2 standards
fatimarafiqui Jul 9, 2017
70f73fe
Added Unit tests for Authentication module
fatimarafiqui Jul 9, 2017
6cb6d60
Fixing Unit test error
fatimarafiqui Jul 9, 2017
1e8338c
Merge pull request #245 from fatimarafiqui/wip/travis
prathmeshranaut Jul 10, 2017
d9c9073
Fixing indentation issue in composer
fatimarafiqui Jul 11, 2017
f421bd5
Removing echo statements from the tests
fatimarafiqui Jul 11, 2017
950cd8c
Adding namespace
fatimarafiqui Jul 12, 2017
7f115aa
Added db mockery support - db instance
fatimarafiqui Jul 12, 2017
44cf69b
Added tests namespace to composer
fatimarafiqui Jul 13, 2017
4a8fdba
Added wrappers for mockery of MySql
fatimarafiqui Jul 13, 2017
6820a06
Added compatibility for database wrapper
fatimarafiqui Jul 13, 2017
e0dcadd
Added unit test using mocked db
fatimarafiqui Jul 13, 2017
5c478ef
Seperated constants from settings file
fatimarafiqui Jul 14, 2017
31e790a
Update getEmail method
fatimarafiqui Jul 13, 2017
78d3bc3
Update getEmail method
fatimarafiqui Jul 14, 2017
336a6ef
Updated user modules and added fixes
fatimarafiqui Jul 14, 2017
253788c
added affected rows method to mysqli wrapper
fatimarafiqui Jul 15, 2017
ef9ab3b
Changed query execution flow in mock mysqli wrapper
fatimarafiqui Jul 16, 2017
a15891f
Added more tests to User modules
fatimarafiqui Jul 16, 2017
83c7f4f
Enforced PSR2
fatimarafiqui Jul 16, 2017
a4986df
Merge branch 'develop' of github.com:systers/FirstAide-web into wip/m…
fatimarafiqui Jul 16, 2017
ee53554
clean up: removed AuthenticationTest
fatimarafiqui Jul 16, 2017
c9ec9b0
Updated Travis
fatimarafiqui Jul 16, 2017
1e755e3
Added detailed comments according to PSR Standards
fatimarafiqui Jul 17, 2017
699b6d7
Merge pull request #247 from fatimarafiqui/wip/mockery
MehaKaushik Jul 18, 2017
28a8fba
Change parameters of getPage() for mockery
fatimarafiqui Jul 18, 2017
d3c2edd
restructure router function for mockery
fatimarafiqui Jul 18, 2017
d463989
Unit tests for Router module
fatimarafiqui Jul 18, 2017
491e70f
Removed License from the repository
fatimarafiqui Jul 18, 2017
adfb05c
Merge pull request #249 from fatimarafiqui/feat/remove_license
MehaKaushik Jul 19, 2017
1b205e1
MISC - Update ReadMe for FirstAideWeb
npari Jul 20, 2017
1e484f2
Merge pull request #251 from systers/npari-readme-update
npari Jul 20, 2017
f1876ae
Merge branch 'develop' of github.com:fatimarafiqui/FirstAide-web into…
fatimarafiqui Jul 25, 2017
00266ee
restructure router logic and modularity
fatimarafiqui Jul 26, 2017
686e782
PSR2 Enforcement and Travis Build Fix
fatimarafiqui Jul 26, 2017
daad66f
Added dummy user obj for logged out users
fatimarafiqui Jul 26, 2017
899cd13
Added unit tests for various templates
fatimarafiqui Jul 26, 2017
0ac4d77
change getTwig method to static method
fatimarafiqui Jul 26, 2017
680ffbf
enforcing psr2
fatimarafiqui Jul 26, 2017
4224978
fixing travis build failure
fatimarafiqui Jul 26, 2017
993d249
Merge pull request #252 from fatimarafiqui/fix/travis_precise_os
MehaKaushik Jul 26, 2017
2d5fde5
Merge branch 'develop' of github.com:systers/FirstAide-web into wip/r…
fatimarafiqui Jul 26, 2017
c9d16c5
Merge pull request #248 from fatimarafiqui/wip/router_test
npari Jul 26, 2017
894f959
Added notification module
fatimarafiqui Jul 27, 2017
dff9cf5
Added method getCircleOfTrustNumbers and other fix
fatimarafiqui Jul 27, 2017
9941bcb
Added js for notification functionality
fatimarafiqui Jul 27, 2017
e11938b
Updated template for sending sms
fatimarafiqui Jul 27, 2017
4a2a3ae
Added AJAX handlers for sending notifications
fatimarafiqui Jul 27, 2017
aad0d71
added test functionality to notification module
fatimarafiqui Jul 27, 2017
eac82fb
fix
fatimarafiqui Jul 27, 2017
a31030a
added tests for notification module
fatimarafiqui Jul 27, 2017
a68e559
added settings for twilio test credentials
fatimarafiqui Jul 27, 2017
e23f301
enforcing psr2
fatimarafiqui Jul 27, 2017
a8539ff
minor clean up
fatimarafiqui Jul 27, 2017
fcf2ba7
Added Twilio test credentials for unit tests
fatimarafiqui Jul 27, 2017
f71c53e
Added block comments for all methods
fatimarafiqui Jul 27, 2017
732fdd1
Added message response constant and change commenting style
fatimarafiqui Aug 2, 2017
bc31fb5
seperated logics from switch case and enhanced modularity
fatimarafiqui Aug 2, 2017
b10d826
added positive and negative tests for notification validity
fatimarafiqui Aug 2, 2017
473ea9e
Remove unused code and cleanup
fatimarafiqui Aug 2, 2017
b9a4204
Added block comments to user module
fatimarafiqui Aug 2, 2017
b5c8807
Added more comments
fatimarafiqui Aug 2, 2017
3119439
Merge pull request #254 from fatimarafiqui/wip/notification_module
npari Aug 2, 2017
b477c3c
Added dependencies to install shell script (#255)
fatimarafiqui Aug 3, 2017
7a826af
moved phpunit tests
fatimarafiqui Aug 6, 2017
8571416
renamed javascripts directory
fatimarafiqui Aug 6, 2017
ce7302f
renamed javascripts directory
fatimarafiqui Aug 6, 2017
501e19a
Added js test for validation.js
fatimarafiqui Aug 6, 2017
f5ea37e
added karma test to travis
fatimarafiqui Aug 6, 2017
caa16c9
enforcing PSR2
fatimarafiqui Aug 6, 2017
7079d67
travis fixed
fatimarafiqui Aug 6, 2017
e398e25
Added block comments
fatimarafiqui Aug 6, 2017
5bc0455
Unit tests for Authentication Module (#250)
fatimarafiqui Aug 6, 2017
4c3c626
Merge branch 'develop' of github.com:systers/FirstAide-web into wip/j…
fatimarafiqui Aug 7, 2017
2be366d
Merge pull request #260 from fatimarafiqui/wip/jsTests
MehaKaushik Aug 7, 2017
b463122
Added more plugins to config
fatimarafiqui Aug 7, 2017
0fa7787
added more node packages for jasmine dependencies
fatimarafiqui Aug 7, 2017
9f0f0da
clean up and added article div
fatimarafiqui Aug 7, 2017
fc0bb49
added specs for index.js
fatimarafiqui Aug 7, 2017
b68f038
moved code to functions
fatimarafiqui Aug 8, 2017
2da8252
added more specs
fatimarafiqui Aug 8, 2017
3841c15
Added block comments to indexSpec.js
fatimarafiqui Aug 9, 2017
993082b
suggested changes for PR
fatimarafiqui Aug 14, 2017
42ac61e
moved code to functions
fatimarafiqui Aug 14, 2017
e2a061a
added specs for menu.js
fatimarafiqui Aug 14, 2017
308547d
Javascript Unit tests and Refactoring of code for index.js (#261)
fatimarafiqui Aug 15, 2017
0edf4fc
added sudo to install.sh
fatimarafiqui Aug 15, 2017
8dac22e
Merge branch 'develop' of github.com:systers/FirstAide-web into wip/j…
fatimarafiqui Aug 15, 2017
608a045
added comments and changed variable names
fatimarafiqui Aug 15, 2017
18696ca
moved AuthenticationTest file to phpUnitTests
fatimarafiqui Aug 17, 2017
aac881a
added screen width to comments
fatimarafiqui Aug 17, 2017
ff4a2ef
Merge pull request #263 from fatimarafiqui/fix/tests
MehaKaushik Aug 17, 2017
b0b5865
Merge pull request #262 from fatimarafiqui/wip/jsTestsMenu
fatimarafiqui Aug 18, 2017
b8fd92f
flushed
fatimarafiqui Aug 21, 2017
9308139
added template for settings page UI
fatimarafiqui Aug 21, 2017
8f66b26
Added route for settings page
fatimarafiqui Aug 21, 2017
a59f29e
Added styles for account settings
fatimarafiqui Aug 21, 2017
37a2266
Added minor tweaks in ui rendering
fatimarafiqui Aug 21, 2017
bd4d882
Fixing travis build failure
fatimarafiqui Aug 21, 2017
c67af03
Refactoring js file for testability
fatimarafiqui Aug 21, 2017
631ee10
Added specs for gethelpnow js file
fatimarafiqui Aug 21, 2017
59ba11b
Added design document UML diagrams for FirstAide
fatimarafiqui Aug 21, 2017
5cd0eb4
Merge pull request #267 from fatimarafiqui/wip/project_docs
fatimarafiqui Aug 21, 2017
e0540b2
Refactoring circle_of_trust.js and added Javascript Unit Tests for t…
fatimarafiqui Aug 21, 2017
8502e23
Merge branch 'develop' of github.com:fatimarafiqui/FirstAide-web into…
fatimarafiqui Aug 21, 2017
2c67e63
Merge pull request #268 from fatimarafiqui/flush
fatimarafiqui Aug 21, 2017
423c119
Added karma-jasmine to travis
fatimarafiqui Aug 22, 2017
756775e
Merge pull request #265 from fatimarafiqui/feat/settings
fatimarafiqui Aug 22, 2017
36a9265
added logout to menu
fatimarafiqui Aug 22, 2017
7a7fdc5
added logout funtionality
fatimarafiqui Aug 22, 2017
260e555
updated menu template for logout
fatimarafiqui Aug 22, 2017
96c7881
added welcome message to homepage
fatimarafiqui Aug 22, 2017
a45d85e
Merge pull request #266 from fatimarafiqui/wip/jsTestsGetHelp
fatimarafiqui Aug 23, 2017
06097c4
Merge pull request #269 from fatimarafiqui/feat/travis_jasmine
Anjali05 Aug 23, 2017
c7afc25
Merge pull request #270 from fatimarafiqui/feat/logout
Anjali05 Aug 23, 2017
704a842
Merge pull request #271 from fatimarafiqui/feat/home
Anjali05 Aug 23, 2017
0eb9566
Added edit user details functionality to index.js
fatimarafiqui Aug 24, 2017
abdaadb
Added settings to menu
fatimarafiqui Aug 24, 2017
91565b6
added updateUserInfo
fatimarafiqui Aug 24, 2017
256fa2c
Added edit user details functionality to ajax call
fatimarafiqui Aug 24, 2017
3970272
added styles
fatimarafiqui Aug 24, 2017
c14bac2
updated template
fatimarafiqui Aug 24, 2017
ca26da7
add modal and twig data to templates
fatimarafiqui Aug 24, 2017
e251567
enforcing PSR2
fatimarafiqui Aug 24, 2017
3d453c0
fixing travis error
fatimarafiqui Aug 24, 2017
6b92daa
Added unit tests
fatimarafiqui Aug 24, 2017
41f97ef
Added more assert
fatimarafiqui Aug 24, 2017
3fe2d0c
Added block comments
fatimarafiqui Aug 24, 2017
c726756
Removed white space and psr2 fix
fatimarafiqui Aug 24, 2017
652ee9e
fixed minor issue
fatimarafiqui Aug 24, 2017
451a22d
fixed indentation
fatimarafiqui Aug 24, 2017
2f76b61
Merge pull request #272 from fatimarafiqui/feat/settings
fatimarafiqui Aug 24, 2017
222a500
Fix
fatimarafiqui Aug 26, 2017
83749d9
Merge pull request #273 from fatimarafiqui/fix/demo
Anjali05 Aug 26, 2017
39f6699
Changed logo URL to home
fatimarafiqui Aug 26, 2017
348fdb4
Refactored multi_segment.js
fatimarafiqui Aug 26, 2017
38e7746
added tests for multi_segment.js
fatimarafiqui Aug 26, 2017
5281f2f
Merge branch 'develop' of github.com:fatimarafiqui/FirstAide-web into…
fatimarafiqui Aug 26, 2017
5307bff
Added block comments
fatimarafiqui Aug 26, 2017
87d65aa
Merge pull request #274 from fatimarafiqui/wip/jsTestsMultiSeg
fatimarafiqui Aug 27, 2017
476c4b1
Added License to the repository
fatimarafiqui Aug 30, 2017
ad0061f
Added database schema
fatimarafiqui Aug 30, 2017
33b310a
Merge pull request #279 from fatimarafiqui/add-license-1
MehaKaushik Aug 30, 2017
8c5bbe8
Merge pull request #280 from fatimarafiqui/docs/config_files
fatimarafiqui Aug 30, 2017
21dd149
Create code_of_conduct.md
Nov 8, 2017
f191540
Create reporting_guidelines.md
Nov 8, 2017
eb8c3b8
Create ISSUE_TEMPLATE.md
janiceilene Jan 29, 2018
20e9f72
Create PULL_REQUEST_TEMPLATE.md
janiceilene Jan 29, 2018
7b3103a
Merge pull request #286 from systers/Janiceilene-patch-3
Apr 25, 2018
2869e2f
Merge pull request #285 from systers/Janiceilene-patch-2
Apr 25, 2018
558afc5
Created CONTRIBUTING.md (#284)
janiceilene Apr 25, 2018
b376097
Janiceilene patch 1 (#289)
Apr 25, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added more assert
  • Loading branch information
fatimarafiqui committed Aug 24, 2017
commit 41f97efb3b1c45ac20eafb4da79408d3a46cd7b0
2 changes: 2 additions & 0 deletions tests/phpUnitTests/modules/UserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ private function assertUserInfoUpdatedWithValidData(
$this->assertInstanceOf(User::class, $userObj);
$updatedResponse = $userObj->updateUserInfo($user);
$this->assertTrue($updatedResponse['response']);
$this->assertTrue($updatedResponse['reload']);
$userCounter += 1;
}

Expand All @@ -253,6 +254,7 @@ private function assertUserInfoUpdatedWithInvalidData(
$this->assertInstanceOf(User::class, $userObj);
$updatedResponse = $userObj->updateUserInfo($user);
$this->assertFalse($updatedResponse['response']);
$this->assertTrue($updatedResponse['reload']);
$userCounter += 1;
}

Expand Down