Revert "Merge branch 'experimental/city-theme' into develop"

This reverts commit f51da9b, reversing changes made to a06088f. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch develop # Your branch is up to date with 'origin/develop'. # # You are currently reverting commit a06088f. # # Changes to be committed: # modified: config/appConfig.js # deleted: config/assetPath.js # modified: config/webpack/dev.js # modified: config/webpack/prod.js # modified: config_dev.json.example # modified: package.json # deleted: src/assets/default/assets/main.scss # deleted: src/assets/default/i18n/index.js # new file: src/assets/images/turkulogowhite.png # modified: src/components/FormFields/index.js # modified: src/components/FormFields/index.scss # deleted: src/components/Header/LanguageSelector.js # deleted: src/components/Header/LanguageSelector.test.js # modified: src/components/Header/index.scss # modified: src/components/HelFormFields/HelKeywordSelector/HelKeywordSelector.js # modified: src/components/HelFormFields/HelLabeledCheckboxGroup.scss # modified: src/components/HelFormFields/HelOffersField.js # modified: src/components/HelFormFields/HelTextField.js # modified: src/components/ImageEdit/index.js # modified: src/components/ImageEdit/index.scss # modified: src/components/ImagePicker/index.js # modified: src/components/ImagePicker/index.scss # modified: src/components/SearchBar/index.js # modified: src/components/SearchBar/index.scss # modified: src/i18n/index.js # modified: src/index.jade # new file: src/themes/material-ui-tku.js # new file: src/themes/tku/tku-brand-colors.js # modified: src/views/App/index.js # modified: yarn.lock Manually reverting changes that were accidentally merged into develop. Weirdly enough Github thought taking commits from develop would be the same as merging the two branches together, while not being able to understand PR reverting (aka only reverting one branch but not the other). Please don't do that again...
City-of-Turku · May 13, 2020 · 50f3868 · 50f3868
1 parent f51da9b
commit 50f3868
Show file tree

Hide file tree

Showing 27 changed files with 168 additions and 592 deletions.
diff --git a/config/appConfig.js b/config/appConfig.js
@@ -36,7 +36,7 @@ nconf.defaults({
 
 /**
  * Function to retrieve value from config
- * @param {undefined|string|string[]} keys
+ * @param {undefined|string|string[]} keys 
  */
 function getConfig(keys) {
     // Return all config if no keys provided

diff --git a/config/assetPath.js b/config/assetPath.js
diff --git a/config/webpack/dev.js b/config/webpack/dev.js
@@ -3,7 +3,7 @@ import common from './common.js';
 import webpack from 'webpack';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import {readConfig} from '../appConfig';
-import assetPath from '../assetPath';
+
 const publicUrl = readConfig('publicUrl')
 const ui_mode = readConfig('ui_mode')
 
@@ -23,17 +23,12 @@ export default {
     resolve: {
         modules: [common.paths.ROOT, 'node_modules'],
         extensions: ['.', '.webpack.js', '.web.js', '.jsx', '.js'],
-        alias: {
-            '@city-assets': assetPath.cityAssets,
-            '@city-images': assetPath.cityImages,
-            '@city-i18n': assetPath.cityi18n,
-        },
     },
     module: {
         rules: [
             {
-                test: /\.(js|jsx)?$/,
-                exclude: /node_modules/,
+                test: /\.(js|jsx)?$/, 
+                exclude: /node_modules/, 
                 enforce: 'pre',
                 use: ['babel-loader', 'eslint-loader'],
             },

diff --git a/config/webpack/prod.js b/config/webpack/prod.js
@@ -3,7 +3,6 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const GitRevisionPlugin = require('git-revision-webpack-plugin');
 const common = require('./common');
 const appConfig = require('../appConfig');
-const assetPath = require('../assetPath');
 
 // There are defined in common.js as well, but that is not available without
 // transpilation, which is not done for webpack configuration file
@@ -34,17 +33,12 @@ const config = {
     resolve: {
         modules: [common.paths.ROOT, 'node_modules'],
         extensions: ['.', '.webpack.js', '.web.js', '.jsx', '.js'],
-        alias: {
-            '@city-assets': assetPath.cityAssets,
-            '@city-images': assetPath.cityImages,
-            '@city-i18n': assetPath.cityi18n,
-        },
     },
     module: {
         rules: [
             {
-                test: /\.(js|jsx)?$/,
-                exclude: /node_modules/,
+                test: /\.(js|jsx)?$/, 
+                exclude: /node_modules/, 
                 enforce: 'pre',
                 use: ['babel-loader', 'eslint-loader'],
             },

diff --git a/config_dev.json.example b/config_dev.json.example
@@ -9,7 +9,7 @@
     "publicUrl": "http://localhost:8080",
     "sessionSecret": "dev-secret-do-not-use-in-production",
     "ui_mode": "events",
-    "client_id": "CLIENT_ID",
+     "client_id": "CLIENT_ID",
     "openid_audience": "OPENID_AUDIENCE",
     "openid_authority": "OPENID_AUTHORITY"
 }
diff --git a/package.json b/package.json
@@ -60,7 +60,6 @@
     "raven-js": "^2.3.0",
     "react": "16.12.0",
     "react-addons-pure-render-mixin": "^15.6.2",
-    "react-bootstrap": "^1.0.1",
     "react-copy-to-clipboard": "^5.0.1",
     "react-dom": "16.12.0",
     "react-helmet": "^5.2.1",
@@ -71,7 +70,6 @@
     "react-router-dom": "^4.2.2",
     "react-router-redux": "^5.0.0-alpha.9",
     "react-select": "^3.0.8",
-    "reactstrap": "^8.4.1",
     "redux": "4.0.4",
     "redux-actions": "^0.9.0",
     "redux-oidc": "^4.0.0-beta1",

diff --git a/src/assets/default/assets/main.scss b/src/assets/default/assets/main.scss
diff --git a/src/assets/default/i18n/index.js b/src/assets/default/i18n/index.js
diff --git a/src/components/FormFields/index.js b/src/components/FormFields/index.js
@@ -17,19 +17,19 @@ import {
     HelKeywordSelector,
 } from 'src/components/HelFormFields'
 import RecurringEvent from 'src/components/RecurringEvent'
-import {Button,Form, FormGroup, Label, Input} from 'reactstrap';
-import {Add, Autorenew} from '@material-ui/icons'
+import {Button, TextField} from '@material-ui/core'
+import {Add, Autorenew, FileCopyOutlined} from '@material-ui/icons'
 import {mapKeywordSetToForm, mapLanguagesSetToForm} from '../../utils/apiDataMapping'
 import {setEventData, setData} from '../../actions/editor'
 import {get, isNull, pickBy} from 'lodash'
 import API from '../../api'
 import CONSTANTS from '../../constants'
 import OrganizationSelector from '../HelFormFields/OrganizationSelector';
 import UmbrellaSelector from '../HelFormFields/UmbrellaSelector/UmbrellaSelector'
+import {HelMaterialTheme} from '../../themes/material-ui'
 import moment from 'moment'
 import HelVideoFields from '../HelFormFields/HelVideoFields/HelVideoFields'
 
-
 let FormHeader = (props) => (
     <div className="row">
         <legend className="col-sm-12">{ props.children }</legend>
@@ -296,20 +296,25 @@ class FormFields extends React.Component {
                             />
                         }
                         <Button
-                            size='lg'block
                             variant="contained"
                             disabled={formType === 'update'}
-                            onClick={() => this.addNewEventDialog()}   
-                        ><span  className="glyphicon glyphicon-plus"></span>
+                            color="primary"
+                            onClick={() => this.addNewEventDialog()}
+                            startIcon={<Add/>}
+                            fullWidth
+                            style={{marginTop: HelMaterialTheme.spacing(2)}}
+                        >
                             <FormattedMessage id="event-add-new-occasion" />
                         </Button>
                         <Button
-                            size='lg' block
                             variant="contained"
                             disabled={formType === 'update'}
+                            color="primary"
                             onClick={() => this.showRecurringEventDialog()}
-
-                        ><span  className="glyphicon glyphicon-refresh"></span>
+                            startIcon={<Autorenew/>}
+                            fullWidth
+                            style={{marginTop: HelMaterialTheme.spacing(2)}}
+                        >
                             <FormattedMessage id="event-add-recurring" />
                         </Button>
                     </div>
@@ -328,29 +333,24 @@ class FormFields extends React.Component {
                 </FormHeader>
                 <div className="row location-row">
                     <div className="col-sm-6 hel-select">
-
                         <HelSelect
-                            legend={this.context.intl.formatMessage({id: 'event-location'})}
                             selectedValue={values['location']}
+                            legend={this.context.intl.formatMessage({id: 'event-location'})}
                             ref="location"
                             name="location"
                             resource="place"
                             validationErrors={validationErrors['location']}
                             setDirtyState={this.props.setDirtyState}
                         />
-
-                        <Form>
-                            <FormGroup className='place-id'>
-                                <label>{this.context.intl.formatMessage({id: 'event-location-id'})}</label>
-                                <input type="text" className="form-control"value={values['location'] && values['location'].id ? values['location'].id : ''} readOnly/>
-                            </FormGroup>
-
-                        </Form>
-
-
+                        <TextField
+                            fullWidth
+                            disabled
+                            label={this.context.intl.formatMessage({id: 'event-location-id'})}
+                            value={values['location'] && values['location'].id ? values['location'].id : ''}
+                        />
                         <CopyToClipboard text={values['location'] ? values['location'].id : ''}>
-                            <button type='button' className="clipboard-copy-button btn btn-default" title={this.context.intl.formatMessage({id: 'copy-to-clipboard'})}>
-                                <span className="glyphicon glyphicon-duplicate" aria-hidden="true"></span>
+                            <button className="clipboard-copy-button" title={this.context.intl.formatMessage({id: 'copy-to-clipboard'})}>
+                                <FileCopyOutlined />
                             </button>
                         </CopyToClipboard>
                         <MultiLanguageField

diff --git a/src/components/FormFields/index.scss b/src/components/FormFields/index.scss
@@ -1,16 +1,11 @@
 .container > div > .row {
     justify-content: space-between;
-
 }
 
 .clipboard-copy-button {
-    padding: 3px;
+    padding: 4px;
     position: absolute;
     box-shadow: 0 1px 6px rgba(0,0,0,0.12), 0 1px 4px rgba(0,0,0,0.12);
-    border-radius: 0px;
-    margin-right: -25px;
-
-
 }
 
 .location-row {
@@ -29,30 +24,6 @@
         top: 65px;
     }
 }
-.glyphicon{
-    font-size: 22px;
-    padding-left: 15px;
-   padding-top: 1px;
-   margin-right: 0px;
-
-}
-.place-id{
-    margin-top: 10px;
-    border-bottom-style:dashed;
-    border-bottom-width: 2px;
-    border-radius: 0px;
-    border-color:rgb(84,84,84);
-    font-size: 16px;
-    .form-control:disabled, .form-control[readonly]{
-        background-color: #fff;
-        font-size: 16px;
-
-    }
-    .form-control{
-        border: 0px;
-    }
-}
-
 
 @media (max-width: 544px) {
     .location-row {
@@ -98,14 +69,3 @@
         }
     }
 }
-.btn-block{
-    color: #fff;
-    background-color:#0072c6 ;
-    margin-top: 15px;
-    font-size: 15.75px;
-    border-radius: 2px;
-
-}
-.glyphicon{
-    margin-right:20px;
-}
diff --git a/src/components/Header/LanguageSelector.js b/src/components/Header/LanguageSelector.js