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

New sidebar #6761

Merged
merged 88 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from 79 commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
8f08be1
console: Refactor css
ryaplots Nov 8, 2023
0a345cf
console: Update storybook
ryaplots Nov 21, 2023
39d2a39
console: Add new button
ryaplots Nov 22, 2023
c64220a
console: Add dropdown button
ryaplots Nov 22, 2023
570172a
console: Add new components and colors and change variables
ryaplots Nov 22, 2023
75ee0c7
console: Fix storybook
ryaplots Nov 23, 2023
4e60769
console: Fix soptrybook
ryaplots Nov 23, 2023
750845b
console: Adjust dropdown styling
ryaplots Nov 23, 2023
7d81709
console: Adjust dropdown styling
ryaplots Nov 27, 2023
b39805e
console: Add section label to storybook
PavelJankoski Nov 24, 2023
b08e4c7
console: Add dedicated entity to storybook
PavelJankoski Nov 24, 2023
6a6f047
console: Improvement in dropdown button
PavelJankoski Nov 29, 2023
5e840f5
console: New design of dropdown implemented
PavelJankoski Nov 29, 2023
eac1182
console: Add styles to storybook
ryaplots Dec 1, 2023
7b9d772
console: Change button naming
ryaplots Dec 1, 2023
bf24b38
console: Add new app and device logos
ryaplots Dec 1, 2023
4bf35b7
console: Add new side navigation
ryaplots Dec 1, 2023
2098d5a
console: Add side menu link component
ryaplots Dec 1, 2023
58b14bc
console: Rework search button
ryaplots Dec 1, 2023
4c12a81
console: Add new sidebar
ryaplots Dec 1, 2023
a0de5b0
console: New variables
ryaplots Dec 1, 2023
668f7a6
console: Add footer submenu and adjust buttons styling
ryaplots Dec 4, 2023
9ef0684
console: Fix stories and separate concerns
ryaplots Dec 5, 2023
69562d5
console: Add language selection to footer
ryaplots Dec 5, 2023
7ec08a0
console: Add minimized version of the sidebar
ryaplots Dec 7, 2023
4e14ed2
console: Use rounded icons
ryaplots Dec 11, 2023
51928a7
console: Apply various fixes
ryaplots Dec 11, 2023
d726985
console: Fix dropdown positioning
PavelJankoski Dec 5, 2023
4f27187
console: Improve hr styling in dropdown-v2
PavelJankoski Dec 7, 2023
8c468a4
console: Fix dedicated entry
ryaplots Dec 11, 2023
a762294
console: Re-organise stories
ryaplots Dec 11, 2023
83785f4
console: Sidebar refactorings
ryaplots Dec 11, 2023
648529f
console: Update locales
ryaplots Dec 11, 2023
c461eed
console: Apply sidebar fixes
ryaplots Dec 11, 2023
c94981f
console: Add minimized version of the sidebar
ryaplots Dec 7, 2023
413f6e6
console: Initial new header implementation
ryaplots Nov 8, 2023
169c330
console: Added sb stories for header and profile dropdown v2
PavelJankoski Nov 28, 2023
7ac1b57
console: Included new dropdowns in the header
PavelJankoski Nov 30, 2023
9ef9bc3
console: Mobile responsiveness of header v2 component
PavelJankoski Dec 11, 2023
8111c9f
console: Resolve conflicts
PavelJankoski Dec 11, 2023
d2b4585
console,account: Fix button styling
kschiffer Dec 12, 2023
1a94e5a
console: Add bar button to entity
ryaplots Dec 12, 2023
e5030d5
console: Implement PR suggestions and new breadcrumbs design
kschiffer Dec 12, 2023
771e1fb
console: Add figma to stories and add drawer
ryaplots Dec 15, 2023
37cdafb
Merge branch 'feature/new-sidebar' of github.com:TheThingsNetwork/lor…
ryaplots Dec 15, 2023
037b151
console: Refactored breadcrumbs component and implemented design remarks
PavelJankoski Dec 18, 2023
d14f46e
Merge branch 'feature/new-sidebar' into feature/new-header
PavelJankoski Dec 18, 2023
a24421c
console: Style fixes in breadcrumbs component
PavelJankoski Dec 18, 2023
789d7f1
console: Implemented UI remarks
PavelJankoski Dec 18, 2023
862a532
console: Removed dot from dropdown li item
PavelJankoski Dec 18, 2023
dd935f8
console: Fixed positioning dropdown on initial render
PavelJankoski Dec 18, 2023
4ad4112
console,account: Apply button styling fixes
kschiffer Dec 19, 2023
790ed41
console: Fix spacing and and sizes
ryaplots Dec 19, 2023
d6f918b
console: Revert app change
ryaplots Dec 19, 2023
61ddbe9
Merge branch 'feature/update-variables' into feature/new-sidebar
ryaplots Dec 19, 2023
8829d3a
console: Remove unrelated chnages
ryaplots Dec 19, 2023
ed8b66c
Merge branch 'feature/update-variables' into feature/new-sidebar
ryaplots Dec 19, 2023
92ea74f
console: Remove unnecessary fs
ryaplots Dec 19, 2023
672d3a5
console: Fix merge
ryaplots Dec 19, 2023
3b030d3
console: Update colors
ryaplots Dec 19, 2023
d499b99
console: Add necessary colors
ryaplots Dec 19, 2023
7ed3e83
Merge branch 'feature/update-variables' into feature/new-sidebar
ryaplots Dec 19, 2023
eed06ec
console: Add new colors
ryaplots Dec 19, 2023
b9f948a
console: Fix PR suggestions
PavelJankoski Dec 19, 2023
aafe02a
console: Resolving conflicts
PavelJankoski Dec 19, 2023
7da732c
console: Process a series of reviews
ryaplots Dec 20, 2023
438b0dd
console: Process review
ryaplots Dec 20, 2023
2dc1190
console: Fix cookies
ryaplots Dec 20, 2023
bd663e1
console: Implemented PR suggestions and rollback breadcrumb component
PavelJankoski Dec 20, 2023
36553e5
console: Rollback additional breadcrumb changes
PavelJankoski Dec 20, 2023
762e0cb
Merge branch 'feature/new-sidebar' into feature/new-header and resolv…
PavelJankoski Dec 20, 2023
c72c7e8
console: Change breadcrumb array in header v2 story
PavelJankoski Dec 20, 2023
d8cf45f
console: Add hover flyout list
ryaplots Dec 20, 2023
da7b926
console: Separate initial call of dropdown positioning into another u…
PavelJankoski Dec 21, 2023
98899c2
console: Added condition to position dropdown when open
PavelJankoski Dec 21, 2023
fb25da1
console: Move container to console, update paths
ryaplots Dec 22, 2023
e53c0e8
Merge pull request #6759 from TheThingsNetwork/feature/new-header
kschiffer Dec 27, 2023
d564957
console: Fix hover dropdown
ryaplots Dec 27, 2023
438a3d5
console: Add onMenuClick to open drawer
ryaplots Dec 27, 2023
1412d72
console: Remove duplicate button
ryaplots Dec 27, 2023
4059587
console: Remove old dropdown
ryaplots Dec 27, 2023
4e0ec40
console: Remove old header
ryaplots Dec 27, 2023
de66163
console: Remove old side navigation
ryaplots Dec 28, 2023
3adafb2
Merge pull request #6787 from TheThingsNetwork/feature/remove-duplicates
kschiffer Dec 29, 2023
4a78d52
console,account: Apply various fixes
kschiffer Jan 4, 2024
c988bda
console,account: Apply various fixes
kschiffer Jan 4, 2024
686a6e5
console,account: Apply more fixes
kschiffer Jan 11, 2024
f5f7ca3
Merge pull request #6806 from TheThingsNetwork/fix/new-sidebar-fixes
kschiffer Jan 12, 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
20 changes: 18 additions & 2 deletions config/storybook/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@

/* eslint-env node */
/* eslint-disable import/no-commonjs */
import fs from 'fs'
import path from 'path'

const MiniCssExtractPlugin = require('mini-css-extract-plugin')
require('@babel/register')

Expand All @@ -22,9 +25,16 @@ const { default: bundleConfig, styleConfig } = require('../webpack.config.babel'
// List of allowed plugins.
const allow = [MiniCssExtractPlugin]

const { CONTEXT = '.' } = process.env
const context = path.resolve(CONTEXT)
const supportedLocales = fs
.readdirSync(path.resolve(context, 'pkg/webui/locales'))
.filter(fn => fn.endsWith('.json'))
.map(fn => fn.split('.')[0])

module.exports = async ({ config, mode }) => {
const webpack = require('webpack')
if (mode === 'PRODUCTION') {
const webpack = require('webpack')
allow.push(webpack.DllReferencePlugin)
}

Expand All @@ -50,7 +60,13 @@ module.exports = async ({ config, mode }) => {
module: {
rules: [...config.module.rules, styleConfig],
},
plugins: [...config.plugins, ...filteredPlugins],
plugins: [
...config.plugins,
...filteredPlugins,
new webpack.DefinePlugin({
'process.predefined.SUPPORTED_LOCALES': JSON.stringify(supportedLocales),
}),
],
}

return cfg
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions pkg/webui/assets/static/tts-logo-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions pkg/webui/assets/static/tts-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 10 additions & 5 deletions pkg/webui/components/breadcrumbs/breadcrumb/breadcrumb.styl
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,32 @@
// See the License for the specific language governing permissions and
// limitations under the License.

.link
one-liner()
text-decoration: none
color: $tc-subtle-gray
min-height: 18px

.container
&:not(:last-child):after
material-icon()
margin: 0 $cs.xxs
content: 'keyboard_arrow_right'
color: $tc-subtle-gray


.link
one-liner()
text-decoration: none
color: $tc-subtle-gray
min-height: 18px
+focus-visible()
text-decoration: underline
color: $tc-deep-gray


.last
one-liner()
display: flex
align-items: center
color: $tc-deep-gray
min-height: 18px
font-weight: $fw.bold
+media-query($bp.s)
&:last-child
padding-right: $ls.xxs
16 changes: 11 additions & 5 deletions pkg/webui/components/breadcrumbs/breadcrumb/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,22 @@ const Breadcrumb = ({ className, path, content, isLast }) => {
let componentProps
if (!isLast) {
Component = Link
componentProps = { className: classnames(className, style.link), to: path, secondary: true }
componentProps = {
className: classnames(className, style.container, style.link),
to: path,
secondary: true,
}
} else {
Component = 'span'
componentProps = { className: classnames(className, style.last) }
componentProps = { className: classnames(className, style.container, style.last) }
}

return (
<Component {...componentProps}>
{isRawText ? <span>{content}</span> : <Message content={content} />}
</Component>
<span {...componentProps}>
<Component {...componentProps}>
{isRawText ? content : <Message content={content} />}
</Component>
</span>
)
}

Expand Down
Loading
Loading