Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6a071ed
Add aliases to run tests locally
gino-m Dec 2, 2025
321c11c
Merge branch 'master' of https://github.com/google/ground-platform in…
gino-m Dec 2, 2025
d4a816e
Update assetLinks warning
gino-m Dec 2, 2025
bb610f3
Update assetLinks warning
gino-m Dec 2, 2025
3c07d8d
Merge branch 'master' of https://github.com/google/ground-platform in…
gino-m Dec 11, 2025
21577c4
Fix tests
gino-m Dec 11, 2025
77960b1
Lint fix
gino-m Dec 11, 2025
2845684
Remove debug log statement
gino-m Dec 11, 2025
10688c7
Uncomment disabled post-condition
gino-m Dec 11, 2025
729d267
Update copyright year
gino-m Dec 11, 2025
7cc1bd3
Remove thinking comments
gino-m Dec 11, 2025
c8f08ba
Update copyright year
gino-m Dec 11, 2025
ca0ebef
Reformat
gino-m Dec 11, 2025
b36299f
Handle error state properly
gino-m Dec 11, 2025
73464ff
Add CR
gino-m Dec 11, 2025
b32ca0a
Update copyright
gino-m Dec 11, 2025
ff0ab6e
Remove drawing tools logic and other unnecessary flags
gino-m Dec 11, 2025
46aaa82
Fix formatting
gino-m Dec 11, 2025
89e371a
Formatting
gino-m Dec 11, 2025
d875522
Merge branch 'master' of https://github.com/google/ground-platform in…
gino-m Dec 11, 2025
721c5a6
Remove blank lines between imports
gino-m Dec 11, 2025
2e034ec
Merge branch 'master' into gino-m/2289/refactor-router
gino-m Dec 12, 2025
5038923
Refactor WIP
gino-m Dec 15, 2025
de8ba58
Fix runtime errors
gino-m Dec 15, 2025
795bbd0
Fix broken test
gino-m Dec 15, 2025
77eac00
Lint fix
gino-m Dec 15, 2025
a069b74
Reorganize components
gino-m Dec 15, 2025
3e0445d
Lint fix
gino-m Dec 15, 2025
d8df5f4
Merge branch 'master' of https://github.com/google/ground-platform in…
gino-m Dec 16, 2025
b6d2ac0
Add readme
gino-m Dec 16, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import {GoogleAuthProvider} from 'firebase/auth';
import {FirebaseUIModule, firebaseui} from 'firebaseui-angular';

import {AppComponent} from 'app/app.component';
import {MainPageContainerModule} from 'app/pages/main-page-container/main-page-container.module';
import {MainPageContainerModule} from 'app/components/main-page-container/main-page-container.module';
import {AppRoutingModule} from 'app/routing.module';
import {environment} from 'environments/environment';

Expand Down
9 changes: 9 additions & 0 deletions web/src/app/components/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Ground web Angular components

This directory contains the Angular components used by the Ground web application.

With the exception of `shared`, each directory in this folder represents a single
page of the web application. Subdirectories recursively contain components used by
the pages in their parent directory.

Components used by two or more pages should be placed in the `shared` directory.
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import {MatButton} from '@angular/material/button';
import {MatIcon} from '@angular/material/icon';
import {RouterModule} from '@angular/router';

import {HeaderModule} from 'app/components/header/header.module';
import {AboutComponent} from 'app/pages/about/about.component';
import {AboutComponent} from 'app/components/about/about.component';
import {HeaderModule} from 'app/components/shared/header/header.module';

@NgModule({
declarations: [AboutComponent],
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ import {ActivatedRoute} from '@angular/router';
import {List, Map} from 'immutable';
import {Observable, Subject} from 'rxjs';

import {ShareSurveyComponent} from 'app/components/share-survey/share-survey.component';
import {
CreateSurveyComponent,
CreateSurveyPhase,
} from 'app/components/create-survey/create-survey.component';
import {DataSharingTermsComponent} from 'app/components/create-survey/data-sharing-terms/data-sharing-terms.component';
import {JobDetailsComponent} from 'app/components/create-survey/job-details/job-details.component';
import {SurveyDetailsComponent} from 'app/components/create-survey/survey-details/survey-details.component';
import {ShareSurveyComponent} from 'app/components/shared/share-survey/share-survey.component';
import {Job} from 'app/models/job.model';
import {LocationOfInterest} from 'app/models/loi.model';
import {DataSharingType, Survey, SurveyState} from 'app/models/survey.model';
import {Task, TaskType} from 'app/models/task/task.model';
import {
CreateSurveyComponent,
CreateSurveyPhase,
} from 'app/pages/create-survey/create-survey.component';
import {DataSharingTermsComponent} from 'app/pages/create-survey/data-sharing-terms/data-sharing-terms.component';
import {JobDetailsComponent} from 'app/pages/create-survey/job-details/job-details.component';
import {SurveyDetailsComponent} from 'app/pages/create-survey/survey-details/survey-details.component';
import {DraftSurveyService} from 'app/services/draft-survey/draft-survey.service';
import {JobService} from 'app/services/job/job.service';
import {LocationOfInterestService} from 'app/services/loi/loi.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import {ActivatedRoute} from '@angular/router';
import {List} from 'immutable';
import {Subscription, combineLatest, filter} from 'rxjs';

import {DataSharingTermsComponent} from 'app/components/create-survey/data-sharing-terms/data-sharing-terms.component';
import {JobDetailsComponent} from 'app/components/create-survey/job-details/job-details.component';
import {SurveyDetailsComponent} from 'app/components/create-survey/survey-details/survey-details.component';
import {TaskDetailsComponent} from 'app/components/create-survey/task-details/task-details.component';
import {DataCollectionStrategy, Job} from 'app/models/job.model';
import {LocationOfInterest} from 'app/models/loi.model';
import {Survey, SurveyState} from 'app/models/survey.model';
import {DataSharingTermsComponent} from 'app/pages/create-survey/data-sharing-terms/data-sharing-terms.component';
import {JobDetailsComponent} from 'app/pages/create-survey/job-details/job-details.component';
import {SurveyDetailsComponent} from 'app/pages/create-survey/survey-details/survey-details.component';
import {TaskDetailsComponent} from 'app/pages/create-survey/task-details/task-details.component';
import {DraftSurveyService} from 'app/services/draft-survey/draft-survey.service';
import {JobService} from 'app/services/job/job.service';
import {LocationOfInterestService} from 'app/services/loi/loi.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import {MatInputModule} from '@angular/material/input';
import {MatProgressBarModule} from '@angular/material/progress-bar';
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';

import {CopySurveyControlsModule} from 'app/components/copy-survey-controls/copy-survey-controls.module';
import {HeaderModule} from 'app/components/header/header.module';
import {ShareSurveyModule} from 'app/components/share-survey/share-survey.module';
import {CreateSurveyComponent} from 'app/pages/create-survey/create-survey.component';
import {DataSharingTermsModule} from 'app/pages/create-survey/data-sharing-terms/data-sharing-terms.module';
import {TaskDetailsModule} from 'app/pages/create-survey/task-details/task-details.module';
import {CreateSurveyComponent} from 'app/components/create-survey/create-survey.component';
import {DataSharingTermsModule} from 'app/components/create-survey/data-sharing-terms/data-sharing-terms.module';
import {TaskDetailsModule} from 'app/components/create-survey/task-details/task-details.module';
import {CopySurveyControlsModule} from 'app/components/shared/copy-survey-controls/copy-survey-controls.module';
import {HeaderModule} from 'app/components/shared/header/header.module';
import {ShareSurveyModule} from 'app/components/shared/share-survey/share-survey.module';

import {JobDetailsModule} from './job-details/job-details.module';
import {StepCardModule} from './step-card/step-card.module';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import {ReactiveFormsModule} from '@angular/forms';
import {MatCardModule} from '@angular/material/card';
import {MatRadioModule} from '@angular/material/radio';

import {DataSharingTermsComponent} from 'app/components/create-survey/data-sharing-terms/data-sharing-terms.component';
import {
DATA_SHARING_TYPE_DESCRIPTION,
DataSharingType,
} from 'app/models/survey.model';
import {DataSharingTermsComponent} from 'app/pages/create-survey/data-sharing-terms/data-sharing-terms.component';

describe('DataSharingTermsComponent', () => {
let component: DataSharingTermsComponent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {MatFormFieldModule} from '@angular/material/form-field';
import {MatInputModule} from '@angular/material/input';
import {MatRadioModule} from '@angular/material/radio';

import {DataSharingTermsComponent} from 'app/pages/create-survey/data-sharing-terms/data-sharing-terms.component';
import {DataSharingTermsComponent} from 'app/components/create-survey/data-sharing-terms/data-sharing-terms.component';

@NgModule({
declarations: [DataSharingTermsComponent],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import {ComponentFixture, TestBed} from '@angular/core/testing';

import {JobDetailsComponent} from 'app/pages/create-survey/job-details/job-details.component';
import {JobDetailsComponent} from 'app/components/create-survey/job-details/job-details.component';

describe('JobDetailsComponent', () => {
let component: JobDetailsComponent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {MatButtonModule} from '@angular/material/button';
import {MatInputModule} from '@angular/material/input';

import {JobDetailsComponent} from 'app/pages/create-survey/job-details/job-details.component';
import {JobDetailsComponent} from 'app/components/create-survey/job-details/job-details.component';

@NgModule({
declarations: [JobDetailsComponent],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';

import {StepCardComponent} from 'app/pages/create-survey/step-card/step-card.component';
import {StepCardComponent} from 'app/components/create-survey/step-card/step-card.component';

@NgModule({
declarations: [StepCardComponent],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {MatFormFieldModule} from '@angular/material/form-field';
import {MatInputModule} from '@angular/material/input';
import {NoopAnimationsModule} from '@angular/platform-browser/animations';

import {SurveyDetailsComponent} from 'app/pages/create-survey/survey-details/survey-details.component';
import {SurveyDetailsComponent} from 'app/components/create-survey/survey-details/survey-details.component';

describe('SurveyDetailsComponent', () => {
let component: SurveyDetailsComponent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {MatButtonModule} from '@angular/material/button';
import {MatInputModule} from '@angular/material/input';

import {SurveyDetailsComponent} from 'app/pages/create-survey/survey-details/survey-details.component';
import {SurveyDetailsComponent} from 'app/components/create-survey/survey-details/survey-details.component';

@NgModule({
declarations: [SurveyDetailsComponent],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {MatDialog} from '@angular/material/dialog';
import {List, Map} from 'immutable';
import {BehaviorSubject, of} from 'rxjs';

import {LoiSelectionModule} from 'app/components/loi-selection/loi-selection.module';
import {LoiSelectionModule} from 'app/components/shared/loi-selection/loi-selection.module';
import {LocationOfInterest} from 'app/models/loi.model';
import {DataSharingType, Survey} from 'app/models/survey.model';
import {AuthService} from 'app/services/auth/auth.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';

import {LoiEditorModule} from 'app/components/loi-editor/loi-editor.module';
import {LoiEditorModule} from 'app/components/shared/loi-editor/loi-editor.module';

import {SurveyLoiComponent} from './survey-loi.component';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {Component, EventEmitter, Output, ViewChild} from '@angular/core';
import {List} from 'immutable';
import {Subscription} from 'rxjs';

import {TasksEditorComponent} from 'app/components/tasks-editor/tasks-editor.component';
import {TasksEditorComponent} from 'app/components/shared/tasks-editor/tasks-editor.component';
import {Task} from 'app/models/task/task.model';
import {TaskService} from 'app/services/task/task.service';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';

import {TasksEditorModule} from 'app/components/tasks-editor/tasks-editor.module';
import {TasksEditorModule} from 'app/components/shared/tasks-editor/tasks-editor.module';

import {TaskDetailsComponent} from './task-details.component';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import {By} from '@angular/platform-browser';
import {Map} from 'immutable';
import {of} from 'rxjs';

import {EditDetailsComponent} from 'app/components/edit-survey/edit-details/edit-details.component';
import {Job} from 'app/models/job.model';
import {Role} from 'app/models/role.model';
import {DataSharingType, Survey} from 'app/models/survey.model';
import {EditDetailsComponent} from 'app/pages/edit-survey/edit-details/edit-details.component';
import {DraftSurveyService} from 'app/services/draft-survey/draft-survey.service';
import {NavigationService} from 'app/services/navigation/navigation.service';
import {SurveyService} from 'app/services/survey/survey.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import {Component, OnInit, ViewChild} from '@angular/core';
import {MatDialog} from '@angular/material/dialog';
import {Subscription} from 'rxjs';

import {SurveyDetailsComponent} from 'app/components/create-survey/survey-details/survey-details.component';
import {DATA_SHARING_TYPE_DESCRIPTION, Survey} from 'app/models/survey.model';
import {SurveyDetailsComponent} from 'app/pages/create-survey/survey-details/survey-details.component';
import {DraftSurveyService} from 'app/services/draft-survey/draft-survey.service';
import {NavigationService} from 'app/services/navigation/navigation.service';
import {SurveyService} from 'app/services/survey/survey.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import {NgModule} from '@angular/core';
import {MatButtonModule} from '@angular/material/button';
import {MatCardModule} from '@angular/material/card';

import {SurveyDetailsModule} from 'app/pages/create-survey/survey-details/survey-details.module';
import {EditDetailsComponent} from 'app/pages/edit-survey/edit-details/edit-details.component';
import {SurveyDetailsModule} from 'app/components/create-survey/survey-details/survey-details.module';
import {EditDetailsComponent} from 'app/components/edit-survey/edit-details/edit-details.component';

@NgModule({
declarations: [EditDetailsComponent],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ import {User} from 'firebase/auth';
import {List, Map} from 'immutable';
import {Subject, from, of} from 'rxjs';

import {LoiEditorComponent} from 'app/components/loi-editor/loi-editor.component';
import {TasksEditorModule} from 'app/components/tasks-editor/tasks-editor.module';
import {EditJobComponent} from 'app/components/edit-survey/edit-job/edit-job.component';
import {LoiEditorComponent} from 'app/components/shared/loi-editor/loi-editor.component';
import {TasksEditorModule} from 'app/components/shared/tasks-editor/tasks-editor.module';
import {DataCollectionStrategy, Job} from 'app/models/job.model';
import {LocationOfInterest} from 'app/models/loi.model';
import {Role} from 'app/models/role.model';
import {DataSharingType, Survey} from 'app/models/survey.model';
import {EditJobComponent} from 'app/pages/edit-survey/edit-job/edit-job.component';
import {AuthService} from 'app/services/auth/auth.service';
import {DataStoreService} from 'app/services/data-store/data-store.service';
import {DialogService} from 'app/services/dialog/dialog.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import {ActivatedRoute, Params} from '@angular/router';
import {List} from 'immutable';
import {Subscription} from 'rxjs';

import {LoiEditorComponent} from 'app/components/loi-editor/loi-editor.component';
import {TasksEditorComponent} from 'app/components/tasks-editor/tasks-editor.component';
import {LoiEditorComponent} from 'app/components/shared/loi-editor/loi-editor.component';
import {TasksEditorComponent} from 'app/components/shared/tasks-editor/tasks-editor.component';
import {DataCollectionStrategy, Job} from 'app/models/job.model';
import {LocationOfInterest} from 'app/models/loi.model';
import {Task} from 'app/models/task/task.model';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import {
} from '@angular/material/button-toggle';
import {MatIconModule} from '@angular/material/icon';

import {LoiEditorModule} from 'app/components/loi-editor/loi-editor.module';
import {TasksEditorModule} from 'app/components/tasks-editor/tasks-editor.module';
import {EditJobComponent} from 'app/pages/edit-survey/edit-job/edit-job.component';
import {EditJobComponent} from 'app/components/edit-survey/edit-job/edit-job.component';
import {LoiEditorModule} from 'app/components/shared/loi-editor/loi-editor.module';
import {TasksEditorModule} from 'app/components/shared/tasks-editor/tasks-editor.module';

@NgModule({
declarations: [EditJobComponent],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ import {RouterTestingModule} from '@angular/router/testing';
import {Map} from 'immutable';
import {BehaviorSubject, Subject, of} from 'rxjs';

import {EditSurveyComponent} from 'app/components/edit-survey/edit-survey.component';
import {Job} from 'app/models/job.model';
import {DataSharingType, Survey} from 'app/models/survey.model';
import {EditSurveyComponent} from 'app/pages/edit-survey/edit-survey.component';
import {DataStoreService} from 'app/services/data-store/data-store.service';
import {DraftSurveyService} from 'app/services/draft-survey/draft-survey.service';
import {JobService} from 'app/services/job/job.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import {MatMenuModule} from '@angular/material/menu';
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
import {RouterModule} from '@angular/router';

import {CopySurveyControlsModule} from 'app/components/copy-survey-controls/copy-survey-controls.module';
import {EditSurveyComponent} from 'app/pages/edit-survey/edit-survey.component';
import {EditSurveyComponent} from 'app/components/edit-survey/edit-survey.component';
import {CopySurveyControlsModule} from 'app/components/shared/copy-survey-controls/copy-survey-controls.module';

import {SurveyHeaderModule} from '../main-page-container/main-page/survey-header/survey-header.module';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {MatDialogModule} from '@angular/material/dialog';
import {MatFormFieldModule} from '@angular/material/form-field';
import {MatInputModule} from '@angular/material/input';

import {JobDialogComponent} from 'app/pages/edit-survey/job-dialog/job-dialog.component';
import {JobDialogComponent} from 'app/components/edit-survey/job-dialog/job-dialog.component';

@NgModule({
declarations: [JobDialogComponent],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import {NgModule} from '@angular/core';
import {MatButtonModule} from '@angular/material/button';
import {RouterModule} from '@angular/router';

import {HeaderModule} from 'app/components/header/header.module';
import {ErrorComponent} from 'app/pages/error/error.component';
import {ErrorComponent} from 'app/components/error/error.component';
import {HeaderModule} from 'app/components/shared/header/header.module';

@NgModule({
declarations: [ErrorComponent],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {Router} from '@angular/router';
import {NEVER, of} from 'rxjs';

import {InlineEditorModule} from 'app/components/inline-editor/inline-editor.module';
import {InlineEditorModule} from 'app/components/shared/inline-editor/inline-editor.module';
import {AuthService} from 'app/services/auth/auth.service';
import {DataStoreService} from 'app/services/data-store/data-store.service';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {MatFormFieldModule} from '@angular/material/form-field';
import {MatIconModule} from '@angular/material/icon';
import {MatInputModule} from '@angular/material/input';

import {InlineEditorModule} from 'app/components/inline-editor/inline-editor.module';
import {InlineEditorModule} from 'app/components/shared/inline-editor/inline-editor.module';

import {EditStyleButtonModule} from './edit-style-button/edit-style-button.module';
import {JobDialogComponent} from './job-dialog.component';
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {MatDialog} from '@angular/material/dialog';
import {List} from 'immutable';
import {Subscription, combineLatest, switchMap} from 'rxjs';

import {LoiPropertiesDialogComponent} from 'app/components/loi-properties-dialog/loi-properties-dialog.component';
import {LoiPropertiesDialogComponent} from 'app/components/shared/loi-properties-dialog/loi-properties-dialog.component';
import {LocationOfInterest} from 'app/models/loi.model';
import {Submission} from 'app/models/submission/submission.model';
import {Survey} from 'app/models/survey.model';
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {MatButtonModule} from '@angular/material/button';
import {MatListModule} from '@angular/material/list';
import {BrowserModule} from '@angular/platform-browser';

import {JobListItemModule} from 'app/components/job-list-item/job-list-item.module';
import {JobListItemModule} from 'app/components/shared/job-list-item/job-list-item.module';
import {GroundIconModule} from 'app/modules/ground-icon.module';

import {JobListComponent} from './job-list.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {Router} from '@angular/router';
import {List, Map} from 'immutable';
import {NEVER, of} from 'rxjs';

import {JobListItemModule} from 'app/components/job-list-item/job-list-item.module';
import {JobListItemModule} from 'app/components/shared/job-list-item/job-list-item.module';
import {AuditInfo} from 'app/models/audit-info.model';
import {Coordinate} from 'app/models/geometry/coordinate';
import {Point} from 'app/models/geometry/point';
Expand Down
Loading
Loading