Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rockets structure #29

Merged
merged 6 commits into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import { Routes, Route } from 'react-router-dom';
import Rockets from './views/Rockets';
import MyProfile from './views/MyProfile';

function App() {
return (
<Routes>
<Route path="/" element={<Rockets />} />
<Route path="rockets" element={<Rockets />} />
<Route path="my-profile" element={<MyProfile />} />
</Routes>
);
Expand Down
1 change: 1 addition & 0 deletions src/components/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const Header = () => (
<nav className="navbar">
<AppLogo />
<ul id="navigation">
<MenuLink url="/rockets" pageName="Rockets" />
<MenuLink url="/my-profile" pageName="My Profile" />
</ul>
</nav>
Expand Down
17 changes: 0 additions & 17 deletions src/index.css

This file was deleted.

10 changes: 7 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { BrowserRouter } from 'react-router-dom';
import { Provider } from 'react-redux';
import store from './redux/store';
import './assets/styles/index.css';
import App from './App';
import './assets/styles/responsive.css';
Expand All @@ -9,9 +11,11 @@ import reportWebVitals from './reportWebVitals';
const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
<React.StrictMode>
<BrowserRouter>
<App />
</BrowserRouter>
<Provider store={store}>
<BrowserRouter>
<App />
</BrowserRouter>
</Provider>
</React.StrictMode>,
);

Expand Down
15 changes: 15 additions & 0 deletions src/redux/rockets/rocketsSlice.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { createSlice } from '@reduxjs/toolkit';

const initialState = {
rockets: [],
isLoading: false,
error: false,
};

const rocketsSlice = createSlice({
name: 'rockets',
initialState,
reducers: {},
});

export default rocketsSlice.reducer;
10 changes: 10 additions & 0 deletions src/redux/store.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { configureStore } from '@reduxjs/toolkit';
import rocketsReducer from './rockets/rocketsSlice';

const store = configureStore({
reducer: {
rockets: rocketsReducer,
},
});

export default store;
9 changes: 9 additions & 0 deletions src/views/Rockets.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import Layout from './Layout';

const Rockets = () => (
<Layout>
<section id="rockets" />
</Layout>
);

export default Rockets;