refactor: move layout.tsx to web/display
https://metaforecast.org/layout is not a real page, so it shouldn't be in src/pages.
This commit is contained in:
		
							parent
							
								
									9c586c6ec1
								
							
						
					
					
						commit
						1b1c0f4228
					
				|  | @ -2,7 +2,7 @@ import React from 'react'; | ||||||
| import ReactMarkdown from 'react-markdown'; | import ReactMarkdown from 'react-markdown'; | ||||||
| import gfm from 'remark-gfm'; | import gfm from 'remark-gfm'; | ||||||
| 
 | 
 | ||||||
| import Layout from './layout'; | import Layout from '../web/display/layout'; | ||||||
| 
 | 
 | ||||||
| let readmeMarkdownText = `# About
 | let readmeMarkdownText = `# About
 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -2,9 +2,9 @@ import { NextPage } from 'next'; | ||||||
| import React from 'react'; | import React from 'react'; | ||||||
| 
 | 
 | ||||||
| import { displayForecastsWrapperForCapture } from '../web/display/displayForecastsWrappers'; | import { displayForecastsWrapperForCapture } from '../web/display/displayForecastsWrappers'; | ||||||
|  | import Layout from '../web/display/layout'; | ||||||
| import { Props } from '../web/search/anySearchPage'; | import { Props } from '../web/search/anySearchPage'; | ||||||
| import CommonDisplay from '../web/search/CommonDisplay'; | import CommonDisplay from '../web/search/CommonDisplay'; | ||||||
| import Layout from './layout'; |  | ||||||
| 
 | 
 | ||||||
| export { getServerSideProps } from "../web/search/anySearchPage"; | export { getServerSideProps } from "../web/search/anySearchPage"; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -6,8 +6,8 @@ import { useState } from 'react'; | ||||||
| 
 | 
 | ||||||
| import { DashboardCreator } from '../web/display/dashboardCreator'; | import { DashboardCreator } from '../web/display/dashboardCreator'; | ||||||
| import displayForecasts from '../web/display/displayForecasts'; | import displayForecasts from '../web/display/displayForecasts'; | ||||||
|  | import Layout from '../web/display/layout'; | ||||||
| import { getDashboardForecastsByDashboardId } from '../web/worker/getDashboardForecasts'; | import { getDashboardForecastsByDashboardId } from '../web/worker/getDashboardForecasts'; | ||||||
| import Layout from './layout'; |  | ||||||
| 
 | 
 | ||||||
| /* get Props */ | /* get Props */ | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -2,9 +2,9 @@ import { NextPage } from 'next'; | ||||||
| import React from 'react'; | import React from 'react'; | ||||||
| 
 | 
 | ||||||
| import { displayForecastsWrapperForSearch } from '../web/display/displayForecastsWrappers'; | import { displayForecastsWrapperForSearch } from '../web/display/displayForecastsWrappers'; | ||||||
|  | import Layout from '../web/display/layout'; | ||||||
| import { Props } from '../web/search/anySearchPage'; | import { Props } from '../web/search/anySearchPage'; | ||||||
| import CommonDisplay from '../web/search/CommonDisplay'; | import CommonDisplay from '../web/search/CommonDisplay'; | ||||||
| import Layout from './layout'; |  | ||||||
| 
 | 
 | ||||||
| export { getServerSideProps } from "../web/search/anySearchPage"; | export { getServerSideProps } from "../web/search/anySearchPage"; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| import Link from 'next/link'; | import Link from 'next/link'; | ||||||
| import React from 'react'; | import React from 'react'; | ||||||
| 
 | 
 | ||||||
| import Layout from './layout'; | import Layout from '../web/display/layout'; | ||||||
| 
 | 
 | ||||||
| /* Display one tool */ | /* Display one tool */ | ||||||
| function displayTool({ | function displayTool({ | ||||||
|  |  | ||||||
|  | @ -1,12 +1,11 @@ | ||||||
| import Head from 'next/head'; | import Head from 'next/head'; | ||||||
| import Link from 'next/link'; | import Link from 'next/link'; | ||||||
| import React from 'react'; | import React, { ErrorInfo } from 'react'; | ||||||
| 
 | 
 | ||||||
| // import { GiDiceEightFacesEight } from "react-icons/gi";
 | import { Logo2 } from '../icons/index'; | ||||||
| import { Logo2 } from '../web/icons/index'; |  | ||||||
| 
 | 
 | ||||||
| /* Utilities */ | /* Utilities */ | ||||||
| const classNameSelected = (isSelected) => | const classNameSelected = (isSelected: boolean) => | ||||||
|   `no-underline py-4 px-2 ml-4 text-md font-medium cursor-pointer border-b-2 border-transparent ${ |   `no-underline py-4 px-2 ml-4 text-md font-medium cursor-pointer border-b-2 border-transparent ${ | ||||||
|     isSelected |     isSelected | ||||||
|       ? "text-blue-700 border-blue-700" |       ? "text-blue-700 border-blue-700" | ||||||
|  | @ -27,16 +26,16 @@ let calculateLastUpdate = () => { | ||||||
| 
 | 
 | ||||||
| // Error catcher
 | // Error catcher
 | ||||||
| class ErrorBoundary extends React.Component< | class ErrorBoundary extends React.Component< | ||||||
|   any, |   {}, | ||||||
|   { error: any; errorInfo: any } |   { error: any; errorInfo: any } | ||||||
| > { | > { | ||||||
|   // https://reactjs.org/docs/error-boundaries.html
 |   // https://reactjs.org/docs/error-boundaries.html
 | ||||||
|   constructor(props) { |   constructor(props: {}) { | ||||||
|     super(props); |     super(props); | ||||||
|     this.state = { error: null, errorInfo: null }; |     this.state = { error: null, errorInfo: null }; | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   componentDidCatch(error, errorInfo) { |   componentDidCatch(error: Error, errorInfo: ErrorInfo) { | ||||||
|     // Catch errors in any components below and re-render with error message
 |     // Catch errors in any components below and re-render with error message
 | ||||||
|     this.setState({ |     this.setState({ | ||||||
|       error: error, |       error: error, | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user