## Steps to start access your project and Start mapping or a mapping campaign @@ -174,29 +150,30 @@ Click on "Submit" to proceed.  3. If a task is already locked by another user, choose a different task that is available for mapping.If a task is already locked by another user, choose a different task that is available for mapping. - - The drop down icon beside **LEGEND** displays a color code. This - color code lets you know the status of each task on the map. - - **READY** means that task is available to be mapped - - **LOCKED FOR MAPPING** means that task is already being mapped by another volunteer and therefore unavailable for mapping - - **MAPPED** or **READY FOR VALIDATION** means that task has been completely mapped and ready to be validated. - - **LOCKED FOR VALIDATION** means that task has been mapped and being validated. - - **VALIDATED** means that task has successfully been validated and completely mapped with no errors - - **INVALIDATED** or **MORE MAPPING NEEDED** means that task did not pass the validation process and needs more mapping - - **BAD** means that task is not clear and cannot be mapped +- The drop down icon beside **LEGEND** displays a color code. This + color code lets you know the status of each task on the map. + + - **READY** means that task is available to be mapped + - **LOCKED FOR MAPPING** means that task is already being mapped by another volunteer and therefore unavailable for mapping + - **MAPPED** or **READY FOR VALIDATION** means that task has been completely mapped and ready to be validated. + - **LOCKED FOR VALIDATION** means that task has been mapped and being validated. + - **VALIDATED** means that task has successfully been validated and completely mapped with no errors + - **INVALIDATED** or **MORE MAPPING NEEDED** means that task did not pass the validation process and needs more mapping + - **BAD** means that task is not clear and cannot be mapped > Note: 'task' refers to each section of the map enclosed in the dotted > lines and each task has a corresponding number tag. -  - - To begin mapping, click on a task closest to you that has the color - code associated with **READY** and change it's status from **READY** - to **LOCKED FOR MAPPING**. Remember to take note of the number tag. - - Scroll to the bottom of the page. The **ACTIVITIES** tab shows the - tasks either **LOCKED FOR MAPPING**, **BAD** or **LOCKED FOR - VALIDATION**. You can search for tasks with the status mentioned - using the number tag associated with each task. + +- To begin mapping, click on a task closest to you that has the color + code associated with **READY** and change it's status from **READY** + to **LOCKED FOR MAPPING**. Remember to take note of the number tag. +- Scroll to the bottom of the page. The **ACTIVITIES** tab shows the + tasks either **LOCKED FOR MAPPING**, **BAD** or **LOCKED FOR + VALIDATION**. You can search for tasks with the status mentioned + using the number tag associated with each task. 4. Use the QR code to start mapping the selected task using the ODK Collect app on your mobile phone. 5. Install and open the ODK Collect app on your phone. @@ -207,11 +184,14 @@ Click on "Submit" to proceed. 10. After completing the assigned task, go back to the project platform on FMTM and mark it as fully mapped. ## Help and Support + If you encounter any issues or need assistance while using FMTM, you can access the following resources: + - Check the [FAQs](https://github.com/hotosm/fmtm/wiki/FAQ) . - Ask your doubts in the [Slack channel: #fmtm-field-pilots](https://hotosm.slack.com/archives/C04PCBFDEGN) -## Thank you +## Thank you + We are excited to have you join our community of passionate mappers and volunteers. FMTM is a powerful platform developed by the Humanitarian OpenStreetMap Team (HOT) to facilitate mapping projects for disaster response, humanitarian efforts, and community development. With FMTM, you have the opportunity to make a real impact by mapping areas that are in need of support. Your contributions help create detailed and up-to-date maps that aid organizations and communities in their efforts to respond to crises, plan infrastructure, and improve the lives of people around the world. diff --git a/docs/dev/Frontend.md b/docs/dev/Frontend.md index 6a2d5e4359..b2c7dbb1a8 100644 --- a/docs/dev/Frontend.md +++ b/docs/dev/Frontend.md @@ -32,7 +32,7 @@ Install the dependencies by running the following command: `npm install` Run the frontend with hot-reloading: `npm run start:live` -The frontend should now be accessible at: <<<<<<
+
diff --git a/src/frontend/main/src/components/TasksMap/TasksMap.jsx b/src/frontend/main/src/components/TasksMap/TasksMap.jsx
index 0f7e0b622b..78322e2f3b 100644
--- a/src/frontend/main/src/components/TasksMap/TasksMap.jsx
+++ b/src/frontend/main/src/components/TasksMap/TasksMap.jsx
@@ -1,16 +1,14 @@
-import React from "react";
-import useOLMap from "../../hooks/useOlMap";
-import { MapContainer as MapComponent } from "../MapComponent/OpenLayersComponent";
-import LayerSwitcherControl from "../MapComponent/OpenLayersComponent/LayerSwitcher/index.js";
-import { VectorLayer } from "../MapComponent/OpenLayersComponent/Layers";
+import React from 'react';
+import useOLMap from '../../hooks/useOlMap';
+import { MapContainer as MapComponent } from '../MapComponent/OpenLayersComponent';
+import LayerSwitcherControl from '../MapComponent/OpenLayersComponent/LayerSwitcher/index.js';
+import { VectorLayer } from '../MapComponent/OpenLayersComponent/Layers';
function elastic(t) {
- return (
- Math.pow(2, -10 * t) * Math.sin(((t - 0.075) * (2 * Math.PI)) / 0.3) + 1
- );
+ return Math.pow(2, -10 * t) * Math.sin(((t - 0.075) * (2 * Math.PI)) / 0.3) + 1;
}
const basicGeojsonTemplate = {
- type: "FeatureCollection",
+ type: 'FeatureCollection',
features: [],
};
const TasksMap = ({ projectTaskBoundries, projectBuildingGeojson }) => {
@@ -23,17 +21,17 @@ const TasksMap = ({ projectTaskBoundries, projectBuildingGeojson }) => {
zoom: 4,
maxZoom: 25,
});
- console.log(projectTaskBoundries, "projectTaskBoundries");
+ console.log(projectTaskBoundries, 'projectTaskBoundries');
return (
-
+
Field Mapping Tasking Manager
-
-
-
-
-
+
+
+
+
+
+ Field Mapping Tasking Manager
+
+
+
+
diff --git a/src/frontend/main/src/index.ts b/src/frontend/main/src/index.ts
index c7ffe8613a..0189803552 100755
--- a/src/frontend/main/src/index.ts
+++ b/src/frontend/main/src/index.ts
@@ -1,2 +1 @@
-
-import("./App");
+import('./App');
diff --git a/src/frontend/main/src/models/createproject/createProjectModel.ts b/src/frontend/main/src/models/createproject/createProjectModel.ts
index 3e4dbad39e..dfa5ba502a 100755
--- a/src/frontend/main/src/models/createproject/createProjectModel.ts
+++ b/src/frontend/main/src/models/createproject/createProjectModel.ts
@@ -1,23 +1,37 @@
-
export interface ProjectDetailsModel {
+ id: number;
+ odkid: number;
+ author: {
+ username: string;
id: number;
- odkid: number;
- author: {
- username: string;
- id: number;
+ };
+ default_locale: string;
+ project_info: {
+ locale: string;
+ name: string;
+ short_description: string;
+ description: string;
+ instructions: string;
+ per_task_instructions: string;
+ }[];
+ status: number;
+ xform_title: string;
+ location_str: string;
+ outline_geojson: {
+ type: string;
+ geometry: {
+ coordinates: [string, string];
+ type: string;
};
- default_locale: string;
- project_info: {
- locale: string;
- name: string;
- short_description: string;
- description: string;
- instructions: string;
- per_task_instructions: string;
- }[];
- status: number;
- xform_title: string;
- location_str: string;
+ properties: Record;
+ id: string;
+ bbox: [string, string, string, string];
+ };
+ project_tasks: {
+ id: number;
+ project_id: number;
+ project_task_index: number;
+ project_task_name: string;
outline_geojson: {
type: string;
geometry: {
@@ -28,55 +42,40 @@ export interface ProjectDetailsModel {
id: string;
bbox: [string, string, string, string];
};
- project_tasks: {
- id: number;
- project_id: number;
- project_task_index: number;
- project_task_name: string;
- outline_geojson: {
- type: string;
- geometry: {
- coordinates: [string, string];
- type: string;
- };
- properties: Record;
- id: string;
- bbox: [string, string, string, string];
- };
- outline_centroid: {
+ outline_centroid: {
+ type: string;
+ geometry: {
+ coordinates: [string, string];
type: string;
- geometry: {
- coordinates: [string, string];
- type: string;
- };
- properties: Record;
- id: string;
- bbox: [string, string, string, string];
};
- task_status: number;
- locked_by_uid: number;
- locked_by_username: string;
- task_history: {
- id: number;
- action_text: string;
- action_date: string;
- }[];
- qr_code_base64: string;
- task_status_str: string;
+ properties: Record;
+ id: string;
+ bbox: [string, string, string, string];
+ };
+ task_status: number;
+ locked_by_uid: number;
+ locked_by_username: string;
+ task_history: {
+ id: number;
+ action_text: string;
+ action_date: string;
}[];
- }
+ qr_code_base64: string;
+ task_status_str: string;
+ }[];
+}
- export interface FormCategoryListModel {
- id: number,
- title: string,
- }
- export interface OrganisationListModel {
- name: string;
- slug: string;
- description: string;
- type: number;
- subscription_tier: null | string;
- id: number;
- logo: string;
- url: string;
- }
\ No newline at end of file
+export interface FormCategoryListModel {
+ id: number;
+ title: string;
+}
+export interface OrganisationListModel {
+ name: string;
+ slug: string;
+ description: string;
+ type: number;
+ subscription_tier: null | string;
+ id: number;
+ logo: string;
+ url: string;
+}
diff --git a/src/frontend/main/src/models/geojsonObjectModel.js b/src/frontend/main/src/models/geojsonObjectModel.js
index 08bb89584b..89d8b06cbf 100755
--- a/src/frontend/main/src/models/geojsonObjectModel.js
+++ b/src/frontend/main/src/models/geojsonObjectModel.js
@@ -1,10 +1,10 @@
export const geojsonObjectModel = {
- 'type': 'FeatureCollection',
- 'SRID': {
- 'type': 'name',
- 'properties': {
- 'name': 'EPSG:3857',
- },
+ type: 'FeatureCollection',
+ SRID: {
+ type: 'name',
+ properties: {
+ name: 'EPSG:3857',
},
- 'features': []
-}
+ },
+ features: [],
+};
diff --git a/src/frontend/main/src/models/home/homeModel.ts b/src/frontend/main/src/models/home/homeModel.ts
index b5319dc5fe..924259b2ac 100755
--- a/src/frontend/main/src/models/home/homeModel.ts
+++ b/src/frontend/main/src/models/home/homeModel.ts
@@ -1,12 +1,11 @@
-
export interface HomeProjectCardModel {
- id: number,
- priority: number,
- title: string,
- location_str: string,
- description: string,
- total_tasks: number,
- tasks_mapped: number,
- tasks_validated: number,
- tasks_bad_imagery: number
-}
\ No newline at end of file
+ id: number;
+ priority: number;
+ title: string;
+ location_str: string;
+ description: string;
+ total_tasks: number;
+ tasks_mapped: number;
+ tasks_validated: number;
+ tasks_bad_imagery: number;
+}
diff --git a/src/frontend/main/src/models/organization/organizationModel.ts b/src/frontend/main/src/models/organization/organizationModel.ts
index 256dec9316..a7795a55b1 100644
--- a/src/frontend/main/src/models/organization/organizationModel.ts
+++ b/src/frontend/main/src/models/organization/organizationModel.ts
@@ -1,43 +1,42 @@
-
export interface OrganizationModal {
- name: string,
- description: string,
- url: string,
- type: number,
+ name: string;
+ description: string;
+ url: string;
+ type: number;
}
- export interface FormCategoryListModel {
- id: number,
- title: string,
- }
- export interface OrganisationListModel {
- name: string;
- slug: string;
- description: string;
- type: number;
- subscription_tier: null | string;
- id: number;
- logo: string;
- url: string;
- }
+export interface FormCategoryListModel {
+ id: number;
+ title: string;
+}
+export interface OrganisationListModel {
+ name: string;
+ slug: string;
+ description: string;
+ type: number;
+ subscription_tier: null | string;
+ id: number;
+ logo: string;
+ url: string;
+}
- export interface GetOrganizationDataModel {
- name : string;
- slug : string;
- description : string;
- type : number;
- subscription_tier : null;
- id: number;
- logo : string;
- url : string;
- }
- export interface PostOrganizationDataModel {
- name : string;
- slug : string;
- description : string;
- type : number;
- subscription_tier : null;
- id: number;
- logo : string;
- url : string;
- }
\ No newline at end of file
+export interface GetOrganizationDataModel {
+ name: string;
+ slug: string;
+ description: string;
+ type: number;
+ subscription_tier: null;
+ id: number;
+ logo: string;
+ url: string;
+}
+export interface PostOrganizationDataModel {
+ name: string;
+ slug: string;
+ description: string;
+ type: number;
+ subscription_tier: null;
+ id: number;
+ logo: string;
+ url: string;
+}
diff --git a/src/frontend/main/src/store/slices/CommonSlice.ts b/src/frontend/main/src/store/slices/CommonSlice.ts
index 1fc4e85df2..333e8f313c 100755
--- a/src/frontend/main/src/store/slices/CommonSlice.ts
+++ b/src/frontend/main/src/store/slices/CommonSlice.ts
@@ -1,30 +1,28 @@
-
-import CoreModules from "../../shared/CoreModules";
+import CoreModules from '../../shared/CoreModules';
const CommonSlice = CoreModules.createSlice({
- name: 'common',
- initialState: {
- snackbar: {
- open: false,
- message: '',
- variant: 'info',
- duration: 0
- },
- loading:false,
- postOrganizationLoading:false
+ name: 'common',
+ initialState: {
+ snackbar: {
+ open: false,
+ message: '',
+ variant: 'info',
+ duration: 0,
},
- reducers: {
- SetSnackBar(state, action) {
- state.snackbar = action.payload
- },
- SetLoading(state,action){
- state.loading = action.payload
- },
- PostOrganizationLoading(state,action){
- state.organization = action.payload
- }
- }
-})
-
+ loading: false,
+ postOrganizationLoading: false,
+ },
+ reducers: {
+ SetSnackBar(state, action) {
+ state.snackbar = action.payload;
+ },
+ SetLoading(state, action) {
+ state.loading = action.payload;
+ },
+ PostOrganizationLoading(state, action) {
+ state.organization = action.payload;
+ },
+ },
+});
export const CommonActions = CommonSlice.actions;
export default CommonSlice;
diff --git a/src/frontend/main/src/store/slices/organizationSlice.ts b/src/frontend/main/src/store/slices/organizationSlice.ts
index 0690199fa0..f4d85c9937 100644
--- a/src/frontend/main/src/store/slices/organizationSlice.ts
+++ b/src/frontend/main/src/store/slices/organizationSlice.ts
@@ -1,32 +1,32 @@
-import CoreModules from "../../shared/CoreModules.js"
+import CoreModules from '../../shared/CoreModules.js';
const OrganizationSlice = CoreModules.createSlice({
- name: 'organization',
- initialState: {
- organizationFormData:{},
- organizationData: [],
- postOrganizationData: null,
- organizationDataLoading: false,
- postOrganizationDataLoading: false,
+ name: 'organization',
+ initialState: {
+ organizationFormData: {},
+ organizationData: [],
+ postOrganizationData: null,
+ organizationDataLoading: false,
+ postOrganizationDataLoading: false,
+ },
+ reducers: {
+ GetOrganizationsData(state, action) {
+ state.oraganizationData = action.payload;
},
- reducers: {
- GetOrganizationsData(state, action) {
- state.oraganizationData = action.payload
- },
- GetOrganizationDataLoading(state, action) {
- state.organizationDataLoading = action.payload
- },
- postOrganizationData(state, action) {
- state.postOrganizationData = action.payload
- },
- PostOrganizationDataLoading(state, action) {
- state.postOrganizationDataLoading = action.payload
- },
- SetOrganizationFormData(state, action) {
- state.organizationFormData = action.payload
- },
- }
-})
+ GetOrganizationDataLoading(state, action) {
+ state.organizationDataLoading = action.payload;
+ },
+ postOrganizationData(state, action) {
+ state.postOrganizationData = action.payload;
+ },
+ PostOrganizationDataLoading(state, action) {
+ state.postOrganizationDataLoading = action.payload;
+ },
+ SetOrganizationFormData(state, action) {
+ state.organizationFormData = action.payload;
+ },
+ },
+});
export const OrganizationAction = OrganizationSlice.actions;
-export default OrganizationSlice;
\ No newline at end of file
+export default OrganizationSlice;
diff --git a/src/frontend/main/src/styles/home.css b/src/frontend/main/src/styles/home.css
index 5171ec811f..40d54188f9 100755
--- a/src/frontend/main/src/styles/home.css
+++ b/src/frontend/main/src/styles/home.css
@@ -1,11 +1,11 @@
#search {
- margin-top: 11.8px;
+ margin-top: 11.8px;
}
#searchXs {
- width: '15%';
+ width: '15%';
}
.dropdown-item {
- width: '100%';
+ width: '100%';
}
diff --git a/src/frontend/main/src/styles/home.scss b/src/frontend/main/src/styles/home.scss
index ba59b55c9f..837407da91 100755
--- a/src/frontend/main/src/styles/home.scss
+++ b/src/frontend/main/src/styles/home.scss
@@ -39,12 +39,12 @@
transform: rotate(360deg);
}
}
-#qrcodeImg{
+#qrcodeImg {
width: 170px;
- height:inherit;
+ height: inherit;
}
.spinner:after {
- content: "";
+ content: '';
box-sizing: border-box;
position: absolute;
top: 50%;
@@ -70,7 +70,7 @@
.ol-popup {
position: absolute;
background-color: white;
- box-shadow: 0 1px 4px rgba(0,0,0,0.2);
+ box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2);
padding: 15px;
border-radius: 10px;
border: 1px solid #cccccc;
@@ -78,10 +78,11 @@
left: -50px;
min-width: 280px;
}
-.ol-popup:after, .ol-popup:before {
+.ol-popup:after,
+.ol-popup:before {
top: 100%;
border: solid transparent;
- content: " ";
+ content: ' ';
height: 0;
width: 0;
position: absolute;
@@ -106,5 +107,5 @@
right: 8px;
}
.ol-popup-closer:after {
- content: "✖";
-}
\ No newline at end of file
+ content: '✖';
+}
diff --git a/src/frontend/main/src/utilities/BasicCard.tsx b/src/frontend/main/src/utilities/BasicCard.tsx
index a1a855e836..fb5eadd501 100755
--- a/src/frontend/main/src/utilities/BasicCard.tsx
+++ b/src/frontend/main/src/utilities/BasicCard.tsx
@@ -2,12 +2,12 @@ import * as React from 'react';
import CoreModules from '../shared/CoreModules';
export default function BasicCard({ title, subtitle, content, variant, contentProps, headerStatus }) {
-
- return (
-
-
- {headerStatus &&
- {/*
+
+ {headerStatus && (
+
+ {/*
{title}
@@ -17,11 +17,12 @@ export default function BasicCard({ title, subtitle, content, variant, contentPr
>
{subtitle}
*/}
- }
-
- {content}
-
-
-
- );
+
+ )}
+
+ {content}
+
+
+
+ );
}
diff --git a/src/frontend/main/src/utilities/CustomizedImage.jsx b/src/frontend/main/src/utilities/CustomizedImage.jsx
index 9a44f6c0d5..bfa2c7c15b 100755
--- a/src/frontend/main/src/utilities/CustomizedImage.jsx
+++ b/src/frontend/main/src/utilities/CustomizedImage.jsx
@@ -1,21 +1,18 @@
-import React from "react";
+import React from 'react';
import cardImg from '../assets/images/project_icon.png';
-import logo from '../assets/images/hotLog.png'
+import logo from '../assets/images/hotLog.png';
import { LazyLoadImage } from 'react-lazy-load-image-component';
-const Switcher = ({ status,width,height }) => {
- switch (status) {
- case 'card':
- return
- )
-}
+const CustomizedImage = ({ status, style }) => {
+ return (null);
- const open = Boolean(anchorEl);
- const handleClick = (event: React.MouseEvent) => {
- setAnchorEl(event.currentTarget);
- };
- const handleClose = () => {
- setAnchorEl(null);
- };
+ const [anchorEl, setAnchorEl] = React.useState(null);
+ const open = Boolean(anchorEl);
+ const handleClick = (event: React.MouseEvent) => {
+ setAnchorEl(event.currentTarget);
+ };
+ const handleClose = () => {
+ setAnchorEl(null);
+ };
- return (
-
-
-
-
- {message}
-
-
-
-
- );
+ return (
+
+
+
+ {message}
+
+
+
+ );
}
diff --git a/src/frontend/main/src/utilities/MappingHeader.tsx b/src/frontend/main/src/utilities/MappingHeader.tsx
index e11be61036..a3fd28cb47 100644
--- a/src/frontend/main/src/utilities/MappingHeader.tsx
+++ b/src/frontend/main/src/utilities/MappingHeader.tsx
@@ -3,26 +3,34 @@ import CoreModules from '../shared/CoreModules';
import environment from '../environment';
const MappingHeader = () => {
- const onToggleOutline=(e)=>{
+ const onToggleOutline = (e) => {
var styleSheet = document.styleSheets[0];
- if(e.target.checked){
+ if (e.target.checked) {
styleSheet.insertRule('* { outline: 1px solid #ff9c84; }', 0);
- }else{
+ } else {
if (styleSheet && styleSheet.cssRules.length > 0) {
styleSheet.deleteRule(0);
}
}
+ };
- }
-
return (
- {environment.nodeEnv === 'development' ?:null}
+ {environment.nodeEnv === 'development' ? (
+
Mapping our world together
-
+
hotosm.org
diff --git a/src/frontend/main/src/utilities/mapUtils.js b/src/frontend/main/src/utilities/mapUtils.js
index 2b972ee051..5aad0c34ac 100644
--- a/src/frontend/main/src/utilities/mapUtils.js
+++ b/src/frontend/main/src/utilities/mapUtils.js
@@ -1,15 +1,14 @@
-import { Stroke, Style } from "ol/style";
+import { Stroke, Style } from 'ol/style';
const basicGeojsonTemplate = {
- type: "FeatureCollection",
- features: [],
+ type: 'FeatureCollection',
+ features: [],
};
const buildingStyle = new Style({
- stroke: new Stroke({
- color: "#FF0000",
- }),
- });
+ stroke: new Stroke({
+ color: '#FF0000',
+ }),
+});
-
-export { basicGeojsonTemplate,buildingStyle }
\ No newline at end of file
+export { basicGeojsonTemplate, buildingStyle };
diff --git a/src/frontend/main/src/views/NotFound404.jsx b/src/frontend/main/src/views/NotFound404.jsx
index 7175ece6a9..ee8ce79070 100644
--- a/src/frontend/main/src/views/NotFound404.jsx
+++ b/src/frontend/main/src/views/NotFound404.jsx
@@ -11,11 +11,11 @@ const NotFoundPage = () => {
alignItems="center"
p={3}
>
-
- The page you were looking for doesn't exist.
+
+ The page you were looking for doesn't exist.
-
- You may have mistyped the address or the page may have moved.
+
+ You may have mistyped the address or the page may have moved.
diff --git a/src/frontend/main/test-tsconfig.json b/src/frontend/main/test-tsconfig.json
index 58c788aa31..d549227b8e 100644
--- a/src/frontend/main/test-tsconfig.json
+++ b/src/frontend/main/test-tsconfig.json
@@ -1,64 +1,60 @@
{
- "compilerOptions": {
- /* Basic Options */
- "target": "esnext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */,
- "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
- "lib": [
- "esnext",
- "dom"
- ] /* Specify library files to be included in the compilation. */,
- // "allowJs": true, /* Allow javascript files to be compiled. */
- // "checkJs": true, /* Report errors in .js files. */
- "jsx": "react-jsx" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */,
- // "declaration": true, /* Generates corresponding '.d.ts' file. */
- // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
- // "sourceMap": true, /* Generates corresponding '.map' file. */
- // "outFile": "./", /* Concatenate and emit output to single file. */
- // "outDir": "./dist/", /* Redirect output structure to the directory. */
- // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
- // "composite": true, /* Enable project compilation */
- // "removeComments": true, /* Do not emit comments to output. */
- "noEmit": false /* Do not emit outputs. */,
- // "importHelpers": true /* Import emit helpers from 'tslib'. */,
- // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
- // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
- /* Strict Type-Checking Options */
- "strict": false /* Enable all strict type-checking options. */,
- // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
- // "strictNullChecks": true, /* Enable strict null checks. */
- // "strictFunctionTypes": true, /* Enable strict checking of function types. */
- // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
- // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
- // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
- // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
- /* Additional Checks */
- "noUnusedLocals": true /* Report errors on unused locals. */,
- "noUnusedParameters": true /* Report errors on unused parameters. */,
- // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
- // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
- /* Module Resolution Options */
- "moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
- // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
- // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
- // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
- // "typeRoots": [], /* List of folders to include type definitions from. */
- // "types": [], /* Type declaration files to be included in compilation. */
- // "allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */,
- "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
- // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
- /* Source Map Options */
- // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
- // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
- // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
- // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
- /* Experimental Options */
- // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
- // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
- "skipLibCheck": true,
- "forceConsistentCasingInFileNames": true,
- "resolveJsonModule": true,
- "outDir": "dist"
-
- },
- "exclude": ["node_modules"]
- }
\ No newline at end of file
+ "compilerOptions": {
+ /* Basic Options */
+ "target": "esnext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */,
+ "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
+ "lib": ["esnext", "dom"] /* Specify library files to be included in the compilation. */,
+ // "allowJs": true, /* Allow javascript files to be compiled. */
+ // "checkJs": true, /* Report errors in .js files. */
+ "jsx": "react-jsx" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */,
+ // "declaration": true, /* Generates corresponding '.d.ts' file. */
+ // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
+ // "sourceMap": true, /* Generates corresponding '.map' file. */
+ // "outFile": "./", /* Concatenate and emit output to single file. */
+ // "outDir": "./dist/", /* Redirect output structure to the directory. */
+ // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+ // "composite": true, /* Enable project compilation */
+ // "removeComments": true, /* Do not emit comments to output. */
+ "noEmit": false /* Do not emit outputs. */,
+ // "importHelpers": true /* Import emit helpers from 'tslib'. */,
+ // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+ // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+ /* Strict Type-Checking Options */
+ "strict": false /* Enable all strict type-checking options. */,
+ // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
+ // "strictNullChecks": true, /* Enable strict null checks. */
+ // "strictFunctionTypes": true, /* Enable strict checking of function types. */
+ // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+ // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
+ // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
+ // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
+ /* Additional Checks */
+ "noUnusedLocals": true /* Report errors on unused locals. */,
+ "noUnusedParameters": true /* Report errors on unused parameters. */,
+ // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
+ // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
+ /* Module Resolution Options */
+ "moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
+ // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
+ // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+ // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
+ // "typeRoots": [], /* List of folders to include type definitions from. */
+ // "types": [], /* Type declaration files to be included in compilation. */
+ // "allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */,
+ "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
+ // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
+ /* Source Map Options */
+ // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+ // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
+ // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
+ // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+ /* Experimental Options */
+ // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
+ // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
+ "skipLibCheck": true,
+ "forceConsistentCasingInFileNames": true,
+ "resolveJsonModule": true,
+ "outDir": "dist"
+ },
+ "exclude": ["node_modules"]
+}
diff --git a/src/frontend/main/tsconfig.json b/src/frontend/main/tsconfig.json
index ff388b6558..778ddc0202 100644
--- a/src/frontend/main/tsconfig.json
+++ b/src/frontend/main/tsconfig.json
@@ -2,11 +2,7 @@
"compilerOptions": {
"target": "ESNext",
"useDefineForClassFields": true,
- "lib": [
- "DOM",
- "DOM.Iterable",
- "ESNext"
- ],
+ "lib": ["DOM", "DOM.Iterable", "ESNext"],
"allowJs": false,
"checkJs": false,
"skipLibCheck": true,
@@ -31,7 +27,7 @@
"noImplicitReturns": true,
"strictPropertyInitialization": true,
"noUnusedLocals": true,
- "noUnusedParameters": true,
+ "noUnusedParameters": true
},
"include": [
// ".eslintrc.cjs",
@@ -40,8 +36,5 @@
"src/**/*.ts",
"tests"
],
- "exclude": [
- "node_modules",
- "dist"
- ],
-}
\ No newline at end of file
+ "exclude": ["node_modules", "dist"]
+}
-
-
-
- )
- })
- )
-}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ );
+ });
+};
export default ProjectCardSkeleton;
diff --git a/src/frontend/main/src/components/organization/OrganizationAddForm.tsx b/src/frontend/main/src/components/organization/OrganizationAddForm.tsx
index fdcc933321..7ae1862918 100644
--- a/src/frontend/main/src/components/organization/OrganizationAddForm.tsx
+++ b/src/frontend/main/src/components/organization/OrganizationAddForm.tsx
@@ -168,7 +168,9 @@ const OrganizationAddForm = () => {
// dispatch(CreateProjectActions.SetProjectDetails({ key: 'organization', value: e.target.value }))
}}
>
- {organizationDataList?.map((org) => )}
+ {organizationDataList?.map((org) => (
+
+ ))}
{errors.type && (
diff --git a/src/frontend/main/src/constants/EditProjectSidebarContent.ts b/src/frontend/main/src/constants/EditProjectSidebarContent.ts
index 993fd036a9..cd93e9fcbc 100644
--- a/src/frontend/main/src/constants/EditProjectSidebarContent.ts
+++ b/src/frontend/main/src/constants/EditProjectSidebarContent.ts
@@ -1,27 +1,26 @@
interface ISidebarContent {
- id: number;
- name: string;
- slug: string;
- type?: string;
+ id: number;
+ name: string;
+ slug: string;
+ type?: string;
}
-
const SidebarContent: ISidebarContent[] = [
- {
- id: 1,
- name: 'Project Description',
- slug: 'project-description'
- },
- {
- id: 2,
- name: 'Form Update',
- slug: 'form-update'
- },
- {
- id: 3,
- name: 'Update Project Boundary',
- slug: 'update-project-boundary'
- },
-]
+ {
+ id: 1,
+ name: 'Project Description',
+ slug: 'project-description',
+ },
+ {
+ id: 2,
+ name: 'Form Update',
+ slug: 'form-update',
+ },
+ {
+ id: 3,
+ name: 'Update Project Boundary',
+ slug: 'update-project-boundary',
+ },
+];
-export default SidebarContent
\ No newline at end of file
+export default SidebarContent;
diff --git a/src/frontend/main/src/hooks/OnScroll.tsx b/src/frontend/main/src/hooks/OnScroll.tsx
index 32c9296c7e..7228a66d80 100755
--- a/src/frontend/main/src/hooks/OnScroll.tsx
+++ b/src/frontend/main/src/hooks/OnScroll.tsx
@@ -1,27 +1,24 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState } from 'react';
export default function OnScroll(element, dep) {
-
- const [scrollTop, setScrollTop] = useState(0);
- useEffect(() => {
- const doc = document.getElementsByClassName('mainview')[0]
-
- const handleScroll = (event) => {
- if (element != undefined) {
- setScrollTop(element.getTargetElement().getBoundingClientRect().y)
- }
- };
-
- doc.addEventListener('scroll', handleScroll);
- window.addEventListener('resize', handleScroll)
-
- return () => {
- doc.removeEventListener('scroll', handleScroll);
- window.removeEventListener('resize', handleScroll)
-
- };
- }, [element, dep]);
-
-
- return { y: scrollTop }
+ const [scrollTop, setScrollTop] = useState(0);
+ useEffect(() => {
+ const doc = document.getElementsByClassName('mainview')[0];
+
+ const handleScroll = (event) => {
+ if (element != undefined) {
+ setScrollTop(element.getTargetElement().getBoundingClientRect().y);
+ }
+ };
+
+ doc.addEventListener('scroll', handleScroll);
+ window.addEventListener('resize', handleScroll);
+
+ return () => {
+ doc.removeEventListener('scroll', handleScroll);
+ window.removeEventListener('resize', handleScroll);
+ };
+ }, [element, dep]);
+
+ return { y: scrollTop };
}
diff --git a/src/frontend/main/src/hooks/WindowDimension.tsx b/src/frontend/main/src/hooks/WindowDimension.tsx
index f6b54f789d..04f70765b5 100755
--- a/src/frontend/main/src/hooks/WindowDimension.tsx
+++ b/src/frontend/main/src/hooks/WindowDimension.tsx
@@ -1,59 +1,50 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState } from 'react';
// Extra small.col - < 576px Mobile Display
// Small.col - sm - ≥576px Mobile Display
// Medium.col - md - ≥768px Tablet Display
// Large.col - lg - ≥992px Desktop Display
// Extra large.col - xl - ≥1200px Desktop Display
function calculateWidthType(width) {
- if (width >= 1700) {
- return 'xl'
- }
- else if (width >= 1332) {
- return 'lg'
- }
- else if (width >= 1200) {
- return 'md'
- } else if (width >= 855) {
- return 'sm'
- } else if (width >= 632) {
- return 's'
- } else if (width < 632) {
- return 'xs'
- }
+ if (width >= 1700) {
+ return 'xl';
+ } else if (width >= 1332) {
+ return 'lg';
+ } else if (width >= 1200) {
+ return 'md';
+ } else if (width >= 855) {
+ return 'sm';
+ } else if (width >= 632) {
+ return 's';
+ } else if (width < 632) {
+ return 'xs';
+ }
}
const windowDimention = () => {
-
- const [windowSize, setWindowSize] = useState({
- width: 0,
- height: 0
- })
-
- useEffect(() => {
-
- const handleResize = () => {
- setWindowSize({
- width: window.innerWidth,
- height: window.innerHeight
- })
- }
-
- handleResize();
- window.addEventListener('resize', handleResize)
-
- const cleanUp = () => {
- window.removeEventListener('resize', handleResize)
- }
-
- return cleanUp;
- }, [])
-
- return { windowSize, type: calculateWidthType(windowSize.width) };
-
-
-
-
-}
-
+ const [windowSize, setWindowSize] = useState({
+ width: 0,
+ height: 0,
+ });
+
+ useEffect(() => {
+ const handleResize = () => {
+ setWindowSize({
+ width: window.innerWidth,
+ height: window.innerHeight,
+ });
+ };
+
+ handleResize();
+ window.addEventListener('resize', handleResize);
+
+ const cleanUp = () => {
+ window.removeEventListener('resize', handleResize);
+ };
+
+ return cleanUp;
+ }, []);
+
+ return { windowSize, type: calculateWidthType(windowSize.width) };
+};
export default windowDimention;
diff --git a/src/frontend/main/src/hooks/useOlMap.ts b/src/frontend/main/src/hooks/useOlMap.ts
index 3e75266bd5..70344efb12 100644
--- a/src/frontend/main/src/hooks/useOlMap.ts
+++ b/src/frontend/main/src/hooks/useOlMap.ts
@@ -1,9 +1,9 @@
/* eslint-disable consistent-return */
-import React, { useRef, useState, useEffect } from "react";
-import Map from "ol/Map";
-import { View } from "ol";
-import * as olExtent from "ol/extent";
-import VectorLayer from "ol/layer/Vector";
+import React, { useRef, useState, useEffect } from 'react';
+import Map from 'ol/Map';
+import { View } from 'ol';
+import * as olExtent from 'ol/extent';
+import VectorLayer from 'ol/layer/Vector';
const defaultProps = {
center: [0, 0],
@@ -53,14 +53,14 @@ const useOLMap = (props) => {
setTimeout(() => {
setRenderComplete(true);
}, 500);
- map.un("rendercomplete", onRenderComplete);
+ map.un('rendercomplete', onRenderComplete);
}
}
- map.on("rendercomplete", onRenderComplete);
+ map.on('rendercomplete', onRenderComplete);
return () => {
if (map) {
- map.un("rendercomplete", onRenderComplete);
+ map.un('rendercomplete', onRenderComplete);
}
};
}, [map]);
diff --git a/src/frontend/main/src/index.css b/src/frontend/main/src/index.css
index 95731bf160..2d7173e655 100755
--- a/src/frontend/main/src/index.css
+++ b/src/frontend/main/src/index.css
@@ -59,44 +59,32 @@ button {
@font-face {
font-family: 'BarlowBold';
- src:
- local('BarlowBold'),
- url('./assets/fonts/Barlow/Barlow-Bold.ttf') format('truetype');
+ src: local('BarlowBold'), url('./assets/fonts/Barlow/Barlow-Bold.ttf') format('truetype');
}
@font-face {
font-family: 'BarlowMedium';
- src:
- local('BarlowMedium'),
- url('./assets/fonts/Barlow/Barlow-Medium.ttf') format('truetype');
+ src: local('BarlowMedium'), url('./assets/fonts/Barlow/Barlow-Medium.ttf') format('truetype');
}
@font-face {
font-family: 'ArchivoBold';
- src:
- local('ArchivoBold'),
- url('./assets/fonts/Archivo/Archivo/Archivo-Bold.ttf') format('truetype');
+ src: local('ArchivoBold'), url('./assets/fonts/Archivo/Archivo/Archivo-Bold.ttf') format('truetype');
}
@font-face {
font-family: 'ArchivoRegular';
- src:
- local('ArchivoRegular'),
- url('./assets/fonts/Archivo/Archivo/Archivo-Regular.ttf') format('truetype');
+ src: local('ArchivoRegular'), url('./assets/fonts/Archivo/Archivo/Archivo-Regular.ttf') format('truetype');
}
@font-face {
font-family: 'ArchivoMedium';
- src:
- local('ArchivoMedium'),
- url('./assets/fonts/Archivo/Archivo/Archivo-Medium.ttf') format('truetype');
+ src: local('ArchivoMedium'), url('./assets/fonts/Archivo/Archivo/Archivo-Medium.ttf') format('truetype');
}
@font-face {
font-family: 'ArchivoLight';
- src:
- local('ArchivoLight'),
- url('./assets/fonts/Archivo/Archivo/Archivo-Light.ttf') format('truetype');
+ src: local('ArchivoLight'), url('./assets/fonts/Archivo/Archivo/Archivo-Light.ttf') format('truetype');
}
.swiper-button-next,
diff --git a/src/frontend/main/src/index.html b/src/frontend/main/src/index.html
index 4134e0afc6..e42d1b9215 100755
--- a/src/frontend/main/src/index.html
+++ b/src/frontend/main/src/index.html
@@ -1,19 +1,23 @@
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- {element}
-
-
- );
+ return (
+
+
+ {element}
+
+
+ );
}
diff --git a/src/frontend/main/src/utilities/CustomizedSnackbar.jsx b/src/frontend/main/src/utilities/CustomizedSnackbar.jsx
index 1c611cc948..bb70fbb4fd 100755
--- a/src/frontend/main/src/utilities/CustomizedSnackbar.jsx
+++ b/src/frontend/main/src/utilities/CustomizedSnackbar.jsx
@@ -1,26 +1,26 @@
import * as React from 'react';
import CoreModules from '../shared/CoreModules';
const Alert = React.forwardRef(function Alert(props, ref) {
- return Toggle Outline
+
+
+ ) : null}
Toggle Outline
+