Skip to content

Commit 701e65e

Browse files
boodlandeleanorreem
authored andcommitted
Update app references one level away
1 parent c107b71 commit 701e65e

17 files changed

+31
-31
lines changed

config/simplybook.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { User } from '../app/userSlice';
1+
import { User } from '../store/userSlice';
22

33
// Simplybook hardcodes additional field IDs
44
const userIdFieldId =

hooks/store.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { useCallback } from 'react';
22
import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux';
3-
import { api } from '../app/api';
4-
import { clearCoursesSlice } from '../app/coursesSlice';
5-
import { clearPartnerAccessesSlice } from '../app/partnerAccessSlice';
6-
import { clearPartnerAdminSlice } from '../app/partnerAdminSlice';
7-
import type { AppDispatch, AppState } from '../app/store';
8-
import { clearUserSlice } from '../app/userSlice';
3+
import { api } from '../store/api';
4+
import { clearCoursesSlice } from '../store/coursesSlice';
5+
import { clearPartnerAccessesSlice } from '../store/partnerAccessSlice';
6+
import { clearPartnerAdminSlice } from '../store/partnerAdminSlice';
7+
import type { AppDispatch, AppState } from '../store/store';
8+
import { clearUserSlice } from '../store/userSlice';
99

1010
export const useTypedSelector: TypedUseSelectorHook<AppState> = useSelector;
1111
export const useAppDispatch = () => useDispatch<AppDispatch>();

hooks/useLoadUser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import { getAuth, onIdTokenChanged, signOut } from 'firebase/auth';
44
import { useEffect, useState } from 'react';
5-
import { useCreateEventLogMutation, useGetUserQuery } from '../app/api';
6-
import { setAuthStateLoading, setLoadError, setUserLoading, setUserToken } from '../app/userSlice';
75
import { EVENT_LOG_NAME } from '../constants/enums';
86
import {
97
GET_AUTH_USER_ERROR,
@@ -14,6 +12,8 @@ import {
1412
LOGOUT_FORCED,
1513
LOGOUT_SUCCESS,
1614
} from '../constants/events';
15+
import { useCreateEventLogMutation, useGetUserQuery } from '../store/api';
16+
import { setAuthStateLoading, setLoadError, setUserLoading, setUserToken } from '../store/userSlice';
1717
import { getErrorMessage } from '../utils/errorMessage';
1818
import logEvent, { getEventUserResponseData } from '../utils/logEvent';
1919
import { useAppDispatch, useStateUtils, useTypedSelector } from './store';

pages/_app.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { NextPageContext } from 'next/types';
1212
import { Hotjar } from 'nextjs-hotjar';
1313
import { useEffect } from 'react';
1414
import { Provider } from 'react-redux';
15-
import { wrapper } from '../app/store';
1615
import CrispScript from '../components/crisp/CrispScript';
1716
import { AppBarSpacer } from '../components/layout/AppBarSpacer';
1817
import Consent from '../components/layout/Consent';
@@ -25,6 +24,7 @@ import firebase from '../config/firebase';
2524
import { storyblok } from '../config/storyblok';
2625
import { AuthGuard } from '../guards/AuthGuard';
2726
import '../public/hotjarNPS.css';
27+
import { wrapper } from '../store/store';
2828
import '../styles/globals.css';
2929
import theme from '../styles/theme';
3030

utils/courseProgress.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Course } from '../app/coursesSlice';
21
import { PROGRESS_STATUS } from '../constants/enums';
2+
import { Course } from '../store/coursesSlice';
33

44
export const determineCourseProgress = (courses: Course[], courseId: number) => {
55
const userCourse = courses.find((course: Course) => course.storyblokId === courseId);

utils/formatPartnerAccess.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { PartnerAccess } from '../app/partnerAccessSlice';
2-
import { PartnerAdmin } from '../app/partnerAdminSlice';
31
import { PartnerContent } from '../constants/partners';
2+
import { PartnerAccess } from '../store/partnerAccessSlice';
3+
import { PartnerAdmin } from '../store/partnerAdminSlice';
44
import { joinedPartners } from './formatPartnerAccesses';
55

66
const partnerAccessBase = {

utils/formatPartnerAccesses.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { PartnerAccess } from '../app/partnerAccessSlice';
2-
import { PartnerAdmin } from '../app/partnerAdminSlice';
1+
import { PartnerAccess } from '../store/partnerAccessSlice';
2+
import { PartnerAdmin } from '../store/partnerAdminSlice';
33

44
export const joinedPartners = (
55
partnerAccesses: PartnerAccess[] | undefined,

utils/getAccountType.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { PartnerAccess, PartnerAccesses } from '../app/partnerAccessSlice';
2-
import { PartnerAdmin } from '../app/partnerAdminSlice';
1+
import { PartnerAccess, PartnerAccesses } from '../store/partnerAccessSlice';
2+
import { PartnerAdmin } from '../store/partnerAdminSlice';
33
import { AccountType, getAccountType } from './getAccountType';
44
const partnerAdminEmpty = { id: null } as PartnerAdmin;
55
const partnerAdmin = { id: 'id' } as PartnerAdmin;

utils/getAccountType.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { PartnerAccesses } from '../app/partnerAccessSlice';
2-
import { PartnerAdmin } from '../app/partnerAdminSlice';
1+
import { PartnerAccesses } from '../store/partnerAccessSlice';
2+
import { PartnerAdmin } from '../store/partnerAdminSlice';
33

44
export enum AccountType {
55
partnerAdmin = 'PARTNER_ADMIN',

utils/getCourseData.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Course, Courses, Session } from '../app/coursesSlice';
1+
import { Course, Courses, Session } from '../store/coursesSlice';
22
import { getCourseData } from './getCourseData';
33

44
const coursesBase: Courses = [

utils/getCourseData.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Courses } from '../app/coursesSlice';
1+
import { Courses } from '../store/coursesSlice';
22

33
const storyblokIdColumnMap: Record<string, string> = {
44
98127815: 'number_dbr_sessions',

utils/hasAccessToPage.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { PartnerAccess } from '../app/partnerAccessSlice';
2-
import { PartnerAdmin } from '../app/partnerAdminSlice';
31
import { PartnerContent } from '../constants/partners';
2+
import { PartnerAccess } from '../store/partnerAccessSlice';
3+
import { PartnerAdmin } from '../store/partnerAdminSlice';
44
import hasAccessToPage from './hasAccessToPage';
55

66
const emptyPartnerAdmin: PartnerAdmin = {

utils/hasAccessToPage.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { PartnerAccesses } from '../app/partnerAccessSlice';
2-
import { PartnerAdmin } from '../app/partnerAdminSlice';
1+
import { PartnerAccesses } from '../store/partnerAccessSlice';
2+
import { PartnerAdmin } from '../store/partnerAdminSlice';
33

44
const hasAccessToPage = (
55
partnersWithAccess: Array<string>,

utils/hasAutomaticAccessCodeFeature.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Partner, PartnerFeature } from '../app/partnersSlice';
21
import { FEATURES } from '../constants/enums';
2+
import { Partner, PartnerFeature } from '../store/partnersSlice';
33
import hasAutomaticAccessCodeFeature from './hasAutomaticAccessCodeFeature';
44
const partnerData = {
55
id: 'partner',

utils/hasAutomaticAccessCodeFeature.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Partner } from '../app/partnersSlice';
21
import { FEATURES } from '../constants/enums';
2+
import { Partner } from '../store/partnersSlice';
33

44
export default function hasAutomaticAccessFeature(partner: Partner): boolean {
55
return partner.partnerFeature.reduce<boolean>(

utils/logEvent.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { track } from '@vercel/analytics/react';
22
import { getAnalytics } from 'firebase/analytics';
3-
import { GetUserResponse } from '../app/api';
4-
import { PartnerAccesses } from '../app/partnerAccessSlice';
5-
import { PartnerAdmin } from '../app/partnerAdminSlice';
3+
import { GetUserResponse } from '../store/api';
4+
import { PartnerAccesses } from '../store/partnerAccessSlice';
5+
import { PartnerAdmin } from '../store/partnerAdminSlice';
66
import {
77
joinedFeatureLiveChat,
88
joinedFeatureTherapy,

utils/whatsappUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ActiveSubscription } from '../app/userSlice';
1+
import { ActiveSubscription } from '../store/userSlice';
22

33
export const findWhatsappSubscription = (
44
subs: ActiveSubscription[] | null,

0 commit comments

Comments
 (0)