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

feat: implement first step of modular #25

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open

feat: implement first step of modular #25

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e5196b7
feat: implement first step of modular
f-necas Aug 2, 2024
4ebe0c0
feat: first step of condition
f-necas Oct 4, 2024
47aa4a1
feat: set menu config file and block account
f-necas Dec 2, 2024
0a49d94
feat: add i18n, config file, improve repsonsive
f-necas Dec 6, 2024
a42e38b
feat: add active app url
f-necas Dec 9, 2024
f1cd390
feat: add types and update active app scoring
f-necas Dec 9, 2024
da82e95
feat: remove activeApp
f-necas Dec 10, 2024
b27d85d
feat: format
f-necas Dec 10, 2024
8a2ef79
feat: this should work
f-necas Dec 10, 2024
0445430
feat: remove getActiveTab
f-necas Dec 18, 2024
ef47dd2
feat: better naming
f-necas Dec 20, 2024
8e8fbb9
feat: ugly but working
f-necas Dec 23, 2024
eab279f
feat: cleaning
f-necas Dec 23, 2024
3208d92
feat: add icons
f-necas Dec 23, 2024
7847a8c
feat: format and readme
f-necas Dec 23, 2024
eb9b75b
feat: add documentation
f-necas Dec 23, 2024
1734baf
feat: add documentation
f-necas Dec 23, 2024
145e829
feat: better example
f-necas Dec 23, 2024
c3bf847
feat: use object assign to keep default values
f-necas Dec 23, 2024
aaff7fe
fix: build
f-necas Dec 23, 2024
c2446ef
fix: reset height
f-necas Dec 23, 2024
6395a8e
feat: set leagcy header back to props to avoid import config file
f-necas Jan 8, 2025
5063b7b
feat: set leagcy header back to props to avoid import config file
f-necas Jan 8, 2025
f7c06a6
feat: and logo either
f-necas Jan 8, 2025
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
11 changes: 6 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@ Iframe can still be set with defining `legacy-url` attribute, style can also be

Attributes available :

| Attribute | Description | Example | For new header | For legacy |
| ----------- |-------------------------------------------------------------------------------------------------------------| ----------------------------------------------------------- | -------------- | ---------- |
| active-app | Use this attribute to set the active class in menu | `<geor-header active-app='console'>` | | v |
| config-file | Use this attribute to set the config file for the new header (not legacy one). See [CONFIG.md](./CONFIG.md) | `<geor-header config-file="/config.json">` | v | |
| stylesheet | adds this stylesheet to the new header (not legacy one). | `<geor-header stylesheet="mystylesheet.css"></geor-header>` | v | |
| Attribute | Description | Example | For new header | For legacy header (iframe) |
|-------------|-------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------| -------------- |----------------------------|
| active-app | Use this attribute to set the active class in menu | `<geor-header active-app='console'>` | | v |
| config-file | Use this attribute to set the config file for the new header (not legacy one). See [CONFIG.md](./CONFIG.md) | `<geor-header config-file="/config.json">` | v | |
| stylesheet | adds this stylesheet to the new header (not legacy one). | `<geor-header stylesheet="mystylesheet.css"></geor-header>` | v | |
| height | sets the height of the header (in pixels) | `<geor-header height="80"></geor-header>` | v | v |

3. Provide a custom stylesheet

Expand Down
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<title>geOrchestra header</title>
</head>
<body style="margin: 0">
<geor-header config-file="/sample-config.json" stylesheet=""></geor-header>
<geor-header config-file="/sample-config.json" stylesheet="" height="80"></geor-header>
<script type="module" src="/src/main.ts"></script>
</body>
</html>
13 changes: 1 addition & 12 deletions public/sample-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,5 @@
}
]
}
],
"i18n": {
"en": {
"customi18n": "WMS/WFS service"
},
"fr": {
"customi18n": "Service WMS/WFS"
},
"es": {
"customi18n": "Servicio WMS/WFS"
}
}
]
}
2 changes: 0 additions & 2 deletions src/config-interfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ export interface Config {
logoTitle?: string
//Whether to hide the login button
hideLogin?: boolean
//Custom style to apply to the header
style?: string
//Custom stylesheet to apply to the header
stylesheet?: string
//Link to icons url. Tested with https://cdn.jsdelivr.net/gh/iconoir-icons/iconoir@main/css/iconoir.css
Expand Down
1 change: 0 additions & 1 deletion src/default-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"legacyHeader": false,
"legacyUrl": "/header/",
"hideLogin": false,
"style": "",
"adminRoles": [
"ROLE_SUPERUSER",
"ROLE_ORGADMIN",
Expand Down
15 changes: 7 additions & 8 deletions src/header.ce.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const props = defineProps<{
activeApp?: string
configFile?: string
stylesheet?: string
height?: number
}>()

const state = reactive({
Expand Down Expand Up @@ -107,9 +108,9 @@ function allNodes(obj: any, key: string, array?: any[]): string[] {
return array
}

function setI18nAndActiveApp(i18n: any) {
function setI18nAndActiveApp(i18n?: any) {
state.lang3 = getI18n(
i18n,
i18n || {},
state.config.lang || navigator.language.substring(0, 2) || 'en'
)
determineActiveApp()
Expand All @@ -132,9 +133,7 @@ onMounted(() => {
console.log(state.config)
setI18nAndActiveApp(json.i18n)
})
else {
setI18nAndActiveApp({})
}
else setI18nAndActiveApp()
if (user.roles.some(role => state.config.adminRoles.includes(role))) {
getPlatformInfos().then(
platformInfos => (state.platformInfos = platformInfos)
Expand All @@ -150,13 +149,13 @@ onMounted(() => {
v-bind:src="`${state.config.legacyUrl}${
props.activeApp ? `?active=${props.activeApp}` : ''
}`"
v-bind:style="state.config.style"
:style="`height:${props.height}px;width:100%;border:0;`"
></iframe>
</div>
<header
v-else-if="state.loaded"
class="host h-[80px] text-base"
v-bind:style="state.config.style"
class="host h-[80px] text-base ${props.height}"
Copy link
Member

@landryb landryb Dec 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldnt that be ${props.height} here again instead of 80px ? i know nothing to css classes but it feels strange.

:style="`height:${props.height}px`"
>
<link
rel="stylesheet"
Expand Down