Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translator correct #54

Open
wants to merge 194 commits into
base: f24
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
194 commits
Select commit Hold shift + click to select a range
baae333
changed the tags file completely
Sep 22, 2024
fdccaa6
Merge pull request #28 from CMU-17313Q/refactoringtags
DachiCharkviani Sep 22, 2024
265558e
modifiedTheFileFromPRoject1
NickDevi Sep 22, 2024
7228179
Merge pull request #29 from CMU-17313Q/recaftoringsorted
NickDevi Sep 22, 2024
943a81d
modified-same-file-from-project-one-to-match-it-in-swifties
Seckhen Sep 22, 2024
35e1656
added-missing-use-strict-line
Seckhen Sep 22, 2024
e4bbc68
Merge pull request #30 from CMU-17313Q/project-one
Seckhen Sep 22, 2024
f09d427
Added voice recording button to new post menu, modified file composer…
Seckhen Sep 23, 2024
ab689af
replicated project1 changes here too
raissg Sep 25, 2024
d227001
Merge pull request #31 from CMU-17313Q/project1clone
raissg Sep 25, 2024
8b57be8
Adding node modules file, which we will work on but is currently not …
Seckhen Sep 25, 2024
c659580
Adding node modules file, which we will work on but is currently not …
Seckhen Sep 25, 2024
9478b3b
Adding node modules file in a newly created folder called node_module…
Seckhen Sep 25, 2024
8b13e60
Adding node modules file in a newly created folder called node_module…
Seckhen Sep 25, 2024
bee5c4c
Delete node_modules/nodebb-theme-harmony/templates/partials/topics_li…
Seckhen Sep 25, 2024
33b0417
added 'share post to chat' button to every topic listing/post'
Sep 25, 2024
d3fb1b0
added 'share post to chat' button to every topic listing/post
Sep 25, 2024
6370123
Merge pull request #32 from CMU-17313Q/adding-node-modules-file-to-gi…
Seckhen Sep 25, 2024
02c1a04
Merge branch 'f24' into userStory1FrontEnd
DachiCharkviani Sep 25, 2024
90e5d52
Merge pull request #33 from CMU-17313Q/userStory1FrontEnd
DachiCharkviani Sep 25, 2024
1d54e24
Implemented front-end modal and event handler to display a popup with…
NickDevi Sep 25, 2024
9e99bb6
Merge branch 'f24' into userStory1FrontEnd
NickDevi Sep 26, 2024
a37b368
Implemented back-end script to retrieve and showcase user's available…
raissg Sep 26, 2024
5528f97
Merge pull request #34 from CMU-17313Q/userStory1FrontEnd
NickDevi Sep 26, 2024
48013d7
Added functions sendPostToChat, sharePostToChat, and fetchTopicTitle …
Seckhen Sep 26, 2024
7edaae0
Merge branch 'f24' into userStory1BackEnd
Seckhen Sep 26, 2024
66e2d7e
Merge pull request #35 from CMU-17313Q/userStory1BackEnd
Seckhen Sep 26, 2024
82bf68b
Added the button for voice memo record - user story 2
Seckhen Sep 26, 2024
cdc0890
Merge pull request #36 from CMU-17313Q/userStory2FrontEnd
Seckhen Sep 26, 2024
5cf8b02
added the option for when the audio button is clicked the options for…
raissg Sep 26, 2024
c6137db
Merge branch 'f24' into userStory2BackEnd
raissg Sep 26, 2024
91a6996
Merge pull request #37 from CMU-17313Q/userStory2BackEnd
raissg Sep 26, 2024
29fd342
added the option for when the audio button is clicked the options for…
raissg Sep 26, 2024
3c10efd
Implemented front-end emoji reaction feature for chat messages, inclu…
Seckhen Sep 26, 2024
a987a3f
Merge pull request #38 from CMU-17313Q/userStory4FrontEnd
Seckhen Sep 26, 2024
b90f0fd
modified lint errors with comments out.
raissg Sep 26, 2024
f37d6be
Revert "Added Front-End Emoji Reaction UI for Chat Messages"
Seckhen Sep 26, 2024
a35c0dd
Merge pull request #39 from CMU-17313Q/userStory2BackEnd
raissg Sep 26, 2024
4897da6
modified lint errors with comments out and added the last code to mak…
raissg Sep 26, 2024
941bfad
Merge pull request #42 from CMU-17313Q/userStory2BackEnd
raissg Sep 26, 2024
6758a66
Implemented front-end emoji reaction feature for chat messages, inclu…
Seckhen Sep 26, 2024
3b7a58a
Merge pull request #43 from CMU-17313Q/userStory4FrontEnd
Seckhen Sep 26, 2024
2ed1fd8
Implement emoji picker functionality in chat, handled real-time updat…
NickDevi Sep 26, 2024
ba86ddc
Implemented front-end modal and event handler to display a popup with…
NickDevi Sep 26, 2024
5ab699a
Implement emoji picker functionality in chat, handled real-time updat…
NickDevi Sep 26, 2024
83cbb21
implement emoji picker functionality in chat, selecting and reacting …
Sep 26, 2024
2e4f854
Revert "Implemented front-end emoji reaction feature for chat message…
Seckhen Sep 26, 2024
9502632
Merge pull request #45 from CMU-17313Q/revert-43-userStory4FrontEnd
Seckhen Sep 26, 2024
198be88
Revert "Revert "Implemented front-end emoji reaction feature for chat…
Seckhen Sep 26, 2024
48be5de
Revert "modified lint errors with comments out and added the last cod…
DachiCharkviani Sep 26, 2024
ed7721c
Merge pull request #46 from CMU-17313Q/revert-42-userStory2BackEnd
DachiCharkviani Sep 26, 2024
6b5882e
Revert "User story2 back end - Choosing mp3 file for saving in database"
DachiCharkviani Sep 26, 2024
b45ac6f
Merge pull request #47 from CMU-17313Q/revert-39-userStory2BackEnd
DachiCharkviani Sep 26, 2024
31c86a7
Merge pull request #48 from CMU-17313Q/revert-38-userStory4FrontEnd
DachiCharkviani Sep 26, 2024
039278d
Revert "User story2 back end - Choosing mp3 file for saving in database"
DachiCharkviani Sep 26, 2024
3edc893
Merge pull request #49 from CMU-17313Q/revert-37-userStory2BackEnd
DachiCharkviani Sep 26, 2024
25f631d
Revert "Added the button for voice memo record - user story 2"
DachiCharkviani Sep 26, 2024
10be420
Merge pull request #50 from CMU-17313Q/revert-36-userStory2FrontEnd
DachiCharkviani Sep 26, 2024
1c88d52
Revert "Implemented back-end to retrieve and showcase users' availabl…
DachiCharkviani Sep 26, 2024
23764ef
Merge pull request #51 from CMU-17313Q/revert-35-userStory1BackEnd
DachiCharkviani Sep 26, 2024
32e7e84
Revert "Implement Front-End Modal for Future Available Chats on Share…
DachiCharkviani Sep 26, 2024
6d27ac0
Merge pull request #52 from CMU-17313Q/revert-34-userStory1FrontEnd
DachiCharkviani Sep 26, 2024
5f8e56c
Revert "node_modules/nodebb-theme-harmony/templates/partials/topics_l…
DachiCharkviani Sep 26, 2024
faed83e
Merge pull request #53 from CMU-17313Q/revert-33-userStory1FrontEnd
DachiCharkviani Sep 26, 2024
91053aa
Revert "Adding node modules file we edited to git repository "
DachiCharkviani Sep 26, 2024
d4595eb
Merge pull request #54 from CMU-17313Q/revert-32-adding-node-modules-…
DachiCharkviani Sep 26, 2024
9c9be39
Revert "replicated project1 changes here too"
DachiCharkviani Sep 26, 2024
a7ca9dd
Merge pull request #55 from CMU-17313Q/revert-31-project1clone
DachiCharkviani Sep 26, 2024
6a3c759
Revert "Matched sound_settings.js to match project one's file "
DachiCharkviani Sep 26, 2024
d4e200b
Merge pull request #56 from CMU-17313Q/revert-30-project-one
DachiCharkviani Sep 26, 2024
97bb224
Revert "Matched The Modified File(sorted.js) from Project NodeBB"
DachiCharkviani Sep 26, 2024
c324071
Merge pull request #57 from CMU-17313Q/revert-29-recaftoringsorted
DachiCharkviani Sep 26, 2024
bf0e2f1
Revert "Imported Improvements for tags.js to Match Project 1"
DachiCharkviani Sep 26, 2024
4a28965
Merge pull request #58 from CMU-17313Q/revert-28-refactoringtags
DachiCharkviani Sep 26, 2024
a141125
Revert "Revert "Imported Improvements for tags.js to Match Project 1""
DachiCharkviani Sep 26, 2024
077e343
Merge pull request #59 from CMU-17313Q/revert-58-revert-28-refactorin…
DachiCharkviani Sep 26, 2024
11ccc6a
Revert "Revert "Matched The Modified File(sorted.js) from Project Nod…
DachiCharkviani Sep 26, 2024
a43b8ff
Merge pull request #60 from CMU-17313Q/revert-57-revert-29-recaftorin…
NickDevi Sep 26, 2024
9cf178c
Revert "Revert "Matched sound_settings.js to match project one's file ""
Seckhen Sep 26, 2024
21a4379
Merge pull request #61 from CMU-17313Q/revert-56-revert-30-project-one
Seckhen Sep 26, 2024
33ede5c
Revert "Revert "replicated project1 changes here too""
raissg Sep 26, 2024
1c431b4
Merge pull request #62 from CMU-17313Q/revert-55-revert-31-project1clone
raissg Sep 26, 2024
caf170d
Revert "Revert "Adding node modules file we edited to git repository ""
Seckhen Sep 26, 2024
1101eaa
Merge pull request #63 from CMU-17313Q/revert-54-revert-32-adding-nod…
Seckhen Sep 26, 2024
94caaae
Revert "Revert "node_modules/nodebb-theme-harmony/templates/partials/…
DachiCharkviani Sep 26, 2024
dcd345f
Merge pull request #64 from CMU-17313Q/revert-53-revert-33-userStory1…
DachiCharkviani Sep 26, 2024
a70b5c7
Revert "Revert "Implement Front-End Modal for Future Available Chats …
NickDevi Sep 26, 2024
d39d3e4
Merge pull request #65 from CMU-17313Q/revert-52-revert-34-userStory1…
NickDevi Sep 26, 2024
297e228
Revert "Revert "Implemented back-end to retrieve and showcase users' …
raissg Sep 26, 2024
88cb365
Merge pull request #66 from CMU-17313Q/revert-51-revert-35-userStory1…
raissg Sep 26, 2024
81d0058
Revert "Revert "Added the button for voice memo record - user story 2""
Seckhen Sep 26, 2024
92bd32f
Merge pull request #67 from CMU-17313Q/revert-50-revert-36-userStory2…
Seckhen Sep 26, 2024
e77ce97
Revert "Revert "User story2 back end - Choosing mp3 file for saving i…
raissg Sep 26, 2024
457e112
Merge pull request #69 from CMU-17313Q/revert-49-revert-37-userStory2…
raissg Sep 26, 2024
4f30796
Revert "Revert "Added Front-End Emoji Reaction UI for Chat Messages""
Seckhen Sep 26, 2024
da5d4ea
Merge pull request #70 from CMU-17313Q/revert-48-revert-38-userStory4…
Seckhen Sep 26, 2024
574a4ab
Revert "Revert "User story2 back end - Choosing mp3 file for saving i…
raissg Sep 26, 2024
54654f8
Merge pull request #71 from CMU-17313Q/revert-47-revert-39-userStory2…
raissg Sep 26, 2024
eb2b9f1
Revert "Revert "modified lint errors with comments out and added the …
raissg Sep 26, 2024
02cb1d9
Merge pull request #72 from CMU-17313Q/revert-46-revert-42-userStory2…
raissg Sep 26, 2024
0a83e08
Merge pull request #73 from CMU-17313Q/revert-45-revert-43-userStory4…
khiyami Sep 26, 2024
55eadde
Enhanced message template to display emoji reactions and added emoji …
Seckhen Sep 26, 2024
d3eac22
fixed lint error:
Sep 26, 2024
9418c12
Merge pull request #74 from CMU-17313Q/userStory4BackEndd
DachiCharkviani Sep 26, 2024
fa264cb
added css files to modify the emojis on frontend!
Seckhen Sep 26, 2024
2595460
Merge pull request #75 from CMU-17313Q/userStory4FrontEnd
khiyami Sep 26, 2024
06ec39a
the file topics_list.tpl had wrong code for some reason after others …
Seckhen Sep 26, 2024
450596b
Merge branch 'f24' into userStory1BackEnd
Seckhen Sep 26, 2024
39e6955
Merge pull request #76 from CMU-17313Q/userStory1BackEnd
Seckhen Sep 26, 2024
11b7c67
adding the initial file for the topics-menu-list.tpl
Oct 20, 2024
efff596
added a button for managing notes in the dropdown
raissg Oct 20, 2024
0ead6ef
added the pop up where we can see notes and add notes
NickDevi Oct 20, 2024
2f3337f
finished the functionality of adding notes to posts fully
Oct 20, 2024
667ec02
just adding the starting version of the post-menu-list.tpl file from …
Oct 20, 2024
5184de6
added the button for managing notes in the dropdown
raissg Oct 20, 2024
4867779
added a pop up for viewing existing notes on the post and for adding …
NickDevi Oct 20, 2024
97c7fd8
Merge branch 'f24' into userStory6Frontend
DachiCharkviani Oct 20, 2024
5daa3b1
added the tests file and the jest configuration file
NickDevi Oct 20, 2024
157d8e6
Merge pull request #87 from CMU-17313Q/userStory6Frontend
DachiCharkviani Oct 20, 2024
2fa071f
frontend implementation
raissg Oct 20, 2024
0d47f02
added all the test files
NickDevi Oct 20, 2024
6ca8cc1
Merge branch 'f24' into automatedTests
NickDevi Oct 20, 2024
6adf80d
Update README.md
DachiCharkviani Oct 20, 2024
69cf3d1
Update plugins.js
NickDevi Oct 20, 2024
fbf0f69
Update plugins.js
NickDevi Oct 20, 2024
dc1a8a0
Update chats.js
NickDevi Oct 20, 2024
dbd38f7
Merge branch 'f24' into anonymous-posting-front-end
NickDevi Oct 20, 2024
07bbdc0
Merge pull request #89 from CMU-17313Q/automatedTests
NickDevi Oct 20, 2024
44f8de4
Merge branch 'f24' into anonymous-posting-front-end
raissg Oct 20, 2024
b57dcde
Merge pull request #90 from CMU-17313Q/anonymous-posting-front-end
raissg Oct 20, 2024
a7c9c4e
Update README.md
Seckhen Oct 20, 2024
3cbe0aa
Update topics.js
Seckhen Oct 20, 2024
5a77423
Fixed lint errors
Seckhen Oct 20, 2024
20da939
Update topics.js
Seckhen Oct 20, 2024
82f8be3
Update tests.js
DachiCharkviani Oct 20, 2024
a7665b2
Update README.md
DachiCharkviani Oct 20, 2024
a594ea3
Merge pull request #91 from CMU-17313Q/Seckhen-patch-1
DachiCharkviani Oct 20, 2024
40880ef
Create UserGuide.md
raissg Oct 20, 2024
6f29826
Add files via upload
raissg Oct 20, 2024
94167f5
Update UserGuide.md
raissg Oct 21, 2024
f4c2692
Add or update the Azure App Service build and deployment workflow config
raissg Oct 26, 2024
a28394d
Update azure-deploy-f24.yml
raissg Oct 26, 2024
abe76d4
Delete .github/workflows/f24_nodebb-swifties.yml
raissg Oct 26, 2024
ed28c84
Update azure-deploy-f24.yml
raissg Oct 26, 2024
61e3cdc
Update azure-deploy-f24.yml
raissg Oct 26, 2024
f4ce224
should work
Oct 27, 2024
326e1bd
Merge pull request #93 from CMU-17313Q/testing33
DachiCharkviani Oct 27, 2024
9882a60
Revert "should work"
DachiCharkviani Oct 27, 2024
d352a52
Merge pull request #95 from CMU-17313Q/revert-93-testing33
DachiCharkviani Oct 27, 2024
73693df
integrated the flow static checking
Oct 27, 2024
73d4173
Merge pull request #98 from CMU-17313Q/flow
DachiCharkviani Oct 27, 2024
a944226
Integrated Tool called Stryker Mutator
NickDevi Oct 27, 2024
bd840fc
slightly modified package.json in install directory
NickDevi Oct 27, 2024
cd12760
Merge pull request #99 from CMU-17313Q/stryker
NickDevi Oct 27, 2024
411bb1e
added jshint developer tool
Seckhen Oct 27, 2024
b369da1
Merge pull request #100 from CMU-17313Q/jshint
NickDevi Oct 27, 2024
e08a3f6
Added developer tool called Prettier
Seckhen Oct 27, 2024
a21dace
fixed lint issues
Seckhen Oct 27, 2024
22d26ef
Update .prettierrc
khiyami Oct 27, 2024
b860689
Merge pull request #102 from CMU-17313Q/prettier
khiyami Oct 27, 2024
5193b31
probably solving the feature issue on deployment
Oct 28, 2024
182793d
Merge pull request #103 from CMU-17313Q/solution
DachiCharkviani Oct 28, 2024
fcc4ef5
Solved the deployment issue about the feature
Oct 28, 2024
600858f
Update package.json
DachiCharkviani Oct 28, 2024
1f1dcaa
Update package.json
DachiCharkviani Oct 28, 2024
5c8b6fa
Merge pull request #104 from CMU-17313Q/solution2
DachiCharkviani Oct 28, 2024
b3a4b09
should have solved the issue
Oct 28, 2024
99ec15e
let's hope now
Oct 28, 2024
fe6e286
solved redis issue
Oct 28, 2024
2a9d12a
Merge pull request #106 from CMU-17313Q/solution4
DachiCharkviani Oct 28, 2024
0b2d48d
removed harmony from installations
Oct 28, 2024
6b44cbf
fixed redis issue
Oct 28, 2024
9780658
new technique
Oct 28, 2024
d641325
Merge pull request #107 from CMU-17313Q/solution5
DachiCharkviani Oct 28, 2024
85d3fcc
now the azure should be solved too
Oct 29, 2024
6c711bf
forgot package.json
Oct 29, 2024
6c3949b
removed line from package.json
Oct 29, 2024
07cd54b
solved the redis issue
Oct 29, 2024
ad6d1cd
Merge pull request #108 from CMU-17313Q/solution6
DachiCharkviani Oct 29, 2024
3162a79
reverting to pre-deployment solution changes
Oct 29, 2024
817b475
Merge pull request #109 from CMU-17313Q/reverting
DachiCharkviani Oct 29, 2024
850e11e
first step
Oct 29, 2024
333d819
Merge pull request #110 from CMU-17313Q/solution7
DachiCharkviani Oct 29, 2024
ad42edd
added changes for the not working sharing functionality on deployed app
Oct 30, 2024
f9f5c95
Merge pull request #111 from CMU-17313Q/sharing
DachiCharkviani Oct 30, 2024
e7295f4
Delete UserGuide.md
raissg Nov 1, 2024
1094804
UserGuide.md
raissg Nov 1, 2024
07ffdcc
Added flow into git flow, and through tests with Stryker saw that it …
Nov 3, 2024
174ff25
fixed lint issues
Nov 3, 2024
5e92a2b
had stryker in the git flow testing included by accident
Nov 3, 2024
67c30bd
Merge pull request #112 from CMU-17313Q/gitFlow
raissg Nov 3, 2024
8d49f3c
Changes to implement UI of the translator feature
raissg Nov 12, 2024
8a57053
Update api.js
raissg Nov 12, 2024
6f985ac
Lint fixes
raissg Nov 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"presets": ["@babel/preset-env", "@babel/preset-flow"],
"plugins": ["babel-plugin-syntax-hermes-parser"]
}
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ logs/
.eslintrc
test/files
*.min.js
install/docker/
install/docker/
.stryker-tmp/
14 changes: 14 additions & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[ignore]

[include]

[libs]

[lints]
untyped-type-import=error
internal-type=error
deprecated-type-bool=error

[options]

[strict]
8 changes: 4 additions & 4 deletions .github/workflows/azure-deploy-f24.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
./.github/workflows/test.yaml

build-and-deploy:
if: github.repository == 'cmu-313/NodeBB'
if: github.repository == 'CMU-17313Q/nodebb-f24-swifties'
needs: lint-and-test

runs-on: ubuntu-latest
Expand All @@ -34,7 +34,7 @@ jobs:

- name: Set up NodeBB
run: |
./nodebb setup '{"url":"https://nodebb-f24.azurewebsites.net:443",
./nodebb setup '{"url":"https://nodebb-swifties.azurewebsites.net:443",
"admin:username": "admin",
"admin:password": "${{ secrets.ADMIN_PASSWORD }}",
"admin:password:confirm": "${{ secrets.ADMIN_PASSWORD }}",
Expand All @@ -48,7 +48,7 @@ jobs:
id: deploy-to-webapp
uses: azure/webapps-deploy@v2
with:
app-name: 'nodebb-f24'
app-name: 'nodebb-swifties'
slot-name: 'Production'
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_BFAB97B1AB1441ACA7C63280F91AD3F3 }}
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_E1A7D2C03DAB4DB580437D9B40DC6FC8 }}
package: .
6 changes: 5 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Lint and test
name: Lint and Test

on:
pull_request:
Expand Down Expand Up @@ -77,6 +77,10 @@ jobs:
- name: Run ESLint
run: npm run lint

- name: Run Flow for Type Checking
run: npx flow check
# Runs Flow to detect any type inconsistencies before merging

- name: Node tests
run: npm test

Expand Down
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
dist/
yarn.lock
npm-debug.log
node_modules/
node_modules/*
!node_modules/nodebb-theme-harmony
sftp-config.json
config.json
jsconfig.json
Expand Down Expand Up @@ -72,4 +73,6 @@ link-plugins.sh
test.sh

.docker/**
!**/.gitkeep
!**/.gitkeep
# stryker temp files
.stryker-tmp/
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Ignore artifacts:
build
coverage
10 changes: 10 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"semi":"true",
"singleQuote":"true",
"trailingComa":"es5",
"useTabs":"true",
"arrowParens":"avoid",
"printWidth":80,
"tabWidth":2,
"bracketSpacing": true
}
Loading