Skip to content

Commit

Permalink
refactor: router
Browse files Browse the repository at this point in the history
  • Loading branch information
Selemon Dev committed Mar 18, 2024
1 parent 2e8e650 commit 249e76d
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 27 deletions.
2 changes: 1 addition & 1 deletion src/core/questions/react/createReactQuestions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ async function createReactQuestions(): Promise<void> {
await createQuestion(tailwindPrompt)
}
await createQuestion(stateManagement)
await createQuestion(reactQuery)
await runPrompt();
await createQuestion(reactQuery)

if (!options.useEslint) {
await createQuestion(eslintPrompt)
Expand Down
2 changes: 1 addition & 1 deletion src/filter/filterFiles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import fs from 'fs-extra';
export function getFilterFile() {
async function reactFilterFileActions() {
if (!options.useRouter) {
fs.remove(`${options.dest}/src/router`)
fs.remove(`${options.dest}/src/pages`)
}

if (!options.useTailwind) {
Expand Down
15 changes: 13 additions & 2 deletions template/react-ts/src/App.ejs
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
import { useState } from 'react'
import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
<% if (useRouter) { -%>
import Home from "./pages/Home";
import About from "./pages/About";
<% } -%>
function App() {
return (
<>

<% if (useRouter) { -%>
<Router>
<Routes>
<Route path="/" element={<Home />} />
<Route path="/about" element={<About />} />
</Routes>
</Router>
<% } -%>
</>
)
}
Expand Down
6 changes: 3 additions & 3 deletions template/react-ts/src/main.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import React from 'react'
import ReactDOM from 'react-dom/client'
import App from './App.tsx'
<% if (stateManagement==='redux') { -%>
import { store } from './app/store'
import { store } from "./store/appStore.ts";
import { Provider } from 'react-redux'
<% } -%>

<% if (stateManagement !== 'redux' || stateManagement !== 'none') { %>
<% if (stateManagement !== 'redux' || stateManagement === 'none') { %>
ReactDOM.createRoot(document.getElementById('root')).render(
<React.StrictMode>
<App />
Expand All @@ -15,7 +15,7 @@ import { Provider } from 'react-redux'
<% } %>


<% if (stateManagement==='redux' ) { -%>
<% if (stateManagement === 'redux' ) { -%>
ReactDOM.createRoot(document.getElementById('root')).render(
<React.StrictMode>
<Provider store={store}>
Expand Down
4 changes: 4 additions & 0 deletions template/react-ts/src/pages/About.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
const About = () => {
return <div>About page</div>;
}
export default About;
4 changes: 4 additions & 0 deletions template/react-ts/src/pages/Home.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
const Home = () => {
return <div>Home page</div>;
}
export default Home;
3 changes: 0 additions & 3 deletions template/react-ts/src/pages/index.tsx

This file was deleted.

17 changes: 0 additions & 17 deletions template/react-ts/src/routes.tsx

This file was deleted.

0 comments on commit 249e76d

Please sign in to comment.