Skip to content
Snippets Groups Projects
Commit 5681d44c authored by Anton Georgiev's avatar Anton Georgiev
Browse files

add error code missing titles

parent 3ce80062
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,6 @@ import mapUser from '/imports/ui/services/user/mapUser'; ...@@ -17,7 +17,6 @@ import mapUser from '/imports/ui/services/user/mapUser';
import { Session } from 'meteor/session'; import { Session } from 'meteor/session';
import IntlStartup from './intl'; import IntlStartup from './intl';
import Meetings from '../../api/meetings'; import Meetings from '../../api/meetings';
import AppService from '/imports/ui/components/app/service';
import AnnotationsTextService from '/imports/ui/components/whiteboard/annotations/text/service'; import AnnotationsTextService from '/imports/ui/components/whiteboard/annotations/text/service';
import Breakouts from '/imports/api/breakouts'; import Breakouts from '/imports/api/breakouts';
import AudioService from '/imports/ui/components/audio/service'; import AudioService from '/imports/ui/components/audio/service';
...@@ -32,10 +31,10 @@ const HTML = document.getElementsByTagName('html')[0]; ...@@ -32,10 +31,10 @@ const HTML = document.getElementsByTagName('html')[0];
let breakoutNotified = false; let breakoutNotified = false;
const propTypes = { const propTypes = {
subscriptionsReady: PropTypes.bool.isRequired, subscriptionsReady: PropTypes.bool,
locale: PropTypes.string, locale: PropTypes.string,
approved: PropTypes.bool, approved: PropTypes.bool,
meetingHasEnded: PropTypes.bool.isRequired, meetingHasEnded: PropTypes.bool,
meetingExist: PropTypes.bool, meetingExist: PropTypes.bool,
}; };
...@@ -43,6 +42,8 @@ const defaultProps = { ...@@ -43,6 +42,8 @@ const defaultProps = {
locale: undefined, locale: undefined,
approved: undefined, approved: undefined,
meetingExist: false, meetingExist: false,
subscriptionsReady: false,
meetingHasEnded: false,
}; };
const fullscreenChangedEvents = [ const fullscreenChangedEvents = [
...@@ -367,7 +368,6 @@ const BaseContainer = withTracker(() => { ...@@ -367,7 +368,6 @@ const BaseContainer = withTracker(() => {
meteorIsConnected: Meteor.status().connected, meteorIsConnected: Meteor.status().connected,
meetingExist: !!meeting, meetingExist: !!meeting,
meetingHasEnded: !!meeting && meeting.meetingEnded, meetingHasEnded: !!meeting && meeting.meetingEnded,
meetingIsBreakout: AppService.meetingIsBreakout(),
}; };
})(Base); })(Base);
......
...@@ -12,6 +12,9 @@ const intlMessages = defineMessages({ ...@@ -12,6 +12,9 @@ const intlMessages = defineMessages({
id: 'app.error.500', id: 'app.error.500',
defaultMessage: 'Ops, something went wrong', defaultMessage: 'Ops, something went wrong',
}, },
410: {
id: 'app.error.410',
},
404: { 404: {
id: 'app.error.404', id: 'app.error.404',
defaultMessage: 'Not found', defaultMessage: 'Not found',
......
...@@ -393,13 +393,14 @@ ...@@ -393,13 +393,14 @@
"app.meeting.logout.validateTokenFailedEjectReason": "Failed to validate authorization token", "app.meeting.logout.validateTokenFailedEjectReason": "Failed to validate authorization token",
"app.meeting.logout.userInactivityEjectReason": "User inactive for too long", "app.meeting.logout.userInactivityEjectReason": "User inactive for too long",
"app.dropdown.close": "Close", "app.dropdown.close": "Close",
"app.error.500": "Ops, something went wrong",
"app.error.404": "Not found",
"app.error.401": "Unauthorized",
"app.error.403": "Forbidden",
"app.error.400": "Bad Request", "app.error.400": "Bad Request",
"app.error.401": "Unauthorized",
"app.error.403": "You have been removed from the meeting",
"app.error.404": "Not found",
"app.error.410": "Meeting has ended",
"app.error.500": "Ops, something went wrong",
"app.error.leaveLabel": "Log in again", "app.error.leaveLabel": "Log in again",
"app.error.fallback.presentation.title": "An error occured", "app.error.fallback.presentation.title": "An error occurred",
"app.error.fallback.presentation.description": "It has been logged. Please try reloading the page.", "app.error.fallback.presentation.description": "It has been logged. Please try reloading the page.",
"app.error.fallback.presentation.reloadButton": "Reload", "app.error.fallback.presentation.reloadButton": "Reload",
"app.guest.waiting": "Waiting for approval to join", "app.guest.waiting": "Waiting for approval to join",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment