From 5ff0ae5dc5ac5cb4962fddcd4b2d4ba48559018b Mon Sep 17 00:00:00 2001
From: bertapasamontes <bertapasamontes@gmail.com>
Date: Mon, 24 Feb 2025 16:49:38 +0100
Subject: [PATCH 1/2] primer commit + variables bootstrap personalizadas

---
 angular.json                                  |  4 +++-
 src/app/app.component.html                    | 10 ++++----
 src/app/app.component.scss                    |  3 +++
 .../shared/header/header.component.html       | 23 ++++++++++++++-----
 .../shared/header/header.component.scss       | 12 ++++++++--
 src/assets/_variables.scss                    | 10 ++++++++
 src/styles.scss                               | 17 +++++++-------
 7 files changed, 58 insertions(+), 21 deletions(-)
 create mode 100644 src/assets/_variables.scss

diff --git a/angular.json b/angular.json
index ecf9dab..25a6ce7 100644
--- a/angular.json
+++ b/angular.json
@@ -33,7 +33,9 @@
               "@angular/material/prebuilt-themes/purple-green.css",
               "src/styles.scss",
               "node_modules/bootstrap/dist/css/bootstrap.min.css",
-              "node_modules/ngx-toastr/toastr.css"
+              "node_modules/ngx-toastr/toastr.css",
+              "src/assets/_variables.scss"
+
             ],
             "scripts": [
               "node_modules/jquery/dist/jquery.min.js",
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 07c7461..9d17228 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,4 +1,6 @@
-<app-header></app-header>
-<!-- <div class="container"> -->
-    <router-outlet></router-outlet>
-<!-- </div> -->
\ No newline at end of file
+<div class="container-fluid m-0">
+    <div class="row">
+    <div class="col-md-3 col-lg-2"><app-header></app-header></div>
+    <div class="col-md-9 col-lg-10 container pt-5"><router-outlet></router-outlet></div>
+</div>
+</div>
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index e69de29..086d372 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -0,0 +1,3 @@
+.container-fluid{
+    padding: 0px !important;
+}
\ No newline at end of file
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index 0458bf2..6e047a0 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -1,9 +1,7 @@
-<nav class="navbar navbar-expand-lg mx-4 my-3">
-    <div class="container-fluid">
-        <a class="navbar-brand" routerLink="/home">8. Inprocode</a>
-    </div>
-    <div class="collapse navbar-collapse">
-        <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+<nav class="navbar">
+    <a class="navbar-brand" routerLink="/home">Michi's Dashboard</a>
+    <div class="row">
+        <ul class="navbar-nav">
             <li class="nav-item">
                 <a class="nav-link active" aria-current="page"  routerLink="/home">Data</a>
               </li>
@@ -18,4 +16,17 @@
               </li>
         </ul>
     </div>
+    <div class="row">
+        <ul class="navbar-nav">
+            <li class="nav-item">
+                <a class="nav-link active" aria-current="page">Ver Michi</a>
+              </li>
+            <li class="nav-item">
+              <a class="nav-link active" aria-current="page">Configuración</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link active" aria-current="page">Cerrar Sesión</a>
+            </li>
+        </ul>
+    </div>
 </nav>
\ No newline at end of file
diff --git a/src/app/components/shared/header/header.component.scss b/src/app/components/shared/header/header.component.scss
index 0665dc6..356958e 100644
--- a/src/app/components/shared/header/header.component.scss
+++ b/src/app/components/shared/header/header.component.scss
@@ -1,3 +1,11 @@
-.nav-link:hover{
-    color: rgb(195, 135, 25) !important;
+.navbar{
+    background-color: #e0cafc;
+    padding: 20px;
+    height: 100vh;
+}
+.nav-item :hover{
+    background-color: #c2a8e4;
+    color: #906fbb;
+    padding: 10px 5px;
+    border-radius: 20px;
 }
\ No newline at end of file
diff --git a/src/assets/_variables.scss b/src/assets/_variables.scss
new file mode 100644
index 0000000..ee0f410
--- /dev/null
+++ b/src/assets/_variables.scss
@@ -0,0 +1,10 @@
+$primary: #F17A12;
+$secondary: #2C3E50;
+$success: #4CAF50;
+$danger: #E74C3C;
+$warning: #F1C40F;
+$info: #3498DB;
+$light: #ECF0F1;
+$dark: #1A1A1A;
+
+@import "bootstrap/scss/bootstrap";
\ No newline at end of file
diff --git a/src/styles.scss b/src/styles.scss
index 7a24afa..03a5eca 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1,13 +1,14 @@
 /* You can add global styles to this file, and also import other style files */
 @font-face {
-    font-family: 'Material Symbols Outlined';
-    font-style: normal;
-    src: url(https://example.com/material-symbols.woff) format('woff');
-  }
-  @import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Special+Elite&display=swap');
+  font-family: 'Material Symbols Outlined';
+  font-style: normal;
+  src: url(https://example.com/material-symbols.woff) format('woff');
+}
+@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Special+Elite&display=swap');
+
 * {
-  font-family: 'Poppins';
-  color: #252525;
-  }
+font-family: 'Poppins';
+}
+
 html, body { height: 100%; }
 body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }

From 8a64d2e4712ecc6952cfd8b6deb3469707dda5b3 Mon Sep 17 00:00:00 2001
From: bertapasamontes <bertapasamontes@gmail.com>
Date: Mon, 24 Feb 2025 16:50:52 +0100
Subject: [PATCH 2/2] Revert "primer commit + variables bootstrap
 personalizadas"

This reverts commit 5ff0ae5dc5ac5cb4962fddcd4b2d4ba48559018b.
---
 angular.json                                  |  4 +---
 src/app/app.component.html                    | 10 ++++----
 src/app/app.component.scss                    |  3 ---
 .../shared/header/header.component.html       | 23 +++++--------------
 .../shared/header/header.component.scss       | 12 ++--------
 src/assets/_variables.scss                    | 10 --------
 src/styles.scss                               | 17 +++++++-------
 7 files changed, 21 insertions(+), 58 deletions(-)
 delete mode 100644 src/assets/_variables.scss

diff --git a/angular.json b/angular.json
index 25a6ce7..ecf9dab 100644
--- a/angular.json
+++ b/angular.json
@@ -33,9 +33,7 @@
               "@angular/material/prebuilt-themes/purple-green.css",
               "src/styles.scss",
               "node_modules/bootstrap/dist/css/bootstrap.min.css",
-              "node_modules/ngx-toastr/toastr.css",
-              "src/assets/_variables.scss"
-
+              "node_modules/ngx-toastr/toastr.css"
             ],
             "scripts": [
               "node_modules/jquery/dist/jquery.min.js",
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 9d17228..07c7461 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,6 +1,4 @@
-<div class="container-fluid m-0">
-    <div class="row">
-    <div class="col-md-3 col-lg-2"><app-header></app-header></div>
-    <div class="col-md-9 col-lg-10 container pt-5"><router-outlet></router-outlet></div>
-</div>
-</div>
+<app-header></app-header>
+<!-- <div class="container"> -->
+    <router-outlet></router-outlet>
+<!-- </div> -->
\ No newline at end of file
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index 086d372..e69de29 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -1,3 +0,0 @@
-.container-fluid{
-    padding: 0px !important;
-}
\ No newline at end of file
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index 6e047a0..0458bf2 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -1,7 +1,9 @@
-<nav class="navbar">
-    <a class="navbar-brand" routerLink="/home">Michi's Dashboard</a>
-    <div class="row">
-        <ul class="navbar-nav">
+<nav class="navbar navbar-expand-lg mx-4 my-3">
+    <div class="container-fluid">
+        <a class="navbar-brand" routerLink="/home">8. Inprocode</a>
+    </div>
+    <div class="collapse navbar-collapse">
+        <ul class="navbar-nav me-auto mb-2 mb-lg-0">
             <li class="nav-item">
                 <a class="nav-link active" aria-current="page"  routerLink="/home">Data</a>
               </li>
@@ -16,17 +18,4 @@
               </li>
         </ul>
     </div>
-    <div class="row">
-        <ul class="navbar-nav">
-            <li class="nav-item">
-                <a class="nav-link active" aria-current="page">Ver Michi</a>
-              </li>
-            <li class="nav-item">
-              <a class="nav-link active" aria-current="page">Configuración</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link active" aria-current="page">Cerrar Sesión</a>
-            </li>
-        </ul>
-    </div>
 </nav>
\ No newline at end of file
diff --git a/src/app/components/shared/header/header.component.scss b/src/app/components/shared/header/header.component.scss
index 356958e..0665dc6 100644
--- a/src/app/components/shared/header/header.component.scss
+++ b/src/app/components/shared/header/header.component.scss
@@ -1,11 +1,3 @@
-.navbar{
-    background-color: #e0cafc;
-    padding: 20px;
-    height: 100vh;
-}
-.nav-item :hover{
-    background-color: #c2a8e4;
-    color: #906fbb;
-    padding: 10px 5px;
-    border-radius: 20px;
+.nav-link:hover{
+    color: rgb(195, 135, 25) !important;
 }
\ No newline at end of file
diff --git a/src/assets/_variables.scss b/src/assets/_variables.scss
deleted file mode 100644
index ee0f410..0000000
--- a/src/assets/_variables.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-$primary: #F17A12;
-$secondary: #2C3E50;
-$success: #4CAF50;
-$danger: #E74C3C;
-$warning: #F1C40F;
-$info: #3498DB;
-$light: #ECF0F1;
-$dark: #1A1A1A;
-
-@import "bootstrap/scss/bootstrap";
\ No newline at end of file
diff --git a/src/styles.scss b/src/styles.scss
index 03a5eca..7a24afa 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1,14 +1,13 @@
 /* You can add global styles to this file, and also import other style files */
 @font-face {
-  font-family: 'Material Symbols Outlined';
-  font-style: normal;
-  src: url(https://example.com/material-symbols.woff) format('woff');
-}
-@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Special+Elite&display=swap');
-
+    font-family: 'Material Symbols Outlined';
+    font-style: normal;
+    src: url(https://example.com/material-symbols.woff) format('woff');
+  }
+  @import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Special+Elite&display=swap');
 * {
-font-family: 'Poppins';
-}
-
+  font-family: 'Poppins';
+  color: #252525;
+  }
 html, body { height: 100%; }
 body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }