@@ -33,7 +35,7 @@
id="includeNonMergable"
v-model="includeNonMergable"
type="checkbox"
- />
+ >
@@ -78,89 +80,81 @@
-
diff --git a/components/TreeItem.vue b/components/TreeItem.vue
index 74619fee..e7f4dc32 100644
--- a/components/TreeItem.vue
+++ b/components/TreeItem.vue
@@ -35,49 +35,36 @@
-
diff --git a/components/TreeView.vue b/components/TreeView.vue
index 8305c270..af0227b0 100644
--- a/components/TreeView.vue
+++ b/components/TreeView.vue
@@ -8,16 +8,11 @@
-
diff --git a/cypress.config.ts b/cypress.config.ts
index c3d94a6e..ee1eda26 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -1,9 +1,9 @@
import { defineConfig } from "cypress";
-const fs = require('fs');
+import fs from 'fs';
export default defineConfig({
e2e: {
- setupNodeEvents(on, config) {
+ setupNodeEvents(on) {
// Disable videos for successful tests
on('after:spec', (spec, results) => {
// If a retry failed, save the video, otherwise delete it to save time by not compressing it.
diff --git a/cypress/e2e/data-models.cy.js b/cypress/e2e/data-models.cy.js
index 278b4b33..88be3435 100644
--- a/cypress/e2e/data-models.cy.js
+++ b/cypress/e2e/data-models.cy.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
describe('Test that we get the right output when using the data models options', () => {
beforeEach(() => {
cy.visit('/')
diff --git a/cypress/e2e/fields.cy.js b/cypress/e2e/fields.cy.js
index 86f1fdb0..4605b6b1 100644
--- a/cypress/e2e/fields.cy.js
+++ b/cypress/e2e/fields.cy.js
@@ -1,3 +1,5 @@
+/* eslint-disable */
+
describe('Test the input fields', () => {
beforeEach(() => {
cy.visit('/')
diff --git a/cypress/e2e/file-output.cy.js b/cypress/e2e/file-output.cy.js
index 1809d659..ba936f34 100644
--- a/cypress/e2e/file-output.cy.js
+++ b/cypress/e2e/file-output.cy.js
@@ -1,3 +1,5 @@
+/* eslint-disable */
+
describe('Check that the generated output files are correct', () => {
beforeEach(() => {
cy.visit('/')
diff --git a/cypress/index.d.ts b/cypress/index.d.ts
deleted file mode 100644
index 6e1084ad..00000000
--- a/cypress/index.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-///
-
-declare namespace Cypress {
- interface Chainable
{
- setValidData(): Chainable;
- enableDataModels(): Chainable;
- disableDataModels(): Chainable;
- enableAdminGrid(): Chainable;
- disableAdminGrid(): Chainable;
- enableSearch(): Chainable;
- addField(fieldName: string, inputType: string): Chainable;
- openFileByPath(filename: string): Chainable;
- }
-}
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 9da28c58..efd05234 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -1,6 +1,4 @@
-// @ts-check
-///
-
+///
// ***********************************************
// This example commands.ts shows you how to
// create various custom commands and overwrite
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
deleted file mode 100644
index 2810324d..00000000
--- a/cypress/tsconfig.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "extends": "../tsconfig.json",
- "include": ["./**/*.ts", "../cypress.d.ts"],
- "exclude": [],
- "compilerOptions": {
- "types": ["cypress", "@percy/cypress"],
- "lib": ["es2015", "dom"],
- "isolatedModules": false,
- "allowJs": true,
- "noEmit": true
- }
-}
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 00000000..934c3a1d
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,6 @@
+// @ts-check
+import withNuxt from './.nuxt/eslint.config.mjs'
+
+export default withNuxt(
+ // Your custom configs here
+)
diff --git a/functions/xml.ts b/functions/xml.ts
index 451db09b..88fcf9ee 100644
--- a/functions/xml.ts
+++ b/functions/xml.ts
@@ -1,5 +1,4 @@
-import { EOL } from 'os'
-import AttributeInterface from '~/interfaces/AttributeInterface'
+import type AttributeInterface from '~/interfaces/AttributeInterface'
export function createItem(
xml: XMLDocument,
@@ -29,6 +28,7 @@ const stringTimesN = (n: number, char: string) => Array(n + 1).join(char)
// Adapted from https://gist.github.com/sente/1083506
export function prettifyXml(xmlInput: string): string {
+ const EOL = '\n'
const indentString = stringTimesN(2, ' ')
let formatted = ''
@@ -47,7 +47,7 @@ export function prettifyXml(xmlInput: string): string {
if (pad !== 0) {
pad -= 1
}
- } else if (line.match(/^<\w([^>]*[^\/])?>.*$/)) {
+ } else if (line.match(/^<\w([^>]*[^/])?>.*$/)) {
indent = 1
} else {
indent = 0
diff --git a/interfaces/GeneratesFileInterface.ts b/interfaces/GeneratesFileInterface.ts
index 42c4ecdf..cafe6394 100644
--- a/interfaces/GeneratesFileInterface.ts
+++ b/interfaces/GeneratesFileInterface.ts
@@ -1,7 +1,7 @@
export default interface GeneratesFileInterface {
- getPath(): String
+ getPath(): string
- getContents(): String
+ getContents(): string
- isMergeable(): Boolean
+ isMergeable(): boolean
}
diff --git a/interfaces/TreeItemInterface.ts b/interfaces/TreeItemInterface.ts
index b4ae0453..77921189 100644
--- a/interfaces/TreeItemInterface.ts
+++ b/interfaces/TreeItemInterface.ts
@@ -1,6 +1,6 @@
export default interface TreeItemInterface {
- Name: String
- Contents: String | null
+ Name: string
+ Contents: string | null
Children: TreeItemInterface | null
- CurrentPath: String
+ CurrentPath: string
}
diff --git a/jest.config.js b/jest.config.js
deleted file mode 100644
index 152978fd..00000000
--- a/jest.config.js
+++ /dev/null
@@ -1,18 +0,0 @@
-module.exports = {
- moduleNameMapper: {
- '^@/(.*)$': '/$1',
- '^~/(.*)$': '/$1',
- '^vue$': 'vue/dist/vue.common.js',
- },
- moduleFileExtensions: ['ts', 'js', 'vue', 'json'],
- transform: {
- '^.+\\.ts$': 'ts-jest',
- '^.+\\.js$': 'babel-jest',
- '.*\\.(vue)$': 'vue-jest',
- },
- collectCoverage: true,
- collectCoverageFrom: [
- '/components/**/*.vue',
- '/pages/**/*.vue',
- ],
-}
diff --git a/jsconfig.json b/jsconfig.json
deleted file mode 100644
index 29037a62..00000000
--- a/jsconfig.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "compilerOptions": {
- "baseUrl": ".",
- "paths": {
- "~/*": ["./*"],
- "@/*": ["./*"],
- "~~/*": ["./*"],
- "@@/*": ["./*"]
- }
- },
- "exclude": ["node_modules", ".nuxt", "dist"]
-}
diff --git a/layouts/README.md b/layouts/README.md
deleted file mode 100644
index cad1ad57..00000000
--- a/layouts/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# LAYOUTS
-
-**This directory is not required, you can delete it if you don't want to use it.**
-
-This directory contains your Application Layouts.
-
-More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/views#layouts).
diff --git a/middleware/README.md b/middleware/README.md
deleted file mode 100644
index 01595ded..00000000
--- a/middleware/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# MIDDLEWARE
-
-**This directory is not required, you can delete it if you don't want to use it.**
-
-This directory contains your application middleware.
-Middleware let you define custom functions that can be run before rendering either a page or a group of pages.
-
-More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/routing#middleware).
diff --git a/nuxt.config.js b/nuxt.config.js
deleted file mode 100644
index 760f0e1e..00000000
--- a/nuxt.config.js
+++ /dev/null
@@ -1,68 +0,0 @@
-export default {
- // Disable server-side rendering: https://go.nuxtjs.dev/ssr-mode
- ssr: false,
-
- // Target: https://go.nuxtjs.dev/config-target
- target: 'static',
-
- // Global page headers: https://go.nuxtjs.dev/config-head
- head: {
- title: 'Magento 2 Model Generator',
- meta: [
- { charset: 'utf-8' },
- { name: 'viewport', content: 'width=device-width, initial-scale=1' },
- { hid: 'description', name: 'description', content: '' },
- ],
- link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.png' }],
- },
-
- // Global CSS: https://go.nuxtjs.dev/config-css
- css: [
- '~/assets/css/tailwind.css',
- { src: 'vue-code-highlight/themes/prism.css', lang: 'css' },
- ],
-
- // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins
- plugins: ['~/plugins/vuex-persist'],
-
- // Auto import components: https://go.nuxtjs.dev/config-components
- components: true,
-
- // Modules for dev and build (recommended): https://go.nuxtjs.dev/config-modules
- buildModules: [
- // https://go.nuxtjs.dev/typescript
- '@nuxt/typescript-build',
- '@nuxt/postcss8',
- ],
-
- // Modules: https://go.nuxtjs.dev/config-modules
- modules: [
- // https://go.nuxtjs.dev/pwa
- '@nuxtjs/pwa',
- ],
-
- // PWA module configuration: https://go.nuxtjs.dev/pwa
- pwa: {
- manifest: {
- lang: 'en',
- },
- },
-
- // Build Configuration: https://go.nuxtjs.dev/config-build
- build: {
- postcss: {
- plugins: {
- tailwindcss: {},
- autoprefixer: {},
- },
- },
- extend(config) {
- config.module.rules.push({
- enforce: 'pre',
- test: /\.stub$/,
- loader: 'raw-loader',
- exclude: /(node_modules)/,
- })
- },
- },
-}
diff --git a/nuxt.config.ts b/nuxt.config.ts
new file mode 100644
index 00000000..f8d40262
--- /dev/null
+++ b/nuxt.config.ts
@@ -0,0 +1,12 @@
+// https://nuxt.com/docs/api/configuration/nuxt-config
+
+export default defineNuxtConfig({
+ devtools: { enabled: true },
+ ssr: false,
+ modules: [
+ '@nuxtjs/tailwindcss',
+ '@pinia/nuxt',
+ '@pinia-plugin-persistedstate/nuxt',
+ "@nuxt/eslint"
+ ],
+})
\ No newline at end of file
diff --git a/output/FileList.ts b/output/FileList.ts
index 7a20debf..f8673e35 100644
--- a/output/FileList.ts
+++ b/output/FileList.ts
@@ -1,22 +1,22 @@
import StateAware from '~/output/StateAware'
import GeneratedFile from '~/output/GeneratedFile'
import UiComponent from '~/output/listing/UiComponent'
-import GeneratesFileInterface from '~/interfaces/GeneratesFileInterface'
+import type GeneratesFileInterface from '~/interfaces/GeneratesFileInterface'
import DbSchemaWhitelist from '~/output/listing/DbSchemaWhitelist'
import DbSchema from '~/output/listing/DbSchema'
export default class FileList extends StateAware {
generate() {
const files = [
- new GeneratedFile(this.state, 'Api/ModelNameRepositoryInterface.php.stub'),
- new GeneratedFile(this.state, 'Api/Data/ModelNameSearchResultsInterface.php.stub'),
- new GeneratedFile(this.state, 'Api/Data/ModelNameInterface.php.stub'),
- new GeneratedFile(this.state, 'etc/di.xml.stub'),
- new GeneratedFile(this.state, 'Model/ModelNameSearchResults.php.stub'),
- new GeneratedFile(this.state, 'Model/ResourceModel/ModelName.php.stub'),
- new GeneratedFile(this.state, 'Model/ResourceModel/ModelName/Collection.php.stub'),
- new DbSchemaWhitelist(this.state),
- new DbSchema(this.state),
+ new GeneratedFile('Api/ModelNameRepositoryInterface.php.stub'),
+ new GeneratedFile('Api/Data/ModelNameSearchResultsInterface.php.stub'),
+ new GeneratedFile('Api/Data/ModelNameInterface.php.stub'),
+ new GeneratedFile('etc/di.xml.stub'),
+ new GeneratedFile('Model/ModelNameSearchResults.php.stub'),
+ new GeneratedFile('Model/ResourceModel/ModelName.php.stub'),
+ new GeneratedFile('Model/ResourceModel/ModelName/Collection.php.stub'),
+ new DbSchemaWhitelist(),
+ new DbSchema(),
]
if (this.isAdmingrid()) {
@@ -24,37 +24,37 @@ export default class FileList extends StateAware {
}
if (this.includeModuleRegistration()) {
- files.push(new GeneratedFile(this.state, 'etc/module.xml.stub'))
- files.push(new GeneratedFile(this.state, 'registration.php.stub'))
+ files.push(new GeneratedFile('etc/module.xml.stub'))
+ files.push(new GeneratedFile('registration.php.stub'))
}
if (this.includeDataModels()) {
- files.push(new GeneratedFile(this.state, 'Model/ModelNameRepository.php.stub', 'Model/ModelNameRepositoryWithDataModel.php.stub'))
- files.push(new GeneratedFile(this.state, 'Model/ModelName.php.stub', 'Model/ModelNameWithDataModel.php.stub'))
- files.push(new GeneratedFile(this.state, 'Model/Data/ModelName.php.stub'))
+ files.push(new GeneratedFile('Model/ModelNameRepository.php.stub', 'Model/ModelNameRepositoryWithDataModel.php.stub'))
+ files.push(new GeneratedFile('Model/ModelName.php.stub', 'Model/ModelNameWithDataModel.php.stub'))
+ files.push(new GeneratedFile('Model/Data/ModelName.php.stub'))
} else {
- files.push(new GeneratedFile(this.state, 'Model/ModelNameRepository.php.stub', 'Model/ModelNameRepositoryWithoutDataModel.php.stub'))
- files.push(new GeneratedFile(this.state, 'Model/ModelName.php.stub', 'Model/ModelNameWithoutDataModel.php.stub'))
+ files.push(new GeneratedFile('Model/ModelNameRepository.php.stub', 'Model/ModelNameRepositoryWithoutDataModel.php.stub'))
+ files.push(new GeneratedFile('Model/ModelName.php.stub', 'Model/ModelNameWithoutDataModel.php.stub'))
}
return files
}
private addAdmingridFiles(files: GeneratesFileInterface[]) {
- files.push(new GeneratedFile(this.state, 'etc/acl.xml.stub'));
- files.push(new GeneratedFile(this.state, 'Controller/Adminhtml/ModelName/Edit.php.stub'));
- files.push(new GeneratedFile(this.state, 'Controller/Adminhtml/ModelName/Delete.php.stub'));
- files.push(new GeneratedFile(this.state, 'Controller/Adminhtml/ModelName/Index.php.stub'));
+ files.push(new GeneratedFile('etc/acl.xml.stub'));
+ files.push(new GeneratedFile('Controller/Adminhtml/ModelName/Edit.php.stub'));
+ files.push(new GeneratedFile('Controller/Adminhtml/ModelName/Delete.php.stub'));
+ files.push(new GeneratedFile('Controller/Adminhtml/ModelName/Index.php.stub'));
- files.push(new GeneratedFile(this.state, 'view/adminhtml/layout/BaseName_index.xml.stub'))
- files.push(new UiComponent(this.state))
+ files.push(new GeneratedFile('view/adminhtml/layout/BaseName_index.xml.stub'))
+ files.push(new UiComponent())
if (this.isMassActions()) {
- files.push(new GeneratedFile(this.state, 'Controller/Adminhtml/ModelName/MassDelete.php.stub'))
+ files.push(new GeneratedFile('Controller/Adminhtml/ModelName/MassDelete.php.stub'))
}
if (this.isNewButtonsEnabled()) {
- files.push(new GeneratedFile(this.state, 'Controller/Adminhtml/ModelName/NewAction.php.stub'))
+ files.push(new GeneratedFile('Controller/Adminhtml/ModelName/NewAction.php.stub'))
}
}
}
diff --git a/output/GeneratedFile.ts b/output/GeneratedFile.ts
index b57dfe48..462cb612 100644
--- a/output/GeneratedFile.ts
+++ b/output/GeneratedFile.ts
@@ -1,14 +1,35 @@
import Mustache from 'mustache'
import StateAware from '~/output/StateAware'
-import GeneratesFileInterface from '~/interfaces/GeneratesFileInterface'
+import type GeneratesFileInterface from '~/interfaces/GeneratesFileInterface'
+import ApiModelNameRepositoryInterfacePhpStub from '@/assets/stubs/Api/ModelNameRepositoryInterface.php.stub?raw'
+import ApiDataModelNameSearchResultsInterfacePhpStub from '@/assets/stubs/Api/Data/ModelNameSearchResultsInterface.php.stub?raw'
+import ApiDataModelNameInterfacePhpStub from '@/assets/stubs/Api/Data/ModelNameInterface.php.stub?raw'
+import etcdiXmlStub from '@/assets/stubs/etc/di.xml.stub?raw'
+import ModelModelNameSearchResultsPhpStub from '@/assets/stubs/Model/ModelNameSearchResults.php.stub?raw'
+import ModelResourceModelModelNamePhpStub from '@/assets/stubs/Model/ResourceModel/ModelName.php.stub?raw'
+import ModelResourceModelModelNameCollectionPhpStub from '@/assets/stubs/Model/ResourceModel/ModelName/Collection.php.stub?raw'
+import etcmoduleXmlStub from '@/assets/stubs/etc/module.xml.stub?raw'
+import registrationPhpStub from '@/assets/stubs/registration.php.stub?raw'
+import ModelModelNameRepositoryWithDataModelPhpStub from '@/assets/stubs/Model/ModelNameRepositoryWithDataModel.php.stub?raw'
+import ModelModelNameWithDataModelPhpStub from '@/assets/stubs/Model/ModelNameWithDataModel.php.stub?raw'
+import ModelModelNameRepositoryWithoutDataModelPhpStub from '@/assets/stubs/Model/ModelNameRepositoryWithoutDataModel.php.stub?raw'
+import ModelModelNameWithoutDataModelPhpStub from '@/assets/stubs/Model/ModelNameWithoutDataModel.php.stub?raw'
+import ModelDataModelNamePhpStub from '@/assets/stubs/Model/Data/ModelName.php.stub?raw'
+import etcaclXmlStub from '@/assets/stubs/etc/acl.xml.stub?raw'
+import ControllerAdminhtmlModelNameEditPhpStub from '@/assets/stubs/Controller/Adminhtml/ModelName/Edit.php.stub?raw'
+import ControllerAdminhtmlModelNameDeletePhpStub from '@/assets/stubs/Controller/Adminhtml/ModelName/Delete.php.stub?raw'
+import ControllerAdminhtmlModelNameIndexPhpStub from '@/assets/stubs/Controller/Adminhtml/ModelName/Index.php.stub?raw'
+import viewadminhtmllayoutBaseName_indexXmlStub from '@/assets/stubs/view/adminhtml/layout/BaseName_index.xml.stub?raw'
+import ControllerAdminhtmlModelNameMassDeletePhpStub from '@/assets/stubs/Controller/Adminhtml/ModelName/MassDelete.php.stub?raw'
+import ControllerAdminhtmlModelNameNewActionPhpStub from '@/assets/stubs/Controller/Adminhtml/ModelName/NewAction.php.stub?raw'
export default class GeneratedFile extends StateAware implements GeneratesFileInterface {
- private path: String
+ private path: string
- private source: String | null
+ private source: string | null
- constructor(state: any, path: String, source: String | null = null) {
- super(state)
+ constructor(path: string, source: string | null = null) {
+ super()
this.path = path
this.source = source
@@ -28,23 +49,45 @@ export default class GeneratedFile extends StateAware implements GeneratesFileIn
.replace('.stub', '')
}
- getContents(): String {
- const contents = require('~/assets/stubs/' + this.source).default
+ getContents(): string {
+ const mapping = {
+ 'Api/ModelNameRepositoryInterface.php.stub': ApiModelNameRepositoryInterfacePhpStub,
+ 'Api/Data/ModelNameSearchResultsInterface.php.stub': ApiDataModelNameSearchResultsInterfacePhpStub,
+ 'Api/Data/ModelNameInterface.php.stub': ApiDataModelNameInterfacePhpStub,
+ 'etc/di.xml.stub': etcdiXmlStub,
+ 'Model/ModelNameSearchResults.php.stub': ModelModelNameSearchResultsPhpStub,
+ 'Model/ResourceModel/ModelName.php.stub': ModelResourceModelModelNamePhpStub,
+ 'Model/ResourceModel/ModelName/Collection.php.stub': ModelResourceModelModelNameCollectionPhpStub,
+ 'etc/module.xml.stub': etcmoduleXmlStub,
+ 'registration.php.stub': registrationPhpStub,
+ 'Model/ModelNameRepositoryWithDataModel.php.stub': ModelModelNameRepositoryWithDataModelPhpStub,
+ 'Model/ModelNameWithDataModel.php.stub': ModelModelNameWithDataModelPhpStub,
+ 'Model/ModelNameRepositoryWithoutDataModel.php.stub': ModelModelNameRepositoryWithoutDataModelPhpStub,
+ 'Model/ModelNameWithoutDataModel.php.stub': ModelModelNameWithoutDataModelPhpStub,
+ 'Model/Data/ModelName.php.stub': ModelDataModelNamePhpStub,
+ 'etc/acl.xml.stub': etcaclXmlStub,
+ 'Controller/Adminhtml/ModelName/Edit.php.stub': ControllerAdminhtmlModelNameEditPhpStub,
+ 'Controller/Adminhtml/ModelName/Delete.php.stub': ControllerAdminhtmlModelNameDeletePhpStub,
+ 'Controller/Adminhtml/ModelName/Index.php.stub': ControllerAdminhtmlModelNameIndexPhpStub,
+ 'view/adminhtml/layout/BaseName_index.xml.stub': viewadminhtmllayoutBaseName_indexXmlStub,
+ 'Controller/Adminhtml/ModelName/MassDelete.php.stub': ControllerAdminhtmlModelNameMassDeletePhpStub,
+ 'Controller/Adminhtml/ModelName/NewAction.php.stub': ControllerAdminhtmlModelNameNewActionPhpStub,
+ }
- return Mustache.render(contents, this.fileContext())
+ return Mustache.render(mapping[this.source], this.fileContext())
}
- snakeToCamel(input: String) {
+ snakeToCamel(input: string) {
return input.replace(/([-_][a-z])/g, (group) =>
group.toUpperCase().replace('-', '').replace('_', '')
)
}
- capitalizeFirstLetter(input: String) {
+ capitalizeFirstLetter(input: string) {
return input.charAt(0).toUpperCase() + input.slice(1)
}
- isMergeable(): Boolean {
+ isMergeable(): boolean {
return .
diff --git a/plugins/vuex-persist.js b/plugins/vuex-persist.js
deleted file mode 100644
index 4a1549cd..00000000
--- a/plugins/vuex-persist.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import VuexPersist from 'vuex-persist'
-
-export default ({ store }) => {
- new VuexPersist({
- key: 'magento2-model-generator',
- }).plugin(store)
-}
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 00000000..18993ad9
Binary files /dev/null and b/public/favicon.ico differ
diff --git a/renovate.json b/renovate.json
deleted file mode 100644
index f45d8f11..00000000
--- a/renovate.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "extends": [
- "config:base"
- ]
-}
diff --git a/run-cypress.sh b/run-cypress.sh
index 95428b05..e8e42f52 100644
--- a/run-cypress.sh
+++ b/run-cypress.sh
@@ -1,8 +1,8 @@
echo "Running nuxt generate"
nuxt generate
-echo "Running yarn start"
-nohup yarn start &
+echo "Running yarn preview"
+nohup yarn preview &
echo "Running cypress install"
cypress install
diff --git a/server/tsconfig.json b/server/tsconfig.json
new file mode 100644
index 00000000..b9ed69c1
--- /dev/null
+++ b/server/tsconfig.json
@@ -0,0 +1,3 @@
+{
+ "extends": "../.nuxt/tsconfig.server.json"
+}
diff --git a/store/README.md b/store/README.md
deleted file mode 100644
index 1972d277..00000000
--- a/store/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# STORE
-
-**This directory is not required, you can delete it if you don't want to use it.**
-
-This directory contains your Vuex Store files.
-Vuex Store option is implemented in the Nuxt.js framework.
-
-Creating a file in this directory automatically activates the option in the framework.
-
-More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/vuex-store).
diff --git a/store/admingrid.ts b/store/admingrid.ts
deleted file mode 100644
index fb7523a6..00000000
--- a/store/admingrid.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-const defaultState = () => ({
- enabled: true,
- bookmarks: false,
- paging: true,
- sticky: true,
- search: false,
- massactions: false,
- filters: false,
- newButton: true,
-})
-
-export const state = defaultState()
-
-export const mutations = {
- setEnabled(state: any, value: boolean) {
- state.enabled = value
- },
- setBookmarks(state: any, value: boolean) {
- state.bookmarks = value
- },
- setPaging(state: any, value: boolean) {
- state.paging = value
- },
- setSticky(state: any, value: boolean) {
- state.sticky = value
- },
- setSearch(state: any, value: boolean) {
- state.search = value
- },
- setMassactions(state: any, value: boolean) {
- state.massactions = value
- },
- setFilters(state: any, value: boolean) {
- state.filters = value
- },
- setNewButton(state: any, value: boolean) {
- state.newButton = value
- },
- reset(state: any) {
- Object.assign(state, defaultState())
- },
-}
diff --git a/store/download.ts b/store/download.ts
deleted file mode 100644
index 9aeee016..00000000
--- a/store/download.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-const defaultState = () => ({
- includeNonMergable: true,
-})
-
-export const state = defaultState()
-
-export const mutations = {
- setIncludeNonMergable(state: any, value: any) {
- state.includeNonMergable = value
- },
- reset(state: any) {
- state.includeNonMergable = true
- },
-}
diff --git a/store/fathom.ts b/store/fathom.ts
deleted file mode 100644
index f4d30c92..00000000
--- a/store/fathom.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-const defaultState = () => ({
- triggered: false,
-})
-
-export const state = defaultState()
-
-export const mutations = {
- setTriggered(state: any) {
- state.triggered = true
- },
- reset(state: any) {
- state.triggered = false
- },
-}
diff --git a/store/model.ts b/store/model.ts
deleted file mode 100644
index 9109450f..00000000
--- a/store/model.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-interface Model {
- name: string
- tableName: string
-}
-
-const defaultState = () => ({
- name: '',
- tableName: '',
-})
-
-export const state = defaultState()
-
-export const mutations = {
- setName(state: any, text: string) {
- state.name = text
- },
-
- setTableName(state: any, text: string) {
- state.tableName = text
- },
-
- reset(state: any) {
- Object.assign(state, defaultState())
- },
-}
diff --git a/store/module.ts b/store/module.ts
deleted file mode 100644
index f1ee9c84..00000000
--- a/store/module.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-const defaultState = () => ({
- vendorName: '',
- moduleName: '',
- includeModuleRegistration: false,
- includeDataModels: false,
-})
-
-export const state = () => defaultState()
-
-export const mutations = {
- setVendorName(state: any, text: string) {
- state.vendorName = text
- },
-
- setModuleName(state: any, text: string) {
- state.moduleName = text
- },
-
- setIncludeModuleRegistration(state: any, value: boolean) {
- state.includeModuleRegistration = value
- },
-
- setIncludeDataModels(state: any, value: boolean) {
- state.includeDataModels = value
- },
-
- reset(state: any) {
- Object.assign(state, defaultState())
- },
-}
diff --git a/store/table.ts b/store/table.ts
deleted file mode 100644
index 9cc71661..00000000
--- a/store/table.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import ColumnInterface from '~/interfaces/ColumnInterface'
-
-const defaultState = () => ({
- columns: [
- {
- fieldName: 'entity_id',
- inputType: 'int',
- },
- {
- fieldName: '',
- inputType: '',
- },
- ],
-})
-
-export const state = defaultState()
-
-export const mutations = {
- moveColumnUp(state: any, column: ColumnInterface) {
- const index = state.columns.indexOf(column)
- if (index > 0) {
- const [removedColumn] = state.columns.splice(index, 1)
- state.columns.splice(index - 1, 0, removedColumn)
- }
- },
-
- moveColumnDown(state: any, column: ColumnInterface) {
- const index = state.columns.indexOf(column)
- if (index < state.columns.length - 1) {
- const [removedColumn] = state.columns.splice(index, 1)
- state.columns.splice(index + 1, 0, removedColumn)
- }
- },
-
- addColumn(state: any, column: ColumnInterface) {
- state.columns.push(column)
- },
-
- updateColumn(state: any, data: any) {
- state.columns.splice(data.index, 1, data.column)
- },
-
- removeColumn(state: any, column: ColumnInterface) {
- state.columns.splice(state.columns.indexOf(column), 1)
- },
-
- reset(state: any) {
- Object.assign(state, defaultState())
- },
-}
diff --git a/stores/admingridStore.ts b/stores/admingridStore.ts
new file mode 100644
index 00000000..410bd5b8
--- /dev/null
+++ b/stores/admingridStore.ts
@@ -0,0 +1,55 @@
+import { defineStore } from 'pinia'
+
+export const useAdminGridStore = defineStore('admingrid', {
+ state: () => ({
+ enabled: true,
+ bookmarks: false,
+ paging: true,
+ sticky: true,
+ search: false,
+ massactions: false,
+ filters: false,
+ newButton: true,
+ }),
+
+ actions: {
+ setEnabled(value: boolean) {
+ this.enabled = value
+ },
+ setBookmarks(value: boolean) {
+ this.bookmarks = value
+ },
+ setPaging(value: boolean) {
+ this.paging = value
+ },
+ setSticky(value: boolean) {
+ this.sticky = value
+ },
+ setSearch(value: boolean) {
+ this.search = value
+ },
+ setMassactions(value: boolean) {
+ this.massactions = value
+ },
+ setFilters(value: boolean) {
+ this.filters = value
+ },
+ setNewButton(value: boolean) {
+ this.newButton = value
+ },
+ reset() {
+ this.enabled = true
+ this.bookmarks = false
+ this.paging = true
+ this.sticky = true
+ this.search = false
+ this.massactions = false
+ this.filters = false
+ this.newButton = true
+ },
+ },
+
+ persist: true,
+})
+
+export type AdminGridStore = ReturnType