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.

Sign up for GitHub

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

Updated package.json - including sass and sass-loader #134

Merged
merged 1 commit into from
Jan 30, 2025
Merged

Updated package.json - including sass and sass-loader #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5,438 changes: 3,324 additions & 2,114 deletions frontend/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"lint:style": "stylelint --fix -f verbose src/**/*.scss",
"lint:fix": "npm run lint:code -- --fix && npm run lint:style -- --fix",
"start:local": "cross-env API_URL=http://localhost/ npm run start",
"prepare": "cd .. && husky install qualibrate_frontend_ui/.husky",
"prepare": "cd .. && husky frontend/.husky",
"format": "prettier --write src public package.json"
},
"pre-commit": [
Expand Down Expand Up @@ -49,13 +49,12 @@
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "4.6.0",
"express": "^4.19.2",
"husky": "^9.0.11",
"husky": "^9.1.7",
"jsonpath": "^1.1.1",
"npm-run-all": "4.1.5",
"pre-commit": "1.2.2",
"prettier": "^3.2.5",
"sass": "^1.77.2",
"sass-loader": "^14.2.1",
"sass": "^1.83.4",
"sass-loader": "^16.0.4",
"stylelint": "^16.6.0",
"stylelint-config-standard": "^36.0.0",
"stylelint-prettier": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/assets/styles/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
flex-direction: column;
height: 100%;

@include colGap(10px);
@include base.colGap(10px);

box-sizing: border-box;
background-color: var(--background-color);
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/assets/styles/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "base";
@use "base";

/* latin-ext */
@font-face {
Expand Down Expand Up @@ -150,7 +150,7 @@
html,
body,
div#root {
@include fullPage;
@include base.fullPage;

font-family: var(--font-family), serif;
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/common/ui-components/buttons/styles/ButtonWrapper.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../../../assets/styles/variables.scss";
@import "../../../../assets/styles/_base.scss";
@use "../../../../assets/styles/variables.scss";
@use "../../../../assets/styles/_base.scss";

.button {
font-size: 1em;
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/common/ui-components/common/Input/Input.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../../../assets/styles/_base";
@use "../../../../assets/styles/_base";

.inputWrapper {
position: relative;
Expand All @@ -23,7 +23,7 @@
}

.input {
@include input;
@include base.input;

&.error {
border: 1px solid rgb(255 36 99 / 30%);
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/common/ui-components/common/styles/LogWrapper.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../../assets/styles/_base.scss";
@use "../../../../assets/styles/_base.scss";

.wrapper {
flex: 1;
Expand All @@ -12,7 +12,7 @@
flex-direction: column;
font-family: monospace;

@include yScroll();
@include base.yScroll();

white-space: pre-wrap;

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/modules/Data/Data.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../assets/styles/variables";
@import "../../assets/styles/base";
@use "../../assets/styles/variables";
@use "../../assets/styles/base";

.wrapper {
height: 100%;
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/modules/GraphLibrary/GraphLibrary.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../assets/styles/variables";
@import "../../assets/styles/base";
@use "../../assets/styles/variables";
@use "../../assets/styles/base";

.wrapper {
height: 100%;
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/modules/GraphLibrary/components/CytoscapeGraph/CytoscapeGraph.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../../../assets/styles/variables";
@import "../../../../assets/styles/base";
@use "../../../../assets/styles/variables";
@use "../../../../assets/styles/base";

.wrapper {
min-height: 20%;
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/modules/GraphLibrary/components/GraphStatus/GraphStatus.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../../../assets/styles/variables";
@import "../../../../assets/styles/base";
@use "../../../../assets/styles/variables";
@use "../../../../assets/styles/base";

.wrapper {
height: 100%;
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/modules/Login/Login.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../assets/styles/variables";
@import "../../assets/styles/base";
@use "../../assets/styles/variables";
@use "../../assets/styles/base";

.content {
display: grid;
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/modules/Nodes/NodesPage.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../assets/styles/variables";
@import "../../assets/styles/base";
@use "../../assets/styles/variables";
@use "../../assets/styles/base";

.wrapper {
height: 100%;
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/modules/Nodes/components/Results/Results.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../../../assets/styles/variables";
@import "../../../../assets/styles/base";
@use "../../../../assets/styles/variables";
@use "../../../../assets/styles/base";

.wrapper {
height: 100%;
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/modules/Nodes/components/RunningJob/RunningJob.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../../../assets/styles/variables";
@import "../../../../assets/styles/base";
@use "../../../../assets/styles/variables";
@use "../../../../assets/styles/base";

.wrapper {
display: flex;
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/modules/Nodes/components/StateUpdates/StateUpdates.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../../../assets/styles/variables";
@import "../../../../assets/styles/base";
@use "../../../../assets/styles/variables";
@use "../../../../assets/styles/base";

.wrapper {
display: flex;
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/modules/SidebarMenu/styles/MenuItem.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../../assets/styles/variables.scss";
@import "../../../assets/styles/_base.scss";
@use "../../../assets/styles/variables.scss";
@use "../../../assets/styles/_base.scss";

.itemWrapper {
display: flex;
Expand All @@ -9,7 +9,7 @@
width: 100%;
box-sizing: border-box;
white-space: pre;
padding-left: $sidebar_padding !important;
padding-left: variables.$sidebar_padding !important;
border-right: 2px solid transparent;
font-size: 18px;
color: var(--menu-text-color);
Expand Down
18 changes: 9 additions & 9 deletions frontend/src/modules/SidebarMenu/styles/SidebarMenu.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
@import "../../../assets/styles/variables.scss";
@import "../../../assets/styles/_base.scss";
@use "../../../assets/styles/variables.scss";
@use "../../../assets/styles/_base.scss";

.container {
position: relative;
width: $sidebar_collapsed_width;
width: variables.$sidebar_collapsed_width;
height: 100vh;
}

.sidebarMenu {
position: absolute;
top: 0;
left: 0;
width: $sidebar_collapsed_width;
width: variables.$sidebar_collapsed_width;
height: 100vh;
box-sizing: border-box;
padding-top: $sidebar_padding;
padding-top: variables.$sidebar_padding;
z-index: 10;
display: flex;
flex-direction: column;
Expand All @@ -24,12 +24,12 @@
transition: width ease-in-out 0.3s;

&.opened {
width: $sidebar_full_width;
width: variables.$sidebar_full_width;
}
}

.qualibrateLogo {
padding-left: $sidebar_padding;
padding-left: variables.$sidebar_padding;
height: 50px;
margin-bottom: 50px;

Expand All @@ -39,7 +39,7 @@
}

.menuContent {
@include yScroll();
@include base.yScroll();

flex: 1;
width: 100%;
Expand All @@ -52,7 +52,7 @@
display: flex;
flex-direction: column;

@include colGap(15px);
@include base.colGap(15px);
}

.menuBottomContent {
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/modules/common/Error/ErrorStatusWrapper.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
overflow: scroll;
max-height: 150px;
padding: 20px;
padding-top: 0px;
padding-top: 0;
flex: none;
}

.statusErrorHeaderWrapper {
padding-left: 0px;
padding-left: 0;
padding-top: 10px;
padding-bottom: 5px;
font-weight: bold;
}

.statusErrorRowWrapper {
overflow: scroll;
padding-left: 0px;
padding-left: 0;
}
6 changes: 3 additions & 3 deletions frontend/src/modules/themeModule/ThemeToggle.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../assets/styles/variables";
@import "../../assets/styles/base";
@use "../../assets/styles/variables";
@use "../../assets/styles/base";

.themeToggleContainer {
display: flex;
Expand All @@ -9,7 +9,7 @@
width: 100%;
box-sizing: border-box;
white-space: pre;
padding-left: $sidebar_padding !important;
padding-left: variables.$sidebar_padding !important;
border-right: 2px solid transparent;
font-size: 18px;
color: var(--menu-text-color);
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/ui-lib/components/headers/Header.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../../assets/styles/variables.scss";
@import "../../../assets/styles/_base.scss";
@use "../../../assets/styles/variables.scss";
@use "../../../assets/styles/_base.scss";

.header {
height: 50px;
Expand All @@ -11,7 +11,7 @@

@include rowGap(0.5rem);

font-size: $header_font_size;
font-size: variables.$header_font_size;
font-family: var(--font-family-cond), monospace, serif;

&.withBtmMargin {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/ui-lib/layouts/styles/Layout.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../../assets/styles/variables.scss";
@use "../../../assets/styles/variables.scss";

.wrapper {
display: flex;
Expand Down
Loading