Pavle Golubovic 3 лет назад
Родитель
Сommit
f5423f6cc0
4 измененных файлов: 29 добавлений и 30 удалений
  1. 1
    1
      src/App.js
  2. 1
    1
      src/request/index.js
  3. 1
    1
      src/store/middleware/accessTokensMiddleware.js
  4. 26
    27
      src/themes/primaryTheme/globalStyles.js

+ 1
- 1
src/App.js Просмотреть файл

import AppRoutes from "./AppRoutes"; import AppRoutes from "./AppRoutes";
import Header from "./components/Header/Header"; import Header from "./components/Header/Header";
import { StyledEngineProvider } from "@mui/material"; import { StyledEngineProvider } from "@mui/material";
//import GlobalStyle from "./themes/primaryTheme/globalStyles";


const App = () => { const App = () => {
return ( return (
</Helmet> </Helmet>
<StyledEngineProvider injectFirst> <StyledEngineProvider injectFirst>
<Header /> <Header />

<AppRoutes /> <AppRoutes />
</StyledEngineProvider> </StyledEngineProvider>
{/* </main> */} {/* </main> */}

+ 1
- 1
src/request/index.js Просмотреть файл

import queryString from "qs"; import queryString from "qs";


const request = axios.create({ const request = axios.create({
baseURL: "http://192.168.88.150:3001/",
baseURL: "http://192.168.88.175:3005/",
// baseURL: "http://192.168.88.176:3001/", // baseURL: "http://192.168.88.176:3001/",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",

+ 1
- 1
src/store/middleware/accessTokensMiddleware.js Просмотреть файл

// import { setUserAccessToken } from "../actions/user/userActions"; // import { setUserAccessToken } from "../actions/user/userActions";


//Change URL with .env //Change URL with .env
const baseURL = "http://192.168.88.150:3001/";
const baseURL = "http://192.168.88.175:3005/";
// const baseURL = "http://192.168.88.175:3005/"; // const baseURL = "http://192.168.88.175:3005/";


//Interceptor unique name //Interceptor unique name

+ 26
- 27
src/themes/primaryTheme/globalStyles.js Просмотреть файл

import { createGlobalStyle } from 'styled-components'; import { createGlobalStyle } from 'styled-components';
import OpenSans from "./fonts/OpenSans-Regular.ttf"
import Poppins from "./fonts/Poppins-Regular.ttf"
import Mulish from "./fonts/Mulish-Regular.ttf"
// import OpenSans from "./fonts/OpenSans-Regular.ttf"
// import Poppins from "./fonts/Poppins-Regular.ttf"
// import Mulish from "./fonts/Mulish-Regular.ttf"
import { BaseStyle } from './base'; import { BaseStyle } from './base';
import { ResetStyle } from './reset'; import { ResetStyle } from './reset';
import { LayoutStyle } from './layout'; import { LayoutStyle } from './layout';
import { customClasses } from './customClasses'; import { customClasses } from './customClasses';
const GlobalStyle = createGlobalStyle` const GlobalStyle = createGlobalStyle`




@font-face {
font-family: 'Open Sans';
src: url(${OpenSans}) format('truetype');
font-weight: 400;
font-style: normal;
font-display: auto;
}
@font-face {
font-family: 'Poppins';
src: url(${Poppins}) format('truetype');
font-weight: 400;
font-style: normal;
font-display: auto;
}
@font-face {
font-family: "Mulish";
src: url(${Mulish}) format('truetype');
font-weight: 400;
font-style: normal;
font-display: auto;
} }

${ResetStyle} ${ResetStyle}
${BaseStyle} ${BaseStyle}
${LayoutStyle} ${LayoutStyle}
${customClasses} ${customClasses}
`; `;



// @font-face {
// font-family: 'Open Sans';
// src: url("Open Sans") format('truetype');
// font-weight: 400;
// font-style: normal;
// font-display: auto;
// }
// @font-face {
// font-family: 'Poppins';
// src: url(Poppins) format('truetype');
// font-weight: 400;
// font-style: normal;
// font-display: auto;
// }
// @font-face {
// font-family: "Mulish";
// src: url(${Mulish}) format('truetype');
// font-weight: 400;
// font-style: normal;
// font-display: auto;
// } }

export default GlobalStyle; export default GlobalStyle;

Загрузка…
Отмена
Сохранить