Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Beta 1 dev #1262

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from
Open

Beta 1 dev #1262

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b30bd01
Initial bellem setup
lemagnifick Jul 15, 2020
bf0c836
Initial bellem setup
lemagnifick Jul 15, 2020
d54d8e9
Initial bellem setup
lemagnifick Jul 15, 2020
9f75c61
=setup: Initial bellem setup
lemagnifick Jul 15, 2020
f2d4a9c
change ES2015 to ES5
Jul 15, 2020
ff94415
translate to french WAREHOUSES_VIEW.SHOW_ON_MAP
lemagnifick Jul 15, 2020
1f341f6
Hide Orders on sidebar menu
lemagnifick Jul 15, 2020
0fac6ca
=Mobile app Core update
Jul 16, 2020
c566d71
=lang: remove other langs on packages/core/src/services/invites/Invit…
lemagnifick Jul 16, 2020
5e596f0
=lang: fix Ilanguage
lemagnifick Jul 16, 2020
497b2a6
=lang: fix language Core & Admin
lemagnifick Jul 16, 2020
ba9dd55
Merge branch 'beta-1' into beta-1-dev
lemagnifick Jul 17, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Initial bellem setup
  • Loading branch information
@lemagnifick
lemagnifick committed Jul 15, 2020
commit bf0c83608e64ade90d671a35d91fcef7e7444216
24 changes: 12 additions & 12 deletions packages/admin-web-angular/.env.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@ GQL_ENDPOINT=http://localhost:5555/graphql
GQL_SUBSCRIPTIONS_ENDPOINT=ws://localhost:5050/subscriptions

# Insert below Google Maps API Key and make sure you restrict access to it
GOOGLE_MAPS_API_KEY=
GOOGLE_MAPS_API_KEY=AIzaSyDudKVRLfNoQFm9JFvGQkGfdxZAbgqXLDE

DEFAULT_LATITUDE=42.6459136
DEFAULT_LONGITUDE=23.3332736
DEFAULT_LATITUDE=4.094836
DEFAULT_LONGITUDE=9.743204

NO_INTERNET_LOGO=assets/images/ever-logo.svg

MAP_MERCHANT_ICON_LINK=http://maps.google.com/mapfiles/kml/pal3/icon21.png
MAP_USER_ICON_LINK=http://maps.google.com/mapfiles/kml/pal3/icon48.png
MAP_CARRIER_ICON_LINK=http://maps.google.com/mapfiles/kml/pal4/icon54.png
API_FILE_UPLOAD_URL=https://api.cloudinary.com/v1_1/evereq/upload
API_FILE_UPLOAD_URL=https://api.cloudinary.com/v1_1/bellem/image/upload

COMPANY_NAME=Ever Co. LTD
COMPANY_SITE_LINK=https://ever.co/
COMPANY_GITHUB_LINK=https://github.com/ever-co
COMPANY_FACEBOOK_LINK=https://www.facebook.com/evercoapp
COMPANY_TWITTER_LINK=https://twitter.com/evercoapp
COMPANY_LINKEDIN_LINK=https://www.linkedin.com/company/ever-co.
COMPANY_NAME=Bellem
COMPANY_SITE_LINK=https://bellem.cm/
COMPANY_GITHUB_LINK=https://github.com/bellem
COMPANY_FACEBOOK_LINK=https://www.facebook.com/bellemapp
COMPANY_TWITTER_LINK=https://twitter.com/bellemapp
COMPANY_LINKEDIN_LINK=https://www.linkedin.com/company/bellem.

GENERATE_PASSWORD_CHARSET=abcdefghijklnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789$_

CURRENCY_SYMBOL=$
CURRENCY_SYMBOL=XAF

DEFAULT_LANGUAGE=en-US
DEFAULT_LANGUAGE=fr-FR

# For maintenance micro service. Ever maintanance API URL: https://maintenance.ever.co/status
SETTINGS_APP_TYPE=admin
Expand Down
10 changes: 5 additions & 5 deletions packages/core/.env.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ HTTPS_KEY_PATH=certificates/https/key.pem

LOGS_PATH=./tmp/logs

DB_URI=mongodb://localhost/ever_development
DB_URI=mongodb://localhost/bellem_production
TESTING_DB_URI=mongodb://localhost/ever_testing

STRIPE_SECRET_KEY=[SOME SORT OF STRING KEY]
Expand All @@ -27,7 +27,7 @@ KEYMETRICS_MACHINE_NAME=[MACHINE NAME]
KEYMETRICS_SECRET_KEY=[SOME SORT OF STRING KEY]
KEYMETRICS_PUBLIC_KEY=[SOME SORT OF STRING KEY]

GOOGLE_APP_ID=[SOME SORT OF STRING KEY]
GOOGLE_APP_ID=AIzaSyDudKVRLfNoQFm9JFvGQkGfdxZAbgqXLDE
GOOGLE_APP_SECRET=[SOME SORT OF STRING KEY]

FACEBOOK_APP_ID=[SOME SORT OF STRING KEY]
Expand All @@ -52,9 +52,9 @@ ARCGIS_CLIENT_SECRET=[SOME SORT OF STRING SECRET]
WEB_MEMORY=4096
WEB_CONCURRENCY=1

IP_STACK_API_KEY=[IP_STACK_SERVICE_API_KEY_VALUE]
IP_STACK_API_KEY=c115255dc3f1f188b12ffef127e23235

LOG_LEVEL= trace|debug|info|warn|error|fatal
LOG_LEVEL= debug

# Apollo Engine Key (optional, see https://www.apollographql.com/docs/platform/schema-registry)
ENGINE_API_KEY=service:XXXXX:XXXXXXXX
APOLLO_KEY=service:bellem:I8bX9IyDhyU8joncCymf-g