diff --git a/imports/helpers.js b/imports/helpers.js new file mode 100644 index 0000000..4b9c290 --- /dev/null +++ b/imports/helpers.js @@ -0,0 +1,7 @@ +export function normalizeString (string) { + return +} + +export function normalizeStringToURLPath (string) { + return string.replace(/\.mp3/g, "").replace(/[^\x00-\x7F]/g, "_").replace(/\.|\//gi, '').replace(/^\s+|\s+$/gm, '').toLowerCase().replace(/ /g, "_").concat('.mp3'); +} \ No newline at end of file diff --git a/imports/startup/server/fileRoutes.js b/imports/startup/server/fileRoutes.js index fd0e78e..86730ae 100644 --- a/imports/startup/server/fileRoutes.js +++ b/imports/startup/server/fileRoutes.js @@ -12,6 +12,7 @@ Picker.route('/images/tmp/:filename', function (params, request, response, next) response.end(data) } catch (err) { if (err.code === 'ENOENT') { + console.log("_______ filePath", filePath); console.log('File not found! filename:', params.filename) } else { console.log('batman: error', error) diff --git a/imports/ui/MusicMap/Markers.js b/imports/ui/MusicMap/Markers.js index c0674d0..18ddd31 100644 --- a/imports/ui/MusicMap/Markers.js +++ b/imports/ui/MusicMap/Markers.js @@ -9,10 +9,10 @@ export const Markers = (props) => { enableRetinaIcons gridSize={10} zoomOnClick={false} - imagePath='img/resize/cluster' + imagePath='/img/cluster' styles={[{ textColor: '#313131', - url: 'img/resize/cluster1.png', + url: '/img/cluster1.png', height: 50, width: 50 }]} diff --git a/imports/ui/components/common/LegendElement.js b/imports/ui/components/Legend/LegendElement.js similarity index 100% rename from imports/ui/components/common/LegendElement.js rename to imports/ui/components/Legend/LegendElement.js diff --git a/imports/ui/components/Legend/index.js b/imports/ui/components/Legend/index.js new file mode 100644 index 0000000..7e8175d --- /dev/null +++ b/imports/ui/components/Legend/index.js @@ -0,0 +1,24 @@ +import React, {Component} from 'react' +import Paper from 'material-ui/Paper' + +export class LegendElement extends Component { + render () { + const style = { + height: 32, + width: 32, + padding: 2, + textAlign: 'center', + color: 'white', + boxShadow: 'black 0px 0px 0px 1px,white 0px 0px 0px 2px, rgba(0, 0, 0, 0.3) 0px 19px 60px, rgba(0, 0, 0, 0.22) 0px 15px 20px' + } + + return ( +
+ +
{this.props.name}
+
+ ) + } +} + +export default LegendElement diff --git a/imports/ui/components/common/PlaceMarker.js b/imports/ui/components/common/PlaceMarker.js index 1c6aab0..371ca16 100644 --- a/imports/ui/components/common/PlaceMarker.js +++ b/imports/ui/components/common/PlaceMarker.js @@ -22,7 +22,7 @@ export default class PlaceMarker extends Component { getIconForMedia (record) { const iconMap = { youtubeVideo: '/img/youtube.svg', - mp3: '/img/resize/record.png' + mp3: '/img/record.png' } return iconMap[record.mediaType] || iconMap['mp3'] } @@ -33,9 +33,11 @@ export default class PlaceMarker extends Component { club: '/img/disco-ball.svg', outdoorHall: '/img/outdoorHall.png', pub: '/img/cafe.png', - tv: '/img/resize/tv.png', - radio: '/img/resize/radio.png', - culture: '/img/resize/culture.png' + tv: '/img/tv.png', + radio: '/img/radio.png', + theatre: '/img/theatre.png', + philharmonia: '/img/piano.png', + culture: '/img/culture.png' } return iconMap[place.type] || iconMap['culture'] } diff --git a/imports/ui/components/dialogs/AddMediaDialog.js b/imports/ui/components/dialogs/AddMediaDialog.js index b0e94c1..8cf7162 100644 --- a/imports/ui/components/dialogs/AddMediaDialog.js +++ b/imports/ui/components/dialogs/AddMediaDialog.js @@ -9,6 +9,7 @@ import MenuItem from 'material-ui/MenuItem' import {Events} from '../../../api/events.js' import TextInput from '../common/TextInput' import PlaceSelect from '../common/PlaceSelect' +import { normalizeStringToURLPath } from "../../../helpers"; export default class AddMediaDialog extends React.Component { state = { @@ -41,14 +42,13 @@ export default class AddMediaDialog extends React.Component { mediaObject.videoId = this.state.videoLink.replace(/http.*watch.*=/gi, '') } - Meteor.call('addMedia', mediaObject) - if (this.state.mediaType === 'mp3' && this.state.mp3 && this.state.uploadedFile) { - mediaObject.mp3 = this.state.mp3 - mediaObject.filename = this.state.filename - Meteor.call('uploadMp3File', this.state.mp3.name, this.state.uploadedFile) + const normalizedFileName = normalizeStringToURLPath(this.state.mp3.name) + mediaObject.filename = normalizedFileName + Meteor.call('uploadMp3File', normalizedFileName, this.state.uploadedFile) } + Meteor.call('addMedia', mediaObject) this.handleClose() // TODO get rid of this reload by utilizing createContainer properly // location.reload() diff --git a/imports/ui/components/dialogs/MapVideoDialog.js b/imports/ui/components/dialogs/MapVideoDialog.js index 9da09a9..23a758f 100644 --- a/imports/ui/components/dialogs/MapVideoDialog.js +++ b/imports/ui/components/dialogs/MapVideoDialog.js @@ -30,7 +30,6 @@ export const MapVideoDialog = (props) => { repositionOnUpdate={false} autoScrollBodyContent > -

{video.name}

{video.youtubeId ? : 'Coś poszło nie tak...' diff --git a/imports/ui/components/dialogs/Mp3Dialog.js b/imports/ui/components/dialogs/Mp3Dialog.js index e78474e..958d42d 100644 --- a/imports/ui/components/dialogs/Mp3Dialog.js +++ b/imports/ui/components/dialogs/Mp3Dialog.js @@ -19,14 +19,15 @@ export const Mp3Dialog = (props) => { repositionOnUpdate={false} autoScrollBodyContent > - Opis:  - {props.media.description || 'brak'} -
-
- + +
+
+ + Opis:  + {props.media.description || 'brak'} } diff --git a/imports/ui/components/dialogs/PlaceDialog.js b/imports/ui/components/dialogs/PlaceDialog.js index 8e7aa33..54c21ca 100644 --- a/imports/ui/components/dialogs/PlaceDialog.js +++ b/imports/ui/components/dialogs/PlaceDialog.js @@ -62,6 +62,6 @@ const SocialIcons = (props) => { const PlaceIcon = (props) => { return - + } diff --git a/public/img/beer.png b/public/img/beer.png deleted file mode 100644 index 5998501..0000000 Binary files a/public/img/beer.png and /dev/null differ diff --git a/public/img/cassette-tape-with-black-border.svg b/public/img/cassette-tape-with-black-border.svg deleted file mode 100644 index 33a19af..0000000 --- a/public/img/cassette-tape-with-black-border.svg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/img/club.png b/public/img/club.png deleted file mode 100644 index 1d86143..0000000 Binary files a/public/img/club.png and /dev/null differ diff --git a/public/img/resize/cluster.png b/public/img/cluster.png similarity index 100% rename from public/img/resize/cluster.png rename to public/img/cluster.png diff --git a/public/img/resize/cluster1.png b/public/img/cluster1.png similarity index 100% rename from public/img/resize/cluster1.png rename to public/img/cluster1.png diff --git a/public/img/culture.png b/public/img/culture.png index 494083b..45e5454 100755 Binary files a/public/img/culture.png and b/public/img/culture.png differ diff --git a/public/img/disco-ball.svg b/public/img/disco-ball.svg deleted file mode 100644 index 9407b51..0000000 --- a/public/img/disco-ball.svg +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/img/facebook.png b/public/img/facebook.png deleted file mode 100755 index 820b4a2..0000000 Binary files a/public/img/facebook.png and /dev/null differ diff --git a/public/img/resize/fb.png b/public/img/fb.png similarity index 100% rename from public/img/resize/fb.png rename to public/img/fb.png diff --git a/public/img/grand-piano.svg b/public/img/grand-piano.svg deleted file mode 100644 index 8c56a78..0000000 --- a/public/img/grand-piano.svg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/img/grid-disco-ball.svg b/public/img/grid-disco-ball.svg deleted file mode 100644 index fc6df3d..0000000 --- a/public/img/grid-disco-ball.svg +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/img/heavy-metal.svg b/public/img/heavy-metal.svg deleted file mode 100644 index a6dc8a1..0000000 --- a/public/img/heavy-metal.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/img/icons8-Beer.png b/public/img/icons8-Beer.png deleted file mode 100755 index 3fc82d0..0000000 Binary files a/public/img/icons8-Beer.png and /dev/null differ diff --git a/public/img/icons8-Cafe.png b/public/img/icons8-Cafe.png deleted file mode 100755 index 1f57cb0..0000000 Binary files a/public/img/icons8-Cafe.png and /dev/null differ diff --git a/public/img/icons8-Facebook.png b/public/img/icons8-Facebook.png deleted file mode 100755 index 58865a8..0000000 Binary files a/public/img/icons8-Facebook.png and /dev/null differ diff --git a/public/img/icons8-Home.png b/public/img/icons8-Home.png deleted file mode 100755 index f852679..0000000 Binary files a/public/img/icons8-Home.png and /dev/null differ diff --git a/public/img/icons8-Instagram_2.png b/public/img/icons8-Instagram_2.png deleted file mode 100755 index 73ff8a8..0000000 Binary files a/public/img/icons8-Instagram_2.png and /dev/null differ diff --git a/public/img/icons8-Music Record.png b/public/img/icons8-Music Record.png deleted file mode 100755 index afc4769..0000000 Binary files a/public/img/icons8-Music Record.png and /dev/null differ diff --git a/public/img/icons8-Park Concert Shell.png b/public/img/icons8-Park Concert Shell.png deleted file mode 100755 index 55620b5..0000000 Binary files a/public/img/icons8-Park Concert Shell.png and /dev/null differ diff --git a/public/img/icons8-Park Concert Shell_2.png b/public/img/icons8-Park Concert Shell_2.png deleted file mode 100755 index a725a69..0000000 Binary files a/public/img/icons8-Park Concert Shell_2.png and /dev/null differ diff --git a/public/img/icons8-Party.png b/public/img/icons8-Party.png deleted file mode 100755 index 4777a5c..0000000 Binary files a/public/img/icons8-Party.png and /dev/null differ diff --git a/public/img/icons8-Radio Filled.png b/public/img/icons8-Radio Filled.png deleted file mode 100755 index e6fb2a2..0000000 Binary files a/public/img/icons8-Radio Filled.png and /dev/null differ diff --git a/public/img/icons8-Retro TV.png b/public/img/icons8-Retro TV.png deleted file mode 100755 index 14cf075..0000000 Binary files a/public/img/icons8-Retro TV.png and /dev/null differ diff --git a/public/img/icons8-Theatre Mask_2.png b/public/img/icons8-Theatre Mask_2.png deleted file mode 100755 index 2a5a388..0000000 Binary files a/public/img/icons8-Theatre Mask_2.png and /dev/null differ diff --git a/public/img/icons8-Theatre Mask_3.png b/public/img/icons8-Theatre Mask_3.png deleted file mode 100755 index 64cb165..0000000 Binary files a/public/img/icons8-Theatre Mask_3.png and /dev/null differ diff --git a/public/img/icons8-YouTube 2.png b/public/img/icons8-YouTube 2.png deleted file mode 100755 index 0987d54..0000000 Binary files a/public/img/icons8-YouTube 2.png and /dev/null differ diff --git a/public/img/resize/insta.png b/public/img/insta.png similarity index 100% rename from public/img/resize/insta.png rename to public/img/insta.png diff --git a/public/img/instagram.png b/public/img/instagram.png deleted file mode 100755 index 0117d63..0000000 Binary files a/public/img/instagram.png and /dev/null differ diff --git a/public/img/musical-disc-and-dj-hand.svg b/public/img/musical-disc-and-dj-hand.svg deleted file mode 100644 index 6f126c1..0000000 --- a/public/img/musical-disc-and-dj-hand.svg +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/img/piano.png b/public/img/piano.png index 2c6b2bf..a4017a4 100755 Binary files a/public/img/piano.png and b/public/img/piano.png differ diff --git a/public/img/pint.svg b/public/img/pint.svg deleted file mode 100644 index c63f4fe..0000000 --- a/public/img/pint.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/img/radio.png b/public/img/radio.png index 6b56f2e..7ff68f9 100755 Binary files a/public/img/radio.png and b/public/img/radio.png differ diff --git a/public/img/resize/record.png b/public/img/record.png similarity index 100% rename from public/img/resize/record.png rename to public/img/record.png diff --git a/public/img/resize/culture.png b/public/img/resize/culture.png deleted file mode 100755 index 45e5454..0000000 Binary files a/public/img/resize/culture.png and /dev/null differ diff --git a/public/img/resize/piano.png b/public/img/resize/piano.png deleted file mode 100755 index a4017a4..0000000 Binary files a/public/img/resize/piano.png and /dev/null differ diff --git a/public/img/resize/radio.png b/public/img/resize/radio.png deleted file mode 100755 index 7ff68f9..0000000 Binary files a/public/img/resize/radio.png and /dev/null differ diff --git a/public/img/resize/tv.png b/public/img/resize/tv.png deleted file mode 100755 index 52e0ab6..0000000 Binary files a/public/img/resize/tv.png and /dev/null differ diff --git a/public/img/resize/www.png b/public/img/resize/www.png deleted file mode 100755 index 58a563e..0000000 Binary files a/public/img/resize/www.png and /dev/null differ diff --git a/public/img/treble-clef.svg b/public/img/treble-clef.svg deleted file mode 100644 index e2c4316..0000000 --- a/public/img/treble-clef.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/img/tv.png b/public/img/tv.png index c377a4a..52e0ab6 100755 Binary files a/public/img/tv.png and b/public/img/tv.png differ diff --git a/public/img/vinyl-record.svg b/public/img/vinyl-record.svg deleted file mode 100644 index edb4c5f..0000000 --- a/public/img/vinyl-record.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/img/www.png b/public/img/www.png index 343517d..58a563e 100755 Binary files a/public/img/www.png and b/public/img/www.png differ diff --git a/public/img/resize/youtube.png b/public/img/youtube.png similarity index 100% rename from public/img/resize/youtube.png rename to public/img/youtube.png diff --git a/server/methods.js b/server/methods.js index e8277ca..d44a4c4 100644 --- a/server/methods.js +++ b/server/methods.js @@ -4,7 +4,7 @@ import fs from 'fs' Meteor.methods({ 'uploadMp3File': function (fileName, fileData) { console.log('received file ', fileName, fileData.length) - const filePath = `${process.env.PWD}/.images/tmp/${fileName}` + const filePath = `${process.env.PWD}/${fileName}` fs.writeFile(filePath, new global.Buffer(fileData, 'binary')) } })