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

Dev #15

Merged
merged 3 commits into from
Aug 20, 2024
Merged

Dev #15

Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions gui/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ yarn.lock
/gerrit

!.env.docker
.env
2 changes: 1 addition & 1 deletion gui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR /app
COPY package*.json ./
COPY .env.docker ./.env

RUN npm install
RUN npm install --include-dev
COPY ./ .
RUN npm run build

Expand Down
13 changes: 7 additions & 6 deletions gui/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "enigma-nebulous",
"name": "nebulous-gui",
"private": true,
"version": "0.0.0",
"version": "1.0.0",
"engines": {
"node": "v20.9.0"
"node": "v20.13.1"
},
"scripts": {
"serve": "vite",
Expand Down Expand Up @@ -52,13 +52,13 @@
"tiny-slider": "^2.9.4",
"tippy.js": "^6.3.7",
"toastify-js": "^1.12.0",
"tom-select": "^2.3.1",
"uuid": "^9.0.1",
"vite-svg-loader": "^5.1.0",
"vue": "^3.3.9",
"vue-draggable-next": "^2.2.1",
"vue-multiselect": "^3.0.0-beta.3",
"vue-router": "^4.1.6",
"xlsx": "^0.18.5",
"vue3-select-component": "^0.5.2",
"zoom-vanilla.js": "^2.0.6"
},
"devDependencies": {
Expand All @@ -76,6 +76,7 @@
"@typescript-eslint/parser": "^6.10.0",
"@vitejs/plugin-vue": "^4.2.3",
"@vue/eslint-config-standard": "^8.0.1",
"add": "^2.0.6",
"autoprefixer": "^10.4.14",
"eslint": "^8.53.0",
"eslint-config-prettier": "^9.0.0",
Expand All @@ -93,6 +94,6 @@
"typescript": "^5.2.2",
"vite": "^4.4.2",
"vue-eslint-parser": "^9.3.2",
"vue-tsc": "^1.8.22"
"vue-tsc": "^2.0.29"
}
}
7 changes: 5 additions & 2 deletions gui/src/assets/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
@import "simplebar/src/simplebar.css";
@import "dropzone/dist/dropzone.css";
@import "tabulator-tables/dist/css/tabulator.css";
@import "tom-select/dist/css/tom-select.css";
@import "zoom-vanilla.js/dist/zoom.css";
@import "toastify-js/src/toastify.css";
@import "highlight.js/styles/github.css";
Expand All @@ -48,6 +47,7 @@
@import "tiny-slider/dist/tiny-slider.css";
@import "leaflet/dist/leaflet.css";
@import "leaflet.markercluster/dist/MarkerCluster.css";
@import "vue-multiselect/dist/vue-multiselect.css";

/*
|--------------------------------------------------------------------------
Expand All @@ -73,9 +73,12 @@
@import "./components/_toastify.css";
@import "./components/_transitions.css";
@import "./components/_zoom-vanilla.css";
@import "./components/_tom-select.css";
@import "./components/_ckeditor.css";
@import "./components/_litepicker.css";
@import "./components/_full-calendar.css";
@import "./components/_tabulator.css";
@import "./components/_vue-multiselect.css";
@import "./components/_main.css";



173 changes: 0 additions & 173 deletions gui/src/assets/css/components/_tom-select.css

This file was deleted.

78 changes: 78 additions & 0 deletions gui/src/assets/css/components/_vue-multiselect.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
.dark{

.multiselect,
.multiselect__input,
.multiselect__single {
font-family: inherit;
font-size: inherit;
}

.multiselect {
color: inherit;
}

.multiselect__content-wrapper {
background: theme('colors.darkmode.700');

}

.multiselect--disabled {
background: theme('colors.darkmode.700');
}

.multiselect__tag{
color:inherit;
background: theme('colors.darkmode.600');
}

.multiselect__tags {
background: theme('colors.darkmode.800');
border-radius: theme('borderRadius.DEFAULT');
font-size:inherit;

}
.multiselect__tag-icon::after {
color: theme('colors.slate.500');
}

.multiselect__tag-icon:focus::after,
.multiselect__tag-icon:hover::after {
color: white;
}

.multiselect__option--highlight {
background:theme('colors.slate.500');
outline: none;
color: white;
}

.multiselect__option--highlight::after {
content: attr(data-select);
background:theme('colors.slate.500');
color: white;
}


.multiselect__option--selected {
background: theme('colors.slate.700');
color: inherit;
font-weight: bold;
}

.multiselect__input::placeholder {
color: theme("colors.slate.500");
}

.multiselect__input,
.multiselect__single{
background: theme('colors.darkmode.700');
}


.multiselect__spinner::before,
.multiselect__spinner::after{
border-color: theme('colors.slate.600') transparent transparent;
}

}

Loading