From 2d3e27197b5485ede26d6512fd54ea1abf543d75 Mon Sep 17 00:00:00 2001 From: Troplo Date: Mon, 30 Nov 2020 02:16:19 +1100 Subject: [PATCH] commit1 --- frontend/src/App.vue | 2 +- frontend/src/components/AvatarIcon.vue | 8 +- frontend/src/components/SelectOptions.vue | 6 +- frontend/src/components/ThreadCubashImpl.vue | 364 ++++++ frontend/src/components/ThreadDisplay.vue | 21 +- frontend/src/components/ThreadPost.vue | 55 +- frontend/src/components/routes/Index.vue | 34 +- frontend/src/components/routes/Thread.vue | 122 +- frontend/src/main.js | 4 +- frontend/src/store/modules/thread.js | 4 +- .../20170925191833-create-bans-table.js | 35 - .../20170925200317-create-categories-table.js | 32 - migrations/20170925201609-create-ips-table.js | 23 - .../20170925201924-create-logs-table.js | 35 - ...170925202317-create-notifications-table.js | 32 - ...20170925202519-create-pollanswers-table.js | 27 - ...170925202651-create-pollquestions-table.js | 27 - .../20170925202801-create-pollvotes-table.js | 25 - ...25203055-create-postnotifications-table.js | 25 - .../20170925203433-create-posts-table.js | 36 - .../20170925204011-create-reports-table.js | 29 - .../20170925204327-create-settings-table.js | 24 - .../20170925204827-create-threads-table.js | 39 - .../20170925205531-create-user_post-table.js | 19 - .../20170925205649-create-userip-table.js | 19 - .../20170925205832-create-users-table.js | 36 - ...20170925210453-create-admintokens-table.js | 23 - ...70927123720-add-show-description-column.js | 14 - .../20171203220305-add-picture-column.js | 13 - ...1208231827-create-profile-picture-table.js | 24 - ...171208235706-add-profile-picture-column.js | 13 - .../20180104141055-create-session-table.js | 23 - .../20181209110718-add-plaintext-column.js | 32 - .../20200806113935-deniedwebsiteaccess.js | 15 - migrations/20200806124138-categorylock.js | 15 - migrations/20200807033716-userlocked.js | 15 - migrations/20200807045245-botaccounts.js | 15 - migrations/20200807101832-relationships.js | 24 - .../20200807102357-relationshiptypes.js | 15 - migrations/20200808103628-sitename.js | 15 - migrations/20200808113351-gateway.js | 15 - migrations/20200808132655-email.js | 39 - migrations/20200810104620-NewBanSystem.js | 19 - migrations/20200810120620-SystemUsers.js | 15 - migrations/20200811022556-premium.js | 85 -- .../20200811024604-usersubscriptions.js | 47 - migrations/20200811124606-PassKey.js | 30 - migrations/20200812082803-HiddenUsers.js | 15 - .../20200812112421-CharacterAvatarVars.js | 88 -- migrations/20200812122900-EmailToken.js | 14 - migrations/20200813155832-banner.js | 23 - migrations/20200814044859-currency.js | 23 - migrations/20200815120718-unban-request.js | 27 - .../20200816103252-registrationsdisabled.js | 14 - migrations/20200816130824-boosters.js | 33 - .../20200817032943-StaffApplications.js | 50 - .../20200818101218-AddSuggestionsColumn.js | 15 - migrations/20200819071018-usersettings.js | 38 - migrations/20200906114205-reportusers.js | 23 - migrations/20200907062230-passwordreset.js | 22 - migrations/20200907074256-themes.js | 19 - migrations/20200908042210-blog.js | 41 - migrations/20200908070345-statelogo.js | 29 - migrations/20200913072222-contributors.js | 16 - migrations/20200913074832-userwall.js | 35 - migrations/20200913143426-renameuserwalls.js | 10 - migrations/20200924073845-levels.js | 34 - migrations/20200930052855-addToState.js | 46 - migrations/20200930145317-inactivethreads.js | 22 - migrations/20201001085400-optoutcheck.js | 32 - migrations/20201007080348-audit.js | 25 - migrations/20201010073627-executives.js | 23 - migrations/20201010082702-walloptout.js | 32 - migrations/20201013085951-2fa.js | 33 - migrations/20201014083412-emaildelete.js | 33 - migrations/20201015055722-chat.js | 30 - migrations/20201015064801-userconvo.js | 29 - migrations/20201015064814-messages.js | 37 - migrations/20201023123218-jwtoffset.js | 18 - migrations/20201024134128-teams-base.js | 52 - migrations/20201024135257-teams-avatar.js | 18 - migrations/20201024141550-teams-approve.js | 18 - migrations/20201024145917-teams-owner.js | 19 - migrations/20201024162834-team-members.js | 26 - migrations/20201024163127-team-roles.js | 58 - .../20201024165105-team-member-roles.js | 18 - migrations/20201025055958-pfpTeam.js | 27 - migrations/20201025115613-teamwalls.js | 35 - migrations/20201026083417-priority.js | 14 - migrations/20201027105736-TeamRoleId.js | 14 - migrations/20201117070116-MarketplaceItems.js | 96 -- migrations/20201117081150-ItemApproval.js | 15 - migrations/20201117090243-ItemCategories.js | 31 - .../20201117090702-ItemCategoryLocked.js | 15 - migrations/20201117094136-ItemCategoryType.js | 15 - migrations/20201117094911-ItemDescription.js | 15 - migrations/20201117112322-inventory.js | 47 - migrations/20201118054637-transactions.js | 58 - .../20201118060033-addIpIdToTransactionLog.js | 14 - migrations/20201118090259-ItemDeleted.js | 16 - migrations/20201119101904-TeamMemberRoles.js | 27 - ...03153-TeamMemberRolesCreatedAtUpdatedAt.js | 20 - .../20201120132931-restrictTeamRoles.js | 55 - migrations/20201121134117-TeamInvites.js | 37 - migrations/20201121134425-addInviteOnly.js | 24 - migrations/20201121135120-TeamInviteDates.js | 20 - migrations/20201121141717-bannedUsernames.js | 19 - migrations/20201123052049-addUserItems.js | 27 - ...201123094448-relationshipCreatedUpdated.js | 20 - migrations/20201123094631-relationshipId.js | 9 - migrations/20201123094806-relationshipId2.js | 9 - migrations/20201123123624-face.js | 15 - .../20201124045544-MessageNotifications.js | 25 - migrations/20201128071217-modeler.js | 8 +- ...treward.js => 20201129140052-createdAt.js} | 6 +- ...atedBan.js => 20201129140053-createdAt.js} | 8 +- ...iteCode.js => 20201129140054-createdAt.js} | 6 +- ...keswall.js => 20201129140056-createdAt.js} | 8 +- migrations/20201129140217-createdAt.js | 13 + ...-DeveloperMode.js => 20201129141730-id.js} | 21 +- migrations/20201129144020-postNumber.js | 13 + models/Notification.js | 86 -- models/PassKey.js | 33 - models/StaffApplications.js | 139 --- models/UnbanRequest.js | 32 - models/admin_token.js | 32 - models/auditlog.js | 16 - models/ban.js | 109 -- models/bannedUsernames.js | 15 - models/blog.js | 135 --- models/category.js | 29 +- models/conversation.js | 56 - models/inventory.js | 66 -- models/ip.js | 28 - models/item.js | 150 --- models/itemcategory.js | 44 - models/log.js | 54 - models/message.js | 31 - models/message_notifications.js | 13 - models/picture.js | 27 - models/poll_answer.js | 25 - models/poll_question.js | 28 - models/poll_vote.js | 12 - models/post.js | 13 - models/post_notification.js | 17 - models/relationship.js | 31 - models/report.js | 40 - models/team.js | 160 --- models/teamWall.js | 117 -- models/team_invite.js | 67 -- models/team_member_role.js | 87 -- models/team_members.js | 38 - models/team_roles.js | 72 -- models/thread.js | 30 +- models/transaction.js | 56 - models/user.js | 279 +---- models/userWall.js | 117 -- models/user_conversation.js | 15 - routes/StaffApplications.js | 63 - routes/UnbanRequest.js | 63 - routes/admin.js | 367 ------ routes/admin_kill_session.js | 15 - routes/admin_token.js | 20 - routes/admin_user_list.js | 96 -- routes/avatar.js | 149 --- routes/blog.js | 0 routes/category.js | 15 +- routes/conversation.js | 104 -- routes/experiments.js | 0 routes/inventory.js | 42 - routes/link_preview.js | 52 - routes/log.js | 243 ---- routes/login_status.js | 20 - routes/marketplace.js | 521 -------- routes/message.js | 62 - routes/notification.js | 98 -- routes/poll.js | 154 --- routes/relationship.js | 203 ---- routes/report.js | 95 -- routes/stats.js | 21 - routes/team.js | 865 -------------- routes/team_admin.js | 1049 ----------------- routes/team_wall.js | 144 --- routes/transactions.js | 19 - routes/user.js | 146 --- routes/user_passkey.js | 123 -- routes/user_wall.js | 140 --- server.js | 30 - 188 files changed, 516 insertions(+), 10231 deletions(-) create mode 100644 frontend/src/components/ThreadCubashImpl.vue delete mode 100644 migrations/20170925191833-create-bans-table.js delete mode 100644 migrations/20170925200317-create-categories-table.js delete mode 100644 migrations/20170925201609-create-ips-table.js delete mode 100644 migrations/20170925201924-create-logs-table.js delete mode 100644 migrations/20170925202317-create-notifications-table.js delete mode 100644 migrations/20170925202519-create-pollanswers-table.js delete mode 100644 migrations/20170925202651-create-pollquestions-table.js delete mode 100644 migrations/20170925202801-create-pollvotes-table.js delete mode 100644 migrations/20170925203055-create-postnotifications-table.js delete mode 100644 migrations/20170925203433-create-posts-table.js delete mode 100644 migrations/20170925204011-create-reports-table.js delete mode 100644 migrations/20170925204327-create-settings-table.js delete mode 100644 migrations/20170925204827-create-threads-table.js delete mode 100644 migrations/20170925205531-create-user_post-table.js delete mode 100644 migrations/20170925205649-create-userip-table.js delete mode 100644 migrations/20170925205832-create-users-table.js delete mode 100644 migrations/20170925210453-create-admintokens-table.js delete mode 100644 migrations/20170927123720-add-show-description-column.js delete mode 100644 migrations/20171203220305-add-picture-column.js delete mode 100644 migrations/20171208231827-create-profile-picture-table.js delete mode 100644 migrations/20171208235706-add-profile-picture-column.js delete mode 100644 migrations/20180104141055-create-session-table.js delete mode 100644 migrations/20181209110718-add-plaintext-column.js delete mode 100644 migrations/20200806113935-deniedwebsiteaccess.js delete mode 100644 migrations/20200806124138-categorylock.js delete mode 100644 migrations/20200807033716-userlocked.js delete mode 100644 migrations/20200807045245-botaccounts.js delete mode 100644 migrations/20200807101832-relationships.js delete mode 100644 migrations/20200807102357-relationshiptypes.js delete mode 100644 migrations/20200808103628-sitename.js delete mode 100644 migrations/20200808113351-gateway.js delete mode 100644 migrations/20200808132655-email.js delete mode 100644 migrations/20200810104620-NewBanSystem.js delete mode 100644 migrations/20200810120620-SystemUsers.js delete mode 100644 migrations/20200811022556-premium.js delete mode 100644 migrations/20200811024604-usersubscriptions.js delete mode 100644 migrations/20200811124606-PassKey.js delete mode 100644 migrations/20200812082803-HiddenUsers.js delete mode 100644 migrations/20200812112421-CharacterAvatarVars.js delete mode 100644 migrations/20200812122900-EmailToken.js delete mode 100644 migrations/20200813155832-banner.js delete mode 100644 migrations/20200814044859-currency.js delete mode 100644 migrations/20200815120718-unban-request.js delete mode 100644 migrations/20200816103252-registrationsdisabled.js delete mode 100644 migrations/20200816130824-boosters.js delete mode 100644 migrations/20200817032943-StaffApplications.js delete mode 100644 migrations/20200818101218-AddSuggestionsColumn.js delete mode 100644 migrations/20200819071018-usersettings.js delete mode 100644 migrations/20200906114205-reportusers.js delete mode 100644 migrations/20200907062230-passwordreset.js delete mode 100644 migrations/20200907074256-themes.js delete mode 100644 migrations/20200908042210-blog.js delete mode 100644 migrations/20200908070345-statelogo.js delete mode 100644 migrations/20200913072222-contributors.js delete mode 100644 migrations/20200913074832-userwall.js delete mode 100644 migrations/20200913143426-renameuserwalls.js delete mode 100644 migrations/20200924073845-levels.js delete mode 100644 migrations/20200930052855-addToState.js delete mode 100644 migrations/20200930145317-inactivethreads.js delete mode 100644 migrations/20201001085400-optoutcheck.js delete mode 100644 migrations/20201007080348-audit.js delete mode 100644 migrations/20201010073627-executives.js delete mode 100644 migrations/20201010082702-walloptout.js delete mode 100644 migrations/20201013085951-2fa.js delete mode 100644 migrations/20201014083412-emaildelete.js delete mode 100644 migrations/20201015055722-chat.js delete mode 100644 migrations/20201015064801-userconvo.js delete mode 100644 migrations/20201015064814-messages.js delete mode 100644 migrations/20201023123218-jwtoffset.js delete mode 100644 migrations/20201024134128-teams-base.js delete mode 100644 migrations/20201024135257-teams-avatar.js delete mode 100644 migrations/20201024141550-teams-approve.js delete mode 100644 migrations/20201024145917-teams-owner.js delete mode 100644 migrations/20201024162834-team-members.js delete mode 100644 migrations/20201024163127-team-roles.js delete mode 100644 migrations/20201024165105-team-member-roles.js delete mode 100644 migrations/20201025055958-pfpTeam.js delete mode 100644 migrations/20201025115613-teamwalls.js delete mode 100644 migrations/20201026083417-priority.js delete mode 100644 migrations/20201027105736-TeamRoleId.js delete mode 100644 migrations/20201117070116-MarketplaceItems.js delete mode 100644 migrations/20201117081150-ItemApproval.js delete mode 100644 migrations/20201117090243-ItemCategories.js delete mode 100644 migrations/20201117090702-ItemCategoryLocked.js delete mode 100644 migrations/20201117094136-ItemCategoryType.js delete mode 100644 migrations/20201117094911-ItemDescription.js delete mode 100644 migrations/20201117112322-inventory.js delete mode 100644 migrations/20201118054637-transactions.js delete mode 100644 migrations/20201118060033-addIpIdToTransactionLog.js delete mode 100644 migrations/20201118090259-ItemDeleted.js delete mode 100644 migrations/20201119101904-TeamMemberRoles.js delete mode 100644 migrations/20201119103153-TeamMemberRolesCreatedAtUpdatedAt.js delete mode 100644 migrations/20201120132931-restrictTeamRoles.js delete mode 100644 migrations/20201121134117-TeamInvites.js delete mode 100644 migrations/20201121134425-addInviteOnly.js delete mode 100644 migrations/20201121135120-TeamInviteDates.js delete mode 100644 migrations/20201121141717-bannedUsernames.js delete mode 100644 migrations/20201123052049-addUserItems.js delete mode 100644 migrations/20201123094448-relationshipCreatedUpdated.js delete mode 100644 migrations/20201123094631-relationshipId.js delete mode 100644 migrations/20201123094806-relationshipId2.js delete mode 100644 migrations/20201123123624-face.js delete mode 100644 migrations/20201124045544-MessageNotifications.js rename migrations/{20200916070118-lastreward.js => 20201129140052-createdAt.js} (79%) rename migrations/{20200915164553-DeactivatedBan.js => 20201129140053-createdAt.js} (65%) rename migrations/{20201121134735-TeamInviteCode.js => 20201129140054-createdAt.js} (67%) rename migrations/{20200913160925-addlikeswall.js => 20201129140056-createdAt.js} (64%) create mode 100644 migrations/20201129140217-createdAt.js rename migrations/{20200810105929-DeveloperMode.js => 20201129141730-id.js} (50%) create mode 100644 migrations/20201129144020-postNumber.js delete mode 100644 models/Notification.js delete mode 100644 models/PassKey.js delete mode 100644 models/StaffApplications.js delete mode 100644 models/UnbanRequest.js delete mode 100644 models/admin_token.js delete mode 100644 models/auditlog.js delete mode 100644 models/ban.js delete mode 100644 models/bannedUsernames.js delete mode 100644 models/blog.js delete mode 100644 models/conversation.js delete mode 100644 models/inventory.js delete mode 100644 models/ip.js delete mode 100644 models/item.js delete mode 100644 models/itemcategory.js delete mode 100644 models/log.js delete mode 100644 models/message.js delete mode 100644 models/message_notifications.js delete mode 100644 models/picture.js delete mode 100644 models/poll_answer.js delete mode 100644 models/poll_question.js delete mode 100644 models/poll_vote.js delete mode 100644 models/post_notification.js delete mode 100644 models/relationship.js delete mode 100644 models/report.js delete mode 100644 models/team.js delete mode 100644 models/teamWall.js delete mode 100644 models/team_invite.js delete mode 100644 models/team_member_role.js delete mode 100644 models/team_members.js delete mode 100644 models/team_roles.js delete mode 100644 models/transaction.js delete mode 100644 models/userWall.js delete mode 100644 models/user_conversation.js delete mode 100644 routes/StaffApplications.js delete mode 100644 routes/UnbanRequest.js delete mode 100644 routes/admin.js delete mode 100644 routes/admin_kill_session.js delete mode 100644 routes/admin_token.js delete mode 100644 routes/admin_user_list.js delete mode 100644 routes/avatar.js delete mode 100644 routes/blog.js delete mode 100644 routes/conversation.js delete mode 100644 routes/experiments.js delete mode 100644 routes/inventory.js delete mode 100644 routes/link_preview.js delete mode 100644 routes/log.js delete mode 100644 routes/login_status.js delete mode 100644 routes/marketplace.js delete mode 100644 routes/message.js delete mode 100644 routes/notification.js delete mode 100644 routes/poll.js delete mode 100644 routes/relationship.js delete mode 100644 routes/report.js delete mode 100644 routes/stats.js delete mode 100644 routes/team.js delete mode 100644 routes/team_admin.js delete mode 100644 routes/team_wall.js delete mode 100644 routes/transactions.js delete mode 100644 routes/user_passkey.js delete mode 100644 routes/user_wall.js diff --git a/frontend/src/App.vue b/frontend/src/App.vue index f82bd21..071df50 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -992,7 +992,7 @@ export default { experimentsTemp: {"wall":false,"theme":"light","relationships":false,"teams":false,"marketplace":false, "newsettings": true}, loadingLogout: false, showMenu: false, - connModal: true, + connModal: false, settingsModal: false, showConfirmModal: false, ajaxErrorHandler: AjaxErrorHandler(this.$store) diff --git a/frontend/src/components/AvatarIcon.vue b/frontend/src/components/AvatarIcon.vue index 55a1d1e..dd101b4 100644 --- a/frontend/src/components/AvatarIcon.vue +++ b/frontend/src/components/AvatarIcon.vue @@ -6,9 +6,7 @@ diff --git a/frontend/src/components/SelectOptions.vue b/frontend/src/components/SelectOptions.vue index 1de7acc..36579ff 100644 --- a/frontend/src/components/SelectOptions.vue +++ b/frontend/src/components/SelectOptions.vue @@ -13,10 +13,10 @@