Skip to content

Commit 0d1609e

Browse files
committed
Refactor Controller/Merchandise related functions and corresponding Models and Views
1 parent f5a85ce commit 0d1609e

34 files changed

+669
-856
lines changed

composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
"App\\Controller\\Account\\": "src/Controllers/Account",
2020
"App\\Controller\\Helper\\": "src/Controllers/Helpers",
2121
"App\\Controller\\Merchandise\\": "src/Controllers/Merchandise",
22-
"App\\Model\\": "src/models"
22+
"App\\Model\\": "src/Models",
23+
"App\\Model\\Authentication\\": "src/Models/Authentication",
24+
"App\\Model\\Merchandise\\": "src/Models/Merchandise"
25+
2326
}
2427
},
2528
"require": {

dist/assets/js/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/assets/styles/main.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 64 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,8 @@
3939
"style-loader": "^1.1.3",
4040
"webpack": "^4.42.1",
4141
"webpack-cli": "^3.3.11"
42+
},
43+
"dependencies": {
44+
"babel-polyfill": "^6.26.0"
4245
}
4346
}

resources/sass/components/_cart.scss

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
11
.popup__content[data-action="cart"] {
2+
// 404
3+
.cart-content.empty {
4+
display: flex;
5+
flex-direction: column;
6+
justify-content: center;
7+
align-items: center;
8+
font-size: 3.2rem;
9+
color: #bbb;
10+
11+
i {
12+
font-size: 4.5rem;
13+
padding-bottom: 2rem;
14+
margin-top: 2rem;
15+
}
16+
}
217
// Fixed buttons at the bottom
3-
.cart-action-buttons {
18+
.cart-footer {
419
background: $white;
520
border-top: 2px solid $eggshell;
6-
padding: 1.5rem 6rem;
21+
padding: 1.5rem 8rem;
722
width: 100%;
823
position: fixed;
924
bottom: 0;
@@ -22,10 +37,10 @@
2237
span.cart-total {
2338
text-align: center;
2439
font-weight: 500;
25-
font-size: 2rem;
40+
font-size: 1.8rem;
2641

27-
span {
28-
padding-left: 2rem;
42+
i {
43+
font-size: 1.4rem;
2944
}
3045
}
3146
}
@@ -40,7 +55,7 @@
4055
font-size: 2rem;
4156
font-style: italic;
4257
font-family: $heading;
43-
text-align: left;
58+
text-align: center;
4459
padding-bottom: 1rem;
4560
}
4661

@@ -54,12 +69,12 @@
5469
padding: 0.5rem 2rem;
5570
}
5671

57-
tr {
72+
tr:not(:last-child) {
5873
border-bottom: 1px solid lighten($bistre, 70%);
74+
}
5975

60-
img {
61-
max-height: 70px;
62-
}
76+
tr img {
77+
max-height: 70px;
6378
}
6479
}
6580

0 commit comments

Comments
 (0)