Home Explore Help
Register Sign In
ilya_shyian
/
store-project
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

change laylout regecx

ilya_shyian 1 year ago
parent
6f02c45185
commit
f178ca5955
3 changed files with 29 additions and 24 deletions
Split View Show Diff Stats
  1. 16 20
      public/index.html
  2. 7 0
      public/shopping-logo.svg
  3. 6 4
      src/components/LayoutPage/index.js

+ 16 - 20
public/index.html
View File 

@@ -1,21 +1,17 @@
 
 <!DOCTYPE html>
 
 <html lang="en">
 
-  <head>
 
-    <meta charset="utf-8" />
 
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
 
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-    <meta name="theme-color" content="#000000" />
 
-    <meta
 
-      name="description"
 
-      content="Web site created using create-react-app"
 
-    />
 
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
 
-    <!--
 
+    <head>
 
+        <meta charset="utf-8" />
 
+        <link rel="icon" href="%PUBLIC_URL%/shopping-logo.svg" />
 
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
 
+        <meta name="theme-color" content="#000000" />
 
+        <meta name="description" content="Web site created using create-react-app" />
 
+        <!--
 
       manifest.json provides metadata used when your web app is installed on a
 
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
 
     -->
 
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
 
-    <!--
 
+        <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
 
+        <!--
 
       Notice the use of %PUBLIC_URL% in the tags above.
 
       It will be replaced with the URL of the `public` folder during the build.
 
       Only files inside the `public` folder can be referenced from the HTML.
 
@@ -24,12 +20,12 @@
 
       work correctly both with client-side routing and a non-root public URL.
 
       Learn how to configure a non-root public URL by running `npm run build`.
 
     -->
 
-    <title>React App</title>
 
-  </head>
 
-  <body>
 
-    <noscript>You need to enable JavaScript to run this app.</noscript>
 
-    <div id="root"></div>
 
-    <!--
 
+        <title>Store</title>
 
+    </head>
 
+    <body>
 
+        <noscript>You need to enable JavaScript to run this app.</noscript>
 
+        <div id="root"></div>
 
+        <!--
 
       This HTML file is a template.
 
       If you open it directly in the browser, you will see an empty page.
 
 
@@ -39,5 +35,5 @@
 
       To begin the development, run `npm start` or `yarn start`.
 
       To create a production bundle, use `npm run build` or `yarn build`.
 
     -->
 
-  </body>
 
+    </body>
 
 </html>

File diff suppressed because it is too large
+ 7 - 0
public/shopping-logo.svg


+ 6 - 4
src/components/LayoutPage/index.js
View File 

@@ -55,10 +55,12 @@ export const LayoutPage = () => {
 
         <Box className="LayoutPage">
 
             <Header />
 
             <Grid container columns={14} rows={1}>
 
-                <Grid xs={location.pathname.match(/(\/categor)|(\/good)|(\/order)*/) ? 3 : 0} item>
 
-                    <Aside />
 
-                </Grid>
 
-                <Grid xs={location.pathname.match(/(\/categor)|(\/good)|(\/order)*/) ? 11 : 14} item>
 
+                {!!location.pathname.match(/(\/categor)|(\/good)|(\/order)+/) && (
 
+                    <Grid xs={3} item>
 
+                        <Aside />
 
+                    </Grid>
 
+                )}
 
+                <Grid xs={location.pathname.match(/(\/categor)|(\/good)|(\/order)+/) ? 11 : 14} item>
 
                     <Content>
 
                         <Routes>
 
                             <Route path="/" exact element={<MainPage />} />