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

Develop #350

Merged
merged 538 commits into from
Nov 25, 2024
Merged
Changes from 2 commits
Commits
Show all changes
538 commits
Select commit Hold shift + click to select a range
8479912
Merge branch 'develop' of https://github.com/mr-loop-1/bluewave-onboa…
mr-loop-1 Oct 14, 2024
5df1620
popup-design
erenfn Oct 14, 2024
16ea71a
Merge pull request #280 from parthmanhas/277-settings-page-features
erenfn Oct 14, 2024
9182f26
Merge pull request #211 from mr-loop-1/feature/settings
erenfn Oct 14, 2024
45a0048
Update index.js
erenfn Oct 14, 2024
2986272
Update index.js
erenfn Oct 14, 2024
d46c886
Update accessGuard.middleware.js
erenfn Oct 14, 2024
f13355b
Update CONTRIBUTING.md
gorkem-bwl Oct 15, 2024
92f69fc
changed file names
erenfn Oct 16, 2024
cd4aedd
Merge pull request #290 from bluewave-labs/popup-design
erenfn Oct 16, 2024
96f95f7
Draft1 - Refactor data validations for controllers in backend
eulerbutcooler Oct 16, 2024
d47a1d4
postman
erenfn Oct 17, 2024
32ccc77
Merge pull request #298 from bluewave-labs/fix-backend-file-names
erenfn Oct 17, 2024
fab02e5
Merge branch 'develop' of https://github.com/bluewave-labs/bluewave-o…
parthmanhas Oct 17, 2024
19c98e8
fix review comments, add image to login response, fix conflicts,
parthmanhas Oct 17, 2024
3d8540e
add back delete user route
parthmanhas Oct 17, 2024
6ccb203
sync user role with updated enum
parthmanhas Oct 17, 2024
dcacb9f
add: profile update handled
mr-loop-1 Oct 18, 2024
0124094
updated `role` field values to use new enum values
d02ev Oct 18, 2024
f17ba99
Merge pull request #304 from parthmanhas/sync-user-role-with-enum-in-…
uparkalau Oct 18, 2024
e5b74ce
add: fetching team details
mr-loop-1 Oct 18, 2024
a40fc23
add: team details in table
mr-loop-1 Oct 19, 2024
bfc969e
add: remove user modal
mr-loop-1 Oct 19, 2024
d1c9fe3
add: remove member fns
mr-loop-1 Oct 19, 2024
59b2de0
add: invite member success
mr-loop-1 Oct 19, 2024
c67a3c6
add: delete member success
mr-loop-1 Oct 19, 2024
829a61b
refactor: logs
mr-loop-1 Oct 19, 2024
dfb5fb5
refactor: local changes
mr-loop-1 Oct 19, 2024
57c2740
Merge branch 'develop' into updating-seeders-with-user-enum-values
erenfn Oct 20, 2024
f34d502
Merge pull request #305 from d02ev/updating-seeders-with-user-enum-va…
erenfn Oct 20, 2024
baa3610
coderabbit comments, handle null value in fullName
parthmanhas Oct 20, 2024
9315f57
added dropdown menu for team roles
erenfn Oct 20, 2024
b80d62c
Merge pull request #279 from parthmanhas/278-store-user-profile-pictures
erenfn Oct 20, 2024
e55a027
Update fileSizeValidator.middleware.js
erenfn Oct 20, 2024
04edc39
add: change role success
mr-loop-1 Oct 22, 2024
6524202
add: user delete success
mr-loop-1 Oct 22, 2024
b39205a
refactor: local changes
mr-loop-1 Oct 22, 2024
a32cd95
add: coderabbit suggestions
mr-loop-1 Oct 22, 2024
dc3cc05
add: coderabbit suggestion
mr-loop-1 Oct 22, 2024
008a2c6
chore: create migrations for tours, hints, banners and popup_logs table
jaykayudo Oct 22, 2024
31a0612
refactor: implement bot review changes
jaykayudo Oct 22, 2024
b0e1038
chore: add url validation
jaykayudo Oct 22, 2024
edd2448
refactored fullname in auth provider
erenfn Oct 22, 2024
a6289d5
Merge branch 'develop' of https://github.com/bluewave-labs/bluewave-o…
erenfn Oct 22, 2024
6ad1320
fix typo
erenfn Oct 22, 2024
c891fad
fixed setItem
erenfn Oct 22, 2024
1cb8537
refactor css fonts
erenfn Oct 22, 2024
521fe84
add picture to auth
erenfn Oct 22, 2024
691779c
add: user update in sidebar
mr-loop-1 Oct 23, 2024
32765e1
Merge branch 'develop' into feature/settings-integration
mr-loop-1 Oct 23, 2024
7fa43ff
banner component
erenfn Oct 23, 2024
f0b22ed
remove testing in app.jsx
erenfn Oct 23, 2024
bd99da8
removed invites for testing
erenfn Oct 23, 2024
e81ece7
fix: rename tour controller file
DeboraSerra Oct 24, 2024
fbab875
chore: raname utils files
DeboraSerra Oct 24, 2024
c096b0b
fix: fix imports of utils files
DeboraSerra Oct 24, 2024
9bed989
fix: fix sequelize config
DeboraSerra Oct 24, 2024
8abad4b
fix: fix sequelize config
DeboraSerra Oct 24, 2024
2c8bce8
Merge branch '320-standardize-backend-file-patterns' of github.com:bl…
DeboraSerra Oct 24, 2024
3634f38
Revert "fix: rename tour controller file"
DeboraSerra Oct 24, 2024
b4ba5c8
fix: rename tour controller file
DeboraSerra Oct 24, 2024
16d6900
fix: file middleware only for post put
mr-loop-1 Oct 25, 2024
f0f81dc
feat: create model
DeboraSerra Oct 25, 2024
be9516b
feat: add link service
DeboraSerra Oct 25, 2024
b5a54d9
feat: add link controller
DeboraSerra Oct 25, 2024
4c4db36
Merge branch 'develop' of github.com:bluewave-labs/bluewave-onboardin…
DeboraSerra Oct 25, 2024
08f86a2
feat: add link route
DeboraSerra Oct 25, 2024
0007d2d
fix: fix link files to make it work
DeboraSerra Oct 25, 2024
9380a61
fix: fix add and edit link
DeboraSerra Oct 25, 2024
7dec47b
chore: undo quotes change on index
DeboraSerra Oct 25, 2024
7498fd2
chore: add validators to migrations
jaykayudo Oct 25, 2024
5eabc91
feat: create links page
DeboraSerra Oct 25, 2024
0c988ba
feat: create link cards and preview placeholder
DeboraSerra Oct 25, 2024
b3ca75f
audit fix
erenfn Oct 26, 2024
543d00e
env fix
erenfn Oct 26, 2024
c2a6199
Merge pull request #313 from bluewave-labs/fullname-refactor
erenfn Oct 26, 2024
1fce852
Merge pull request #317 from bluewave-labs/refactor-css-fonts
erenfn Oct 26, 2024
9bf94d6
Merge pull request #318 from bluewave-labs/banner-component
erenfn Oct 26, 2024
5deba11
Merge branch 'develop' of https://github.com/bluewave-labs/bluewave-o…
erenfn Oct 26, 2024
d0180d4
Merge pull request #275 from bluewave-labs/273-fix-checkColorFields
erenfn Oct 26, 2024
c4dff05
Merge pull request #321 from bluewave-labs/320-standardize-backend-fi…
erenfn Oct 26, 2024
52a5fb3
coderabbit changes
erenfn Oct 26, 2024
b087e89
Merge branch 'develop' into feature/settings-integration
mr-loop-1 Oct 26, 2024
07f51af
Merge pull request #308 from mr-loop-1/feature/settings-integration
erenfn Oct 26, 2024
dcae71e
fix: remove custom validator from migrations
jaykayudo Oct 26, 2024
aa8b9b1
frontend folder restructure
erenfn Oct 26, 2024
2c12708
frontend folder restructure
erenfn Oct 26, 2024
aa43853
undo base url
erenfn Oct 26, 2024
5bb3fd2
change file names
erenfn Oct 26, 2024
5e7c46d
Update and rename GuideMainPageData.js to guideMainPageData.js
erenfn Oct 26, 2024
683c4b9
Rename CreateActivityButtonData.js to createActivityButtonData.js
erenfn Oct 26, 2024
da1110b
revert env
erenfn Oct 26, 2024
cd1d1df
Update team.routes.js
erenfn Oct 26, 2024
f597526
Merge pull request #325 from bluewave-labs/frontend-foler-restructure
erenfn Oct 26, 2024
bf9b00e
resolved conflicts
erenfn Oct 26, 2024
6c239d0
Merge branch 'develop' of github.com:bluewave-labs/bluewave-onboardin…
DeboraSerra Oct 26, 2024
2f9fc81
refactor: revert string to enum
jaykayudo Oct 26, 2024
475ffd4
fix: fix error with migration
jaykayudo Oct 26, 2024
0aebb7d
fix: revert createdBy Index
jaykayudo Oct 26, 2024
c080e50
feat: continue adding style to link page
DeboraSerra Oct 27, 2024
42191d8
Merge pull request #312 from jaykayudo/chore/add-migrations
erenfn Oct 27, 2024
ee20cce
Merge pull request #319 from bluewave-labs/remove-invites-for-testing
erenfn Oct 27, 2024
043ce8b
added endpoint to set organisation
d02ev Oct 27, 2024
cb9a35a
added routing to progress steps pages after signup
d02ev Oct 27, 2024
1294b79
added sending invites and setting org feature
d02ev Oct 27, 2024
6174f7c
BE coderabbit refactorings
d02ev Oct 27, 2024
188d0a2
FE coderabbit refactorings
d02ev Oct 27, 2024
ebc3822
removed duplicate validations
d02ev Oct 27, 2024
4b6980e
fix: Update Profile Image modal and placeholder issue solved
aryanp-86 Oct 28, 2024
4dfb0a3
fix: alter page to use GuideTemplate
DeboraSerra Oct 28, 2024
d609651
feat: start adding dragging feature
DeboraSerra Oct 28, 2024
fb9affc
feat: add create and delete link to front service
DeboraSerra Oct 28, 2024
71755e8
feat: add add new link feature
DeboraSerra Oct 28, 2024
a7861dc
Update loginHelper.js
erenfn Oct 28, 2024
2005a69
Merge branch 'develop' into d02ev/issue#303
d02ev Oct 29, 2024
b2e83da
Refactor decodeHtmlEntities function to use DOMParser
aryanp-86 Oct 29, 2024
16a2d84
auth validation - backend + frontend
eulerbutcooler Oct 29, 2024
6b30ea1
Merge remote-tracking branch 'upstream/develop' into develop
eulerbutcooler Oct 29, 2024
0c5576f
Merge pull request #328 from aryanp-86/develop
erenfn Oct 29, 2024
e83e704
Merge branch 'develop' of github.com:bluewave-labs/bluewave-onboardin…
DeboraSerra Oct 29, 2024
ccf6c69
Update popup.controller.js
erenfn Oct 29, 2024
a76add1
Update banner.controller.js
erenfn Oct 29, 2024
cea5d42
Setting up path aliases for components
aryanp-86 Oct 29, 2024
23bd5c9
Merge branch 'bluewave-labs:develop' into develop
aryanp-86 Oct 29, 2024
bb76be5
feat: add edit function to settings
DeboraSerra Oct 29, 2024
f696d2f
feat: add missing info on settings header
DeboraSerra Oct 29, 2024
4ce41c1
feat: add delete popup
DeboraSerra Oct 29, 2024
7c0b391
chore: reorganize files
DeboraSerra Oct 29, 2024
eea048a
feat: style preview
DeboraSerra Oct 29, 2024
b4b21d4
Merge develop into #302
DeboraSerra Oct 29, 2024
ddf52cf
feat: create helper link modal
DeboraSerra Oct 30, 2024
ed98216
chore: change link route to use new model
DeboraSerra Oct 30, 2024
0d01fe3
chore: update frontend to use new link routes
DeboraSerra Oct 30, 2024
56c46bf
feat: add helper link service
DeboraSerra Oct 30, 2024
c37804c
feat: add helper link controller
DeboraSerra Oct 30, 2024
d7fab6b
feat: add helper link routes
DeboraSerra Oct 30, 2024
4d1011a
fix: minor changes to make helper-link work
DeboraSerra Oct 30, 2024
7b7e048
feat: add helper link services in front end
DeboraSerra Oct 30, 2024
bd9ee2b
fix: copy popup controller from developer
DeboraSerra Oct 30, 2024
4b41acd
Merge pull request #330 from aryanp-86/develop
erenfn Oct 30, 2024
f0a0a73
Merge pull request #329 from bluewave-labs/erenfn-patch-4
erenfn Oct 30, 2024
f37bc30
reviewed changes
d02ev Oct 30, 2024
8b9ba2f
Merge branch 'develop' of github.com:bluewave-labs/bluewave-onboardin…
DeboraSerra Oct 30, 2024
6db8d3c
reafactors
d02ev Oct 30, 2024
0520365
updated email validation regex
d02ev Oct 30, 2024
c964473
chore: update front to use new back logic
DeboraSerra Oct 30, 2024
35ee1da
Merge pull request #327 from d02ev/d02ev/issue#303
erenfn Oct 30, 2024
807762e
feat: add appearance feature
DeboraSerra Oct 30, 2024
5f82741
feat: add delete helper
DeboraSerra Oct 30, 2024
1f49356
Added watch functional for the docker compose run
uparkalau Oct 31, 2024
b2fea67
added role based access to CRUD ops on banners, hints and popups
d02ev Oct 31, 2024
3cec13e
Merge branch 'develop' of github.com:bluewave-labs/bluewave-onboardin…
DeboraSerra Nov 2, 2024
e3b8993
feat: add context api to links page
DeboraSerra Nov 2, 2024
1141806
added conditional rendering on FE and admin accessguard on CUD on BE
d02ev Nov 2, 2024
236922e
coderabbit refactorings
d02ev Nov 2, 2024
142e421
fix: make last alterations work
DeboraSerra Nov 2, 2024
ae2dd34
chore: trying to make dragging work
DeboraSerra Nov 2, 2024
72f3200
Merge pull request #337 from d02ev/d02ev/issue#301
erenfn Nov 4, 2024
ab9aa45
chore: change links route
DeboraSerra Nov 4, 2024
592030a
chore: change helper links route
DeboraSerra Nov 4, 2024
a1aaaf7
chore: change popup render logic
DeboraSerra Nov 4, 2024
fae5abf
Merge branch 'develop' of github.com:bluewave-labs/bluewave-onboardin…
DeboraSerra Nov 4, 2024
64c4e8e
chore: change helper links route
DeboraSerra Nov 4, 2024
934f5da
Merge branch 'fix-file-helper' into 302-implement-create-helper-link-…
DeboraSerra Nov 4, 2024
eb46b9a
fix: change constants file back
DeboraSerra Nov 4, 2024
83948d4
feat: make drag work
DeboraSerra Nov 5, 2024
7b25c15
api key page done
erenfn Nov 5, 2024
9a81885
chore: change key from title to id
DeboraSerra Nov 5, 2024
1ff7a5f
revert docker compose
erenfn Nov 5, 2024
c4ae2f3
team count refactor
erenfn Nov 5, 2024
008cd88
feat: add click outside and enter functions to settings
DeboraSerra Nov 5, 2024
a644a70
refactor: refactor save helper link faction
DeboraSerra Nov 5, 2024
64b46f2
test: start creating test cases
DeboraSerra Nov 6, 2024
d39f82b
test: add more test cases
DeboraSerra Nov 6, 2024
09b9fb6
test: add preview title test
DeboraSerra Nov 6, 2024
ae60db7
test: add test to header color
DeboraSerra Nov 6, 2024
1560e9d
test: add test to icon color
DeboraSerra Nov 6, 2024
222b317
test: add test to link target
DeboraSerra Nov 6, 2024
183f061
test: finish adding test cases
DeboraSerra Nov 7, 2024
4faaf8c
chore: reorganize the test
DeboraSerra Nov 7, 2024
86df10a
test: change snapshot test
DeboraSerra Nov 7, 2024
d6d37c0
fix: undo CONTRIBUTING.md change
DeboraSerra Nov 7, 2024
fce60ad
refactor: refactor front end with coderabbit suggestions
DeboraSerra Nov 7, 2024
2d0dbd4
fix: fix tests:
DeboraSerra Nov 7, 2024
4a4209f
refactor: refactor back end with coderabbit suggestions
DeboraSerra Nov 8, 2024
267ddd0
coderabbit changes
erenfn Nov 8, 2024
53f055a
revert docker compose
erenfn Nov 8, 2024
a7262a0
add support link
erenfn Nov 8, 2024
7d9f962
selected user bug fixed
erenfn Nov 8, 2024
cc96d75
remove console log
erenfn Nov 8, 2024
7a91662
refactor: change code to use transactions
DeboraSerra Nov 8, 2024
b4bff3e
fix: remove click outside settings
DeboraSerra Nov 8, 2024
94286b4
chore: change link preview from components to products
DeboraSerra Nov 8, 2024
7c551fc
fix: fix bug created on previous commit
DeboraSerra Nov 8, 2024
6c382a8
chore: improve error handling on helper service
DeboraSerra Nov 8, 2024
8b3f131
fix: fix url validation
DeboraSerra Nov 9, 2024
f48a53a
fix: change text validation
DeboraSerra Nov 9, 2024
1f30b0f
feat: add focus to header title input
DeboraSerra Nov 9, 2024
1c4459d
chore: add migrations
DeboraSerra Nov 9, 2024
7879dc8
feat: add focus to link title input
DeboraSerra Nov 9, 2024
8f18d2d
chore: roll back click outside and fix function
DeboraSerra Nov 9, 2024
9e8dfb7
Merge pull request #340 from bluewave-labs/331-fe-code-snippet
erenfn Nov 11, 2024
a8b619f
feat: Adding a utility function to make settings rbac
aryanp-86 Nov 11, 2024
5d18d92
chore: add coderabbit validation
DeboraSerra Nov 11, 2024
a75b4f4
Merge branch 'develop' of github.com:bluewave-labs/bluewave-onboardin…
DeboraSerra Nov 11, 2024
05317b0
chore: refactor code with coderabbit suggestions
DeboraSerra Nov 11, 2024
199e99f
chore: refactor code with coderabbit suggestions
DeboraSerra Nov 11, 2024
6260337
chore: add toast emmiter msg builder to helper link
DeboraSerra Nov 12, 2024
c90e889
Auth validations - frontend and backend
eulerbutcooler Nov 12, 2024
560fbd1
undid some comments
eulerbutcooler Nov 12, 2024
be2c17d
watch fixes
erenfn Nov 13, 2024
63ba5b4
Merge branch 'develop' into 333-add-watch-capability-to-docker
erenfn Nov 13, 2024
a2a9346
Update docker-compose.yml
erenfn Nov 13, 2024
74dc281
node env fix
erenfn Nov 13, 2024
6dd495d
ignore fixes
erenfn Nov 13, 2024
5cd35db
Merge pull request #335 from bluewave-labs/333-add-watch-capability-t…
erenfn Nov 13, 2024
7907926
chore: change helperLink validation
DeboraSerra Nov 13, 2024
dfcc8ce
chore: add coderabbit suggestion
DeboraSerra Nov 13, 2024
689469c
chore: remove link content reloading
DeboraSerra Nov 13, 2024
2c5626c
Merge branch 'develop' of https://github.com/bluewave-labs/bluewave-o…
eulerbutcooler Nov 13, 2024
224bf9a
Refactored the utility function
aryanp-86 Nov 13, 2024
06dd91d
Update docker-compose.yml
erenfn Nov 13, 2024
fa4672e
fix: fix url validation
DeboraSerra Nov 13, 2024
aa3c618
chore: add coderabbit suggestions
DeboraSerra Nov 13, 2024
8cb0cb1
Fixed onBlur validation checks
eulerbutcooler Nov 13, 2024
df9cef8
Merge branch 'develop' of https://github.com/bluewave-labs/bluewave-o…
eulerbutcooler Nov 13, 2024
eab6ee1
fix: change relative url regex
DeboraSerra Nov 13, 2024
0275561
Merge pull request #342 from bluewave-labs/302-implement-create-helpe…
DeboraSerra Nov 13, 2024
df341bd
Update ToastItem.jsx
erenfn Nov 13, 2024
3cac009
Update constants.js
erenfn Nov 13, 2024
4841dcc
Merge branch 'develop' of https://github.com/bluewave-labs/bluewave-o…
eulerbutcooler Nov 14, 2024
662fad0
Enhanced login page with sign-up link, improved validation for name a…
eulerbutcooler Nov 14, 2024
d1266fc
Merge branch 'bluewave-labs:develop' into develop
aryanp-86 Nov 14, 2024
80ecbd9
Refactored teamtab and settings to ensure consistency
aryanp-86 Nov 14, 2024
d5654d7
Added suggested edits
eulerbutcooler Nov 14, 2024
4413476
undid a comment
eulerbutcooler Nov 14, 2024
b5ac2e0
more edits
eulerbutcooler Nov 14, 2024
999a88d
Added reducer functionality for tab change
aryanp-86 Nov 15, 2024
4a75d78
Removed tabValue from authProvider
aryanp-86 Nov 15, 2024
b9875b3
refactored teams page
erenfn Nov 15, 2024
51fa6a8
coderabbit
erenfn Nov 15, 2024
c9f163b
Merge pull request #1 from bluewave-labs/teams-page-refactored
aryanp-86 Nov 15, 2024
632c76b
Merge pull request #344 from aryanp-86/develop
erenfn Nov 15, 2024
8e8c118
team tab refactor
erenfn Nov 15, 2024
3b14fe3
Merge pull request #348 from bluewave-labs/teams-page-refactored
erenfn Nov 15, 2024
5830b7d
updated the auth tests and made minor changes to name regex
eulerbutcooler Nov 16, 2024
cbbc723
Merge pull request #346 from eulerbutcooler/auth-validations
erenfn Nov 16, 2024
a3809b8
admin register routes
erenfn Nov 16, 2024
dd74ba0
Update docker-compose.yml
erenfn Nov 16, 2024
d46ed29
Merge pull request #349 from bluewave-labs/339-admin-login
erenfn Nov 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
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
color: var(--main-text-color);
font-weight: 600;
margin-bottom: 15px;
font-size: 16px;
font-size: var(--font-header);
}

.list{
@@ -24,7 +24,7 @@
.listText{
color: var(--main-text-color);
font-weight: 400;
font-size: 13px;
font-size: var(--font-regular);
margin-bottom: 10px;
list-style-type: none;
}
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
color: var(--main-text-color);
box-shadow: 0px 1px 2px 0px #1018280D;
cursor: pointer;
font-size: 13px;
font-size: var(--font-regular);
background-color: #fff;
}

2 changes: 1 addition & 1 deletion frontend/src/components/Checkbox/CheckboxStyles.css
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
outline: none;
}
.checkbox-label {
font-size: 16px;
font-size: var(--font-header);
}

.primary .MuiCheckbox-root {
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
}

input {
font-size: 13px;
font-size: var(--font-regular);
height: 34px;
padding-top: 0;
padding-bottom: 0;
4 changes: 2 additions & 2 deletions frontend/src/components/DropdownList/DropdownList.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.select {
width: 241px;
height: 34px;
font-size: 13px !important;
font-size: var(--font-regular) !important;
border-radius: 8px !important;
}

@@ -10,7 +10,7 @@
}

.menuItem {
font-size: 13px !important;
font-size: var(--font-regular) !important;
}

.MuiMenuItem-root.Mui-selected {
2 changes: 1 addition & 1 deletion frontend/src/components/DropdownMenu/DropdownMenu.css
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@

.dropdown-item .MuiTypography-root{
width: 100%;
font-size: 13px;
font-size: var(--font-regular);
font-weight: 400;
line-height: 24px;
color: var(--main-text-color);
4 changes: 2 additions & 2 deletions frontend/src/components/Header/Header.css
Original file line number Diff line number Diff line change
@@ -26,15 +26,15 @@
}

.user-name{
font-size: 13px;
font-size: var(--font-regular);
font-weight: 600;
line-height: 20px;
color: var(--main-text-color);
}

.user-role {
margin: 0;
font-size: 13px;
font-size: var(--font-regular);
font-weight: 400;
line-height: 20px;
color: var(--main-text-color);
2 changes: 1 addition & 1 deletion frontend/src/components/HeadingTabs/TabStyles.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.MuiTab-root {
font-family: 'Inter', sans-serif;
font-size: 13px;
font-size: var(--font-regular);
font-style: normal;
font-weight: 400;
line-height: 20px;
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
margin-top: 1.5rem;
margin-bottom: 0.5rem;
font-weight: 400;
font-size: 13px;
font-size: var(--font-regular);
}

.hint-appearance-color {
Original file line number Diff line number Diff line change
@@ -9,6 +9,6 @@

.hint-label {
font-weight: 400;
font-size: 13px;
font-size: var(--font-regular);
margin-top: 1.5rem;
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.date{
font-family: Inter;
font-size: 13px;
font-size: var(--font-regular);
font-weight: 400;
line-height: 24px;
text-align: left;
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@


.metricName {
font-size: 16px;
font-size: var(--font-header);
font-weight: 600;
line-height: 24px;
margin-bottom: 13px;
@@ -26,7 +26,7 @@
}

.changeRate {
font-size: 13px;
font-size: var(--font-regular);
font-weight: 400;
line-height: 20px;
color: var(--third-text-color);
4 changes: 2 additions & 2 deletions frontend/src/components/LeftMenu/LeftMenu.css
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
}

.title .MuiTypography-root {
font-size: 11px;
font-size: var(--font-informative);
font-weight: 400;
line-height: 38px;
color: #98A2B3;
@@ -32,7 +32,7 @@

.menu-item .MuiTypography-root {
width: 100%;
font-size: 13px;
font-size: var(--font-regular);
font-weight: 400;
line-height: 24px;
color: var(--main-text-color);
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
border-radius: 5px;
padding: 2rem;
font-size: 13px;
font-size: var(--font-regular);
color: var(--third-text-color);
font-weight: 400;

h3 {
font-size: 16px;
font-size: var(--font-header);
font-weight: 600;
}
}
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
border-radius: 5px;
padding: 1.5rem 3rem;
box-sizing: content-box;
font-size: 13px;
font-size: var(--font-regular);
width: 350px;
color: var(--third-text-color);

Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
border-radius: 5px;
padding: 1.5rem 3rem;
box-sizing: content-box;
font-size: 13px;
font-size: var(--font-regular);
width: 350px;
color: var(--third-text-color);
}
2 changes: 1 addition & 1 deletion frontend/src/components/RichTextEditor/RichTextEditor.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.editor-container {
border: 1px solid var(--light-border-color);
color: var(--main-text-color);
font-size: 13px;
font-size: var(--font-regular);
border-radius: 8px;
padding-top: 1rem;
margin-top: 1rem;
2 changes: 1 addition & 1 deletion frontend/src/components/RichTextEditor/Tabs/EditorTabs.css
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

.tab{
text-transform: none !important;
font-size: 13px!important;
font-size: var(--font-regular)!important;
font-weight: 400!important;
line-height: 20px!important;
padding: 0 !important;
2 changes: 1 addition & 1 deletion frontend/src/components/Settings/Settings.module.scss
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
.smallText {
font-weight: 400;
line-height: 20px;
font-size: 11px;
font-size: var(--font-informative);
color: var(--second-text-color);
margin-bottom: 20px;
}
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
}

.textField .MuiOutlinedInput-root {
font-size: 13px;
font-size: var(--font-regular);
box-shadow: 0px 1px 2px 0px #1018280d;
}

@@ -26,12 +26,12 @@
}

.textField .MuiButton-root {
font-size: 13px;
font-size: var(--font-regular);
color: var(--second-text-color);
}

.MuiBox-root .MuiInputLabel-root {
font-size: 13px;
font-size: var(--font-regular);
color: var(--second-text-color);
}

2 changes: 1 addition & 1 deletion frontend/src/components/Toast/Toast.module.scss
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
.toast {
background-color: white;
border: 1px solid var(--light-border-color);
font-size: 13px;
font-size: var(--font-regular);
line-height: 20px;
color: var(--third-text-color);
padding: 16px;
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@

.list-item-info h4 {
margin: 0;
font-size: 16px;
font-size: var(--font-header);
color: var(--main-text-color);
}

Original file line number Diff line number Diff line change
@@ -18,15 +18,15 @@
}

.user-name {
font-size: 13px;
font-size: var(--font-regular);
font-weight: 600;
line-height: 20px;
color: var(--main-text-color);
}

.user-role {
margin: 0;
font-size: 13px;
font-size: var(--font-regular);
font-weight: 400;
line-height: 20px;
color: var(--main-text-color);
2 changes: 1 addition & 1 deletion frontend/src/products/Popup/PopupComponent.module.css
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
.popupContent {
padding: 20px 25px;
color: var(--second-text-color);
font-size: 13px;
font-size: var(--font-regular);
}

.centered {
2 changes: 1 addition & 1 deletion frontend/src/scenes/dashboard/Dashboard.module.scss
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
}

.text {
font-size: 16px;
font-size: var(--font-header);
font-weight: 400;
line-height: 38px;
color: #344054;
4 changes: 2 additions & 2 deletions frontend/src/scenes/errors/Error.module.scss
Original file line number Diff line number Diff line change
@@ -17,12 +17,12 @@
.infoHeader {
font-weight: 600;
color: var(--main-text-color);
font-size: 16px;
font-size: var(--font-header);
line-height: 30px;
}

.infoText {
font-size: 13px;
font-size: var(--font-regular);
font-weight: 400;
line-height: 23px;
}
20 changes: 10 additions & 10 deletions frontend/src/scenes/login/Login.module.css
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@
.form-group label {
display: block;
margin-bottom: 5px;
font-size: 13px;
font-size: var(--font-regular);
color: var(--main-text-color);
font-weight: 500;
}
@@ -50,7 +50,7 @@
padding: 8px 12px;
border: 1px solid #D0D5DD;
border-radius: 8px;
font-size: 13px;
font-size: var(--font-regular);
box-sizing: border-box;
color: var(--second-text-color);

@@ -61,7 +61,7 @@

.form-group input[type="checkbox"],
.form-group a {
font-size: 13px;
font-size: var(--font-regular);
color: var(--main-purple);
text-decoration: none;
font-weight: bold;
@@ -78,13 +78,13 @@
border-radius: 8px;
color: #fff;
cursor: pointer;
font-size: 13px;
font-size: var(--font-regular);
background-color: var(--main-purple);
}

.sign-up-link {
text-align: center;
font-size: 13px;
font-size: var(--font-regular);
font-weight: 450;
color: var(--second-text-color);
}
@@ -100,14 +100,14 @@
letter-spacing: 1px;
margin-bottom: 30px;
margin-top: 20px;
font-size: 16px;
font-size: var(--font-header);
font-weight: 600;
line-height: 38px;
}

/* For Create an Account Page */
.password-constraints {
font-size: 13px;
font-size: var(--font-regular);
display: flex;
align-items: center;
color: var(--second-text-color);
@@ -131,14 +131,14 @@
color: var(--second-text-color);
text-align: center;
margin-bottom: 30px;
font-size: 13px;
font-size: var(--font-regular);
font-weight: 400;
line-height: 24px;
}

.error-message {
color: #D92D20;
font-size: 13px;
font-size: var(--font-regular);
font-weight: 400;
margin-bottom: 1rem;
margin-top: 0.25rem;
@@ -148,7 +148,7 @@
padding: 10px;
color: var(--second-text-color);
cursor: pointer;
font-size: 13px;
font-size: var(--font-regular);
background-color: transparent;
border: none;
outline: none;
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
}

.label {
font-size: 13px;
font-size: var(--font-regular);
font-weight: 700;
line-height: 20px;
text-align: left;
4 changes: 2 additions & 2 deletions frontend/src/scenes/settings/ProfileTab/ProfileTab.module.css
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@
}

.label {
font-size: 13px;
font-size: var(--font-regular);
font-weight: 700;
line-height: 20px;
text-align: left;
@@ -48,7 +48,7 @@
.supportText {
margin: 0;
color: var(--second-text-color);
font-size: 13px;
font-size: var(--font-regular);
font-weight: 400;
line-height: 20px;
margin-top: 6px;
2 changes: 1 addition & 1 deletion frontend/src/scenes/settings/Settings.module.css
Original file line number Diff line number Diff line change
@@ -5,5 +5,5 @@
margin: 30px 30px;
}
.tabLabel{
font-size: 13px !important;
font-size: var(--font-regular) !important;
}
4 changes: 2 additions & 2 deletions frontend/src/scenes/settings/TeamTab/TeamTab.module.css
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
display: flex;
align-items: center;
gap: 0.6rem;
font-size: 13px;
font-size: var(--font-regular);
}

.team {
@@ -35,7 +35,7 @@
}

h6 {
font-size: 13px;
font-size: var(--font-regular);
font-weight: 600;
}

Original file line number Diff line number Diff line change
@@ -10,10 +10,10 @@
.nameCol {
display: flex !important;
flex-direction: column;
font-size: 13px ;
font-size: var(--font-regular) ;
}

.data {
font-size: 13px ;
font-size: var(--font-regular) ;
color: var(--second-text-color) !important;
}
8 changes: 4 additions & 4 deletions frontend/src/styles/globals.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
@import url(variables.css);

$base-font-size: 16px;
$base-font-size: var(--font-header);

@mixin text-style($type, $font-weight: regular) {
color: var(--main-text-color);
@if $type == header-text {
font-size: 16px;
font-size: var(--font-header);
line-height: 24px;
} @else if $type == informative {
font-size: 11px;
font-size: var(--font-informative);
line-height: 11px;
} @else {
font-size: 13px;
font-size: var(--font-regular);
line-height: 13px;
}

126 changes: 65 additions & 61 deletions frontend/src/styles/variables.css
Original file line number Diff line number Diff line change
@@ -1,62 +1,66 @@
:root {
--main-text-color: #344054;
--second-text-color: #667085;
--third-text-color: #475467;
--main-purple: #7f56d9;
--light-purple: #f3e5f5;
--light-gray: #EAECF0;
--light-border-color: #D0D5DD;
--border-error-solid: #D92D20;
--checkIcon-green: #079455;
--background-color: #fcfcfd;
--dark-purple: #6941C6;
--light-purple-background: #F9F5FF;
--grey-border: #EBEBEB;
--shadow-one: #10182808;
--shadow-two: #10182814;
--header-background: #F8F9F8;

/* Additional colors */
--primary-color: #6200ea;
--secondary-color: #03dac6;
--error-color: #b00020;
--warning-color: #ff9800;
--info-color: #2196f3;
--success-color: #4caf50;
--light-background: #ffffff;
--dark-background: #121212;
--light-surface: #f5f5f5;
--dark-surface: #1e1e1e;

/* Custom label tag component */
--label-orange-bg: #fff3e0;
--label-orange-color: #ef6c00;
--label-orange-border: #ef6c00;
--label-green-bg: #e8f5e9;
--label-green-border: #a5d6a7;
--label-new-dot: #ff9800;
}

/* Dark mode overrides */
body[data-theme='dark'] {
--main-text-color: #FFFFFF;
--second-text-color: #B0B0B0;
--third-text-color: #A0A0A0;
--background-color: #121212;
--header-background: #1F1F1F;
--main-purple: #bb86fc;
--light-purple: #3a3a3a;
--light-gray: #2c2c2c;
--light-border-color: #444444;
--primary-color: #bb86fc;
--secondary-color: #03dac6;
--error-color: #cf6679;
--warning-color: #ffb74d;
--info-color: #64b5f6;
--success-color: #81c784;
--light-background: #1e1e1e;
--dark-background: #121212;
--light-surface: #2c2c2c;
--dark-surface: #1e1e1e;
}


/* fonts */
--font-header: 16px;
--font-regular: 13px;
--font-informative: 11px;
--main-text-color: #344054;
--second-text-color: #667085;
--third-text-color: #475467;
--main-purple: #7f56d9;
--light-purple: #f3e5f5;
--light-gray: #EAECF0;
--light-border-color: #D0D5DD;
--border-error-solid: #D92D20;
--checkIcon-green: #079455;
--background-color: #fcfcfd;
--dark-purple: #6941C6;
--light-purple-background: #F9F5FF;
--grey-border: #EBEBEB;
--shadow-one: #10182808;
--shadow-two: #10182814;
--header-background: #F8F9F8;

/* Additional colors */
--primary-color: #6200ea;
--secondary-color: #03dac6;
--error-color: #b00020;
--warning-color: #ff9800;
--info-color: #2196f3;
--success-color: #4caf50;
--light-background: #ffffff;
--dark-background: #121212;
--light-surface: #f5f5f5;
--dark-surface: #1e1e1e;

/* Custom label tag component */
--label-orange-bg: #fff3e0;
--label-orange-color: #ef6c00;
--label-orange-border: #ef6c00;
--label-green-bg: #e8f5e9;
--label-green-border: #a5d6a7;
--label-new-dot: #ff9800;
}

/* Dark mode overrides */
body[data-theme='dark'] {
--main-text-color: #FFFFFF;
--second-text-color: #B0B0B0;
--third-text-color: #A0A0A0;
--background-color: #121212;
--header-background: #1F1F1F;
--main-purple: #bb86fc;
--light-purple: #3a3a3a;
--light-gray: #2c2c2c;
--light-border-color: #444444;
--primary-color: #bb86fc;
--secondary-color: #03dac6;
--error-color: #cf6679;
--warning-color: #ffb74d;
--info-color: #64b5f6;
--success-color: #81c784;
--light-background: #1e1e1e;
--dark-background: #121212;
--light-surface: #2c2c2c;
--dark-surface: #1e1e1e;
}
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@
.tour-info-container p {
margin-bottom: 0;
color: #6b7280;
font-size: 13px;
font-size: var(--font-regular);
font-weight: 400;
line-height: 20px;
text-align: left;