Browse Source

RIFFMASTER: FRONTEND: add color preview for groupColor in list of riffs

Kuba 2 years ago
parent
commit
90bc0c187d
32 changed files with 33 additions and 6 deletions
  1. 5 3
      Backend/Spring/.idea/workspace.xml
  2. BIN
      Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/domain/Riff.class
  3. BIN
      Backend/Spring/target/classes/pl/dmcs/jwoszczyk/domain/Riff.class
  4. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/1.pack
  5. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/10.pack
  6. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/11.pack
  7. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/14.pack
  8. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/2.pack
  9. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/4.pack
  10. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/5.pack
  11. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/7.pack
  12. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/8.pack
  13. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/9.pack
  14. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/index.pack
  15. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/index.pack.old
  16. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/09ab225c1a846814815302f436b1aaea4be46224e1c1e138428ec8686f2bc9b7.json
  17. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/1d2fc6a9f9457f808a23f21af6376e4a0db801943575b17cbc13d51142437447.json
  18. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/22159daa6db4781412c0f1fee56392ab07e887fe808d9e83a3d754bd71f6351d.json
  19. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/26a8e28f8ec3c7a049ae184516cd43092ddcd5c1af03c7cdcd101575eaeb9790.json
  20. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/3497e01d55e8bcfefef226959e4d536d587fe8418de5ba460b447b9f7d5d200a.json
  21. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/602e654b5227bfacd2ae65467fa61a7375c819defe3f99bbf47bd0f3432139f1.json
  22. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/7259c11c5cddd8d96392f4e9a98d3e16d85800cd15b22222b8ae2f38f768be5b.json
  23. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/834fe0ba1f57ecde1f08dee0505fb6d70aec535427cb3bf84082910e22a49df5.json
  24. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/a256e7409eff6c788f115bc55c3696638dc0be70e3b79542b290b2df3bff6625.json
  25. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/a9303472bbd8110d23432f9f03155a69d240a6a0744658bacb4836b53c519258.json
  26. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/b542d2239e8542e583a29fd56b464e2e9f30b39eb8659c0099d77d38b0fd63fc.json
  27. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/d6e36bc68a63846c4b7b2fd765af6606441e02aac01394100625018d24dea40f.json
  28. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/fae1ce2cdaefaac6739942381ba0f9b27c280de60b84a1b9f7666bec77e03a47.json
  29. 4 2
      Frontend/RiffMasterFront/.idea/workspace.xml
  30. 12 0
      Frontend/RiffMasterFront/src/app/main-page/main-page.component.css
  31. 7 1
      Frontend/RiffMasterFront/src/app/main-page/main-page.component.html
  32. 5 0
      Frontend/RiffMasterFront/src/app/main-page/main-page.component.ts

+ 5 - 3
Backend/Spring/.idea/workspace.xml

@@ -11,8 +11,9 @@
   <component name="ChangeListManager">
     <list default="true" id="8315de53-8c15-472c-a710-45938463dc02" name="Changes" comment="RIFFMASTER: add frontend files">
       <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/Services/song.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/Services/song.service.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/models/riff.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/models/riff.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -215,7 +216,8 @@
       <workItem from="1686820558130" duration="622000" />
       <workItem from="1686836941887" duration="14004000" />
       <workItem from="1686898654444" duration="1889000" />
-      <workItem from="1686909268841" duration="15333000" />
+      <workItem from="1686909268841" duration="15817000" />
+      <workItem from="1686937489475" duration="603000" />
     </task>
     <task id="LOCAL-00001" summary="add basic hello world and transfering data to server">
       <created>1679575346987</created>

BIN
Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/domain/Riff.class


BIN
Backend/Spring/target/classes/pl/dmcs/jwoszczyk/domain/Riff.class


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/1.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/10.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/11.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/14.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/2.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/4.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/5.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/7.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/8.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/9.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/index.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/index.pack.old


File diff suppressed because it is too large
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/09ab225c1a846814815302f436b1aaea4be46224e1c1e138428ec8686f2bc9b7.json


File diff suppressed because it is too large
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/1d2fc6a9f9457f808a23f21af6376e4a0db801943575b17cbc13d51142437447.json


File diff suppressed because it is too large
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/22159daa6db4781412c0f1fee56392ab07e887fe808d9e83a3d754bd71f6351d.json


File diff suppressed because it is too large
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/26a8e28f8ec3c7a049ae184516cd43092ddcd5c1af03c7cdcd101575eaeb9790.json


File diff suppressed because it is too large
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/3497e01d55e8bcfefef226959e4d536d587fe8418de5ba460b447b9f7d5d200a.json


File diff suppressed because it is too large
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/602e654b5227bfacd2ae65467fa61a7375c819defe3f99bbf47bd0f3432139f1.json


File diff suppressed because it is too large
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/7259c11c5cddd8d96392f4e9a98d3e16d85800cd15b22222b8ae2f38f768be5b.json


File diff suppressed because it is too large
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/834fe0ba1f57ecde1f08dee0505fb6d70aec535427cb3bf84082910e22a49df5.json


File diff suppressed because it is too large
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/a256e7409eff6c788f115bc55c3696638dc0be70e3b79542b290b2df3bff6625.json


File diff suppressed because it is too large
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/a9303472bbd8110d23432f9f03155a69d240a6a0744658bacb4836b53c519258.json


File diff suppressed because it is too large
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/b542d2239e8542e583a29fd56b464e2e9f30b39eb8659c0099d77d38b0fd63fc.json


File diff suppressed because it is too large
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/d6e36bc68a63846c4b7b2fd765af6606441e02aac01394100625018d24dea40f.json


File diff suppressed because it is too large
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/fae1ce2cdaefaac6739942381ba0f9b27c280de60b84a1b9f7666bec77e03a47.json


+ 4 - 2
Frontend/RiffMasterFront/.idea/workspace.xml

@@ -6,7 +6,8 @@
   <component name="ChangeListManager">
     <list default="true" id="d91bc08d-d968-4797-8fb3-ef602a37db2a" name="Changes" comment="RIFFMASTER: add frontend business logic (riff, song)">
       <change beforePath="$PROJECT_DIR$/../../Backend/Spring/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/domain/Riff.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/domain/Riff.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/domain/Riff.class" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/domain/Riff.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/classes/pl/dmcs/jwoszczyk/domain/Riff.class" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/target/classes/pl/dmcs/jwoszczyk/domain/Riff.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -98,7 +99,8 @@
       <workItem from="1686820564623" duration="521000" />
       <workItem from="1686836939723" duration="5206000" />
       <workItem from="1686898660229" duration="4682000" />
-      <workItem from="1686909264196" duration="8088000" />
+      <workItem from="1686909264196" duration="8471000" />
+      <workItem from="1686937499471" duration="774000" />
     </task>
     <task id="LOCAL-00001" summary="RIFFMASTER: add frontend project">
       <created>1685976235580</created>

+ 12 - 0
Frontend/RiffMasterFront/src/app/main-page/main-page.component.css

@@ -87,3 +87,15 @@ body {
   margin-left: 10px; /* Adjust the margin as needed */
 }
 
+.color-container {
+  display: flex;
+  align-items: center;
+}
+
+.color-box {
+  width: 20px;
+  height: 20px;
+  margin-right: 5px;
+}
+
+

+ 7 - 1
Frontend/RiffMasterFront/src/app/main-page/main-page.component.html

@@ -111,9 +111,15 @@
 
         <ng-container matColumnDef="groupColor">
           <th mat-header-cell *matHeaderCellDef>GroupColor</th>
-          <td mat-cell *matCellDef="let riff">{{ riff.groupColor }}</td>
+          <td mat-cell *matCellDef="let riff">
+            <div class="color-container">
+              <span class="color-box" [style.backgroundColor]="getValidColor(riff.groupColor)"></span>
+              <span>{{ riff.groupColor }}</span>
+            </div>
+          </td>
         </ng-container>
 
+
         <tr mat-header-row *matHeaderRowDef="['name', 'startMs', 'endMs', 'groupColor']"></tr>
         <tr mat-row *matRowDef="let row; columns: ['name', 'startMs', 'endMs', 'groupColor']"></tr>
       </table>

+ 5 - 0
Frontend/RiffMasterFront/src/app/main-page/main-page.component.ts

@@ -114,6 +114,11 @@ export class MainPageComponent implements OnInit {
     }
   }
 
+  getValidColor(color: string): string {
+    const validColor = color.startsWith("#") ? color.slice(0, 7) : "";
+    return validColor;
+  }
+
 
   generatePdf() {
     // Implement your PDF generation logic here

Some files were not shown because too many files changed in this diff