Skip to content

feature(integrate-api): API integration #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
AdityaKhatri merged 12 commits into from
Oct 9, 2025
Merged

feature(integrate-api): API integration #229

AdityaKhatri merged 12 commits into from
Oct 9, 2025

Conversation

@barshathakuri
Copy link
Contributor

@barshathakuri barshathakuri commented Sep 4, 2025 •
edited
Loading

Changes

  • Remove old data fetching
  • Add Data from API

This PR doesn't introduce any

  • temporary files, auto-generated files or secret keys
  • build works
  • eslint issues
  • typescript issues
  • codegen errors
  • console.log meant for debugging
  • typos
  • unwanted comments
  • conflict markers

This PR includes

  • Translation

AdityaKhatri
AdityaKhatri requested changes Sep 5, 2025
View reviewed changes
public/locales/cs/data.json
"footprint": "Ověření",
"change-detection": "Porovnání",
"project-card-progress-text": "{{progress, number}}% dokončeno",
"project-card-last-update": "{{date, datetime}}",
Copy link
Contributor

@AdityaKhatri AdityaKhatri Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we might need this, because this also happens during the build time. Need to take this from env or something in github pages.

public/locales/cs/data.json
"change-detection": "Porovnání",
"project-card-progress-text": "{{progress, number}}% dokončeno",
"project-card-last-update": "{{date, datetime}}",
"project-card-contributors-text": "{{contributors}}",
Copy link
Contributor

@AdityaKhatri AdityaKhatri Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This too

src/components/Link/index.tsx Outdated
href = {
...href,
pathname: href.pathname?.replace('[locale]', locale),
pathname: href?.pathname?.replace('[locale]', locale),
Copy link
Contributor

@AdityaKhatri AdityaKhatri Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this necessary?

src/components/ProjectsMap/index.tsx Outdated
Comment on lines 142 to 144
.map((project) => (isDefined(project.exportHotTaskingManagerGeometries) ? {
...project,
coordinates: [project.coordinates[1], project.coordinates[0]] as LatLngTuple,
Copy link
Contributor

@AdityaKhatri AdityaKhatri Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to add this further

src/pages/[locale]/data/index.tsx Outdated
Comment on lines 121 to 124
pagination: {
limit: PAGE_SIZE,
offset: 0,
}
Copy link
Contributor

@AdityaKhatri AdityaKhatri Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a note to remove this later

src/pages/[locale]/data/index.tsx Outdated
Comment on lines 778 to 780
// icon={
// projectTypeOptionsMap[project.projectType]?.icon
// }
Copy link
Contributor

@AdityaKhatri AdityaKhatri Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this commented out? Bring it back please. This can be worked on right now, I think.

src/pages/[locale]/data/index.tsx Outdated
</Tag>
)}
{project.number_of_users && (
{/* {project.number_of_users && (
Copy link
Contributor

@AdityaKhatri AdityaKhatri Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uncomment and hardcode in the transformation earlier

src/pages/queries.ts Outdated
import { gql } from 'graphql-request';
import { ProjectStatus, ProjectType } from 'utils/common';

export interface ProjectProperties {
Copy link
Contributor

@AdityaKhatri AdityaKhatri Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to bring this from server/backend

src/utils/common.ts Outdated
export type ProjectType = 'FIND' | 'VALIDATE' | 'VALIDATE_IMAGE' | 'COMPARE' | 'COMPLETENESS';

export type ProjectType = 1 | 2 | 3 | 4 | 10;
// export type ProjectType = 1 | 2 | 3 | 4 | 10;
Copy link
Contributor

@AdityaKhatri AdityaKhatri Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this

src/utils/requests/projectCentroids.ts Outdated
.map(async (feature) => {
let geometry = null;

// 🔑 Fetch geometry from exportHotTaskingManagerGeometries URL
Copy link
Contributor

@AdityaKhatri AdityaKhatri Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh oh, i see chatgpt 😋

subinasr
subinasr requested changes Sep 10, 2025
View reviewed changes
public/locales/cs/data_old.json
@@ -0,0 +1,4 @@
{
Copy link
Contributor

@subinasr subinasr Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason we separated these out?

src/components/ProjectsMap/index.tsx Outdated
import Link from 'components/Link';

import styles from './styles.module.css';
import { ProjectProperties } from 'pages/queries';
Copy link
Contributor

@subinasr subinasr Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why fetching this type from queries and not directly from the generated schema?

src/pages/[locale]/data/index.tsx Outdated
projectTypeOptionsMap[project.project_type].icon
)}
icon={
projectTypeOptionsMap[project.projectType]?.icon
Copy link
Contributor

@subinasr subinasr Sep 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this mapping function?

AdityaKhatri
AdityaKhatri requested changes Sep 15, 2025
View reviewed changes
.gitmodules Outdated
@@ -1,3 +1,6 @@
[submodule "server"]
path = server
url = git@github.com:mapswipe/python-mapswipe-workers.git
Copy link
Contributor

@AdityaKhatri AdityaKhatri Sep 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need the other one anymore.

src/components/ProjectTypeIcon/index.tsx Outdated
export interface Props {
className?: string;
type: '1' | '2' | '3' | '10';
type: 'FIND' | 'VALIDATE' | 'VALIDATE_IMAGE' | 'COMPARE' | 'COMPLETENESS';
Copy link
Contributor

@AdityaKhatri AdityaKhatri Sep 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add icon for completeness as well.

src/components/ProjectsMap/index.tsx Outdated
),
},
]), [t]);
const projectTypeOptions: ProjectTypeOption[] = useMemo(() => ([
Copy link
Contributor

@AdityaKhatri AdityaKhatri Sep 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably need other projectType options too. All of them.

src/pages/[locale]/index.tsx
icons={(
<ProjectTypeIcon
type="2"
type="VALIDATE"
Copy link
Contributor

@AdityaKhatri AdityaKhatri Sep 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we need to add other project options here?

src/pages/[locale]/projects/[id].tsx
Comment on lines 252 to 268
10: {
key: 'COMPLETENESS',
label: t('validate-image'),
icon: (
<ProjectTypeIcon type="10" size="small" />
<ProjectTypeIcon type="VALIDATE_IMAGE" size="small" />
Copy link
Contributor

@AdityaKhatri AdityaKhatri Sep 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other project types are needed here too?

@barshathakuri barshathakuri force-pushed the feature/update-api branch 5 times, most recently from ffd7e45 to c59a742 Compare September 18, 2025 06:20
@barshathakuri barshathakuri force-pushed the feature/update-api branch 3 times, most recently from 9641647 to c642ac8 Compare September 19, 2025 09:19
@frozenhelium frozenhelium changed the base branch from main to project/private-api September 19, 2025 09:48
@barshathakuri barshathakuri force-pushed the feature/update-api branch 6 times, most recently from 76d0c00 to c642ac8 Compare September 19, 2025 13:27
@AdityaKhatri AdityaKhatri force-pushed the feature/update-api branch 2 times, most recently from 3cad8c7 to 953ca7d Compare September 25, 2025 10:34
@AdityaKhatri AdityaKhatri force-pushed the feature/update-api branch 4 times, most recently from 6823ec1 to 8eba61c Compare September 25, 2025 11:29
@AdityaKhatri AdityaKhatri force-pushed the feature/update-api branch 6 times, most recently from ede0d78 to 5e6a07d Compare October 9, 2025 09:35
@AdityaKhatri AdityaKhatri merged commit 4ff8350 into project/private-api Oct 9, 2025
1 check passed
@AdityaKhatri AdityaKhatri deleted the feature/update-api branch October 9, 2025 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AdityaKhatri AdityaKhatri Awaiting requested review from AdityaKhatri

@subinasr subinasr Awaiting requested review from subinasr

Assignees

@AdityaKhatri AdityaKhatri

@subinasr subinasr

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@barshathakuri @AdityaKhatri @subinasr @frozenhelium