Skip to content
Closed
Show file tree
Hide file tree
Changes from all 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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"mini-css-extract-plugin": "^2.6.0",
"moment": "^2.22.2",
"moment-timezone": "^0.5.21",
"openstack-uicore-foundation": "4.2.28-beta.6",
"openstack-uicore-foundation": "5.0.43",
"path-browserify": "^1.0.1",
"process": "^0.11.10",
"prop-types": "^15.7.2",
Expand Down
2 changes: 1 addition & 1 deletion src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import LogInCallbackRoute from './routes/login-callback-route'
import DefaultRoute from "./routes/default-route";
import SummitLayout from './layouts/summit-layout';
import LandingLayout from './layouts/landing-layout';
import {AjaxLoader} from "openstack-uicore-foundation/lib/components";
import AjaxLoader from "openstack-uicore-foundation/lib/components/ajaxloader";
import {resetLoading} from "openstack-uicore-foundation/lib/utils/actions";
import {doLogout, onUserAuth, getUserInfo} from 'openstack-uicore-foundation/lib/security/actions';
import {initLogOut, doLoginBasicLogin, getIdToken} from 'openstack-uicore-foundation/lib/security/methods';
Expand Down
3 changes: 2 additions & 1 deletion src/components/affiliationstable/AffiliationsTable.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React from 'react';
import { connect } from 'react-redux';
import AffiliationsActionsTableCell from './AffiliationsActionsTableCell';
import { OrganizationInput, DateTimePicker } from 'openstack-uicore-foundation/lib/components'
import OrganizationInput from 'openstack-uicore-foundation/lib/components/inputs/organization-input'
import DateTimePicker from 'openstack-uicore-foundation/lib/components/inputs/datetimepicker'
import { epochToMoment, formatEpoch } from 'openstack-uicore-foundation/lib//utils/methods'
import { addAffiliation, saveAffiliation, deleteAffiliation } from "../../actions/member-actions"
import T from "i18n-react/dist/i18n-react";
Expand Down
2 changes: 1 addition & 1 deletion src/components/clock.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
**/

import React from 'react';
import { Clock } from "openstack-uicore-foundation/lib/components";
import Clock from "openstack-uicore-foundation/lib/components/clock";
import { updateClock } from '../actions/clock-actions';
import { connect } from 'react-redux';

Expand Down
6 changes: 5 additions & 1 deletion src/components/inputs/questions-input.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@

import React from 'react';
import 'awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css'
import {Input, Dropdown, RadioList, CheckboxList, RawHTML} from 'openstack-uicore-foundation/lib/components'
import Input from 'openstack-uicore-foundation/lib/components/inputs/text-input'
import Dropdown from 'openstack-uicore-foundation/lib/components/inputs/dropdown'
import RadioList from 'openstack-uicore-foundation/lib/components/inputs/radio-list'
import CheckboxList from 'openstack-uicore-foundation/lib/components/inputs/checkbox-list'
import RawHTML from 'openstack-uicore-foundation/lib/components/raw-html'
import {EXTRA_QUESTION_MAX_LENGTH} from "../../utils/constants";

export default class QuestionsInput extends React.Component {
Expand Down
2 changes: 1 addition & 1 deletion src/components/presentation-review-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import React from 'react'
import 'awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css'
import SubmitButtons from "./presentation-submit-buttons";
import { RawHTML } from 'openstack-uicore-foundation/lib/components'
import RawHTML from 'openstack-uicore-foundation/lib/components/raw-html'
import T from "i18n-react/dist/i18n-react";
import {getMarketingValue} from "./marketing-setting";

Expand Down
3 changes: 2 additions & 1 deletion src/components/presentation-speakers-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
import React from 'react'
import 'awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css'
import SubmitButtons from "./presentation-submit-buttons";
import { Exclusive, Dropdown } from 'openstack-uicore-foundation/lib/components'
import Exclusive from 'openstack-uicore-foundation/lib/components/exclusive-wrapper'
import Dropdown from 'openstack-uicore-foundation/lib/components/inputs/dropdown'
import T from "i18n-react/dist/i18n-react";
import CPFSpeakerInput from './inputs/speaker-input'
import Swal from "sweetalert2";
Expand Down
8 changes: 7 additions & 1 deletion src/components/presentation-summary-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@
import React, {useState, useEffect} from 'react'
import T from 'i18n-react/dist/i18n-react'
import 'awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css'
import {Dropdown, Input, RadioList, RawHTML, TextArea, TextEditor, Exclusive} from 'openstack-uicore-foundation/lib/components'
import Dropdown from 'openstack-uicore-foundation/lib/components/inputs/dropdown'
import Input from 'openstack-uicore-foundation/lib/components/inputs/text-input'
import RadioList from 'openstack-uicore-foundation/lib/components/inputs/radio-list'
import RawHTML from 'openstack-uicore-foundation/lib/components/raw-html'
import TextArea from 'openstack-uicore-foundation/lib/components/inputs/textarea-input'
import TextEditor from 'openstack-uicore-foundation/lib/components/inputs/editor-input'
import Exclusive from 'openstack-uicore-foundation/lib/components/exclusive-wrapper'
import SubmitButtons from './presentation-submit-buttons'
import {scrollToError, validate} from '../utils/methods'
import QuestionsInput from '../components/inputs/questions-input'
Expand Down
3 changes: 2 additions & 1 deletion src/components/presentation-uploads-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@

import React from 'react'
import 'awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css'
import {RawHTML, UploadInputV2} from 'openstack-uicore-foundation/lib/components'
import RawHTML from 'openstack-uicore-foundation/lib/components/raw-html'
import UploadInputV2 from 'openstack-uicore-foundation/lib/components/inputs/upload-input-v2'
import {findElementPos} from 'openstack-uicore-foundation/lib/utils/methods'
import SubmitButtons from './presentation-submit-buttons'
import {scrollToError} from '../utils/methods'
Expand Down
10 changes: 9 additions & 1 deletion src/components/speaker-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,15 @@ import 'awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css'
import {findElementPos} from 'openstack-uicore-foundation/lib/utils/methods'
import AffiliationsTable from './affiliationstable'
import PresentationLinks from "./inputs/presentation-links";
import { Input, TextEditor, UploadInput, Exclusive, CountryInput, LanguageInput, CheckboxList, FreeMultiTextInput, RegistrationCompanyInput } from 'openstack-uicore-foundation/lib/components'
import Input from 'openstack-uicore-foundation/lib/components/inputs/text-input'
import TextEditor from 'openstack-uicore-foundation/lib/components/inputs/editor-input'
import UploadInput from 'openstack-uicore-foundation/lib/components/inputs/upload-input'
import Exclusive from 'openstack-uicore-foundation/lib/components/exclusive-wrapper'
import CountryInput from 'openstack-uicore-foundation/lib/components/inputs/country-input'
import LanguageInput from 'openstack-uicore-foundation/lib/components/inputs/language-input'
import CheckboxList from 'openstack-uicore-foundation/lib/components/inputs/checkbox-list'
import FreeMultiTextInput from 'openstack-uicore-foundation/lib/components/inputs/free-multi-text-input'
import RegistrationCompanyInput from 'openstack-uicore-foundation/lib/components/inputs/registration-company-input'
import {validate, scrollToError} from "../utils/methods";


Expand Down
2 changes: 1 addition & 1 deletion src/pages/landing-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import '../styles/landing-page.less';
import T from "i18n-react/dist/i18n-react";
import SelectionProcessPage from "./selection-process-page";
import TracksGuidePage from "./tracks-guide-page";
import { Exclusive } from 'openstack-uicore-foundation/lib/components'
import Exclusive from 'openstack-uicore-foundation/lib/components/exclusive-wrapper'
import { getAllFromSummit, getSelectionPlanSettings } from '../actions/base-actions';
import { connect } from 'react-redux'
import {getCurrentSelectionPlanId} from "../utils/methods";
Expand Down
2 changes: 1 addition & 1 deletion src/pages/plan-selection-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
**/

import React from "react";
import {Dropdown} from 'openstack-uicore-foundation/lib/components'
import Dropdown from 'openstack-uicore-foundation/lib/components/inputs/dropdown'
import history from "../history";
import {connect} from "react-redux";
import T from "i18n-react";
Expand Down
2 changes: 1 addition & 1 deletion src/pages/preview-presentation-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import React from 'react';
import { connect } from 'react-redux';
import T from 'i18n-react/dist/i18n-react';
import { RawHTML } from 'openstack-uicore-foundation/lib/components'
import RawHTML from 'openstack-uicore-foundation/lib/components/raw-html'
import { loadEventCategory } from "../actions/base-actions";
import {getSubmissionsPath} from "../utils/methods";

Expand Down
2 changes: 1 addition & 1 deletion src/pages/selection-process-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import React from 'react';
import T from 'i18n-react/dist/i18n-react';
import { RawHTML } from 'openstack-uicore-foundation/lib/components'
import RawHTML from 'openstack-uicore-foundation/lib/components/raw-html'

export default class SelectionProcessPage extends React.Component {

Expand Down
2 changes: 1 addition & 1 deletion src/pages/summit-selection-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
**/

import React from "react";
import {Dropdown} from 'openstack-uicore-foundation/lib/components'
import Dropdown from 'openstack-uicore-foundation/lib/components/inputs/dropdown'
import history from "../history";
import {connect} from "react-redux";
import {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/thankyou-presentation-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import React from 'react';
import { connect } from 'react-redux';
import T from 'i18n-react/dist/i18n-react';
import { Exclusive } from 'openstack-uicore-foundation/lib/components'
import Exclusive from 'openstack-uicore-foundation/lib/components/exclusive-wrapper'
import {getSubmissionsPath} from "../utils/methods";

import '../styles/thankyou-presentation-page.less';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/tracks-guide-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import React from 'react';
import T from 'i18n-react/dist/i18n-react';
import {RawHTML} from 'openstack-uicore-foundation/lib/components'
import RawHTML from 'openstack-uicore-foundation/lib/components/raw-html'
import {connect} from "react-redux";

const TracksGuidePage = ({summit}) => {
Expand Down
15 changes: 11 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5355,10 +5355,12 @@ open@^8.0.9:
is-docker "^2.1.1"
is-wsl "^2.2.0"

openstack-uicore-foundation@4.2.28-beta.6:
version "4.2.28-beta.6"
resolved "https://registry.npmjs.org/openstack-uicore-foundation/-/openstack-uicore-foundation-4.2.28-beta.6.tgz#7304427e6e80802a8575fe6fc5fb18c6f0d0a147"
integrity sha512-2wshJvSmetE3ZqvCCjSyHWHuCqP/xwedcu+ROdhlfG67pRGe0aD6d4h3KjW1xE02SMC7pAODRUA12PiEXkdNAA==
openstack-uicore-foundation@5.0.43:
version "5.0.43"
resolved "https://registry.yarnpkg.com/openstack-uicore-foundation/-/openstack-uicore-foundation-5.0.43.tgz#a0f870bd2d1dd7a97a1b6e78009b5248ca27baab"
integrity sha512-UBIENc7nEhhKEsmaGRKdEIziNhnGypy5bf9ydssEgFB/Fe6Q6gH07x1U8m5s1nXYV9OCneMvLTBH98tprUXlOg==
dependencies:
use-sync-external-store "^1.6.0"

p-limit@^2.2.0:
version "2.3.0"
Expand Down Expand Up @@ -7270,6 +7272,11 @@ url-toolkit@^2.2.1:
resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.2.5.tgz#58406b18e12c58803e14624df5e374f638b0f607"
integrity sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==

use-sync-external-store@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz#b174bfa65cb2b526732d9f2ac0a408027876f32d"
integrity sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==

util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
Expand Down