Skip to content

Commit

Permalink
approve and team create
Browse files Browse the repository at this point in the history
  • Loading branch information
Arkadius-WD committed Oct 27, 2023
1 parent a56a831 commit 65460c8
Show file tree
Hide file tree
Showing 24 changed files with 258 additions and 27 deletions.
65 changes: 62 additions & 3 deletions dist/approvals.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
crossorigin="anonymous"
defer
></script>
<script type="module" crossorigin src="./assets/main-64d467c2.js"></script>
<link rel="stylesheet" href="./assets/index-21b70a9a.css">
<script type="module" crossorigin src="./assets/main-7700b10d.js"></script>
<link rel="stylesheet" href="./assets/index-bc30aaf2.css">
</head>

<body>
Expand Down Expand Up @@ -145,7 +145,66 @@
<h2>Approvals</h2>
</div>
</header>
<div class="calendar-window window"></div>
<div class="approval window">
<div class="approvals">
<h3>Project #0015</h3>
<ul class="approvals__container">
<li class="approvals__approval">
<div class="approvals__approval-icon">
<i class="fa-regular fa-thumbs-up"></i>
</div>
<div class="approvals__approval-title">
<p>Approval 1</p>
</div>
<div class="approvals__approval-project">
<p>Olivia Braun</p>
<img src="./assets/4-4c5bd68c.jpeg" alt="avatar" />
</div>
</li>
<li class="approvals__approval">
<div class="approvals__approval-icon">
<i class="fa-regular fa-thumbs-up"></i>
</div>
<div class="approvals__approval-title">
<p>Approval 2</p>
</div>
<div class="approvals__approval-project">
<p>Emma Smith</p>
<img src="./assets/5-01d5527f.jpeg" alt="avatar" />
</div>
</li>
<li class="approvals__approval">
<div class="approvals__approval-icon">
<i class="fa-regular fa-thumbs-up"></i>
</div>
<div class="approvals__approval-title">
<p>Approval 3</p>
</div>
<div class="approvals__approval-project">
<p>Liam Johnson</p>
<img src="./assets/6-b7d0e6de.jpg" alt="avatar" />
</div>
</li>
</ul>
</div>
<div class="approvals">
<h3>Project #0016</h3>
<ul class="approvals__container">
<li class="approvals__approval">
<div class="approvals__approval-icon">
<i class="fa-regular fa-thumbs-up"></i>
</div>
<div class="approvals__approval-title">
<p>Approval 1</p>
</div>
<div class="approvals__approval-project">
<p>Emma Smith</p>
<img src="./assets/5-01d5527f.jpeg" alt="avatar" />
</div>
</li>
</ul>
</div>
</div>
</section>
<section class="comunicator">
<div class="talks talks-hidden">
Expand Down
Binary file added dist/assets/1-f461cdf1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/assets/2-912f0f8a.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/assets/3-33d58c6f.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/assets/4-4c5bd68c.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/assets/5-01d5527f.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/assets/6-b7d0e6de.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

File renamed without changes.
4 changes: 2 additions & 2 deletions dist/budget.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
crossorigin="anonymous"
defer
></script>
<script type="module" crossorigin src="./assets/main-64d467c2.js"></script>
<link rel="stylesheet" href="./assets/index-21b70a9a.css">
<script type="module" crossorigin src="./assets/main-7700b10d.js"></script>
<link rel="stylesheet" href="./assets/index-bc30aaf2.css">
</head>

<body>
Expand Down
4 changes: 2 additions & 2 deletions dist/calendar.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
crossorigin="anonymous"
defer
></script>
<script type="module" crossorigin src="./assets/main-64d467c2.js"></script>
<link rel="stylesheet" href="./assets/index-21b70a9a.css">
<script type="module" crossorigin src="./assets/main-7700b10d.js"></script>
<link rel="stylesheet" href="./assets/index-bc30aaf2.css">
</head>

<body>
Expand Down
4 changes: 2 additions & 2 deletions dist/files.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
crossorigin="anonymous"
defer
></script>
<script type="module" crossorigin src="./assets/main-64d467c2.js"></script>
<link rel="stylesheet" href="./assets/index-21b70a9a.css">
<script type="module" crossorigin src="./assets/main-7700b10d.js"></script>
<link rel="stylesheet" href="./assets/index-bc30aaf2.css">
</head>

<body>
Expand Down
4 changes: 2 additions & 2 deletions dist/git.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
crossorigin="anonymous"
defer
></script>
<script type="module" crossorigin src="./assets/main-64d467c2.js"></script>
<link rel="stylesheet" href="./assets/index-21b70a9a.css">
<script type="module" crossorigin src="./assets/main-7700b10d.js"></script>
<link rel="stylesheet" href="./assets/index-bc30aaf2.css">
</head>

<body>
Expand Down
4 changes: 2 additions & 2 deletions dist/history.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
crossorigin="anonymous"
defer
></script>
<script type="module" crossorigin src="./assets/main-64d467c2.js"></script>
<link rel="stylesheet" href="./assets/index-21b70a9a.css">
<script type="module" crossorigin src="./assets/main-7700b10d.js"></script>
<link rel="stylesheet" href="./assets/index-bc30aaf2.css">
</head>

<body>
Expand Down
4 changes: 2 additions & 2 deletions dist/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
crossorigin="anonymous"
defer
></script>
<script type="module" crossorigin src="./assets/main-64d467c2.js"></script>
<link rel="stylesheet" href="./assets/index-21b70a9a.css">
<script type="module" crossorigin src="./assets/main-7700b10d.js"></script>
<link rel="stylesheet" href="./assets/index-bc30aaf2.css">
</head>

<body>
Expand Down
4 changes: 2 additions & 2 deletions dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
crossorigin="anonymous"
defer
></script>
<script type="module" crossorigin src="./assets/main-64d467c2.js"></script>
<link rel="stylesheet" href="./assets/index-21b70a9a.css">
<script type="module" crossorigin src="./assets/main-7700b10d.js"></script>
<link rel="stylesheet" href="./assets/index-bc30aaf2.css">
</head>
<body>
<section class="start">
Expand Down
4 changes: 2 additions & 2 deletions dist/portfolio.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
crossorigin="anonymous"
defer
></script>
<script type="module" crossorigin src="./assets/main-64d467c2.js"></script>
<link rel="stylesheet" href="./assets/index-21b70a9a.css">
<script type="module" crossorigin src="./assets/main-7700b10d.js"></script>
<link rel="stylesheet" href="./assets/index-bc30aaf2.css">
</head>

<body>
Expand Down
31 changes: 28 additions & 3 deletions dist/teams.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
crossorigin="anonymous"
defer
></script>
<script type="module" crossorigin src="./assets/main-64d467c2.js"></script>
<link rel="stylesheet" href="./assets/index-21b70a9a.css">
<script type="module" crossorigin src="./assets/main-7700b10d.js"></script>
<link rel="stylesheet" href="./assets/index-bc30aaf2.css">
</head>

<body>
Expand Down Expand Up @@ -145,7 +145,32 @@
<h2>Teams</h2>
</div>
</header>
<div class="calendar-window window"></div>
<div class="teams-window window">
<div class="avatar">
<img src="./assets/1-f461cdf1.jpg" alt="avatar" />
<p>Memeber 1</p>
</div>
<div class="avatar">
<img src="./assets/2-912f0f8a.jpg" alt="avatar" />
<p>Memeber 2</p>
</div>
<div class="avatar">
<img src="./assets/3-33d58c6f.jpg" alt="avatar" />
<p>Memeber 3</p>
</div>
<div class="avatar">
<img src="./assets/4-4c5bd68c.jpeg" alt="avatar" />
<p>Memeber 4</p>
</div>
<div class="avatar">
<img src="./assets/5-01d5527f.jpeg" alt="avatar" />
<p>Memeber 5</p>
</div>
<div class="avatar">
<img src="./assets/6-b7d0e6de.jpg" alt="avatar" />
<p>Memeber 6</p>
</div>
</div>
</section>
<section class="comunicator">
<div class="talks talks-hidden">
Expand Down
4 changes: 2 additions & 2 deletions dist/todo.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
crossorigin="anonymous"
defer
></script>
<script type="module" crossorigin src="./assets/main-64d467c2.js"></script>
<link rel="stylesheet" href="./assets/index-21b70a9a.css">
<script type="module" crossorigin src="./assets/main-7700b10d.js"></script>
<link rel="stylesheet" href="./assets/index-bc30aaf2.css">
</head>

<body>
Expand Down
61 changes: 60 additions & 1 deletion src/approvals.html
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,66 @@
<h2>Approvals</h2>
</div>
</header>
<div class="calendar-window window"></div>
<div class="approval window">
<div class="approvals">
<h3>Project #0015</h3>
<ul class="approvals__container">
<li class="approvals__approval">
<div class="approvals__approval-icon">
<i class="fa-regular fa-thumbs-up"></i>
</div>
<div class="approvals__approval-title">
<p>Approval 1</p>
</div>
<div class="approvals__approval-project">
<p>Olivia Braun</p>
<img src="./img/avatars/4.jpeg" alt="avatar" />
</div>
</li>
<li class="approvals__approval">
<div class="approvals__approval-icon">
<i class="fa-regular fa-thumbs-up"></i>
</div>
<div class="approvals__approval-title">
<p>Approval 2</p>
</div>
<div class="approvals__approval-project">
<p>Emma Smith</p>
<img src="./img/avatars/5.jpeg" alt="avatar" />
</div>
</li>
<li class="approvals__approval">
<div class="approvals__approval-icon">
<i class="fa-regular fa-thumbs-up"></i>
</div>
<div class="approvals__approval-title">
<p>Approval 3</p>
</div>
<div class="approvals__approval-project">
<p>Liam Johnson</p>
<img src="./img/avatars/6.jpg" alt="avatar" />
</div>
</li>
</ul>
</div>
<div class="approvals">
<h3>Project #0016</h3>
<ul class="approvals__container">
<li class="approvals__approval">
<div class="approvals__approval-icon">
<i class="fa-regular fa-thumbs-up"></i>
</div>
<div class="approvals__approval-title">
<p>Approval 1</p>
</div>
<div class="approvals__approval-project">
<p>Emma Smith</p>
<img src="./img/avatars/5.jpeg" alt="avatar" />
</div>
</li>
</ul>
</div>
</div>
</section>
<section class="comunicator">
<div class="talks talks-hidden">
Expand Down
25 changes: 25 additions & 0 deletions src/style/components/_approvals.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
@use '../variables/colors' as *;

.approval {
display: flex;
flex-wrap: wrap;
padding-bottom: 10rem;
overflow-y: scroll;

h3 {
width: 16rem;
}

img {
width: 4rem;
border: 1px solid $second;
border-radius: 1rem;
}

.approvals__container {
background-color: #fff;
margin: 2rem;
border-radius: 1rem;
border: 1px solid $second;
}
}
2 changes: 2 additions & 0 deletions src/style/components/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@
@forward 'calendar';
@forward 'todo';
@forward 'portfolio';
@forward 'approvals';
@forward 'budget';
@forward 'files';
@forward 'teams';
36 changes: 36 additions & 0 deletions src/style/components/_teams.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
@use '../variables/colors' as *;

.teams-window {
margin-left: 2rem;
display: flex;
flex-wrap: wrap;
gap: 2rem;

.avatar {
width: 14rem;
height: 14rem;
border: 1px solid $second;
border-radius: 2rem;
transition: all 0.3s;
&:hover {
border: 1px solid rgba($color: $second, $alpha: 0.5);
}
}

img {
width: 12rem;
height: 12rem;
border-radius: 2rem;
margin-left: 1rem;
padding: 0.5rem;
transition: all 0.3s;

&:hover {
transform: scale(1.05);
}
}
p {
text-align: center;
color: $fifth;
}
}
27 changes: 26 additions & 1 deletion src/teams.html
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,32 @@
<h2>Teams</h2>
</div>
</header>
<div class="calendar-window window"></div>
<div class="teams-window window">
<div class="avatar">
<img src="./img/avatars/1.jpg" alt="avatar" />
<p>Memeber 1</p>
</div>
<div class="avatar">
<img src="./img/avatars/2.jpg" alt="avatar" />
<p>Memeber 2</p>
</div>
<div class="avatar">
<img src="./img/avatars/3.jpg" alt="avatar" />
<p>Memeber 3</p>
</div>
<div class="avatar">
<img src="./img/avatars/4.jpeg" alt="avatar" />
<p>Memeber 4</p>
</div>
<div class="avatar">
<img src="./img/avatars/5.jpeg" alt="avatar" />
<p>Memeber 5</p>
</div>
<div class="avatar">
<img src="./img/avatars/6.jpg" alt="avatar" />
<p>Memeber 6</p>
</div>
</div>
</section>
<section class="comunicator">
<div class="talks talks-hidden">
Expand Down

0 comments on commit 65460c8

Please sign in to comment.