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

refont of the style to fix the futter issue and redo of some view to … #152

Merged
merged 1 commit into from
Apr 19, 2024
Merged

refont of the style to fix the futter issue and redo of some view to … #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion frontend/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
</head>

<body>
<div id="app"></div>
<div id="app" style="min-height: 100vh;
display: flex;
flex-direction: column;
justify-content: space-between;" >
</div>
<script type="module" src="/src/main.js"></script>
</body>

Expand Down
12 changes: 12 additions & 0 deletions frontend/src/assets/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,20 @@ h4
justify-content: center;
}

.center {
display: flex;
flex-direction: column;
align-items: center;
}

@media (hover: hover) {
a:hover {
text-decoration: underline;
}
}

@media (min-width: 481px) {
.form-wrapper {
max-width: 80%;
}
}
6 changes: 3 additions & 3 deletions frontend/src/components/Footer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

<style scoped style="scss">
footer {
min-height: 5rem;
background-image: url('/background.jpg');
background-size: cover;
height: 5rem;
margin-top: 1rem;
background-image: url('/background.jpg');
background-size: cover;
display: flex;
justify-content: center;
align-items: center;
Expand Down
10 changes: 4 additions & 6 deletions frontend/src/components/Header.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ header {
height: 50px;
}

.wrapper
{
.wrapper {
display: flex;
flex-direction: column;
padding: 1.3rem 0;
Expand Down Expand Up @@ -67,15 +66,15 @@ nav {
}
}

@media (min-width: 1024px) {
@media (min-width: 481px) {
#main-title
{
margin-bottom: 0;
margin-bottom: 0;
line-height: 0;
}
.wrapper {
flex-direction: row;
max-width: 1100px;
max-width: 90vw;
margin: 0 auto;
padding: 1rem;
}
Expand All @@ -91,7 +90,6 @@ nav {
}
}
}

.logo {
margin: 0 2rem 0 0;
}
Expand Down
5 changes: 0 additions & 5 deletions frontend/src/router/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ const router = createRouter({
name: 'Login',
component: () => import('../views/Authentication/LoginView.vue')
},
{
path: '/logout',
name: 'Logout',
component: () => import('../views/Authentication/LogoutView.vue')
},
{
path: '/register',
name: 'Register',
Expand Down
22 changes: 1 addition & 21 deletions frontend/src/views/AddQuestionView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const submitForm = async () => {
</script>

<template>
<section class="add-question container form-wrapper">
<section class="center container form-wrapper">
<div>
<h1 class="title">Add your question</h1>
<p class="info">Help us become the best quiz game ever by adding your amazing new question!</p>
Expand All @@ -75,28 +75,8 @@ const submitForm = async () => {
</template>

<style scoped>
.container {
display: flex;
flex-direction: column;
align-items: center;
min-height: 80vh;
}

.title, .info {
text-align: center;
}

@media (min-width: 576px) {
.form-wrapper {
max-width: 90%;
}
}

@media (min-width: 1024px) {
.form-wrapper {
max-width: 70%;
}
}

</style>

21 changes: 1 addition & 20 deletions frontend/src/views/Authentication/LoginView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const login = async () => {

<template>
<div>
<section class="login-form container">
<section class="center container">
<div>
<h1 class="title">Login</h1>
<p class="info">Log in here</p>
Expand All @@ -58,30 +58,11 @@ const login = async () => {
</template>

<style scoped>
.container {
display: flex;
flex-direction: column;
align-items: center;
min-height: 80vh;
}

.title, .info {
text-align: center;
}

.success-message {
color: green;
}

@media (min-width: 576px) {
.form-wrapper {
max-width: 90%;
}
}

@media (min-width: 1024px) {
.form-wrapper {
max-width: 70%;
}
}
</style>
20 changes: 1 addition & 19 deletions frontend/src/views/Authentication/RegisterView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const register = async () => {

<template>
<div>
<section class="Register-form container">
<section class="center container">
<div>
<h1 class="title">Register</h1>
<p class="info">Create a new account</p>
Expand All @@ -61,12 +61,6 @@ const register = async () => {
</template>

<style scoped>
.container {
display: flex;
flex-direction: column;
align-items: center;
min-height: 80vh;
}

.title, .info {
text-align: center;
Expand All @@ -75,16 +69,4 @@ const register = async () => {
.success-message {
color: green;
}

@media (min-width: 576px) {
.form-wrapper {
max-width: 90%;
}
}

@media (min-width: 1024px) {
.form-wrapper {
max-width: 70%;
}
}
</style>
28 changes: 20 additions & 8 deletions frontend/src/views/CategoriesView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@ onMounted(async () => {
</script>

<template>
<main class="container col-wrapper">
<p class="info">Maximise your IQ by correctly answering the questions in the different categories below and
<section class="container">
<p class="info">Maximise your IQ by correctly answering the questions in the different categories below and
climb the leaderboard to become the best.</p>
<div class="empty-space"></div>
</section>
<section class="container col-wrapper">
<div>
<h1 class="title">Categories</h1>
<div class="all-categories">
Expand All @@ -30,13 +31,16 @@ onMounted(async () => {
</div>
</div>
<LeaderBoard />
</main>
</section>
</template>

<style scoped>
.info{
text-align: center;
}
.all-categories {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(210px, 1fr));
grid-template-columns: repeat(auto-fill, minmax(230px, 1fr));
row-gap: 1rem;
column-gap: 1rem;
}
Expand All @@ -47,11 +51,19 @@ onMounted(async () => {
padding: 2rem 0;
}

@media (min-width: 1024px) {
@media (min-width: 530px) {
.col-wrapper {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(230px, 600px));
column-gap: 1rem;
}
}

@media (min-width: 800px) {
.col-wrapper {
display: grid;
grid-template-columns: .66fr .33fr;
column-gap: 2rem;
grid-template-columns: 10fr 1fr;
column-gap: 1rem;
}
}
</style>
1 change: 0 additions & 1 deletion frontend/src/views/NotFoundView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
display: flex;
flex-direction: column;
align-items: center;
min-height: 80vh;
}

.title, .info {
Expand Down
15 changes: 9 additions & 6 deletions frontend/src/views/QuizView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const fetchNewQuestion = async () => {
// wait for the question before checking if the user has asked for options
hasAskedOptions.value = await APIClient.getIfOptionsAsked();
}
// Fetch user IQ and add it to the graph
// Fetch user IQ and add it to the graph
const graphComponent = ref(null);
const fetchUserIQ = async () => {
const userIq = await APIClient.getUserIQ(id_category);
Expand All @@ -36,9 +36,10 @@ onMounted(() => {
</script>

<template>
<section class="container">
<p class="info">Answer correctly to the question and earn as many IQs as possible!</p>
</section>
<section class="quiz container col-wrapper">
<p class="info">Answer correctly to the question and earn as many IQs as possible!</p>
<div class="empty-space"></div>
<div>
<h1 class="title">Question</h1>
<p class="question box">{{ question }}</p>
Expand All @@ -50,11 +51,13 @@ onMounted(() => {
<GraphSection ref="graphComponent" />
<LeaderBoard :id_category="Number(id_category)" />
</div>

</section>
</template>

<style scoped>
.container{
max-width: 1200px;
}
.title {
text-align: center;
}
Expand All @@ -71,8 +74,8 @@ onMounted(() => {
@media (min-width: 1024px) {
.col-wrapper {
display: grid;
grid-template-columns: .66fr .33fr;
column-gap: 2rem;
grid-template-columns: 5fr 1fr;
column-gap: 3rem;
}

.category-banner {
Expand Down
Loading