Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
180 commits
Select commit Hold shift + click to select a range
871efad
feat/added feature for email and password validaion
moueedAli Sep 3, 2025
1619055
fix/removed_email_and_password
moueedAli Sep 3, 2025
d45d345
feat/added new feature to perform checks against DB for existing email
moueedAli Sep 3, 2025
676d083
updated step one and two
lindadqd Sep 3, 2025
6687919
Added password feature and fixed prettier
Sep 3, 2025
4bc89b8
Fixed mobile number input
lindadqd Sep 3, 2025
fb52174
updated placeholder in mobile number
lindadqd Sep 3, 2025
4746a82
Merge pull request #6 from boolean-uk/2-client--validate-inputs-creat…
magnusgit1 Sep 3, 2025
6859c6a
updated bio-stepFour
lindadqd Sep 3, 2025
da9c05d
feat/added step three in create profile
mariehhansen Sep 4, 2025
3f6fe18
Updated next buttons - user has to fill in correct input
lindadqd Sep 4, 2025
f08502b
feat/added feature for email and password check against database for …
moueedAli Sep 4, 2025
6793813
Merge branch 'main' into passwordfeature
magnusgit1 Sep 5, 2025
223bc30
Merge pull request #8 from lindadqd/passwordfeature
magnusgit1 Sep 5, 2025
4981692
Merge pull request #11 from boolean-uk/7-client-validate-inputs-creat…
magnusgit1 Sep 5, 2025
3a310a0
Fixed createProfile to match ticket
lindadqd Sep 5, 2025
5185703
Fixed autofill email and password
lindadqd Sep 9, 2025
5b9bdcc
Merge remote-tracking branch 'origin/1-client---profile-creation' int…
lindadqd Sep 9, 2025
2a8d2c7
fixed missing steps from merge
lindadqd Sep 9, 2025
98b4a9f
Upload profile picture ok
lindadqd Sep 10, 2025
17837c5
missing form context
lindadqd Sep 10, 2025
0ddf2e0
refactor
lindadqd Sep 10, 2025
5d1c57d
Merge branch 'main' into 21-client-profile-creation-add-picture
magnusgit1 Sep 10, 2025
1c8613b
add file structure and route for Student View Cohort page
mariehhansen Sep 10, 2025
d2126ed
Merge branch 'main' into profile-creation-linda
magnusgit1 Sep 11, 2025
e2061d6
Merge pull request #10 from boolean-uk/profile-creation-linda
magnusgit1 Sep 11, 2025
6d29f5f
Merge pull request #23 from boolean-uk/15-client---cohorts-page---stu…
magnusgit1 Sep 11, 2025
3d9ccfe
Merge branch 'main' into 21-client-profile-creation-add-picture
magnusgit1 Sep 11, 2025
3d3a0dd
Merge pull request #22 from boolean-uk/21-client-profile-creation-add…
magnusgit1 Sep 11, 2025
9bebb8a
fixed issues from merge
lindadqd Sep 11, 2025
c665e94
Merge pull request #28 from boolean-uk/fix/fix-issues-with-previous-m…
magnusgit1 Sep 11, 2025
390e24a
fixed log in issue
lindadqd Sep 11, 2025
e355c64
Merge pull request #29 from boolean-uk/fix/fix-issues-with-previous-m…
magnusgit1 Sep 11, 2025
ecbed05
feat/added feature for my exercises part in Cohorts page - Student view
moueedAli Sep 11, 2025
ee6799a
Added component for view all teachers
Sep 11, 2025
afbbbaa
fix/fixed issue from Daves last comment
moueedAli Sep 11, 2025
e63eba5
Merge pull request #30 from boolean-uk/feat/add-box-for-my-exercises
magnusgit1 Sep 11, 2025
3e710c1
Added function to three dots
Sep 11, 2025
61fa1de
fixed issues with submit profile
lindadqd Sep 12, 2025
3e51528
Merge pull request #47 from boolean-uk/fix/fix-renaming-issues-to-mat…
magnusgit1 Sep 12, 2025
73daa4b
Merge branch 'main' into 18-client---cohorts-page---student-view---te…
Isabelltran Sep 12, 2025
b84e7d8
feat/student page cohort view
mariehhansen Sep 12, 2025
63f48bf
Merge pull request #43 from boolean-uk/18-client---cohorts-page---stu…
magnusgit1 Sep 12, 2025
95546fd
change app title and minor fix in students.css
mariehhansen Sep 12, 2025
58b6553
Merge branch 'main' into 15-client---cohorts-page---student-view---my…
mariehhansen Sep 12, 2025
a298ae2
add cohort manager favicon
mariehhansen Sep 12, 2025
f0ec240
Merge branch '15-client---cohorts-page---student-view---my-cohort---v…
mariehhansen Sep 12, 2025
09511d2
fixed so that we see posts
Sep 12, 2025
4f64b83
Merge pull request #52 from boolean-uk/postsindexfix
emazau Sep 15, 2025
cd7a15b
Merge pull request #51 from boolean-uk/15-client---cohorts-page---stu…
emazau Sep 15, 2025
a25a2d0
added-azure-logo-removed-the-rest
lindadqd Sep 15, 2025
4223283
Merge pull request #53 from boolean-uk/edit-social-buttons-on-login-page
emazau Sep 16, 2025
eb4b3aa
minor change in welcome/index.js to send correct data to DB
moueedAli Sep 16, 2025
8064f25
Merge pull request #55 from boolean-uk/fix/minor-changes-made-in-welcome
emazau Sep 16, 2025
7e28c49
updated icons on sidebar for each page
lindadqd Sep 16, 2025
f91e8ba
fix input fields in welcome components
mariehhansen Sep 16, 2025
686f9cf
Merge pull request #64 from boolean-uk/fix-asterisk-stepThree
emazau Sep 16, 2025
603f45c
Merge pull request #57 from boolean-uk/#31-client-sidebar
emazau Sep 16, 2025
309853e
added icons to teacher view sidebar
lindadqd Sep 16, 2025
11c6cad
feat/added-page-and-navigation-for-profile-page
moueedAli Sep 16, 2025
20aa74d
Merge pull request #67 from boolean-uk/#63-client-dashboard-teacher-v…
emazau Sep 16, 2025
a75df6d
Merge branch 'main' into 35-client-user-profile-page-view-profile
emazau Sep 16, 2025
efa5e0b
Merge pull request #69 from boolean-uk/35-client-user-profile-page-vi…
emazau Sep 16, 2025
0b836b1
added cohorts to teacher view
lindadqd Sep 16, 2025
56206fc
many changes to POSTS dashboard student view
Sep 16, 2025
aee0547
feat/added-feauture-for-profile-page
moueedAli Sep 16, 2025
02c9b9e
Merge pull request #70 from boolean-uk/#62-client-dashboard-teacher-v…
emazau Sep 16, 2025
34446a8
Merge branch 'main' into feat/fetch-all-user-data-from-backend
emazau Sep 16, 2025
c70ecd6
Merge pull request #71 from boolean-uk/feat/fetch-all-user-data-from-…
emazau Sep 16, 2025
4ace223
Merge branch 'main' into Huge-commit-POSTS
emazau Sep 16, 2025
a577203
Merge pull request #72 from boolean-uk/Huge-commit-POSTS
emazau Sep 16, 2025
243a9ec
removed cohort from profile page
Richard-Persson Sep 16, 2025
67028ee
Merge pull request #73 from boolean-uk/minor_profile_change
moueedAli Sep 16, 2025
c151122
users are not hard coded in cohort page anymore, but needs role checked
mariehhansen Sep 16, 2025
d853528
check user role, when signing in
lindadqd Sep 17, 2025
b75d8a9
feat/added-feature-that-gets-user-info-for-a-logged-in-user
moueedAli Sep 17, 2025
17c5f37
get teachers from database to cohorts page
mariehhansen Sep 17, 2025
23c3ae5
Merge branch 'main' into 56-client---cohorts-page---student-view---ge…
emazau Sep 17, 2025
c4a087c
Merge pull request #76 from boolean-uk/56-client---cohorts-page---stu…
emazau Sep 17, 2025
451a517
Merge remote-tracking branch 'origin/main' into feat/get-user-info-by…
moueedAli Sep 17, 2025
aca9681
feat/added-feature-for-profile-page-header
moueedAli Sep 17, 2025
4ccd401
home page for teachers done
lindadqd Sep 17, 2025
78c0c47
updatet 3dots button
lindadqd Sep 17, 2025
7056762
edit getters in apiClient
mariehhansen Sep 17, 2025
7ed02a7
Made new features for posts page
Sep 17, 2025
22923d8
Merge pull request #74 from boolean-uk/#65-check-user-role
emazau Sep 17, 2025
42db6df
Merge branch 'main' into feat/get-user-info-by-logged-in-user
emazau Sep 17, 2025
a666ae4
Merge pull request #75 from boolean-uk/feat/get-user-info-by-logged-i…
emazau Sep 17, 2025
e572af7
Merge branch 'main' into #62-client-dashboard-teacher-view-home-students
emazau Sep 17, 2025
d2310f9
Merge pull request #79 from boolean-uk/#62-client-dashboard-teacher-v…
emazau Sep 17, 2025
9b0c7b9
Merge pull request #80 from boolean-uk/56-client---cohorts-page---stu…
emazau Sep 17, 2025
f8277e1
Merge branch 'main' into New-Branch-Sorry-wrong-format-POSTS-Page
emazau Sep 17, 2025
e78f291
Merge pull request #81 from boolean-uk/New-Branch-Sorry-wrong-format-…
emazau Sep 17, 2025
c440d57
fix merge bugs
Sep 17, 2025
3026e84
fix bug
Sep 17, 2025
3beb895
feat/added-loading-feauture-in-profile-page
moueedAli Sep 17, 2025
f8791b1
Merge pull request #82 from boolean-uk/feat/added-feauture-for-loadin…
emazau Sep 17, 2025
0fdba39
switch between courses in cohort page
mariehhansen Sep 17, 2025
e6db2e7
add loading component
mariehhansen Sep 18, 2025
1bea55c
change from ProfileCircle to UserIcon
mariehhansen Sep 18, 2025
6ec517b
fix fetch in cohort page
mariehhansen Sep 18, 2025
8c4b2c8
Merge branch 'main' into 56-client---cohorts-page---student-view---ge…
mariehhansen Sep 18, 2025
a6a2d45
feat/added-edit-page-for-profile-page-for-logged-in-user
moueedAli Sep 18, 2025
03283a9
Merge pull request #83 from boolean-uk/56-client---cohorts-page---stu…
emazau Sep 18, 2025
465faa6
Merge branch 'main' into feat/add-edit-page-for-profile-page
emazau Sep 18, 2025
0376d69
Merge pull request #89 from boolean-uk/feat/add-edit-page-for-profile…
emazau Sep 18, 2025
95ad05a
minor change because of endpoint
moueedAli Sep 18, 2025
b6eec5f
Merge pull request #90 from boolean-uk/fix/minor-change-because-of-en…
emazau Sep 18, 2025
49566d7
made many new features to posts pages
Sep 18, 2025
8c08121
Merge branch 'main' into Posts-pages-new-features-FRONTEND
emazau Sep 18, 2025
dd3be92
Merge pull request #91 from boolean-uk/Posts-pages-new-features-FRONTEND
emazau Sep 18, 2025
d543f1c
add id prop to see profile for one user
mariehhansen Sep 19, 2025
ed0ce95
Merge branch '56-client---cohorts-page---student-view---get-data-from…
mariehhansen Sep 19, 2025
c4a5254
Merge branch 'main' into 56-client---cohorts-page---student-view---ge…
emazau Sep 19, 2025
e2edf22
Merge pull request #92 from boolean-uk/56-client---cohorts-page---stu…
emazau Sep 19, 2025
2650231
Added search bar
Sep 19, 2025
e055154
Merge branch 'main' into 27-client---dashboard---student-view---searc…
Isabelltran Sep 19, 2025
2f25bb1
fixed the problem with getting wrong data when viewing other profile
moueedAli Sep 19, 2025
6f44501
Merge pull request #94 from boolean-uk/fix/get-right-data-by-profile
emazau Sep 19, 2025
1dcdf77
Fixed ClickOutside
Sep 19, 2025
983468a
Merge branch '27-client---dashboard---student-view---search-bar-resul…
Sep 19, 2025
85bf393
Fixed ClickOutside
Sep 19, 2025
8988df9
add loading page to cohorts page
mariehhansen Sep 19, 2025
441fbff
Merge pull request #95 from boolean-uk/add-loading-cohorts-page
emazau Sep 19, 2025
0352951
completed cohorts-page-teacher view
lindadqd Sep 19, 2025
9b8aad9
added feature for changing password in edit page
moueedAli Sep 19, 2025
e7150df
Merge branch 'main' into #84-client-cohorts-page-teacher-view
lindadqd Sep 19, 2025
c5011d8
Merge pull request #96 from boolean-uk/#84-client-cohorts-page-teache…
emazau Sep 19, 2025
e355949
Merge pull request #97 from boolean-uk/feat/add-password-change-feature
emazau Sep 19, 2025
34fe053
added features to posts and comments
Sep 19, 2025
106e5fd
Merge branch 'main' into 86-added-new-featues-Posts-page
emazau Sep 19, 2025
75618e8
Merge pull request #98 from boolean-uk/86-added-new-featues-Posts-page
emazau Sep 19, 2025
a4acff4
fix bugs after merge
Sep 19, 2025
16f64b0
fixed merge bugs
Sep 19, 2025
4c75f0c
Added new page for search
Sep 19, 2025
50510aa
Merge branch 'main' into 27-client---dashboard---student-view---searc…
Isabelltran Sep 19, 2025
e01a7fd
fix bugs
Sep 19, 2025
ce98d02
fix course in students, cohort page
mariehhansen Sep 22, 2025
9c73ecb
remove comments
mariehhansen Sep 22, 2025
b9460c7
Merge pull request #93 from boolean-uk/27-client---dashboard---studen…
emazau Sep 22, 2025
19f57e1
Merge pull request #99 from boolean-uk/fix-cohort-course-date
emazau Sep 22, 2025
039a7f6
I think bugs are fixed
Sep 22, 2025
b932b42
fixed course fetching error from database update
lindadqd Sep 22, 2025
e3e813b
-
lindadqd Sep 22, 2025
6e0f443
Merge branch 'main' into #84-client-cohorts-page-teacher-view
emazau Sep 22, 2025
7aa35d5
Merge pull request #102 from boolean-uk/#84-client-cohorts-page-teach…
emazau Sep 22, 2025
4f16130
added jwt token to fronted
Sep 22, 2025
80fbac4
Merge branch 'main' of https://github.com/boolean-uk/java-team-dev-cl…
Sep 22, 2025
fb8b2a4
fixed apiclient to add jwt token
Sep 22, 2025
8c782d4
fix dashboard - my cohort
mariehhansen Sep 22, 2025
8a97588
add styling to dashboard - my cohort
mariehhansen Sep 22, 2025
9d6ceab
Merge branch 'main' into 26-client---dashboard---student-view---my-co…
mariehhansen Sep 22, 2025
79b9638
Merge pull request #103 from boolean-uk/26-client---dashboard---stude…
emazau Sep 22, 2025
9f93273
added buttons
Sep 22, 2025
4dca765
replaced dummy data with db data
magnusgit1 Sep 22, 2025
05a0511
fixed loading
magnusgit1 Sep 22, 2025
097cd0f
added templates
magnusgit1 Sep 22, 2025
0048f3c
Added buttons in teacher view in search
Sep 22, 2025
ee9ec7e
minor change
magnusgit1 Sep 22, 2025
006ffb4
feat/added-feauture-for-profile-picture-in-profile-and-edit-page
moueedAli Sep 22, 2025
6200782
fixed so that it works dynamically and checks who made the posts
Sep 22, 2025
f939988
Merge branch 'main' into 92_Posts_fixed_bugs_and_made_more_dynamic
emazau Sep 22, 2025
bd0b5f9
Merge pull request #109 from boolean-uk/92_Posts_fixed_bugs_and_made_…
emazau Sep 22, 2025
0653b8f
Added lock icon to stepThree
Richard-Persson Sep 22, 2025
2507051
Merge branch 'main' into CLIENT/change-hardcoded-data-in-dashboard
emazau Sep 22, 2025
7469b52
Merge pull request #104 from boolean-uk/CLIENT/change-hardcoded-data-…
emazau Sep 22, 2025
3ce1cb1
Merge branch 'main' into 101-client---dashboard---student-view---sear…
emazau Sep 22, 2025
9c4bc6b
Merge pull request #106 from boolean-uk/101-client---dashboard---stud…
emazau Sep 22, 2025
582d5f7
Merge branch 'main' into fix/fix-issues-with-profile-page
emazau Sep 22, 2025
d6da870
Merge pull request #108 from boolean-uk/fix/fix-issues-with-profile-page
emazau Sep 22, 2025
5058e43
Merge pull request #110 from boolean-uk/change_training_info_register…
emazau Sep 22, 2025
c11937a
fixed minor bug
Richard-Persson Sep 22, 2025
f56989f
fixed issue with edit page
moueedAli Sep 22, 2025
37dde9f
fixed see-profile from teach-view
magnusgit1 Sep 22, 2025
4f28c35
Merge pull request #112 from boolean-uk/quick_fix_S3
emazau Sep 23, 2025
02f7897
fixed issue fetching training info data
moueedAli Sep 23, 2025
70d1af9
Merge branch 'main' into fix/fix-issue-with-edit-page
moueedAli Sep 23, 2025
4f1f682
Merge pull request #113 from boolean-uk/fix/fix-issue-with-edit-page
moueedAli Sep 23, 2025
edef5b9
Added and fixed the css
Sep 23, 2025
55cc27d
added snackbars
Sep 23, 2025
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
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
name: "🐞 Bug Fix"
about: "Report a bug or something that is not working as expected"
title: "[FIX] "
labels: bug
assignees: ""
---

## 🐛 Bug Description
A clear and concise description of what the bug is.

## 🔄 Steps to Reproduce
Steps to reproduce the behavior:
1. Go to ...
2. Click on ...
3. See error ...

## ✅ Expected Behavior
What should have happened instead?

## 📸 Screenshots / Logs
If applicable, add screenshots or error messages.

## 🖥️ Environment
- OS:
- Version:
- Other relevant info:
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: "✨ Feature Request"
about: "Suggest a new feature or improvement"
title: "[FEATURE] "
labels: enhancement
assignees: ""
---

## ✨ Description
What would you like to add or improve?

## 🎯 Use Case
Why is this useful? Who benefits from it?

## 💡 Proposed Solution
How could this be implemented? (optional)

## 📎 Additional Info
Anything else you’d like to share? (related issues, links, references, etc.)
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/other.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: "📌 Other"
about: "Questions, discussions, or anything else"
title: "[OTHER] "
labels: question
assignees: ""
---

## 📌 Description
What is this about?

## 🌍 Context
Why is this relevant?

## 📎 Additional Info
Anything else that might be useful.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*

.vscode
.vscode
.idea

3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

src/*
src/
48 changes: 44 additions & 4 deletions package-lock.json

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

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^14.4.3",
"browser-image-compression": "^2.0.2",
"jwt-decode": "^3.1.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-modal": "^3.16.1",
"react-password-checklist": "^1.8.1",
"react-router-dom": "^6.8.0",
"react-scripts": "5.0.1",
"reactjs-popup": "^2.0.6",
"web-vitals": "^3.1.1"
},
"scripts": {
Expand Down Expand Up @@ -43,7 +46,7 @@
},
"devDependencies": {
"eslint": "^8.57.1",
"eslint-config-prettier": "^9.1.0",
"eslint-config-prettier": "^9.1.2",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-n": "^16.6.2",
Expand Down
4 changes: 4 additions & 0 deletions public/faviconsvg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/favicontransparent.ico
Binary file not shown.
Binary file added public/faviconwhite.ico
Binary file not shown.
4 changes: 2 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="%PUBLIC_URL%/favicontransparent.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
Expand All @@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>Cohort Manager</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
15 changes: 15 additions & 0 deletions public/microsoft-azure-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,17 @@
grid-template-columns: 151px 2fr 1fr;
grid-template-rows: 96px auto;
background-color: #f0f5fa;
height: 100vh;

height: auto;
min-height: 100vh;
}

.ReactModal__Body--open,
.ReactModal__Html--open {
overflow: hidden;
}

.border-line {
border-bottom: 1px solid var(--color-blue5);
padding: 20px 10px;
}
Loading