Skip to content

Commit

Permalink
Finish 7.0.0-beta.2
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaschampagne committed Apr 9, 2022
2 parents cf0f752 + 3c80c16 commit 2138daf
Show file tree
Hide file tree
Showing 28 changed files with 5,295 additions and 4,899 deletions.
6,932 changes: 3,534 additions & 3,398 deletions appcore/package-lock.json

Large diffs are not rendered by default.

100 changes: 50 additions & 50 deletions appcore/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "elevate-sports-app",
"version": "7.0.0-beta.1",
"version": "7.0.0-beta.2",
"license": "MPL-2.0",
"scripts": {
"ng": "ng",
Expand All @@ -23,84 +23,84 @@
"engineStrict": true,
"private": true,
"dependencies": {
"@angular/animations": "~13.2.1",
"@angular/cdk": "^13.2.1",
"@angular/common": "~13.2.1",
"@angular/compiler": "~13.2.1",
"@angular/core": "^13.2.1",
"@angular/animations": "~13.3.1",
"@angular/cdk": "^13.3.2",
"@angular/common": "~13.3.1",
"@angular/compiler": "~13.3.1",
"@angular/core": "^13.3.1",
"@angular/flex-layout": "^13.0.0-beta.38",
"@angular/forms": "^13.2.1",
"@angular/localize": "^13.2.1",
"@angular/material": "^13.2.1",
"@angular/material-moment-adapter": "^13.2.1",
"@angular/platform-browser": "~13.2.1",
"@angular/platform-browser-dynamic": "~13.2.1",
"@angular/router": "~13.2.1",
"@angular/forms": "^13.3.1",
"@angular/localize": "^13.3.1",
"@angular/material": "^13.3.2",
"@angular/material-moment-adapter": "^13.3.2",
"@angular/platform-browser": "~13.3.1",
"@angular/platform-browser-dynamic": "~13.3.1",
"@angular/router": "~13.3.1",
"@elevate/shared": "file:modules/shared",
"@iktakahiro/markdown-it-katex": "^4.0.1",
"@sentry/browser": "^6.14.1",
"@sentry/browser": "^6.19.3",
"angular-plotly.js": "^4.0.4",
"d3": "^6.7.0",
"file-saver": "^2.0.5",
"github-markdown-css": "^5.0.0",
"http-status-codes": "^2.1.4",
"github-markdown-css": "^5.1.0",
"http-status-codes": "^2.2.0",
"jdenticon": "^3.1.1",
"json2csv": "^5.0.6",
"json2csv": "^5.0.7",
"lodash": "^4.17.21",
"lokijs": "^1.5.12",
"lz-string": "github:pieroxy/lz-string",
"mapbox-gl": "^2.6.1",
"mapbox-gl": "^2.7.1",
"mapbox-gl-controls": "^2.3.5",
"markdown-it": "^12.2.0",
"markdown-it": "^12.3.2",
"metrics-graphics": "^2.15.6",
"moment": "^2.29.1",
"ngx-clipboard": "^14.0.1",
"ngx-pipes": "^2.7.6",
"ngx-clipboard": "^15.1.0",
"ngx-pipes": "^3.0.0",
"p-defer": "^3.0.0",
"pako": "^2.0.3",
"plotly.js-basic-dist-min": "^2.8.1",
"rxjs": "^6.6.7",
"pako": "^2.0.4",
"plotly.js-basic-dist-min": "^2.11.1",
"rxjs": "^7.5.5",
"semver": "^7.3.5",
"tslib": "^2.3.1",
"unique-names-generator": "^4.6.0",
"zone.js": "~0.11.4"
"unique-names-generator": "^4.7.1",
"zone.js": "~0.11.5"
},
"devDependencies": {
"@angular-devkit/build-angular": "^13.2.2",
"@angular-eslint/builder": "^13.0.1",
"@angular-eslint/eslint-plugin": "^13.0.1",
"@angular-eslint/eslint-plugin-template": "^13.0.1",
"@angular-eslint/schematics": "^13.0.1",
"@angular-eslint/template-parser": "^13.0.1",
"@angular/cli": "^13.2.2",
"@angular/compiler-cli": "^13.2.1",
"@angular/language-service": "~13.2.1",
"@types/chrome": "^0.0.178",
"@angular-devkit/build-angular": "^13.3.1",
"@angular-eslint/builder": "^13.1.0",
"@angular-eslint/eslint-plugin": "^13.1.0",
"@angular-eslint/eslint-plugin-template": "^13.1.0",
"@angular-eslint/schematics": "^13.1.0",
"@angular-eslint/template-parser": "^13.1.0",
"@angular/cli": "^13.3.1",
"@angular/compiler-cli": "^13.3.1",
"@angular/language-service": "~13.3.1",
"@types/chrome": "^0.0.180",
"@types/d3": "^6.7.5",
"@types/file-saver": "^2.0.5",
"@types/jasmine": "~3.10.3",
"@types/jasmine": "~4.0.2",
"@types/jasminewd2": "~2.0.10",
"@types/jest": "^27.4.0",
"@types/jest": "^27.4.1",
"@types/json2csv": "^5.0.3",
"@types/lodash": "^4.14.178",
"@types/lodash": "^4.14.181",
"@types/lokijs": "^1.5.7",
"@types/mapbox-gl": "^2.6.0",
"@types/mapbox-gl": "^2.6.3",
"@types/markdown-it": "^12.2.3",
"@types/node": "^16.11.6",
"@types/node": "^16",
"@types/plotly.js-dist-min": "^2.3.0",
"@types/semver": "^7.3.9",
"@typescript-eslint/eslint-plugin": "4.33.0",
"@typescript-eslint/parser": "4.33.0",
"@typescript-eslint/eslint-plugin": "5.17.0",
"@typescript-eslint/parser": "5.17.0",
"chokidar": "^3.5.3",
"electron": "^16.0.7",
"eslint": "^7.32.0",
"jasmine-core": "~3.8.0",
"electron": "^17.4.0",
"eslint": "^8.12.0",
"jasmine-core": "~4.0.1",
"jasmine-spec-reporter": "~7.0.0",
"jest": "^27.4.7",
"jest-preset-angular": "^11.1.0",
"jest": "^27.5.1",
"jest-preset-angular": "^11.1.1",
"protractor": "~7.0.0",
"ts-node": "^10.4.0",
"eslint-config-prettier": "^7.2.0",
"ts-node": "^10.7.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^4.0.0",
"typescript": "~4.5.4"
}
Expand Down
3 changes: 2 additions & 1 deletion appcore/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
<mat-nav-list>
<mat-list-item *ngFor="let item of mainMenuItems" routerLink="/{{item.routerLink}}"
routerLinkActive="{{item.routerLinkActive}}">
<mat-icon fontSet="material-icons-outlined">{{item.icon}}</mat-icon>
<mat-icon *ngIf="item.iconClass" fontSet="material-icons-outlined" [color]="item.iconClass">{{item.icon}}</mat-icon>
<mat-icon *ngIf="!item.iconClass" fontSet="material-icons-outlined">{{item.icon}}</mat-icon>
<span class="mat-body-1">{{item.name}}</span>
</mat-list-item>
<mat-list-item (click)="openResourceResolver.openLink('https://www.strava.com/dashboard')"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import { ConfirmDialogComponent } from "../shared/dialogs/confirm-dialog/confirm
import { ConfirmDialogDataModel } from "../shared/dialogs/confirm-dialog/confirm-dialog-data.model";
import { ElectronService } from "../desktop/electron/electron.service";
import { RuntimeInfoService } from "../desktop/machine/runtime-info.service";
import { RuntimeInfo } from "@elevate/shared/electron/runtime-info";
import { AthleteModel } from "@elevate/shared/models/athlete/athlete.model";

@Injectable({
providedIn: "root"
Expand Down Expand Up @@ -39,7 +41,7 @@ export class DesktopElevateErrorHandler extends ElevateErrorHandler {
});

Promise.all([this.runtimeInfoService.get(), this.athleteService.fetch()]).then(results => {
const [runtimeInfo, athlete] = results;
const [runtimeInfo, athlete] = results as [RuntimeInfo, AthleteModel];

Sentry.setContext("athlete", {
gender: athlete.gender,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { NgModule } from "@angular/core";
import { RouterModule, Routes } from "@angular/router";
import { DownloadDesktopAppComponent } from "./download-desktop-app.component";

const routes: Routes = [
{
path: "",
component: DownloadDesktopAppComponent
}
];

@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class DownloadDesktopAppRoutingModule {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<mat-card class="centered-section">
<mat-card-title class="mat-headline">
Desktop version of Elevate is now available as public BETA 🥳 !!
</mat-card-title>
<mat-card-content>
<div class="pad-std-bt">
<strong>The desktop app is most advanced version of Elevate. Try it !</strong>
</div>
<div class="pad-std-bt" >
<a matTooltip="Click to view screenshots..." matTooltipPosition="above" href="https://photos.app.goo.gl/BiFVBsqNW9VpV4tr9" target="_blank"><img src="https://i.imgur.com/Tf1JXRDm.png"></a>
</div>
<div class="pad-std-bt">
<button mat-flat-button color="primary" (click)="onDonateClicked()">
Support the project 😊 ❤️
</button>
</div>
<div class="pad-std-bt">
<button (click)="onWindowsDownload()" color="primary" mat-stroked-button>
Download for Windows
</button>
</div>
<div class="pad-std-bt">
<button (click)="onMacDownload()" color="primary" mat-stroked-button>
Download for macOS
</button>
</div>
</mat-card-content>
</mat-card>
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { Component, Inject } from "@angular/core";
import { AppRoutes } from "../../shared/models/app-routes";
import { Router } from "@angular/router";
import {
OPEN_RESOURCE_RESOLVER,
OpenResourceResolver
} from "../../shared/services/links-opener/open-resource-resolver";
import { AppPackage } from "@elevate/shared/tools/app-package";

@Component({
selector: "app-download-desktop-app",
templateUrl: "./download-desktop-app.component.html",
styleUrls: ["./download-desktop-app.component.scss"]
})
export class DownloadDesktopAppComponent {
constructor(
@Inject(Router) private readonly router: Router,
@Inject(OPEN_RESOURCE_RESOLVER) private readonly openResourceResolver: OpenResourceResolver
) {}

public onWindowsDownload(): void {
this.openResourceResolver.openLink(`${AppPackage.getElevateDoc()}/Download-%26-Install/Windows/`);
}

public onMacDownload(): void {
this.openResourceResolver.openLink(`${AppPackage.getElevateDoc()}/Download-%26-Install/macOS/`);
}

public onDonateClicked(): void {
this.router.navigate([AppRoutes.donate]);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { NgModule } from "@angular/core";
import { DownloadDesktopAppComponent } from "./download-desktop-app.component";
import { DownloadDesktopAppRoutingModule } from "./download-desktop-app-routing.module";
import { CoreModule } from "../../core/core.module";

@NgModule({
imports: [CoreModule, DownloadDesktopAppRoutingModule],
declarations: [DownloadDesktopAppComponent]
})
export class DownloadDesktopAppModule {}
14 changes: 10 additions & 4 deletions appcore/src/app/shared/models/app-routes.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
export class AppRoutes {
public static readonly dashboard: string = "dashboard";
public static readonly goals: string = "goals";
// Common
public static readonly activities: string = "activities";
public static readonly activity: string = "activity";
public static readonly fitnessTrend: string = "fitnessTrend";
public static readonly yearProgressions: string = "yearProgressions";
public static readonly globalSettings: string = "globalSettings";
public static readonly athleteSettings: string = "athleteSettings";
public static readonly zonesSettings: string = "zonesSettings";
public static readonly connectors: string = "connectors";
public static readonly donate: string = "donate";
public static readonly releasesNotes: string = "releasesNotes";
public static readonly report: string = "report";
public static readonly advancedMenu: string = "advancedMenu";
public static readonly help: string = "help";

// Desktop
public static readonly dashboard: string = "dashboard";
public static readonly goals: string = "goals";
public static readonly activity: string = "activity";
public static readonly connectors: string = "connectors";

// Extension
public static readonly downloadDesktopApp: string = "desktopAppBeta";
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ import { RouterModule, Routes } from "@angular/router";
import { AppRoutes } from "../../models/app-routes";

const routes: Routes = [
{
path: AppRoutes.downloadDesktopApp,
loadChildren: () =>
import("../../../extension/download-desktop-app/download-desktop-app.module").then(
module => module.DownloadDesktopAppModule
)
},
{
path: AppRoutes.activities,
loadChildren: () => import("../../../activities/activities.module").then(module => module.ActivitiesModule)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { AppRoutes } from "../../../models/app-routes";
@Injectable()
export class DesktopMenuItemsProvider implements MenuItemsProvider {
public readonly mainMenuItems: MenuItemModel[] = [
/* {
{
icon: "space_dashboard",
routerLink: AppRoutes.dashboard,
routerLinkActive: true
Expand All @@ -14,7 +14,7 @@ export class DesktopMenuItemsProvider implements MenuItemsProvider {
icon: "emoji_events",
routerLink: AppRoutes.goals,
routerLinkActive: true
},*/
},
{
icon: "summarize",
routerLink: AppRoutes.activities,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ import { AppRoutes } from "../../../models/app-routes";
@Injectable()
export class ExtensionMenuItemsProvider implements MenuItemsProvider {
public readonly mainMenuItems: MenuItemModel[] = [
{
icon: "get_app",
iconClass: "warn",
routerLink: AppRoutes.downloadDesktopApp,
routerLinkActive: true
},
{
icon: "view_list",
routerLink: AppRoutes.activities,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export const MENU_ITEMS_PROVIDER = new InjectionToken<MenuItemsProvider>("MENU_I

export class MenuItemModel {
public icon: string;
public iconClass?: "primary" | "accent" | "warn";
public routerLink: string;
public routerLinkActive: boolean;
public name?: string;
Expand Down
3 changes: 0 additions & 3 deletions appcore/src/app/top-bar/desktop-top-bar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ import { Platform } from "@elevate/shared/enums/platform.enum";
]
})
export class DesktopTopBarComponent extends TopBarComponent implements OnInit {
public currentVersion: string;
public buildMetadata: { commit: string; date: string };
public isFullScreen: boolean;
public isMaximized: boolean;
Expand Down Expand Up @@ -125,8 +124,6 @@ export class DesktopTopBarComponent extends TopBarComponent implements OnInit {
this.changeDetectorRef.detectChanges();
});

this.currentVersion = this.versionsProvider.getPackageVersion();

this.versionsProvider.getBuildMetadata().then((buildMetadata: { commit: string; date: string }) => {
this.buildMetadata = buildMetadata;
this.buildMetadata.date = this.buildMetadata.date.slice(0, 10).replace(/-/g, "");
Expand Down
Loading

0 comments on commit 2138daf

Please sign in to comment.