diff --git a/.gitignore b/.gitignore index 17bbb8e5f5..4559af13e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ dump.rdb - +dump2.rdb dist/ yarn.lock npm-debug.log @@ -78,3 +78,5 @@ test.sh dump.rdb .archiver_shadow/ .snapshots/ + +.env \ No newline at end of file diff --git a/Dockerfile.railway b/Dockerfile.railway new file mode 100644 index 0000000000..10c38d4bca --- /dev/null +++ b/Dockerfile.railway @@ -0,0 +1,32 @@ +FROM mcr.microsoft.com/devcontainers/javascript-node:1-22-bookworm +COPY . /app +WORKDIR /app + +ARG NODEBB_PORT +ARG NODEBB_DB +ARG REDIS_URL +ARG NODEBB_ADMIN_USERNAME +ARG NODEBB_ADMIN_PASSWORD +ARG NODEBB_ADMIN_EMAIL +ARG NODEBB_URL +ARG NODE_ENV +SHELL ["/bin/bash", "-c"] + +RUN rm -f ./dump.rdb +RUN apt-get update \ + && apt-get install -y \ + iputils-ping \ + redis-server \ + && rm -rf /var/lib/apt/lists/* + +RUN set -eu; \ + . ./parse-redis-url.sh \ + && curl https://qlty.sh | /bin/bash \ + && mv ~/.qlty/bin/qlty /usr/local/bin/qlty \ + && rm -rf ~/.qlty \ + && qlty --version \ + && ./nodebb setup + +EXPOSE 4567 +RUN npm i +CMD ["/bin/sh","./railway-start.sh"] \ No newline at end of file diff --git a/config2.json b/config2.json new file mode 100644 index 0000000000..5728b9a75a --- /dev/null +++ b/config2.json @@ -0,0 +1,17 @@ +{ + "url": "http://127.0.0.1:4567", + "secret": "e132a0f9-93e4-4750-91cc-7f82bcd0a4d3", + "database": "redis", + "port": "4567", + "redis": { + "host": "127.0.0.1", + "port": 6379, + "password": "", + "database": 0 + }, + "test_database": { + "host": "127.0.0.1", + "database": 1, + "port": 6379 + } +} \ No newline at end of file diff --git a/parse-redis-url.sh b/parse-redis-url.sh new file mode 100644 index 0000000000..24e92c8a38 --- /dev/null +++ b/parse-redis-url.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env sh +set -eu + +uri="${REDIS_URL:-}" + +# Drop scheme +rest="${uri#redis://}" + +# Defaults +REDIS_USERNAME="" +REDIS_PASSWORD="" + +# Split creds vs host:port +if [ "${rest#*@}" != "$rest" ]; then + creds="${rest%@*}" # user:password (or just user) + hostport="${rest#*@}" # host:port[/...] + if [ "${creds#*:}" != "$creds" ]; then + REDIS_USERNAME="${creds%%:*}" + REDIS_PASSWORD="${creds#*:}" + else + REDIS_USERNAME="$creds" + REDIS_PASSWORD="" + fi +else + hostport="$rest" +fi + +# Strip any /db suffix +hostport="${hostport%%/*}" + +REDIS_HOST="${hostport%%:*}" +REDIS_PORT="${hostport##*:}" + +# Export generic vars +# export REDIS_HOST REDIS_PORT REDIS_USERNAME REDIS_PASSWORD + +# Export NodeBB vars +export NODEBB_DB_HOST="$REDIS_HOST" +export NODEBB_DB_PORT="$REDIS_PORT" +export NODEBB_DB_USER="$REDIS_USERNAME" +export NODEBB_DB_PASSWORD="$REDIS_PASSWORD" + +exec "$@" diff --git a/public/openapi/components/schemas/PostObject.yaml b/public/openapi/components/schemas/PostObject.yaml index 1904cded51..f02b8a5b9c 100644 --- a/public/openapi/components/schemas/PostObject.yaml +++ b/public/openapi/components/schemas/PostObject.yaml @@ -2,6 +2,19 @@ PostObject: description: A single post in the array returned from `Posts.getPostSummaryByPids` type: object properties: + endorsedVotes: + type: array + items: + type: object + properties: + username: + type: string + uid: + type: number + displayname: + type: string + isLocal: + type: boolean pid: type: number tid: @@ -54,7 +67,8 @@ PostObject: description: This is either username or fullname depending on forum and user settings userslug: type: string - description: An URL-safe variant of the username (i.e. lower-cased, spaces + description: + An URL-safe variant of the username (i.e. lower-cased, spaces removed, etc.) picture: type: string @@ -63,12 +77,14 @@ PostObject: type: string icon:text: type: string - description: A single-letter representation of a username. This is used in the + description: + A single-letter representation of a username. This is used in the auto-generated icon given to users without an avatar icon:bgColor: type: string - description: A six-character hexadecimal colour code assigned to the user. This + description: + A six-character hexadecimal colour code assigned to the user. This value is used in conjunction with `icon:text` for the user's auto-generated icon @@ -102,7 +118,8 @@ PostObject: type: number mainPid: type: number - description: The post id of the first post in this topic (also called the + description: + The post id of the first post in this topic (also called the "original post") teaserPid: type: number @@ -140,7 +157,8 @@ PostObject: type: string parentCid: type: number - description: The category identifier for the category that is the immediate + description: + The category identifier for the category that is the immediate ancestor of the current category bgColor: type: string @@ -160,6 +178,19 @@ PostDataObject: allOf: - type: object properties: + endorsedVotes: + type: array + items: + type: object + properties: + username: + type: string + uid: + type: number + displayname: + type: string + isLocal: + type: boolean pid: type: number uid: @@ -212,7 +243,8 @@ PostDataObject: description: This is either username or fullname depending on forum and user settings userslug: type: string - description: An URL-safe variant of the username (i.e. lower-cased, spaces + description: + An URL-safe variant of the username (i.e. lower-cased, spaces removed, etc.) reputation: type: number @@ -249,12 +281,14 @@ PostDataObject: nullable: true icon:text: type: string - description: A single-letter representation of a username. This is used in the + description: + A single-letter representation of a username. This is used in the auto-generated icon given to users without an avatar icon:bgColor: type: string - description: A six-character hexadecimal colour code assigned to the user. This + description: + A six-character hexadecimal colour code assigned to the user. This value is used in conjunction with `icon:text` for the user's auto-generated icon @@ -317,7 +351,8 @@ PostDataObject: description: A friendly name for a given user account userslug: type: string - description: An URL-safe variant of the username (i.e. lower-cased, spaces + description: + An URL-safe variant of the username (i.e. lower-cased, spaces removed, etc.) picture: type: string @@ -326,12 +361,14 @@ PostDataObject: description: A user identifier icon:text: type: string - description: A single-letter representation of a username. This is used in the + description: + A single-letter representation of a username. This is used in the auto-generated icon given to users without an avatar icon:bgColor: type: string - description: A six-character hexadecimal colour code assigned to the user. This + description: + A six-character hexadecimal colour code assigned to the user. This value is used in conjunction with `icon:text` for the user's auto-generated icon diff --git a/public/openapi/components/schemas/TopicObject.yaml b/public/openapi/components/schemas/TopicObject.yaml index 30ba9d3a77..9211fa14e5 100644 --- a/public/openapi/components/schemas/TopicObject.yaml +++ b/public/openapi/components/schemas/TopicObject.yaml @@ -1,6 +1,6 @@ TopicObject: allOf: - - $ref: '#/TopicObjectSlim' + - $ref: "#/TopicObjectSlim" - type: object properties: lastposttime: @@ -48,7 +48,8 @@ TopicObject: type: string userslug: type: string - description: An URL-safe variant of the username (i.e. lower-cased, spaces + description: + An URL-safe variant of the username (i.e. lower-cased, spaces removed, etc.) reputation: type: number @@ -66,12 +67,14 @@ TopicObject: type: string icon:text: type: string - description: A single-letter representation of a username. This is used in the + description: + A single-letter representation of a username. This is used in the auto-generated icon given to users without an avatar icon:bgColor: type: string - description: A six-character hexadecimal colour code assigned to the user. This + description: + A six-character hexadecimal colour code assigned to the user. This value is used in conjunction with `icon:text` for the user's auto-generated icon @@ -109,6 +112,19 @@ TopicObject: sourceContent: type: string nullable: true + endorsedVotes: + type: array + items: + type: object + properties: + username: + type: string + uid: + type: number + displayname: + type: string + isLocal: + type: boolean timestampISO: type: string description: An ISO 8601 formatted date string (complementing `timestamp`) @@ -127,19 +143,22 @@ TopicObject: type: boolean userslug: type: string - description: An URL-safe variant of the username (i.e. lower-cased, spaces + description: + An URL-safe variant of the username (i.e. lower-cased, spaces removed, etc.) picture: nullable: true type: string icon:text: type: string - description: A single-letter representation of a username. This is used in the + description: + A single-letter representation of a username. This is used in the auto-generated icon given to users without an avatar icon:bgColor: type: string - description: A six-character hexadecimal colour code assigned to the user. This + description: + A six-character hexadecimal colour code assigned to the user. This value is used in conjunction with `icon:text` for the user's auto-generated icon @@ -239,7 +258,8 @@ TopicObjectSlim: type: number pinned: type: number - description: Whether or not this particular topic is pinned to the top of the + description: + Whether or not this particular topic is pinned to the top of the category timestamp: type: number @@ -295,4 +315,4 @@ TopicObjectSlim: type: number description: The number of thumbnails associated with this topic required: - - tid \ No newline at end of file + - tid diff --git a/public/openapi/read/categories.yaml b/public/openapi/read/categories.yaml index 76d2375ebb..92a5e1e189 100644 --- a/public/openapi/read/categories.yaml +++ b/public/openapi/read/categories.yaml @@ -76,6 +76,19 @@ get: items: type: object properties: + endorsedVotes: + type: array + items: + type: object + properties: + username: + type: string + uid: + type: number + displayname: + type: string + isLocal: + type: boolean pid: type: number timestamp: @@ -96,19 +109,22 @@ get: description: A friendly name for a given user account userslug: type: string - description: An URL-safe variant of the username (i.e. lower-cased, spaces + description: + An URL-safe variant of the username (i.e. lower-cased, spaces removed, etc.) picture: nullable: true type: string icon:text: type: string - description: A single-letter representation of a username. This is used in the + description: + A single-letter representation of a username. This is used in the auto-generated icon given to users without an avatar icon:bgColor: type: string - description: A six-character hexadecimal colour code assigned to the user. This + description: + A six-character hexadecimal colour code assigned to the user. This value is used in conjunction with `icon:text` for the user's auto-generated icon @@ -134,6 +150,19 @@ get: items: type: object properties: + endorsedVotes: + type: array + items: + type: object + properties: + username: + type: string + uid: + type: number + displayname: + type: string + isLocal: + type: boolean pid: type: number tid: @@ -165,19 +194,22 @@ get: description: This is either username or fullname depending on forum and user settings userslug: type: string - description: An URL-safe variant of the username (i.e. lower-cased, spaces + description: + An URL-safe variant of the username (i.e. lower-cased, spaces removed, etc.) picture: nullable: true type: string icon:text: type: string - description: A single-letter representation of a username. This is used in the + description: + A single-letter representation of a username. This is used in the auto-generated icon given to users without an avatar icon:bgColor: type: string - description: A six-character hexadecimal colour code assigned to the user. This + description: + A six-character hexadecimal colour code assigned to the user. This value is used in conjunction with `icon:text` for the user's auto-generated icon @@ -223,34 +255,34 @@ get: user: type: object properties: - uid: - type: number - example: 1 - isLocal: - type: boolean - description: Whether the user belongs to the local installation or not. - username: - type: string - example: Dragon Fruit - userslug: - type: string - example: dragon-fruit - picture: - type: string - example: 'https://images.unsplash.com/photo-1560070094-e1f2ddec4337?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=256&h=256&q=80' - nullable: true - displayname: - type: string - description: This is either username or fullname depending on forum and user settings - example: Dragon Fruit - 'icon:text': - type: string - example: D - 'icon:bgColor': - type: string - example: '#9c27b0' + uid: + type: number + example: 1 + isLocal: + type: boolean + description: Whether the user belongs to the local installation or not. + username: + type: string + example: Dragon Fruit + userslug: + type: string + example: dragon-fruit + picture: + type: string + example: "https://images.unsplash.com/photo-1560070094-e1f2ddec4337?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=256&h=256&q=80" + nullable: true + displayname: + type: string + description: This is either username or fullname depending on forum and user settings + example: Dragon Fruit + "icon:text": + type: string + example: D + "icon:bgColor": + type: string + example: "#9c27b0" imageClass: type: string - $ref: ../components/schemas/Pagination.yaml#/Pagination - $ref: ../components/schemas/Breadcrumbs.yaml#/Breadcrumbs - - $ref: ../components/schemas/CommonProps.yaml#/CommonProps \ No newline at end of file + - $ref: ../components/schemas/CommonProps.yaml#/CommonProps diff --git a/public/openapi/read/index.yaml b/public/openapi/read/index.yaml index 4c45da4360..7dd491a9a8 100644 --- a/public/openapi/read/index.yaml +++ b/public/openapi/read/index.yaml @@ -94,19 +94,22 @@ get: description: This is either username or fullname depending on forum and user settings userslug: type: string - description: An URL-safe variant of the username (i.e. lower-cased, spaces + description: + An URL-safe variant of the username (i.e. lower-cased, spaces removed, etc.) picture: nullable: true type: string icon:text: type: string - description: A single-letter representation of a username. This is used in the + description: + A single-letter representation of a username. This is used in the auto-generated icon given to users without an avatar icon:bgColor: type: string - description: A six-character hexadecimal colour code assigned to the user. This + description: + A six-character hexadecimal colour code assigned to the user. This value is used in conjunction with `icon:text` for the user's auto-generated icon @@ -118,7 +121,8 @@ get: description: A category identifier parentCid: type: number - description: The category identifier for the category that is the immediate + description: + The category identifier for the category that is the immediate ancestor of the current category topic: type: object @@ -127,6 +131,19 @@ get: type: string title: type: string + endorsedVotes: + type: array + items: + type: object + properties: + username: + type: string + uid: + type: number + displayname: + type: string + isLocal: + type: boolean imageClass: type: string timesClicked: @@ -136,6 +153,19 @@ get: items: type: object properties: + endorsedVotes: + type: array + items: + type: object + properties: + username: + type: string + uid: + type: number + displayname: + type: string + isLocal: + type: boolean pid: type: number tid: @@ -164,19 +194,22 @@ get: description: This is either username or fullname depending on forum and user settings userslug: type: string - description: An URL-safe variant of the username (i.e. lower-cased, spaces + description: + An URL-safe variant of the username (i.e. lower-cased, spaces removed, etc.) picture: nullable: true type: string icon:text: type: string - description: A single-letter representation of a username. This is used in the + description: + A single-letter representation of a username. This is used in the auto-generated icon given to users without an avatar icon:bgColor: type: string - description: A six-character hexadecimal colour code assigned to the user. This + description: + A six-character hexadecimal colour code assigned to the user. This value is used in conjunction with `icon:text` for the user's auto-generated icon @@ -225,33 +258,33 @@ get: user: type: object properties: - uid: - type: number - example: 1 - username: - type: string - example: Dragon Fruit - userslug: - type: string - example: dragon-fruit - picture: - type: string - example: 'https://images.unsplash.com/photo-1560070094-e1f2ddec4337?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=256&h=256&q=80' - nullable: true - displayname: - type: string - description: This is either username or fullname depending on forum and user settings - example: Dragon Fruit - 'icon:text': - type: string - example: D - 'icon:bgColor': - type: string - example: '#9c27b0' - isLocal: - type: boolean - description: Whether the user belongs to the local installation or not. + uid: + type: number + example: 1 + username: + type: string + example: Dragon Fruit + userslug: + type: string + example: dragon-fruit + picture: + type: string + example: "https://images.unsplash.com/photo-1560070094-e1f2ddec4337?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=256&h=256&q=80" + nullable: true + displayname: + type: string + description: This is either username or fullname depending on forum and user settings + example: Dragon Fruit + "icon:text": + type: string + example: D + "icon:bgColor": + type: string + example: "#9c27b0" + isLocal: + type: boolean + description: Whether the user belongs to the local installation or not. imageClass: type: string - $ref: ../components/schemas/Pagination.yaml#/Pagination - - $ref: ../components/schemas/CommonProps.yaml#/CommonProps \ No newline at end of file + - $ref: ../components/schemas/CommonProps.yaml#/CommonProps diff --git a/public/openapi/read/post-queue.yaml b/public/openapi/read/post-queue.yaml index 9bd93903c4..b7e890953b 100644 --- a/public/openapi/read/post-queue.yaml +++ b/public/openapi/read/post-queue.yaml @@ -35,6 +35,19 @@ get: allOf: - type: object properties: + endorsedVotes: + type: array + items: + type: object + properties: + username: + type: string + uid: + type: number + displayname: + type: string + isLocal: + type: boolean id: type: string uid: @@ -134,7 +147,8 @@ get: description: A friendly name for a given user account userslug: type: string - description: An URL-safe variant of the username (i.e. lower-cased, spaces + description: + An URL-safe variant of the username (i.e. lower-cased, spaces removed, etc.) picture: nullable: true @@ -144,12 +158,14 @@ get: description: A user identifier icon:text: type: string - description: A single-letter representation of a username. This is used in the + description: + A single-letter representation of a username. This is used in the auto-generated icon given to users without an avatar icon:bgColor: type: string - description: A six-character hexadecimal colour code assigned to the user. This + description: + A six-character hexadecimal colour code assigned to the user. This value is used in conjunction with `icon:text` for the user's auto-generated icon @@ -180,4 +196,4 @@ get: type: boolean - $ref: ../components/schemas/Pagination.yaml#/Pagination - $ref: ../components/schemas/Breadcrumbs.yaml#/Breadcrumbs - - $ref: ../components/schemas/CommonProps.yaml#/CommonProps \ No newline at end of file + - $ref: ../components/schemas/CommonProps.yaml#/CommonProps diff --git a/public/openapi/read/unread.yaml b/public/openapi/read/unread.yaml index 77e9ec44f6..a395e3fb6d 100644 --- a/public/openapi/read/unread.yaml +++ b/public/openapi/read/unread.yaml @@ -81,7 +81,8 @@ get: type: string userslug: type: string - description: An URL-safe variant of the username (i.e. lower-cased, spaces + description: + An URL-safe variant of the username (i.e. lower-cased, spaces removed, etc.) reputation: type: number @@ -99,12 +100,14 @@ get: type: string icon:text: type: string - description: A single-letter representation of a username. This is used in the + description: + A single-letter representation of a username. This is used in the auto-generated icon given to users without an avatar icon:bgColor: type: string - description: A six-character hexadecimal colour code assigned to the user. This + description: + A six-character hexadecimal colour code assigned to the user. This value is used in conjunction with `icon:text` for the user's auto-generated icon @@ -128,6 +131,19 @@ get: type: object nullable: true properties: + endorsedVotes: + type: array + items: + type: object + properties: + username: + type: string + uid: + type: number + displayname: + type: string + isLocal: + type: boolean pid: type: number uid: @@ -161,19 +177,22 @@ get: type: boolean userslug: type: string - description: An URL-safe variant of the username (i.e. lower-cased, spaces + description: + An URL-safe variant of the username (i.e. lower-cased, spaces removed, etc.) picture: nullable: true type: string icon:text: type: string - description: A single-letter representation of a username. This is used in the + description: + A single-letter representation of a username. This is used in the auto-generated icon given to users without an avatar icon:bgColor: type: string - description: A six-character hexadecimal colour code assigned to the user. This + description: + A six-character hexadecimal colour code assigned to the user. This value is used in conjunction with `icon:text` for the user's auto-generated icon @@ -270,4 +289,4 @@ get: type: string - $ref: ../components/schemas/Pagination.yaml#/Pagination - $ref: ../components/schemas/Breadcrumbs.yaml#/Breadcrumbs - - $ref: ../components/schemas/CommonProps.yaml#/CommonProps \ No newline at end of file + - $ref: ../components/schemas/CommonProps.yaml#/CommonProps diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index 10c5d54cf2..5cbb0334d0 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -69,8 +69,15 @@ define('forum/topic/events', [ const votes = $('[data-pid="' + data.post.pid + '"] [component="post/vote-count"]').filter(function (index, el) { return $(el).closest('[data-pid]').attr('data-pid') === String(data.post.pid); }); + const endorsedVotesComponent = $('[data-pid="' + data.post.pid + '"] [component="post/endorsed"]'); const reputationElements = $('.reputation[data-uid="' + data.post.uid + '"]'); votes.html(data.post.votes).attr('data-votes', data.post.votes); + if (data.endorsedData.length) { + endorsedVotesComponent.show(); + endorsedVotesComponent.find("[component='post/endorsed/text']").text(data.endorsedData.map(user => user.username).join(', ')); + } else { + endorsedVotesComponent.hide(); + } reputationElements.html(data.user.reputation).attr('data-reputation', data.user.reputation); } diff --git a/railway-start.sh b/railway-start.sh new file mode 100644 index 0000000000..f5b948fc71 --- /dev/null +++ b/railway-start.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +./nodebb start +./nodebb log \ No newline at end of file diff --git a/src/api/helpers.js b/src/api/helpers.js index 298725e915..efbba96a57 100644 --- a/src/api/helpers.js +++ b/src/api/helpers.js @@ -73,7 +73,7 @@ exports.doTopicAction = async function (action, event, caller, { tids }) { socketHelpers.emitToUids(event, data, notifyUids); await logTopicAction(action, caller, tid, title); - switch(action) { + switch (action) { case 'delete': // falls through case 'purge': { if (utils.isNumber(cid) && parseInt(cid, 10) > 0) { @@ -141,6 +141,7 @@ exports.postCommand = async function (caller, command, eventName, notification, return await executeCommand(caller, command, eventName, notification, filteredData.data); }; +// execute voting command on a post and send a message to client on vote update async function executeCommand(caller, command, eventName, notification, data) { const result = await posts[command](data.pid, caller.uid); if (result && eventName) { diff --git a/src/api/posts.js b/src/api/posts.js index c9a570dec4..7c892dec97 100644 --- a/src/api/posts.js +++ b/src/api/posts.js @@ -454,13 +454,13 @@ async function canSeeVotes(uid, cids, type) { const cidToAllowed = _.zipObject(uniqCids, canRead); const checks = cids.map( (cid, index) => isAdmin || isMod[index] || - ( - cidToAllowed[cid] && ( - meta.config[type] === 'all' || - (meta.config[type] === 'loggedin' && parseInt(uid, 10) > 0) + cidToAllowed[cid] && + ( + meta.config[type] === 'all' || + (meta.config[type] === 'loggedin' && parseInt(uid, 10) > 0) + ) ) - ) ); return isArray ? checks : checks[0]; } diff --git a/src/install.js b/src/install.js index 11ef81c2e9..c6846b0e27 100644 --- a/src/install.js +++ b/src/install.js @@ -72,7 +72,6 @@ function checkSetupFlagEnv() { if (Object.keys(envConfMap).some(key => envKeys.includes(key))) { winston.info('[install/checkSetupFlagEnv] checking env vars for setup info...'); setupVal = setupVal || {}; - Object.entries(process.env).forEach(([evName, evValue]) => { // get setup values from env if (evName.startsWith('NODEBB_DB_')) { setupVal[`${process.env.NODEBB_DB}:${envConfMap[evName]}`] = evValue; diff --git a/src/posts/data.js b/src/posts/data.js index 28e6c24aaa..6d79a2b924 100644 --- a/src/posts/data.js +++ b/src/posts/data.js @@ -3,12 +3,13 @@ const db = require('../database'); const plugins = require('../plugins'); const utils = require('../utils'); - const intFields = [ 'uid', 'pid', 'tid', 'deleted', 'timestamp', 'upvotes', 'downvotes', 'deleterUid', 'edited', 'replies', 'bookmarks', 'announces', ]; +const groups = require('../groups'); +const user = require('../user'); module.exports = function (Posts) { Posts.getPostsFields = async function (pids, fields) { @@ -22,12 +23,20 @@ module.exports = function (Posts) { posts: postData, fields: fields, }); + + const endorsedVotes = await Posts.getEndorsedUsers(pids); + result.posts.forEach(post => modifyPost(post, fields)); + result.posts.forEach((post, i) => { + if (post === undefined || post === null) return; + post.endorsedVotes = endorsedVotes[i]; + }); return result.posts; }; Posts.getPostData = async function (pid) { const posts = await Posts.getPostsFields([pid], []); + return posts && posts.length ? posts[0] : null; }; @@ -53,6 +62,19 @@ module.exports = function (Posts) { await db.setObject(`post:${pid}`, data); plugins.hooks.fire('action:post.setFields', { data: { ...data, pid } }); }; + Posts.getEndorsedUsers = async function (pids) { + const upvoterIds = await db.getSetsMembers(pids.map(pid => `pid:${pid}:upvote`)); + const flattenedUpvoterIds = [... new Set(upvoterIds.flat())]; + + const userDataMap = (await user.getUsersFields(flattenedUpvoterIds, ['username'])).reduce((acc, user) => ({ ...acc, [user.uid]: user }), {}); + const userGroupsMap = (await groups.getUserGroups(flattenedUpvoterIds)) + .reduce((acc, groups, i) => ({ ...acc, [flattenedUpvoterIds[i]]: groups }), {}); + const specialUpvotes = upvoterIds.map(userIds => + userIds.filter(uid => + userGroupsMap[uid].find(group => group.slug.toLowerCase() === 'instructor' || group.slug.toLowerCase() === 'ta') !== undefined) + .map(uid => userDataMap[uid])); + return specialUpvotes; + }; }; function modifyPost(post, fields) { diff --git a/src/posts/votes.js b/src/posts/votes.js index d9487b1dc2..585ac8ea16 100644 --- a/src/posts/votes.js +++ b/src/posts/votes.js @@ -190,13 +190,13 @@ module.exports = function (Posts) { await db.sortedSetAdd(`uid:${uid}:downvote`, now, pid); } } - const postData = await Posts.getPostFields(pid, ['pid', 'uid', 'tid']); const newReputation = await user.incrementUserReputationBy(postData.uid, type === 'upvote' ? 1 : -1); await adjustPostVotes(postData, uid, type, unvote); await fireVoteHook(postData, uid, type, unvote, voteStatus); + const endorsedData = (await Posts.getEndorsedUsers([pid]))[0]; return { user: { @@ -206,6 +206,7 @@ module.exports = function (Posts) { post: postData, upvote: type === 'upvote' && !unvote, downvote: type === 'downvote' && !unvote, + endorsedData, }; } diff --git a/test/api.js b/test/api.js index d9a4062c44..6990a199f6 100644 --- a/test/api.js +++ b/test/api.js @@ -535,7 +535,7 @@ describe('API', async () => { assert( responses.hasOwnProperty('418') || Object.keys(responses).includes(String(result.response.statusCode)), - `${method.toUpperCase()} ${path} sent back unexpected HTTP status code: ${result.response.statusCode}` + `${method.toUpperCase()} ${path} sent back unexpected HTTP status code: ${result.response.statusCode} (expected: ${JSON.stringify(responses)})` ); }); @@ -697,7 +697,7 @@ describe('API', async () => { return; } - assert(schema[prop], `"${prop}" was found in response, but is not defined in schema (path: ${method} ${path}, context: ${context}), SCHEMA ${JSON.stringify(response)}`); + assert(schema[prop], `"${prop}" was found in response, but is not defined in schema (path: ${method} ${path}, context: ${context}), SCHEMA ${JSON.stringify(schema)} ${JSON.stringify(response)}`); }); } }); diff --git a/vendor/nodebb-theme-harmony-2.1.35/templates/partials/account/header.tpl b/vendor/nodebb-theme-harmony-2.1.35/templates/partials/account/header.tpl index 0d372d9c04..756936dad9 100644 --- a/vendor/nodebb-theme-harmony-2.1.35/templates/partials/account/header.tpl +++ b/vendor/nodebb-theme-harmony-2.1.35/templates/partials/account/header.tpl @@ -1,3 +1,4 @@ +
diff --git a/vendor/nodebb-theme-harmony-2.1.35/templates/partials/topic/post.tpl b/vendor/nodebb-theme-harmony-2.1.35/templates/partials/topic/post.tpl index 0ba7023ae7..1f1b6a4e49 100644 --- a/vendor/nodebb-theme-harmony-2.1.35/templates/partials/topic/post.tpl +++ b/vendor/nodebb-theme-harmony-2.1.35/templates/partials/topic/post.tpl @@ -8,6 +8,7 @@ {{{ if (./parent && !hideParent) }}} {{{ end }}} +
@@ -85,6 +86,22 @@
+ +
+
+ + Endorsed by + + {{{ each posts.endorsedVotes }}} + {{{ if @last }}} + {posts.endorsedVotes.username} + {{{ else }}} + {posts.endorsedVotes.username}, + {{{ end }}} + {{{ end }}} + +
+
{{{ if posts.user.signature }}}
{posts.user.signature}
{{{ end }}} diff --git a/vendor/nodebb-theme-harmony-2.1.35/templates/topic.tpl b/vendor/nodebb-theme-harmony-2.1.35/templates/topic.tpl index 8a298b1f10..a59df29f1d 100644 --- a/vendor/nodebb-theme-harmony-2.1.35/templates/topic.tpl +++ b/vendor/nodebb-theme-harmony-2.1.35/templates/topic.tpl @@ -83,7 +83,6 @@ {{{ if ./editedISO }}} {{{ end }}} - {{{ if (config.topicPostSort != "most_votes") }}} diff --git a/vendor/nodebb-theme-harmony-main/.gitignore b/vendor/nodebb-theme-harmony-main/.gitignore deleted file mode 100644 index 270508c166..0000000000 --- a/vendor/nodebb-theme-harmony-main/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -*.css -npm-debug.log -sftp-config.json -*.sublime-project -*.sublime-workspace -.idea -.vscode -node_modules/ \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/.npmignore b/vendor/nodebb-theme-harmony-main/.npmignore deleted file mode 100644 index 2eb0848797..0000000000 --- a/vendor/nodebb-theme-harmony-main/.npmignore +++ /dev/null @@ -1,5 +0,0 @@ -*.css -npm-debug.log -sftp-config.json -*.sublime-project -*.sublime-workspace diff --git a/vendor/nodebb-theme-harmony-main/README.md b/vendor/nodebb-theme-harmony-main/README.md deleted file mode 100644 index 94e0fea1d1..0000000000 --- a/vendor/nodebb-theme-harmony-main/README.md +++ /dev/null @@ -1,22 +0,0 @@ -Harmony theme for NodeBB -==================== - -The Harmony theme is the default theme for NodeBB for versions spanning v3.0.0 onwards. - -## Issues - -Issues are tracked in [the main project issue tracker](https://github.com/NodeBB/NodeBB/issues?q=is%3Aopen+is%3Aissue+label%3Athemes). - -## Screenshots - -### Categories - -_The cards in the header are added by the recent cards plugin. https://github.com/NodeBB-Community/nodebb-plugin-recent-cards_ - - - -### Recent - - -### Topic - diff --git a/vendor/nodebb-theme-harmony-main/eslint.config.mjs b/vendor/nodebb-theme-harmony-main/eslint.config.mjs deleted file mode 100644 index f0da2045c6..0000000000 --- a/vendor/nodebb-theme-harmony-main/eslint.config.mjs +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -import serverConfig from 'eslint-config-nodebb'; -import publicConfig from 'eslint-config-nodebb/public'; - -export default [ - ...publicConfig, - ...serverConfig, -]; - diff --git a/vendor/nodebb-theme-harmony-main/languages/harmony.json b/vendor/nodebb-theme-harmony-main/languages/harmony.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/vendor/nodebb-theme-harmony-main/languages/harmony.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/lib/controllers.js b/vendor/nodebb-theme-harmony-main/lib/controllers.js deleted file mode 100644 index 379ec06509..0000000000 --- a/vendor/nodebb-theme-harmony-main/lib/controllers.js +++ /dev/null @@ -1,29 +0,0 @@ -'use strict'; - -const Controllers = module.exports; - -const accountHelpers = require.main.require('./src/controllers/accounts/helpers'); -const helpers = require.main.require('./src/controllers/helpers'); - -Controllers.renderAdminPage = (req, res) => { - res.render('admin/plugins/harmony', { - title: '[[themes/harmony:theme-name]]', - }); -}; - -Controllers.renderThemeSettings = async (req, res, next) => { - const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query); - if (!userData) { - return next(); - } - const lib = require('../library'); - userData.theme = await lib.loadThemeConfig(userData.uid); - - userData.title = '[[themes/harmony:settings.title]]'; - userData.breadcrumbs = helpers.buildBreadcrumbs([ - { text: userData.username, url: `/user/${userData.userslug}` }, - { text: '[[themes/harmony:settings.title]]' }, - ]); - - res.render('account/theme', userData); -}; diff --git a/vendor/nodebb-theme-harmony-main/library.js b/vendor/nodebb-theme-harmony-main/library.js deleted file mode 100644 index 45f8bd2707..0000000000 --- a/vendor/nodebb-theme-harmony-main/library.js +++ /dev/null @@ -1,187 +0,0 @@ -'use strict'; - -const nconf = require.main.require('nconf'); -const meta = require.main.require('./src/meta'); -const _ = require.main.require('lodash'); -const user = require.main.require('./src/user'); - -const controllers = require('./lib/controllers'); - -const library = module.exports; - -const defaults = { - enableQuickReply: 'on', - enableBreadcrumbs: 'on', - centerHeaderElements: 'off', - mobileTopicTeasers: 'off', - stickyToolbar: 'on', - topicSidebarTools: 'on', - topMobilebar: 'off', - autohideBottombar: 'on', - openSidebars: 'off', - chatModals: 'off', -}; - -library.init = async function (params) { - const { router, middleware } = params; - const routeHelpers = require.main.require('./src/routes/helpers'); - - routeHelpers.setupAdminPageRoute(router, '/admin/plugins/harmony', [], controllers.renderAdminPage); - - routeHelpers.setupPageRoute(router, '/user/:userslug/theme', [ - middleware.exposeUid, - middleware.ensureLoggedIn, - middleware.canViewUsers, - middleware.checkAccountPermissions, - ], controllers.renderThemeSettings); - - if (nconf.get('isPrimary') && process.env.NODE_ENV === 'production') { - setTimeout(buildSkins, 0); - } -}; - -async function buildSkins() { - try { - const plugins = require.main.require('./src/plugins'); - await plugins.prepareForBuild(['client side styles']); - for (const skin of meta.css.supportedSkins) { - await meta.css.buildBundle(`client-${skin}`, true); - } - require.main.require('./src/meta/minifier').killAll(); - } catch (err) { - console.error(err.stack); - } -} - -library.addAdminNavigation = async function (header) { - header.plugins.push({ - route: '/plugins/harmony', - icon: 'fa-paint-brush', - name: '[[themes/harmony:theme-name]]', - }); - return header; -}; - -library.addProfileItem = async (data) => { - data.links.push({ - id: 'theme', - route: 'theme', - icon: 'fa-paint-brush', - name: '[[themes/harmony:settings.title]]', - visibility: { - self: true, - other: false, - moderator: false, - globalMod: false, - admin: false, - }, - }); - - return data; -}; - -library.defineWidgetAreas = async function (areas) { - const locations = ['header', 'sidebar', 'footer']; - const templates = [ - 'categories.tpl', 'category.tpl', 'topic.tpl', 'users.tpl', - 'unread.tpl', 'recent.tpl', 'popular.tpl', 'top.tpl', 'tags.tpl', 'tag.tpl', - 'login.tpl', 'register.tpl', 'world.tpl', - ]; - function capitalizeFirst(str) { - return str.charAt(0).toUpperCase() + str.slice(1); - } - templates.forEach((template) => { - locations.forEach((location) => { - areas.push({ - name: `${capitalizeFirst(template.split('.')[0])} ${capitalizeFirst(location)}`, - template: template, - location: location, - }); - }); - }); - - areas = areas.concat([ - { - name: 'Main post header', - template: 'topic.tpl', - location: 'mainpost-header', - }, - { - name: 'Main post footer', - template: 'topic.tpl', - location: 'mainpost-footer', - }, - { - name: 'Sidebar Footer', - template: 'global', - location: 'sidebar-footer', - }, - { - name: 'Brand Header', - template: 'global', - location: 'brand-header', - }, - { - name: 'About me (before)', - template: 'account/profile.tpl', - location: 'profile-aboutme-before', - }, - { - name: 'About me (after)', - template: 'account/profile.tpl', - location: 'profile-aboutme-after', - }, - ]); - - return areas; -}; - -library.loadThemeConfig = async function (uid) { - const [themeConfig, userConfig] = await Promise.all([ - meta.settings.get('harmony'), - user.getSettings(uid), - ]); - - const config = { ...defaults, ...themeConfig, ...(_.pick(userConfig, Object.keys(defaults))) }; - config.enableQuickReply = config.enableQuickReply === 'on'; - config.enableBreadcrumbs = config.enableBreadcrumbs === 'on'; - config.centerHeaderElements = config.centerHeaderElements === 'on'; - config.mobileTopicTeasers = config.mobileTopicTeasers === 'on'; - config.stickyToolbar = config.stickyToolbar === 'on'; - config.topicSidebarTools = config.topicSidebarTools === 'on'; - config.autohideBottombar = config.autohideBottombar === 'on'; - config.topMobilebar = config.topMobilebar === 'on'; - config.openSidebars = config.openSidebars === 'on'; - config.chatModals = config.chatModals === 'on'; - return config; -}; - -library.getThemeConfig = async function (config) { - config.theme = await library.loadThemeConfig(config.uid); - config.openDraftsOnPageLoad = false; - return config; -}; - -library.getAdminSettings = async function (hookData) { - if (hookData.plugin === 'harmony') { - hookData.values = { - ...defaults, - ...hookData.values, - }; - } - return hookData; -}; - -library.saveUserSettings = async function (hookData) { - Object.keys(defaults).forEach((key) => { - if (hookData.data.hasOwnProperty(key)) { - hookData.settings[key] = hookData.data[key] || undefined; - } - }); - return hookData; -}; - -library.filterMiddlewareRenderHeader = async function (hookData) { - hookData.templateData.bootswatchSkinOptions = await meta.css.getSkinSwitcherOptions(hookData.req.uid); - return hookData; -}; \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/package.json b/vendor/nodebb-theme-harmony-main/package.json deleted file mode 100644 index ed8f50b600..0000000000 --- a/vendor/nodebb-theme-harmony-main/package.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "name": "nodebb-theme-harmony", - "version": "2.1.33", - "nbbpm": { - "compatibility": "^4.0.0" - }, - "description": "Harmony theme for NodeBB", - "main": "library.js", - "repository": { - "type": "git", - "url": "https://github.com/NodeBB/nodebb-theme-harmony" - }, - "scripts": { - "lint": "eslint ." - }, - "keywords": [ - "nodebb", - "theme", - "forum", - "bootstrap", - "responsive" - ], - "contributors": [ - { - "name": "Julian Lam", - "email": "julian@nodebb.org", - "url": "https://github.com/julianlam" - }, - { - "name": "Barış Soner Uşaklı", - "email": "baris@nodebb.org", - "url": "https://github.com/barisusakli" - } - ], - "license": "MIT", - "bugs": { - "url": "https://github.com/NodeBB/nodebb-theme-harmony/issues" - }, - "dependencies": { - "@fontsource/inter": "5.2.8", - "@fontsource/poppins": "5.2.7" - }, - "devDependencies": { - "eslint": "9.39.2", - "eslint-config-nodebb": "^1.1.4" - } -} diff --git a/vendor/nodebb-theme-harmony-main/plugin.json b/vendor/nodebb-theme-harmony-main/plugin.json deleted file mode 100644 index 96d5e2acf4..0000000000 --- a/vendor/nodebb-theme-harmony-main/plugin.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "id": "nodebb-theme-harmony", - "hooks": [ - { "hook": "static:app.load", "method": "init" }, - { "hook": "filter:admin.header.build", "method": "addAdminNavigation" }, - { "hook": "filter:widgets.getAreas", "method": "defineWidgetAreas" }, - { "hook": "filter:config.get", "method": "getThemeConfig" }, - { "hook": "filter:settings.get", "method": "getAdminSettings"}, - { "hook": "filter:user.saveSettings", "method": "saveUserSettings" }, - { "hook": "filter:user.profileMenu", "method": "addProfileItem" }, - { "hook": "filter:middleware.renderHeader", "method": "filterMiddlewareRenderHeader" } - ], - "scripts": [ - "public/harmony.js" - ], - "modules": { - "../admin/plugins/harmony.js": "public/admin.js", - "../client/account/theme.js": "public/settings.js" - }, - "staticDirs": { - "inter": "node_modules/@fontsource/inter/files", - "poppins": "node_modules/@fontsource/poppins/files" - }, - "languages": "languages" -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/public/.eslintrc b/vendor/nodebb-theme-harmony-main/public/.eslintrc deleted file mode 100644 index a3ce8297a6..0000000000 --- a/vendor/nodebb-theme-harmony-main/public/.eslintrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "nodebb/public" -} diff --git a/vendor/nodebb-theme-harmony-main/public/admin.js b/vendor/nodebb-theme-harmony-main/public/admin.js deleted file mode 100644 index 6df37a7156..0000000000 --- a/vendor/nodebb-theme-harmony-main/public/admin.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -define('admin/plugins/harmony', ['settings'], function (Settings) { - var ACP = {}; - - ACP.init = function () { - Settings.load('harmony', $('.harmony-settings')); - - $('#save').on('click', function () { - Settings.save('harmony', $('.harmony-settings')); - }); - }; - - return ACP; -}); diff --git a/vendor/nodebb-theme-harmony-main/public/harmony.js b/vendor/nodebb-theme-harmony-main/public/harmony.js deleted file mode 100644 index 35c0bb98d2..0000000000 --- a/vendor/nodebb-theme-harmony-main/public/harmony.js +++ /dev/null @@ -1,298 +0,0 @@ -'use strict'; - -$(document).ready(function () { - setupSkinSwitcher(); - setupNProgress(); - setupMobileMenu(); - setupSearch(); - setupDrafts(); - handleMobileNavigator(); - setupNavTooltips(); - fixPlaceholders(); - fixSidebarOverflow(); - - function setupSkinSwitcher() { - $('[component="skinSwitcher"]').on('click', '.dropdown-item', function () { - const skin = $(this).attr('data-value'); - $('[component="skinSwitcher"] .dropdown-item .fa-check').addClass('invisible'); - $(this).find('.fa-check').removeClass('invisible'); - require(['forum/account/settings', 'hooks'], function (accountSettings, hooks) { - hooks.one('action:skin.change', function () { - $('[component="skinSwitcher"] [component="skinSwitcher/icon"]').removeClass('fa-fade'); - }); - $('[component="skinSwitcher"] [component="skinSwitcher/icon"]').addClass('fa-fade'); - accountSettings.changeSkin(skin); - }); - }); - } - - require(['hooks'], function (hooks) { - $(window).on('action:composer.resize action:sidebar.toggle', function () { - const isRtl = $('html').attr('data-dir') === 'rtl'; - const css = { - width: $('#panel').width(), - }; - const sidebarEl = $('.sidebar-left'); - css[isRtl ? 'right' : 'left'] = sidebarEl.is(':visible') ? sidebarEl.outerWidth(true) : 0; - $('[component="composer"]').css(css); - }); - - hooks.on('filter:chat.openChat', function (hookData) { - // disables chat modals & goes straight to chat page based on user setting - hookData.modal = config.theme.chatModals && !utils.isMobile(); - return hookData; - }); - }); - - function setupMobileMenu() { - require(['hooks', 'api', 'navigator'], function (hooks, api, navigator) { - $('[component="sidebar/toggle"]').on('click', async function () { - const sidebarEl = $('.sidebar'); - sidebarEl.toggleClass('open'); - if (app.user.uid) { - await api.put(`/users/${app.user.uid}/settings`, { - settings: { - openSidebars: sidebarEl.hasClass('open') ? 'on' : 'off', - }, - }); - } - $(window).trigger('action:sidebar.toggle'); - if (ajaxify.data.template.topic) { - hooks.fire('action:navigator.update', { newIndex: navigator.getIndex() }); - } - }); - - const bottomBar = $('[component="bottombar"]'); - let stickyTools = null; - const location = config.theme.topMobilebar ? 'top' : 'bottom'; - const $body = $('body'); - const $window = $(window); - $body.on('shown.bs.dropdown hidden.bs.dropdown', '.sticky-tools', function () { - bottomBar.toggleClass('hidden', $(this).find('.dropdown-menu.show').length); - }); - function isSearchVisible() { - return !!$('[component="bottombar"] [component="sidebar/search"] .search-dropdown.show').length; - } - - let lastScrollTop = $window.scrollTop(); - let newPostsLoaded = false; - - function onWindowScroll() { - const st = $window.scrollTop(); - if (newPostsLoaded) { - newPostsLoaded = false; - lastScrollTop = st; - return; - } - if (st !== lastScrollTop && !navigator.scrollActive && !isSearchVisible()) { - const diff = Math.abs(st - lastScrollTop); - const scrolledDown = st > lastScrollTop; - const scrolledUp = st < lastScrollTop; - const isHiding = !scrolledUp && scrolledDown; - if (diff > 10) { - bottomBar.css({ - [location]: isHiding ? - -bottomBar.find('.bottombar-nav').outerHeight(true) : - 0, - }); - if (stickyTools && config.theme.topMobilebar && config.theme.autohideBottombar) { - stickyTools.css({ - top: isHiding ? 0 : 'var(--panel-offset)', - }); - } - } - } - lastScrollTop = st; - } - - const delayedScroll = utils.throttle(onWindowScroll, 250); - function enableAutohide() { - $window.off('scroll', delayedScroll); - if (config.theme.autohideBottombar) { - lastScrollTop = $window.scrollTop(); - $window.on('scroll', delayedScroll); - } - } - - hooks.on('action:posts.loading', function () { - $window.off('scroll', delayedScroll); - }); - hooks.on('action:posts.loaded', function () { - newPostsLoaded = true; - setTimeout(enableAutohide, 250); - }); - hooks.on('action:ajaxify.end', function () { - bottomBar.removeClass('hidden'); - const { template } = ajaxify.data; - stickyTools = (template.category || template.topic) ? $('.sticky-tools') : null; - $window.off('scroll', delayedScroll); - if (config.theme.autohideBottombar) { - bottomBar.css({ [location]: 0 }); - setTimeout(enableAutohide, 250); - } - }); - }); - } - - function setupSearch() { - $('[component="sidebar/search"]').on('shown.bs.dropdown', function () { - $(this).find('[component="search/fields"] input[name="query"]').trigger('focus'); - }); - } - - function setupDrafts() { - require(['composer/drafts', 'bootbox'], function (drafts, bootbox) { - const draftsEl = $('[component="sidebar/drafts"]'); - - function updateBadgeCount() { - const count = drafts.getAvailableCount(); - if (count > 0) { - draftsEl.removeClass('hidden'); - } - $('[component="drafts/count"]').toggleClass('hidden', count <= 0).text(count); - } - - async function renderDraftList() { - const draftListEl = $('[component="drafts/list"]'); - const draftItems = drafts.listAvailable(); - if (!draftItems.length) { - draftListEl.find('.no-drafts').removeClass('hidden'); - draftListEl.find('.placeholder-wave').addClass('hidden'); - draftListEl.find('.draft-item-container').html(''); - return; - } - draftItems.reverse().forEach((draft) => { - if (draft) { - if (draft.title) { - draft.title = utils.escapeHTML(String(draft.title)); - } - draft.text = utils.escapeHTML( - draft.text - ).replace(/(?:\r\n|\r|\n)/g, '
'); - } - }); - - const html = await app.parseAndTranslate('partials/sidebar/drafts', 'drafts', { drafts: draftItems }); - draftListEl.find('.no-drafts').addClass('hidden'); - draftListEl.find('.placeholder-wave').addClass('hidden'); - draftListEl.find('.draft-item-container').html(html).find('.timeago').timeago(); - } - - - draftsEl.on('shown.bs.dropdown', renderDraftList); - - draftsEl.on('click', '[component="drafts/open"]', function () { - drafts.open($(this).attr('data-save-id')); - }); - - draftsEl.on('click', '[component="drafts/delete"]', function () { - const save_id = $(this).attr('data-save-id'); - bootbox.confirm('[[modules:composer.discard-draft-confirm]]', function (ok) { - if (ok) { - drafts.removeDraft(save_id); - renderDraftList(); - } - }); - return false; - }); - - $(window).on('action:composer.drafts.save', updateBadgeCount); - $(window).on('action:composer.drafts.remove', updateBadgeCount); - updateBadgeCount(); - }); - } - - function setupNProgress() { - require(['nprogress'], function (NProgress) { - window.nprogress = NProgress; - if (NProgress) { - $(window).on('action:ajaxify.start', function () { - NProgress.set(0.7); - }); - - $(window).on('action:ajaxify.end', function () { - NProgress.done(true); - }); - } - }); - } - - function handleMobileNavigator() { - const paginationBlockEl = $('.pagination-block'); - require(['hooks'], function (hooks) { - hooks.on('action:ajaxify.end', function () { - paginationBlockEl.find('.dropdown-menu.show').removeClass('show'); - }); - hooks.on('filter:navigator.scroll', function (hookData) { - paginationBlockEl.find('.dropdown-menu.show').removeClass('show'); - return hookData; - }); - }); - } - - function setupNavTooltips() { - // remove title from user icon in sidebar to prevent double tooltip - $('.sidebar [component="header/avatar"] .avatar').removeAttr('title'); - const tooltipEls = $('.sidebar [title]'); - const lefttooltipEls = $('.sidebar-left [title]'); - const rightooltipEls = $('.sidebar-right [title]'); - const isRtl = $('html').attr('data-dir') === 'rtl'; - lefttooltipEls.tooltip({ - trigger: 'manual', - animation: false, - placement: isRtl ? 'left' : 'right', - }); - rightooltipEls.tooltip({ - trigger: 'manual', - animation: false, - placement: isRtl ? 'right' : 'left', - }); - - tooltipEls.on('mouseenter', function (ev) { - const target = $(ev.target); - const isDropdown = target.hasClass('dropdown-menu') || !!target.parents('.dropdown-menu').length; - if (!$('.sidebar').hasClass('open') && !isDropdown) { - $(this).tooltip('show'); - } - }); - tooltipEls.on('click mouseleave', function () { - $(this).tooltip('hide'); - }); - } - - function fixPlaceholders() { - if (!config.loggedIn) { - return; - } - ['notifications', 'chat'].forEach((type) => { - const countEl = $(`nav.sidebar [component="${type}/count"]`).first(); - if (!countEl.length) { - return; - } - const count = parseInt(countEl.text(), 10); - if (count > 1) { - const listEls = $(`.dropdown-menu [component="${type}/list"]`); - listEls.each((index, el) => { - const placeholder = $(el).children().first(); - for (let x = 0; x < count - 1; x++) { - const cloneEl = placeholder.clone(true); - cloneEl.insertAfter(placeholder); - } - }); - } - }); - } - - function fixSidebarOverflow() { - // overflow-y-auto needs to be removed on main-nav when dropdowns are opened - const mainNavEl = $('#main-nav'); - function toggleOverflow() { - mainNavEl.toggleClass( - 'overflow-y-auto', - !mainNavEl.find('.dropdown-menu.show').length - ); - } - mainNavEl.on('shown.bs.dropdown', toggleOverflow) - .on('hidden.bs.dropdown', toggleOverflow); - } -}); diff --git a/vendor/nodebb-theme-harmony-main/public/settings.js b/vendor/nodebb-theme-harmony-main/public/settings.js deleted file mode 100644 index e677db7fe0..0000000000 --- a/vendor/nodebb-theme-harmony-main/public/settings.js +++ /dev/null @@ -1,31 +0,0 @@ -'use strict'; - -define('forum/account/theme', ['forum/account/header', 'api', 'settings', 'alerts'], function (header, api, settings, alerts) { - const Theme = {}; - - Theme.init = () => { - header.init(); - Theme.setupForm(); - }; - - Theme.setupForm = () => { - const saveEl = document.getElementById('save'); - if (saveEl) { - const formEl = document.getElementById('theme-settings'); - saveEl.addEventListener('click', async () => { - const themeSettings = settings.helper.serializeForm($(formEl)); - await api.put(`/users/${ajaxify.data.uid}/settings`, { - settings: { - ...themeSettings, - }, - }); - if (ajaxify.data.isSelf) { - config.theme = (await api.get('/api/config')).theme; - } - alerts.success('[[success:settings-saved]]'); - }); - } - }; - - return Theme; -}); diff --git a/vendor/nodebb-theme-harmony-main/renovate.json b/vendor/nodebb-theme-harmony-main/renovate.json deleted file mode 100644 index 39a2b6e9a5..0000000000 --- a/vendor/nodebb-theme-harmony-main/renovate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:base" - ] -} diff --git a/vendor/nodebb-theme-harmony-main/screenshot.png b/vendor/nodebb-theme-harmony-main/screenshot.png deleted file mode 100644 index 1f8908da19..0000000000 Binary files a/vendor/nodebb-theme-harmony-main/screenshot.png and /dev/null differ diff --git a/vendor/nodebb-theme-harmony-main/screenshots/categories.png b/vendor/nodebb-theme-harmony-main/screenshots/categories.png deleted file mode 100644 index 7cae6309a1..0000000000 Binary files a/vendor/nodebb-theme-harmony-main/screenshots/categories.png and /dev/null differ diff --git a/vendor/nodebb-theme-harmony-main/screenshots/recent.png b/vendor/nodebb-theme-harmony-main/screenshots/recent.png deleted file mode 100644 index 9551a27575..0000000000 Binary files a/vendor/nodebb-theme-harmony-main/screenshots/recent.png and /dev/null differ diff --git a/vendor/nodebb-theme-harmony-main/screenshots/topic.png b/vendor/nodebb-theme-harmony-main/screenshots/topic.png deleted file mode 100644 index 3e5c92cf55..0000000000 Binary files a/vendor/nodebb-theme-harmony-main/screenshots/topic.png and /dev/null differ diff --git a/vendor/nodebb-theme-harmony-main/scss/account.scss b/vendor/nodebb-theme-harmony-main/scss/account.scss deleted file mode 100644 index 0a318b3e1e..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/account.scss +++ /dev/null @@ -1,27 +0,0 @@ -.page-user.page-status-200 #panel { - margin-top: 0px!important; -} -.account { - margin-top: 200px; - - @include media-breakpoint-up(md) { - margin-top: 300px; - } - - .categories { - [component="categories/category"] { - $category-pad: 50; - @for $i from 1 through 6 { - .depth-#{$i} { - padding-left: #{$category-pad * $i}px; - } - } - } - } -} - -[component="group/badge/item"]:first-child [component="group/order/up"], -[component="group/badge/item"]:last-child [component="group/order/down"] { - opacity: 0.65; - pointer-events: none; -} diff --git a/vendor/nodebb-theme-harmony-main/scss/category.scss b/vendor/nodebb-theme-harmony-main/scss/category.scss deleted file mode 100644 index 41bff4d4eb..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/category.scss +++ /dev/null @@ -1,4 +0,0 @@ -.category-header .description p { margin: 0; } -.page-category .breadcrumb .breadcrumb-item:last-child { - display: none; -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/chats.scss b/vendor/nodebb-theme-harmony-main/scss/chats.scss deleted file mode 100644 index e0c5f49a96..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/chats.scss +++ /dev/null @@ -1,12 +0,0 @@ -// themes have a different layout so each one needs this block to set height to 100% -body.page-user-chats { - > .layout-container { - height: 100%; - > #panel { - height: 100%; - > .container { - height: 100%; - } - } - } -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/common.scss b/vendor/nodebb-theme-harmony-main/scss/common.scss deleted file mode 100644 index 2ba4e047a2..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/common.scss +++ /dev/null @@ -1,132 +0,0 @@ - -html { - height: 100%; -} - -body { - overflow-y: scroll; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-rendering: optimizeLegibility; -} - -@include media-breakpoint-down(lg) { - body:not(.page-user-chats) { - min-height: 100vh; - .layout-container { - min-height: 100vh; - } - } -} - -// fixes chrome font boosting :/ https://stackoverflow.com/questions/13430897/how-to-override-font-boosting-in-mobile-chrome -body * { - max-height:1000000px; - text-size-adjust: none; - -webkit-text-size-adjust: none; - -moz-text-size-adjust: none; -} - -hr { - border-top-color: var(--bs-border-color); - opacity: 1; -} - -.ff-base { font-family: $font-family-base !important; } -.ff-sans { font-family: $font-family-sans-serif !important; } -.ff-secondary { font-family: $font-family-secondary; } -.tracking-tight { letter-spacing: -0.02em; } - -.caret { - &::after { - border: none; - font-family: "FontAwesome"; - content: "\f078"; - } -} - -.placeholder-wave { - opacity: 0.5; -} - -.bg-card-cap { - --bs-bg-opacity: 1; - background-color: $card-cap-bg!important; -} - -blockquote { - $bq-border-color: mix($light, $dark, 75%); - @extend .text-bg-light; - font-style: normal; - border-left: 2px solid $bq-border-color; - padding: 1rem; - p:last-child { - margin-bottom: 0; - } - .toggle { - border-color: $bq-border-color!important; - } -} - -body:not(.page-user) { - #content { - transition: opacity 150ms linear; - &.ajaxifying { - -moz-opacity: 0; - opacity: 0; - } - } -} -.page-user { - #content { - transition: opacity 150ms linear; - &.ajaxifying .account-content { - transition: opacity 150ms linear; - -moz-opacity: 0; - opacity: 0; - } - } -} - -.sticky-tools { - position: sticky; - z-index: 3; - top: 0; - padding: 0.25rem 0; -} -// quartz doesn't need body-bg for tool background -.skin-quartz .sticky-tools { - background-color: initial; -} - -.flex-basis-md-200 { - @include media-breakpoint-up(md) { - flex-basis: 200px!important; - } -} - -.markdown-highlight { - @extend .shadow-sm; - @extend .border; -} - -[component="chat/message/body"], [component="post/content"] { - .img-fluid { - @extend .shadow-sm; - padding: $spacer * 0.5; - margin: $spacer * 0.5 0; - border: 1px solid $border-color; - background-color: $light; - border-radius: $border-radius-sm; - max-height: 500px; - width: auto; - } -} - -[component="chat/message/body"], -[component="post/content"], -[component="topic/teaser"] .post-content, -[component="category/posts"] .post-content, -.post-queue.posts-list .post-content { - a { text-decoration: underline;} -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/fonts.scss b/vendor/nodebb-theme-harmony-main/scss/fonts.scss deleted file mode 100644 index 21a9bfca53..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/fonts.scss +++ /dev/null @@ -1,24 +0,0 @@ -@use "pkg:@fontsource-utils/scss" as fontsource; -@use "pkg:@fontsource/inter/scss" as inter; -@use "pkg:@fontsource/poppins/scss" as poppins; - -$weights: $font-weight-light, $font-weight-normal, $font-weight-semibold, $font-weight-bold; -$subsets: (latin, latin-ext); -$font-path: "./plugins/nodebb-theme-harmony" !default; - - -@include fontsource.faces( - $metadata: inter.$metadata, - $subsets: $subsets, - $weights: $weights, - $styles: all, - $directory: "#{$font-path}/inter" -); - -@include fontsource.faces( - $metadata: poppins.$metadata, - $subsets: $subsets, - $weights: $weights, - $styles: all, - $directory: "#{$font-path}/poppins" -); diff --git a/vendor/nodebb-theme-harmony-main/scss/groups.scss b/vendor/nodebb-theme-harmony-main/scss/groups.scss deleted file mode 100644 index 914e3fce90..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/groups.scss +++ /dev/null @@ -1,22 +0,0 @@ -.template-groups-details #panel { - margin-top: 0px!important; -} - -.group-hover-bg { - $hover-color: mix($light, $dark, 97%); - $border-color: mix($light, $dark, 90%); - .card-body { - border-color: $border-color!important; - } - &:hover { - background-color: $hover-color; - } -} - -.groups.details { - margin-top: 200px; - - @include media-breakpoint-up(md) { - margin-top: 300px; - } -} diff --git a/vendor/nodebb-theme-harmony-main/scss/harmony.scss b/vendor/nodebb-theme-harmony-main/scss/harmony.scss deleted file mode 100644 index e4fd5a073e..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/harmony.scss +++ /dev/null @@ -1,26 +0,0 @@ -@import "fonts"; -@import "mixins"; -@import "common"; - -@import "header"; -@import "topic"; -@import "category"; -@import "chats"; -@import "sidebar"; -@import "mobilebar"; -@import "status"; -@import "account"; -@import "groups"; -@import "modals"; - -@import "modules/breadcrumbs"; -@import "modules/tags"; -@import "modules/user-menu"; -@import "modules/topic-navigator"; -@import "modules/topics-list"; -@import "modules/cover"; -@import "modules/nprogress"; -@import "modules/paginator"; -@import "modules/filters"; - -@import "skins"; \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/header.scss b/vendor/nodebb-theme-harmony-main/scss/header.scss deleted file mode 100644 index a64d632c11..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/header.scss +++ /dev/null @@ -1,16 +0,0 @@ -// hide brand/title on user and group details pages so it doesnt break covers -body[class*="template-account-"], .template-chats, .template-groups-details { - .brand-container { - display: none; - } -} -[component="brand/wrapper"] { - &:hover { - background-color: $card-cap-bg; - } -} - -[component="brand/logo"] { - max-height: 48px; - width: auto; -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/mixins.scss b/vendor/nodebb-theme-harmony-main/scss/mixins.scss deleted file mode 100644 index 5ce0e55354..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/mixins.scss +++ /dev/null @@ -1,167 +0,0 @@ -@mixin topic-avatars() { - .icon .avatar, .timeline-badge { - z-index: 1; - - line-height: calc(var(--avatar-size) - 4px); - } - - [component="user/locality"] { - transform: translate(-75%, -100%); - z-index: 2; - background-color: $body-bg; - font-size: .5rem; - } - - [component="user/status"] { - transform: translate(-80%, -100%); - z-index: 2; - } - - @include media-breakpoint-up(sm) { - [component="user/status"] { - padding: 5px; - } - - [component="user/locality"] { - font-size: .75rem; - } - } -} - -@mixin timeline-style() { - > [component="post"], .timeline-event, > [component="post/placeholder"] { - position: relative; // for absolutely positioned pseudo-element, below - border: 0; - margin-left: 1.5rem; - transition: border-color 1s ease-out; - - &:last-child { - padding-bottom: 2rem; - - &:after { - content: ''; - position: absolute; - bottom: 0; - height: 16px; - width: 16px; - background-color: $border-color; - border-radius: 100%; - transform: translate(calc(-50% - .5px), 100%); - transition: background-color 1s ease-out; - } - - &.highlight:after { - background-color: $primary; - } - } - - >.post-container-parent { - margin-left: -1.5rem; - } - - &.highlight { - .bookmarked { - opacity: 1 !important; - } - } - - @include topic-avatars(); - } - - [component="topic/event"], [component="topic/necro-post"] { - &.timeline-event { - text-align: left; - justify-content: left; - font-size: 1em; - - .timeline-badge { - display: flex; - align-items: center; - justify-content: center; - flex-shrink: 0; - padding: 0; - margin-right: 1rem; - color: $gray-500; - background-color: $body-bg; - } - - .timeline-text { - line-height: 32px; - text-transform: initial; - } - } - } - - @include media-breakpoint-down(sm) { - > [component="post"], .timeline-event { - margin-left: initial; - &:first-child:before, &:last-child:after { - display: none; - } - } - - [component="post"] { - margin-left: initial; - > div:not(.content) { - margin-left: 0; - } - } - - [component="post"]:last-child:after { - display: none; - } - - - [component="topic/event"], [component="topic/necro-post"] { - &.timeline-event { - .timeline-badge { - margin-right: initial; - } - .timeline-text { - line-height: 16px; - font-size: 0.75rem; - } - } - } - } - - @include media-breakpoint-up(sm) { - > [component="post"], .timeline-event, > [component="post/placeholder"] { - border-left: 2px solid $border-color; - - &.highlight { - border-left: 2px solid $primary; - } - } - - .timeline-event { - margin-left: 1.5rem; - - [component="topic/event/delete"] { - visibility: hidden; - } - - &:hover { - [component="topic/event/delete"] { - visibility: visible; - - &:hover { - color: $danger; - } - } - } - } - - [component="topic/event"], [component="topic/necro-post"] { - &.timeline-event .timeline-badge { - width: 24px; - height: 24px; - padding: 0; - margin-left: -0.75rem; - margin-right: 1.25rem; - border: 2px solid $border-color; - border-radius: 50%; - } - } - } -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/mobilebar.scss b/vendor/nodebb-theme-harmony-main/scss/mobilebar.scss deleted file mode 100644 index fecb2cd639..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/mobilebar.scss +++ /dev/null @@ -1,63 +0,0 @@ -.navigator-mobile { - .pagination-block { - .scroller-container { - border-right: 3px solid; - margin-right: 5.5px; - .scroller-thumb { - right: -6px; - padding-right: 15px; - margin-right: -15px; - } - } - } -} - -.bottombar-nav { - #user_dropdown .avatar { - margin: 2px 0; // fixes the avatar so its height is same as the icons on right sidebar - } - .nav-text { - font-size: 1rem; - color: $body-color; - } - .nav-link { - padding: 8px; - border-radius: $border-radius-sm; - } - .usermenu, .chats, .notifications, .drafts, .search, .logged-out-menu { - .visible-open { display: none; } - } - .badge { - font-size: 9px; - line-height: 12px; - } - - .dropdown-menu { - left: 0!important; - right: 0!important; - box-shadow: none!important; - border-left: 0; - border-right: 0; - border-radius: 0; - .list-container { - max-height: 60vh!important; - overflow-y: auto!important; - } - } - - .navigation-dropdown, .user-dropdown { - > li { - > a, .dropdown-item { - padding: 10px 20px!important; - } - } - - max-height: 60vh!important; - overflow: auto!important; - } - - .search-dropdown .quick-search-results { - max-height: 225px!important; - overflow-y: auto!important; - } -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/modals.scss b/vendor/nodebb-theme-harmony-main/scss/modals.scss deleted file mode 100644 index 201cfb5229..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/modals.scss +++ /dev/null @@ -1,6 +0,0 @@ -.tool-modal { - @include media-breakpoint-up(md) { - bottom: $spacer * 3; - right: $spacer * 4; - } -} diff --git a/vendor/nodebb-theme-harmony-main/scss/modules/breadcrumbs.scss b/vendor/nodebb-theme-harmony-main/scss/modules/breadcrumbs.scss deleted file mode 100644 index 6f7d855138..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/modules/breadcrumbs.scss +++ /dev/null @@ -1,16 +0,0 @@ -.breadcrumb .breadcrumb-item { - font-family: $font-family-secondary; - - &::before { - font-family: $font-family-sans-serif; - font-weight: $font-weight-semibold; - font-size: $small-font-size; - line-height: $h4-font-size; - } - - a, span { - color: $body-color; - font-size: $small-font-size; - line-height: 16px; - } -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/modules/cover.scss b/vendor/nodebb-theme-harmony-main/scss/modules/cover.scss deleted file mode 100644 index 33c6571263..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/modules/cover.scss +++ /dev/null @@ -1,104 +0,0 @@ -// used in group and account pages -.cover { - background-size: cover; - background-repeat: no-repeat; - height: 200px; - position: absolute; - background-origin: content-box; - width: 100%; - top: var(--panel-offset)!important; - left: auto; - right: 0px; - - &:hover .controls, .controls:focus-within { - opacity: 1; - } - - .controls { - height: 200px; - line-height: 200px; - opacity: 0; - @include transition(opacity .15s linear); - cursor: pointer; - pointer-events: none; - - > * { - pointer-events: all; - } - } - - &.active { - &:hover { - cursor: move; - } - - .controls { - > * { - display: none; - } - } - - .save { - display: inline-block; - } - } - - &.saving { - .save { - display: none; - } - - .indicator { - display: inline-block; - } - } - - .save, .indicator { - display: inline-block; - position: absolute; - bottom: 1em; - left: 50%; - transform: translateX(-50%); - opacity: 1; - padding: 0.5em; - font-weight: bold; - - &:hover { - cursor: pointer; - } - } - - .save { - display: none; - } - - .indicator { - display: none; - } -} - -.cover > .container { - height: 200px; - position: relative; - pointer-events: none; - .save { - pointer-events: all; - } - .controls { - pointer-events: none; - > * { - pointer-events: all; - } - } -} - -@include media-breakpoint-up(md) { - .cover, .cover > .container { - height: 300px; - - .controls { - height: 300px; - line-height: 300px; - } - } -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/modules/filters.scss b/vendor/nodebb-theme-harmony-main/scss/modules/filters.scss deleted file mode 100644 index 1f70620d48..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/modules/filters.scss +++ /dev/null @@ -1,8 +0,0 @@ -[component="search/filters"], [component="flags/filters"] { - .filter-btn { - border-color: $gray-300!important; - &.active-filter { - border-color: $primary!important; - } - } -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/modules/nprogress.scss b/vendor/nodebb-theme-harmony-main/scss/modules/nprogress.scss deleted file mode 100644 index a576b32d44..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/modules/nprogress.scss +++ /dev/null @@ -1,80 +0,0 @@ -#nprogress { - pointer-events: none; -} - -$nprogress-color: $primary; - -#nprogress .bar { - background: $nprogress-color; - position: fixed; - z-index: 1031; - top: 0; - left: 0; - width: 100%; - height: 2px; -} - -#nprogress .peg { - display: block; - position: absolute; - right: 0px; - width: 100px; - height: 100%; - box-shadow: 0 0 10px $nprogress-color, 0 0 5px $nprogress-color; - opacity: 1.0; - - -webkit-transform: rotate(3deg) translate(0px, -4px); - -ms-transform: rotate(3deg) translate(0px, -4px); - transform: rotate(3deg) translate(0px, -4px); -} - -#nprogress .spinner { - display: none; - position: fixed; - z-index: 1031; - top: 15px; - right: 15px; -} - -@include media-breakpoint-down(sm) { - #nprogress .spinner { - bottom: 15px; - right: 15px; - top: initial; - } -} - - -#nprogress .spinner-icon { - width: 18px; - height: 18px; - box-sizing: border-box; - - border: solid 2px transparent; - border-top-color: $nprogress-color; - border-left-color: $nprogress-color; - border-radius: 50%; - - -webkit-animation: nprogress-spinner 400ms linear infinite; - animation: nprogress-spinner 400ms linear infinite; -} - -.nprogress-custom-parent { - overflow: hidden; - position: relative; -} - -.nprogress-custom-parent #nprogress .spinner, -.nprogress-custom-parent #nprogress .bar { - position: absolute; -} - -@-webkit-keyframes nprogress-spinner { - 0% { -webkit-transform: rotate(0deg); } - 100% { -webkit-transform: rotate(360deg); } -} -@keyframes nprogress-spinner { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(360deg); } -} - diff --git a/vendor/nodebb-theme-harmony-main/scss/modules/paginator.scss b/vendor/nodebb-theme-harmony-main/scss/modules/paginator.scss deleted file mode 100644 index 1689c8e49b..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/modules/paginator.scss +++ /dev/null @@ -1,24 +0,0 @@ -.skin-noskin [component="pagination"] { - .page-item.active:not(.disabled) .page-link { - color: $body-color; - background-color: $gray-300; - border-color: $gray-300; - } - - .page-item:not(.disabled):hover .page-link { - color: $body-color; - } -} - -[component="pagination"] { - .page-item.active:not(.disabled) .page-link { - color: $pagination-active-color; - } - .page-item:not(.disabled):hover .page-link { - color: $pagination-hover-color; - background-color: $pagination-hover-bg; - } - .page-item:not(.disabled) .page-link { - color: $body-color; - } -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/modules/tags.scss b/vendor/nodebb-theme-harmony-main/scss/modules/tags.scss deleted file mode 100644 index f1217aa621..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/modules/tags.scss +++ /dev/null @@ -1,6 +0,0 @@ -.tag-list { - .tag { - background-color: $gray-200!important; - color: $gray-700!important; - } -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/modules/topic-navigator.scss b/vendor/nodebb-theme-harmony-main/scss/modules/topic-navigator.scss deleted file mode 100644 index 8d0f681c83..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/modules/topic-navigator.scss +++ /dev/null @@ -1,53 +0,0 @@ -.pagination-block { display: none; } - -body.template-topic { - // used for both sidebar and bottom bar pagination-block - .pagination-block { - display: block; - transition: opacity 250ms ease-in; - opacity: 0; - &.ready { - opacity: 1; - } - &.noreplies { - pointer-events: none; - cursor: none; - } - } -} - -.topic .pagination-block { - .scroller-content { - min-width: 170px; - } - .scroller-container { - left: 16px; - height: 275px; - border-left: 2px solid $border-color; - - .scroller-thumb { - left: -5px; - &:not(.active) { - transition: top 100ms linear; - } - cursor: grab; - &.active { - cursor: grabbing; - } - } - - .unread { - width: 1px; - height: 0; // initial - bottom: 0; - background: $primary; - transition: $transition-base; - left: -1px; - - .meta { - left: 5px; - font-size: 13px; - } - } - } -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/modules/topics-list.scss b/vendor/nodebb-theme-harmony-main/scss/modules/topics-list.scss deleted file mode 100644 index 714010c1f8..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/modules/topics-list.scss +++ /dev/null @@ -1,40 +0,0 @@ -ul.topics-list, ul.categories-list { - li { - &.deleted { - .meta, .topic-thumbs { visibility: hidden!important; } - opacity: 0.65; - } - - &.selected { - background-color: mix($body-bg, $body-color, 90%); - [component="topic/select"] { - color: $success!important; - visibility: visible; - } - } - p { - margin: 0 !important; - } - - // all other skins use link-color for unread titles - &.unread .title { - color: $link-color!important; - } - - .ui-sortable-handle { - cursor: move; - } - - // if only one thumb don't display - [data-numthumbs="1"] { display: none; } - } -} - -// on default skin use primary color for unread titles -.skin-noskin { - ul.topics-list, ul.categories-list { - li.unread .title { - color: $primary!important; - } - } -} diff --git a/vendor/nodebb-theme-harmony-main/scss/modules/user-menu.scss b/vendor/nodebb-theme-harmony-main/scss/modules/user-menu.scss deleted file mode 100644 index cda2ac064b..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/modules/user-menu.scss +++ /dev/null @@ -1,11 +0,0 @@ -[component="header/usercontrol"] { - [component="header/profilelink"] > div, .user-status > div { - min-width: 1.25em; // match fontawesome fixed width - } - .user-status i.fa-check { - display: none; - } - .user-status.selected i.fa-check { - display: block; - } -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/overrides.scss b/vendor/nodebb-theme-harmony-main/scss/overrides.scss deleted file mode 100644 index 11131a3fe5..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/overrides.scss +++ /dev/null @@ -1,66 +0,0 @@ -// only overrides to bs5 variables here - -// Harmony colours -$white: #fff !default; -$gray-100: #f8f9fa !default; -$gray-200: #e9ecef !default; -$gray-300: #dee2e6 !default; -$gray-400: #ced4da !default; -$gray-500: #adb5bd !default; -$gray-600: #6c757d !default; -$gray-700: #495057 !default; -$gray-800: #343a40 !default; -$gray-900: #212529 !default; -$black: #000 !default; - -$blue: #0d6efd !default; -$red: #dc3545 !default; -$yellow: #ffc107 !default; -$green: #198754 !default; -$cyan: #0dcaf0 !default; - -$primary: $blue !default; -$secondary: $gray-600 !default; -$success: $green !default; -$info: $cyan !default; -$warning: $yellow !default; -$danger: $red !default; -$light: $gray-100 !default; -$dark: $gray-900 !default; - -$body-color: $gray-800 !default; -$body-bg: $white !default; -$body-tertiary-bg: $gray-200 !default; -$text-muted: $gray-600 !default; -$border-color: $gray-200 !default; -$link-color: #0951be !default; - -$form-check-input-border: var(--bs-border-width) solid $gray-500 !default; - -$input-placeholder-color: $gray-600!important; - -// no caret on dropdown-toggle -$enable-caret: false; - -// disable smooth scroll, this makes window.scrollTo(0,0) in ajaxify.js take x milliseconds -$enable-smooth-scroll: false; - -$enable-shadows: true; - -$link-decoration: none; -$link-hover-decoration: underline; - -// Custom fonts -$font-family-sans-serif: "Inter", system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; -$font-family-secondary: "Poppins", system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; -$font-weight-semibold: 500 !default; -$small-font-size: 0.875rem !default; - -$breadcrumb-divider: quote("→"); -$breadcrumb-divider-color: $gray-500 !default; -$breadcrumb-active-color: $body-color !default; -$breadcrumb-item-padding-x: 12px !default; - -.form-control::placeholder, .bootstrap-tagsinput::placeholder { - color: $gray-500 !important; -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/sidebar.scss b/vendor/nodebb-theme-harmony-main/scss/sidebar.scss deleted file mode 100644 index 2f35291fc9..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/sidebar.scss +++ /dev/null @@ -1,123 +0,0 @@ -.skin-noskin { - // only using colors when there is no bootswatch skin applied - nav.sidebar, .bottombar-nav { - color: $secondary !important; - background-color: $light !important; - } - .bottombar-nav { - .dropdown-menu { - color: $secondary !important; - background-color: $light !important; - } - } -} - -.sidebar { - $hover-color: mix($light, $dark, 90%); - - @include media-breakpoint-up(lg) { - &.open { - min-width: 200px; - max-width: 200px; - width: 200px; - - .sidebar-toggle { - .fa-angles-right { display: none; } - .fa-angles-left { display: inline-block; } - } - .visible-open { display: initial; } - .visible-closed { display: none; } - hr.visible-open { display: block; } - .truncate-open { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - .sidebar-toggle-container { - width: 100% - } - } - } - .visible-open { display: none; } - .visible-closed {display: initial; } - - .truncate-open { - overflow: initial; - text-overflow: initial; - white-space: initial; - } - - .nav-link { - @extend .ff-secondary; - padding: ($spacer * 0.25) ($spacer * 0.5); - border-radius: $border-radius-sm; - cursor: pointer; - &.active { - background-color: $hover-color; - } - &:hover { - background-color: $hover-color; - } - } - - .nav-item { - .dropdown-menu .dropdown-item { - @extend .rounded-1; - } - } - - #user_dropdown .avatar { - margin: 2px 0; // fixes the avatar so its height is same as the icons on right sidebar - } - - .sidebar-toggle { - justify-content: start; - .fa-angles-right { display: inline-block; } - .fa-angles-left { display: none; } - } - - .search-dropdown { - width: 300px; - } - - .chats-dropdown, .notifications-dropdown, .drafts-dropdown { - min-width: 300px; - width: 300px; - .list-container { - max-height: 400px; - overflow-y: auto; - } - } - - .badge { - font-size: 9px; - line-height: 12px; - &.visible-open { - font-size:12px; - line-height: 12px; - font-weight: normal; - } - } - - [data-widget-area="sidebar-footer"] { - font-size: $font-size-base * 0.75; - } -} - - /*rtl:begin:ignore*/ - html[data-dir="rtl"] { - .sidebar { - &.open { - .sidebar-toggle { - .fa-angles-right { display: none; } - .fa-angles-left { display: inline-block; } - } - } - .sidebar-toggle { - .fa-angles-right { display: inline-block; } - .fa-angles-left { display: none; } - } - } -} - /*rtl:end:ignore*/ - diff --git a/vendor/nodebb-theme-harmony-main/scss/skins.scss b/vendor/nodebb-theme-harmony-main/scss/skins.scss deleted file mode 100644 index 192f2d2636..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/skins.scss +++ /dev/null @@ -1,65 +0,0 @@ -.skin-quartz { - // $body-bg-image is gradient in quartz - [component="post"] .icon { - background-color: transparent !important; - } - .form-control::placeholder { - color:$gray-100!important; - } -} - -.skin-solar { - .form-control::placeholder { - color:$gray-100!important; - } -} - -.skin-quartz, .skin-lux, .skin-morph { - // $spacer being modified looks bad on this element - .topic-list-header .btn, .topic-main-buttons .btn { - padding: 6px 12px; - } -} - -.skin-yeti { - .badge { - padding-left: 0.5rem; - padding-right: 0.5rem; - } -} - -// table color fix, remove once https://github.com/thomaspark/bootswatch/issues/1276 is published -.skin-darkly, .skin-superhero, .skin-solar, .skin-quartz { - table > :not(caption) > * > * { - color: white; - } -} - -.skin-superhero { - // fix read button in dropdowns - .mark-read .read { - color: $primary!important; - } -} - -.skin-slate { - // fix unread button colors in dropdowns - .mark-read .unread { - color: $secondary!important; - } -} - -.skin-morph { - .text-secondary { - color: #7b8ab8!important; - } -} - -:root { - .skin-darkly, .skin-slate, .skin-cyborg { - --bs-border-color: #929292; - } - .skin-zephyr { - --bs-secondary-rgb: var(--bs-secondary-color); - } -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/status.scss b/vendor/nodebb-theme-harmony-main/scss/status.scss deleted file mode 100644 index 37c5f0a474..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/status.scss +++ /dev/null @@ -1,25 +0,0 @@ -.status { - padding: 3px; - - &.online { - background-color: $success; - } - - &.away { - background-color: $warning; - } - - &.dnd { - background-color: $danger; - } - - &.offline { - background-color: $gray-600; - } -} - -@include media-breakpoint-up(sm) { - .status { - padding: 5px; - } -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/scss/topic.scss b/vendor/nodebb-theme-harmony-main/scss/topic.scss deleted file mode 100644 index 9f1abd43bf..0000000000 --- a/vendor/nodebb-theme-harmony-main/scss/topic.scss +++ /dev/null @@ -1,149 +0,0 @@ -body.template-topic { - .breadcrumb .breadcrumb-item:last-child { - display: none; - } - .topic { - .posts-container { - max-width: 960px; - width: 960px; - } - - .posts { - &.timeline { - @include timeline-style; - } - - .post-header { - font-size: 0.8125rem; - line-height: 1.25rem; - - .bookmarked { - transition: $transition-fade; - } - } - - [component="post"] { - &.selected .post-container { - background-color: mix($body-bg, $body-color, 90%); - } - &.deleted .post-container .content { opacity: .65; } - - [component="post/content"] { - @include fix-lists(); - - > blockquote { - > blockquote { - > *:not(.blockquote) { - display: none; - } - } - - > blockquote.uncollapsed { - > *:not(.blockquote) { - display: block; - } - } - } - - @include media-breakpoint-up(lg) { - table { // text-break breaks table formatting - word-break:initial!important; - } - } - } - } - - [component="post/upvote"], [component="post/downvote"] { - &.upvoted, &.downvoted { - background-color: var(--btn-ghost-active-color); - - &:hover { - background-color: var(--btn-ghost-hover-color); - } - } - } - } - } - - .quick-reply { - @include topic-avatars(); - } - - [component="post/parent"] { - margin-left: 2.5rem; - [component="post/parent/content"] > p:last-child { - margin-bottom: 0; - } - &[data-collapsed="true"] { - > [component="post/parent/content"] > * { - font-size: 13px!important; - line-height: var(--bs-btn-line-height)!important; - } - } - } - - [component="post/replies/container"] { - .icon { - display: none !important; - } - - .post-header .icon { - display: initial !important; - - .status { - display: none; - } - } - - .timeline-event { - display: none !important; - } - - [component="post"] { - padding-top: 0 !important; - padding-bottom: $spacer; - &:last-of-type { - padding-bottom: 0; - .post-footer { - padding-bottom: 0!important; - border-bottom: none !important; - } - } - } - } - - - [component="topic/thumb/list"] { - &.thumbs-collapsed a.d-inline-block:nth-of-type(n+4) { - display: none!important; - } - > a { - height: calc($font-size-base * 4); - } - } -} - -@include media-breakpoint-up(lg) { - body.template-topic { - .topic .posts { - [component="post"] { - [component="post/actions"] { - opacity: 0; - transition: $transition-fade; - - &:has([aria-expanded="true"]) { - opacity: 1; - } - } - [component="post/actions"]:focus-within { - opacity: 1; - } - &:hover { - > div > .post-container > [component="post/footer"] > div > [component="post/actions"] { - opacity: 1; - } - } - } - } - } -} \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/best.tpl b/vendor/nodebb-theme-harmony-main/templates/account/best.tpl deleted file mode 100644 index 21b7d5b195..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/best.tpl +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/blocks.tpl b/vendor/nodebb-theme-harmony-main/templates/account/blocks.tpl deleted file mode 100644 index fb7a60aabb..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/blocks.tpl +++ /dev/null @@ -1,51 +0,0 @@ - -
-

[[pages:account/blocks, {username}]]

-
-
-
- - - - - -
-
-
-
-
- - -
- {{{ each users }}} -
- - -
- {{{ end }}} -
- -
- - diff --git a/vendor/nodebb-theme-harmony-main/templates/account/bookmarks.tpl b/vendor/nodebb-theme-harmony-main/templates/account/bookmarks.tpl deleted file mode 100644 index 21b7d5b195..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/bookmarks.tpl +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/categories.tpl b/vendor/nodebb-theme-harmony-main/templates/account/categories.tpl deleted file mode 100644 index 576caf5ae8..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/categories.tpl +++ /dev/null @@ -1,64 +0,0 @@ - - -
-
-

{title}

-
- -
-
- - -
-
-
- -
-
    - {{{each categories}}} - - {{{end}}} -
- -
- - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/consent.tpl b/vendor/nodebb-theme-harmony-main/templates/account/consent.tpl deleted file mode 100644 index f472e9ee99..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/consent.tpl +++ /dev/null @@ -1,73 +0,0 @@ - -

[[user:consent.title]]

- -

[[user:consent.lead]]

-

[[user:consent.intro]]

- -
- -
-
- {{{ if gdpr_consent }}} -
- [[user:consent.received]] - -
- {{{ else }}} -
- [[user:consent.not-received]] -

-
- -
-
- {{{ end }}} -
-
-

[[user:consent.email-intro]]

- {{{ if digest.enabled }}} -

[[user:consent.digest-frequency, {digest.frequency}]]

- {{{ else }}} -

[[user:consent.digest-off]]

- {{{ end }}} - -
- - - [[pages:account/settings]] - -
-
-
-
-
-
-
-

[[user:consent.right-of-access]]

-

[[user:consent.right-of-access-description]]

-

[[user:consent.right-to-rectification]]

-

[[user:consent.right-to-rectification-description]]

-

[[user:consent.right-to-erasure]]

-

[[user:consent.right-to-erasure-description]]

-

[[user:consent.right-to-data-portability]]

-

[[user:consent.right-to-data-portability-description]]

- -
- -
- - [[user:consent.export-profile]] - - - [[user:consent.export-posts]] - - - [[user:consent.export-uploads]] - -
-
-
-
-
- - diff --git a/vendor/nodebb-theme-harmony-main/templates/account/controversial.tpl b/vendor/nodebb-theme-harmony-main/templates/account/controversial.tpl deleted file mode 100644 index 21b7d5b195..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/controversial.tpl +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/downvoted.tpl b/vendor/nodebb-theme-harmony-main/templates/account/downvoted.tpl deleted file mode 100644 index 21b7d5b195..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/downvoted.tpl +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/edit.tpl b/vendor/nodebb-theme-harmony-main/templates/account/edit.tpl deleted file mode 100644 index dcdb867ff9..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/edit.tpl +++ /dev/null @@ -1,138 +0,0 @@ - - -
-

{{{ if isSelf }}}[[user:edit-profile]]{{{ else }}}[[pages:account/edit, {username}]]{{{ end }}}

- -
-
-
-
-
- - -
- -
- - -
- - {{{ each customUserFields }}} -
- - {{{ if ((./type == "input-text") || (./type == "input-link")) }}} - - {{{ end }}} - - {{{ if (./type == "input-number") }}} - - {{{ end }}} - - {{{ if (./type == "input-date") }}} - - {{{ end }}} - - {{{ if ((./type == "select") || (./type == "select-multi")) }}} - - {{{ end }}} -
- {{{ end }}} - - {{{ if groups.length }}} -
- - -
- {{{ each groups }}} -
- -
- - - {{{ if allowMultipleBadges }}} - - - {{{ end }}} -
-
- {{{ end }}} -
-
- {{{ end }}} - - {{{ if allowAboutMe }}} -
- - -
- {{{ end }}} - - {{{ if (allowSignature && !disableSignatures) }}} -
- - -
- {{{ end }}} -
-
-
- -
-
- - - {{{ if config.requireEmailConfirmation }}} - {{{ if (email && isSelf) }}} - [[user:confirm-email]]

- {{{ end }}} - {{{ end }}} -
- - {{{ if sso.length }}} - -
- {{{ each sso }}} -
- - {{{ if ./icon }}}{{{ end }}} - {{{ if ./associated }}}[[user:sso.associated]]{{{ else }}}[[user:sso.not-associated]]{{{ end }}} - {./name} - - {{{ if ./deauthUrl }}} - [[user:sso.dissociate]] - {{{ end }}} -
- {{{ end }}} -
- {{{ end }}} - -
- {{{ if (allowAccountDelete && isSelf) }}} -
- -
- {{{ end }}} -
-
- - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/edit/password.tpl b/vendor/nodebb-theme-harmony-main/templates/account/edit/password.tpl deleted file mode 100644 index 4505529fa3..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/edit/password.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -

{{{ if isSelf }}}[[user:change-password]]{{{ else }}}[[pages:{template.name}, {username}]]{{{ end }}}

-
-
-
- - - {{{ if isSelf }}} -
- - -
- {{{ end }}} - -
- - - -
- -
- - - -
- -
- -
-
-
-
- - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/edit/username.tpl b/vendor/nodebb-theme-harmony-main/templates/account/edit/username.tpl deleted file mode 100644 index a98f78ebd9..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/edit/username.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - -

{{{ if isSelf }}}[[user:change-username]]{{{ else }}}[[pages:{template.name}, {username}]]{{{ end }}}

-
-
-
-
- - -
- - - - {{{ if isSelf }}} -
- - -
- {{{ end }}} - - - -
- -
-
-
-
- - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/followers.tpl b/vendor/nodebb-theme-harmony-main/templates/account/followers.tpl deleted file mode 100644 index 68fe6de65d..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/followers.tpl +++ /dev/null @@ -1,15 +0,0 @@ - -

[[pages:{template.name}, {username}]]

- -{{{ if !users.length }}} -
[[user:has-no-follower]]
-{{{ end }}} - -
-{{{ each users }}} - -{{{end}}} -
- - - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/following.tpl b/vendor/nodebb-theme-harmony-main/templates/account/following.tpl deleted file mode 100644 index 73fd4913db..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/following.tpl +++ /dev/null @@ -1,16 +0,0 @@ - - -

[[pages:{template.name}, {username}]]

- -{{{ if !users.length }}} -
[[user:follows-no-one]]
-{{{ end }}} - -
-{{{ each users }}} - -{{{end}}} -
- - - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/groups.tpl b/vendor/nodebb-theme-harmony-main/templates/account/groups.tpl deleted file mode 100644 index c1faf80836..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/groups.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -

[[pages:{template.name}, {username}]]

- -
-
- {{{ if !groups.length }}} -
[[groups:no-groups-found]]
- {{{ else }}} - - {{{ end }}} -
-
- - diff --git a/vendor/nodebb-theme-harmony-main/templates/account/ignored.tpl b/vendor/nodebb-theme-harmony-main/templates/account/ignored.tpl deleted file mode 100644 index 238b943cd5..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/ignored.tpl +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/info.tpl b/vendor/nodebb-theme-harmony-main/templates/account/info.tpl deleted file mode 100644 index 8bdd0a3ec7..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/info.tpl +++ /dev/null @@ -1,271 +0,0 @@ - - -{{{ if sessions.length }}} -
-

[[global:sessions]]

-
    - -
-
-{{{ end }}} - -
-
-
-
- [[global:recentips]] -
-
-
    - {{{each ips}}} -
  • {@value}
    • - {{{end}}} -
-
-
- -
-
- [[user:info.username-history]] -
-
- -
-
- -
-
- [[user:info.email-history]] -
-
- -
-
- - {{{ if isAdminOrGlobalModerator }}} -
-
- [[user:info.moderation-note]] -
-
- - - -
-
- {{{ each moderationNotes }}} -
- -
-
- {buildAvatar(./user, "24px", true)} - - - - -
- - -
-
- {./note} -
- -
- -
- -
- - -
-
-
- {{{ end }}} -
- -
-
- {{{ end }}} -
-
-
-
- [[user:info.latest-flags]] -
-
- {{{ if history.flags.length }}} -
    - {{{ each history.flags }}} -
  • -
    -
    - {{{ if (./type == "user")}}} - [[user:info.profile]] - {{{ else }}} - [[user:info.post]] - {{{ end }}} - -
    - - [[user:info.view-flag]] -
    - - {{{ if (./type == "post") }}} -

    - {{{ if history.flags.targetPurged }}} -

    [[flags:target-purged]]
    - {{{ else }}} - {./title} - {{{ end }}} -

    - {{{ end }}} - -
    - [[user:info.reported-by]] -
    - {{{ each ./reports }}} - {buildAvatar(./reporter, "24px", true)} - {{{ end }}} -
    -
    -
    • - {{{ end }}} -
- {{{ else }}} -
[[user:info.no-flags]]
- {{{ end }}} -
-
- -
-
- [[user:info.ban-history]] - - {{{ if (!banned && !isSelf) }}} - - {{{ end }}} - {{{ if (banned && !isSelf) }}} - - {{{ end }}} -
-
- {{{ if history.bans.length }}} -
    - {{{ each history.bans }}} -
  • -
    - - {{{ if (./type != "unban") }}} - [[user:banned]] - {{{ else }}} - [[user:unbanned]] - {{{ end }}} -
    -

    - [[user:info.banned-reason-label]]: {./reason} -

    -

    - {{{ if ./until }}} - [[user:info.banned-until, {isoTimeToLocaleString(./untilISO, config.userLang)}]] - {{{ else }}} - {{{ if (./type != "unban") }}} - [[user:info.banned-permanently]] - {{{ end }}} - {{{ end }}} -

    -
    • - {{{ end }}} -
- {{{ else }}} -
[[user:info.no-ban-history]]
- {{{ end }}} -
-
- -
-
- [[user:info.mute-history]] - - {{{ if !muted }}} - {{{ if !isSelf }}} - - {{{ end }}} - {{{ else }}} - {{{ if !isSelf }}} - - {{{ end }}} - {{{ end }}} -
-
- {{{ if history.mutes.length }}} -
    - {{{ each history.mutes }}} -
  • -
    - - {{{ if (./type != "unmute") }}} - [[user:muted]] - {{{ else }}} - [[user:unmuted]] - {{{ end }}} -
    -

    - [[user:info.banned-reason-label]]: {./reason} -

    -

    - {{{ if ./until }}} - [[user:info.muted-until, {isoTimeToLocaleString(./untilISO, config.userLang)}]] - {{{ end }}} -

    -
    • - {{{ end }}} -
- {{{ else }}} -
[[user:info.no-mute-history]]
- {{{ end }}} -
-
-
-
- - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/posts.tpl b/vendor/nodebb-theme-harmony-main/templates/account/posts.tpl deleted file mode 100644 index d155ad3f4f..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/posts.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -
-

[[global:posts]]

-
- [[global:header.recent]] - {{{ if !reputation:disabled }}} - [[global:best]] - [[global:controversial]] - {{{ if canEdit }}} - [[global:upvoted]] - {{{ if !downvote:disabled }}} - [[global:downvoted]] - {{{ end }}} - {{{ end }}} - {{{ end }}} - {{{ if canEdit }}} - [[user:bookmarks]] - {{{ end }}} -
-
- -{{{ if !posts.length }}} -
{noItemsFoundKey}
-{{{ end }}} - -
- - - {{{ if config.usePagination }}} - - {{{ end }}} -
- - diff --git a/vendor/nodebb-theme-harmony-main/templates/account/profile.tpl b/vendor/nodebb-theme-harmony-main/templates/account/profile.tpl deleted file mode 100644 index be1b5aead7..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/profile.tpl +++ /dev/null @@ -1,92 +0,0 @@ - - -{{{ if widgets.profile-aboutme-before.length }}} -
-{{{each widgets.profile-aboutme-before}}} -{./html} -{{{end}}} -
-{{{ end }}} - -{{{ if aboutme }}} -
-{aboutmeParsed} -
-{{{ end }}} - -{{{ if widgets.profile-aboutme-after.length }}} -
-{{{each widgets.profile-aboutme-after}}} -{./html} -{{{end}}} -
-{{{ end }}} - - - - diff --git a/vendor/nodebb-theme-harmony-main/templates/account/read.tpl b/vendor/nodebb-theme-harmony-main/templates/account/read.tpl deleted file mode 100644 index 238b943cd5..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/read.tpl +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/sessions.tpl b/vendor/nodebb-theme-harmony-main/templates/account/sessions.tpl deleted file mode 100644 index 679d087729..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/sessions.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - -

[[user:sessions.description]]

-
-
    - -
- - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/settings.tpl b/vendor/nodebb-theme-harmony-main/templates/account/settings.tpl deleted file mode 100644 index 70374d5a74..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/settings.tpl +++ /dev/null @@ -1,268 +0,0 @@ - - -
-

{{{ if isSelf }}}[[pages:account/settings]]{{{ else }}}[[pages:account/settings-of, {username}]]{{{ end }}}

- -
-
-
- {{{ if !disableCustomUserSkins }}} - - - -
- {{{ end }}} - - {{{ if allowUserHomePage }}} - - -
- -

[[user:homepage-description]]

-
- - -
- {{{ end }}} - -
[[global:privacy]]
- - {{{ if !hideEmail }}} -
- - -
- {{{ end }}} - - {{{ if !hideFullname }}} -
- - -
- {{{ end }}} - - {{{ if !config.disableChat }}} -
- - -
- - -
- - -
- {{{ each settings.chatAllowListUsers }}} -
- {buildAvatar(@value, "16px", true)} {./username} - -
- {{{ end }}} -
- - -
- -
- - -
- {{{ each settings.chatDenyListUsers }}} -
- {buildAvatar(@value, "16px", true)} {./username} - -
- {{{ end }}} -
- - -
- - {{{ end }}} - -
- -
[[user:browsing]]
- -
- - -
- - {{{ if inTopicSearchAvailable }}} -
- - -
-

[[user:topic-search-help]]

- {{{ end }}} - -
- - -
- -
- - -
- -
- -
[[global:pagination]]
- -
- - -
-
- - -
-
- - -
- -
- -
[[global:sort]]
- -
- - -
-
- - -
- - - {{{ if !disableEmailSubscriptions }}} -
-
[[global:email]]
-
-
- - -

[[user:digest-description]]

-
-
- {{{ end }}} - - {{{ each customSettings}}} -
-
{./title}
-
- {./content} -
- {{{end}}} -
-
- -
- - - -
- - {{{ if (isAdmin && isSelf) }}} - - - -
- {{{ end }}} - -
[[topic:watch]]
-
-
- - -
-
- - -
-
- - -
-
-
- -
[[user:notifications]]
-
- {{{ each notificationSettings }}} -
-
- -
-
- -
-
- {{{end}}} - -
-
- -
-
- -
-
-
-
-
- - diff --git a/vendor/nodebb-theme-harmony-main/templates/account/shares.tpl b/vendor/nodebb-theme-harmony-main/templates/account/shares.tpl deleted file mode 100644 index 82f471cec2..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/shares.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - -
-
-

[[pages:account/shares, {username}]]

-
-
- -{{{ if !topics.length }}} -
{noItemsFoundKey}
-{{{ end }}} - -
- - {{{ if config.usePagination }}} - - {{{ end }}} -
- - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/tags.tpl b/vendor/nodebb-theme-harmony-main/templates/account/tags.tpl deleted file mode 100644 index c1007eb836..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/tags.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - -
-
-

{title}

-
-
- -
- -
- - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/theme.tpl b/vendor/nodebb-theme-harmony-main/templates/account/theme.tpl deleted file mode 100644 index 01206b1d5d..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/theme.tpl +++ /dev/null @@ -1,82 +0,0 @@ - - -
-

[[themes/harmony:settings.title]]

- - -
- -
-
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- - -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/topics.tpl b/vendor/nodebb-theme-harmony-main/templates/account/topics.tpl deleted file mode 100644 index 4a78a9534b..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/topics.tpl +++ /dev/null @@ -1,45 +0,0 @@ - - -
-
-

[[global:topics]]

- {{{ if showSort }}} -
- - -
- {{{ end }}} -
- -
- {{{ if canEdit }}} - [[global:header.recent]] - [[user:watched]] - [[user:ignored]] - [[user:read]] - {{{ end }}} -
-
- - -{{{ if !topics.length }}} -
{noItemsFoundKey}
-{{{ end }}} - -
- - {{{ if config.usePagination }}} - - {{{ end }}} -
- - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/uploads.tpl b/vendor/nodebb-theme-harmony-main/templates/account/uploads.tpl deleted file mode 100644 index dd5e79002e..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/uploads.tpl +++ /dev/null @@ -1,37 +0,0 @@ - - -

{title}

- -
- {{{ if privateUploads }}}[[uploads:private-uploads-info]]{{{ else }}}[[uploads:public-uploads-info]]{{{ end }}} -
- -{{{ if !uploads.length }}} -
[[uploads:no-uploads-found]]
-{{{ end }}} - - - - - - - - - - {{{ each uploads }}} - - - - - {{{ end }}} - -
- {./url} - -
- -
-
- - - diff --git a/vendor/nodebb-theme-harmony-main/templates/account/upvoted.tpl b/vendor/nodebb-theme-harmony-main/templates/account/upvoted.tpl deleted file mode 100644 index 21b7d5b195..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/upvoted.tpl +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/account/watched.tpl b/vendor/nodebb-theme-harmony-main/templates/account/watched.tpl deleted file mode 100644 index 238b943cd5..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/account/watched.tpl +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/admin/plugins/harmony.tpl b/vendor/nodebb-theme-harmony-main/templates/admin/plugins/harmony.tpl deleted file mode 100644 index 0dc2e541ee..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/admin/plugins/harmony.tpl +++ /dev/null @@ -1,72 +0,0 @@ -
- - -
-
-
-
- - -
-
- - -

[[themes/harmony:settings.enableBreadcrumbs.why]]

-
-
- - -
-
- - -
-
- -
- [[themes/harmony:settings.stickyToolbar]] -

- [[themes/harmony:settings.stickyToolbar.help]] -

-
-
-
- -
- [[themes/harmony:settings.topicSidebarTools]] -

- [[themes/harmony:settings.topicSidebarTools.help]] -

-
-
-
- -
- [[themes/harmony:settings.autohideBottombar]] -

- [[themes/harmony:settings.autohideBottombar.help]] -

-
-
-
- -
- [[themes/harmony:settings.topMobilebar]] -
-
-
- - -
-
- -
- [[themes/harmony:settings.chatModals]] -
-
-
-
- - -
-
diff --git a/vendor/nodebb-theme-harmony-main/templates/categories.tpl b/vendor/nodebb-theme-harmony-main/templates/categories.tpl deleted file mode 100644 index 0a5df5db97..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/categories.tpl +++ /dev/null @@ -1,29 +0,0 @@ -
- {{{ each widgets.header }}} - {{widgets.header.html}} - {{{ end }}} -
-
-
- {{{ if pagination.pages.length }}} -
- {{{ end }}} -
    - {{{ each categories }}} - - {{{ end }}} -
- - -
-
- {{{ each widgets.sidebar }}} - {{widgets.sidebar.html}} - {{{ end }}} -
-
-
- {{{ each widgets.footer }}} - {{widgets.footer.html}} - {{{ end }}} -
diff --git a/vendor/nodebb-theme-harmony-main/templates/category.tpl b/vendor/nodebb-theme-harmony-main/templates/category.tpl deleted file mode 100644 index 82d84639c0..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/category.tpl +++ /dev/null @@ -1,92 +0,0 @@ - -{{{ if config.theme.enableBreadcrumbs }}} - -{{{ end }}} - -
-
- {buildCategoryIcon(@value, "40px", "rounded-1 flex-shrink-0")} -

{./name}

-
- {{{ if ./descriptionParsed }}} -
- {./descriptionParsed} -
- {{{ end }}} - {{{ if ./handleFull }}} -

- [[category:handle.description, {handleFull}]] - -

- {{{ end }}} -
- - {humanReadableNumber(totalTopicCount)} - [[global:topics]] - - - {humanReadableNumber(totalPostCount)} - [[global:posts]] - - {{{ if !isNumber(cid) }}} - - View Original - - - {{{ end }}} -
-
- -{{{ if widgets.header.length }}} -
- {{{ each widgets.header }}} - {{widgets.header.html}} - {{{ end }}} -
-{{{ end }}} - - -
-
- - {{{ if (topics.length || privileges.topics:create) }}} - - {{{ end }}} - - {{{ if (./inbox && (./hasFollowers == false)) }}} - - {{{ end }}} - - {{{ if (!topics.length && privileges.topics:create) }}} -
- [[category:no-topics]] -
- {{{ end }}} - - - - {{{ if config.usePagination }}} - - {{{ end }}} -
-
- {{{ each widgets.sidebar }}} - {{widgets.sidebar.html}} - {{{ end }}} -
-
-
- {{{each widgets.footer}}} - {{widgets.footer.html}} - {{{end}}} -
- -{{{ if !config.usePagination }}} - -{{{ end }}} diff --git a/vendor/nodebb-theme-harmony-main/templates/footer.tpl b/vendor/nodebb-theme-harmony-main/templates/footer.tpl deleted file mode 100644 index c62d38cb03..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/footer.tpl +++ /dev/null @@ -1,24 +0,0 @@ - -
- - -
- {{{ if !config.theme.topMobilebar }}} - - {{{ else }}} -
- -
- {{{ end }}} - - {{{ if !isSpider }}} -
-
- -
-
- {{{ end }}} - - - - diff --git a/vendor/nodebb-theme-harmony-main/templates/groups/details.tpl b/vendor/nodebb-theme-harmony-main/templates/groups/details.tpl deleted file mode 100644 index fd392c7dbe..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/groups/details.tpl +++ /dev/null @@ -1,86 +0,0 @@ -
-
-
- {{{ if group.isOwner }}} -
- - - -
- [[groups:cover-save]] -
[[groups:cover-saving]]
- {{{ end }}} -
-
- -
-
-
-

{group.displayName}

-
-
- {group.descriptionParsed} -
- {{{ if group.private }}}[[groups:details.private]]{{{ end }}} - {{{ if group.hidden }}}[[groups:details.hidden]]{{{ end }}} -
-
-
-
- {{{ if loggedIn }}} - {function.membershipBtn, group} - {{{ end }}} - {{{ if isAdmin }}} - [[user:edit]] - {{{ end }}} -
-
- -
-
- {{{each widgets.left}}} - {{widgets.left.html}} - {{{end}}} -
- - -
-
-
-

[[global:posts]]

- {{{ if !posts.length }}} -
[[groups:details.has-no-posts]]
- {{{ end }}} - -
-
-

[[groups:details.members]]

- - -
- {{{ if group.isOwner }}} -
-

[[groups:details.pending]]

- -
- -
-

[[groups:details.invited]]

- -
- -
-

[[groups:details.owner-options]]

- -
- {{{ end }}} -
-
- -
- {{{each widgets.right}}} - {{widgets.right.html}} - {{{end}}} -
-
-
diff --git a/vendor/nodebb-theme-harmony-main/templates/groups/list.tpl b/vendor/nodebb-theme-harmony-main/templates/groups/list.tpl deleted file mode 100644 index 6d62e93482..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/groups/list.tpl +++ /dev/null @@ -1,58 +0,0 @@ -
- {{{each widgets.header}}} - {{widgets.header.html}} - {{{end}}} -
-
-

[[pages:groups]]

-
-
-
- [[topic:sort-by]] -
- [[groups:details.group-name]] - [[groups:details.member-count]] - [[groups:details.creation-date]] -
-
-
-
-
-
- {{{ if allowGroupCreation }}} - - {{{ end }}} - -
-
-
- - -
-
-
-
-
- -
- -
- {{{ if groups.length }}} - - {{{ else }}} -
-
- [[groups:no-groups-found]] -
-
- {{{ end }}} -
- - -
diff --git a/vendor/nodebb-theme-harmony-main/templates/groups/members.tpl b/vendor/nodebb-theme-harmony-main/templates/groups/members.tpl deleted file mode 100644 index ffec941ab3..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/groups/members.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
- {{{ each users }}} - - {{{ end }}} -
- - -
\ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/header.tpl b/vendor/nodebb-theme-harmony-main/templates/header.tpl deleted file mode 100644 index 412826c93a..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/header.tpl +++ /dev/null @@ -1,39 +0,0 @@ - - - - {browserTitle} - {{{each metaTags}}}{function.buildMetaTag}{{{end}}} - - {{{each linkTags}}}{function.buildLinkTag}{{{end}}} - - - - {{{if useCustomHTML}}} - {{customHTML}} - {{{end}}} - {{{if useCustomCSS}}} - - {{{end}}} - - - - [[global:skip-to-content]] - - {{{ if config.theme.topMobilebar }}} - - {{{ end }}} - -
- - -
- -
- - diff --git a/vendor/nodebb-theme-harmony-main/templates/notifications.tpl b/vendor/nodebb-theme-harmony-main/templates/notifications.tpl deleted file mode 100644 index 3e6673d701..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/notifications.tpl +++ /dev/null @@ -1,32 +0,0 @@ -
- - -
- -
-
-
- {{{ each filters }}} - {{{ if ./separator }}} -
- {{{ else }}} - -
{filters.name}
- {humanReadableNumber(./count)} - - {{{ end }}} - {{{ end }}} -
-
-
-
    - -
- -
-
-
- - diff --git a/vendor/nodebb-theme-harmony-main/templates/partials/account/admin-menu.tpl b/vendor/nodebb-theme-harmony-main/templates/partials/account/admin-menu.tpl deleted file mode 100644 index 2941c91505..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/partials/account/admin-menu.tpl +++ /dev/null @@ -1,36 +0,0 @@ -
- - -
diff --git a/vendor/nodebb-theme-harmony-main/templates/partials/account/category-item.tpl b/vendor/nodebb-theme-harmony-main/templates/partials/account/category-item.tpl deleted file mode 100644 index e7f9568a44..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/partials/account/category-item.tpl +++ /dev/null @@ -1,22 +0,0 @@ -
  • - -
    -
    -
    - {buildCategoryIcon(@value, "24px", "rounded-1")} -
    -
    -
    - -
    - {{{ if ./descriptionParsed }}} -
    {./descriptionParsed}
    - {{{ end }}} -
    -
    -
    - -
    -
    -
    -
    • diff --git a/vendor/nodebb-theme-harmony-main/templates/partials/account/footer.tpl b/vendor/nodebb-theme-harmony-main/templates/partials/account/footer.tpl deleted file mode 100644 index e3c5167c91..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/partials/account/footer.tpl +++ /dev/null @@ -1,3 +0,0 @@ -
    -
    -
    \ No newline at end of file diff --git a/vendor/nodebb-theme-harmony-main/templates/partials/account/header.tpl b/vendor/nodebb-theme-harmony-main/templates/partials/account/header.tpl deleted file mode 100644 index 0d372d9c04..0000000000 --- a/vendor/nodebb-theme-harmony-main/templates/partials/account/header.tpl +++ /dev/null @@ -1,98 +0,0 @@ -