+
+
+
- {/* Welcome - Title and Subtitle */}
-
-
Welcome to SILVA
-
- Plan, report, and analyze your silviculture activities
-
+ {/* Welcome - Title and Subtitle */}
+
+
Welcome to SILVA
+
+ Plan, report, and analyze your silviculture activities
+
+
+ {/* Button Group */}
+
+
+
- {/* Button Group */}
-
-
-
-
-
-
-
+
+
+
+
+
-
+
);
};
diff --git a/frontend/src/screens/Opening/index.tsx b/frontend/src/screens/Opening/index.tsx
index b5220d72..7ecdc3be 100644
--- a/frontend/src/screens/Opening/index.tsx
+++ b/frontend/src/screens/Opening/index.tsx
@@ -2,11 +2,13 @@ import React, {useEffect, useState} from "react";
import FavouriteCard from "../../components/FavouriteCard";
import PageTitle from "../../components/PageTitle";
import './Opening.scss'
-import { TabList } from "@carbon/react";
-import { Tabs } from "@carbon/react";
-import { Tab } from "@carbon/react";
-import { TabPanels } from "@carbon/react";
-import { TabPanel } from "@carbon/react";
+import {
+ TabList,
+ Tabs,
+ Tab,
+ TabPanels,
+ TabPanel
+} from "@carbon/react";
import OpeningsTab from "../../components/OpeningsTab";
import OpeningMetricsTab from "../../components/OpeningMetricsTab";
diff --git a/frontend/src/screens/SilvicultureSearch/index.tsx b/frontend/src/screens/SilvicultureSearch/index.tsx
index faa59ccb..c50dae59 100644
--- a/frontend/src/screens/SilvicultureSearch/index.tsx
+++ b/frontend/src/screens/SilvicultureSearch/index.tsx
@@ -1,14 +1,15 @@
import React from "react";
import PageTitle from "../../components/PageTitle";
import './SilvicultureSearch.scss'
-import { TabList } from "@carbon/react";
-import { Tabs } from "@carbon/react";
-import { Tab } from "@carbon/react";
-import { TabPanels } from "@carbon/react";
-import { TabPanel } from "@carbon/react";
+import {
+ TabList,
+ Tabs,
+ Tab,
+ TabPanels,
+ TabPanel
+} from "@carbon/react";
import * as Icons from '@carbon/icons-react';
import OpeningsSearchTab from "../../components/SilvicultureSearch/Openings/OpeningsSearchTab";
-import { OpeningsSearchProvider } from "../../contexts/search/OpeningsSearch";
const SilvicultureSearch: React.FC = () => {
@@ -26,9 +27,9 @@ const SilvicultureSearch: React.FC = () => {
Openings
- Activities
- Stocking standards
- Standard units
+ Activities
+ Stocking standards
+ Standard units
diff --git a/frontend/src/store.ts b/frontend/src/store.ts
deleted file mode 100644
index edba420c..00000000
--- a/frontend/src/store.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { createStore, combineReducers, applyMiddleware } from 'redux'
-import { thunk } from 'redux-thunk'
-import { composeWithDevTools } from '@redux-devtools/extension'
-import { userDetailsReducer } from './reducers/userReducer'
-import { UserClientRolesType } from './types/UserRoleType'
-import { selectedClientRolesReducer } from './reducers/selectedClientRolesReducer'
-import { FamLoginUser } from './services/AuthService'
-
-const reducer = combineReducers({
- userDetails: userDetailsReducer,
- selectedClientRoles: selectedClientRolesReducer
-});
-
-const FAM_LOGIN_USER = 'famLoginUser';
-
-
-const userInfoFromStorage = JSON.parse(localStorage.getItem(FAM_LOGIN_USER) as string) as
- | FamLoginUser
- | undefined
- | null;
-
-const selectedClientRolesFromStorage = JSON.parse(localStorage.getItem('selectedClientRoles') as string) as
- | UserClientRolesType
- | undefined
- | null;
-
-// set the initial state
-const initialState: object = {
- userDetails: {
- user: {
- ...userInfoFromStorage,
- isLoggedIn: !!userInfoFromStorage?.authToken
- },
- loading: true,
- error: false
- },
- selectedClientRoles: selectedClientRolesFromStorage
-};
-
-const middleware = [thunk];
-
-const store = createStore(
- reducer,
- initialState,
- composeWithDevTools(applyMiddleware(...middleware))
-);
-
-export type RootState = ReturnType;
-export type AppDispatch = typeof store.dispatch;
-
-export default store;
diff --git a/frontend/src/types/NotificationType.ts b/frontend/src/types/NotificationType.ts
new file mode 100644
index 00000000..0e0e3bd5
--- /dev/null
+++ b/frontend/src/types/NotificationType.ts
@@ -0,0 +1,8 @@
+export interface NotificationContent {
+ title: string;
+ subTitle: string;
+ buttonLabel?: string;
+ dismissIn?: number;
+ type: 'info' | 'error' | 'success' | 'warning' | 'info-square' | 'error-square' | 'warning-alt';
+ onClose: () => void;
+}
\ No newline at end of file
diff --git a/frontend/src/utils/ThemePreference.tsx b/frontend/src/utils/ThemePreference.tsx
index fb95ab1e..bddecb21 100644
--- a/frontend/src/utils/ThemePreference.tsx
+++ b/frontend/src/utils/ThemePreference.tsx
@@ -20,7 +20,7 @@ function useThemePreference() {
}
interface ThemePreferenceProps {
- children?: ReactNode
+ readonly children?: ReactNode
}
/**
diff --git a/frontend/src/views/LoginOrgSelection/index.tsx b/frontend/src/views/LoginOrgSelection/index.tsx
deleted file mode 100644
index 901782e2..00000000
--- a/frontend/src/views/LoginOrgSelection/index.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, { useEffect } from 'react';
-import { FlexGrid, Row, Column } from '@carbon/react';
-import OrganizationSelection from '../../components/OrganizationSelection';
-import { RootState } from '../../store';
-import { useSelector } from 'react-redux';
-import './styles.scss';
-
-/**
- * Renders the organization selection view after login.
- *
- * This view allows users to select which organization they are representing.
- * It displays the user's name and username, prompting them to choose an organization.
- *
- * @returns {JSX.Element} The rendered LoginOrgSelection component.
- */
-function LoginOrgSelection (): JSX.Element {
- const userDetails = useSelector((state: RootState) => state.userDetails);
- const user = userDetails.user;
-
- return (
-
-
-
-
-
- Organization selection
-
-
- {`${user?.firstName} ${user?.lastName} ${user.providerUsername ? "("+user.providerUsername+")": ""} select which organization you're representing.`}
-
-
-
-
-
-
- );
-};
-
-export default LoginOrgSelection;
diff --git a/frontend/src/views/LoginOrgSelection/styles.scss b/frontend/src/views/LoginOrgSelection/styles.scss
deleted file mode 100644
index db688f12..00000000
--- a/frontend/src/views/LoginOrgSelection/styles.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-@use '@carbon/type';
-@use '@bcgov-nr/nr-theme/design-tokens/variables.scss' as vars;
-
-.login-org-selection-grid {
- background: lightgray; // temporary change for demo linear-gradient(180deg, #E0EFFF 0%, #F2EEDB 100%);
- height: 100vh;
- width: 100%;
- display: flex;
- justify-content: center;
- align-items: center;
- margin-inline: 0;
- max-inline-size: none;
-
- .row-container {
- max-width: none;
- width: 100%;
- display: flex;
- justify-content: center;
- align-items: center;
- }
-
- .col-container {
- display: flex;
- flex-direction: column;
- padding: min(4.63%, 3rem) min(4.63%, 4rem);
- border-radius: 0.5rem;
- background: var(--bx-layer-02);
- /* Light Theme/Shadows/Menu */
- box-shadow: 0rem 0.125rem 0.375rem 0rem rgba(0, 0, 0, 0.30);
- min-height: 50vh;
- }
-
- .title-section {
- text-align: left;
- margin-bottom: 2.5rem;
-
- .title-text {
- margin-bottom: 1rem;
- font-size: 2.625rem;
- }
-
- .subtitle-text {
- @include type.type-style('body-01');
- color: var(--#{vars.$bcgov-prefix}-text-secondary);
- font-size: 1rem;
- }
- }
-}