Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
eb427d7
config1
20rohanc Jun 9, 2021
ebe0a4e
Folders are renamable
20rohanc Jun 18, 2021
0fee7a0
Style upgrades and improved trash system
20rohanc Jun 18, 2021
9a7e335
Tried fixing nb client
20rohanc Jun 23, 2021
b9a6f5f
Only folder name-changing functionality added
20rohanc Jun 27, 2021
25af05a
Embedded demo video into front page of NB. Size changes as screen siz…
KMitzel Jun 29, 2021
0ffaefe
Merge pull request #155 from KMitzel/video-embed
JumanaFM Jul 5, 2021
8767195
Merge pull request #154 from 20rohanc/commit
JumanaFM Jul 5, 2021
e4daf7a
Merge pull request #158 from haystack/master
JumanaFM Jul 12, 2021
7716203
Course URLs
20rohanc Jul 14, 2021
ff3f026
Removed superfluous delete button
20rohanc Jul 14, 2021
10392e0
Course/File Links added
20rohanc Jul 14, 2021
52541e2
Revised routing issue
20rohanc Jul 16, 2021
52d1256
Error file added
20rohanc Jul 16, 2021
25d5228
Corrected router issues
20rohanc Jul 17, 2021
02f4a64
Course and tab links fully operational, folder links only partially w…
20rohanc Jul 19, 2021
bb1b017
Only have to click on the edit button once for the form to show up
20rohanc Jul 19, 2021
db52bc2
Merge pull request #160 from 20rohanc/commit
JumanaFM Jul 20, 2021
2ce4e22
Delete package.json
JumanaFM Jul 20, 2021
1d5a1c0
Delete package-lock.json
JumanaFM Jul 20, 2021
c4ddaba
Merge branch 'summer21-02' of https://github.com/20rohanc/nb into 20r…
JumanaFM Jul 20, 2021
1258d75
Merge branch '20rohanc-summer21-02' into summer21
JumanaFM Jul 20, 2021
d94a961
Merge branch 'summer21' of https://github.com/haystack/nb into summer21
JumanaFM Jul 20, 2021
3dd9d2d
Fixed faulty variable names
20rohanc Jul 20, 2021
291c209
Resolved merge issues
20rohanc Jul 20, 2021
3a162aa
Fixed package-lock in repo
20rohanc Jul 20, 2021
d5a164e
Added linkid column in db
20rohanc Aug 9, 2021
6763a9a
Removed debugging bit
20rohanc Aug 9, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ node_modules
config.js
email-config.js
config/config.json
package-lock.json

# local env files
.env.local
Expand Down
5 changes: 5 additions & 0 deletions models/Classes/Classes.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ const nb_class = (sequelize, DataTypes) => {
unique: true,
allowNull: false
},
link_id:{
type: DataTypes.INTEGER,
unique: true,
allowNull: true
},
/*
description: {
type: DataTypes.STRING,
Expand Down
17,012 changes: 0 additions & 17,012 deletions package-lock.json

This file was deleted.

21 changes: 13 additions & 8 deletions routes/annotations.js
Original file line number Diff line number Diff line change
Expand Up @@ -338,17 +338,22 @@ router.get('/new_annotation', (req, res) => {

// TODO: is this the correct way to filter replies?
let goodLocations = locations.filter((location) => {
let head = location.Thread.HeadAnnotation;
try {
let head = location.Thread.HeadAnnotation;

if (head.visibility === 'MYSELF' && head.Author.id !== req.user.id) {
return false;
}
if (head.visibility === 'INSTRUCTORS' && !isUserInstructor) {
return false;
} if (req.query.sectioned === 'true' && isUserStudent && head.Author.id !== req.user.id && !usersICanSee.has(head.Author.id) && !instructors.has(head.Author.id)) {
if (head.visibility === 'MYSELF' && head.Author.id !== req.user.id) {
return false;
}
if (head.visibility === 'INSTRUCTORS' && !isUserInstructor) {
return false;
} if (req.query.sectioned === 'true' && isUserStudent && head.Author.id !== req.user.id && !usersICanSee.has(head.Author.id) && !instructors.has(head.Author.id)) {
return false;
}
return true;
} catch(e) {
console.log(e)
return false;
}
return true;
})

goodLocations.forEach((location) => {
Expand Down
Loading