Skip to content

G
getme
Commit 29206c33 by amal
Options

Merge branch 'amal' into 'master'

Amal See merge request !37
parents 0ef467a6 d9635d89
Showing with 91 additions and 23 deletions
.git.zip deleted 100644 → 0
File deleted
config.xml
...@@ -105,5 +105,5 @@ ...@@ -105,5 +105,5 @@
</plugin> </plugin>
<plugin name="cordova-plugin-nativegeocoder" spec="3.2.2" /> <plugin name="cordova-plugin-nativegeocoder" spec="3.2.2" />
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" /> <plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
<engine name="android" spec="^8.0.0" /> <engine name="android" spec="8.0.0" />
</widget> </widget>
package.json
...@@ -33,17 +33,17 @@ ...@@ -33,17 +33,17 @@
"@ionic/storage": "^2.2.0", "@ionic/storage": "^2.2.0",
"@types/googlemaps": "^3.38.0", "@types/googlemaps": "^3.38.0",
"agm-direction": "^0.7.8", "agm-direction": "^0.7.8",
"cordova-android": "^8.0.0", "cordova-android": "8.0.0",
"cordova-plugin-device": "^2.0.2", "cordova-plugin-device": "^2.0.3",
"cordova-plugin-geolocation": "4.0.2", "cordova-plugin-geolocation": "^4.0.2",
"cordova-plugin-googleplus": "^8.1.2", "cordova-plugin-googleplus": "^8.2.0",
"cordova-plugin-ionic-keyboard": "^2.1.3", "cordova-plugin-ionic-keyboard": "^2.2.0",
"cordova-plugin-ionic-webview": "^4.1.1", "cordova-plugin-ionic-webview": "^4.1.3",
"cordova-plugin-nativegeocoder": "3.2.2", "cordova-plugin-nativegeocoder": "^3.2.2",
"cordova-plugin-splashscreen": "^5.0.2", "cordova-plugin-splashscreen": "^5.0.3",
"cordova-plugin-statusbar": "^2.4.2", "cordova-plugin-statusbar": "^2.4.3",
"cordova-plugin-whitelist": "^1.3.3", "cordova-plugin-whitelist": "^1.3.4",
"cordova-sqlite-storage": "^3.3.0", "cordova-sqlite-storage": "^3.4.0",
"core-js": "^2.5.4", "core-js": "^2.5.4",
"firebase": "^6.4.0", "firebase": "^6.4.0",
"rxjs": "~6.5.1", "rxjs": "~6.5.1",
...@@ -94,11 +94,12 @@ ...@@ -94,11 +94,12 @@
"cordova-plugin-nativegeocoder": {}, "cordova-plugin-nativegeocoder": {},
"cordova-sqlite-storage": {}, "cordova-sqlite-storage": {},
"cordova-plugin-googleplus": { "cordova-plugin-googleplus": {
"REVERSED_CLIENT_ID": "com.googleusercontent.apps.949385251610-a6lrfr6uhr73991e38t3t013jj3v56a9" "REVERSED_CLIENT_ID": "com.googleusercontent.apps.949385251610-a6lrfr6uhr73991e38t3t013jj3v56a9",
"PLAY_SERVICES_VERSION": "15.0.1"
} }
}, },
"platforms": [ "platforms": [
"android" "android"
] ]
} }
} }
\ No newline at end of file
src/app/cart/cart.page.scss
...@@ -219,6 +219,10 @@ ...@@ -219,6 +219,10 @@
color: rgba(215, 213, 228, 1); color: rgba(215, 213, 228, 1);
outline: none; outline: none;
} }
&:focus {
color: rgba(215, 213, 228, 1);
outline: none;
}
} }
.add_btn { .add_btn {
color: #29285b; color: #29285b;
...@@ -291,6 +295,9 @@ ...@@ -291,6 +295,9 @@
color: rgba(176, 174, 199, 1); color: rgba(176, 174, 199, 1);
text-align: left; text-align: left;
font-size: 16px; font-size: 16px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
h5 { h5 {
margin: 0px; margin: 0px;
...@@ -300,6 +307,9 @@ ...@@ -300,6 +307,9 @@
font-weight: bolder; font-weight: bolder;
font-size: 20px; font-size: 20px;
padding-top: 10px; padding-top: 10px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
} }
.cart_count { .cart_count {
......
src/app/catstorelist/catstorelist.page.scss
...@@ -61,6 +61,9 @@ ...@@ -61,6 +61,9 @@
letter-spacing: 2px; letter-spacing: 2px;
padding-bottom: 5px; padding-bottom: 5px;
font-size: 14px; font-size: 14px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
p { p {
color: #fff; color: #fff;
...@@ -69,6 +72,9 @@ ...@@ -69,6 +72,9 @@
text-align: left; text-align: left;
font-size: 20px; font-size: 20px;
font-weight: lighter; font-weight: lighter;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
} }
} }
...@@ -114,6 +120,9 @@ ...@@ -114,6 +120,9 @@
letter-spacing: 2px; letter-spacing: 2px;
padding-bottom: 2px; padding-bottom: 2px;
font-size: 14px; font-size: 14px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
p { p {
color: #fff; color: #fff;
...@@ -122,6 +131,9 @@ ...@@ -122,6 +131,9 @@
text-align: left; text-align: left;
font-size: 20px; font-size: 20px;
font-weight: lighter; font-weight: lighter;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
} }
} }
...@@ -158,6 +170,9 @@ ...@@ -158,6 +170,9 @@
color: rgba(59, 57, 77, 1); color: rgba(59, 57, 77, 1);
font-weight: 900; font-weight: 900;
padding-bottom: 2px; padding-bottom: 2px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
img { img {
width: 16px; width: 16px;
} }
...@@ -166,6 +181,9 @@ ...@@ -166,6 +181,9 @@
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
color: rgba(176, 174, 199); color: rgba(176, 174, 199);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
} }
} }
......
src/app/home/home.page.scss
.home_wrapper { .home_wrapper {
width: 100%; width: 100%;
padding-bottom: 50px;
.home_banner { .home_banner {
width: 100%; width: 100%;
height: 300px; height: 300px;
...@@ -26,6 +27,7 @@ ...@@ -26,6 +27,7 @@
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 150px;
} }
} }
ion-slides { ion-slides {
...@@ -61,6 +63,9 @@ ...@@ -61,6 +63,9 @@
letter-spacing: 2px; letter-spacing: 2px;
padding-bottom: 5px; padding-bottom: 5px;
font-size: 14px; font-size: 14px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
p { p {
color: #fff; color: #fff;
...@@ -69,6 +74,9 @@ ...@@ -69,6 +74,9 @@
text-align: left; text-align: left;
font-size: 20px; font-size: 20px;
font-weight: lighter; font-weight: lighter;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
} }
} }
...@@ -121,6 +129,9 @@ ...@@ -121,6 +129,9 @@
letter-spacing: 2px; letter-spacing: 2px;
padding-bottom: 2px; padding-bottom: 2px;
font-size: 14px; font-size: 14px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
p { p {
color: #fff; color: #fff;
...@@ -129,6 +140,9 @@ ...@@ -129,6 +140,9 @@
text-align: left; text-align: left;
font-size: 20px; font-size: 20px;
font-weight: lighter; font-weight: lighter;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
} }
} }
...@@ -165,6 +179,9 @@ ...@@ -165,6 +179,9 @@
color: rgba(59, 57, 77, 1); color: rgba(59, 57, 77, 1);
font-weight: 900; font-weight: 900;
padding-bottom: 2px; padding-bottom: 2px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
img { img {
width: 16px; width: 16px;
} }
...@@ -173,6 +190,9 @@ ...@@ -173,6 +190,9 @@
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
color: rgba(176, 174, 199); color: rgba(176, 174, 199);
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
} }
} }
......
src/app/myorder/myorder.page.scss
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
list-style: none; list-style: none;
padding: 10px; padding: 10px;
padding-bottom: 15px; padding-bottom: 15px;
.order_info{ .order_info {
padding-top: 10px; padding-top: 10px;
padding-bottom: 10px; padding-bottom: 10px;
h5{ h5 {
margin:0px; margin: 0px;
padding:0px; padding: 0px;
} }
.order_track{ .order_track {
background-color: rgba(53, 203, 171, 1); background-color: rgba(53, 203, 171, 1);
color: #fff; color: #fff;
border-radius: 3px; border-radius: 3px;
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
width: 100%;
span { span {
color: #29285b; color: #29285b;
} }
......
src/app/productdetail/productdetail.page.scss
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
width: 100%; width: 100%;
height: 300px; height: 300px;
position: relative; position: relative;
ion-slides {
height: 100%;
}
.fav_icon { .fav_icon {
width: 30px; width: 30px;
height: 30px; height: 30px;
......
src/app/productlist/productlist.page.scss
.product_list { .product_list {
padding-bottom: 50px;
.product_title { .product_title {
padding: 10px; padding: 10px;
padding-bottom: 20px; padding-bottom: 20px;
......
src/app/storelist/storelist.page.html
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<button class="nav_btn nav_back floatLeft" (click)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
</button> </button>
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..."> </div> <input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()">
</div>
<button class="nav_btn nav_search floatRight" *ngIf="!searchShow"> <button class="nav_btn nav_search floatRight" *ngIf="!searchShow">
</button> </button>
<button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"> <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()">
......
src/app/storelist/storelist.page.scss
...@@ -114,6 +114,9 @@ ...@@ -114,6 +114,9 @@
letter-spacing: 2px; letter-spacing: 2px;
padding-bottom: 2px; padding-bottom: 2px;
font-size: 14px; font-size: 14px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
p { p {
color: #fff; color: #fff;
...@@ -122,6 +125,9 @@ ...@@ -122,6 +125,9 @@
text-align: left; text-align: left;
font-size: 20px; font-size: 20px;
font-weight: lighter; font-weight: lighter;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
} }
} }
...@@ -158,6 +164,9 @@ ...@@ -158,6 +164,9 @@
color: rgba(59, 57, 77, 1); color: rgba(59, 57, 77, 1);
font-weight: 900; font-weight: 900;
padding-bottom: 2px; padding-bottom: 2px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
img { img {
width: 16px; width: 16px;
} }
...@@ -166,6 +175,9 @@ ...@@ -166,6 +175,9 @@
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
color: rgba(176, 174, 199); color: rgba(176, 174, 199);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
} }
} }
......
src/global.scss
...@@ -453,8 +453,8 @@ app-deliverypop { ...@@ -453,8 +453,8 @@ app-deliverypop {
height: 17px; height: 17px;
border-radius: 50%; border-radius: 50%;
position: absolute; position: absolute;
top: 2px; top: 5px;
right: 5px; right: 10px;
font-size: 10px; font-size: 10px;
padding: 4px; padding: 4px;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment