Skip to content

Commit

Permalink
Merge pull request #546 from crossroads/master
Browse files Browse the repository at this point in the history
#November2019Release1
  • Loading branch information
namrataukirde authored Nov 13, 2019
2 parents 09ae150 + 3c4ddf5 commit 3df2af5
Show file tree
Hide file tree
Showing 101 changed files with 2,467 additions and 943 deletions.
16 changes: 9 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -213,23 +213,25 @@ jobs:
echo 'export PATH=$PATH:`yarn bin`' >> $BASH_ENV
echo 'export PATH=$PATH:$ANDROID_HOME/tools/gradle/bin' >> $BASH_ENV
- run:
name: Install Gradle 3.3
name: Install Gradle 4.10.3
command: |
wget -O /tmp/gradle.zip https://downloads.gradle.org/distributions/gradle-3.3-bin.zip
wget -O /tmp/gradle.zip https://services.gradle.org/distributions/gradle-4.10.3-all.zip
unzip -d $ANDROID_HOME/tools /tmp/gradle.zip
mv $ANDROID_HOME/tools/gradle-3.3 $ANDROID_HOME/tools/gradle
mv $ANDROID_HOME/tools/gradle-4.10.3 $ANDROID_HOME/tools/gradle
- run:
name: Download Google-services file
command: |
yarn run azure-filestore download -d stock/$ENVIRONMENT -f google-services.json
mv google-services.json ~/code/cordova
mv ~/code/google-services.json ~/code/cordova
working_directory: ~/code
- run:
name: Download Keystore File
command: |
yarn run azure-filestore download -f $KEYSTORE
mv $KEYSTORE ~/code/cordova
working_directory: ~/code
- run: yes | sdkmanager --licenses || exit 0
- run: yes | sdkmanager --update || exit 0
- run:
name: Download Google Play Store Key file
command: |
Expand All @@ -241,7 +243,7 @@ jobs:
command: bundle exec rake ${ENVIRONMENT} android app:build
working_directory: cordova
- store_artifacts:
path: cordova/platforms/android/build/outputs/apk/
path: cordova/platforms/android/app/build/outputs/apk/
- run:
name: release android build
command: bundle exec fastlane android ${ENVIRONMENT}
Expand Down Expand Up @@ -269,8 +271,8 @@ jobs:
command: |
echo 'export STAGING=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo false; else echo true; fi)' >> $BASH_ENV
echo 'export ENVIRONMENT=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo production; else echo staging; fi)' >> $BASH_ENV
echo 'export PROVISIONING_PROFILE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo 'GoodCityStock.mobileprovision'; else echo 'GoodCity_Stock_Staging.mobileprovision'; fi)' >> $BASH_ENV
echo 'export CERTIFICATE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo 'Goodcity_2020.p12'; else echo 'GoodCity_2019_Development.p12'; fi)' >> $BASH_ENV
echo 'export PROVISIONING_PROFILE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo 'GoodCityStock.mobileprovision'; else echo 'GoodCityStockStaging.mobileprovision'; fi)' >> $BASH_ENV
echo 'export CERTIFICATE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo 'Goodcity_2020.p12'; else echo 'GoodCity_2020_Development.p12'; fi)' >> $BASH_ENV
- run:
command: |
npm rebuild node-sass
Expand Down
35 changes: 35 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
### Ticket Link:

NOTE: Specify ticket link

### What does this PR do?

FEATURE: Specify feature name

BUG: Specify bug

NOTE: Give a description of what this PR does. If it fixes any bug, specify cause of an issue and approach/solution added to fix that issue.


### Impacted Areas

NOTE: List any impacted areas (e.g. Dashboard > My Active Offers > scheduled )


### Screenshots

NOTE: Attach screeenshots if PR contains any UI changes

### Mockup Link

Note: Specify mockup link

### Linked PR's:

NOTE: If these changes are related to some existing PR or fixes any issue from existing PR changes, specify PR links.

### Linked Slack conversation:

NOTE: IF there is any conversation happened for current changes in any of the slack channel, mention the slack message link.

### Any Open question(s) or challenge(s):
42 changes: 21 additions & 21 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.0)
CFPropertyList (3.0.1)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
atomos (0.1.3)
babosa (1.0.2)
babosa (1.0.3)
capistrano (3.4.0)
i18n
rake (>= 10.0.0)
Expand Down Expand Up @@ -62,16 +62,16 @@ GEM
dotenv (2.7.5)
emoji_regex (1.0.1)
escape (0.0.4)
excon (0.66.0)
faraday (0.15.4)
excon (0.68.0)
faraday (0.17.0)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.5)
fastlane (2.129.0)
fastimage (2.1.7)
fastlane (2.135.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
Expand All @@ -81,9 +81,9 @@ GEM
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 2.0)
excon (>= 0.45.0, < 1.0.0)
faraday (~> 0.9)
faraday (~> 0.17)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 0.9)
faraday_middleware (~> 0.13.1)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-api-client (>= 0.21.2, < 0.24.0)
Expand All @@ -96,7 +96,7 @@ GEM
multipart-post (~> 2.0.0)
plist (>= 3.1.0, < 4.0.0)
public_suffix (~> 2.0.0)
rubyzip (>= 1.2.2, < 2.0.0)
rubyzip (>= 1.3.0, < 2.0.0)
security (= 0.1.3)
simctl (~> 1.6.3)
slack-notifier (>= 2.0.0, < 3.0.0)
Expand All @@ -119,9 +119,9 @@ GEM
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.9)
google-cloud-core (1.3.0)
google-cloud-core (1.4.1)
google-cloud-env (~> 1.0)
google-cloud-env (1.2.0)
google-cloud-env (1.3.0)
faraday (~> 0.11)
google-cloud-storage (1.16.0)
digest-crc (~> 0.4)
Expand All @@ -143,14 +143,14 @@ GEM
concurrent-ruby (~> 1.0)
json (2.2.0)
jwt (2.1.0)
memoist (0.16.0)
mime-types (3.2.2)
memoist (0.16.1)
mime-types (3.3)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
mime-types-data (3.2019.1009)
mini_magick (4.9.5)
minitest (5.11.3)
molinillo (0.6.6)
multi_json (1.13.1)
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
nanaimo (0.2.6)
Expand All @@ -171,14 +171,14 @@ GEM
retriable (3.1.2)
rouge (2.0.7)
ruby-macho (1.4.0)
rubyzip (1.2.3)
rubyzip (1.3.0)
security (0.1.3)
signet (0.11.0)
signet (0.12.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.5)
simctl (1.6.6)
CFPropertyList
naturally
slack-notifier (2.3.2)
Expand All @@ -201,7 +201,7 @@ GEM
unf_ext (0.0.7.6)
unicode-display_width (1.6.0)
word_wrap (1.0.0)
xcodeproj (1.12.0)
xcodeproj (1.13.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ def mobile_provisioning_file
file = if production_env?
"GoodCityStock.mobileprovision"
else
"GoodCity_Stock_Staging.mobileprovision"
"GoodCityStockStaging.mobileprovision"
end
File.join(prefix, file)
end
Expand Down
53 changes: 53 additions & 0 deletions app/components/goodcity/locations-search-overlay.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import Ember from "ember";
import _ from "lodash";
import SearchMixin from "stock/mixins/search_resource";

/**
* An overlay that pops up from the bottom of the screen, allowing the user
* to search and select a location.
*
* The popup *does not* do anything to the location apart from returning it
*
* @property {boolean} open whether the popup is visible or not
* @property {function} onSelect callback triggered when an order is selected
*/
export default Ember.Component.extend(SearchMixin, {
searchProps: {},
autoLoad: true,
store: Ember.inject.service(),
perPage: 10,

init() {
this._super(...arguments);
this.set("uuid", _.uniqueId("location_search_overlay_"));
},

recentlyUsedLocations: Ember.computed("open", function() {
return this.get("store")
.peekAll("location")
.sortBy("recentlyUsedAt")
.slice(0, 10);
}),

showRecentlyUsed: Ember.computed.not("searchText"),

actions: {
cancel() {
this.send("selectLocation", null);
this.set("searchText", "");
},

selectLocation(location) {
this.getWithDefault("onSelect", _.noop)(location);
this.set("open", false);
},

loadMoreLocations(pageNo) {
const params = this.trimQuery(
_.merge({}, this.getSearchQuery(), this.getPaginationQuery(pageNo))
);

return this.get("store").query("location", params);
}
}
});
Loading

0 comments on commit 3df2af5

Please sign in to comment.