Skip to content
This repository has been archived by the owner on Jun 3, 2024. It is now read-only.

New design for Masq #164

Merged
merged 41 commits into from
Apr 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
a1cd629
views/geolocation_denied_modal.dot: fix typo
sujeebant Mar 18, 2019
8f586ca
masq: do not display old login panel
sujeebant Mar 20, 2019
9c0f20d
scss/includes/login.scss: rename file to login_masq.scss
sujeebant Mar 20, 2019
d8fb0c0
masq: add masq icon
sujeebant Mar 20, 2019
80f7f70
masq: add new login panel
sujeebant Mar 20, 2019
6a3e87a
masq: add user info panel
sujeebant Mar 20, 2019
de0a50e
masq: rendering masq panel and user info panel
sujeebant Mar 20, 2019
60cecf5
add masq modal on add favorite
sujeebant Mar 18, 2019
4c363a4
views/menu.dot: increase menu width
sujeebant Mar 20, 2019
6cc8e3f
menu.scss: make scrolling menu independent of top element height
sujeebant Mar 20, 2019
c3ff2ae
modals/masq_favorite_modal.js: add do-not-ask-again checkbox
sujeebant Mar 22, 2019
97fad49
masq: add way to wait for favorite modal to close
sujeebant Mar 26, 2019
e48cb0a
masq: update package.json
sujeebant Mar 26, 2019
fd50e49
make modal positioning independent from its size
sujeebant Mar 26, 2019
f36df41
dispatch an event at favorite creation to update poi panel
sujeebant Mar 27, 2019
760467e
masq: scss/modals/masq_favorite.scss: add mobile style
sujeebant Mar 27, 2019
86548d1
masq: add masq icon in favorite list when logged in
sujeebant Mar 27, 2019
acca57c
store.js: do not return error when checking if logged in with masq di…
sujeebant Mar 28, 2019
adee402
tests/integration/tests/poi.js: fix poi instantiation
sujeebant Mar 28, 2019
d7129eb
masq: instantiate masq modal only if masq is enabled
sujeebant Apr 1, 2019
afa8487
favorites_panel.dot: fix indentation
sujeebant Mar 28, 2019
05e5f3a
masq: add masq footer in favorite list
sujeebant Apr 1, 2019
dfc5dec
masq: display favorite list footer only when logged out
sujeebant Apr 1, 2019
55e4e1c
masq: add onboarding
sujeebant Apr 2, 2019
a8ff7e3
masq: launch masq onboarding on click in menu button
sujeebant Apr 3, 2019
42bbb54
masq: add cursor pointer to masq footer in favorite list
sujeebant Apr 3, 2019
2941ff4
package.json, package-lock.json: update masq
sujeebant Apr 3, 2019
510a35d
make store isLoggedIn function async
sujeebant Apr 8, 2019
f33c601
store.js: handle login and logout events
sujeebant Feb 28, 2019
b442897
panel/login_masq.js: refactor init function
sujeebant Apr 10, 2019
fa99c98
store.js: rename init functions to masqInit
sujeebant Apr 10, 2019
39b0faf
fix how click on modal overlay are handled
sujeebant Apr 10, 2019
56243c0
masq: add new app image to send to masq
sujeebant Apr 10, 2019
bcabcaf
scss/menu.scss: change maps icon color in header to green
sujeebant Apr 10, 2019
9906808
masq: open onboarding on more details in favorite modal
sujeebant Apr 12, 2019
9092dd9
masq: generate icon url
sujeebant Apr 15, 2019
e848b40
update text
leventdem Apr 11, 2019
55d5505
add available soon to third slide of on-boarding
leventdem Apr 11, 2019
40b838d
Minor improvements after rebase: babel config and ie11 fixes
amatissart Apr 15, 2019
4413bfc
masq icon: Use document.baseURI instead of location.origin
amatissart Apr 15, 2019
9b27ba2
run npm audit
amatissart Apr 15, 2019
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
6 changes: 4 additions & 2 deletions build/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ module.exports = function (mode) {
"Edge >= 17"
]
},
"useBuiltIns": "entry"
"useBuiltIns": "entry",
"corejs": 2
}]],
}

Expand All @@ -24,7 +25,8 @@ module.exports = function (mode) {
[
"@babel/preset-env",
{
"useBuiltIns": "entry"
"useBuiltIns": "entry",
"corejs": 2
}
]
]
Expand Down
10 changes: 8 additions & 2 deletions build/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@ const mainJsChunkConfig = (buildMode) => {
loader: 'babel-loader',
options : babelConf(buildMode)
},
{loader: 'dot-loader'}
{
loader: 'dot-loader',
options: {}
}
]
}, {
test: /\.yml$/,
Expand Down Expand Up @@ -153,7 +156,10 @@ const mapJsChunkConfig = (buildMode) => {
loader: 'babel-loader',
options : babelConf(buildMode)
},
{loader : 'dot-loader'}
{
loader : 'dot-loader',
options: {}
}
]
}, {
test: /\.yml$/,
Expand Down
2 changes: 1 addition & 1 deletion config/default_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ masq:
enabled: false
title: Qwant Maps
desc: Maps application developed by Qwant
icon: https://www.qwant.com/maps/statics/images/qwant-logo.svg
icon: /statics/images/masq/maps-app.png
signalhubUrl: override_by_environment
baseMasqAppUrl: override_by_environment

Expand Down
10,677 changes: 3,555 additions & 7,122 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
"@qwant/nconf-getter": "file:local_modules/nconf_getter",
"@qwant/po-js-loader": "file:local_modules/po-js-loader",
"acorn": "^6.1.1",
"autoprefixer": "^9.5.1",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^24.1.0",
"babel-loader": "^8.0.4",
"babel-preset-env": "1.7.0",
"css-loader": "0.28.7",
"dot": "https://github.com/olado/doT.git#299b4da",
"dot-loader": "0.1.1",
"dot-loader": "^0.1.2",
"esdoc": "^1.1.0",
"esdoc-standard-plugin": "1.0.0",
"extract-loader": "1.0.1",
Expand All @@ -58,9 +58,8 @@
"klokantech-noto-sans": "git+https://github.com/QwantResearch/fonts.git#f25a802",
"mapbox-gl": "0.51.0",
"mapbox-gl-js-mock": "https://github.com/QwantResearch/mapbox-gl-js-mock.git#1da05703",
"masq-lib": "git+https://github.com/QwantResearch/masq-lib.git#v0.7.0",
"masq-lib": "git+https://github.com/QwantResearch/masq-lib.git#v0.8.2",
"node-sass": "^4.9.2",
"npm": "^6.4.1",
"po2json": "0.4.5",
"postcss-import": "12.0.0",
"postcss-loader": "2.0.9",
Expand Down
1 change: 1 addition & 0 deletions public/images/masq/arrow-right-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/masq/arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/masq/gifs/OnBoarding01_732x420.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/masq/gifs/OnBoarding02_450x258.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/masq/gifs/OnBoarding03_450x258.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/masq/gifs/OnBoarding04_450x258.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/masq/maps-app.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions public/images/masq/masq-box.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/masq/masq-by-qwant.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading