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

Nav bar updates #82

Open
wants to merge 31 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
196c2d4
added delete button (implementing it to work is in progress)
wangd14 Feb 10, 2023
9b9f8f2
Trying to figure out this button (doesn't work)
wangd14 Feb 18, 2023
70c0559
delete plan button "works" but site tries to open up the degree where…
wangd14 Feb 28, 2023
6a63f01
Icon Animation Part 1
WChen04 Feb 28, 2023
643b2d2
Merge branch 'nav-bar-updates' of https://github.com/Ryzon3/DegreeDoc…
WChen04 Feb 28, 2023
5c70435
Added Button popup
WChen04 Mar 3, 2023
4c2505e
Fixed Logo animation and darkmode button
WChen04 Mar 17, 2023
724d979
Deleted Commented Part
WChen04 Mar 17, 2023
f54b46a
Merge branch 'main' into nav-bar-updates
WChen04 Mar 17, 2023
0392fe6
fixing media screens
WChen04 Mar 28, 2023
e0ae3a1
cleaning up css
WChen04 Mar 28, 2023
daaccd3
Update AHeader.vue
WChen04 Mar 31, 2023
6ab259c
Merge branch 'main' into nav-bar-updates
WChen04 Mar 31, 2023
fa15738
Fixed tags
WChen04 Mar 31, 2023
9f5dfc5
Merge branch 'main' into nav-bar-updates
WChen04 Apr 7, 2023
47745f1
Update AHeader.vue
WChen04 Apr 7, 2023
ec1f635
fixing
WChen04 Apr 13, 2023
47e8dbc
fixed logo slide
WChen04 Apr 13, 2023
2b680d0
rewrote all css for the header
WChen04 Apr 13, 2023
008d08d
Changed date
WChen04 Apr 13, 2023
199a87a
Fixed up media screens
WChen04 Apr 13, 2023
1d277bb
updating media screens
WChen04 Apr 14, 2023
e130eae
Media screen works for 1440 device not mine for somereason
WChen04 Apr 14, 2023
5dda092
Update AHeader.vue
WChen04 Apr 14, 2023
c012317
Update AHeader.vue
WChen04 Apr 14, 2023
e318ad5
Trying to make a prototype of a onload browser
WChen04 Apr 25, 2023
a9fd069
Update loadproto.html
WChen04 Apr 25, 2023
cb2a3d8
attempting to centering items
WChen04 Apr 25, 2023
7454c7c
made welcome screen
WChen04 Apr 25, 2023
0e9e32c
Deleting unneeded code
WChen04 Apr 25, 2023
32b1a2b
Updating animation times and positions
WChen04 Apr 25, 2023
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
1 change: 1 addition & 0 deletions frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ export default {
</q-layout>
</template>


<style scoped></style>
2 changes: 1 addition & 1 deletion frontend/src/components/AFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default {
<a href="https://github.com/Ryzon3/DegreeDoctor">
<q-icon id="icon" name="fa-brands fa-github" size="35px" />
</a>
<p id="copy">&copy; 2022 Degree Doctor</p>
<p id="copy">&copy; 2023 Degree Doctor</p>
</q-toolbar-title>
</q-toolbar>
</q-footer>
Expand Down
272 changes: 249 additions & 23 deletions frontend/src/components/AHeader.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<script>
import { useImage } from "@vueuse/core";
import { useStore } from "../stores/store";
import DarkModeToggle from "./DarkModeToggle.vue";
import PlansList from "./PlansList.vue";

Expand All @@ -15,35 +17,259 @@ export default {
};
</script>

<template>
<q-header elevated class="bg-secondary text-white header" height-hint="98">
<q-toolbar>
<q-toolbar-title>
<q-avatar @click="sendQuiz()">
<img src="../assets/Degree_Doctor_logo.png" />
</q-avatar>
<a @click="sendQuiz()"> Degree Doctor</a>
</q-toolbar-title>

<PlansList />
<DarkModeToggle />
</q-toolbar>
</q-header>
<template>
<nav>
<div class="navbar">
<div class="left">
<div class="image-container">
<router-link to="/quiz" id="logo"><img src="../assets/Degree_Doctor_logo.png"/></router-link>
</div>
<div class="DD">
<RouterLink to="/" id="title">Degree Doctor</RouterLink>
<div class="fading-effect"></div>
</div>
</div>
<div class="other">
<DarkModeToggle/>
</div>
</div>
</nav>
</template>


<style scoped>
.card-contain {
.navbar{
display: flex;
flex-direction: row;
background:#835eba;
justify-content:space-between;
align-items: center;
justify-content: space-between;
padding-right: 1em;
height: 5rem;
}
.header {
.left{
display: flex;
justify-content: center;
flex-direction: row;
align-items: center;
max-height: 54px;
height: 100%;
padding-left: 17em;
}
img{
width: 4em;
margin-left: -4em;
margin-top: 0em;


}
#title{
display:flex;
color:WHITE;
font-weight: 500;
text-decoration: none;
font-size: 1.2rem;
padding-bottom: 3px;
justify-content: space-around;
margin-left: 3em;
opacity: 1;
}
.other{
padding-right: 17em;
}
/* .image-container {
position: absolute;
top: 3.5%;
right: 20%;
transform: translate(-50%,-50%);
} */
/* .image-container img {
-webkit-filter: drop-shadow(-4px 5px 5px rgba(0,0,0,0.6));
filter: drop-shadow(-4px 5px 5px rgba(0,0,0,0.6));
animation: image-slide 4s cubic-bezier(.5,.5,0,1);
animation-fill-mode: forwards;
}

@media screen and (min-width: 2560px){
@keyframes image-slide {
0% { transform: translateX(-730px) scale(0); }
60% { transform: translateX(-730px) scale(1); }
90% { transform: translateX(-1550px) scale(1); }
100% { transform: translateX(-1550px) scale(1); }
}
@keyframes fade-in{
from {
opacity: 0;
}
to {
opacity: 1;
}
}
.navbar{
height: 8em;
}
img{
width:5em;
margin-top: 3em;
}
#title{
font-size:2em;
margin-left: 10em;
animation-name: fade-in;
animation-duration: 1s;
animation-fill-mode: forwards;
animation-delay: 3000ms;
}
.other{
padding-right: 29em;

}
DarkModeToggle{
width: 2em;
}


}

@media screen and (max-width: 1440px){
@keyframes image-slide {
0% { transform: translateX(-400px) scale(0); }
60% { transform: translateX(-400px) scale(1); }
90% { transform: translateX(-875px) scale(1); }
100% { transform: translateX(-875px) scale(1); }
}
@keyframes fade-in{
from {
opacity: 0;
}
to {
opacity: 1;
}
}
#title{
animation-name: fade-in;
animation-duration: 1s;
animation-fill-mode: forwards;
animation-delay: 2750ms;
}
img{
margin-top:2em;
}


}
@media screen and (min-width: 1440px){
@keyframes image-slide {
0% { transform: translateX(-400px) scale(0); }
60% { transform: translateX(-400px) scale(1); }
90% { transform: translateX(-900px) scale(1); }
100% { transform: translateX(-900px) scale(1); }
}
@keyframes fade-in{
from {
opacity: 0;
}
to {
opacity: 1;
}
}
#title{

animation-name: fade-in;
animation-duration: 1s;
animation-fill-mode: forwards;
animation-delay: 3000ms;
}
img{
margin-top:1em;
}




}
@media screen and (max-width: 1024px){
@keyframes image-slide {
0% { transform: translateX(-275px) scale(0); }
60% { transform: translateX(-275px) scale(1); }
90% { transform: translateX(-600px) scale(1); }
100% { transform: translateX(-600px) scale(1); }
}
@keyframes fade-in{
from {
opacity: 0;
}
to {
opacity: 1;
}
}
#title{
margin-left: 0em;
animation-name: fade-in;
animation-duration: 1s;
animation-fill-mode: forwards;
animation-delay: 3000ms;
}
.other{
padding-right: 11em;
}



}
@media screen and (max-width: 768px){
@keyframes image-slide {
0% { transform: translateX(-200px) scale(0); }
60% { transform: translateX(-200px) scale(1); }
90% { transform: translateX(-425px) scale(1); }
100% { transform: translateX(-425px) scale(1); }
}
@keyframes fade-in{
from {
opacity: 0;
}
to {
opacity: 1;
}
}
#title{
margin-left: -2em;
animation-name: fade-in;
animation-duration: 1s;
animation-fill-mode: forwards;
animation-delay: 3000ms;
}
.other{
padding-right: 9em;
}
img{
margin-top: 3em;
width:3.5em;
}
}
</style>
@media screen and (max-width: 768px){
@keyframes image-slide {
0% { transform: translateX(-200px) scale(0); }
60% { transform: translateX(-200px) scale(1); }
90% { transform: translateX(-425px) scale(1); }
100% { transform: translateX(-425px) scale(1); }
}
@keyframes fade-in{
from {
opacity: 0;
}
to {
opacity: 1;
}
}
#title{
margin-left: -2em;
animation-name: fade-in;
animation-duration: 1s;
animation-fill-mode: forwards;
animation-delay: 3000ms;
}
.other{
padding-right: 9em;
}
img{
margin-top: 1em;
width:3.5em;
}
} */
</style>
45 changes: 45 additions & 0 deletions frontend/src/components/Header.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<script>
import { useImage } from "@vueuse/core";
import { useStore } from "../stores/store";
import DarkModeToggle from "./DarkModeToggle.vue";
import PlansList from "./PlansList.vue";

export default {
components: {
DarkModeToggle,
PlansList,
},
methods: {
sendQuiz() {
this.$router.push("/quiz");
},
},
};
</script>

<template>
<div class="navbar">
<div class="left">
<div class="image-container">
<router-link to="/quiz" id="logo"><img src="../assets/Degree_Doctor_logo.png"/></router-link>
</div>
</div>
</div>
</template>

<style scoped>
.image-container {
position: absolute;
top: 3.5%;
right: 20%;
transform: translate(-50%,-50%);
z-index: 2; /* Makes sure this is on top */
}
.image-container img {
-webkit-filter: drop-shadow(-4px 5px 5px rgba(0,0,0,0.6));
filter: drop-shadow(-4px 5px 5px rgba(0,0,0,0.6));
height: 200px;
animation: image-slide 4s cubic-bezier(.5,.5,0,1);
animation-fill-mode: forwards;
}
</style>
Loading