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>
Code2Gether-Discord · Sep 24, 2023 · 521799d · 521799d
1 parent 369ab65
commit 521799d
Show file tree

Hide file tree

Showing 30 changed files with 903 additions and 93 deletions.
diff --git a/README.md b/README.md
@@ -63,12 +63,12 @@ After making changes to any entity you need to add a migration and update the da
   - Update the Roadmap
 - Git pull master
 - Open up *subtrack.maui.csproj*
-    - Set the value of application Id to `<ApplicationId>com.companyname.subtrack</ApplicationId>`
+    - Set the value of application Id to `<ApplicationId>com.code2gether.subtrack</ApplicationId>`
     - Set the value of application Title `<ApplicationTitle>subtrack</ApplicationTitle>`
 - Inside Visual Studio set build mode to **Release**
 - Build the project
 - Run the project
-- The APK file should have been created at this location: *subtrack.MAUI\bin\Release\net6.0-android\com.companyname.subtrack-Signed.apk*
+- The APK file should have been created at this location: *subtrack.MAUI\bin\Release\net6.0-android\com.code2gether.subtrack-Signed.apk*
 - Remove the changes that were made to the *.csproj* file
 - Upload the APK release to Github
   - The version should be prefixed with a **"v"** and suffix of (app stage which is currently alpha 2/9-2023) **"-alpha"**

diff --git a/docs/MVP mockups.png b/docs/MVP mockups.png
diff --git a/docs/mockups.drawio b/docs/mockups.drawio
diff --git a/docs/mockups.png b/docs/mockups.png
diff --git a/docs/roadmap.drawio b/docs/roadmap.drawio
@@ -1,6 +1,6 @@
 <mxfile host="65bd71144e">
     <diagram id="0sBSfLOzs08FeBCRcvm6" name="2023">
-        <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">
+        <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">
             <root>
                 <mxCell id="0"/>
                 <mxCell id="1" parent="0"/>
@@ -74,12 +74,12 @@
                     </mxGeometry>
                 </mxCell>
                 <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">
-                    <mxGeometry x="433" y="345" width="89" height="33" as="geometry"/>
+                    <mxGeometry x="433" y="330" width="89" height="33" as="geometry"/>
                 </mxCell>
                 <mxCell id="32" style="edgeStyle=none;rounded=1;html=1;strokeColor=default;fontColor=#030303;endArrow=none;endFill=0;" parent="1" edge="1">
                     <mxGeometry relative="1" as="geometry">
-                        <mxPoint x="433" y="359.99999999999994" as="targetPoint"/>
-                        <mxPoint x="396.9999999999998" y="359.99999999999994" as="sourcePoint"/>
+                        <mxPoint x="433" y="344.99999999999994" as="targetPoint"/>
+                        <mxPoint x="396.9999999999998" y="344.99999999999994" as="sourcePoint"/>
                     </mxGeometry>
                 </mxCell>
                 <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 @@
                     </mxGeometry>
                 </mxCell>
                 <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">
-                    <mxGeometry x="242.5" y="310" width="115.5" height="40" as="geometry"/>
+                    <mxGeometry x="242.5" y="300" width="115.5" height="40" as="geometry"/>
                 </mxCell>
                 <mxCell id="46" style="edgeStyle=none;rounded=1;html=1;strokeColor=default;fontColor=#030303;endArrow=none;endFill=0;" parent="1" edge="1">
                     <mxGeometry relative="1" as="geometry">
-                        <mxPoint x="398" y="329.5799999999999" as="targetPoint"/>
-                        <mxPoint x="357.99999999999955" y="329.5799999999999" as="sourcePoint"/>
+                        <mxPoint x="398" y="319.5799999999999" as="targetPoint"/>
+                        <mxPoint x="357.99999999999955" y="319.5799999999999" as="sourcePoint"/>
                     </mxGeometry>
                 </mxCell>
                 <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 @@
                 <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">
                     <mxGeometry x="420" y="145" width="25" height="20" as="geometry"/>
                 </mxCell>
-                <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">
+                <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">
                     <mxGeometry x="271" y="158" width="25" height="20" as="geometry"/>
                 </mxCell>
+                <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">
+                    <mxGeometry x="242.5" y="198" width="25" height="20" as="geometry"/>
+                </mxCell>
+                <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">
+                    <mxGeometry x="306" y="352" width="54.75" height="33" as="geometry"/>
+                </mxCell>
+                <mxCell id="57" style="edgeStyle=none;rounded=1;html=1;strokeColor=default;fontColor=#030303;endArrow=none;endFill=0;" edge="1" parent="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <mxPoint x="401" y="366.99999999999994" as="targetPoint"/>
+                        <mxPoint x="360.99999999999955" y="366.99999999999994" as="sourcePoint"/>
+                    </mxGeometry>
+                </mxCell>
             </root>
         </mxGraphModel>
     </diagram>

diff --git a/docs/roadmap.png b/docs/roadmap.png
diff --git a/subtrack.DAL/Entities/Subscription.cs b/subtrack.DAL/Entities/Subscription.cs
@@ -26,6 +26,8 @@ public class Subscription : ICloneable
     [Range(1, int.MaxValue, ErrorMessage = "Interval has to be greater than 0")]
     public int BillingInterval { get; set; }
 
+    public string PrimaryColor { get; set; }
+
     public object Clone()
     {
         return (Subscription)MemberwiseClone();

diff --git a/subtrack.DAL/Migrations/20230916005301_BackgroundColor.Designer.cs b/subtrack.DAL/Migrations/20230916005301_BackgroundColor.Designer.cs
diff --git a/subtrack.DAL/Migrations/20230916005301_BackgroundColor.cs b/subtrack.DAL/Migrations/20230916005301_BackgroundColor.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace subtrack.DAL.Migrations
+{
+    /// <inheritdoc />
+    public partial class BackgroundColor : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "BackgroundColor",
+                table: "Subscriptions",
+                type: "TEXT",
+                nullable: false,
+                defaultValue: "#282828");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "BackgroundColor",
+                table: "Subscriptions");
+        }
+    }
+}
diff --git a/subtrack.DAL/Migrations/20230917120115_PrimaryColor.Designer.cs b/subtrack.DAL/Migrations/20230917120115_PrimaryColor.Designer.cs
diff --git a/subtrack.DAL/Migrations/20230917120115_PrimaryColor.cs b/subtrack.DAL/Migrations/20230917120115_PrimaryColor.cs
@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace subtrack.DAL.Migrations
+{
+    /// <inheritdoc />
+    public partial class PrimaryColor : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "BackgroundColor",
+                table: "Subscriptions",
+                newName: "PrimaryColor");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "PrimaryColor",
+                table: "Subscriptions",
+                newName: "BackgroundColor");
+        }
+    }
+}
diff --git a/subtrack.DAL/Migrations/SubtrackDbContextModelSnapshot.cs b/subtrack.DAL/Migrations/SubtrackDbContextModelSnapshot.cs
@@ -40,12 +40,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("INTEGER");
 
                     b.Property<int>("BillingInterval")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("INTEGER")
                         .HasDefaultValue(1);
 
                     b.Property<int>("BillingOccurrence")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("INTEGER")
                         .HasDefaultValue(1);
 
@@ -66,9 +64,14 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasMaxLength(12)
+                        .HasMaxLength(50)
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("PrimaryColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasDefaultValue("#282828");
+
                     b.HasKey("Id");
 
                     b.ToTable("Subscriptions");

diff --git a/subtrack.DAL/SubtrackDbContext.cs b/subtrack.DAL/SubtrackDbContext.cs
@@ -23,6 +23,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             entity.Property(e => e.BillingOccurrence).HasDefaultValue(BillingOccurrence.Month).ValueGeneratedNever();
             entity.Property(e => e.BillingInterval).HasDefaultValue(1).ValueGeneratedNever();
+            entity.Property(e => e.PrimaryColor).HasDefaultValue("#282828").ValueGeneratedNever();
         });
     }
 }