From e0af9b9af48f437abd5344ab89e596eb62a57c21 Mon Sep 17 00:00:00 2001
From: Saladin21 <13519187@std.stei.itb.ac.id>
Date: Mon, 18 Apr 2022 11:22:44 +0700
Subject: [PATCH] implement new header and sidebar
---
src/App.vue | 3 +--
src/components/sidebar.vue | 5 ++++-
src/views/AdminEdit.vue | 4 ++++
src/views/AdminIndex.vue | 4 ++++
src/views/AdminInsert.vue | 4 ++++
src/views/ChangePass.vue | 4 ++++
src/views/DepartemenIndex.vue | 4 ++++
src/views/KaryawanDetail.vue | 4 ++++
src/views/KaryawanEdit.vue | 4 ++++
src/views/KaryawanInsert.vue | 4 ++++
src/views/KpiCreate.vue | 4 ++++
src/views/KpiDetail.vue | 4 ++++
src/views/KpiIndex.vue | 8 ++++++--
src/views/KpiManagerDetail.vue | 4 ++++
src/views/ManagerKaryawanDetail.vue | 4 ++++
src/views/ManagerKaryawanIndex.vue | 8 ++++++--
src/views/ManagerKpiIndex.vue | 6 +++++-
src/views/ProfilAdmin.vue | 6 +++++-
src/views/ProfilUser.vue | 6 +++++-
src/views/ResponseDetail.vue | 6 +++++-
src/views/ResponseEmployee.vue | 6 +++++-
src/views/ResponseIndex.vue | 4 ++++
22 files changed, 94 insertions(+), 12 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index eec3402..462129f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,8 +18,7 @@ export default {
-moz-osx-font-smoothing: grayscale;
color: #2c3e50;
margin:0;
- height: 100%;
- margin-top: 100px;
+ padding-top: 130px;
}
html,
diff --git a/src/components/sidebar.vue b/src/components/sidebar.vue
index a737ffa..db93e77 100644
--- a/src/components/sidebar.vue
+++ b/src/components/sidebar.vue
@@ -1,5 +1,5 @@
<template>
- <div class="fixed-top">
+ <div class=" navigation fixed-top">
<!--
<button @click="setActive()" class="btn my-4 align-self-center" :class="{active_cont : isActive}" id="menu-btn">></button> -->
<div id="sidebar" class="collapse collapse-horizontal show border-end">
@@ -186,4 +186,7 @@ export default {
#logo {
margin-left: 30px;
}
+.navigation{
+ width: 250px
+}
</style>
diff --git a/src/views/AdminEdit.vue b/src/views/AdminEdit.vue
index 4a8cac4..f580e37 100644
--- a/src/views/AdminEdit.vue
+++ b/src/views/AdminEdit.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar></Sidebar>
@@ -46,6 +48,7 @@
</div>
</div>
</div>
+ </div>
</template>
<script>
@@ -66,6 +69,7 @@ export default {
username: "",
email: "",
password: "",
+ nav_active : true,
}
},
methods: {
diff --git a/src/views/AdminIndex.vue b/src/views/AdminIndex.vue
index 10e3718..7362cad 100644
--- a/src/views/AdminIndex.vue
+++ b/src/views/AdminIndex.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar current_page="Admin"></Sidebar>
@@ -51,6 +53,7 @@
</div>
</div>
</div>
+ </div>
</template>
<script>
@@ -97,6 +100,7 @@ export default {
},
filter: "",
+ nav_active : true,
};
},
methods: {
diff --git a/src/views/AdminInsert.vue b/src/views/AdminInsert.vue
index 43b9bf9..98c5a1b 100644
--- a/src/views/AdminInsert.vue
+++ b/src/views/AdminInsert.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar></Sidebar>
@@ -45,6 +47,7 @@
</div>
</div>
</div>
+ </div>
</template>
<script>
@@ -66,6 +69,7 @@ export default {
username: "",
email: "",
password: "",
+ nav_active : true,
}
},
methods: {
diff --git a/src/views/ChangePass.vue b/src/views/ChangePass.vue
index 18089ca..3507d5f 100644
--- a/src/views/ChangePass.vue
+++ b/src/views/ChangePass.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar current_page = "About" />
@@ -22,6 +24,7 @@
</div>
</div>
</div>
+ </div>
</template>
@@ -45,6 +48,7 @@ export default {
current_password: "",
new_password:"",
new_password_confirmation:"",
+ nav_active : true,
}
},
methods: {
diff --git a/src/views/DepartemenIndex.vue b/src/views/DepartemenIndex.vue
index cf2c53a..8442c4b 100644
--- a/src/views/DepartemenIndex.vue
+++ b/src/views/DepartemenIndex.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar current_page="Departemen"></Sidebar>
@@ -86,6 +88,7 @@
</template>
</Modal>
</div>
+ </div>
</template>
@@ -147,6 +150,7 @@ export default {
},
},
filter: "",
+ nav_active : true,
};
},
props:{},
diff --git a/src/views/KaryawanDetail.vue b/src/views/KaryawanDetail.vue
index 3ec1e81..56d6afd 100644
--- a/src/views/KaryawanDetail.vue
+++ b/src/views/KaryawanDetail.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar></Sidebar>
@@ -69,6 +71,7 @@
</div>
</div>
</div>
+ </div>
</template>
<script>
@@ -181,6 +184,7 @@ export default {
},
],
dept_last_page : 1,
+ nav_active : true,
}
},
methods: {
diff --git a/src/views/KaryawanEdit.vue b/src/views/KaryawanEdit.vue
index 8ef90db..bd91509 100644
--- a/src/views/KaryawanEdit.vue
+++ b/src/views/KaryawanEdit.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar></Sidebar>
@@ -73,6 +75,7 @@
</div>
</div>
</div>
+ </div>
</template>
<script>
@@ -185,6 +188,7 @@ export default {
},
],
dept_last_page : 1,
+ nav_active : true,
}
},
methods: {
diff --git a/src/views/KaryawanInsert.vue b/src/views/KaryawanInsert.vue
index d80f6f7..fd2213b 100644
--- a/src/views/KaryawanInsert.vue
+++ b/src/views/KaryawanInsert.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar></Sidebar>
@@ -73,6 +75,7 @@
</div>
</div>
</div>
+ </div>
</template>
<script>
@@ -105,6 +108,7 @@ export default {
temp_dept: ["Keuangan", "Marketing", "Operasional"],
temp_atasan: ["Yusuf", "Budi"],
temp_jabatan: ["Manager", "Staf"],
+ nav_active : true,
}
},
methods: {
diff --git a/src/views/KpiCreate.vue b/src/views/KpiCreate.vue
index 18201ff..3c0b414 100644
--- a/src/views/KpiCreate.vue
+++ b/src/views/KpiCreate.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar></Sidebar>
@@ -85,6 +87,7 @@
</div>
</div>
</div>
+ </div>
</template>
<script>
@@ -112,6 +115,7 @@ export default {
period_type: "Daily",
deadline: null,
deadline_time: "",
+ nav_active : true,
}
},
methods: {
diff --git a/src/views/KpiDetail.vue b/src/views/KpiDetail.vue
index c57967e..51d5b69 100644
--- a/src/views/KpiDetail.vue
+++ b/src/views/KpiDetail.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar></Sidebar>
@@ -105,6 +107,7 @@
</div>
</div>
</div>
+ </div>
</template>
<script>
@@ -133,6 +136,7 @@ export default {
date : "",
images:[]
},
+ nav_active : true,
}
},
methods: {
diff --git a/src/views/KpiIndex.vue b/src/views/KpiIndex.vue
index cfb1541..71d39c9 100644
--- a/src/views/KpiIndex.vue
+++ b/src/views/KpiIndex.vue
@@ -1,9 +1,11 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
- <Sidebar current_page = "About"></Sidebar>
+ <Sidebar current_page="KPI"></Sidebar>
<div class="col ps-md-2 pt-2">
- <Header></Header>
+ <Header ></Header>
<!-- isi mulai di sini -->
<div class="col-6 mx-3 mb-3">
<select
@@ -50,6 +52,7 @@
</div>
</div>
+ </div>
</template>
<script>
@@ -86,6 +89,7 @@ export default {
page_num : 0,
entry_per_page: 10,
pagination: [],
+ nav_active : true,
}
},
methods: {
diff --git a/src/views/KpiManagerDetail.vue b/src/views/KpiManagerDetail.vue
index 6c197b0..18d2d28 100644
--- a/src/views/KpiManagerDetail.vue
+++ b/src/views/KpiManagerDetail.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar></Sidebar>
@@ -106,6 +108,7 @@
</div>
</div>
</div>
+ </div>
</template>
<script>
@@ -196,6 +199,7 @@ export default {
name: "Hadi",
},
],
+ nav_active : true,
}
},
methods: {
diff --git a/src/views/ManagerKaryawanDetail.vue b/src/views/ManagerKaryawanDetail.vue
index 5cdda1c..6452dea 100644
--- a/src/views/ManagerKaryawanDetail.vue
+++ b/src/views/ManagerKaryawanDetail.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar current_page = "About"></Sidebar>
@@ -63,6 +65,7 @@
</div>
</div>
</div>
+ </div>
</template>
<script>
@@ -123,6 +126,7 @@ export default {
endpoint:"",
startReport : "",
endReport:"",
+ nav_active : true,
}
},
created(){
diff --git a/src/views/ManagerKaryawanIndex.vue b/src/views/ManagerKaryawanIndex.vue
index 2902c65..862f757 100644
--- a/src/views/ManagerKaryawanIndex.vue
+++ b/src/views/ManagerKaryawanIndex.vue
@@ -1,7 +1,9 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
- <Sidebar current_page = "About"></Sidebar>
+ <Sidebar current_page = "Bawahan"></Sidebar>
<div class="col ps-md-2 pt-2">
<Header></Header>
<div class="row p-2">
@@ -22,6 +24,7 @@
</div>
</div>
</div>
+ </div>
</template>
<script>
@@ -63,7 +66,8 @@ export default {
hidden : false,
clickable : false
},
- }
+ },
+ nav_active : true,
}
},
methods: {
diff --git a/src/views/ManagerKpiIndex.vue b/src/views/ManagerKpiIndex.vue
index b444f2d..4c0af26 100644
--- a/src/views/ManagerKpiIndex.vue
+++ b/src/views/ManagerKpiIndex.vue
@@ -1,7 +1,9 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
- <Sidebar current_page = "About"></Sidebar>
+ <Sidebar current_page = "KPI Bawahan"></Sidebar>
<div class="col ps-md-2 pt-2">
<Header></Header>
<div class="row p-2">
@@ -41,6 +43,7 @@
</div>
</div>
</div>
+ </div>
</template>
<script>
@@ -94,6 +97,7 @@ export default {
data: "custom"},
],
componentKey : 1,
+ nav_active : true,
}
},
methods: {
diff --git a/src/views/ProfilAdmin.vue b/src/views/ProfilAdmin.vue
index 77608b0..a4791f7 100644
--- a/src/views/ProfilAdmin.vue
+++ b/src/views/ProfilAdmin.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar current_page="About"></Sidebar>
@@ -33,6 +35,7 @@
</div>
</div>
</div>
+ </div>
</template>
<script>
@@ -49,7 +52,8 @@ export default {
data(){
return{
username:"",
- email:""
+ email:"",
+ nav_active : true,
}
},
methods:{
diff --git a/src/views/ProfilUser.vue b/src/views/ProfilUser.vue
index f3c0e9f..7cd3c9d 100644
--- a/src/views/ProfilUser.vue
+++ b/src/views/ProfilUser.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar current_page="About"></Sidebar>
@@ -51,6 +53,7 @@
</div>
</div>
</div>
+ </div>
</template>
<script>
@@ -75,7 +78,8 @@ export default {
atasan:null,
atasan_name:null,
username:"",
- email:""
+ email:"",
+ nav_active : true,
};
},
diff --git a/src/views/ResponseDetail.vue b/src/views/ResponseDetail.vue
index 8787d51..301e1c8 100644
--- a/src/views/ResponseDetail.vue
+++ b/src/views/ResponseDetail.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar current_page = "About"></Sidebar>
@@ -70,6 +72,7 @@
</div>
</div>
</div>
+ </div>
<!-- Adjust Modal -->
<button hidden="hidden" type="button" class="btn" data-bs-toggle="modal" data-bs-target="#adjustModal" id="modalButton">
Launch modal
@@ -147,7 +150,8 @@ export default {
},
emp: {},
responseAdj:{},
- newComment:""
+ newComment:"",
+ nav_active : true,
}
},
created(){
diff --git a/src/views/ResponseEmployee.vue b/src/views/ResponseEmployee.vue
index d2e52d7..3e1b9d6 100644
--- a/src/views/ResponseEmployee.vue
+++ b/src/views/ResponseEmployee.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar current_page = "About"></Sidebar>
@@ -64,6 +66,7 @@
</div>
</div>
</div>
+ </div>
<!-- Comment Modal -->
<div class="modal fade" id="commentModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered mx-auto">
@@ -121,7 +124,8 @@ export default {
},
emp: {},
responseAdj:{},
- newComment:""
+ newComment:"",
+ nav_active : true,
}
},
created(){
diff --git a/src/views/ResponseIndex.vue b/src/views/ResponseIndex.vue
index 2b53667..bd631b8 100644
--- a/src/views/ResponseIndex.vue
+++ b/src/views/ResponseIndex.vue
@@ -1,4 +1,6 @@
<template>
+<div v-bind:class="{content_nav_active: nav_active}">
+ <button hidden="hidden" @click="this.nav_active = !this.nav_active" id="toggleNav"></button>
<div class="container-fluid">
<div class="row flex-nowrap">
<Sidebar current_page = "About"></Sidebar>
@@ -135,6 +137,7 @@
</div>
</div>
</div>
+ </div>
</template>
<script>
@@ -201,6 +204,7 @@ export default {
showModal : false,
responseAdj : {actual : 0},
responseId : -1,
+ nav_active : true,
}
},
created(){
--
GitLab