Moving api files to their own directory in td.vue

TheRealKANi · Feb 13, 2022 · 773eb61 · 773eb61
1 parent ec16e72
commit 773eb61
Show file tree

Hide file tree

Showing 21 changed files with 54 additions and 56 deletions.
diff --git a/td.vue/src/components/ProviderLoginButton.vue b/td.vue/src/components/ProviderLoginButton.vue
@@ -27,7 +27,7 @@
 <script>
 import { providerNames } from '@/service/provider/providers.js';
 import { AUTH_SET_LOCAL } from '@/store/actions/auth.js';
-import loginApi from '@/service/loginApi.js';
+import loginApi from '@/service/api/loginApi.js';
 import { PROVIDER_SELECTED } from '@/store/actions/provider.js';
 
 export default {

diff --git a/td.vue/src/service/api.js → td.vue/src/service/api/api.js b/td.vue/src/service/api.js → td.vue/src/service/api/api.js
@@ -1,4 +1,4 @@
-import clientFactory from './httpClient.js';
+import clientFactory from '../httpClient.js';
 
 /**
  * Does a GET request to the given resource

diff --git a/td.vue/src/service/loginApi.js → td.vue/src/service/api/loginApi.js b/td.vue/src/service/loginApi.js → td.vue/src/service/api/loginApi.js
diff --git a/td.vue/src/service/threatmodelApi.js → td.vue/src/service/api/threatmodelApi.js b/td.vue/src/service/threatmodelApi.js → td.vue/src/service/api/threatmodelApi.js
diff --git a/td.vue/src/store/modules/auth.js b/td.vue/src/store/modules/auth.js
@@ -1,6 +1,6 @@
 import { AUTH_CLEAR, AUTH_SET_JWT, AUTH_SET_LOCAL, LOGOUT } from '../actions/auth.js';
 import { BRANCH_CLEAR } from '../actions/branch.js';
-import loginApi from '../../service/loginApi.js';
+import loginApi from '../../service/api/loginApi.js';
 import { PROVIDER_CLEAR } from '../actions/provider.js';
 import providers from '../../service/provider/providers.js';
 import { REPOSITORY_CLEAR } from '../actions/repository.js';

diff --git a/td.vue/src/store/modules/branch.js b/td.vue/src/store/modules/branch.js
@@ -5,7 +5,7 @@ import {
     BRANCH_FETCH,
     BRANCH_SELECTED
 } from '../actions/branch.js';
-import threatmodelApi from '../../service/threatmodelApi.js';
+import threatmodelApi from '../../service/api/threatmodelApi.js';
 
 export const clearState = (state) => {
     state.all.length = 0;

diff --git a/td.vue/src/store/modules/repository.js b/td.vue/src/store/modules/repository.js
@@ -5,7 +5,7 @@ import {
     REPOSITORY_FETCH,
     REPOSITORY_SELECTED
 } from '../actions/repository.js';
-import threatmodelApi from '../../service/threatmodelApi.js';
+import threatmodelApi from '../../service/api/threatmodelApi.js';
 
 export const clearState = (state) => {
     state.all.length = 0;

diff --git a/td.vue/src/store/modules/threatmodel.js b/td.vue/src/store/modules/threatmodel.js
@@ -15,7 +15,7 @@ import {
     THREATMODEL_SELECTED,
     THREATMODEL_SET_IMMUTABLE_COPY
 } from '../actions/threatmodel.js';
-import threatmodelApi from '../../service/threatmodelApi.js';
+import threatmodelApi from '../../service/api/threatmodelApi.js';
 
 export const clearState = (state) => {
     state.all.length = 0;

diff --git a/td.vue/src/views/Home.vue b/td.vue/src/views/Home.vue
@@ -42,8 +42,6 @@
 </style>
 
 <script>
-
-
 import { allProviders } from '@/service/provider/providers.js';
 import TdProviderLoginButton from '@/components/ProviderLoginButton.vue';
 

diff --git a/td.vue/src/views/OauthReturn.vue b/td.vue/src/views/OauthReturn.vue
@@ -7,7 +7,7 @@
 import { mapState } from 'vuex';
 
 import { AUTH_SET_JWT } from '@/store/actions/auth.js';
-import loginApi from '@/service/loginApi.js';
+import loginApi from '@/service/api/loginApi.js';
 
 export default {
     name: 'OAuthReturn',

diff --git a/td.vue/tests/unit/components/providerLoginButton.spec.js b/td.vue/tests/unit/components/providerLoginButton.spec.js
@@ -4,7 +4,7 @@ import { shallowMount, createLocalVue } from '@vue/test-utils';
 import Vuex from 'vuex';
 
 import { AUTH_SET_LOCAL } from '@/store/actions/auth.js';
-import loginApi from '@/service/loginApi.js';
+import loginApi from '@/service/api/loginApi.js';
 import { PROVIDER_SELECTED } from '@/store/actions/provider.js';
 import TdProviderLoginButton from '@/components/ProviderLoginButton.vue';
 

diff --git a/td.vue/tests/unit/service/api.spec.js b/td.vue/tests/unit/service/api.spec.js
@@ -1,4 +1,4 @@
-import api from '@/service/api.js';
+import api from '@/service/api/api.js';
 import httpClient from '@/service/httpClient.js';
 
 describe('service/api.js', () => {

diff --git a/td.vue/tests/unit/service/loginApi.spec.js b/td.vue/tests/unit/service/loginApi.spec.js
@@ -1,5 +1,5 @@
-import api from '@/service/api.js';
-import loginApi from '@/service/loginApi.js';
+import api from '@/service/api/api.js';
+import loginApi from '@/service/api/loginApi.js';
 
 describe('service/loginApi.js', () => {
     const provider = 'github';

diff --git a/td.vue/tests/unit/service/threatmodelApi.spec.js b/td.vue/tests/unit/service/threatmodelApi.spec.js
@@ -1,5 +1,5 @@
-import api from '@/service/api.js';
-import threatmodelApi from '@/service/threatmodelApi.js';
+import api from '@/service/api/api.js';
+import threatmodelApi from '@/service/api/threatmodelApi.js';
 
 describe('service/threatmodelApi.js', () => {
     beforeEach(() => {

diff --git a/td.vue/tests/unit/store/modules/auth.spec.js b/td.vue/tests/unit/store/modules/auth.spec.js
@@ -1,7 +1,7 @@
 import { AUTH_CLEAR, AUTH_SET_JWT, AUTH_SET_LOCAL, LOGOUT } from '@/store/actions/auth.js';
 import authModule, { clearState } from '@/store/modules/auth.js';
 import { BRANCH_CLEAR } from '@/store/actions/branch.js';
-import loginApi from '@/service/loginApi.js';
+import loginApi from '@/service/api/loginApi.js';
 import { PROVIDER_CLEAR } from '@/store/actions/provider.js';
 import { REPOSITORY_CLEAR } from '@/store/actions/repository.js';
 import { THREATMODEL_CLEAR } from '@/store/actions/threatmodel.js';

diff --git a/td.vue/tests/unit/store/modules/branch.spec.js b/td.vue/tests/unit/store/modules/branch.spec.js
@@ -1,6 +1,6 @@
 import { BRANCH_CLEAR, BRANCH_FETCH, BRANCH_SELECTED } from '@/store/actions/branch.js';
 import branchModule, { clearState } from '@/store/modules/branch.js';
-import threatmodelApi from '@/service/threatmodelApi.js';
+import threatmodelApi from '@/service/api/threatmodelApi.js';
 
 describe('store/modules/branch.js', () => {
     const mocks = {

diff --git a/td.vue/tests/unit/store/modules/repository.spec.js b/td.vue/tests/unit/store/modules/repository.spec.js
@@ -1,6 +1,6 @@
 import { REPOSITORY_CLEAR, REPOSITORY_FETCH, REPOSITORY_SELECTED } from '@/store/actions/repository.js';
 import repoModule, { clearState } from '@/store/modules/repository.js';
-import threatmodelApi from '@/service/threatmodelApi.js';
+import threatmodelApi from '@/service/api/threatmodelApi.js';
 
 describe('store/modules/repository.js', () => {
     const mocks = {

diff --git a/td.vue/tests/unit/store/modules/threatmodel.spec.js b/td.vue/tests/unit/store/modules/threatmodel.spec.js
@@ -9,7 +9,7 @@ import {
     THREATMODEL_SET_IMMUTABLE_COPY
 } from '@/store/actions/threatmodel.js';
 import threatmodelModule, { clearState } from '@/store/modules/threatmodel.js';
-import threatmodelApi from '@/service/threatmodelApi.js';
+import threatmodelApi from '@/service/api/threatmodelApi.js';
 import { THREATMODEL_CONTRIBUTORS_UPDATED, THREATMODEL_RESTORE } from '../../../../src/store/actions/threatmodel';
 
 describe('store/modules/threatmodel.js', () => {

diff --git a/td.vue/tests/unit/views/home.spec.js b/td.vue/tests/unit/views/home.spec.js
@@ -5,7 +5,7 @@ import Vuex from 'vuex';
 
 import { AUTH_SET_LOCAL } from '@/store/actions/auth.js';
 import Home from '@/views/Home.vue';
-import loginApi from '@/service/loginApi.js';
+import loginApi from '@/service/api/loginApi.js';
 import { PROVIDER_SELECTED } from '@/store/actions/provider.js';
 import router from '@/router/index.js';
 import TdProviderLoginButton from '@/components/ProviderLoginButton.vue';

diff --git a/td.vue/tests/unit/views/oauthReturn.spec.js b/td.vue/tests/unit/views/oauthReturn.spec.js
@@ -2,7 +2,7 @@ import { shallowMount, createLocalVue } from '@vue/test-utils';
 import Vuex from 'vuex';
 
 import { AUTH_SET_JWT } from '@/store/actions/auth.js';
-import loginApi from '@/service/loginApi.js';
+import loginApi from '@/service/api/loginApi.js';
 import OAuthReturn from '@/views/OauthReturn.vue';
 
 describe('views/OauthReturn.vue', () => {

diff --git a/td.vue/vue.config.js b/td.vue/vue.config.js
@@ -23,51 +23,51 @@ module.exports = {
         electronBuilder:{
             mainProcessFile: './src/td.desktop.js',
             builderOptions: {
-                "appId": "org.owasp.threatdragon",
-                "productName": "OWASP-Threat-Dragon",
-                "publish": {
-                    "provider": "github"
+                'appId': 'org.owasp.threatdragon',
+                'productName': 'OWASP-Threat-Dragon',
+                'publish': {
+                    'provider': 'github'
                 },
-                "afterSign": "electron-builder-notarize",
-                "mac": {
-                    "category": "public.app-category.developer-tools",
-                    "icon": "./src/icons/icon.icns",
-                    "entitlements": "./node_modules/electron-builder-notarize/entitlements.mac.inherit.plist",
-                    "hardenedRuntime": true,
-                    "target": [
-                        "dmg",
-                        "zip"
+                'afterSign': 'electron-builder-notarize',
+                'mac': {
+                    'category': 'public.app-category.developer-tools',
+                    'icon': './src/icons/icon.icns',
+                    'entitlements': './node_modules/electron-builder-notarize/entitlements.mac.inherit.plist',
+                    'hardenedRuntime': true,
+                    'target': [
+                        'dmg',
+                        'zip'
                     ]
                 },
-                "win": {
-                    "icon": "./src/icons/icon.ico",
-                    "target": [
+                'win': {
+                    'icon': './src/icons/icon.ico',
+                    'target': [
                         {
-                            "target": "nsis",
-                            "arch": [
-                                "ia32",
-                                "x64"
+                            'target': 'nsis',
+                            'arch': [
+                                'ia32',
+                                'x64'
                             ]
                         }
                     ]
                 },
-                "linux": {
-                    "category": "Development",
-                    "executableName": "threat-dragon",
-                    "icon": "./src/icons/td-256.png",
-                    "synopsis": "OWASP Threat Dragon",
-                    "target": [
-                        "AppImage",
-                        "snap",
-                        "deb",
-                        "rpm"
+                'linux': {
+                    'category': 'Development',
+                    'executableName': 'threat-dragon',
+                    'icon': './src/icons/td-256.png',
+                    'synopsis': 'OWASP Threat Dragon',
+                    'target': [
+                        'AppImage',
+                        'snap',
+                        'deb',
+                        'rpm'
                     ]
                 },
-                "snap": {
-                    "grade": "stable",
-                    "summary": "OWASP Threat Dragon, desktop version",
-                    "description": "OWASP Threat Dragon is a free, open-source, cross-platform threat modelling application",
-                    "title": "OWASP Threat Dragon"
+                'snap': {
+                    'grade': 'stable',
+                    'summary': 'OWASP Threat Dragon, desktop version',
+                    'description': 'OWASP Threat Dragon is a free, open-source, cross-platform threat modelling application',
+                    'title': 'OWASP Threat Dragon'
                 }
             }
         }