forked from voxgig/model-vue
-
Notifications
You must be signed in to change notification settings - Fork 0
PQView branch #3
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
Merged
Merged
Changes from 35 commits
Commits
Show all changes
63 commits
Select commit
Hold shift + click to select a range
6d760bc
setting up search v-ComboBox view
Chayma-ab fbd7da8
search is working fine
Chayma-ab f672354
Fixing the search bar & filter intergration
Chayma-ab 2755625
Merge branch 'main' into Desktop__105__107
kierandesmond b4722a2
search bar modifications
Chayma-ab 9bd9607
search bar modifications
Chayma-ab f472753
Merge pull request #2 from plantquest/Desktop__105__107
kierandesmond 0320608
styling the sidebar following the template
Chayma-ab 16d036f
style mdi-magnify icon
Chayma-ab 51a3022
more styling
Chayma-ab 3c7cb45
fixing the clear btn to close the sideCard
Chayma-ab 747c4f1
modify the headbar to the side
Chayma-ab dd4ff10
v0.16.25-ca
kierandesmond df6c19c
Merge pull request #6 from plantquest/Desktop_105_106_107-Nov
kierandesmond 81160b6
Removing test changes
kierandesmond cdcf119
Merge branch 'main' into PQVIEW_develop_merge
kierandesmond 3de459a
fixing bugs
Chayma-ab ce06ae3
Merge branch 'Desktop_105_106_107-Nov' of https://github.com/plantque…
Chayma-ab d3cf944
Merge branch 'Desktop_105_106_107-Nov' into PQVIEW_develop_merge
kierandesmond 259a6cb
removing the footer text
Chayma-ab b93e182
v0.16.40-pqview
kierandesmond 94d697c
v0.16.41-pqview
kierandesmond 86ae38b
Updated Vxg files
kierandesmond 881bb9e
set spacing in search bar
mohitnimavatgh cbc939f
commit changes
Chayma-ab d9347aa
Merge branch 'PQView' of https://github.com/plantquest/model-vue into…
Chayma-ab 231eff8
Merge pull request #9 from plantquest/PQView_165
kierandesmond 16a8483
v0.16.45-pqview
kierandesmond d06f352
Add search bar in Assets Tab
mohitnimavatgh e9c4e37
Remove the search bar from admin portal
mohitnimavatgh 4b9cce0
Works well
kierandesmond 7eca6a6
Merge branch 'PQView' into PQView_184
kierandesmond 857b1b1
Merge pull request #10 from plantquest/PQView_184
kierandesmond dabfb52
Added tweak - still had the title
kierandesmond 52a1e1a
Merge branch 'PQView' into PQView_160
kierandesmond f34b2fc
Merge pull request #11 from plantquest/PQView_160
kierandesmond aaa4caa
remove Admin from sidebar Menu_items and fixing the footer
Chayma-ab 1b3aac6
committing last chages
Chayma-ab 0858cd9
fixing conflicts
Chayma-ab 343b23e
Merge branch 'Desktop_105_106_107-Nov' of https://github.com/plantque…
Chayma-ab ef15246
fixing conflicts
Chayma-ab 987e92d
model-view with two branches
YodaheTG d5e27db
The Button Title In Each of the Admin Portal tabs Appears
mohitnimavatgh 9479a1a
Merge branch 'PQView' into PQView_200
kierandesmond 8702113
Merge pull request #14 from plantquest/PQView_200
kierandesmond 26fb389
v0.16.50-pqview
kierandesmond 0fd447a
v0.16.55-pqview
kierandesmond e4e9b6d
working on navigation bar
Chayma-ab 0df9c65
adding a closing icon for the navigation bar
Chayma-ab 70fbd8f
Merge branch 'Desktop_105_106_107-Nov' into Desktop_105_106_107_Nov-v…
Chayma-ab 7413e82
BasicNAvStages
Chayma-ab d9d9abd
fixing some styling
Chayma-ab ee57f1b
Merge branch 'PQView' into Desktop_105_106_107_Nov-v2_merge_Nov
kierandesmond cec91b9
Merge pull request #15 from plantquest/Desktop_105_106_107_Nov-v2_mer…
kierandesmond 4529804
v0.16.60-pqview
kierandesmond 3e2a760
Added test spec and bumped version
kierandesmond 8722a23
v0.16.65-pqview
kierandesmond 67e6ca6
revers point and the BasicNavStages
Chayma-ab 3948951
before merge
Chayma-ab bc5a7e5
Merge branch 'Desktop_105_106_107_Nov-v2_merge_Nov' into PQView
kierandesmond bde3f63
v0.16.70-pqview
kierandesmond 3d30eb2
v0.16.75-pqview
kierandesmond 8ff70fd
dataPath for pathData
kierandesmond File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,168 @@ | ||
| .vxg-icon{padding:20px}.vxg-app-bar{height:64px;background-color:#fff;margin-left:25px}.vxg-head-btn{height:100%;background-color:#fff!important;color:rgb(var(--vxg-ct0));text-transform:none!important;-webkit-box-shadow:none!important;box-shadow:none!important;margin-left:10px}.vxg-head-btn .v-icon{color:rgb(var(--vxg-ci0))!important}.basic-footer[data-v-edc4307a]{padding:1rem;text-align:center;background-color:#f5f5f5;color:#333}nav.vxg-side,nav.vxg-side .v-sheet{background-color:rgb(var(--vxg-cb1))!important}nav.vxg-side .v-divider{border-color:rgb(var(--vxg-ct2))!important;margin:16px 8px}.btn-style{background-color:#283348!important;width:141px;height:281px;margin:4px!important}.btn-style.selected-btn{background-color:rgb(var(--vxg-cb1))!important}.btn-style.selected-btn,.btn-style.selected-btn .v-icon{color:rgb(var(--vxg-ct1))!important}.vxg-toggle{background-color:rgb(var(--vxg-cb1))!important;padding:10px!important;padding-bottom:10px;padding-top:10px;margin-right:10px}a.vxg-router-link{display:block;margin:0 8px;padding:16px 8px;text-decoration:none!important;color:rgb(var(--vxg-ct1))!important;border-radius:8px}a.vxg-router-link .v-icon{color:rgb(var(--vxg-ct2))!important}a.vxg-router-link.router-link-active{background-color:rgb(var(--vxg-cb2))!important;color:rgb(var(--vxg-ct1))!important}a.vxg-router-link.router-link-active .v-icon{color:rgb(var(--vxg-ct1))!important}.vxg-side-open{width:48px;height:48px}.drawer-toggle{width:48px}.font-size-13{font-size:13px}.vxg-form-field{text-align:right;padding:0 8px 0 0;-webkit-box-sizing:border-box;box-sizing:border-box}div.changes{width:100%;color:rgba(0,0,0,.26)!important;background-color:transparent!important}div.changes table{width:100%;background-color:#fff!important;border-bottom:0;border-left:0;border-right:1px solid rgba(0,0,0,.26);border-top:1px solid rgba(0,0,0,.26)}div.changes td,div.changes th{background-color:#fff!important;border-right:0;border-top:0;border-left:1px solid rgba(0,0,0,.26);border-bottom:1px solid rgba(0,0,0,.26);padding:4px} | ||
| .vxg-icon { | ||
| padding: 20px; | ||
| } | ||
| .vxg-app-bar { | ||
| height: 64px; | ||
| background-color: white; | ||
| margin-left: 25px; | ||
| } | ||
| .vxg-head-btn { | ||
| height: 100%; | ||
| background-color: white !important; | ||
| color: rgb(var(--vxg-ct0)); | ||
| text-transform: none !important; | ||
| -webkit-box-shadow: none !important; | ||
| box-shadow: none !important; | ||
| margin-left: 10px; | ||
| } | ||
| .vxg-head-btn .v-icon { | ||
| color: rgb(var(--vxg-ci0)) !important; | ||
| } | ||
| .basic-footer[data-v-d93f7088] { | ||
| padding: 1rem; | ||
| text-align: center; | ||
| background-color: #f5f5f5; | ||
| color: #333; | ||
| } | ||
| .v-navigation-drawer { | ||
| background: #141B2D; | ||
| } | ||
| .v-navigation-drawer__content { | ||
| overflow-y: hidden; | ||
| } | ||
| nav.vxg-side { | ||
| background-color: #141B2D !important; | ||
| } | ||
| nav.vxg-side .v-sheet { | ||
| background-color: #141B2D !important; | ||
| } | ||
| nav.vxg-side .v-divider { | ||
| border-color: rgb(var(--vxg-ct2)) !important; | ||
| margin: 16px 8px; | ||
| height: 22px; | ||
| } | ||
| .btn-style { | ||
| background-color: #283348 !important; | ||
| width: 141px; | ||
| height: 281px; | ||
| margin: 4px !important; | ||
| } | ||
| .btn-style.selected-btn { | ||
| background-color: rgb(var(--vxg-cb1)) !important; | ||
| color: rgb(var(--vxg-ct1)) !important; | ||
| } | ||
| .btn-style.selected-btn .v-icon { | ||
| color: rgb(var(--vxg-ct1)) !important; | ||
| } | ||
| .vxg-toggle { | ||
| background-color: rgb(var(--vxg-cb1)) !important; | ||
| padding: 10px !important; | ||
| padding-bottom: 10px; | ||
| padding-top: 10px; | ||
| margin-right: 10px; | ||
| } | ||
| a.vxg-router-link { | ||
| display: block; | ||
| margin: 0px 8px; | ||
| padding: 16px 8px; | ||
| text-decoration: none !important; | ||
| color: rgb(var(--vxg-ct1)) !important; | ||
| border-radius: 8px; | ||
| } | ||
| a.vxg-router-link .v-icon { | ||
| color: rgb(var(--vxg-ct2)) !important; | ||
| } | ||
| a.vxg-router-link.router-link-active { | ||
| background-color: rgb(var(--vxg-cb2)) !important; | ||
| color: rgb(var(--vxg-ct1)) !important; | ||
| } | ||
| a.vxg-router-link.router-link-active .v-icon { | ||
| color: rgb(var(--vxg-ct1)) !important; | ||
| } | ||
| .vxg-side-open { | ||
| width: 48px; | ||
| height: 48px; | ||
| } | ||
| .drawer-toggle { | ||
| width: 48px; | ||
| } | ||
| .magnifierIcon { | ||
| margin: 3px 0 0 40px; | ||
| font-size: large; | ||
| color: #141b2d; | ||
| } | ||
| img.clip-path-group { | ||
| width: 20px; | ||
| } | ||
| img.Layer_5 { | ||
| width: 20px; | ||
| } | ||
| img.catppuccin-search { | ||
| width: 20px; | ||
| } | ||
| .font-size-13 { | ||
| font-size: 13px; | ||
| } | ||
| .searchIcons hr { | ||
| margin: 0 5px !important; | ||
| } | ||
| .searchIcons svg { | ||
| width: 20px; | ||
| height: 20px; | ||
| } | ||
| .v-input__control { | ||
| background: white; | ||
| margin-top: auto; | ||
| margin-left: 4px; | ||
| margin-right: 4px; | ||
| } | ||
| .comboxSearch .v-select__slot { | ||
| margin-left: 25px; | ||
| margin-bottom: 4px; | ||
| } | ||
| .comboxSearch .v-input__slot { | ||
| width: calc(100% - 30px); | ||
| } | ||
| .comboxSearch fieldset { | ||
| border: none !important; | ||
| } | ||
| .catppuccin-search { | ||
| width: 24px; | ||
| /* Adjust size as needed */ | ||
| height: 24px; | ||
| /* Adjust size as needed */ | ||
| } | ||
| .comboxSearch .v-input__icon { | ||
| position: absolute; | ||
| margin-left: 187px; | ||
| } | ||
| .v-text-field { | ||
| padding: 0 34px; | ||
| } | ||
| .vxg-form-field { | ||
| text-align: right; | ||
| padding: 0px 8px 0px 0px; | ||
| -webkit-box-sizing: border-box; | ||
| box-sizing: border-box; | ||
| } | ||
| div.changes { | ||
| width: 100%; | ||
| color: rgba(0, 0, 0, 0.26) !important; | ||
| background-color: rgba(0, 0, 0, 0) !important; | ||
| } | ||
| div.changes table { | ||
| width: 100%; | ||
| background-color: #FFF !important; | ||
| border-bottom: 0px; | ||
| border-left: 0px; | ||
| border-right: 1px solid rgba(0, 0, 0, 0.26); | ||
| border-top: 1px solid rgba(0, 0, 0, 0.26); | ||
| } | ||
| div.changes th, div.changes td { | ||
| background-color: #FFF !important; | ||
| border-right: 0px; | ||
| border-top: 0px; | ||
| border-left: 1px solid rgba(0, 0, 0, 0.26); | ||
| border-bottom: 1px solid rgba(0, 0, 0, 0.26); | ||
| padding: 4px; | ||
| } |
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My fellow developers, let me express my concerns about this version number.
Let me be clear: while I appreciate the spirit of innovation, the version number "0.16.45-pqview" raises some important points we need to address. The suffix "-pqview" deviates from standard semantic versioning practices, and this kind of change, this transformation if you will, could impact npm's ability to properly resolve dependencies.
Let me suggest a more conventional approach:
And if you need to distinguish this branch, consider using npm's built-in tag system: