Skip to content
This repository has been archived by the owner on Feb 23, 2021. It is now read-only.

Add team#6 #3

Open
wants to merge 67 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
efa46ca
Added basic app structure
keshavagarwal17 Feb 20, 2021
58d206f
Merge pull request #1 from The-Keshav-Agarwal/team#6
nlok5923 Feb 20, 2021
df58708
Connect To Database
keshavagarwal17 Feb 20, 2021
3c8522a
boostrap problem resolved
nlok5923 Feb 20, 2021
f1a44d4
Merge branch 'team#6' into creator-dev
nlok5923 Feb 20, 2021
d034567
test commit
nlok5923 Feb 20, 2021
15bec36
Merge pull request #2 from nlok5923/creator-dev
keshavagarwal17 Feb 20, 2021
4476884
add model
keshavagarwal17 Feb 20, 2021
a0acc69
Merge branch 'team#6' of https://github.com/The-Keshav-Agarwal/api-di…
keshavagarwal17 Feb 20, 2021
600bc00
merging changes
nlok5923 Feb 20, 2021
b44969f
remove errors
keshavagarwal17 Feb 20, 2021
b44c8f4
Merge branch 'team#6' of https://github.com/The-Keshav-Agarwal/api-di…
nlok5923 Feb 20, 2021
fddb58a
added register page
nlok5923 Feb 20, 2021
d73ed00
enhanced register file
nlok5923 Feb 20, 2021
9bc8af1
added backend for registration
nlok5923 Feb 20, 2021
4d56e42
added frontend for login
keshavagarwal17 Feb 20, 2021
fc20ec0
init :tada: dashboard
nlok5923 Feb 20, 2021
bc2d3ca
login with backend completed
keshavagarwal17 Feb 20, 2021
c44e446
login with backend completed
keshavagarwal17 Feb 20, 2021
1b70800
minor fixes
nlok5923 Feb 20, 2021
1934c0e
minor changes in styling
keshavagarwal17 Feb 20, 2021
87664f4
added page for adding symptoms
keshavagarwal17 Feb 21, 2021
377c1c6
minor update
keshavagarwal17 Feb 21, 2021
9d2070b
[WIP] Product selection page
nlok5923 Feb 21, 2021
ff90834
conflict resolved
nlok5923 Feb 21, 2021
b676baa
product seletion
nlok5923 Feb 21, 2021
7044a5b
partial work done for showing disease
keshavagarwal17 Feb 21, 2021
89e45d6
Merge branch 'team#6' of https://github.com/The-Keshav-Agarwal/api-di…
keshavagarwal17 Feb 21, 2021
d312c91
changed endpoint
nlok5923 Feb 21, 2021
eb78136
Showing disease according to symptoms
keshavagarwal17 Feb 21, 2021
aaaa78b
Merge branch 'team#6' of https://github.com/The-Keshav-Agarwal/api-di…
keshavagarwal17 Feb 21, 2021
4ba9c6d
minor update
keshavagarwal17 Feb 21, 2021
1c40c5b
adding multiple symptoms
nlok5923 Feb 21, 2021
27af8b1
conflict resolved
nlok5923 Feb 21, 2021
026dea7
change data type in model
keshavagarwal17 Feb 21, 2021
bf9bd60
add route for article according to disease
keshavagarwal17 Feb 21, 2021
344b030
unrelated changes
nlok5923 Feb 21, 2021
3b7929c
conflict resolved
nlok5923 Feb 21, 2021
1bd20d3
parsing quill text done
nlok5923 Feb 21, 2021
b6add44
remove all unnecessary comments and logs
keshavagarwal17 Feb 21, 2021
324cbe9
wastage
nlok5923 Feb 21, 2021
639c947
conflict resolved
nlok5923 Feb 21, 2021
c86f199
quill issue addressed
nlok5923 Feb 21, 2021
c1ce966
added all article page
nlok5923 Feb 21, 2021
32b9335
added sweet alert feature
nlok5923 Feb 21, 2021
476b6d8
ultra-minute changes done
nlok5923 Feb 21, 2021
9bfbaf8
not working like/dislike code
keshavagarwal17 Feb 21, 2021
4abaa5c
remove conflicts
keshavagarwal17 Feb 21, 2021
688962f
minor update
keshavagarwal17 Feb 21, 2021
82b0400
working
nlok5923 Feb 21, 2021
3b6a7a5
Merge branch 'team#6' of https://github.com/The-Keshav-Agarwal/api-di…
nlok5923 Feb 21, 2021
3cce476
woking
nlok5923 Feb 21, 2021
06a2e38
add like/dislike
keshavagarwal17 Feb 21, 2021
c2233e9
Added features of website in readme
nlok5923 Feb 21, 2021
289d1da
working
nlok5923 Feb 21, 2021
cdad89a
minor changes
keshavagarwal17 Feb 21, 2021
69f5720
merging
keshavagarwal17 Feb 21, 2021
3de4fc8
minor errors
keshavagarwal17 Feb 21, 2021
d07830c
issue resolved
nlok5923 Feb 21, 2021
bc68eb8
Added instruction to run code
keshavagarwal17 Feb 21, 2021
644db55
Update README.md
keshavagarwal17 Feb 21, 2021
474d751
Update README.md
keshavagarwal17 Feb 21, 2021
2507228
Update README.md
keshavagarwal17 Feb 21, 2021
10e69a2
push to heroku
keshavagarwal17 Feb 21, 2021
f7d19eb
change token and deploy on heroku
keshavagarwal17 Feb 21, 2021
bb10b46
Merge branch 'team#6' of https://github.com/The-Keshav-Agarwal/api-di…
keshavagarwal17 Feb 21, 2021
ba85418
local -> global
nlok5923 Feb 22, 2021
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
Prev Previous commit
Next Next commit
minor errors
keshavagarwal17 committed Feb 21, 2021
commit 3de4fc806d5cfb1ff20fa7a57c4873ceb7a1ee3a
8 changes: 5 additions & 3 deletions team#6 - {2}/views/particularArticles.ejs
Original file line number Diff line number Diff line change
@@ -28,7 +28,10 @@
var data = "<%- article.data %>"
var disease_info = document.getElementById('disease_info');
disease_info.innerHTML = data;
const handleLikeDislike = async(postId,userId,like)=>{
</script>
<% }) %>
<script>
const handleLikeDislike = async(postId,userId,like)=>{
var xhr = new XMLHttpRequest();
xhr.open('POST', '/dashboard/likePost', true);
await xhr.setRequestHeader('Content-Type', 'application/json');
@@ -41,6 +44,5 @@
);
location.reload();
}
</script>
<% }) %>
</script>
</div>