Skip to content

Commit c127815

Browse files
graphefruitgraphefruit
committed
#997 - Show unwrapped of 2025
1 parent 5a7d5b2 commit c127815

File tree

16 files changed

+2545
-1619
lines changed

16 files changed

+2545
-1619
lines changed

‎ios/App/App.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@
357357
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.food-and-drink";
358358
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
359359
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
360-
MARKETING_VERSION = 8.4.3;
360+
MARKETING_VERSION = 8.4.4;
361361
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
362362
PRODUCT_BUNDLE_IDENTIFIER = com.beanconqueror.app;
363363
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -383,7 +383,7 @@
383383
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.food-and-drink";
384384
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
385385
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
386-
MARKETING_VERSION = 8.4.3;
386+
MARKETING_VERSION = 8.4.4;
387387
PRODUCT_BUNDLE_IDENTIFIER = com.beanconqueror.app;
388388
PRODUCT_NAME = "$(TARGET_NAME)";
389389
PROVISIONING_PROFILE_SPECIFIER = "";

‎ios/App/App.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict/>
5+
</plist>

‎ios/App/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ PODS:
4141
- Capacitor
4242
- CapgoCapacitorNavigationBar (7.1.27):
4343
- Capacitor
44-
- CordovaPlugins (7.4.2):
44+
- CordovaPlugins (7.4.4):
4545
- CapacitorCordova
4646
- IONFilesystemLib (1.0.0)
4747
- IONGeolocationLib (1.0.0)
@@ -141,7 +141,7 @@ SPEC CHECKSUMS:
141141
CapawesomeCapacitorFilePicker: 0f4a913a00e39dd77213449f0d917e92f35a5ca9
142142
CapgoCameraPreview: 29d500a7567cd3005b7fe62a70baad1ee6d0c67e
143143
CapgoCapacitorNavigationBar: dfa5f03c60a92e5cfdd67768e4a4f0c86a0b1c04
144-
CordovaPlugins: b02dd62282839c828983e64748fb6531503c92b1
144+
CordovaPlugins: 7d85160adba178e1066f758c0ceb2d4aa86ed6be
145145
IONFilesystemLib: ceacae793975039530458eabab0c495c70515a0d
146146
IONGeolocationLib: 81f33f88d025846946de2cf63b0c7628e7c6bc9d
147147
OSBarcodeLib: f2e981270a64faf476cb790864262b29ab8cd68a

‎package-lock.json‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@capacitor/barcode-scanner": "^2.0.3",
3636
"@capacitor/camera": "^7.0.1",
3737
"@capacitor/clipboard": "^7.0.1",
38-
"@capacitor/core": "^7.4.2",
38+
"@capacitor/core": "^7.4.4",
3939
"@capacitor/device": "^7.0.1",
4040
"@capacitor/filesystem": "^7.1.3",
4141
"@capacitor/geolocation": "^7.1.4",
@@ -90,7 +90,7 @@
9090
"@angular/compiler-cli": "^20.1.3",
9191
"@angular/language-service": "^20.1.3",
9292
"@capacitor/assets": "^3.0.5",
93-
"@capacitor/cli": "^7.0.0",
93+
"@capacitor/cli": "^7.4.4",
9494
"@ionic/angular-toolkit": "^9.0.0",
9595
"@types/jasmine": "~3.6.0",
9696
"@types/jasminewd2": "~2.0.8",

‎src/app/dashboard/dashboard.module.ts‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
import {NgModule} from '@angular/core';
2-
import {CommonModule} from '@angular/common';
3-
import {FormsModule} from '@angular/forms';
4-
5-
import {IonicModule} from '@ionic/angular';
6-
7-
import {DashboardPageRoutingModule} from './dashboard-routing.module';
8-
import {SharedModule} from '../shared/shared.module';
1+
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
2+
import { CommonModule } from '@angular/common';
3+
import { FormsModule } from '@angular/forms';
94

5+
import { IonicModule } from '@ionic/angular';
6+
import { DashboardPageRoutingModule } from './dashboard-routing.module';
7+
import { SharedModule } from '../shared/shared.module';
108

119
@NgModule({
1210
imports: [
1311
CommonModule,
1412
FormsModule,
1513
IonicModule,
1614
DashboardPageRoutingModule,
17-
SharedModule
15+
SharedModule,
1816
],
19-
declarations: []
17+
declarations: [],
18+
schemas: [CUSTOM_ELEMENTS_SCHEMA],
2019
})
21-
export class DashboardPageModule {
22-
}
20+
export class DashboardPageModule {}

‎src/app/dashboard/dashboard.page.html‎

Lines changed: 91 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<ion-menu-button></ion-menu-button>
55
</ion-buttons>
66
<ion-buttons slot="end">
7-
<ion-button tappable (short-press)="addBrew()" (long-press)="longPressAdd($event)" class="big-add-icon" fill="clear">
7+
<ion-button tappable (short-press)="addBrew()" (long-press)="longPressAdd($event)" class="big-add-icon"
8+
fill="clear">
89
<ion-icon class="ion-color-accent" name="beanconqueror-add" slot="icon-only"></ion-icon>
910
</ion-button>
1011
</ion-buttons>
@@ -15,83 +16,101 @@
1516
</ion-header>
1617
<ion-content>
1718
<ion-grid>
18-
<ion-row>
19-
<ion-col size="6">
20-
<ion-card [routerLink]="['/home/brews']" class="dashboard ion-no-margin" tappable>
21-
<ion-card-header class="ion-no-padding ion-no-margin">
22-
<ion-card-title>{{getBrewsDrunk}}</ion-card-title>
23-
<ion-card-subtitle>
24-
@if(getBrewsDrunk === 1) {
25-
<span>{{"PAGE_HOME_TOTAL_BREW" | translate}}</span>
26-
} @else {
27-
<span>{{"PAGE_HOME_TOTAL_BREWS" | translate}}</span>
28-
}
29-
</ion-card-subtitle>
30-
</ion-card-header>
31-
</ion-card>
32-
</ion-col>
33-
<ion-col size="6">
34-
<ion-card [routerLink]="['/statistic']" class="dashboard ion-no-margin no-border" tappable>
35-
<ion-card-header class="ion-no-padding ion-no-margin">
36-
<ion-card-title>{{getTimePassedSinceLastBrew}}</ion-card-title>
37-
<ion-card-subtitle>
38-
{{getTimePassedSinceLastBrewMessage}} {{"WITHOUT_COFFEE" | translate}}
39-
</ion-card-subtitle>
40-
</ion-card-header>
41-
</ion-card>
42-
</ion-col>
43-
</ion-row>
44-
<ion-row>
45-
<ion-col size="6">
46-
<ion-card [routerLink]="['/home/beans']" class="dashboard ion-no-margin" tappable>
47-
<ion-card-header class="ion-no-padding ion-no-margin">
48-
<ion-card-title>{{getBeansCount}}</ion-card-title>
49-
<ion-card-subtitle>
50-
@if(getBeansCount === 1) {
51-
<span>{{"PAGE_HOME_BEAN_EXPLORED" | translate}}</span>
52-
} @else {
53-
<span>{{"PAGE_HOME_BEANS_EXPLORED" | translate}}</span>
54-
}
55-
</ion-card-subtitle>
56-
</ion-card-header>
57-
</ion-card>
58-
</ion-col>
59-
<ion-col size="6">
60-
<ion-card [routerLink]="['/home/beans']" class="dashboard ion-no-margin no-border" tappable>
61-
<ion-card-header class="ion-no-padding ion-no-margin">
62-
<ion-card-title>
19+
@if (showUnwrapped) {
20+
<ion-row>
21+
<ion-col size="12">
22+
<ion-card (click)="openUnwrapped()" tappable>
23+
<ion-card-header>
24+
<ion-card-title>
25+
<ion-icon color='accent' name="gift-outline"></ion-icon>
26+
{{ 'UNWRAPPED.BUTTON.TITLE' | translate }}
27+
</ion-card-title>
28+
<ion-card-subtitle>{{ 'UNWRAPPED.BUTTON.SUBTITLE' | translate }}</ion-card-subtitle>
29+
</ion-card-header>
30+
</ion-card>
31+
</ion-col>
32+
</ion-row>
33+
}
34+
<ion-row>
35+
<ion-col size="6">
36+
<ion-card [routerLink]="['/home/brews']" class="dashboard ion-no-margin" tappable>
37+
<ion-card-header class="ion-no-padding ion-no-margin">
38+
<ion-card-title>{{getBrewsDrunk}}</ion-card-title>
39+
<ion-card-subtitle>
40+
@if(getBrewsDrunk === 1) {
41+
<span>{{"PAGE_HOME_TOTAL_BREW" | translate}}</span>
42+
} @else {
43+
<span>{{"PAGE_HOME_TOTAL_BREWS" | translate}}</span>
44+
}
45+
</ion-card-subtitle>
46+
</ion-card-header>
47+
</ion-card>
48+
</ion-col>
49+
<ion-col size="6">
50+
<ion-card [routerLink]="['/statistic']" class="dashboard ion-no-margin no-border" tappable>
51+
<ion-card-header class="ion-no-padding ion-no-margin">
52+
<ion-card-title>{{getTimePassedSinceLastBrew}}</ion-card-title>
53+
<ion-card-subtitle>
54+
{{getTimePassedSinceLastBrewMessage}} {{"WITHOUT_COFFEE" | translate}}
55+
</ion-card-subtitle>
56+
</ion-card-header>
57+
</ion-card>
58+
</ion-col>
59+
</ion-row>
60+
<ion-row>
61+
<ion-col size="6">
62+
<ion-card [routerLink]="['/home/beans']" class="dashboard ion-no-margin" tappable>
63+
<ion-card-header class="ion-no-padding ion-no-margin">
64+
<ion-card-title>{{getBeansCount}}</ion-card-title>
65+
<ion-card-subtitle>
66+
@if(getBeansCount === 1) {
67+
<span>{{"PAGE_HOME_BEAN_EXPLORED" | translate}}</span>
68+
} @else {
69+
<span>{{"PAGE_HOME_BEANS_EXPLORED" | translate}}</span>
70+
}
71+
</ion-card-subtitle>
72+
</ion-card-header>
73+
</ion-card>
74+
</ion-col>
75+
<ion-col size="6">
76+
<ion-card [routerLink]="['/home/beans']" class="dashboard ion-no-margin no-border" tappable>
77+
<ion-card-header class="ion-no-padding ion-no-margin">
78+
<ion-card-title>
6379
@if(settings.freeze_coffee_beans) {
64-
<ion-icon color='accent-secondary' style="top: 3px;position: relative;" name="thermometer-outline"></ion-icon>&nbsp;{{leftOverBeansWeight}}<br/><ion-icon color='accent-secondary' style="top: 3px;position: relative;" name="snow-outline"></ion-icon>&nbsp;{{leftOverFrozenBeansWeight}}
80+
<ion-icon color='accent-secondary' style="top: 3px;position: relative;"
81+
name="thermometer-outline"></ion-icon>&nbsp;{{leftOverBeansWeight}}<br /><ion-icon
82+
color='accent-secondary' style="top: 3px;position: relative;"
83+
name="snow-outline"></ion-icon>&nbsp;{{leftOverFrozenBeansWeight}}
6584
} @else {
66-
{{leftOverBeansWeight}}
85+
{{leftOverBeansWeight}}
6786
}
68-
</ion-card-title>
69-
<ion-card-subtitle>
70-
{{"BEANS_WEIGHT_AVAILABLE" | translate}}
71-
</ion-card-subtitle>
72-
</ion-card-header>
73-
</ion-card>
74-
</ion-col>
75-
</ion-row>
76-
</ion-grid>
87+
</ion-card-title>
88+
<ion-card-subtitle>
89+
{{"BEANS_WEIGHT_AVAILABLE" | translate}}
90+
</ion-card-subtitle>
91+
</ion-card-header>
92+
</ion-card>
93+
</ion-col>
94+
</ion-row>
95+
</ion-grid>
7796

7897
<div class="ion-padding-horizontal ion-padding-top">
7998
<h4 class="ion-no-margin">{{"PAGE_HOME_LAST_BREWS" | translate}}</h4>
8099
</div>
81-
@if (brews?.length > 0) {
82-
@for(brew of brews; track brew.config.uuid) {
83-
<brew-information [layout]="'dashboard'" (brewAction)="brewAction($event[0],$event[1])"
84-
[brew]="brew"></brew-information>
85-
}
86-
} @else {
87-
<div class="ion-padding ion-text-center">
88-
<div>
89-
<ion-icon color="inactive" name="beanconqueror-cup" size="large"></ion-icon>
90-
</div>
91-
<div class="text-color-inactive ion-margin-top">
92-
{{"PAGE_BREWS_NO_ENTRIES" | translate}}
93-
</div>
94-
</div>
95-
}
100+
@if (brews?.length > 0) {
101+
@for(brew of brews; track brew.config.uuid) {
102+
<brew-information [layout]="'dashboard'" (brewAction)="brewAction($event[0],$event[1])"
103+
[brew]="brew"></brew-information>
104+
}
105+
} @else {
106+
<div class="ion-padding ion-text-center">
107+
<div>
108+
<ion-icon color="inactive" name="beanconqueror-cup" size="large"></ion-icon>
109+
</div>
110+
<div class="text-color-inactive ion-margin-top">
111+
{{"PAGE_BREWS_NO_ENTRIES" | translate}}
112+
</div>
113+
</div>
114+
}
96115

97116
</ion-content>

‎src/app/dashboard/dashboard.page.scss‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@
22

33

44
ion-card.dashboard {
5-
text-align:center;
5+
text-align: center;
66
padding: 12px;
7-
height:100%;
7+
height: 100%;
88

99
ion-card-title {
1010
color: var(--ion-color-accent-secondary);
11-
font-size:24px;
11+
font-size: 24px;
1212
font-weight: bold;
1313
}
14+
1415
ion-card-subtitle {
1516
color: var(--ion-text-color);
16-
font-size:14px;
17-
margin-top:0px;
17+
font-size: 14px;
18+
margin-top: 0px;
1819
}
1920
}
2021

@@ -58,3 +59,10 @@
5859
}
5960

6061
}
62+
63+
.no-border {
64+
box-shadow: none !important;
65+
border: 1px solid var(--ion-color-light-shade);
66+
}
67+
68+

0 commit comments

Comments
 (0)