mirror of
https://github.com/openmhz/trunk-server.git
synced 2026-11-16 10:47:32 -05:00
Merge branch 'master' into twitter
This commit is contained in:
@@ -2,19 +2,17 @@
|
|||||||
import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
|
import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
|
||||||
import { createSelector} from '@reduxjs/toolkit'
|
import { createSelector} from '@reduxjs/toolkit'
|
||||||
|
|
||||||
|
|
||||||
// Define our single API slice object
|
// Define our single API slice object
|
||||||
export const apiSlice = createApi({
|
export const apiSlice = createApi({
|
||||||
// The cache reducer expects to be added at `state.api` (already default - this is optional)
|
// The cache reducer expects to be added at `state.api` (already default - this is optional)
|
||||||
reducerPath: 'api',
|
reducerPath: 'api',
|
||||||
|
|
||||||
// All of our requests will have URLs starting with '/fakeApi'
|
// All of our requests will have URLs starting with '/fakeApi'
|
||||||
baseQuery: fetchBaseQuery({ baseUrl: process.env.REACT_APP_BACKEND_SERVER }),
|
baseQuery: fetchBaseQuery({ baseUrl: process.env.REACT_APP_BACKEND_SERVER }),
|
||||||
// The "endpoints" represent operations and requests for this server
|
// The "endpoints" represent operations and requests for this server
|
||||||
endpoints: builder => ({
|
endpoints: builder => ({
|
||||||
// The `getPosts` endpoint is a "query" operation that returns data
|
// The `getPosts` endpoint is a "query" operation that returns data
|
||||||
getGroups: builder.query({
|
getGroups: builder.query({
|
||||||
// The URL for the request is '/fakeApi/posts'
|
// The URL for the request is '/fakeApi/posts
|
||||||
query: (shortName) => ({ url: `/${shortName}/groups` })
|
query: (shortName) => ({ url: `/${shortName}/groups` })
|
||||||
}),
|
}),
|
||||||
getSystems: builder.query({
|
getSystems: builder.query({
|
||||||
|
|||||||
0
frontend/src/features/call/callSlice.js
Normal file
0
frontend/src/features/call/callSlice.js
Normal file
11
frontend/src/features/group/groupSlice.js
Normal file
11
frontend/src/features/group/groupSlice.js
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
const groupSlice = createSlice({
|
||||||
|
name: 'group',
|
||||||
|
initialState: [],
|
||||||
|
reducers: {
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
// Extract the action creators object and the reducer
|
||||||
|
const { actions, reducer } = groupSlice
|
||||||
|
// Export the reducer, either as a default or named export
|
||||||
|
export default reducer
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
// https://github.com/supasate/connected-react-router
|
// https://github.com/supasate/connected-react-router
|
||||||
// configureStore.js
|
// configureStore.js
|
||||||
|
|
||||||
|
|
||||||
import { createBrowserHistory } from 'history'
|
import { createBrowserHistory } from 'history'
|
||||||
import { applyMiddleware, compose, createStore } from 'redux'
|
import { applyMiddleware, compose, createStore } from 'redux'
|
||||||
import { routerMiddleware } from 'connected-react-router'
|
import { routerMiddleware } from 'connected-react-router'
|
||||||
@@ -9,7 +10,8 @@ import { apiSlice } from '../features/api/apiSlice'
|
|||||||
|
|
||||||
import thunk from 'redux-thunk';
|
import thunk from 'redux-thunk';
|
||||||
|
|
||||||
export const history = createBrowserHistory()
|
import { apiSlice } from '../features/api/apiSlice'
|
||||||
|
|
||||||
|
|
||||||
export default function configureStore(preloadedState) {
|
export default function configureStore(preloadedState) {
|
||||||
const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
|
const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
|
||||||
|
|||||||
Reference in New Issue
Block a user