Răsfoiți Sursa

RIFFMASTER: add orange theme to login and register page

= 2 ani în urmă
părinte
comite
66db573ee0
36 a modificat fișierele cu 165 adăugiri și 10 ștergeri
  1. 3 3
      Backend/Spring/.idea/workspace.xml
  2. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/1.pack
  3. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/10.pack
  4. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/11.pack
  5. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/12.pack
  6. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/13.pack
  7. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/2.pack
  8. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/3.pack
  9. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/4.pack
  10. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/5.pack
  11. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/6.pack
  12. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/7.pack
  13. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/8.pack
  14. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/9.pack
  15. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/index.pack
  16. BIN
      Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/index.pack.old
  17. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/096b5502452952b4992ba7a3d3a00ddedc84398cb0be93d5af792b3395440056.json
  18. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/0d8875b665a2d5fd5a3b8e342ee71c3c2d63377938c46cc3252040ad2c833f99.json
  19. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/1291fc245f85f3b4f1ae7ae6df3db6a376cb30ce23fb63211d2547214b672423.json
  20. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/2f84913250136d2bdcfe85a419a927656be372a376c2ca068b4ca7cf4cca1251.json
  21. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/3635e816cbdcde128170985fea1f05ae7ad248d6cdced48154343ccc106b0daf.json
  22. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/50bc0ea9344a9a3fbd651a4e369c9005012073f21657ed1079f09e9d4be26f92.json
  23. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/7dd07caf84399f356db7e4898a35fac7f90beae124213221d9cdfba4dfe7aae5.json
  24. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/a95205671dfbd639de09c49aef148a66120cf5663c173827a0fae209b8b141f3.json
  25. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/c725518ffe41b901ee0a65d623e359e569f387f5042f41ba6acd66ff57c157d7.json
  26. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/d610e5f83bc919b27815d07242d21251b74cbccbb9241f7781ef95012d8a38f7.json
  27. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/db4a371506253a7ffee37b52d537b418092f1b19baf9f479ced9afb4820cef5a.json
  28. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/fbe905622e8b38736707e67e3f8f315a219f61bb029e6c29377b657b2bc4cf1d.json
  29. 0 0
      Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/fdafc46a71242bdea69b22c1ca38fbbc8de4c98769f2b7103a8dde61a609fa69.json
  30. 1 1
      Frontend/RiffMasterFront/.idea/workspace.xml
  31. 54 0
      Frontend/RiffMasterFront/src/app/login-page/login-page.component.css
  32. 0 2
      Frontend/RiffMasterFront/src/app/login-page/login-page.component.html
  33. 2 2
      Frontend/RiffMasterFront/src/app/main-page/main-page.component.html
  34. 54 0
      Frontend/RiffMasterFront/src/app/register-page/register-page.component.css
  35. 46 1
      Frontend/RiffMasterFront/src/app/register-page/register-page.component.html
  36. 5 1
      Frontend/RiffMasterFront/src/styles.css

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

@@ -14,9 +14,9 @@
       <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/index.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/index.pack" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/index.pack.old" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/index.pack.old" afterDir="false" />
       <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/app.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/app.component.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/app.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/app.component.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/login-page/login-page.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/login-page/login-page.component.html" 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/register-page/register-page.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/register-page/register-page.component.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/register-page/register-page.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/register-page/register-page.component.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/styles.css" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/styles.css" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />

BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/1.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/10.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/11.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/12.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/13.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/2.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/3.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/4.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/5.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/6.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/7.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/8.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/9.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/index.pack


BIN
Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/6fc734508214cf082987b690b9c397dd93e8a65f/index.pack.old


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/096b5502452952b4992ba7a3d3a00ddedc84398cb0be93d5af792b3395440056.json


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/0d8875b665a2d5fd5a3b8e342ee71c3c2d63377938c46cc3252040ad2c833f99.json


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/1291fc245f85f3b4f1ae7ae6df3db6a376cb30ce23fb63211d2547214b672423.json


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/2f84913250136d2bdcfe85a419a927656be372a376c2ca068b4ca7cf4cca1251.json


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/3635e816cbdcde128170985fea1f05ae7ad248d6cdced48154343ccc106b0daf.json


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/50bc0ea9344a9a3fbd651a4e369c9005012073f21657ed1079f09e9d4be26f92.json


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/7dd07caf84399f356db7e4898a35fac7f90beae124213221d9cdfba4dfe7aae5.json


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/a95205671dfbd639de09c49aef148a66120cf5663c173827a0fae209b8b141f3.json


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/c725518ffe41b901ee0a65d623e359e569f387f5042f41ba6acd66ff57c157d7.json


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/d610e5f83bc919b27815d07242d21251b74cbccbb9241f7781ef95012d8a38f7.json


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/db4a371506253a7ffee37b52d537b418092f1b19baf9f479ced9afb4820cef5a.json


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/fbe905622e8b38736707e67e3f8f315a219f61bb029e6c29377b657b2bc4cf1d.json


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
Frontend/RiffMasterFront/.angular/cache/16.0.4/babel-webpack/fdafc46a71242bdea69b22c1ca38fbbc8de4c98769f2b7103a8dde61a609fa69.json


+ 1 - 1
Frontend/RiffMasterFront/.idea/workspace.xml

@@ -83,7 +83,7 @@
       <workItem from="1686320426184" duration="4172000" />
       <workItem from="1686487159086" duration="10000" />
       <workItem from="1686487225522" duration="522000" />
-      <workItem from="1686571863797" duration="5621000" />
+      <workItem from="1686571863797" duration="7208000" />
     </task>
     <task id="LOCAL-00001" summary="RIFFMASTER: add frontend project">
       <created>1685976235580</created>

+ 54 - 0
Frontend/RiffMasterFront/src/app/login-page/login-page.component.css

@@ -0,0 +1,54 @@
+/* global.css */
+
+.container {
+  display: flex;
+}
+
+.margin-column {
+  flex: 1;
+}
+
+.col-left {
+  flex: 1;
+}
+
+.col-right {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.login-card {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.login-card mat-card-content {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+.mat-form-field {
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.signup-link {
+  margin-bottom: 10px;
+  text-align: center;
+}
+
+.signup-link a {
+  color: orange;
+  text-decoration: none;
+}
+
+.login-button {
+  width: 100%;
+  background-color: orange;
+  color: black;
+  margin-bottom: 10px;
+}

+ 0 - 2
Frontend/RiffMasterFront/src/app/login-page/login-page.component.html

@@ -26,8 +26,6 @@
         <button mat-raised-button color="primary" class="login-button">
           Login
         </button>
-
-
       </mat-card-content>
     </mat-card>
   </div>

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

@@ -40,12 +40,12 @@
 
       <div class="button-row">
 
-        <button mat-raised-button color="primary" (click)="download()">
+        <button mat-raised-button  (click)="download()">
           <mat-icon>cloud_download</mat-icon>
           Download
         </button>
 
-        <button mat-raised-button color="primary" (click)="upload()">
+        <button mat-raised-button color="accent" (click)="upload()">
           <mat-icon>cloud_upload</mat-icon>
           Upload
         </button>

+ 54 - 0
Frontend/RiffMasterFront/src/app/register-page/register-page.component.css

@@ -0,0 +1,54 @@
+/* global.css */
+
+.container {
+  display: flex;
+}
+
+.margin-column {
+  flex: 1;
+}
+
+.col-left {
+  flex: 1;
+}
+
+.col-right {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.login-card {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.login-card mat-card-content {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+.mat-form-field {
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.signup-link {
+  margin-bottom: 10px;
+  text-align: center;
+}
+
+.signup-link a {
+  color: orange;
+  text-decoration: none;
+}
+
+.login-button {
+  width: 100%;
+  background-color: orange;
+  color: black;
+  margin-bottom: 10px;
+}

+ 46 - 1
Frontend/RiffMasterFront/src/app/register-page/register-page.component.html

@@ -1 +1,46 @@
-<p>register-page works!</p>
+<!-- register.component.html -->
+
+<div class="container">
+  <div class="margin-column"></div> <!-- First margin column -->
+
+  <div class="col-left">
+    <mat-card class="login-card">
+      <mat-card-header>
+        <mat-card-title>Register</mat-card-title>
+      </mat-card-header>
+      <mat-card-content>
+        <mat-form-field appearance="fill">
+          <mat-label>Email</mat-label>
+          <input matInput type="email" placeholder="Enter your email">
+        </mat-form-field>
+
+        <mat-form-field appearance="fill">
+          <mat-label>Password</mat-label>
+          <input matInput type="password" placeholder="Enter your password">
+        </mat-form-field>
+
+        <mat-form-field appearance="fill">
+          <mat-label>Confirm Password</mat-label>
+          <input matInput type="password" placeholder="Confirm your password">
+        </mat-form-field>
+
+        <div class="signup-link">
+          Already have an account? <a [routerLink]="['/login']">Login</a>
+        </div>
+
+        <button mat-raised-button color="primary" class="login-button">
+          Register
+        </button>
+
+      </mat-card-content>
+    </mat-card>
+  </div>
+
+  <div class="col-right">
+    <div class="buttons-container">
+      <!-- Empty column for alignment purposes -->
+    </div>
+  </div>
+
+  <div class="margin-column"></div> <!-- Second margin column -->
+</div>

+ 5 - 1
Frontend/RiffMasterFront/src/styles.css

@@ -1,5 +1,7 @@
 /* You can add global styles to this file, and also import other style files */
 
+
+
 html, body { height: 100%; }
 body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
 
@@ -38,13 +40,15 @@ button[type="submit"] {
   width: 100%;
   padding: 10px;
   font-size: 16px;
-  background-color: #4CAF50;
+  background-color: orange !important;
   color: white;
   border: none;
   border-radius: 5px;
   cursor: pointer;
 }
 
+
+
 button[type="submit"]:hover {
   background-color: orange;
 }

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff