Merge branch 'develop'

laineyhm · laineyhm · commit 7a894ecb04d6 · 2023-04-18T15:51:40.000+07:00
diff --git a/src/Site/views/languageforge/container/languageforge.html.twig b/src/Site/views/languageforge/container/languageforge.html.twig
@@ -33,7 +33,7 @@
                         </a>
                         <div class="dropdown-menu dropdown-menu-right" uib-dropdown-menu id="myProjectDropdownMenu" aria-labelledby="myProjectDropdown" style="max-height: 80vh; overflow-y: auto">
                             <a class="dropdown-item" data-ng-href="/app/lexicon/new-project">
-                                <b>Start or Join a New Project</b></a>
+                                <b>Get Project from Language Depot</b></a>
                             {% if projects|length > 10 %}
                                 <a class="dropdown-item" href="/app/projects"><b>List All Projects</b></a>
                                 <div class="dropdown-divider"></div>
diff --git a/src/angular-app/bellows/apps/projects/projects-app.component.html b/src/angular-app/bellows/apps/projects/projects-app.component.html
@@ -7,7 +7,7 @@
                     <form data-ng-show="$ctrl.rights.showControlBar" class="control-bar form-inline mb-2">
                         <button id="startJoinProjectButton" type="button" data-ng-show="$ctrl.rights.canCreateProject" class="btn btn-primary"
                                 data-ng-click="$ctrl.startProject()">
-                            <i class="fa fa-plus"></i> Start or Join a New Project</button>
+                            <i class="fa fa-plus"></i> Get Project from Language Depot</button>
                     </form>
                 </div>
             </div>
diff --git a/src/angular-app/languageforge/lexicon/core/lexicon-project.service.ts b/src/angular-app/languageforge/lexicon/core/lexicon-project.service.ts
@@ -46,11 +46,6 @@ export class LexiconProjectService {
           'Configuration',
           this.linkService.projectUrl() + 'configuration'
         ));
-        settings.push(new HeaderSetting(
-          'dropdown-import-data',
-          'Import Data',
-          this.linkService.projectUrl() + 'importExport'
-        ));
         settings.push(new HeaderSetting(
           'userManagementLink',
           'Share With Others',
diff --git a/src/angular-app/languageforge/lexicon/editor/editor-list.view.html b/src/angular-app/languageforge/lexicon/editor/editor-list.view.html
@@ -114,9 +114,6 @@
                     <div class="lexiconItemListContainer" data-pui-when-scrolled="$ctrl.show.more()">
                         <div class="text-center no-entries" id="noEntries">
                             <h4>Looks like there are no entries yet.</h4>
-                            <button class="btn btn-primary" data-ng-if="$ctrl.lecRights.canEditEntry()" data-ng-click="$ctrl.navigateToLiftImport()"
-                                    data-ng-hide="$ctrl.projectSettings.hasSendReceive">
-                                <i class="fa fa-upload"></i> Import entries from LIFT</button>
                             <button class="btn btn-primary" data-ng-click="$ctrl.syncProject()" data-ng-show="$ctrl.projectSettings.hasSendReceive">
                                 <i class="fa fa-refresh"></i> Synchronize project with LanguageDepot.org</button>
                             <button class="btn btn-primary" id="noEntriesNewWord" data-ng-if="$ctrl.lecRights.canEditEntry()"
diff --git a/src/angular-app/languageforge/lexicon/new-project/lexicon-new-project.component.ts b/src/angular-app/languageforge/lexicon/new-project/lexicon-new-project.component.ts
@@ -24,7 +24,6 @@ import {LexiconProjectSettings} from '../shared/model/lexicon-project-settings.m
 import {LexiconProject, SendReceive} from '../shared/model/lexicon-project.model';
 import {LexOptionList} from '../shared/model/option-list.model';
 import {SendReceiveStatus} from '../shared/model/send-receive-status.model';
-import {NewProjectChooserState} from './new-project-chooser.component';
 import {NewProjectInitialDataState} from './non-send-receive/new-project-initial-data.component';
 import {NewProjectSendReceiveCloneState} from './send-receive/new-project-clone.component';
 import {NewProjectSendReceiveCredentialsState} from './send-receive/new-project-credentials.component';
@@ -230,7 +229,7 @@ export class LexiconNewProjectController implements angular.IController {
             this.projectService.deleteProject([this.newProject.id]);
             break;
         }
-        this.$state.go(NewProjectChooserState.name);
+        this.$state.go(NewProjectSendReceiveCredentialsState.name);
         break;
       case SendReceiveState.Hold:
         this.gotoEditor();
diff --git a/src/angular-app/languageforge/lexicon/new-project/lexicon-new-project.module.ts b/src/angular-app/languageforge/lexicon/new-project/lexicon-new-project.module.ts
@@ -9,7 +9,6 @@ import {SelectLanguageModule} from '../../../bellows/shared/select-language.comp
 import {PuiUtilityModule} from '../../../bellows/shared/utils/pui-utils.module';
 import {LexiconCoreModule} from '../core/lexicon-core.module';
 import {LexiconNewProjectComponent, NewProjectAbstractState} from './lexicon-new-project.component';
-import {NewProjectChooserComponent, NewProjectChooserState} from './new-project-chooser.component';
 import {
   NewProjectInitialDataComponent, NewProjectInitialDataState
 } from './non-send-receive/new-project-initial-data.component';
@@ -41,7 +40,6 @@ export const LexiconNewProjectModule = angular
     LexiconCoreModule
   ])
   .component('lexiconNewProject', LexiconNewProjectComponent)
-  .component('newProjectChooser', NewProjectChooserComponent)
   .component('newProjectSendReceiveCredentials', NewProjectSendReceiveCredentialsComponent)
   .component('newProjectSendReceiveClone', NewProjectSendReceiveCloneComponent)
   .component('newProjectName', NewProjectNameComponent)
@@ -53,7 +51,6 @@ export const LexiconNewProjectModule = angular
       // State machine from ui.router
       $stateProvider
         .state(NewProjectAbstractState)
-        .state(NewProjectChooserState)
 
         .state(NewProjectSendReceiveCredentialsState)
         .state(NewProjectSendReceiveCloneState)
@@ -67,7 +64,7 @@ export const LexiconNewProjectModule = angular
       $urlRouterProvider
         .when('', ['$state', ($state: angular.ui.IStateService | any) => {
           if (!$state.$current.navigable) {
-            $state.go(NewProjectChooserState.name);
+            $state.go(NewProjectSendReceiveCredentialsState.name);
           }
         }]);
 
diff --git a/src/angular-app/languageforge/lexicon/new-project/new-project-chooser.component.html b/src/angular-app/languageforge/lexicon/new-project/new-project-chooser.component.html
diff --git a/src/angular-app/languageforge/lexicon/new-project/new-project-chooser.component.ts b/src/angular-app/languageforge/lexicon/new-project/new-project-chooser.component.ts
diff --git a/src/angular-app/languageforge/lexicon/new-project/non-send-receive/new-project-initial-data.component.ts b/src/angular-app/languageforge/lexicon/new-project/non-send-receive/new-project-initial-data.component.ts
@@ -87,6 +87,7 @@ export const NewProjectInitialDataComponent: angular.IComponentOptions = {
 };
 
 export const NewProjectInitialDataState = {
+  url: '/non-send-receive-initial-data',
   name: 'newProject.initialData',
   template: `
     <new-project-initial-data
diff --git a/src/angular-app/languageforge/lexicon/new-project/non-send-receive/new-project-name.controller.ts b/src/angular-app/languageforge/lexicon/new-project/non-send-receive/new-project-name.controller.ts
@@ -2,7 +2,7 @@ import * as angular from 'angular';
 
 import {LexiconNewProjectState} from '../lexicon-new-project-state.model';
 import {LexiconNewProjectController, NewProject} from '../lexicon-new-project.component';
-import {NewProjectChooserState} from '../new-project-chooser.component';
+import { NewProjectSendReceiveCredentialsState } from '../send-receive/new-project-credentials.component';
 import {NewProjectInitialDataState} from './new-project-initial-data.component';
 
 export class NewProjectNameController implements angular.IController {
@@ -73,6 +73,7 @@ export const NewProjectNameComponent: angular.IComponentOptions = {
 };
 
 export const NewProjectNameState = {
+  url: '/non-send-receive',
   name: 'newProject.name',
   template: `
     <new-project-name npn-new-project="$ctrl.newProject"
@@ -150,7 +151,7 @@ export const NewProjectNameState = {
       controller.neutral();
     },
     goPreviousState(controller: LexiconNewProjectController): void {
-      controller.$state.go(NewProjectChooserState.name);
+      controller.$state.go(NewProjectSendReceiveCredentialsState.name);
     }
   }
 } as LexiconNewProjectState;
diff --git a/src/angular-app/languageforge/lexicon/new-project/non-send-receive/new-project-select-primary-language.component.ts b/src/angular-app/languageforge/lexicon/new-project/non-send-receive/new-project-select-primary-language.component.ts
@@ -65,6 +65,7 @@ export const NewProjectSelectPrimaryLanguageComponent: angular.IComponentOptions
 };
 
 export const NewProjectSelectPrimaryLanguageState = {
+  url: '/non-send-receive-primary-lang',
   name: 'newProject.selectPrimaryLanguage',
   template: `
     <new-project-select-primary-language nps-new-project="$ctrl.newProject" nps-validate-form="$ctrl.validateForm()">
diff --git a/src/angular-app/languageforge/lexicon/new-project/non-send-receive/new-project-verify-data.component.ts b/src/angular-app/languageforge/lexicon/new-project/non-send-receive/new-project-verify-data.component.ts
@@ -33,6 +33,7 @@ export const NewProjectVerifyDataComponent: angular.IComponentOptions = {
 };
 
 export const NewProjectVerifyDataState = {
+  url: '/non-send-receive-verify-data',
   name: 'newProject.verifyData',
   template: `
     <new-project-verify-data
diff --git a/src/angular-app/languageforge/lexicon/new-project/send-receive/new-project-clone.component.ts b/src/angular-app/languageforge/lexicon/new-project/send-receive/new-project-clone.component.ts
@@ -20,6 +20,7 @@ export const NewProjectSendReceiveCloneComponent: angular.IComponentOptions = {
 };
 
 export const NewProjectSendReceiveCloneState = {
+  url: '/non-send-receive-clone',
   name: 'newProject.sendReceiveClone',
   template: `<new-project-send-receive-clone></new-project-send-receive-clone>`,
   data: {
diff --git a/src/angular-app/languageforge/lexicon/new-project/send-receive/new-project-credentials.component.ts b/src/angular-app/languageforge/lexicon/new-project/send-receive/new-project-credentials.component.ts
@@ -4,7 +4,7 @@ import {LexiconSendReceiveApiService} from '../../core/lexicon-send-receive-api.
 import {LexiconProject, SendReceiveProject} from '../../shared/model/lexicon-project.model';
 import {LexiconNewProjectState} from '../lexicon-new-project-state.model';
 import {LexiconNewProjectController} from '../lexicon-new-project.component';
-import {NewProjectChooserState} from '../new-project-chooser.component';
+import {NewProjectAbstractState} from '../lexicon-new-project.component';
 
 export class NewProjectSendReceiveCredentialsController implements angular.IController {
   srcProject: LexiconProject;
@@ -99,7 +99,7 @@ export const NewProjectSendReceiveCredentialsState = {
     step: 1,
     isSRProject: true,
     show: {
-      backButton: true,
+      backButton: false,
       nextButton: true,
       step3: false
     },
@@ -178,7 +178,7 @@ export const NewProjectSendReceiveCredentialsState = {
       }
     },
     goPreviousState(controller: LexiconNewProjectController): void {
-      controller.$state.go(NewProjectChooserState.name);
+      controller.$state.go(NewProjectAbstractState.name);
     }
   }
 } as LexiconNewProjectState;
diff --git a/src/appIcons/maskable_icon.png b/src/appIcons/maskable_icon.png
diff --git a/src/manifest.json b/src/manifest.json
@@ -33,29 +33,35 @@
   ],
   "icons": [
     {
-      "src": "images/lf-logo-48-mdpi.png",
+      "src": "appIcons/lf-logo-48-mdpi.png",
       "type": "image/png",
       "sizes": "48x48"
     },
     {
-      "src": "images/lf-logo-96-xhdpi.png",
+      "src": "appIcons/lf-logo-96-xhdpi.png",
       "type": "image/png",
       "sizes": "96x96"
     },
     {
-      "src": "images/lf-logo-144-xxhdpi.png",
+      "src": "appIcons/lf-logo-144-xxhdpi.png",
       "type": "image/png",
       "sizes": "144x144"
     },
     {
-      "src": "images/lf-logo-circle-192-xxxhdpi.png",
+      "src": "appIcons/lf-logo-circle-192-xxxhdpi.png",
       "type": "image/png",
       "sizes": "192x192"
     },
     {
-      "src": "images/lf-logo-circle-512-xxxxxhdpi.png",
+      "src": "appIcons/lf-logo-circle-512-xxxxxhdpi.png",
       "type": "image/png",
       "sizes": "512x512"
+    },
+    {
+      "src": "appIcons/maskable_icon.png",
+      "type": "image/png",
+      "sizes": "512x512",
+      "purpose": "any maskable"
     }
   ]
 }
diff --git a/test/e2e/pages/new-lex-project.page.ts b/test/e2e/pages/new-lex-project.page.ts
@@ -9,12 +9,6 @@ export class NewLexProjectPage extends BasePage {
   readonly formStatus = this.locator('#form-status');
   readonly progressIndicatorStep3Label = this.locator('#progress-indicator-step3-label');
 
-  // step 0: chooser
-  readonly chooserPage = {
-    sendReceiveButton: this.locator('#send-receive-button'),
-    createButton: this.locator('#create-button'),
-  };
-
   // step 1: project name
   readonly namePage = {
     projectNameInput: this.locator('#project-name'),
diff --git a/test/e2e/pages/projects.page.ts b/test/e2e/pages/projects.page.ts
@@ -12,7 +12,7 @@ export class ProjectsPage extends BasePage {
   readonly projectsList = this.locator('[data-ng-repeat="project in visibleProjects"]');
   readonly projectNames = this.projectsList.locator('a[href^="/app/lexicon"]');
 
-  readonly createButton = this.locator('button:has-text("Start or Join a New Project")');
+  readonly createButton = this.locator('button:has-text("Get Project from Language Depot")');
   readonly createNonSRProjectButton = this.locator('text=Create a non-send/receive project (not recommended)'); // SR - send/receive
   readonly projectNameInput = this.locator('[placeholder="eg\\:\\ My\\ Dictionary"]');
   readonly nextButton = this.locator('text=Next'); // project creation: step after project name
@@ -32,7 +32,7 @@ export class ProjectsPage extends BasePage {
   readonly addAsTechSupportBtnText = 'text=Tech Support';
 
   constructor(page: Page) {
-    super(page, '/app/projects', page.locator('button:has-text("Start or Join a New Project")'));
+    super(page, '/app/projects', page.locator('button:has-text("Get Project from Language Depot")'));
   }
 
   override async goto(): Promise<this> {
diff --git a/test/e2e/tests/lexicon-new-project.spec.ts b/test/e2e/tests/lexicon-new-project.spec.ts
