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

[WIP] Added new create-poll button in post drafting interface (no forms linked yet) #43

Merged
merged 10 commits into from
Feb 11, 2025
+19 −4
Merged

[WIP] Added new create-poll button in post drafting interface (no forms linked yet) #43

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a5f49b0
added julie's changes for testing & build upon (moderator group now a…
yukiiii04 Feb 9, 2025
68d9e7d
made new server & admin now works
yukiiii04 Feb 9, 2025
c5cf673
added new privilege statements relevant json files (privileges, modul…
yukiiii04 Feb 10, 2025
b6fe316
changed classname of button to be create-poll-btn
yukiiii04 Feb 10, 2025
4e8c44d
temporarily removed privilege condition in composer-formatting.tpl, b…
yukiiii04 Feb 10, 2025
ee4a031
added privilege in src/install.js to get instructors privilege to cre…
yukiiii04 Feb 11, 2025
a060334
added another post:file permission to instructors, but but it's not s…
yukiiii04 Feb 11, 2025
1c2c57f
addeed create-poll into composer-formatting.tpl
yukiiii04 Feb 11, 2025
c4f4e2e
commented out composer-formatting from .gitignore
yukiiii04 Feb 11, 2025
cb4347e
Merge branch 'main' into yuki-polls-sprint1
jwjulie Feb 11, 2025
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
11 changes: 10 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
dist/
yarn.lock
npm-debug.log
node_modules/
node_modules/*
!/node_modules/nodebb-plugin-composer-default
/node_modules/nodebb-plugin-composer-default/*
!/node_modules/nodebb-plugin-composer-default/static/
/node_modules/nodebb-plugin-composer-default/static/*
!/node_modules/nodebb-plugin-composer-default/static/templates/
/node_modules/nodebb-plugin-composer-default/static/templates/*
!/node_modules/nodebb-plugin-composer-default/static/templates/partials/
/node_modules/nodebb-plugin-composer-default/static/templates/partials/*
!/node_modules/nodebb-plugin-composer-default/static/templates/partials/composer-formatting.tpl
sftp-config.json
config.json
jsconfig.json
Expand Down
Binary file added dump.rdb
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions public/language/en-US/admin/manage/categories.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
"optional-clone-settings": "(Optional) Clone Settings From Category",
"clone-children": "Clone Children Categories And Settings",
"purge": "Purge Category",
"upload-files": "Upload Files",
"create-poll": "Create Poll",

"enable": "Enable",
"disable": "Disable",
Expand Down
1 change: 1 addition & 0 deletions public/language/en-US/admin/manage/privileges.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"chat-with-privileged": "Chat with Privileged",
"upload-images": "Upload Images",
"upload-files": "Upload Files",
"create-poll": "Create Poll",
"signature": "Signature",
"ban": "Ban",
"mute": "Mute",
Expand Down
1 change: 1 addition & 0 deletions public/language/en-US/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
"ip-address": "IP Address",
"enter-page-number": "Enter page number",
"upload-file": "Upload file",
"create-poll": "Create Poll",
"upload": "Upload",
"uploads": "Uploads",
"allowed-file-types": "Allowed file types are %1",
Expand Down
1 change: 1 addition & 0 deletions public/language/en-US/modules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
"composer.upload-picture": "Upload Image",
"composer.upload-file": "Upload File",
"composer.zen-mode": "Zen Mode",
"composer.create-poll": "Create Poll",
"composer.select-category": "Select a category",
"composer.textarea.placeholder": "Enter your post content here, drag and drop images",
"composer.post-queue-alert": "Hello👋!<br/>This forum uses a post queue system, since you are a new user your post will be hidden until it is approved by our moderation team.",
Expand Down
1 change: 1 addition & 0 deletions src/cli/setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ async function setup(initConfig) {
configFile = path.resolve(paths.baseDir, config);
}

console.log('===000===000=== SETTING UP');
const data = await install.setup();

prestart.loadConfig(configFile);
Expand Down
31 changes: 27 additions & 4 deletions src/install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,26 @@ async function createGlobalModeratorsGroup() {
await groups.show('Global Moderators');
}

async function createInstructorsGroup() {
console.log('===000===000===CREATING INSTRUCTORS');
const groups = require('./groups');
const exists = await groups.exists('Instructors');
if (exists) {
winston.info('Instructor group found, skipping creation!');
} else {
await groups.create({
name: 'Instructors',
userTitle: 'Instructor',
userTitleEnabled: 1,
description: 'Professors and TAs',
hidden: 0,
private: 1,
disableJoinRequests: 1,
});
}
await groups.show('Instructors');
}

async function giveGlobalPrivileges() {
const privileges = require('./privileges');
const defaultPrivileges = [
Expand All @@ -431,11 +451,13 @@ async function giveGlobalPrivileges() {
'groups:local:login',
];
await privileges.global.give(defaultPrivileges, 'registered-users');
await privileges.global.give(defaultPrivileges.concat(['groups:view:users:info']), 'Instructors');
console.log('===000===000===GAVE INSTRUCTORS PERMS');
await privileges.global.give(defaultPrivileges.concat([
'groups:ban', 'groups:upload:post:file', 'groups:view:users:info',
]), 'Global Moderators');
await privileges.global.give(['groups:view:users', 'groups:view:tags', 'groups:view:groups'], 'guests');
await privileges.global.give(['groups:view:users', 'groups:view:tags', 'groups:view:groups'], 'spiders');
'groups:ban', 'groups:upload:post:file', 'create-poll']), 'Global Moderators');
await privileges.global.give(['groups:view:users', 'groups:view:tags', 'groups:view:groups', 'create-poll'], 'guests');
await privileges.global.give(['groups:view:users', 'groups:view:tags', 'groups:view:groups', 'create-poll'], 'spiders');
await privileges.global.give(['groups:view:users', 'groups:view:tags', 'groups:upload:post:file', 'groups:view:groups', 'create-poll'], 'Instructors');
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jwjulie can you review this and see if these changes will break anything (I don't think they will but I'm also not 100% sure if this is necessary). I was attempting to add create-poll as a privilege to all the current roles. 😆 ❤️ ☮️ ✌️

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good! Adding the create-polls privilege should not cause issues with anything I have implemented.

}

async function createCategories() {
Expand Down Expand Up @@ -587,6 +609,7 @@ install.setup = async function () {
await createDefaultUserGroups();
const adminInfo = await createAdministrator();
await createGlobalModeratorsGroup();
await createInstructorsGroup();
await giveGlobalPrivileges();
await createMenuItems();
await createWelcomePost();
Expand Down