Update site setup and cleanup

CHANGELOG.md

@@ -1,6 +1,12 @@
+## 1.27.0
+
+Updated fixed site setup form.
+
 ## 1.26.6
 
 Fixed moth trap edit form.
+Updated species dictionary.
+Bug fixes.
 
 ## 1.26.5
 

package.json

@@ -3,7 +3,7 @@
   "id": "uk.ac.ceh.ebms",
   "title": "ButterflyCount",
   "description": "ButterflyCount mobile application.",
-  "version": "1.26.6",
+  "version": "1.27.0",
   "homepage": "http://www.butterfly-monitoring.net",
   "scripts": {
     "prepare": "husky",
@@ -40,7 +40,7 @@
     "@capacitor/status-bar": "6.0.1",
     "@flumens/bigu": "0.4.0",
     "@flumens/ionic": "2.0.0-alpha.64.1",
-    "@flumens/tailwind": "0.19.1",
+    "@flumens/tailwind": "0.21.0",
     "@heroicons/react": "^2.2.0",
     "@hookform/resolvers": "^3.9.1",
     "@ionic-native/core": "5.36.0",
@@ -72,7 +72,6 @@
     "mobx": "^6.13.5",
     "mobx-react": "9.1.1",
     "mobx-utils": "6.1.0",
-    "prop-types": "15.8.1",
     "react": "18.3.1",
     "react-aria-components": "^1.4.1",
     "react-autosuggest": "10.1.0",
@@ -107,6 +106,7 @@
     "@flumens/fetch-onedrive-excel": "0.3.3",
     "@flumens/prettier-config": "0.4.0",
     "@flumens/webpack-config": "5.5.0",
+    "@types/geojson": "^7946.0.14",
     "@types/jest": "29.5.14",
     "@types/lodash": "^4.17.13",
     "@types/react": "18.3.12",

src/App.tsx

@@ -1,6 +1,11 @@
 import { observer } from 'mobx-react';
 import { Route, Redirect } from 'react-router-dom';
-import { TailwindContext, TailwindContextValue } from '@flumens';
+import {
+  TailwindBlockContext,
+  TailwindContext,
+  TailwindContextValue,
+  defaultContext,
+} from '@flumens';
 import {
   IonApp as IonAppPlain,
   IonRouterOutlet,
@@ -24,6 +29,11 @@ const IonApp = IonAppPlain as any; // IonApp has 'lang' prop missing.
 
 const platform = isPlatform('ios') ? 'ios' : 'android';
 const tailwindContext: TailwindContextValue = { platform };
+const tailwindBlockContext = {
+  ...defaultContext,
+  ...tailwindContext,
+  basePath: '',
+};
 
 const HomeRedirect = () => <Redirect to="home" />;
 
@@ -34,20 +44,22 @@ const App = () => {
     <IonApp lang={language as any}>
       <LanguageCountrySelectRequired appModel={appModel}>
         <TailwindContext.Provider value={tailwindContext}>
-          <Onboarding>
-            <WhatsNewDialog appModel={appModel} />
-            <IonReactRouter>
-              <IonRouterOutlet id="main">
-                <Route exact path="/" component={HomeRedirect} />
-                <Route path="/home" component={Home} />
-                {Info}
-                {User}
-                {Survey}
-                {Location}
-                {Settings}
-              </IonRouterOutlet>
-            </IonReactRouter>
-          </Onboarding>
+          <TailwindBlockContext.Provider value={tailwindBlockContext}>
+            <Onboarding>
+              <WhatsNewDialog appModel={appModel} />
+              <IonReactRouter>
+                <IonRouterOutlet id="main">
+                  <Route exact path="/" component={HomeRedirect} />
+                  <Route path="/home" component={Home} />
+                  {Info}
+                  {User}
+                  {Survey}
+                  {Location}
+                  {Settings}
+                </IonRouterOutlet>
+              </IonReactRouter>
+            </Onboarding>
+          </TailwindBlockContext.Provider>
         </TailwindContext.Provider>
       </LanguageCountrySelectRequired>
     </IonApp>

src/Info/About/index.jsx → src/Info/About/index.tsx

@@ -1,11 +1,11 @@
-import PropTypes from 'prop-types';
 import { Trans as T } from 'react-i18next';
 import { Page, Main, Header, Section } from '@flumens';
+import appModel from 'models/app';
 import './styles.scss';
 
 const { P } = Section;
 
-const Component = ({ appModel }) => {
+const Component = () => {
   const isEnglish = appModel.attrs.language === 'en';
 
   return (
@@ -71,8 +71,4 @@ const Component = ({ appModel }) => {
   );
 };
 
-Component.propTypes = {
-  appModel: PropTypes.object.isRequired,
-};
-
 export default Component;

src/Info/router.jsx

@@ -1,14 +1,12 @@
 import { Route } from 'react-router-dom';
-import appModel from 'models/app';
 import About from './About';
 import Credits from './Credits';
 import Guide from './Guide';
 import Help from './Help';
 
-const AboutWrap = () => <About appModel={appModel} />;
 export default [
   <Route path="/info/help" key="/info/help" exact component={Help} />,
   <Route path="/info/credits" key="/info/credits" exact component={Credits} />,
-  <Route path="/info/about" key="/info/about" exact component={AboutWrap} />,
+  <Route path="/info/about" key="/info/about" exact component={About} />,
   <Route path="/info/guide" key="/info/guide" exact component={Guide} />,
 ];

src/Location/MothTrap/Home/Main.tsx

@@ -23,8 +23,8 @@ type Props = {
   deleteLamp: (lamp: Lamp) => void;
 };
 
-const MothTrapSetupMain = ({ location, addNewLamp, deleteLamp }: Props) => {
-  const { type, lamps, location: loc, typeOther } = location.attrs;
+const MothTrapHomeMain = ({ location, addNewLamp, deleteLamp }: Props) => {
+  const { type, lamps = [], location: loc = {}, typeOther } = location.attrs;
 
   const { t } = useTranslation();
 
@@ -150,4 +150,4 @@ const MothTrapSetupMain = ({ location, addNewLamp, deleteLamp }: Props) => {
   );
 };
 
-export default observer(MothTrapSetupMain);
+export default observer(MothTrapHomeMain);

src/Location/MothTrap/Home/index.tsx

@@ -87,6 +87,10 @@ const MothTrapSetup = ({ sample: location }: Props) => {
   const addNewLamp = () => {
     const cid = UUID();
 
+    if (!location.attrs.lamps) {
+      location.attrs.lamps = [];
+    }
+
     location.attrs.lamps.push({
       cid,
       attrs: { type: '', quantity: 1, description: '' },

src/Location/MothTrap/Lamp/Main.tsx

@@ -12,7 +12,7 @@ type Props = {
   lamp: Lamp;
 };
 
-const MothTrapSetupMain = ({ location, lamp }: Props) => {
+const MothTrapLampMain = ({ location, lamp }: Props) => {
   const { description, type } = lamp.attrs;
 
   const getCounterOnChange = (value: number) => {
@@ -57,4 +57,4 @@ const MothTrapSetupMain = ({ location, lamp }: Props) => {
   );
 };
 
-export default observer(MothTrapSetupMain);
+export default observer(MothTrapLampMain);

src/Survey/AreaCount/Area/Main/Favourites/index.tsx

@@ -121,7 +121,7 @@ const Favourites = ({
         </IonToolbar>
 
         {hasGroup && (
-          <IonToolbar className=" !p-0 text-black [--background:var(--ion-page-background)]">
+          <IonToolbar className="!p-0 text-black [--background:var(--ion-page-background)]">
             <IonSegment onIonChange={onSegmentClick} value={segment}>
               <IonSegmentButton value="group">
                 <IonLabel className="ion-text-wrap">