Skip to content

Commit 521799d

Browse files
chrisK00kgrontisdenislavhashwin003Penguine-Os
authored
Release 2.1.0 (#146)
* Update README.md * Update README.md * revert version * revert comments * companyname * Update README.md * #114 Implemented CssUtil.GetDueClass & tests (#123) * #114 Implemented CssUtil.GetDueClass & tests * #114 Added semicolor to css rule * #114 Changed placement of css rule. * #114 removed dots from string result. * #114 PR review changes. * #115 Added call to GetDueClass method in monthly page. (#124) * add mockups for icons and colors * Adds font color to due period depending on severity. (#126) * Adds font color to due period depending on severity. * Returns text-end class for Index page. * Preserves newline in subscription description (#131) * Introduces subscription background color. (#135) * Adds background color to the database * Adds a control to select background color for a subscription * Updates tests to include background color * Updates migration scripts * Update subtrack.MAUI/Utilities/CssUtil.cs Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Minor updates * Update subtrack.MAUI/Pages/UpsertSubscription.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/UpsertSubscription.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/UpsertSubscription.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/UpsertSubscription.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Minor adjustments --------- Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * #128 make labels less visible (#136) * #128 make labels less visible * Update subtrack.MAUI/wwwroot/css/app.css Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/SubscriptionDetails.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/SubscriptionDetails.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/SubscriptionDetails.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/SubscriptionDetails.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/SubscriptionDetails.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> --------- Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * #125 Added US Culture as a constant (#144) * #142 Fixed descriptions not displayed correctly. (#145) * update roadmap * make nav buttons larger and remove outline on back save and edit buttons (#143) * btn outline => btn filled * navbar simplification * resolve comments * format and remove non existing css class * remove default styling --------- Co-authored-by: ChrisK00 <christian.khalil2000@gmail.com> Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> --------- Co-authored-by: Konstantinos Grontis <grodiscostas@hotmail.com> Co-authored-by: denislavh <53407843+denislavh@users.noreply.github.com> Co-authored-by: Ashwin Thyagarajan <ashwin031192@gmail.com> Co-authored-by: Penguine-Os <yenebeb.df@gmail.com>
1 parent 369ab65 commit 521799d

30 files changed

+903
-93
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ After making changes to any entity you need to add a migration and update the da
6363
- Update the Roadmap
6464
- Git pull master
6565
- Open up *subtrack.maui.csproj*
66-
- Set the value of application Id to `<ApplicationId>com.companyname.subtrack</ApplicationId>`
66+
- Set the value of application Id to `<ApplicationId>com.code2gether.subtrack</ApplicationId>`
6767
- Set the value of application Title `<ApplicationTitle>subtrack</ApplicationTitle>`
6868
- Inside Visual Studio set build mode to **Release**
6969
- Build the project
7070
- Run the project
71-
- The APK file should have been created at this location: *subtrack.MAUI\bin\Release\net6.0-android\com.companyname.subtrack-Signed.apk*
71+
- The APK file should have been created at this location: *subtrack.MAUI\bin\Release\net6.0-android\com.code2gether.subtrack-Signed.apk*
7272
- Remove the changes that were made to the *.csproj* file
7373
- Upload the APK release to Github
7474
- The version should be prefixed with a **"v"** and suffix of (app stage which is currently alpha 2/9-2023) **"-alpha"**

‎docs/MVP mockups.png‎

-149 KB
Binary file not shown.

‎docs/mockups.drawio‎

Lines changed: 454 additions & 4 deletions
Large diffs are not rendered by default.

‎docs/mockups.png‎

70.3 KB
Loading

‎docs/roadmap.drawio‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<mxfile host="65bd71144e">
22
<diagram id="0sBSfLOzs08FeBCRcvm6" name="2023">
3-
<mxGraphModel dx="722" dy="422" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
3+
<mxGraphModel dx="1697" dy="531" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
44
<root>
55
<mxCell id="0"/>
66
<mxCell id="1" parent="0"/>
@@ -74,12 +74,12 @@
7474
</mxGeometry>
7575
</mxCell>
7676
<mxCell id="31" value="Push notifications" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;labelBorderColor=none;strokeColor=#D154D1;strokeWidth=2;fontColor=#030303;fillColor=#FFFFFF;" parent="1" vertex="1">
77-
<mxGeometry x="433" y="345" width="89" height="33" as="geometry"/>
77+
<mxGeometry x="433" y="330" width="89" height="33" as="geometry"/>
7878
</mxCell>
7979
<mxCell id="32" style="edgeStyle=none;rounded=1;html=1;strokeColor=default;fontColor=#030303;endArrow=none;endFill=0;" parent="1" edge="1">
8080
<mxGeometry relative="1" as="geometry">
81-
<mxPoint x="433" y="359.99999999999994" as="targetPoint"/>
82-
<mxPoint x="396.9999999999998" y="359.99999999999994" as="sourcePoint"/>
81+
<mxPoint x="433" y="344.99999999999994" as="targetPoint"/>
82+
<mxPoint x="396.9999999999998" y="344.99999999999994" as="sourcePoint"/>
8383
</mxGeometry>
8484
</mxCell>
8585
<mxCell id="35" value="Overdue payments" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;labelBorderColor=none;strokeColor=#D154D1;strokeWidth=2;fontColor=#030303;fillColor=#FFFFFF;" parent="1" vertex="1">
@@ -122,12 +122,12 @@
122122
</mxGeometry>
123123
</mxCell>
124124
<mxCell id="45" value="Startpage filtering and ordering" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;labelBorderColor=none;strokeColor=#D154D1;strokeWidth=2;fontColor=#030303;fillColor=#FFFFFF;" parent="1" vertex="1">
125-
<mxGeometry x="242.5" y="310" width="115.5" height="40" as="geometry"/>
125+
<mxGeometry x="242.5" y="300" width="115.5" height="40" as="geometry"/>
126126
</mxCell>
127127
<mxCell id="46" style="edgeStyle=none;rounded=1;html=1;strokeColor=default;fontColor=#030303;endArrow=none;endFill=0;" parent="1" edge="1">
128128
<mxGeometry relative="1" as="geometry">
129-
<mxPoint x="398" y="329.5799999999999" as="targetPoint"/>
130-
<mxPoint x="357.99999999999955" y="329.5799999999999" as="sourcePoint"/>
129+
<mxPoint x="398" y="319.5799999999999" as="targetPoint"/>
130+
<mxPoint x="357.99999999999955" y="319.5799999999999" as="sourcePoint"/>
131131
</mxGeometry>
132132
</mxCell>
133133
<mxCell id="47" value="" style="sketch=0;html=1;aspect=fixed;strokeColor=none;shadow=0;align=center;verticalAlign=top;fillColor=#2D9C5E;shape=mxgraph.gcp2.check" parent="1" vertex="1">
@@ -142,9 +142,21 @@
142142
<mxCell id="50" value="" style="sketch=0;html=1;aspect=fixed;strokeColor=none;shadow=0;align=center;verticalAlign=top;fillColor=#2D9C5E;shape=mxgraph.gcp2.check" parent="1" vertex="1">
143143
<mxGeometry x="420" y="145" width="25" height="20" as="geometry"/>
144144
</mxCell>
145-
<mxCell id="51" value="" style="sketch=0;html=1;aspect=fixed;strokeColor=none;shadow=0;align=center;verticalAlign=top;fillColor=#2D9C5E;shape=mxgraph.gcp2.check" vertex="1" parent="1">
145+
<mxCell id="51" value="" style="sketch=0;html=1;aspect=fixed;strokeColor=none;shadow=0;align=center;verticalAlign=top;fillColor=#2D9C5E;shape=mxgraph.gcp2.check" parent="1" vertex="1">
146146
<mxGeometry x="271" y="158" width="25" height="20" as="geometry"/>
147147
</mxCell>
148+
<mxCell id="52" value="" style="sketch=0;html=1;aspect=fixed;strokeColor=none;shadow=0;align=center;verticalAlign=top;fillColor=#2D9C5E;shape=mxgraph.gcp2.check" vertex="1" parent="1">
149+
<mxGeometry x="242.5" y="198" width="25" height="20" as="geometry"/>
150+
</mxCell>
151+
<mxCell id="55" value=".NET 8" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;labelBorderColor=none;strokeColor=#D154D1;strokeWidth=2;fontColor=#030303;fillColor=#FFFFFF;" vertex="1" parent="1">
152+
<mxGeometry x="306" y="352" width="54.75" height="33" as="geometry"/>
153+
</mxCell>
154+
<mxCell id="57" style="edgeStyle=none;rounded=1;html=1;strokeColor=default;fontColor=#030303;endArrow=none;endFill=0;" edge="1" parent="1">
155+
<mxGeometry relative="1" as="geometry">
156+
<mxPoint x="401" y="366.99999999999994" as="targetPoint"/>
157+
<mxPoint x="360.99999999999955" y="366.99999999999994" as="sourcePoint"/>
158+
</mxGeometry>
159+
</mxCell>
148160
</root>
149161
</mxGraphModel>
150162
</diagram>

‎docs/roadmap.png‎

1.68 KB
Loading

‎subtrack.DAL/Entities/Subscription.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ public class Subscription : ICloneable
2626
[Range(1, int.MaxValue, ErrorMessage = "Interval has to be greater than 0")]
2727
public int BillingInterval { get; set; }
2828

29+
public string PrimaryColor { get; set; }
30+
2931
public object Clone()
3032
{
3133
return (Subscription)MemberwiseClone();

‎subtrack.DAL/Migrations/20230916005301_BackgroundColor.Designer.cs‎

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

‎subtrack.DAL/Migrations/20230916005301_BackgroundColor.cs‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
using Microsoft.EntityFrameworkCore.Migrations;
2+
3+
#nullable disable
4+
5+
namespace subtrack.DAL.Migrations
6+
{
7+
/// <inheritdoc />
8+
public partial class BackgroundColor : Migration
9+
{
10+
/// <inheritdoc />
11+
protected override void Up(MigrationBuilder migrationBuilder)
12+
{
13+
migrationBuilder.AddColumn<string>(
14+
name: "BackgroundColor",
15+
table: "Subscriptions",
16+
type: "TEXT",
17+
nullable: false,
18+
defaultValue: "#282828");
19+
}
20+
21+
/// <inheritdoc />
22+
protected override void Down(MigrationBuilder migrationBuilder)
23+
{
24+
migrationBuilder.DropColumn(
25+
name: "BackgroundColor",
26+
table: "Subscriptions");
27+
}
28+
}
29+
}

‎subtrack.DAL/Migrations/20230917120115_PrimaryColor.Designer.cs‎

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

0 commit comments

Comments
 (0)