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

Fix/UI authenticated user explore course #34080

Closed
Closed
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
676 commits
Select commit Hold shift + click to select a range
b94ef3f
remove launch
tuanptit Dec 14, 2023
7883c73
remove checkout
tuanptit Dec 14, 2023
3f3290c
add timeout
tuanptit Dec 14, 2023
e555f06
feature (i18n): set default language from en to vi
uuuuv Dec 14, 2023
537a84d
Merge pull request #22 from FUNiX-Tech/feature/default_language
DAN3002 Dec 14, 2023
f7043a5
update no cache
tuanptit Dec 14, 2023
3253297
fix: not type block complete
sonxauxi2411 Dec 14, 2023
4e13418
Merge pull request #23 from FUNiX-Tech/bugfix/complete_time_not_type
DAN3002 Dec 14, 2023
0080de3
feat : change logo
sonxauxi2411 Dec 15, 2023
3564ece
add no cache
tuanptit Dec 15, 2023
ebddf1e
chore : remove version labxblock
sonxauxi2411 Dec 16, 2023
c4e3185
Merge branch 'dev' into feature/custom_lab
sonxauxi2411 Dec 16, 2023
6ff1773
Merge pull request #24 from FUNiX-Tech/feature/custom_lab
uuuuv Dec 17, 2023
d01f0f0
Create deploy-to-ec2-staging.yml
tuanptit Dec 18, 2023
183e125
remove port params
tuanptit Dec 18, 2023
48b65db
fix : remove class problem-error
sonxauxi2411 Dec 18, 2023
7967707
feat : add org database
sonxauxi2411 Dec 18, 2023
039428f
Merge pull request #25 from FUNiX-Tech/feature/problem_quiz
uuuuv Dec 18, 2023
fa92416
make change
tuanptit Dec 18, 2023
556fe8c
feat: change design
sonxauxi2411 Dec 18, 2023
5165035
feature: chatbot app
uuuuv Dec 19, 2023
6f9fc04
feat : css quiz
sonxauxi2411 Dec 19, 2023
947e283
Merge pull request #26 from FUNiX-Tech/feature/problem_quiz
uuuuv Dec 19, 2023
556140e
feat : change logic feedback
sonxauxi2411 Dec 19, 2023
d2a99ff
chore : change logo
sonxauxi2411 Dec 19, 2023
39aa455
add docker pull
tuanptit Dec 19, 2023
ce1d32b
fix (chatbot module): some error
uuuuv Dec 19, 2023
2f5a784
Merge pull request #27 from FUNiX-Tech/feature/change_logo
uuuuv Dec 19, 2023
10cc6fe
Merge pull request #28 from FUNiX-Tech/feature/chatbot
sonxauxi2411 Dec 19, 2023
82bd657
fix (chatbot): view error
uuuuv Dec 19, 2023
1cf6713
Merge pull request #29 from FUNiX-Tech/feature/chatbot
uuuuv Dec 19, 2023
cfcf5f4
feat: change api login notify
sonxauxi2411 Dec 20, 2023
06f5c75
chore : comment api portal
sonxauxi2411 Dec 20, 2023
d2c5bb3
chore : remove comment api portal
sonxauxi2411 Dec 20, 2023
fda3cfb
Merge pull request #30 from FUNiX-Tech/feature/register_org
uuuuv Dec 21, 2023
3e244e8
fix: css display none not problem quiz custom
sonxauxi2411 Dec 21, 2023
b6483d1
fix : re-render unit
sonxauxi2411 Dec 21, 2023
d02e0f9
Merge pull request #31 from FUNiX-Tech/feature/problem_quiz
uuuuv Dec 21, 2023
76aeed8
fix : not quiz-problem-custom
sonxauxi2411 Dec 21, 2023
52d1eb9
chore: change validate
sonxauxi2411 Dec 21, 2023
93a5acb
Merge pull request #32 from FUNiX-Tech/feature/problem_quiz
sonxauxi2411 Dec 21, 2023
7f9c274
feat : remove validate length and change name problem
sonxauxi2411 Dec 22, 2023
e117489
fix : not button hint
sonxauxi2411 Dec 22, 2023
f97adca
Merge pull request #33 from FUNiX-Tech/feature/problem_quiz
sonxauxi2411 Dec 22, 2023
42bea6b
Merge pull request #34 from FUNiX-Tech/dev
DAN3002 Dec 22, 2023
cfe9c28
chore : remove validate not email
sonxauxi2411 Dec 23, 2023
5b974c0
Merge pull request #35 from FUNiX-Tech/feature/register_org
sonxauxi2411 Dec 23, 2023
ea2754a
Update deploy-to-ec2.yml
tuanptit Dec 23, 2023
9c5622c
Update deploy-to-ec2-staging.yml
tuanptit Dec 23, 2023
c15a93c
Update deploy-to-ec2-staging.yml
tuanptit Dec 23, 2023
9113c1a
chore : remove problem progress
sonxauxi2411 Dec 26, 2023
99401bb
fix : background incorrect feedback quiz
sonxauxi2411 Dec 26, 2023
360226b
fix : remove indicator
sonxauxi2411 Dec 26, 2023
d78305a
chore : add more tranls
sonxauxi2411 Dec 26, 2023
f33974a
Merge pull request #36 from FUNiX-Tech/feature/translate_vn
sonxauxi2411 Dec 26, 2023
ec079e8
Merge pull request #37 from FUNiX-Tech/feature/problem_quiz
sonxauxi2411 Dec 26, 2023
2543505
fix : background incorrect
sonxauxi2411 Dec 26, 2023
a867aa7
fix (create user api): create student_code if there is not
uuuuv Dec 26, 2023
a253abe
test
sonxauxi2411 Dec 26, 2023
d94c890
test
sonxauxi2411 Dec 26, 2023
22ff2a6
Merge pull request #38 from FUNiX-Tech/feature/problem_quiz
sonxauxi2411 Dec 26, 2023
a67598d
feature (unit styles): done with unit styles
uuuuv Dec 27, 2023
dac2977
Merge pull request #39 from FUNiX-Tech/feature/unit_ui_lms
uuuuv Dec 27, 2023
70f2694
fix (unit styles): anchor styles
uuuuv Dec 27, 2023
872e20c
Merge pull request #40 from FUNiX-Tech/feature/unit_ui_lms
uuuuv Dec 27, 2023
48f3aa1
fix (unit styles): remove span margin
uuuuv Dec 27, 2023
d507e5b
Merge pull request #41 from FUNiX-Tech/feature/unit_ui_lms
uuuuv Dec 27, 2023
194647d
fix (unit styles): make span and anchor inherit some styles
uuuuv Dec 27, 2023
4769fc6
Merge pull request #42 from FUNiX-Tech/feature/unit_ui_lms
uuuuv Dec 27, 2023
16a6173
fix (unit ui): style i tag
uuuuv Dec 27, 2023
6ec79e5
Merge pull request #43 from FUNiX-Tech/fix/unit_lms_ui
uuuuv Dec 27, 2023
573fe1f
fix (unit style): heading tag
uuuuv Dec 27, 2023
f6d2a61
Merge pull request #44 from FUNiX-Tech/fix/unit_lms_ui
uuuuv Dec 27, 2023
661b763
Merge pull request #45 from FUNiX-Tech/dev
tuanptit Dec 27, 2023
2b91b5a
fix : focus problem render
sonxauxi2411 Dec 28, 2023
a39957f
Merge pull request #46 from FUNiX-Tech/feature/problem_quiz
sonxauxi2411 Dec 28, 2023
ae02071
feat : slice content thread
sonxauxi2411 Dec 28, 2023
ee38657
Merge pull request #47 from FUNiX-Tech/feature/setting_discussion
sonxauxi2411 Dec 28, 2023
9300216
feature (unit components): add info tags, table styles, image styles
uuuuv Dec 28, 2023
c8236f0
Merge pull request #48 from FUNiX-Tech/feature/unit_html_components
uuuuv Dec 28, 2023
46ae87b
chore: add more translate
sonxauxi2411 Dec 29, 2023
19313fa
fix: get complete time
uuuuv Dec 31, 2023
ebf1535
Merge pull request #49 from FUNiX-Tech/hotfix/typo_get_completion_time
uuuuv Dec 31, 2023
b693462
Merge pull request #50 from FUNiX-Tech/dev
uuuuv Dec 31, 2023
c185477
Delete .github/workflows/commitlint.yml
tuanptit Dec 31, 2023
0a52617
test : close post discussion
sonxauxi2411 Jan 1, 2024
9b40b5c
chore : comment discussion close
sonxauxi2411 Jan 1, 2024
ad2df60
Merge pull request #51 from FUNiX-Tech/feature/setting_discussion
sonxauxi2411 Jan 1, 2024
1141ffb
fix (studio style): xblock header button icon
uuuuv Jan 1, 2024
5d48809
Merge pull request #52 from FUNiX-Tech/fix/studio_css
uuuuv Jan 1, 2024
3d0f7b9
Merge pull request #53 from FUNiX-Tech/dev
uuuuv Jan 1, 2024
fd5f4b0
feat: create api next lesson unit
sonxauxi2411 Jan 3, 2024
7719374
feat : logic btn complete quiz
sonxauxi2411 Jan 3, 2024
993a239
feat: create portal_host api
hoangbnmfx19875 Jan 3, 2024
d1b6767
Merge pull request #54 from FUNiX-Tech/feature/create-portal-host
uuuuv Jan 3, 2024
90e1958
fix: unit note element style
uuuuv Jan 3, 2024
26cfbdb
chore (requirements): replace funixora2 with ora2
uuuuv Jan 3, 2024
5d39991
Merge pull request #55 from FUNiX-Tech/fix/unit_element_note_style
uuuuv Jan 3, 2024
a99acd2
Merge pull request #56 from FUNiX-Tech/feature/problem_quiz
sonxauxi2411 Jan 4, 2024
08ea70f
add slack
tuanptit Jan 4, 2024
bf7ef20
add slack
tuanptit Jan 4, 2024
06d2407
feat: add api next_lesson
sonxauxi2411 Jan 5, 2024
bccb0b8
Merge pull request #57 from FUNiX-Tech/feature/problem_quiz
sonxauxi2411 Jan 5, 2024
687f616
chore : remove print and update labxblock
sonxauxi2411 Jan 7, 2024
17ba5db
Merge pull request #58 from FUNiX-Tech/feature/custom_lab
sonxauxi2411 Jan 7, 2024
769bf0f
feature: matching problem
uuuuv Jan 8, 2024
ada3b5d
feature (studio html editor): fix auto convert base64 image to blob w…
uuuuv Jan 8, 2024
e34c2a1
fix: remove completion video youtube rule
hoangbnmfx19875 Jan 8, 2024
0f5fbf7
Merge pull request #60 from FUNiX-Tech/feature/fix-completion-video
uuuuv Jan 8, 2024
9383c52
feature: remove inline styles course content
uuuuv Jan 8, 2024
337cb8c
Merge pull request #61 from FUNiX-Tech/feature/remove_course_inline_s…
uuuuv Jan 8, 2024
6681a43
chore: lms image scss
uuuuv Jan 9, 2024
76ff6ca
Merge pull request #62 from FUNiX-Tech/feature/remove_course_inline_s…
hoangbnmfx19875 Jan 9, 2024
fa61c14
chore: remove spaces between function and ()
uuuuv Jan 9, 2024
1302468
Merge pull request #63 from FUNiX-Tech/feature/remove_course_inline_s…
hoangbnmfx19875 Jan 9, 2024
0610a6d
fix: image unit ratio
uuuuv Jan 9, 2024
3702cc8
chore (remove inline styles): update templates, hadnler errors
uuuuv Jan 9, 2024
12150ce
Merge pull request #64 from FUNiX-Tech/fix/image_unit_ratio
uuuuv Jan 9, 2024
a15779d
fix: add <o:p> tag to allowed tags to remove styles, fix font-weight …
uuuuv Jan 9, 2024
501eba0
fix: add more tags to remove inline styles
uuuuv Jan 9, 2024
98e41d9
fix: add more tags to remove inline styles
uuuuv Jan 9, 2024
87023a2
Merge pull request #65 from FUNiX-Tech/feature/remove_course_inline_s…
uuuuv Jan 9, 2024
a57aa54
feature: get resume url api
uuuuv Jan 10, 2024
1d1e1e2
Merge pull request #67 from FUNiX-Tech/feature/jump_to_course_api
hoangbnmfx19875 Jan 10, 2024
423da6a
feat : add actions best thread
sonxauxi2411 Jan 10, 2024
5ee01cc
fix : not best thread
sonxauxi2411 Jan 10, 2024
14faba3
fix: update thread best
sonxauxi2411 Jan 10, 2024
233e33a
Merge branch 'dev' into feature/discussion_actions
sonxauxi2411 Jan 10, 2024
98802f8
Merge pull request #66 from FUNiX-Tech/feature/problem_quiz
tuanptit Jan 11, 2024
6906990
fix : quiz not response
sonxauxi2411 Jan 11, 2024
292f8ae
fix: change submit repose quiz
sonxauxi2411 Jan 11, 2024
877b018
Merge pull request #68 from FUNiX-Tech/feature/problem_quiz
sonxauxi2411 Jan 11, 2024
1ea8d4f
Merge pull request #69 from FUNiX-Tech/feature/discussion_actions
sonxauxi2411 Jan 11, 2024
94279b1
change flow cicd
tuanptit Jan 11, 2024
cbbc765
remove }
tuanptit Jan 11, 2024
1d1b2f7
change cicd flow stagging
tuanptit Jan 11, 2024
e586b02
feature: index page ui
uuuuv Jan 11, 2024
c179862
chore: removed unused code
uuuuv Jan 11, 2024
03e363f
Merge pull request #70 from FUNiX-Tech/feature/index_page_design
hoangbnmfx19875 Jan 11, 2024
8bd698a
fix: single quiz style
uuuuv Jan 11, 2024
f713d0f
Merge pull request #71 from FUNiX-Tech/fix/single_quiz_style
hoangbnmfx19875 Jan 11, 2024
0bcb0a6
feat: add more tags discussion
sonxauxi2411 Jan 12, 2024
8b2a050
Merge pull request #72 from FUNiX-Tech/feature/discussion_tags
sonxauxi2411 Jan 12, 2024
cac64bf
fix: bug not action menu and remove thread best
sonxauxi2411 Jan 12, 2024
2a00ae7
Merge pull request #73 from FUNiX-Tech/bugfix/not_action_menu_discussion
sonxauxi2411 Jan 12, 2024
fbb406e
fix : notify doublue
sonxauxi2411 Jan 12, 2024
9fff1d6
fix: no indicator Error
sonxauxi2411 Jan 12, 2024
795a434
Merge pull request #74 from FUNiX-Tech/feature/problem_quiz
sonxauxi2411 Jan 12, 2024
dd5e8be
feat: create matching quiz by XML template, grade the matching quiz
trongfunix Jan 13, 2024
f2e2124
fix : group quiz not indicator Error
sonxauxi2411 Jan 13, 2024
c392e35
feature (funix default theme): lms unit scss
uuuuv Jan 13, 2024
11fe920
feature (funix theme): done with lms theme
uuuuv Jan 14, 2024
9a3f5b0
feature (studio unit ui): update unit styles cms(no theme)
uuuuv Jan 14, 2024
a51445c
Merge pull request #75 from FUNiX-Tech/feature/theme_funix
hoangbnmfx19875 Jan 14, 2024
52e869a
feature (theme lms): remove theme
uuuuv Jan 14, 2024
ab583d6
chore: update labXblock
sonxauxi2411 Jan 14, 2024
b6b1313
Merge pull request #76 from FUNiX-Tech/feature/custom_lab
sonxauxi2411 Jan 14, 2024
e506833
fix (lms scss): undefined mixin
uuuuv Jan 14, 2024
77f6da0
Merge pull request #77 from FUNiX-Tech/feature/theme_funix: remove theme
uuuuv Jan 14, 2024
3c6e6ff
feature: chatbot session
uuuuv Jan 15, 2024
6f04537
Merge pull request #78 from FUNiX-Tech/feature/chatbot_markdown_to_html
hoangbnmfx19875 Jan 15, 2024
d08e558
feat : last history course dashboard
sonxauxi2411 Jan 15, 2024
9127aaa
Merge branch 'staging' into dev
sonxauxi2411 Jan 15, 2024
fa18b9c
Merge pull request #80 from FUNiX-Tech/dev
DAN3002 Jan 15, 2024
056e0d2
fix (chatbot): error when converting response_msg if response_msg is …
uuuuv Jan 15, 2024
ceb78c2
fix (chatbot); get latest query of a session when fetching session list
uuuuv Jan 15, 2024
7563c15
Merge pull request #81 from FUNiX-Tech/fix/markdown_response_msg_is_none
hoangbnmfx19875 Jan 15, 2024
d3ea3c9
fix: redirect to /courses when clicked on logo, adjust courses' cards…
Jan 15, 2024
ac58847
Merge pull request #84 from FUNiX-Tech/fix/home-layout
hoangbnmfx19875 Jan 15, 2024
98a3e13
feature (new design): done with lms
uuuuv Jan 15, 2024
211f55e
feature (unit studio): done with new design
uuuuv Jan 15, 2024
8a97de1
chore: unit scss
uuuuv Jan 15, 2024
8052210
chore: add margin top for 1st p tag
uuuuv Jan 15, 2024
5ad718b
chore: margin top for 1st p tag in unit cms
uuuuv Jan 15, 2024
993ff32
Merge pull request #85 from FUNiX-Tech/feature/new_design_ui
hoangbnmfx19875 Jan 15, 2024
d22a22d
Merge pull request #82 from FUNiX-Tech/feature/last_history_course_da…
sonxauxi2411 Jan 15, 2024
b2eb4eb
fix: responsive layout in explore courses
Jan 15, 2024
fb03cae
deploy stag
tuanptit Jan 15, 2024
287138f
Merge pull request #86 from FUNiX-Tech/fix/home-layout
hoangbnmfx19875 Jan 16, 2024
a3fc93f
fix: uncomment search bar in explore course
Jan 16, 2024
92e301d
fix: adjust the javascript block name
Jan 16, 2024
18e5ad6
Merge pull request #88 from FUNiX-Tech/fix/home-layout
hoangbnmfx19875 Jan 16, 2024
2ee873e
Merge pull request #87 from FUNiX-Tech/feature/last_history_course_da…
tuanptit Jan 16, 2024
a6c3ab7
fix: adjust image size in course card
Jan 16, 2024
17b81e8
Merge pull request #89 from FUNiX-Tech/fix/home-layout
hoangbnmfx19875 Jan 16, 2024
ce9370b
feature (unit design): change pt to rem, em, table responsive lms
uuuuv Jan 16, 2024
10cbdd7
fix: adjust layout of search input and search message
Jan 16, 2024
372da8c
Merge pull request #90 from FUNiX-Tech/feature/new_design_ui
hoangbnmfx19875 Jan 16, 2024
af3b52e
fix: typo
Jan 16, 2024
95613a9
Merge pull request #91 from FUNiX-Tech/fix/home-layout
uuuuv Jan 16, 2024
4273629
Merge pull request #93 from FUNiX-Tech/fix/home-layout
tuanptit Jan 16, 2024
be6f22a
debug
tuanptit Jan 16, 2024
a12b7cc
disable auto trigger pipeline
tuanptit Jan 16, 2024
cb4207d
Merge pull request #92 from FUNiX-Tech/feature/new_design_ui
uuuuv Jan 16, 2024
d1507ae
feature: image api fallback
uuuuv Jan 16, 2024
5f60bbd
debug 2
tuanptit Jan 16, 2024
376de0c
fix : not date history dashboard
sonxauxi2411 Jan 16, 2024
9b10785
fix: font size unit
uuuuv Jan 16, 2024
bdf3bca
merge: dev
uuuuv Jan 16, 2024
f3518ab
Merge pull request #94 from FUNiX-Tech/fix/fallback_image
hoangbnmfx19875 Jan 16, 2024
f0a61b8
fix : not date history dashboard
sonxauxi2411 Jan 16, 2024
da45d26
Merge pull request #96 from FUNiX-Tech/hotfix/date_history_dashboard
sonxauxi2411 Jan 16, 2024
7bfa3bd
fix: fix drag and drop item
trongfunix Jan 16, 2024
a3181e2
Merge pull request #95 from FUNiX-Tech/bugfix/not_date_history_dashboard
sonxauxi2411 Jan 17, 2024
680e5fd
Merge branch 'staging' into dev
uuuuv Jan 17, 2024
a9b9868
fix: fix button matching submit in multi quiz
trongfunix Jan 17, 2024
e2fe73c
fix: fix button matching submit in multi quiz
trongfunix Jan 17, 2024
9d938d6
fix: merge dev, fix conflict
trongfunix Jan 17, 2024
33544cf
Merge pull request #99 from FUNiX-Tech/feature/matching_quiz
hoangbnmfx19875 Jan 17, 2024
4b748d9
feature: custom btn quiz matching
sonxauxi2411 Jan 17, 2024
0ef5e84
fix : show btn
sonxauxi2411 Jan 17, 2024
73535f9
fix : btn show
sonxauxi2411 Jan 17, 2024
43e389f
fix: css style html tag
trongfunix Jan 17, 2024
c4267bc
feat: basic responsive layout of header and footer
Jan 17, 2024
e7285bc
Merge pull request #100 from FUNiX-Tech/feature/matching_quiz
hoangbnmfx19875 Jan 18, 2024
bb5d55f
add: responsive for header and footer
Jan 18, 2024
e88dcef
Fix: change font to roboto
NQToan1509 Jan 18, 2024
4ef52ee
Merge pull request #101 from FUNiX-Tech/fix/change-font-to-roboto
uuuuv Jan 18, 2024
1e3b7ab
chore: setup basic layout for body
khoans Jan 18, 2024
cc727e7
Merge branch 'feature/matching_quiz' into feature/group_quiz
sonxauxi2411 Jan 19, 2024
2bc3e6a
chore : change template quiz
sonxauxi2411 Jan 19, 2024
1209d69
fix : submit quiz
sonxauxi2411 Jan 19, 2024
d282370
chore : change logic next btn
sonxauxi2411 Jan 19, 2024
1c1fa93
fix : change logic next btn quiz
sonxauxi2411 Jan 19, 2024
7486c2a
fix : css btn submit quiz matching
sonxauxi2411 Jan 19, 2024
b01f2e3
Merge branch 'dev' into feature/group_quiz
sonxauxi2411 Jan 19, 2024
ffe1ecd
Merge pull request #103 from FUNiX-Tech/feature/group_quiz
sonxauxi2411 Jan 19, 2024
e66d9d9
ui: initial course-list layout
Jan 19, 2024
4535bfd
Merge branch 'dev' into fix/home-layout
khoans Jan 19, 2024
b98d24a
Merge pull request #104 from FUNiX-Tech/fix/home-layout
uuuuv Jan 19, 2024
0001af8
fix: _header sass file
khoans Jan 19, 2024
452a093
Merge branch 'dev' into fix/deploy_explore_course
khoans Jan 19, 2024
f7167db
Merge pull request #105 from FUNiX-Tech/fix/deploy_explore_course
khoans Jan 19, 2024
b45c5e8
conflict: revert _header.scss file
khoans Jan 19, 2024
c5c83b3
fix: adjust padding
khoans Jan 19, 2024
78087ca
Merge branch 'dev' into fix/home-layout
khoans Jan 19, 2024
be7e407
Merge pull request #106 from FUNiX-Tech/fix/home-layout
khoans Jan 19, 2024
2e186c9
ui: update course-list layout in explore courses
khoans Jan 19, 2024
bced42b
Merge branch 'dev' into ui/explore-course
khoans Jan 19, 2024
5bf1ef1
Merge pull request #107 from FUNiX-Tech/ui/explore-course
khoans Jan 19, 2024
c863c3e
fix: add hover effect, fix click through mobile-menu bug
khoans Jan 19, 2024
a463eef
Merge branch 'dev' into ui/explore-course
khoans Jan 19, 2024
153e4a4
Merge branch 'ui/explore-course' of https://github.com/FUNiX-Tech/edx…
khoans Jan 19, 2024
c0af726
Merge pull request #108 from FUNiX-Tech/ui/explore-course
khoans Jan 19, 2024
ed784ad
fix: remove course-info at header and adjust footer in course-overvie…
khoans Jan 20, 2024
f89ff2b
fix: remove footer import in explore-course folder
khoans Jan 20, 2024
ce5baf0
fix: temporary fix localization of footer, adjust max-width of header…
khoans Jan 20, 2024
dcc4ece
ui: add position fixed on header
khoans Jan 20, 2024
c8a7b92
fix: add condition to check user is authenticated when auto redirect …
khoans Jan 20, 2024
7f53baa
fix: fix explore-course header of authenticated user
khoans Jan 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 56 additions & 29 deletions lms/djangoapps/branding/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@ def _footer_copyright():

"""

unique_language_copyright_footer = configuration_helpers.get_value('UNIQUE_LANGUAGE_COPYRIGHT_FOOTER', None)
unique_language_copyright_footer = configuration_helpers.get_value(
'UNIQUE_LANGUAGE_COPYRIGHT_FOOTER', None)

if unique_language_copyright_footer:
if unique_language_copyright_footer:
return unique_language_copyright_footer

return _compose_copyright_footer()


return _(
# Translators: 'edX' and 'Open edX' are trademarks of 'edX Inc.'.
Expand Down Expand Up @@ -174,7 +174,8 @@ def _footer_social_links():
Returns: list

"""
platform_name = configuration_helpers.get_value('platform_name', settings.PLATFORM_NAME)
platform_name = configuration_helpers.get_value(
'platform_name', settings.PLATFORM_NAME)
links = []

for social_name in settings.SOCIAL_MEDIA_FOOTER_NAMES:
Expand Down Expand Up @@ -224,7 +225,8 @@ def _build_support_form_url(full_path=False):

if configuration_helpers.get_value('CONTACT_US_ENABLE', True):
# Gets custom url ad check if it's enabled
contact_us_page = configuration_helpers.get_value('CONTACT_US_CUSTOM_LINK', '')
contact_us_page = configuration_helpers.get_value(
'CONTACT_US_CUSTOM_LINK', '')

# If no custom link is set, get default support form using reverse
if not contact_us_page:
Expand Down Expand Up @@ -266,7 +268,8 @@ def _footer_connect_links(language=settings.LANGUAGE_CODE):
]

if language == settings.LANGUAGE_CODE:
links.append(("media_kit", (marketing_link("MEDIA_KIT"), _("Media Kit"))))
links.append(
("media_kit", (marketing_link("MEDIA_KIT"), _("Media Kit"))))
links.append(("donate", (marketing_link("DONATE"), _("Donate"))))

return [
Expand All @@ -289,9 +292,10 @@ def _find_position_of_link(links, key):

def _footer_navigation_links(language=settings.LANGUAGE_CODE):
"""Return the navigation links to display in the footer. """
platform_name = configuration_helpers.get_value('platform_name', settings.PLATFORM_NAME)
platform_name = configuration_helpers.get_value(
'platform_name', settings.PLATFORM_NAME)
links = [
("about", ('https://funix.edu.vn/', _("About"))),
("about", ('https://funix.edu.vn/', _("About"))),
("blog", ('https://funix.edu.vn/blog/', _("Blog"))),
# ("about", (marketing_link("ABOUT"), _("About"))),
# ("enterprise", (
Expand Down Expand Up @@ -324,9 +328,11 @@ def _footer_legal_links(language=settings.LANGUAGE_CODE):
"""Return the legal footer links (e.g. terms of service). """

links = [
("terms_of_service_and_honor_code", (marketing_link("TOS_AND_HONOR"), _("Terms of Service & Honor Code"))),
("terms_of_service_and_honor_code", (marketing_link(
"TOS_AND_HONOR"), _("Terms of Service & Honor Code"))),
("privacy_policy", (marketing_link("PRIVACY"), _("Privacy Policy"))),
("accessibility_policy", (marketing_link("ACCESSIBILITY"), _("Accessibility Policy"))),
("accessibility_policy", (marketing_link(
"ACCESSIBILITY"), _("Accessibility Policy"))),
("media_kit", (marketing_link("MEDIA_KIT"), _("Media Kit"))),
]

Expand All @@ -341,7 +347,8 @@ def _footer_legal_links(language=settings.LANGUAGE_CODE):

if language == settings.LANGUAGE_CODE:
position = _find_position_of_link(links, 'accessibility_policy')
links.insert(position, ("sitemap", (marketing_link("SITE_MAP"), _("Sitemap"))))
links.insert(
position, ("sitemap", (marketing_link("SITE_MAP"), _("Sitemap"))))

return [
{
Expand All @@ -367,19 +374,24 @@ def _add_enterprise_marketing_footer_query_params(url):

def _footer_business_links(language=settings.LANGUAGE_CODE):
"""Return the business links to display in the footer. """
platform_name = configuration_helpers.get_value('platform_name', settings.PLATFORM_NAME)
platform_name = configuration_helpers.get_value(
'platform_name', settings.PLATFORM_NAME)
links = [
("about", (marketing_link("ABOUT"), _("About"))),
("enterprise", (
_add_enterprise_marketing_footer_query_params(marketing_link("ENTERPRISE")),
_("{platform_name} for Business").format(platform_name=platform_name)
_add_enterprise_marketing_footer_query_params(
marketing_link("ENTERPRISE")),
_("{platform_name} for Business").format(
platform_name=platform_name)
)),
]

if language == settings.LANGUAGE_CODE:
links.append(('affiliates', (marketing_link("AFFILIATES"), _("Affiliates"))))
links.append(
('affiliates', (marketing_link("AFFILIATES"), _("Affiliates"))))
# Translators: 'Open edX' is a trademark, please keep this untranslated
links.append(('openedx', (_footer_openedx_link()["url"], _("Open edX"))))
links.append(
('openedx', (_footer_openedx_link()["url"], _("Open edX"))))
links.append(('careers', (marketing_link("CAREERS"), _("Careers"))))
links.append(("news", (marketing_link("NEWS"), _("News"))))

Expand All @@ -398,9 +410,11 @@ def _footer_more_info_links(language=settings.LANGUAGE_CODE):
"""Return the More Information footer links (e.g. terms of service). """

links = [
("terms_of_service_and_honor_code", (marketing_link("TOS_AND_HONOR"), _("Terms of Service & Honor Code"))),
("terms_of_service_and_honor_code", (marketing_link(
"TOS_AND_HONOR"), _("Terms of Service & Honor Code"))),
("privacy_policy", (marketing_link("PRIVACY"), _("Privacy Policy"))),
("accessibility_policy", (marketing_link("ACCESSIBILITY"), _("Accessibility Policy"))),
("accessibility_policy", (marketing_link(
"ACCESSIBILITY"), _("Accessibility Policy"))),
]

# Backwards compatibility: If a combined "terms of service and honor code"
Expand All @@ -413,7 +427,8 @@ def _footer_more_info_links(language=settings.LANGUAGE_CODE):
])

if language == settings.LANGUAGE_CODE:
links.append(("trademarks", (marketing_link("TRADEMARKS"), _("Trademark Policy"))))
links.append(
("trademarks", (marketing_link("TRADEMARKS"), _("Trademark Policy"))))
links.append(("sitemap", (marketing_link("SITE_MAP"), _("Sitemap"))))

return [
Expand All @@ -436,7 +451,8 @@ def _footer_mobile_links(is_secure):
Returns: list

"""
platform_name = configuration_helpers.get_value('platform_name', settings.PLATFORM_NAME)
platform_name = configuration_helpers.get_value(
'platform_name', settings.PLATFORM_NAME)

mobile_links = []
if settings.FEATURES.get('ENABLE_FOOTER_MOBILE_APP_LINKS'):
Expand Down Expand Up @@ -516,7 +532,8 @@ def _absolute_url(is_secure, url_path):
unicode

"""
site_name = configuration_helpers.get_value('SITE_NAME', settings.SITE_NAME)
site_name = configuration_helpers.get_value(
'SITE_NAME', settings.SITE_NAME)
parts = ("https" if is_secure else "http", site_name, url_path, '', '', '')
return six.moves.urllib.parse.urlunparse(parts)

Expand Down Expand Up @@ -599,7 +616,8 @@ def get_logo_url(is_secure=True):
"""
brand_logo_url = settings.LOGO_URL
default_local_path = 'images/logo.png'
logo_url_from_site_config = configuration_helpers.get_value('logo_image_url')
logo_url_from_site_config = configuration_helpers.get_value(
'logo_image_url')
university = configuration_helpers.get_value('university')

if logo_url_from_site_config:
Expand All @@ -624,8 +642,10 @@ def get_favicon_url():
Default local image path
"""
brand_favicon_url = settings.FAVICON_URL
default_local_path = getattr(settings, 'FAVICON_PATH', 'images/favicon.ico')
favicon_url_from_site_config = configuration_helpers.get_value('favicon_path')
default_local_path = getattr(
settings, 'FAVICON_PATH', 'images/favicon.ico')
favicon_url_from_site_config = configuration_helpers.get_value(
'favicon_path')

if favicon_url_from_site_config:
return staticfiles_storage.url(favicon_url_from_site_config)
Expand Down Expand Up @@ -673,12 +693,19 @@ def get_logo_url_for_email():
return (getattr(settings, 'LOGO_URL_PNG_FOR_EMAIL', None) or
getattr(settings, 'LOGO_URL_PNG', None) or default_logo_url)


def _compose_copyright_footer():
platform_name = configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME)
platform_name = configuration_helpers.get_value(
'PLATFORM_NAME', settings.PLATFORM_NAME) or 'FUNiX'
copyright_year = configuration_helpers.get_value('COPYRIGHT_YEAR', "2023")
org_name = configuration_helpers.get_value('ORGANIZATION_NAME', "Galaxy Education")
org_name = configuration_helpers.get_value(
'ORGANIZATION_NAME', "Galaxy Education")
org_type = _(configuration_helpers.get_value('ORGANIZATION_TYPE', "JSC"))

return _(
"@{copyright_year}. Copyrighted. {platform_name} - Member of {org_name} {org_type}"
).format(copyright_year=copyright_year, platform_name=platform_name, org_name=org_name, org_type=org_type)
part1 = _(
"@{copyright_year}. Copyrighted").format(copyright_year=copyright_year)
part2 = _("{platform_name} - Member of {org_name} {org_type}").format(
platform_name=platform_name, org_name=org_name, org_type=org_type
)

return part1, part2
Loading