Skip to content

Commit

Permalink
Update packages, cwebpack configuration. Moved from CommonJS to ES6
Browse files Browse the repository at this point in the history
  • Loading branch information
jlpereira committed Jan 19, 2019
1 parent d7ba3bb commit cf59888
Show file tree
Hide file tree
Showing 177 changed files with 4,793 additions and 10,016 deletions.
19 changes: 0 additions & 19 deletions .babelrc

This file was deleted.

1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
> 1%
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,9 @@ yarn-debug.log*
.yarn-integrity

yarn.lock
/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
1 change: 1 addition & 0 deletions app/javascript/packs/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

// Styles
require('../style/application.scss')
require('leaflet/dist/leaflet.css')

require('../vue/citations/otus/main.js')
require('../vue/content/editor/main.js')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.selected.citation
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.citations
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.otu_citations
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.selected.otu
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.selected.topics
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.source_citations
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.selected.source
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.topics
}
30 changes: 20 additions & 10 deletions app/javascript/vue/citations/otus/store/getters/getters.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
import getCitationSelected from './getCitationSelected'
import getCitationsList from './getCitationsList'
import getOtuCitationsList from './getOtuCitationsList'
import getOtuSelected from './getOtuSelected'
import getSetTopics from './getSetTopics'
import getSourceCitationsList from './getSourceCitationsList'
import getSourceSelected from './getSourceSelected'
import getTopicsList from './getTopicsList'
import objectsSelected from './objectsSelected'

const GetterNames = {
GetCitationSelected: 'getCitationSelected',
GetCitationsList: 'getCitationsList',
Expand All @@ -11,18 +21,18 @@ const GetterNames = {
}

const GetterFunctions = {
[GetterNames.GetCitationSelected]: require('./getCitationSelected'),
[GetterNames.GetCitationsList]: require('./getCitationsList'),
[GetterNames.GetOtuCitationsList]: require('./getOtuCitationsList'),
[GetterNames.GetOtuSelected]: require('./getOtuSelected'),
[GetterNames.GetSetTopics]: require('./getSetTopics'),
[GetterNames.GetSourceCitationsList]: require('./getSourceCitationsList'),
[GetterNames.GetSourceSelected]: require('./getSourceSelected'),
[GetterNames.GetTopicsList]: require('./getTopicsList'),
[GetterNames.ObjectsSelected]: require('./objectsSelected')
[GetterNames.GetCitationSelected]: getCitationSelected,
[GetterNames.GetCitationsList]: getCitationsList,
[GetterNames.GetOtuCitationsList]: getOtuCitationsList,
[GetterNames.GetOtuSelected]: getOtuSelected,
[GetterNames.GetSetTopics]: getSetTopics,
[GetterNames.GetSourceCitationsList]: getSourceCitationsList,
[GetterNames.GetSourceSelected]: getSourceSelected,
[GetterNames.GetTopicsList]: getTopicsList,
[GetterNames.ObjectsSelected]: objectsSelected
}

module.exports = {
export {
GetterNames,
GetterFunctions
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = function (state) {
export default function (state) {
if (state.selected.otu == undefined || state.selected.source == undefined) {
return true
} else {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state, citation) {
export default function (state, citation) {
state.citations.push(citation)
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state, citation) {
export default function (state, citation) {
state.otu_citations.push(citation)
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state, citation) {
export default function (state, citation) {
state.source_citations.push(citation)
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state, topic) {
export default function (state, topic) {
state.selected.topics.push(topic)
}
51 changes: 34 additions & 17 deletions app/javascript/vue/citations/otus/store/mutations/mutations.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
import addCitation from './addCitation'
import addToOtuList from './addToOtuList'
import addTopicSelected from './addTopicSelected'
import addToSourceList from './addToSourceList'
import removeCitationSelected from './removeCitationSelected'
import removeOtuFormCitationList from './removeOtuFormCitationList'
import removeSourceFormCitationList from './removeSourceFormCitationList'
import removeTopicSelected from './removeTopicSelected'
import setCitationsList from './setCitationsList'
import setCurrentCitation from './setCurrentCitation'
import setOtuCitationsList from './setOtuCitationsList'
import setOtuSelected from './setOtuSelected'
import setSourceCitationsList from './setSourceCitationsList'
import setSourceSelected from './setSourceSelected'
import setTopicsList from './setTopicsList'
import setTopicsSelected from './setTopicsSelected'

const MutationNames = {
AddCitation: 'addCitation',
AddToOtuList: 'addToOtuList',
Expand All @@ -18,25 +35,25 @@ const MutationNames = {
}

const MutationFunctions = {
[MutationNames.AddCitation]: require('./addCitation'),
[MutationNames.AddToOtuList]: require('./addToOtuList'),
[MutationNames.AddTopicSelected]: require('./addTopicSelected'),
[MutationNames.AddToSourceList]: require('./addToSourceList'),
[MutationNames.RemoveCitationSelected]: require('./removeCitationSelected'),
[MutationNames.RemoveOtuFormCitationList]: require('./removeOtuFormCitationList'),
[MutationNames.RemoveSourceFormCitationList]: require('./removeSourceFormCitationList'),
[MutationNames.RemoveTopicSelected]: require('./removeTopicSelected'),
[MutationNames.SetCitationsList]: require('./setCitationsList'),
[MutationNames.SetCurrentCitation]: require('./setCurrentCitation'),
[MutationNames.SetOtuCitationsList]: require('./setOtuCitationsList'),
[MutationNames.SetOtuSelected]: require('./setOtuSelected'),
[MutationNames.SetSourceCitationsList]: require('./setSourceCitationsList'),
[MutationNames.SetSourceSelected]: require('./setSourceSelected'),
[MutationNames.SetTopicsList]: require('./setTopicsList'),
[MutationNames.SetTopicsSelected]: require('./setTopicsSelected')
[MutationNames.AddCitation]: addCitation,
[MutationNames.AddToOtuList]: addToOtuList,
[MutationNames.AddTopicSelected]: addTopicSelected,
[MutationNames.AddToSourceList]: addToSourceList,
[MutationNames.RemoveCitationSelected]: removeCitationSelected,
[MutationNames.RemoveOtuFormCitationList]: removeOtuFormCitationList,
[MutationNames.RemoveSourceFormCitationList]: removeSourceFormCitationList,
[MutationNames.RemoveTopicSelected]: removeTopicSelected,
[MutationNames.SetCitationsList]: setCitationsList,
[MutationNames.SetCurrentCitation]: setCurrentCitation,
[MutationNames.SetOtuCitationsList]: setOtuCitationsList,
[MutationNames.SetOtuSelected]: setOtuSelected,
[MutationNames.SetSourceCitationsList]: setSourceCitationsList,
[MutationNames.SetSourceSelected]: setSourceSelected,
[MutationNames.SetTopicsList]: setTopicsList,
[MutationNames.SetTopicsSelected]: setTopicsSelected
}

module.exports = {
export {
MutationNames,
MutationFunctions
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = function (state) {
export default function (state) {
state.selected.otu = undefined,
state.selected.citation = undefined,
state.citations = []
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = function (state, id) {
export default function (state, id) {
var position = state.otu_citations.findIndex(item => {
if (id === item.id) {
return true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = function (state, id) {
export default function (state, id) {
var position = state.source_citations.findIndex(item => {
if (id === item.id) {
return true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = function (state, id) {
export default function (state, id) {
var position = state.selected.topics.findIndex(item => {
if (id === item.id) {
return true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state, list) {
export default function (state, list) {
state.citations = list
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state, citation) {
export default function (state, citation) {
state.selected.citation = citation
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state, list) {
export default function (state, list) {
state.otu_citations = list
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state, newOtu) {
export default function (state, newOtu) {
state.selected.otu = newOtu
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state, list) {
export default function (state, list) {
state.source_citations = list
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state, newSource) {
export default function (state, newSource) {
state.selected.source = newSource
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state, list) {
export default function (state, list) {
state.topics = list
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state, topics) {
export default function (state, topics) {
state.selected.topics = topics
}
2 changes: 1 addition & 1 deletion app/javascript/vue/citations/otus/store/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ function newStore () {
})
}

module.exports = {
export {
newStore
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = function (list, id) {
export default function (list, id) {
var
position = list.findIndex(item => {
if (id === item.id) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.panels.otu
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.panels.recent
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.panels.topic
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.citations
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.selected.content
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.depictions
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.selected.otu
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.selected.topic
}
36 changes: 24 additions & 12 deletions app/javascript/vue/content/editor/store/getters/getters.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
import activeOtuPanel from './activeOtuPanel'
import activeRecentPanel from './activeRecentPanel'
import activeTopicPanel from './activeTopicPanel'
import getCitationsList from './getCitationsList'
import getContentSelected from './getContentSelected'
import getDepictionsList from './getDepictionsList'
import getOtuSelected from './getOtuSelected'
import getRecent from './getRecent'
import getTopicSelected from './getTopicSelected'
import panelCitations from './panelCitations'
import panelFigures from './panelFigures'

const GetterNames = {
ActiveOtuPanel: 'activeOtuPanel',
ActiveRecentPanel: 'activeRecentPanel',
Expand All @@ -13,20 +25,20 @@ const GetterNames = {
}

const GetterFunctions = {
[GetterNames.ActiveOtuPanel]: require('./activeOtuPanel.js'),
[GetterNames.ActiveRecentPanel]: require('./activeRecentPanel'),
[GetterNames.ActiveTopicPanel]: require('./activeTopicPanel'),
[GetterNames.GetCitationsList]: require('./getCitationsList'),
[GetterNames.GetContentSelected]: require('./getContentSelected'),
[GetterNames.GetDepictionsList]: require('./getDepictionsList'),
[GetterNames.GetOtuSelected]: require('./getOtuSelected'),
[GetterNames.GetRecent]: require('./getRecent'),
[GetterNames.GetTopicSelected]: require('./getTopicSelected'),
[GetterNames.PanelCitations]: require('./panelCitations'),
[GetterNames.PanelFigures]: require('./panelFigures')
[GetterNames.ActiveOtuPanel]: activeOtuPanel,
[GetterNames.ActiveRecentPanel]: activeRecentPanel,
[GetterNames.ActiveTopicPanel]: activeTopicPanel,
[GetterNames.GetCitationsList]: getCitationsList,
[GetterNames.GetContentSelected]: getContentSelected,
[GetterNames.GetDepictionsList]: getDepictionsList,
[GetterNames.GetOtuSelected]: getOtuSelected,
[GetterNames.GetRecent]: getRecent,
[GetterNames.GetTopicSelected]: getTopicSelected,
[GetterNames.PanelCitations]: panelCitations,
[GetterNames.PanelFigures]: panelFigures
}

module.exports = {
export {
GetterNames,
GetterFunctions
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.panels.citations
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state) {
export default function (state) {
return state.panels.figures
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (state, citation) {
export default function (state, citation) {
state.citations.push(citation)
}
Loading

0 comments on commit cf59888

Please sign in to comment.