diff --git a/env.sh b/env.sh index f14b723..c6159cd 100644 --- a/env.sh +++ b/env.sh @@ -1,14 +1,25 @@ INT_DIR="@/freeleaps-int/sites/freeleaps/deploy" DEPLOY_DIR="deploy" +DEV_BOX_DIR="../devbox" +DEV_ENV="$DEPLOY_DIR/.dev.env" FE_ENV="$DEPLOY_DIR/.fe.env" + if [ -d "$INT_DIR" ]; then - cp $INT_DIR/. deploy -r -u + cp $INT_DIR/. $DEPLOY_DIR -r -u +fi +if [ -d "$DEV_BOX_DIR" ]; then + cp $DEV_BOX_DIR/. $DEPLOY_DIR -r -u + source $DEV_ENV fi if [ -f $FE_ENV ] then - export $(cat $FE_ENV | sed 's/#.*//g' | xargs) + source $FE_ENV fi +sudo npm cache clean -f +sudo npm install -g n +sudo n stable +hash -r npm config set "@fortawesome:registry" https://npm.fontawesome.com/ npm config set "//npm.fontawesome.com/:_authToken" $FONTAWESOME_AUTH_TOKEN \ No newline at end of file diff --git a/frontend/src/headers/HeaderUser.vue b/frontend/src/headers/HeaderUser.vue index 02f8e3b..0b72e51 100644 --- a/frontend/src/headers/HeaderUser.vue +++ b/frontend/src/headers/HeaderUser.vue @@ -45,8 +45,8 @@
- - - -
-
+
- +
-
+
- +
- +

{{ passwordOperation.message }} @@ -133,104 +81,51 @@

-
+
- +
- +

{{ emailOperation.message }}

-
-
+
- +
- +

{{ mobileOperation.message }}

-
@@ -242,13 +137,8 @@
- - - -
-
+
- +
- +
-
+
- +
-
+
- +
- - - -
-
+
- +
- + {{ userProfile.account.provider.expected_salary.currency }}
-
- {{ $t('Have you linked your strip account?') }} + {{ $t('Have you linked your strip account?') }}
{{ @@ -672,49 +445,26 @@
-
+
{{ $t('Apply self-intro template') }}
- +
-
+

-

-
+