Skip to content

Commit 6b5be95

Browse files
committed
import css to pages/_app.js
1 parent ef34f39 commit 6b5be95

File tree

8 files changed

+154
-988
lines changed

8 files changed

+154
-988
lines changed

next.config.js

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
const withSass = require('@zeit/next-sass')
2-
const withCss = require('@zeit/next-css')
3-
const webpack = require('webpack')
4-
const {parsed: localEnv} = require('dotenv').config();
1+
const path = require('path')
52

6-
module.exports = withCss(
7-
withSass({
8-
webpack: config => {
9-
// Fixes npm packages that depend on `fs` module
10-
config.node = {
11-
fs: 'empty'
12-
}
13-
config.plugins.push(new webpack.EnvironmentPlugin(localEnv))
14-
return config
15-
}
16-
})
17-
);
3+
module.exports = {
4+
sassOptions: {
5+
includePaths: [path.join(__dirname, 'styles/**/*.scss')],
6+
},
7+
}

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
"@sentry/browser": "^5.6.3",
3434
"@syncfusion/ej2-react-dropdowns": "^17.2.39",
3535
"@syncfusion/ej2-react-grids": "^17.2.39",
36-
"@zeit/next-css": "^1.0.1",
37-
"@zeit/next-sass": "^1.0.1",
3836
"axios": "^0.19.0",
3937
"cookie-parser": "^1.4.4",
4038
"dotenv": "^8.0.0",
@@ -49,11 +47,12 @@
4947
"query-string": "^6.12.1",
5048
"react": "^16.8.6",
5149
"react-copy-to-clipboard": "^5.0.2",
52-
"react-datepicker": "^2.14.1",
50+
"react-datepicker": "^4.8.0",
5351
"react-dom": "^16.8.6",
5452
"react-modal": "^3.9.1",
5553
"react-select": "^3.0.4",
5654
"react-spinners": "^0.6.1",
55+
"sass": "^1.57.1",
5756
"sweetalert2": "^8.13.0",
5857
"sweetalert2-react-content": "^1.1.0",
5958
"yup": "^0.28.5"
@@ -65,7 +64,6 @@
6564
"devDependencies": {
6665
"@sentry/webpack-plugin": "^1.8.1",
6766
"css-loader": "^2.0.0",
68-
"node-sass": "^4.12.0",
6967
"sass-loader": "^7.1.0",
7068
"webpack": "^4.39.1"
7169
}

pages/_app.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import '../styles/components/CheckLogin.scss'
2+
import '../styles/components/FieldWithElement.scss'
3+
import '../styles/components/layout.scss'
4+
import '../styles/components/Modal.scss'
5+
import '../styles/components/Pagination.scss'
6+
import '../styles/components/Price.scss'
7+
import '../styles/components/ProductsChooser.scss'
8+
import '../styles/pages/global.scss'
9+
import '../styles/pages/index.scss'
10+
import '../styles/pages/admin/coupons.scss'
11+
import '../styles/pages/admin/coupons2.scss'
12+
import '../styles/pages/admin/products.scss'
13+
14+
export default function MyApp({ Component, pageProps }) {
15+
return <Component {...pageProps} />
16+
}

styles/pages/admin/coupons.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
@import "../global.scss";
2-
31
#search {
42
font-size: 14pt;
53
}

styles/pages/admin/coupons2.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../global.scss";
1+
22

33
#random_coupon {
44
font-size: 12pt;

styles/pages/admin/products.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
@import "../global.scss";
2-
@import "./coupons.scss";
3-
41
.product-search-card {
52
height: 100%;
63
border: 2px solid #e9e9e9;

styles/pages/global.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
@import "../../../node_modules/@syncfusion/ej2-base/styles/material.css";
2-
@import "../../../node_modules/@syncfusion/ej2-inputs/styles/material.css";
3-
@import "../../../node_modules/@syncfusion/ej2-dropdowns/styles/material.css";
1+
@import "../../node_modules/@syncfusion/ej2-base/styles/material.css";
2+
@import "../../node_modules/@syncfusion/ej2-inputs/styles/material.css";
3+
@import "../../node_modules/@syncfusion/ej2-dropdowns/styles/material.css";
4+
@import "../../node_modules/react-datepicker/dist/react-datepicker.min.css";
45

56
.title {
67
font-weight: 100;

0 commit comments

Comments
 (0)