Skip to content

Commit

Permalink
req
Browse files Browse the repository at this point in the history
  • Loading branch information
Marshmello88 committed Oct 31, 2020
1 parent f8c28cd commit f53d86d
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 55 deletions.
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: python manage.py
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,15 @@ add items to their cart.

21) User can also leave a review.

#Tested on
# Tested on

Ipad pro (landscape and portrait), laptop with HPDI, laptop with MPDI, iphone 5, iphone 6/7/8, iphone 6/7/8 plus, iphone X
(phones tested in portrait mode).

#Nice to haves
# Nice to haves

- When adding a product to favorites include some type of heart animation
- Responsive on more devices
-


Expand Down
6 changes: 5 additions & 1 deletion ecommerce_project/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/

# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'vj&*5($z3h8k#azn@o0*yr*9=d4^4ur%t9&$7^&)=c5etekpp@'
SECRET_KEY = os.environ.get

# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
Expand Down Expand Up @@ -165,12 +165,16 @@
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/3.1/howto/static-files/

STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
STATIC_TMP = os.path.join(BASE_DIR, 'static')

STATIC_URL = '/static/'
STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')]

MEDIA_URL = '/media/'
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')


#FREE_DELIVERY_THRESHOLD = 50
#STANDARD_DELIVERY_PERCENTAGE = 10

Expand Down
4 changes: 4 additions & 0 deletions static/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -1043,6 +1043,10 @@ p {
/* Portrait and Landscape */

@media only screen and (min-device-width: 320px) and (max-device-width: 568px) and (-webkit-min-device-pixel-ratio: 2) {
.shopwidth {
text-align: center!important;
padding: 0;
}
.brandinfosection {
margin: 0 auto;
display: block!important;
Expand Down
17 changes: 1 addition & 16 deletions templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -127,25 +127,10 @@ <h2 class="h2margin">Subscribe for special offers!</h2>
</div>
</section>
<!-- FOOTER n stuff -->
<footer class="myfooter">
<footer class="myfooter text-center">
<hr class="separator">
<div class="shopwidth">
<div class="">
<div class="table-item-footer half1 xtramargin">
<div class="payment-icons">
<ul class="payment-method-icons-list">
<li class="payment-icon">
<i class="fab fa-paypal"></i>
</li>
<li class="payment-icon">
<i class="fab fa-ideal"></i>
</li>
<li class="payment-icon">
<i class="fab fa-cc-mastercard"></i>
</li>
</ul>
</div>
</div>
<div class="table-item-footer half2 xtramargin">
<div class="txtalign">
<small class="site-footer__copyright-content">© 2020, <a href="/" title="">Whatever©</a></small>
Expand Down
36 changes: 0 additions & 36 deletions templates/random.html

This file was deleted.

0 comments on commit f53d86d

Please sign in to comment.