Skip to content
This repository has been archived by the owner on Jan 24, 2024. It is now read-only.

Commit

Permalink
modify: fix to place pages directory under src
Browse files Browse the repository at this point in the history
  • Loading branch information
sota1235 committed Dec 7, 2019
1 parent 5c1e716 commit efbe476
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ module.exports = {
singleQuote : true,
trailingComma : 'all',
parser : 'typescript',
filepath : './{src,pages,.storybook}/**/*.{ts,tsx}',
filepath : './{src,.storybook}/**/*.{ts,tsx}',
};
4 changes: 3 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
"fix": "npm run prettier && npm run eslint:fix && npm run stylelint",
"stylelint": "stylelint './{src,pages,.storybook}/**/*.{ts,tsx}'",
"prettier": "prettier './{src,pages,.storybook}/**.{ts,tsx}'",
"fix": "npm run prettier:fix && npm run eslint:fix",
"stylelint": "stylelint './{src,.storybook}/**/*.{ts,tsx}'",
"prettier": "prettier './{src,.storybook}/**.{ts,tsx}'",
"prettier:fix": "npm run prettier -- --write",
"eslint": "eslint '{src,pages,.storybook}/**/*.{ts,tsx}'",
"eslint": "eslint '{src,.storybook}/**/*.{ts,tsx}'",
"eslint:fix": "npm run eslint -- --fix",
"lint": "npm run prettier && npm run eslint",
"fix": "npm run prettier:fix && npm run eslint:fix",
"test": "jest",
"test:ci": "jest -c ./jest.config.ci.js",
"storybook": "start-storybook -p 6006",
Expand Down
8 changes: 4 additions & 4 deletions pages/_app.tsx → src/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import React from 'react';
import App, { AppProps } from 'next/app';
import { Provider } from 'react-redux';
import { Store } from 'redux';
import { ActionTypes } from '../src/actions/actionTypes';
import { withReduxStore } from '../src/hoc/withReduxStore';
import { AppState } from '../src/reducers';
import { ActionTypes } from '../actions/actionTypes';
import { withReduxStore } from '../hoc/withReduxStore';
import { AppState } from '../reducers';
import { ThemeProvider } from 'styled-components';
import { theme } from '../src/styles/theme';
import { theme } from '../styles/theme';

type AppStore = Store<AppState, ActionTypes>;
interface Props extends AppProps {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion pages/index.tsx → src/pages/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import Head from 'next/head';
import { Nav } from '../src/components/Nav';
import { Nav } from '../components/Nav';
import styled from 'styled-components';
import Link from 'next/link';

Expand Down

0 comments on commit efbe476

Please sign in to comment.