Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: wasedatime/wasedatime-web
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9d23cce838561ddbf75398c42953c0e6cfe278c6
Choose a base ref
..
head repository: wasedatime/wasedatime-web
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 22c37e96c9853441f7382ba91fe1d0d7bd695e7e
Choose a head ref
Showing with 25,770 additions and 19,109 deletions.
  1. +8 −8 .github/workflows/deploy.yml
  2. +4 −0 .gitignore
  3. +1 −1 .gitmodules
  4. +8 −0 .hintrc
  5. +1 −1 apps/campus/package.json
  6. +5 −11 apps/campus/pnpm-lock.yaml
  7. +58 −6 apps/career/package.json
  8. +7,620 −1,987 apps/career/pnpm-lock.yaml
  9. +6 −0 apps/career/postcss.config.js
  10. +156 −0 apps/career/src/App.tsx
  11. +1 −0 apps/career/src/assets/logo.svg
  12. BIN apps/career/src/assets/syllabus-icons/art.png
  13. BIN apps/career/src/assets/syllabus-icons/art_jp.png
  14. BIN apps/career/src/assets/syllabus-icons/ase.png
  15. BIN apps/career/src/assets/syllabus-icons/ase_jp.png
  16. BIN apps/career/src/assets/syllabus-icons/cie.png
  17. BIN apps/career/src/assets/syllabus-icons/cie_jp.png
  18. BIN apps/career/src/assets/syllabus-icons/cjl.png
  19. BIN apps/career/src/assets/syllabus-icons/cjl_jp.png
  20. BIN apps/career/src/assets/syllabus-icons/cms.png
  21. BIN apps/career/src/assets/syllabus-icons/cms_jp.png
  22. BIN apps/career/src/assets/syllabus-icons/cse.png
  23. BIN apps/career/src/assets/syllabus-icons/cse_jp.png
  24. BIN apps/career/src/assets/syllabus-icons/edu.png
  25. BIN apps/career/src/assets/syllabus-icons/edu_jp.png
  26. BIN apps/career/src/assets/syllabus-icons/ehum.png
  27. BIN apps/career/src/assets/syllabus-icons/ehum_jp.png
  28. BIN apps/career/src/assets/syllabus-icons/fse.png
  29. BIN apps/career/src/assets/syllabus-icons/fse_jp.png
  30. BIN apps/career/src/assets/syllabus-icons/g_ase.png
  31. BIN apps/career/src/assets/syllabus-icons/g_ase_jp.png
  32. BIN apps/career/src/assets/syllabus-icons/g_cse.png
  33. BIN apps/career/src/assets/syllabus-icons/g_cse_jp.png
  34. BIN apps/career/src/assets/syllabus-icons/g_e.png
  35. BIN apps/career/src/assets/syllabus-icons/g_e_jp.png
  36. BIN apps/career/src/assets/syllabus-icons/g_edu.png
  37. BIN apps/career/src/assets/syllabus-icons/g_edu_jp.png
  38. BIN apps/career/src/assets/syllabus-icons/g_fse.png
  39. BIN apps/career/src/assets/syllabus-icons/g_fse_jp.png
  40. BIN apps/career/src/assets/syllabus-icons/g_hum.png
  41. BIN apps/career/src/assets/syllabus-icons/g_hum_jp.png
  42. BIN apps/career/src/assets/syllabus-icons/g_ips.png
  43. BIN apps/career/src/assets/syllabus-icons/g_ips_jp.png
  44. BIN apps/career/src/assets/syllabus-icons/g_its.png
  45. BIN apps/career/src/assets/syllabus-icons/g_its_jp.png
  46. BIN apps/career/src/assets/syllabus-icons/g_las.png
  47. BIN apps/career/src/assets/syllabus-icons/g_las_jp.png
  48. BIN apps/career/src/assets/syllabus-icons/g_law.png
  49. BIN apps/career/src/assets/syllabus-icons/g_law_jp.png
  50. BIN apps/career/src/assets/syllabus-icons/g_ps.png
  51. BIN apps/career/src/assets/syllabus-icons/g_ps_jp.png
  52. BIN apps/career/src/assets/syllabus-icons/g_sa.png
  53. BIN apps/career/src/assets/syllabus-icons/g_sa_jp.png
  54. BIN apps/career/src/assets/syllabus-icons/g_saps.png
  55. BIN apps/career/src/assets/syllabus-icons/g_saps_jp.png
  56. BIN apps/career/src/assets/syllabus-icons/g_sc.png
  57. BIN apps/career/src/assets/syllabus-icons/g_sc_jp.png
  58. BIN apps/career/src/assets/syllabus-icons/g_seee.png
  59. BIN apps/career/src/assets/syllabus-icons/g_seee_jp.png
  60. BIN apps/career/src/assets/syllabus-icons/g_siccs.png
  61. BIN apps/career/src/assets/syllabus-icons/g_siccs_jp.png
  62. BIN apps/career/src/assets/syllabus-icons/g_sjal.png
  63. BIN apps/career/src/assets/syllabus-icons/g_sjal_jp.png
  64. BIN apps/career/src/assets/syllabus-icons/g_sps.png
  65. BIN apps/career/src/assets/syllabus-icons/g_sps_jp.png
  66. BIN apps/career/src/assets/syllabus-icons/g_sss.png
  67. BIN apps/career/src/assets/syllabus-icons/g_sss_jp.png
  68. BIN apps/career/src/assets/syllabus-icons/g_wbs.png
  69. BIN apps/career/src/assets/syllabus-icons/g_wbs_jp.png
  70. BIN apps/career/src/assets/syllabus-icons/g_wls.png
  71. BIN apps/career/src/assets/syllabus-icons/g_wls_jp.png
  72. BIN apps/career/src/assets/syllabus-icons/gec.png
  73. BIN apps/career/src/assets/syllabus-icons/gec_jp.png
  74. BIN apps/career/src/assets/syllabus-icons/hss.png
  75. BIN apps/career/src/assets/syllabus-icons/hss_jp.png
  76. BIN apps/career/src/assets/syllabus-icons/hum.png
  77. BIN apps/career/src/assets/syllabus-icons/hum_jp.png
  78. BIN apps/career/src/assets/syllabus-icons/law.png
  79. BIN apps/career/src/assets/syllabus-icons/law_jp.png
  80. BIN apps/career/src/assets/syllabus-icons/pse.png
  81. BIN apps/career/src/assets/syllabus-icons/pse_jp.png
  82. BIN apps/career/src/assets/syllabus-icons/sils.png
  83. BIN apps/career/src/assets/syllabus-icons/sils_jp.png
  84. BIN apps/career/src/assets/syllabus-icons/soc.png
  85. BIN apps/career/src/assets/syllabus-icons/soc_jp.png
  86. BIN apps/career/src/assets/syllabus-icons/sps.png
  87. BIN apps/career/src/assets/syllabus-icons/sps_jp.png
  88. BIN apps/career/src/assets/syllabus-icons/sss.png
  89. BIN apps/career/src/assets/syllabus-icons/sss_jp.png
  90. +5 −0 apps/career/src/components/Icons/CloseIcon.tsx
  91. +8 −0 apps/career/src/components/Icons/CoursesIcon.tsx
  92. +7 −0 apps/career/src/components/Icons/FreeChatIcon.tsx
  93. +9 −0 apps/career/src/components/Icons/JobHuntingIcon.tsx
  94. +7 −0 apps/career/src/components/Icons/LifeIcon.tsx
  95. +7 −0 apps/career/src/components/Icons/ResearchIcon.tsx
  96. +4 −0 apps/career/src/components/Icons/SearchIcon.tsx
  97. +8 −0 apps/career/src/components/Icons/SendIcon.tsx
  98. +49 −0 apps/career/src/components/common/Breadcrumbs.tsx
  99. +52 −0 apps/career/src/components/common/Dropdown.tsx
  100. +204 −0 apps/career/src/components/common/Header.tsx
  101. +52 −0 apps/career/src/components/common/HeaderWithModal.tsx
  102. +27 −0 apps/career/src/components/common/IntersestGrid.tsx
  103. +19 −0 apps/career/src/components/common/JobPostButton.tsx
  104. +101 −0 apps/career/src/components/common/LanguageMenu.tsx
  105. +23 −0 apps/career/src/components/common/Modal.tsx
  106. +159 −0 apps/career/src/components/common/SchoolFilter.tsx
  107. +25 −0 apps/career/src/components/common/ThemeToggle.tsx
  108. +67 −0 apps/career/src/components/jobdetail/CompanyOverview.tsx
  109. +86 −0 apps/career/src/components/jobdetail/JobContent.tsx
  110. +106 −0 apps/career/src/components/jobdetail/JobOverview.tsx
  111. +75 −0 apps/career/src/components/jobdetail/Jobdetail.tsx
  112. +88 −0 apps/career/src/components/joblist/JobCard.tsx
  113. +30 −0 apps/career/src/components/joblist/JobCardFooter.tsx
  114. +91 −0 apps/career/src/components/joblist/Joblist.tsx
  115. +150 −0 apps/career/src/components/joblist/PostRegisterProfile.tsx
  116. +54 −0 apps/career/src/components/joblist/PreRegisterProfile.tsx
  117. +305 −0 apps/career/src/components/joblist/ProfileModal.tsx
  118. +59 −0 apps/career/src/constants/dropdownOptions.ts
  119. +6 −0 apps/career/src/constants/locales/en/translation.json
  120. +6 −0 apps/career/src/constants/locales/ja/translation.json
  121. +138 −0 apps/career/src/constants/school-name-icon-map-en.ts
  122. +138 −0 apps/career/src/constants/school-name-icon-map-ja.ts
  123. +90 −0 apps/career/src/constants/schools.ts
  124. +39 −0 apps/career/src/declarations.d.ts
  125. +33 −12 apps/career/src/root.component.tsx
  126. +66 −0 apps/career/src/styles/common.css
  127. +87 −0 apps/career/src/styles/main.css
  128. +11 −0 apps/career/src/types/careerComponentProps.ts
  129. +21 −0 apps/career/src/types/job.ts
  130. +9 −0 apps/career/src/types/profileComponentProps.ts
  131. +4 −0 apps/career/src/types/theme.ts
  132. +11 −0 apps/career/src/types/userProfile.ts
  133. +21 −0 apps/career/src/utils/auth.ts
  134. +15 −0 apps/career/src/utils/get-school-icon-path.ts
  135. +30 −0 apps/career/src/utils/getDate.ts
  136. +40 −0 apps/career/src/utils/i18n.ts
  137. +14 −0 apps/career/src/utils/storeDate.ts
  138. +69 −0 apps/career/src/utils/theme-context.tsx
  139. +25 −0 apps/career/src/utils/timeFormatter.ts
  140. +16 −0 apps/career/tailwind.config.js
  141. +7 −5 apps/feeds/components/FeedLink.tsx
  142. +8 −7 apps/feeds/next.config.js
  143. +1 −1 apps/feeds/public/feeds
  144. +23 −5 apps/feeds/tsconfig.json
  145. +13 −0 apps/forum/index.html
  146. +1 −1 apps/forum/package.json
  147. +183 −186 apps/forum/pnpm-lock.yaml
  148. +171 −0 apps/forum/src/App.tsx
  149. +0 −93 apps/forum/src/components/App.tsx
  150. +89 −92 apps/forum/src/components/Board.tsx
  151. +8 −6 apps/forum/src/components/BoardMenu.tsx
  152. +106 −25 apps/forum/src/components/Comment.tsx
  153. +69 −15 apps/forum/src/components/CommentForm.tsx
  154. +167 −82 apps/forum/src/components/CreateThread.tsx
  155. +7 −9 apps/forum/src/components/FeedBackBox.tsx
  156. +2 −2 apps/forum/src/components/FilterMenu.tsx
  157. +25 −7 apps/forum/src/components/Thread.tsx
  158. +169 −123 apps/forum/src/components/ThreadBlock.tsx
  159. +21 −0 apps/forum/src/components/common/CommentNotification.tsx
  160. +5 −1 apps/forum/src/components/common/Header.tsx
  161. +14 −12 apps/forum/src/components/common/HeaderWithModal.tsx
  162. +1 −1 apps/forum/src/components/common/SchoolFilter.tsx
  163. +14 −6 apps/forum/src/components/form/ConfirmModal.tsx
  164. +1 −1 apps/forum/src/components/icons/CloseIcon.tsx
  165. +1 −1 apps/forum/src/components/icons/SendIcon.tsx
  166. +1 −1 apps/forum/src/constants/locales/en/translation.json
  167. +2 −2 apps/forum/src/constants/locales/ja/translation.json
  168. +13 −0 apps/forum/src/index.html
  169. +8 −5 apps/forum/src/root.component.tsx
  170. +66 −0 apps/forum/src/styles/common.css
  171. +28 −0 apps/forum/src/styles/main.css
  172. +6 −0 apps/forum/src/types/thread.ts
  173. +12 −0 apps/forum/src/types/threadPayload.ts
  174. +3 −1 apps/forum/src/utils/get-school-icon-path.ts
  175. +30 −0 apps/forum/src/utils/getDate.ts
  176. +14 −0 apps/forum/src/utils/storeDate.ts
  177. +30 −0 apps/forum/src/utils/timeFormatter.tsx
  178. +2 −1 apps/root/package.json
  179. +92 −15 apps/root/pnpm-lock.yaml
  180. +12 −6 apps/root/sitemap.xml
  181. +3 −2 apps/root/src/App.tsx
  182. BIN apps/root/src/assets/img/home/forum-dark.png
  183. BIN apps/root/src/assets/img/home/forum-light.png
  184. +1 −1 apps/root/src/components/Home.tsx
  185. +7 −4 apps/root/src/components/aboutUs/AboutUs.tsx
  186. +0 −4 apps/root/src/components/aboutUs/MeetOurTeam/MeetOurTeam.tsx
  187. +21 −2 apps/root/src/components/aboutUs/OurMission.tsx
  188. +22 −10 apps/root/src/components/block/IconTextGroup.tsx
  189. +22 −6 apps/root/src/components/frame/MobileNav.tsx
  190. +120 −19 apps/root/src/components/frame/Nav.tsx
  191. +1 −0 apps/root/src/components/frame/Sidebar.tsx
  192. +1 −1 apps/root/src/components/home/HomeModal.tsx
  193. +12 −5 apps/root/src/components/home/NewFeatures.tsx
  194. +8 −0 apps/root/src/components/icons/CareerIcon.tsx
  195. +3 −0 apps/root/src/components/user/RedirectPage.tsx
  196. +5 −5 apps/root/src/constants/locales/en/translation.json
  197. +5 −5 apps/root/src/constants/locales/jp/translation.json
  198. +5 −3 apps/root/src/index.html
  199. +18 −0 apps/root/src/utils/fetchNotification.ts
  200. +30 −0 apps/root/src/utils/getDate.ts
  201. +27 −0 apps/root/src/utils/shouldCallApi.ts
  202. +1 −1 apps/root/src/utils/theme-context.tsx
  203. +16 −5 apps/root/src/wasedatime-root-config.ts
  204. +1 −1 apps/syllabus/package.json
  205. +346 −352 apps/syllabus/pnpm-lock.yaml
  206. +14 −8 apps/syllabus/src/components/courseInfo/CourseInfo.tsx
  207. +5 −5 apps/syllabus/src/components/courseInfo/CourseReviews.tsx
  208. +1 −1 apps/syllabus/src/components/courseInfo/ShareButtons.tsx
  209. +1 −1 apps/syllabus/src/containers/AddedCourseAndPrefItem.tsx
  210. +1 −1 apps/syllabus/src/containers/AddedCourseItemContainer.tsx
  211. +1 −1 apps/syllabus/src/containers/CourseItemContainer.tsx
  212. +1 −1 apps/syllabus/src/containers/CourseListSummaryContainer.tsx
  213. +1 −1 apps/syllabus/src/containers/SyllabusContainer.tsx
  214. +3 −6 apps/syllabus/src/root.component.tsx
  215. +67 −0 apps/syllabus/src/styles/common.css
  216. +94 −73 packages/eslint-config-custom/pnpm-lock.yaml
  217. +3 −3 packages/ui/.prettierrc.cjs
  218. +1 −2 packages/ui/lib/base/Modal.d.ts
  219. +1 −2 packages/ui/lib/icons/CrossIcon.d.ts
  220. +1 −2 packages/ui/lib/icons/GoogleIcon.d.ts
  221. +1 −2 packages/ui/lib/layout/Header.d.ts
  222. +1 −2 packages/ui/lib/layout/LanguageMenu.d.ts
  223. +1 −2 packages/ui/lib/layout/LoadingSpinner.d.ts
  224. +1 −2 packages/ui/lib/layout/SignInModal.d.ts
  225. +1 −2 packages/ui/lib/layout/ThemeToggle.d.ts
  226. +4 −5 packages/ui/lib/theme/Logo.d.ts
  227. +11,836 −14,846 packages/ui/lib/wasedatime-ui.es.js
  228. +95 −124 packages/ui/lib/wasedatime-ui.umd.js
  229. +869 −829 packages/ui/pnpm-lock.yaml
  230. +11 −3 packages/ui/src/utils/user.ts
  231. +21 −21 pnpm-lock.yaml
16 changes: 8 additions & 8 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -11,12 +11,12 @@ jobs:
if: github.event.release.prerelease == true
strategy:
matrix:
microapps:
[
microapps: [
"WEBHOOK_ROOT_DEV",
"WEBHOOK_SYLLABUS_DEV",
"WEBHOOK_CAMPUS_DEV",
"WEBHOOK_FEEDS_DEV",
"WEBHOOK_CAREER_DEV",
# "WEBHOOK_CAMPUS_DEV",
# "WEBHOOK_FEEDS_DEV",
"WEBHOOK_FORUMS_DEV",
]
env:
@@ -30,12 +30,12 @@ jobs:
if: github.event.release.prerelease != true
strategy:
matrix:
microapps:
[
microapps: [
"WEBHOOK_ROOT_PROD",
"WEBHOOK_SYLLABUS_PROD",
"WEBHOOK_CAMPUS_PROD",
"WEBHOOK_FEEDS_PROD",
"WEBHOOK_CAREER_PROD",
# "WEBHOOK_CAMPUS_PROD",
# "WEBHOOK_FEEDS_PROD",
"WEBHOOK_FORUMS_PROD",
]
env:
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -85,3 +85,7 @@ bit.json

# turbo
.turbo

# feeds articles

apps/feeds/public/feeds/
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "apps/feeds/public/feeds"]
path = apps/feeds/public/feeds
url = https://github.com/wasedatime/feeds.git
url = git@github.com:wasedatime/feeds.git
8 changes: 8 additions & 0 deletions .hintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": [
"development"
],
"hints": {
"no-inline-styles": "off"
}
}
2 changes: 1 addition & 1 deletion apps/campus/package.json
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@
"react-bootstrap": "1.6.4",
"react-datepicker": "3.8.0",
"react-dom": "17.0.2",
"react-ga": "3.3.0",
"react-ga4": "^2.1.0",
"react-helmet": "6.1.0",
"react-i18next": "11.15.6",
"react-router-dom": "^6.7.0",
16 changes: 5 additions & 11 deletions apps/campus/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 58 additions & 6 deletions apps/career/package.json
Original file line number Diff line number Diff line change
@@ -15,29 +15,81 @@
"devDependencies": {
"@babel/core": "7.17.5",
"@babel/eslint-parser": "7.17.0",
"@babel/plugin-syntax-flow": "^7.21.4",
"@babel/plugin-transform-react-jsx": "^7.22.0",
"@babel/plugin-transform-runtime": "7.17.0",
"@babel/preset-env": "7.16.11",
"@babel/preset-react": "7.16.7",
"@babel/preset-typescript": "7.16.7",
"@babel/runtime": "7.17.2",
"@fortawesome/fontawesome-svg-core": "1.3.0",
"@types/node": "17.0.21",
"@typescript-eslint/eslint-plugin": "5.14.0",
"@typescript-eslint/parser": "5.14.0",
"@vitejs/plugin-react": "1.3.2",
"autoprefixer": "10.4.2",
"babel-plugin-styled-components": "2.1.4",
"concurrently": "7.0.0",
"cssnano": "5.1.0",
"dotenv": "^16.0.3",
"esbuild": "^0.18.6",
"eslint": "8.10.0",
"eslint-config-custom": "workspace:*",
"localforage": "1.10.0",
"postcss": "8.4.8",
"prettier": "2.5.1",
"prettier-plugin-tailwindcss": "^0.2.8",
"prettier-eslint": "13.0.0",
"prop-types": "^15.8.1",
"react-is": "^18.2.0",
"react-native": "^0.68.7",
"sass": "1.49.9",
"tailwindcss": "3.0.23",
"ts-config-single-spa": "2.0.1",
"typescript": "4.6.2",
"vite": "^4.3.5",
"vite-plugin-dynamic-import": "^0.7.0"
"typescript": "4.6.2"
},
"dependencies": {
"@aws-amplify/api": "4.0.42",
"@aws-amplify/auth": "4.4.4",
"@emotion/react": "11.9.0",
"@emotion/styled": "11.8.1",
"@fortawesome/free-solid-svg-icons": "6.0.0",
"@fortawesome/react-fontawesome": "0.1.17",
"@headlessui/react": "^1.7.14",
"@material-ui/core": "4.12.4",
"@mui/icons-material": "5.8.3",
"@mui/material": "5.8.3",
"@popperjs/core": "^2.11.8",
"@types/react": "17.0.39",
"@types/react-dom": "17.0.13",
"@types/styled-components": "5.1.24",
"@types/uuid": "^9.0.5",
"@vitejs/plugin-react": "1.3.2",
"eslint-plugin-react-hooks": "4.3.0",
"i18next": "19.9.2",
"prettier-plugin-tailwindcss": "^0.2.8",
"react": "17.0.2",
"react-dom": "17.0.2",
"single-spa-react": "3.2.0"
"react-ga4": "^2.1.0",
"react-helmet": "6.1.0",
"react-i18next": "11.15.6",
"react-infinite-scroll-component": "^6.1.0",
"react-responsive": "9.0.0-beta.10",
"react-router-dom": "^6.11.2",
"recoil": "^0.7.7",
"single-spa-react": "3.2.0",
"styled-components": "5.3.3",
"uuid": "^9.0.1",
"vite": "4.3.5",
"vite-plugin-dynamic-import": "^0.7.1",
"wasedatime-ui": "*"
},
"peerDependencies": {
"@babel/plugin-syntax-flow": "^7.16.7",
"@babel/plugin-transform-react-jsx": "^7.17.3",
"@fortawesome/fontawesome-svg-core": "1.3.0",
"@popperjs/core": "^2.11.5",
"eslint-plugin-react-hooks": "4.3.0",
"prop-types": "^15.8.1",
"react-is": "^18.1.0",
"react-native": "^0.68.1"
}
}
Loading