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.

Sign up for GitHub

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

Feature/Terminal Dashboard #31

Merged
merged 13 commits into from
Jan 24, 2024
Merged

Feature/Terminal Dashboard #31

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bed0d74
Feature/Tabs added and added styling
Huib8 Jan 17, 2024
4de2680
changes added/fix
Huib8 Jan 18, 2024
83ae5da
changes after review
Huib8 Jan 18, 2024
1f5a604
fix: console log removed
Huib8 Jan 18, 2024
2b3b7e4
changes after review
Huib8 Jan 19, 2024
9839725
chanched controller name
Huib8 Jan 19, 2024
353b013
changes tabs object
Huib8 Jan 19, 2024
00d071d
changes after review
Huib8 Jan 22, 2024
335442f
changes after review
Huib8 Jan 22, 2024
ff2d86a
changes after review
Huib8 Jan 22, 2024
0cdb17e
fix: color tabs changes, tabs rounded removed
Huib8 Jan 22, 2024
26ee2b7
fix: scrollbar color changes
Huib8 Jan 22, 2024
e65f0f4
Merge branch 'dev' of https://github.com/DanericNetwork/Biblio-App in…
Timtendo12 Jan 24, 2024
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
13 changes: 13 additions & 0 deletions src/app/Http/Controllers/AppController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

namespace App\Http\Controllers;

use Illuminate\Http\Request;
use Inertia\Inertia;

class AppController extends Controller
{
public function index() {
return Inertia::render('terminal-dashboard');
Huib8 marked this conversation as resolved.
Show resolved Hide resolved
}
}
92 changes: 48 additions & 44 deletions src/resources/vue/components/ItemCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,72 @@
<template>
<div class="item-card">
<div class="left">
<Icon icon="book" size="90" color="white" />
<Icon class="book-icon" icon="book" size="90" color="white" />
<div class="info">
<p>{{ title }}</p>
<p>{{ description }}</p>
<p>{{ item.content }}</p>
Huib8 marked this conversation as resolved.
Show resolved Hide resolved
<p>{{ item.description }}</p>
</div>
</div>
<div v-if="warning" class="right">
<div v-if="item.warning" class="right">
<Icon icon="warning" size="35" />
</div>
</div>
</template>

<script>
import Icon from "./icon.vue";
import Icon from "./icon.vue";

export default {
name: "ItemCard",
props: {
title: String,
description: String,
warning: Boolean,
},
components: {
Icon,
},
};
export default {
name: "ItemCard",
props: {
item: Object,
itemIndex: Number,
},
components: {
Icon,
},
};
</script>

<style lang="scss">
.item-card {
width: 667px;
height: 116px;
background: #1d243a;
border-radius: 8px;
.item-card {
width: 667px;
height: 116px;
background: #1d243a;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: space-between;
padding: 13px;

.left {
display: flex;
align-items: center;
justify-content: space-between;
padding: 13px;
width: 100%;
height: 100%;

.left {
.info {
margin-left: 20px;
display: flex;
align-items: center;
width: 100%;
height: 100%;
flex-direction: column;

.info {
margin-left: 20px;
display: flex;
flex-direction: column;

p {
color: #fff;
font-size: 32px;
font-family: "Outfit";
font-weight: 700;
}
p {
color: #fff;
font-size: 32px;
font-family: "Outfit";
font-weight: 700;
}
}
}

.right {
display: flex;
align-items: flex-start;
height: 100%;
}
.right {
display: flex;
align-items: flex-start;
height: 100%;
}
.book-icon {
width: 50px;
height: 50px;
}
</style>
}
</style>
228 changes: 228 additions & 0 deletions src/resources/vue/components/Tabs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,228 @@
<template>
Huib8 marked this conversation as resolved.
Show resolved Hide resolved
Huib8 marked this conversation as resolved.
Show resolved Hide resolved
Huib8 marked this conversation as resolved.
Show resolved Hide resolved
Huib8 marked this conversation as resolved.
Show resolved Hide resolved
<div class="tabs-main-div">
<ul class="tabs">
<li
v-for="(tab, index) in tabs"
:key="index"
class="tab"
@click="changeTab(index)"
:class="{ active: activeTab === index }"
>
{{ tab.name }}
</li>
</ul>
<div class="tab-content-container">
<div
v-for="(tab, index) in tabs"
:key="index"
class="tab-content"
:class="{ active: activeTab === index }"
>
<item-card
v-for="(item, itemIndex) in tab.items"
:key="itemIndex"
:item="tab.items[itemIndex]"
:itemIndex="itemIndex"
/>
</div>
</div>
</div>
</template>

<script>
import ItemCard from "./ItemCard.vue";
import Box from "./Box.vue";

export default {
components: {
ItemCard,
Box,
},
data() {
return {
activeTab: 0,
tabs: [
{
name: "In bezit",
items: [
Huib8 marked this conversation as resolved.
Show resolved Hide resolved
{
content: "Content 1.1",
description: "Description 1.1",
warning: true,
},
{
content: "Content 1.2",
description: "Description 1.2",
warning: false,
},
{
content: "Content 1.3",
description: "Description 1.3",
warning: true,
},
{
content: "Content 1.3",
description: "Description 1.3",
warning: true,
},
{
content: "Content 1.3",
description: "Description 1.3",
warning: true,
},
{
content: "Content 1.3",
description: "Description 1.3",
warning: true,
},
{
content: "Content 1.3",
description: "Description 1.3",
warning: true,
},
Huib8 marked this conversation as resolved.
Show resolved Hide resolved
{
content: "Content 1.3",
description: "Description 1.3",
warning: true,
},
{
content: "Content 1.3",
description: "Description 1.3",
warning: true,
},
{
content: "Content 1.3",
description: "Description 1.3",
warning: true,
},
],
},
{
name: "Verleden",
items: [
{
content: "Content 2.1",
description: "Description 2.1",
warning: false,
},
{
content: "Content 2.2",
description: "Description 2.2",
warning: true,
},
],
},
{
name: "Boetes",
items: [
{
content: "Content 3.1",
description: "Description 3.1",
warning: true,
},
{
content: "Content 3.2",
description: "Description 3.2",
warning: false,
},
],
},
{
name: "Reservering",
items: [
{
content: "Content 4.1",
description: "Description 4.1",
warning: false,
},
{
content: "Content 4.2",
description: "Description 4.2",
warning: true,
},
],
},
],
};
},
methods: {
changeTab(index) {
this.activeTab = index;
},
},
};
</script>

<style lang="scss">
.tabs-main-div {
max-width: 100%;
margin: 0 auto;
height: 100%;
display: flex;
flex-direction: column;
justify-content: flex-end;
}

.tabs {
display: flex;
list-style: none;
padding: 0;
margin: 0;
width: 100%;
justify-content: flex-end;
}

.tab {
padding: 10px;
cursor: pointer;
background-color: grey;
border: 1px solid grey;
border-radius: 5px 5px 0 0;
}

.tab:hover {
background-color: #e57e1f;
}

.tab.active {
background-color: #e57e1f;
border-bottom: 1px solid #e57e1f;
}

.tab-content-container {
flex: 1;
display: flex;
max-height: 90vh;
overflow-y: auto;
background-color: #e57e1f;
}

.tab-content {
flex: 1;
min-height: 0;
display: none;
padding: 20px;
height: 90vh;
background-color: #e57e1f;
border-radius: 0 0 5px 5px;
box-sizing: border-box;
}

.tab-content.active {
display: flex;
flex-direction: column;
}

.tab:nth-child(1),
.tab:nth-child(2),
.tab:nth-child(3),
.tab:nth-child(4) {
width: 25%;
}

.item-card {
margin-bottom: 10px;
width: 95%;
height: 50px;
}
</style>
Loading