Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ui improvements #75

Merged
merged 16 commits into from
Aug 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/css/style.css

Large diffs are not rendered by default.

106 changes: 13 additions & 93 deletions public/css/tailwind.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ html,
body {
margin: 0;
padding: 0;
width: 100%;
height: 100%;
min-height: 100vh;
min-width: 100vw;
overflow-x: hidden;
box-sizing: border-box;
background: linear-gradient(122.51deg, #e6ecfc 30%, #7fb4f1 100%) !important;
scroll-behavior: smooth;
}

@tailwind components;
Expand All @@ -24,86 +25,15 @@ body {
width: 75vw;
}

.tradebyte-logo {
color: #1955e4;
text-shadow: 1px 2px 40px rgba(0, 0, 0, 0.5);
}

.line {
border: 1.5px solid #8e9aad;
}

.user-profile {
border-radius: 100px;
border: 10px solid #1955e4;
}

.tick {
height: 20px;
width: 20px;
border-radius: 50%;
background-color: #38cda0;
color: white;
}

.tick-background {
background: #a9f7e6;
border-radius: 29px;
color: #1b9b7f;
}

.tab-color {
border-radius: 10px;
border-color: #1955e4;
color: #1955e4;
}

.view-link {
color: #1955e4;
}

.view-link:hover {
color: #0d338a;
}

.button {
background-color: #1955e4;
}

.button:hover {
background-color: #0d338a;
}

.table-content {
overflow: scroll;
overflow-x: scroll;
overflow-y: auto;
}

.transaction-companySymbol {
color: rgb(0, 0, 0);
font-weight: 700;
font-size: 1.1rem;
}

.transaction-input:focus {
outline: none;
}

.transaction-cancel {
background-color: rgb(246, 76, 76);
}

.transaction-cancel:hover {
background-color: rgb(208, 7, 7);
}

.transaction-buy {
background-color: #52af93;
input::-webkit-outer-spin-button.without-arrow,
input::-webkit-inner-spin-button.without-arrow {
-webkit-appearance: none;
margin: 0;
}

.transaction-buy:hover {
background-color: #089e7e;
/* Firefox */
input[type="number"].without-arrow {
-moz-appearance: textfield;
}

.symbolicon {
Expand All @@ -114,11 +44,6 @@ body {
-webkit-text-fill-color: transparent;
}

.notification {
position: relative;
display: inline-block;
}

.notification .badge {
position: absolute;
top: -5px;
Expand All @@ -129,14 +54,9 @@ body {
color: white;
}

.min-w {
min-width: 400px;
}

@media (max-width: 400px) {
.min-w {
min-width: 300px;
}
/* search bar */
#searchbar:focus .search-list {
display: block;
}

/* Login Page */
Expand Down
2 changes: 1 addition & 1 deletion tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { colors } = require('tailwindcss/defaultTheme')
const { colors } = require("tailwindcss/defaultTheme");

module.exports = {
purge: {
Expand Down
3 changes: 2 additions & 1 deletion views/addBalance.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
Add Balance
</h2>
</div>
<hr class="line" />

<hr class="border-2 border-gray-700" />

<div class="container py-16 mx-auto">
<h3 class="text-2xl">Your Balance:<b> <%= user.balance%> </b></h3>
Expand Down
2 changes: 1 addition & 1 deletion views/edit.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
>
</header>

<hr class="line my-4 mb-8" />
<hr class="border-2 border-gray-700 my-4 mb-8" />

<!--form -->

Expand Down
49 changes: 29 additions & 20 deletions views/layouts/app.ejs
Original file line number Diff line number Diff line change
@@ -1,24 +1,33 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0-2/css/all.min.css"
integrity="sha256-46r060N2LrChLLb5zowXQ72/iKKNiw/lAmygmHExk/o="
crossorigin="anonymous"
/>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/Chart.min.js"></script>

<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0-2/css/all.min.css"
integrity="sha256-46r060N2LrChLLb5zowXQ72/iKKNiw/lAmygmHExk/o=" crossorigin="anonymous" />
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/Chart.min.js"></script>
<link type="text/css" rel="stylesheet" href="../css/style.css" />
<link rel="stylesheet" href="../css/tailwind.css" />
<link
rel="shortcut icon"
href="../images/TradeByte-Favicon.png"
type="image/x-icon"
/>
<title>TradeByte</title>
</head>

<link type="text/css" rel="stylesheet" href="../css/style.css" />
<link rel="stylesheet" href="../css/tailwind.css">
<link rel="shortcut icon" href="../images/TradeByte-Favicon.png" type="image/x-icon">
<title>TradeByte</title>
</head>

<body>
<div class="md:flex flex-col md:flex-row min-h-screen w-full">
<%- include('../partials/_nav.ejs') %> <%- body %>
</div>
<script type="application/javascript" src="../javascript/script.js"></script>
</body>

</html>
<body>
<div class="md:flex flex-col md:flex-row w-full">
<%- include('../partials/_nav.ejs') %> <%- body %>
</div>
<script
type="application/javascript"
src="../javascript/script.js"
></script>
</body>
</html>
2 changes: 1 addition & 1 deletion views/layouts/login.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<title>TradeByte</title>
</head>

<body class="flex justify-center items-center w-screen">
<body class="flex justify-center items-center min-h-screen">
<%- body %>

<script src="javascript/script.js"></script>
Expand Down
23 changes: 15 additions & 8 deletions views/login.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="flex flex-row items-center justify-between p-4">
<a href="#" class="flex-shrink-0 text-center">
<img
class="h-8 w-8 tradebyte-logo"
class="h-8 w-8"
src="../images/TradeByte-Favicon.png"
alt="Logo"
/>
Expand Down Expand Up @@ -286,9 +286,15 @@
class="text-gray-600 serif font-normal italic px-6 py-6 md:py-12 lg:px-16 md:py-6 text-md lg:text-xl"
x-show.transition="testimonialActive == 3"
>
It was really good collaborating with a team while learning a
stack together. Luckily, we had a good mentor who guided us
all
I had a great learning experience here, and throughout the
Uplift project we develop 3 apps including the main project.
Pavan Gandhi our mentor, he created a well organised
curriculum which Cover all the basics topics to the advance
topics needed to create the main project. And also he managed
us and assigned us task according to our area of interest. And
also had a great team members and i was great to work with
these guys and we may do some other projects together in
future.
</p>
</div>

Expand Down Expand Up @@ -321,10 +327,11 @@
class="text-gray-600 serif font-normal italic px-6 py-6 md:py-12 lg:px-16 md:py-6 text-md lg:text-xl"
x-show.transition="testimonialActive == 6"
>
I had fun learning Node and making a project at last which
turned out really well. I learned many things about backend
and contribution while working with TradeByte team. It was a
good experience.
Tradebyte was my lovely project on working with open-source
technologies and following AGILE principles we had awesome
learnings and delivering the code on Fly. kudos to the team
for helping each other and making it to the production-ready
app.
</p>
</div>
</div>
Expand Down
Loading