Skip to content

Commit 1492676

Browse files
coderinblackcoderinblack
coderinblack
authored and
coderinblack
committed
✨ Fix Forums/Updates Create Issue
1 parent fba2edb commit 1492676

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

client/src/components/Navbar.vue

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<template>
22
<nav
33
:class="{
4-
'bg-purple-100': $route.name==='Schools'
5-
|| $route.name==='PostQuestion',
6-
'bg-green-100': $route.name==='Create',
4+
'bg-purple-100': $route.name==='Schools' || $route.name==='PostQuestion',
75
'bg-yellow-100': $route.name==='Join',
86
'bg-blue-100': $route.name==='School' || $route.name==='Question',
9-
'bg-green-100': $route.name==='Forum'
7+
'bg-green-100': $route.name==='Forum' || $route.name==='Create'
108
}"
119
class="text-gray-700 body-font font-poppins"
1210
>

client/src/views/Home.vue

+10-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
<div class="mt-5">
2121
<div class="uppercase tracking-wide font-bold text-darkblue">IT COMES EQUIPPED</div>
2222
<h1 class="font-poppins text-4xl md:text-5xl font-bold text-darkblue">Tailored for Teachers and Students</h1>
23-
<p class="text-gray-800 text-xl md:text-2xl mt-2">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
23+
<p class="text-gray-800 text-xl md:text-2xl mt-2">
24+
Gekko offers a seamless product that will help you and your school stay connected while practicing social distancing.
25+
The best part is, it is free! No more costly fees for your school district!
26+
</p>
2427
</div>
2528
<div class="hidden md:block ml-10 mt-20">
2629
<img src="@/assets/static/learning.svg" alt="learning image by undraw">
@@ -29,11 +32,13 @@
2932

3033
<div class="flex flex-row-reverse justify-center w-4/5 mx-auto mb-20 mt-20 md:mb-40 md:mt-40">
3134
<div class="mt-5">
32-
<div class="uppercase tracking-wide font-bold text-darkblue">IT COMES EQUIPPED</div>
33-
<h1 class="font-poppins text-4xl md:text-5xl font-bold text-darkblue">Tailored for Teachers and Students</h1>
34-
<p class="text-gray-800 text-xl md:text-2xl mt-2">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
35+
<div class="uppercase tracking-wide font-bold text-darkblue">REALTIME COMMUNICATION</div>
36+
<h1 class="font-poppins text-4xl md:text-5xl font-bold text-darkblue">Ask And Answer Questions In Realtime</h1>
37+
<p class="text-gray-800 text-xl md:text-2xl mt-2">
38+
Gekko's realtime forum allows for students, teachers, and parents to ask and answer questions. Its like magic!
39+
</p>
3540
</div>
36-
<div class="hidden md:block mr-20 mt-20">
41+
<div class="hidden md:block mr-20 mt-20 max-w-xl">
3742
<img src="@/assets/static/learning.svg" alt="learning image by undraw">
3843
</div>
3944
</div>

server/src/services/answers/answers.hooks.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ module.exports = {
5252
get: [],
5353
create: [
5454
async context => {
55-
context.result.user = await context.app.service('users').get(context.result.user_id);
55+
context.result.user = await context.app.service('users').get(context.result.user_id).name;
5656
return context;
5757
}
5858
],

server/src/services/forums/forums.hooks.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ module.exports = {
5252
get: [],
5353
create: [
5454
async context => {
55-
context.result.user = await context.app.service('users').get(context.result.user_id);
55+
context.result.user = await context.app.service('users').get(context.result.user_id).name;
5656
return context;
5757
}
5858
],

0 commit comments

Comments
 (0)