Browse Source

Improved/fixed/worked on style code splitting.

KrisVos130 7 years ago
parent
commit
cae4ff3bb9

+ 24 - 12
frontend/app/js/app.jsx

@@ -59,7 +59,8 @@ class App extends Component { // eslint-disable-line react/no-multi-comp
 						exact
 						path="/login"
 						component={ asyncComponent({
-							resolve: () => System.import("views/Auth/Login")
+							resolve: () => System.import("views/Auth/Login"),
+							name: "Login"
 						})}
 						auth="disallowed"
 						title={ t("pages:login") }
@@ -68,7 +69,8 @@ class App extends Component { // eslint-disable-line react/no-multi-comp
 						exact
 						path="/logout"
 						component={ asyncComponent({
-							resolve: () => System.import("views/Auth/Logout")
+							resolve: () => System.import("views/Auth/Logout"),
+							name: "Logout"
 						})}
 						auth="required"
 						title="Logout"
@@ -77,7 +79,8 @@ class App extends Component { // eslint-disable-line react/no-multi-comp
 						exact
 						path="/register"
 						component={ asyncComponent({
-							resolve: () => System.import("views/Auth/Register")
+							resolve: () => System.import("views/Auth/Register"),
+							name: "Register"
 						})}
 						auth="disallowed"
 						title={ t("pages:register") }
@@ -86,7 +89,8 @@ class App extends Component { // eslint-disable-line react/no-multi-comp
 						exact
 						path="/settings"
 						component={ asyncComponent({
-							resolve: () => System.import("views/Auth/Settings")
+							resolve: () => System.import("views/Auth/Settings"),
+							name: "Settings"
 						})}
 						auth="required"
 						title={ t("pages:settings") }
@@ -95,7 +99,8 @@ class App extends Component { // eslint-disable-line react/no-multi-comp
 						exact
 						path="/settings/setpassword"
 						component={ asyncComponent({
-							resolve: () => System.import("views/Auth/Settings/SetPassword")
+							resolve: () => System.import("views/Auth/Settings/SetPassword"),
+							name: "SetPassword"
 						})}
 						auth="required"
 						title={ t("pages:setPassword") }
@@ -104,7 +109,8 @@ class App extends Component { // eslint-disable-line react/no-multi-comp
 						exact
 						path="/reset_password"
 						component={ asyncComponent({
-							resolve: () => System.import("views/Auth/ForgotPassword")
+							resolve: () => System.import("views/Auth/ForgotPassword"),
+							name: "ForgotPassword"
 						})}
 						auth="disallowed"
 						title={ t("pages:resetPassword") }
@@ -112,7 +118,8 @@ class App extends Component { // eslint-disable-line react/no-multi-comp
 					<AuthRoute
 						path="/terms"
 						component={ asyncComponent({
-							resolve: () => System.import("views/Terms")
+							resolve: () => System.import("views/Terms"),
+							name: "Terms"
 						})}
 						auth="ignored"
 						title={ t("pages:terms") }
@@ -120,7 +127,8 @@ class App extends Component { // eslint-disable-line react/no-multi-comp
 					<AuthRoute
 						path="/privacy"
 						component={ asyncComponent({
-							resolve: () => System.import("views/Privacy")
+							resolve: () => System.import("views/Privacy"),
+							name: "Privacy"
 						})}
 						auth="ignored"
 						title={ t("pages:privacy") }
@@ -128,7 +136,8 @@ class App extends Component { // eslint-disable-line react/no-multi-comp
 					<AuthRoute
 						path="/team"
 						component={ asyncComponent({
-							resolve: () => System.import("views/Team")
+							resolve: () => System.import("views/Team"),
+							name: "Team"
 						})}
 						auth="ignored"
 						title={ t("pages:team") }
@@ -136,7 +145,8 @@ class App extends Component { // eslint-disable-line react/no-multi-comp
 					<AuthRoute
 						path="/u/:username"
 						component={ asyncComponent({
-							resolve: () => System.import("views/Profile")
+							resolve: () => System.import("views/Profile"),
+							name: "Profile"
 						})}
 						auth="ignored"
 						title={ t("pages:profile") }
@@ -145,7 +155,8 @@ class App extends Component { // eslint-disable-line react/no-multi-comp
 						exact
 						path="/"
 						component={ asyncComponent({
-							resolve: () => System.import("views/Home")
+							resolve: () => System.import("views/Home"),
+							name: "Home"
 						})}
 						auth="ignored"
 						title={ t("pages:homepage") }
@@ -153,7 +164,8 @@ class App extends Component { // eslint-disable-line react/no-multi-comp
 					<AuthRoute
 						path="*"
 						component={ asyncComponent({
-							resolve: () => System.import("views/Errors/Error404")
+							resolve: () => System.import("views/Errors/Error404"),
+							name: "Error404"
 						})}
 						auth="ignored"
 						title={ t("pages:error404") }

+ 0 - 1
frontend/app/js/components/CustomInput.jsx

@@ -1,7 +1,6 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
 const i18next = require("i18next");
-import "specific/form.scss";
 
 const t = i18next.t;
 

+ 0 - 2
frontend/app/js/components/Global/Navbar.jsx

@@ -4,8 +4,6 @@ import { connect } from "react-redux";
 import { NavLink } from "react-router-dom";
 import { translate } from "react-i18next";
 
-import "navbar.scss";
-
 @connect(state => ({
 	loggedIn: state.user.get("loggedIn"),
 }))

+ 1 - 1
frontend/app/js/index.js

@@ -12,7 +12,7 @@ import rootReducer from "reducers";
 import i18n from "./i18n";
 import App from "./app";
 
-import "../styles/main.scss";
+import "main.scss";
 
 // const isProduction = process.env.NODE_ENV === "production";
 let store = null;

+ 0 - 2
frontend/app/js/views/Auth/ForgotPassword/index.jsx

@@ -3,8 +3,6 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { translate } from "react-i18next";
 
-import "setPassword.scss";
-
 import CustomInput from "components/CustomInput.jsx";
 import CustomErrors from "components/CustomMessages.jsx";
 

+ 0 - 2
frontend/app/js/views/Auth/Login/index.jsx

@@ -6,8 +6,6 @@ import CustomMessages from "components/CustomMessages.jsx";
 import PropTypes from "prop-types";
 import { translate, Trans } from "react-i18next";
 
-import "login.scss";
-
 import io from "io";
 import config from "config";
 

+ 0 - 2
frontend/app/js/views/Auth/Register/index.jsx

@@ -6,8 +6,6 @@ import CustomMessages from "components/CustomMessages.jsx";
 import PropTypes from "prop-types";
 import { translate, Trans } from "react-i18next";
 
-import "register.scss";
-
 import io from "io";
 import config from "config";
 

+ 0 - 2
frontend/app/js/views/Auth/Settings/SetPassword/index.jsx

@@ -3,8 +3,6 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { translate } from "react-i18next";
 
-import "setPassword.scss";
-
 import CustomInput from "components/CustomInput.jsx";
 import CustomMessages from "components/CustomMessages.jsx";
 

+ 0 - 1
frontend/app/js/views/Auth/Settings/index.jsx

@@ -6,7 +6,6 @@ import { NavLink } from "react-router-dom";
 import { translate } from "react-i18next";
 
 import config from "config";
-import "settings.scss";
 
 import CustomInput from "components/CustomInput.jsx";
 import CustomMessages from "components/CustomMessages.jsx";

+ 0 - 2
frontend/app/js/views/Privacy/index.jsx

@@ -5,8 +5,6 @@ import {connect} from "react-redux";
 import {NavLink} from "react-router-dom";
 import {translate} from "react-i18next";
 
-// import "termsPrivacy.scss";
-
 @translate(["privacy"], {wait: true})
 export default class Privacy extends Component {
 	static propTypes = {

+ 0 - 2
frontend/app/js/views/Profile/index.jsx

@@ -6,8 +6,6 @@ import {translate} from "react-i18next";
 
 import CustomMessages from "components/CustomMessages.jsx";
 
-//import "profile.scss";
-
 import io from "io";
 
 @connect(state => ({

+ 0 - 2
frontend/app/js/views/Team/index.jsx

@@ -2,8 +2,6 @@ import React, {Component} from "react";
 import PropTypes from "prop-types";
 import {translate} from "react-i18next";
 
-// import "team.scss";
-
 @translate(["team"], {wait: true})
 export default class Team extends Component {
 	static propTypes = {

+ 0 - 2
frontend/app/js/views/Terms/index.jsx

@@ -5,8 +5,6 @@ import {connect} from "react-redux";
 import {NavLink} from "react-router-dom";
 import {translate} from "react-i18next";
 
-// import "termsPrivacy.scss";
-
 @translate(["terms"], {wait: true})
 export default class Terms extends Component {
 	static propTypes = {

+ 7 - 0
frontend/app/styles/main.scss

@@ -1,6 +1,13 @@
 // @import "musare-theme";
 @import "colors";
 @import "breakpoints";
+@import "login";
+@import "navbar";
+@import "register";
+@import "setPassword";
+@import "settings";
+@import "specific/button";
+@import "specific/form";
 @import url("https://fonts.googleapis.com/css?family=Roboto:100,400,500,700");
 
 html, body {

+ 0 - 1
frontend/app/styles/station/main.scss

@@ -1 +0,0 @@
-@import "player.scss";

+ 0 - 0
frontend/app/styles/station/player.scss


+ 1 - 1
frontend/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/Musare/MusareNode",
   "scripts": {
     "dev": "webpack --watch",
-    "production": "rm -rf ./dist && SET NODE_ENV=\"production\" && webpack",
+    "production": "SET NODE_ENV=production&& webpack",
     "lint": "eslint ./app/js ./webpack.config.js -f table --ext .js --ext .jsx || true"
   },
   "devDependencies": {