Skip to content

Commit

Permalink
temp: testing merge proper
Browse files Browse the repository at this point in the history
  • Loading branch information
ilee2u committed Jan 11, 2024
1 parent babbdec commit 33b85d4
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
5 changes: 5 additions & 0 deletions src/api.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import { examRequiresAccessToken, store } from './data';

// TODO: Come back to this later after figuring out how to merge first and unit testing
// const {
// sidebarIsOpen,
// } = useSelector(state => state.exams);

export function isExam() {
const { exam } = store.getState().examState;
return !!exam?.id;
Expand Down
2 changes: 1 addition & 1 deletion src/data/slice.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export const {
} = examSlice.actions;

export const {
reducer
reducer,
} = examSlice;

export default examSlice.reducer;
14 changes: 7 additions & 7 deletions src/data/store.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { configureStore } from '@reduxjs/toolkit';
import examReducer from './slice';
// import { configureStore } from '@reduxjs/toolkit';
// import examReducer from './slice';

export default configureStore({
reducer: {
examState: examReducer,
},
});
// export default configureStore({
// reducer: {
// examState: examReducer,
// },
// });
2 changes: 1 addition & 1 deletion src/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ export {
fetchExamAccess,
} from './api';
export { store } from './data';
export { reducer } from './data/slice'
export { reducer } from './data/slice';

0 comments on commit 33b85d4

Please sign in to comment.