Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
O
oauth-play
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ASM
oauth-play
Commits
be45afa2
Commit
be45afa2
authored
Mar 21, 2018
by
Andreas Åkre Solberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Update use of webpack 4 and more recent babel"
This reverts commit
e8f78555
.
parent
d333abe0
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1979 additions
and
4126 deletions
+1979
-4126
.babelrc
.babelrc
+1
-1
package-lock.json
package-lock.json
+1939
-4076
package.json
package.json
+28
-28
src/utils/API.js
src/utils/API.js
+5
-4
webpack.base.config.js
webpack.base.config.js
+6
-17
No files found.
.babelrc
View file @
be45afa2
{
"presets": ["e
nv", "react
"]
"presets": ["e
s2015","react", "stage-2
"]
}
package-lock.json
View file @
be45afa2
This diff is collapsed.
Click to expand it.
package.json
View file @
be45afa2
...
...
@@ -5,56 +5,56 @@
"main"
:
""
,
"scripts"
:
{
"start"
:
"node server"
,
"dev"
:
"webpack-dev-server --content-base public --config ./webpack.dev.config.js --host
127.0.0.1
"
,
"dev"
:
"webpack-dev-server --content-base public --config ./webpack.dev.config.js --host
0.0.0.0
"
,
"build"
:
"webpack --display-error-details -d"
,
"build:prod"
:
"webpack -p --config ./webpack.prod.config.js"
},
"author"
:
"Andreas Åkre Solberg <andreas.solberg@uninett.no>"
,
"license"
:
"
MIT
"
,
"devDependencies"
:
{
"
babel-core
"
:
"
^6.
26.0
"
,
"
babel-eslint
"
:
"
^
8.2.2
"
,
"
babel-loader
"
:
"
^
7.1
.4
"
,
"
babel-p
olyfill
"
:
"
^6.2
6.0
"
,
"
babel-preset-
env
"
:
"
^1.6.1
"
,
"
babel-preset-
react
"
:
"
^6.24.1
"
,
"
css-loader
"
:
"
^0.2
8.1
1
"
,
"
babel-core
"
:
"
^6.
7.2
"
,
"
babel-eslint
"
:
"
^
7.2.3
"
,
"
babel-loader
"
:
"
^
6.2
.4
"
,
"
babel-p
reset-es2015
"
:
"
^6.
6.0
"
,
"
babel-preset-
react
"
:
"
^6.5.0
"
,
"
babel-preset-
stage-2
"
:
"
^6.24.1
"
,
"
css-loader
"
:
"
^0.2
3.
1
"
,
"
eslint
"
:
"
^3.19.0
"
,
"
eslint-config-react-app
"
:
"
^2.1.0
"
,
"
eslint-plugin-flowtype
"
:
"
^2.46.1
"
,
"
eslint-plugin-import
"
:
"
^2.9.0
"
,
"
eslint-plugin-jsx-a11y
"
:
"
^6.0.3
"
,
"
eslint-plugin-react
"
:
"
^7.7.0
"
,
"
file-loader
"
:
"
^1.1.11
"
,
"
html-webpack-plugin
"
:
"
^3.0.7
"
,
"
mini-css-extract-plugin
"
:
"
^0.2.0
"
,
"
style-loader
"
:
"
^0.20.3
"
,
"
url-loader
"
:
"
^1.0.1
"
,
"
webpack
"
:
"
^4.1.1
"
,
"
webpack-dev-server
"
:
"
^3.1.1
"
"
file-loader
"
:
"
^0.11.2
"
,
"
html-webpack-plugin
"
:
"
^2.30.1
"
,
"
style-loader
"
:
"
^0.13.0
"
,
"
url-loader
"
:
"
^0.5.9
"
,
"
webpack
"
:
"
^3.11.0
"
,
"
webpack-dev-server
"
:
"
^2.11.2
"
},
"dependencies"
:
{
"
axios
"
:
"
^0.16.2
"
,
"
babel-plugin-transform-es2015-spread
"
:
"
^6.22.0
"
,
"
babel-polyfill
"
:
"
^6.23.0
"
,
"
bootstrap
"
:
"
^3.3.7
"
,
"
dotenv
"
:
"
^4.0.0
"
,
"
express
"
:
"
^4.1
6.3
"
,
"
history
"
:
"
^4.7.2
"
,
"
jso
"
:
"
^4.0.0-rc
.3
"
,
"
express
"
:
"
^4.1
5.4
"
,
"
extract-text-webpack-plugin
"
:
"
^3.0.0
"
,
"
history
"
:
"
^4.6
.3
"
,
"
jwt-decode
"
:
"
^2.2.0
"
,
"
lodash
"
:
"
^4.17.
5
"
,
"
moment
"
:
"
^2.
21.0
"
,
"
react
"
:
"
^15.6.
2
"
,
"
react-bootstrap
"
:
"
^0.31.
5
"
,
"
react-dom
"
:
"
^15.6.
2
"
,
"
lodash
"
:
"
^4.17.
4
"
,
"
moment
"
:
"
^2.
18.1
"
,
"
react
"
:
"
^15.6.
1
"
,
"
react-bootstrap
"
:
"
^0.31.
2
"
,
"
react-dom
"
:
"
^15.6.
1
"
,
"
react-fontawesome
"
:
"
^1.6.1
"
,
"
react-redux
"
:
"
^5.0.
7
"
,
"
react-remarkable
"
:
"
^1.1.
3
"
,
"
react-redux
"
:
"
^5.0.
5
"
,
"
react-remarkable
"
:
"
^1.1.
1
"
,
"
redux
"
:
"
^3.7.1
"
,
"
redux-actions
"
:
"
^2.
3.0
"
,
"
redux-actions
"
:
"
^2.
2.1
"
,
"
redux-localstorage
"
:
"
^0.4.1
"
,
"
redux-promise
"
:
"
^0.5.3
"
,
"
redux-thunk
"
:
"
^2.2.0
"
,
"
uninett-bootstrap-theme
"
:
"
^1.0.1
"
,
"
webpack-cli
"
:
"
^2.0.12
"
"
uninett-bootstrap-theme
"
:
"
^1.0.1
"
}
}
src/utils/API.js
View file @
be45afa2
import
actions
from
'
../actions/
'
// import jso from '../../lib/jso'
import
{
JSO
,
Popup
}
from
'
jso
'
const
baseURL
=
'
https://prefstore.dataporten-api.no
'
...
...
@@ -12,15 +14,14 @@ class Authenticator {
authenticateORCID
()
{
this
.
jso
.
wipeTokens
()
return
this
.
jso
.
getToken
()
return
this
.
jso
.
getToken
(
{}
)
.
then
((
token
)
=>
{
return
{}
})
return
{}
})
}
authenticate
()
{
let
opts
=
{}
opts
.
redirect_uri
=
'
http://0.0.0.0:8080/passiveResponse.html
'
return
this
.
jso
.
getToken
(
opts
)
.
then
((
token
)
=>
{
// console.error("Get Token returned ", token)
...
...
webpack.base.config.js
View file @
be45afa2
...
...
@@ -4,8 +4,7 @@ const dotenv = require('dotenv').config()
const
webpack
=
require
(
'
webpack
'
)
const
HtmlWebpackPlugin
=
require
(
'
html-webpack-plugin
'
);
// const ExtractTextPlugin = require('extract-text-webpack-plugin');
const
MiniCssExtractPlugin
=
require
(
"
mini-css-extract-plugin
"
)
const
ExtractTextPlugin
=
require
(
'
extract-text-webpack-plugin
'
);
module
.
exports
=
{
...
...
@@ -38,7 +37,10 @@ module.exports = {
limit
:
10000
}
},
{
test
:
/
\.
css$/
,
loader
:
'
style-loader!css-loader
'
},
{
test
:
/
\.
js
[
x
]?
$/
,
exclude
:
(
/node_modules/
),
...
...
@@ -47,13 +49,6 @@ module.exports = {
presets
:
[
'
es2015
'
,
'
react
'
,
'
stage-2
'
],
plugins
:
[
'
transform-es2015-spread
'
]
}
},
{
test
:
/
\.
css$/
,
use
:
[
MiniCssExtractPlugin
.
loader
,
"
css-loader
"
]
}
]
},
...
...
@@ -69,12 +64,6 @@ module.exports = {
inject
:
'
body
'
}),
new
webpack
.
EnvironmentPlugin
([
"
API_URL
"
,
"
REDIRECT_URL
"
,
"
CLIENT_ID
"
]),
// new ExtractTextPlugin('style.css'),
new
MiniCssExtractPlugin
({
// Options similar to the same options in webpackOptions.output
// both options are optional
filename
:
"
[name].css
"
,
chunkFilename
:
"
[id].css
"
})
new
ExtractTextPlugin
(
'
style.css
'
),
]
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment