Merge pull request #3 from oslabs-beta/modularization

Modularization
open-source-labs · Apr 29, 2024 · 5f874ce · 5f874ce
2 parents f918bf6 + b299a5f
commit 5f874ce
Show file tree

Hide file tree

Showing 12 changed files with 468 additions and 411 deletions.
diff --git a/app/assets/search.svg b/app/assets/search.svg
diff --git a/app/components/ApplicationsCard/styles.scss b/app/components/ApplicationsCard/styles.scss
@@ -204,3 +204,45 @@
     height: 55px;
   }
 }
+
+.cardLine {
+  background-color: $grey;
+  width: 85%;
+  border: none;
+  height: 1px;
+  margin-top: 20px;
+  margin-bottom: 15px;
+}
+
+.cardFooter {
+  width: 90%;
+  display: flex;
+  height: 20px;
+  align-items: center;
+  margin-left: 18px;
+}
+
+#cardFooterText {
+  color: $icon;
+  font-size: 11px;
+  margin: 0;
+  margin-left: 10px;
+}
+
+.cardFooterIcon {
+  color: $icon;
+  font-size: 14px;
+  margin: 0;
+}
+
+#databaseName {
+  margin-top: 14px;
+  margin-bottom: 0;
+  font-size: 40px;
+  width: 280px;
+}
+
+#serviceName {
+  font-size: 11px;
+  margin-top: 6px;
+}
diff --git a/app/components/DashboardIcons/styles.scss b/app/components/DashboardIcons/styles.scss
@@ -20,11 +20,127 @@
   color: $ggreen;
   text-align: center;
   border-radius: 6px;
-  // padding: 5px 0;
+  font-size: 12px;
+  position: absolute;
+  z-index: 1;
+  top: 50px;
+  right: -14px;
+}
+
+.dashboardIconArea .dashboardTooltip::after {
+  content: '';
+  position: absolute;
+  bottom: 50px;
+  left: 35px;
+  border-width: 5px;
+  border-style: solid;
+  border-color: transparent transparent $background transparent;
+}
+
+.navIcon {
+  font-size: 34px;
+  vertical-align: middle;
+  text-align: center;
+  color: $icon;
+  background-color: transparent;
+  box-sizing: content-box;
+  border-radius: 50%;
+  line-height: 1.5;
+  white-space: nowrap;
+  outline: 0;
+  border: none;
+  cursor: pointer;
+  position: relative;
+  min-height: auto;
+  white-space: nowrap;
+  margin: 5px;
+  margin-top: 15px;
+  padding: 5px;
+}
+
+#dashboardIcon {
+  margin-top: 4px;
+  margin-left: -35px;
+  font-size: 26px;
+  padding: 8px;
+
+  &:hover {
+    cursor: pointer;
+    box-shadow: $boxshadow3;
+    background-color: $background;
+    color: $ggreen;
+  }
+}
+
+.notificationsIconArea {
+  position: relative;
+  display: inline-block;
+}
+
+.notificationsIconArea:hover .notificationsTooltip {
+  visibility: visible;
+}
+
+.notificationsIconArea .notificationsTooltip {
+  visibility: hidden;
+  width: 80px;
+  background-color: $background;
+  color: $gred;
+  text-align: center;
+  border-radius: 6px;
+  padding: 5px 0;
   font-size: 12px;
   /* Position the tooltip */
   position: absolute;
   z-index: 1;
   top: 50px;
   right: -14px;
+}
+
+.notificationsIconArea .notificationsTooltip::after {
+  content: '';
+  position: absolute;
+  bottom: 37px;
+  left: 35px;
+  border-width: 5px;
+  border-style: solid;
+  border-color: transparent transparent $background transparent;
+}
+
+#notificationsIcon {
+  margin-top: 4px;
+  margin-left: 2px;
+  font-size: 26px;
+  &:hover {
+    cursor: pointer;
+    box-shadow: $boxshadow3;
+    background-color: $background;
+    color: $gred;
+  }
+}
+
+#personIcon {
+  margin-top: 4px;
+  margin-left: 2px;
+  font-size: 26px;
+  &:hover {
+    cursor: pointer;
+    box-shadow: $boxshadow3;
+    background-color: $background;
+    color: $gyellow;
+  }
+}
+
+.personIconArea {
+  position: relative;
+  display: inline-block;
+}
+
+.personIconArea:hover .personTooltip {
+  visibility: visible;
+}
+
+.personIconArea .personTooltip {
+  color: $gyellow;
+  text-align: center;
 }
diff --git a/app/components/FirstLaunch/FirstLaunch.scss b/app/components/FirstLaunch/FirstLaunch.scss
@@ -0,0 +1,147 @@
+@import '../../stylesheets/constants.scss';
+
+.btns {
+  display: flex;
+  justify-content: space-around;
+}
+
+.home {
+  background: $darkblue;
+  display: flex;
+  flex-direction: column;
+  align-content: center;
+  align-items: center;
+  justify-content: flex-start;
+  justify-items: center;
+  position: absolute;
+  margin-left: 50px;
+  padding-top: 160px;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  opacity: 1;
+
+
+  .logo-container {
+    height: auto;
+    width: 40%;
+    max-width: 650px;
+
+    img {
+      width: 100%;
+      transition: 0.3s ease-in;
+
+      &:hover {
+        filter: brightness(0.7);
+      }
+    }
+  }
+
+  h1 {
+    font-size: 325%;
+    letter-spacing: 2px;
+  }
+
+  p {
+    margin: 15px 0;
+    color: white;
+  }
+
+  // Get Started Button
+  .link {
+    font-size: 88%;
+    padding: 10px 17px;
+    letter-spacing: 0.5px;
+    text-decoration: none;
+    border-radius: 30px;
+    background-color: $navy;
+    color: #fff;
+    @include centerWithFlex();
+    transition: 1s;
+    animation: glow linear 4s infinite;
+
+    &:hover {
+      background-color: $hover;
+      opacity: 0.85;
+      animation: none;
+    }
+  }
+}
+
+.welcome {
+  color: rgba(255, 255, 255, 0.801);
+  text-align: center;
+  h1 {
+    margin-bottom: 90px;
+  }
+  h2 {
+    margin-bottom: 33px;
+  }
+  .btns {
+    display: flex;
+    justify-content: space-around;
+  }
+  form {
+    flex-direction: column;
+    label {
+      width: 50%;
+      input {
+        padding: 5px 7px;
+        margin: 2px 0;
+        width: 100%;
+      }
+    }
+    button.needAccount {
+      all: initial;
+      font-family: 'Roboto';
+      color: rgba(255, 255, 255, 0.801);
+      cursor: pointer;
+    }
+  }
+}
+
+@keyframes fadeIn {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
+@-moz-keyframes fadeIn {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
+@-webkit-keyframes fadeIn {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
+@-o-keyframes fadeIn {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
+@-ms-keyframes fadeIn {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
diff --git a/app/components/FirstLaunch.tsx → app/components/FirstLaunch/FirstLaunch.tsx b/app/components/FirstLaunch.tsx → app/components/FirstLaunch/FirstLaunch.tsx
@@ -1,5 +1,6 @@
 import React, { useContext } from 'react';
-import { DashboardContext } from '../context/DashboardContext';
+import { DashboardContext } from '../../context/DashboardContext';
+import './FirstLaunch.scss'
 
 //  THIS FILE IS NOT DOING ANYTHING RIGHT NOW
 const FirstLaunch: React.FC = React.memo(() => {
@@ -8,7 +9,7 @@ const FirstLaunch: React.FC = React.memo(() => {
   return (
     <div className="home">
       <div className="welcome" data-testid="FirstLaunch">
-        <h1 className="welcomeMessage">Welcome to Chronos!</h1>
+        <h1>Welcome to Chronos!</h1>
         <h2>Would you like authentication?</h2>
         <div className="btns">
           <button className="link" onClick={() => updateLandingPage('createAdmin')}>