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

Add Speakers to the default page list on the sidebar #187

Merged
merged 6 commits into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
2 changes: 1 addition & 1 deletion webapp/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if (ENV_DEVELOPMENT || !window.venueless) {
feedback: `${httpProtocol}//${hostname}:8443/_feedback/`,
},
defaultLocale: 'en',
locales: ['en', 'de', 'pt_BR'],
locales: ['en', 'de', 'pt_BR', 'ar', 'fr', 'es', 'uk', 'ru'],
theme: {
logo: {
url: "/eventyay-video-logo.svg",
Expand Down
1 change: 1 addition & 0 deletions webapp/src/components/RoomsSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ transition(name="sidebar")
.global-links(role="group", aria-label="pages")
router-link.room(v-if="roomsByType.page.includes(rooms[0])", :to="{name: 'home'}", v-html="$emojify(rooms[0].name)")
router-link.room(:to="{name: 'schedule'}", v-if="!!world.pretalx && (world.pretalx.url || world.pretalx.domain)") {{ $t('RoomsSidebar:schedule:label') }}
router-link.room(:to="{name: 'schedule:speakers'}", v-if="!!world.pretalx && (world.pretalx.url || world.pretalx.domain)") {{ $t('RoomsSidebar:speaker:label') }}
router-link.room(v-for="page of roomsByType.page", v-if="page !== rooms[0]", :to="{name: 'room', params: {roomId: page.id}}", v-html="$emojify(page.name)")
.group-title#stages-title(v-if="roomsByType.stage.length || hasPermission('world:rooms.create.stage')")
span {{ $t('RoomsSidebar:stages-headline:text') }}
Expand Down
16 changes: 15 additions & 1 deletion webapp/src/components/profile/GreetingPrompt.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ prompt.c-profile-greeting-prompt(:allowCancel="false")
h1 {{ $t('profile/GreetingPrompt:step-avatar:heading') }}
p {{ $t('profile/GreetingPrompt:step-avatar:text') }}
change-avatar(ref="step", v-model="profile.avatar", :profile="profile", @blockSave="blockSave = $event")
.step-display-language(v-else-if="activeStep === 'displayLanguage'")
h2 {{ $t('preferences/index:interface-language:header') }}
p {{ $t('preferences/index:interface-language:description') }}
bunt-select#select-interface-language(name="interface-language", v-model="interfaceLanguage", :options="languages", option-value="code", option-label="nativeLabel")
.step-additional-fields(v-else-if="activeStep === 'additionalFields'")
h1 {{ $t('profile/GreetingPrompt:step-fields:heading') }}
p {{ $t('profile/GreetingPrompt:step-fields:text') }}
Expand All @@ -42,6 +46,8 @@ prompt.c-profile-greeting-prompt(:allowCancel="false")
import { mapState } from 'vuex'
import { required } from 'buntpapier/src/vuelidate/validators'
import api from 'lib/api'
import config from 'config'
import { locales } from 'locales'
import Prompt from 'components/Prompt'
import ChangeAvatar from './ChangeAvatar'
import ChangeAdditionalFields from './ChangeAdditionalFields'
Expand All @@ -57,6 +63,7 @@ export default {
processingStep: false,
blockSave: false,
saving: false,
interfaceLanguage: this.$i18n.resolvedLanguage,
}
},
validations () {
Expand All @@ -74,6 +81,7 @@ export default {
steps () {
const steps = [
'displayName',
'displayLanguage',
'avatar'
]
if (this.world?.social_logins?.length) steps.unshift('connectSocial')
Expand All @@ -85,6 +93,10 @@ export default {
},
nextStep () {
return this.steps[this.steps.indexOf(this.activeStep) + 1]
},
languages () {
if (!config.locales?.length) return null
return locales.filter(locale => config.locales.includes(locale.code))
}
},
async created () {
Expand Down Expand Up @@ -132,6 +144,8 @@ export default {
}
this.profile.greeted = true // override even if explicitly set to false by server
await this.$store.dispatch('updateUser', {profile: this.profile})
localStorage.userLanguage = this.interfaceLanguage
await this.$store.dispatch('updateUserLocale', this.interfaceLanguage)
// TODO error handling
this.$emit('close')
}
Expand All @@ -154,7 +168,7 @@ export default {
margin: 0 0 8px 0
width: 360px
white-space: pre-wrap
.step-connect-social, .step-display-name, .step-avatar, .step-additional-fields
.step-connect-social, .step-display-name, .step-avatar, .step-display-language, .step-additional-fields
display: flex
flex-direction: column
align-items: center
Expand Down
430 changes: 430 additions & 0 deletions webapp/src/locales/ar.json

Large diffs are not rendered by default.

586 changes: 295 additions & 291 deletions webapp/src/locales/de.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions webapp/src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@
"preferences/index:btn-upload-save:label": "save",
"preferences/index:heading": "Your profile",
"preferences/index:interface-language:header": "Interface Language",
"preferences/index:interface-language:description": "Please select your language. You can change it later in your profile.",
"preferences/index:notification-permission-denied-warning": "Desktop notifications are blocked for this site. Please change the setting in your browser.",
"preferences/index:notifications:description": "Get desktop notifications for direct messages, contact requests and more while the event is running in the background.",
"preferences/index:notifications:header": "Desktop Notifications",
Expand Down Expand Up @@ -278,6 +279,7 @@
"profile/GreetingPrompt:step-display-name:text": "We will show your name to other attendees if you interact with them, e.g. in a chat. You do not need to use your real name.",
"profile/GreetingPrompt:step-display-name~as-first-step:heading": "Hi there!",
"profile/GreetingPrompt:step-display-name~as-first-step:text": "Before you join others in this event, please set up your profile.\nWe will show your name to other attendees if you interact with them, e.g. in a chat. You do not need to use your real name. After this, you can optionally choose a picture.",
"profile/GreetingPrompt:step-display-language:heading": "Please select your language",
"profile/GreetingPrompt:step-fields:heading": "",
"profile/GreetingPrompt:step-fields:text": "And lastly, why not add some optional information to your profile? Don't worry, you can always edit anything in your profile later.",
"Prompt:cancel:label": "cancel",
Expand Down Expand Up @@ -345,6 +347,7 @@
"RoomsSidebar:posters-headline:text": "Posters",
"RoomsSidebar:posters-manage:label": "Manage",
"RoomsSidebar:schedule:label": "Schedule",
"RoomsSidebar:speaker:label": "Speakers",
"RoomsSidebar:stages-headline:text": "Stages",
"RoomsSidebar:users-tooltip:few": "Some people are currently inside this room",
"RoomsSidebar:users-tooltip:many": "Many users are currently inside this room",
Expand Down
Loading
Loading