diff --git a/src/App.js b/src/App.js index 9a94681..494539e 100644 --- a/src/App.js +++ b/src/App.js @@ -47,7 +47,7 @@ function App() { if (loading) return null; return ( -
+
diff --git a/src/css/index.css b/src/css/index.css index 6643dcf..83650bf 100644 --- a/src/css/index.css +++ b/src/css/index.css @@ -18,6 +18,22 @@ --font-family-mono: monaco, "Consolas", "Lucida Console", monospace; } +.w-100{ + width: 100% !important; +} + +.w-auto{ + width: auto !important; +} + +.f-s0{ + flex-shrink: 0; +} + +.f-g{ + flex-grow: 1; +} + hr{ margin: 1.5rem 0; } @@ -83,7 +99,7 @@ h1, h2, h3, h4, h5, h6 { } .pageTitle{ - margin: 4px; + margin: 7px; } .flex { @@ -112,7 +128,7 @@ tbody tr:hover { } .is-full-screen { - height: 100%; + height: inherit; min-height: unset; } @@ -121,20 +137,34 @@ tbody tr:hover { box-shadow: 0 1px 3px #00000085; } -.bg-triangles{ +body:before{ + content: ' '; + display: block; + position: fixed; + left: 0; + top: 0; + width: 100%; + height: 100%; + opacity: 0.4; background: url(../img/background.svg); + background-repeat: no-repeat; + background-position: 50% 0; background-size: cover; + z-index: -1000; } .dir-column{ + display: flex; flex-direction: column; } .dir-row{ + display: flex; flex-direction: row; } .flex-wrap{ + display: flex; flex-wrap: wrap; } @@ -585,6 +615,10 @@ tbody tr:hover { margin-left: auto !important; } +.ml-20{ + margin-left: 20px !important; +} + .iconButton{ padding: 0.5rem; } @@ -632,4 +666,66 @@ tbody tr:hover { /* Show the tooltip text when you mouse over the tooltip container */ .tooltip:focus .tooltiptext { visibility: visible; +} +.drop-container { + position: relative; + display: flex; + gap: 10px; + flex-direction: column; + justify-content: center; + align-items: center; + height: 200px; + padding: 20px; + border-radius: 10px; + border: 2px dashed #555; + color: var(--font-color); + cursor: pointer; + transition: background .2s ease-in-out, border .2s ease-in-out; +} + +.drop-container:hover { + background: rgba(238, 238, 238, 0.048); + border-color: var(--bg-color) +} + +.drop-container input[type=file]{ + width: auto !important; +} + +.drop-container input[type=file]:focus{ + border: none !important; +} + +.drop-title { + font-size: 20px; + font-weight: bold; + text-align: center; + transition: color .2s ease-in-out; +} + +input[type=file] { + width: 350px; + max-width: 100%; + padding: 5px; + border: none !important; +} + +input[type=file]::file-selector-button { + background: var(--color-lightGrey); + border: 1px solid transparent; + border-radius: 4px; + color: var(--color-darkGrey); + cursor: pointer; + display: inline-block; + font-size: var(--font-size); + line-height: 1; + padding: 1rem 2.5rem; + text-align: center; + text-decoration: none; + transform: scale(1); + transition: opacity .2s ease; +} + +input[type=file]::file-selector-button:hover { + opacity: .8; } \ No newline at end of file diff --git a/src/css/pages/Home.css b/src/css/pages/Home.css index e1f83fa..f608e1e 100644 --- a/src/css/pages/Home.css +++ b/src/css/pages/Home.css @@ -3,4 +3,8 @@ /* height: 100%; */ margin: 10px; background-color: var(--background-secondary); +} +.pfp-wrapper{ + gap: 20px; + flex-wrap: wrap; } \ No newline at end of file diff --git a/src/css/pages/Login.css b/src/css/pages/Login.css index ce679fc..fb92f44 100644 --- a/src/css/pages/Login.css +++ b/src/css/pages/Login.css @@ -1,5 +1,9 @@ .third-party-login{ cursor: pointer; + display: flex; + flex-direction: column; + align-items: center; + font-size: 14px; } input{ margin-bottom: 1rem; @@ -35,4 +39,9 @@ input{ } .main-content.login{ margin-top: 0; + height: 100%; + min-height: 100vh; +} +.main-content.login>div:first-child{ + height: calc(100vh - 55.6px) } \ No newline at end of file diff --git a/src/pages/Home.js b/src/pages/Home.js index 3bd67d9..38fca3a 100644 --- a/src/pages/Home.js +++ b/src/pages/Home.js @@ -89,15 +89,24 @@ const Profile = () => {

Profile

- -

Profile Picture

- -
- - -
- -

3rd party connections

+
+
+

Profile Picture

+ +
+
+

Change Profile Picture

+
+ + +
+
+
+

Third party connections

@@ -122,7 +131,7 @@ const Profile = () => { -

Two Factor: {user.twoFactor ? 'enabled' : 'disabled'}

+

Two Factor: {user.twoFactor ? 'enabled' : 'disabled'}

diff --git a/src/pages/Login.js b/src/pages/Login.js index d7abdd3..53e0cb8 100644 --- a/src/pages/Login.js +++ b/src/pages/Login.js @@ -113,16 +113,15 @@ const TwoFactor = () => {

Verification Code

{fail ?

Invalid code

: null} -
+ - +
; }; const Login = () => { - document.body.classList.add('bg-triangles'); return
diff --git a/src/pages/Users.js b/src/pages/Users.js index 5f1cfab..29b350b 100644 --- a/src/pages/Users.js +++ b/src/pages/Users.js @@ -55,7 +55,7 @@ const Permissions = ({ perms }) => { } return
-

Permissions

+

Permissions

    {elements}
@@ -121,7 +121,7 @@ const User = ({ user }) => { }}>Back

User {user.id}

-
+
{user.disabled ? : }
@@ -141,7 +141,7 @@ const User = ({ user }) => { -

Applications

+

Applications

} /> } />