Skip to content
This repository was archived by the owner on Mar 26, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 0 additions & 32 deletions .eslintrc

This file was deleted.

32 changes: 16 additions & 16 deletions .github/workflows/pr_test_deploy.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
name: Review deployment
# name: Review deployment

on: pull_request
# on: pull_request

jobs:
test:
runs-on: ubuntu-latest
# jobs:
# test:
# runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2
# steps:
# - name: Checkout repository
# uses: actions/checkout@v2

- name: Set Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18.x
# - name: Set Node.js 18.x
# uses: actions/setup-node@v3
# with:
# node-version: 18.x

- name: Install
run: yarn
# - name: Install
# run: yarn

- name: Check
run: yarn lint ; yarn format
# - name: Check
# run: yarn lint ; yarn format
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ yarn-debug.log*
yarn-error.log*
lerna-debug.log*
.pnpm-debug.log*
yarn.lock

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
Expand Down
12 changes: 0 additions & 12 deletions .prettierrc

This file was deleted.

12 changes: 2 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,20 @@
"scripts": {
"start": "vue-cli-service serve --port 9003",
"build": "vue-cli-service build",
"lint": "eslint --ext .vue --ext .js .",
"lint:fix": "eslint --ext .vue --ext .js --fix .",
"format": "prettier --check .",
"format:write": "prettier --write .",
"serve:standalone": "vue-cli-service serve --mode standalone"
},
"dependencies": {
"core-js": "^3.8.3",
"single-spa-vue": "^2.1.0",
"vue": "^3.2.13",
"vue-router": "^4.1.5"
"vue-router": "^4.1.5",
"profcomff-common": "file:../../packages/common"
},
"devDependencies": {
"@babel/core": "^7.12.16",
"@babel/eslint-parser": "^7.12.16",
"@vue/cli-plugin-babel": "~5.0.0",
"@vue/cli-plugin-eslint": "~5.0.0",
"@vue/cli-service": "~5.0.0",
"@vue/eslint-config-prettier": "^7.0.0",
"eslint": "^7.32.0",
"eslint-plugin-vue": "^8.0.3",
"prettier": "^2.8.3",
"vue-cli-plugin-single-spa": "~3.3.0"
},
"browserslist": [
Expand Down
6 changes: 4 additions & 2 deletions src/components/Menu/ListItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,26 @@
:href="path"
target="_blank"
>
<span class="material-symbols-sharp icon">{{ info.icon }}</span>
<MaterialIcon icon="info.icon" />
{{ info.text }}
</a>
<RouterLink
v-else
class="link"
:to="path"
>
<span class="material-symbols-sharp icon">{{ info.icon }}</span>
<MaterialIcon icon="info.icon" />
{{ info.text }}
</RouterLink>
</template>

<script>
import { format_url } from '@/utils/urls';
import { MaterialIcon } from 'profcomff-common/components';

export default {
name: 'ListItem',
components: { MaterialIcon },
props: {
info: Object,
},
Expand Down
5 changes: 1 addition & 4 deletions src/utils/urls.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
export function format_url(url) {
url = url.replace(
/\$\{\s*marketing_id\s*\}/i,
localStorage.getItem('marketing-id'),
);
url = url.replace(/\$\{\s*marketing_id\s*\}/i, localStorage.getItem('marketing-id'));
return url;
}
13 changes: 4 additions & 9 deletions src/views/Services.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
class="category"
>
<GridView
v-if="category.type == 'grid3'"
v-if="category.type === 'grid3'"
:info="category"
@navigate="route"
/>
<ListView
v-else-if="category.type == 'list'"
v-else-if="category.type === 'list'"
:info="category"
@navigate="route"
/>
Expand Down Expand Up @@ -76,17 +76,12 @@ export default {
let res = await fetch(`${process.env.VUE_APP_API_NAVBAR}/apps`);
this.buttons = await res.json();
} catch (err) {
this.buttons = JSON.parse(
localStorage.getItem('navbar-buttons'),
);
this.buttons = JSON.parse(localStorage.getItem('navbar-buttons'));
}
} catch (err) {
console.log(err);
} finally {
localStorage.setItem(
'navbar-buttons',
JSON.stringify(this.buttons),
);
localStorage.setItem('navbar-buttons', JSON.stringify(this.buttons));
}
this.loaded = true;
},
Expand Down
Loading