Skip to content

Commit

Permalink
Merge pull request #296 from tks18/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
tks18 authored Jun 23, 2021
2 parents 61bd4cb + 0a9b09d commit a25f834
Show file tree
Hide file tree
Showing 75 changed files with 5,543 additions and 4,492 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
webpack.config.js
6 changes: 6 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": true
}
2 changes: 2 additions & 0 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ cd vuejs
printf ".\n.\n.\n.\n.\n"
printf "Setting Default Environment Variables"
export VUE_APP_SECRET_PASS=${SECRET_PASS}
export VUE_APP_BUILD="prod"
export VUE_APP_LOCAL=false
export VUE_APP_CDN_PATH=https://cdn.jsdelivr.net/gh/tks18/gindex-v4@master/themes/THEME/
printf "\n"
printf "Getting Latest themes and Variants"
Expand Down
2 changes: 1 addition & 1 deletion vetur.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
projects: [
{
root: './vuejs',
package: './vuejs/package.json',
package: './package.json',
snippetFolder: './vuejs/.vscode/vetur/snippets',
globalComponents: ['./vuejs/src/components/**/*.vue'],
},
Expand Down
3 changes: 3 additions & 0 deletions vuejs/.browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
> 1%
last 2 versions
not dead
72 changes: 72 additions & 0 deletions vuejs/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"env": {
"browser": true,
"es2021": true
},
"extends": [
"plugin:vue/base",
"plugin:vue/essential",
"plugin:vue/recommended",
"plugin:vue/strongly-recommended",
"eslint:recommended",
"airbnb",
"google",
"standard"
],
"parser": "vue-eslint-parser",
"parserOptions": {
"parser": "@babel/eslint-parser",
"ecmaVersion": 2021,
"sourceType": "module"
},
"plugins": ["vue"],
"rules": {
"require-jsdoc": "off",
"valid-jsdoc": "off",
"vue/html-indent": "off",
"semi": "off",
"space-before-function-paren": "off",
"vue/max-attributes-per-line": "off",
"vue/singleline-html-element-content-newline": "off",
"no-unmodified-loop-condition": "off",
"object-curly-spacing": "off",
"template-curly-spacing": "off",
"linebreak-style": "off",
"no-undef": "off",
"camelcase": "off",
"indent": "off",
"max-len": "off",
"operator-linebreak": "off",
"comma-dangle": "off",
"quotes": "off",
"no-restricted-syntax": "off",
"vue/html-self-closing": "off",
"no-restricted-globals": "off",
"import/no-dynamic-require": "off",
"newline-per-chained-call": "off",
"guard-for-in": "off",
"no-await-in-loop": "off",
"import/no-unresolved": "off",
"no-plusplus": "off"
},
"overrides": [
{
"files": [
"**/__tests__/*.{j,t}s?(x)",
"**/tests/unit/**/*.spec.{j,t}s?(x)"
],
"env": {
"jest": true
}
},
{
"files": [
"**/__tests__/*.{j,t}s?(x)",
"**/tests/unit/**/*.spec.{j,t}s?(x)"
],
"env": {
"jest": true
}
}
]
}
28 changes: 18 additions & 10 deletions vuejs/.yarn/build-state.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,33 @@
# Warning: This file is automatically generated. Removing it is fine, but will
# cause all your builds to become invalidated.

# core-js@npm:2.6.11
"15178ded27ab674ae2054269453d809bdb1d00b98392a34947b5d43ea7a5811e5674c2fda7d48bb653b24a3506b0a8aa126bbac861bdeba93438ec6c7efb2d9d":
40339d700f532b94ee70722cc9b9500e473f97f5667200718e38219562f073840f325e586592f423df1121d32bc160e2a1d4146cd55c827679c6457ac32e9138
# core-js-pure@npm:3.15.0
"9b80393e57b60de7129423ce646634395feb1af895868ec782685e85da3a0384b803693cdba172ba94c7ea8010d596df58cf09e2d61e20bbefad496afdb81879":
30fb5f52ef609c99372c82b0f1e7281a02d901a738f8db97a689c12289bdb041c718dc00118e9c8d98254c5e98278d0c61955bd682416d9c7a35a7dd3a36cbf5

# core-js@npm:3.6.5
"5941340066f775d2694fe1955bef9a66af767bfade2eca6ca442d82a68a5c999e76165c38ab532c125bf81c66c151d83d8e96f86a3f7af2d755000b3e2d48171":
5c75574ac87cd7ada1faefebff91f8eeab29b2d746d05bd7c59fff68cfb143ae7add29148e8230e4e01ee20c05213708be6edf8a222bed3a0e3a27bce342b6c5
# core-js@npm:2.6.12
"0b93d77d31629ea22008e81fc0f5432252f9d8d4985cb82c4253a1aa05054d1dc0f9f59daf4668987876afb8a8adc93e90748dfdcc90cd8312236b6ebc616a70":
6ae5203729872bc3368b4d27994462ed6351cd8b32ab8507975a41784aa15368fedd03936a9f37b40dfc3735d4ad6c42a6950b7ac5356a0fe8a452522010ecab

# core-js@npm:3.15.0
"6abc42efa11e1fab751e36b2e6e725f9e3cc72c2d0af3ae4d4cc43deed45ab217ad918f7f07fc35f3a4b4e9f2a9ebe83501c44dabbd9f7e243ce2339bb4c5991":
173d1e8d68220aae15daf1f07b46ae2be632eee14d93e05c9e7511768cbba9bdb2b796acbe8454229a7c73a3a1b3b2cc527682c5cee28017b1e8458421fc653b

# ejs@npm:2.7.4
"879ed38a4e6f542ab08c36367888dd2c675bef03e81327d75da644a9795ff2d91c34d3cc00a725a6332b56c51ff7cd6a6c5e8c9f9411e6c41bf42b356e1e2417":
4e2ed2a8005a2e09e2a4026d8c0b6bf1e76a0be5e38fb6d9be139681cb52d24dc9944ee046f531beaff7bcaad1ff9f2e2c15734538d0410da61ebabf1b7e39b3

# fibers@npm:5.0.0
"aa74f08ddb9b7c4ebef69a52ac27320026e47481bcb101262734865d04b6dd8ad5ad602bd649ae7bf8135c4d596b57658c811fb7a8cf4d3ecc444dd9a68e1789":
e38f196e865021a3405195613b2289ae2525117491e2355eb44ef3d2167fa56555ea03d525013916a23ca480f38f77b7a1c17ee01ad5115cf5ece134fdaa82fc

# javascript-obfuscator@npm:2.15.2
"95a480448acb88f1ace2b293d69ba9cead97ec55d607877dd89d5f9d1db0fb7721482e9836af67ad1bbbbe8a12c69753dbd8fd3e965e99d2aab3d5c2784746d3":
1ee834be33a0641685ca179f846fcb2f2e937df0b16fb785d94c331c63e08080622440ecb26e5d6fe1f46e78e816f581be97075f7689cb212770766c136af539
b2a5ca79c2be9f7d88ef4515c92c2db4b061a00fa25f1a77872395fe474f1a5794935b408ea15acd50a2df1abe65f59da1730db518b678c076bce8543cba3937

# node-sass@npm:4.14.1
"edc7772b3a0532be3621207ffaa6a9ea396f3b73757e746eb443430321fa98b2275a193aef651a20a9d694edc141856dfec4f0de2951d3316b61204be538e651":
9811df741a136e76a3f2cda5b7d6602b1933dd220186d20c9ed489eea52c3f86e0af9e11e2169234cbd36f384fba7b5ce0e5de433a4d7be8fbad9472323305a7
# node-sass@npm:6.0.0
"7b9729adf36414b5e0c1e37ae00ee4a918b65b808740b7a5d9cef11829f06bc38655a2099625ce54f1de31b01e4dc01492ad145aee250b63b3f70080fe55dcfc":
06b56ee4256510295433650a10b7cabf4657c68ac41aa3ecd9ec251289cc979d11c9572bff1fb6348975630ada5dbdddf25240f2ffd35d0429610f948794573a

# yorkie@npm:2.0.0
"90a2c44491603d8abc64958df6cb3953fed067e47c862d5de6bfa981036615c4ca5f9a35456b35547d446eaa0a7ca942052f034a125463af0d56b74101a96fe3":
Expand Down
Binary file modified vuejs/.yarn/install-state.gz
Binary file not shown.
77 changes: 77 additions & 0 deletions vuejs/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion vuejs/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
yarnPath: '.yarn/releases/yarn-berry.js'
nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-berry.js
19 changes: 16 additions & 3 deletions vuejs/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
module.exports = {
presets: [
'@vue/cli-plugin-babel/preset'
'@vue/cli-plugin-babel/preset',
[
'@babel/preset-env',
{
bugfixes: true,
modules: false,
targets: 'last 2 versions',
},
],
],
"plugins": ["@babel/plugin-syntax-dynamic-import"]
}
env: {
test: {
plugins: ['@babel/plugin-transform-modules-commonjs'],
},
},
plugins: ['@babel/plugin-syntax-dynamic-import'],
};
20 changes: 20 additions & 0 deletions vuejs/jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es6",
"baseUrl": "."
},
"typeAcquisition": {
"exclude": [
"agent-base",
"dotenv",
"https-proxy-agent",
"html-entities",
"socks-proxy-agent",
"source-map",
"tsconfig-paths"
]
},
"exclude": ["node_modules", "dist"],
"include": ["src/**/*"]
}
77 changes: 38 additions & 39 deletions vuejs/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"name": "gindex-v4",
"version": "8.4.6",
"g2index": "8.4.6",
"cdnVersion": "frontend-8.4.6",
"license": "MIT",
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
Expand All @@ -26,72 +25,72 @@
"crypto-js": "^4.0.0",
"element-ui": "^2.13.1",
"feb-alive": "^1.0.9",
"flv.js": "^1.5.0",
"hls.js": "^0.14.10",
"js-base64": "^2.6.1",
"js-cookie": "^2.2.1",
"js-base64": "^3.6.1",
"lodash": "^4.17.19",
"lowdb": "^1.0.0",
"markdown-it": "^11.0.0",
"marked": "^1.1.0",
"node-sass": "^4.14.0",
"nprogress": "^0.2.0",
"plyr": "^3.6.2",
"sass-loader": "8.0.2",
"sass": "1.32.8",
"v-tooltip": "^2.0.3",
"v-viewer": "^1.5.1",
"vue": "^2.6.11",
"vue-avatar": "^2.3.0",
"vue-axios": "^2.1.5",
"vue-clipboard2": "^0.3.1",
"vue-codemirror": "^4.0.6",
"vue-infinite-loading": "^2.4.5",
"vue-infinite-scroll": "^2.0.2",
"vue-lazyload": "^1.3.3",
"vue-loading-overlay": "^3.3.2",
"vue-material-checkbox": "^2.2.0",
"vue-meta": "^2.4.0",
"vue-moment": "^4.1.0",
"vue-notification": "^1.3.20",
"vue-plyr": "^6.0.4",
"vue-plyr": "6.0.4",
"vue-router": "^3.3.4",
"vue-select": "^3.10.7",
"vue-share-buttons": "^1.1.0",
"vue-switch-button": "^0.2.1",
"vue-toastification": "^1.7.6",
"vue2-animate": "^2.1.3"
},
"devDependencies": {
"@babel/core": "^7.14.6",
"@babel/eslint-parser": "^7.14.5",
"@babel/plugin-transform-modules-commonjs": "^7.14.5",
"@babel/preset-env": "^7.14.5",
"@vue/cli-plugin-babel": "~4.4.5",
"@vue/cli-plugin-eslint": "~4.4.5",
"@vue/cli-service": "~4.4.5",
"babel-core": "^6.26.3",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.2.2",
"babel-plugin-component": "^1.1.1",
"babel-plugin-lodash": "^3.3.4",
"browserslist": "^4.16.6",
"caniuse-lite": "^1.0.30001239",
"compression-webpack-plugin": "^4.0.0",
"eslint": "^7.3.0",
"eslint-plugin-vue": "^6.2.2",
"css-minimizer-webpack-plugin": "1.2.0",
"deepmerge": "4.2.2",
"eslint": "^7.29.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-google": "^0.14.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^5.1.0",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-vue": "^7.11.1",
"fibers": "5.0.0",
"fs": "0.0.1-security",
"html-minimizer-webpack-plugin": "^3.1.0",
"html-webpack-plugin": "^5.3.1",
"javascript-obfuscator": "^2.15.2",
"vue-template-compiler": "^2.6.11",
"lodash-webpack-plugin": "^0.11.6",
"node-sass": "^6.0.0",
"prettier": "^2.3.1",
"sass-loader": "8.0.2",
"vue-eslint-parser": "^7.6.0",
"vue-template-compiler": "^2.6.14",
"webpack-obfuscator": "2.6.0"
},
"eslintConfig": {
"root": true,
"env": {
"node": true
},
"extends": [
"plugin:vue/essential",
"eslint:recommended"
],
"parserOptions": {
"parser": "babel-eslint"
},
"rules": {}
},
"browserslist": [
"> 1%",
"last 2 versions",
"not dead"
]
"releases": {
"production": "frontend-8.4.6",
"development": "frontend-8.4.6.100-dev"
}
}
Loading

0 comments on commit a25f834

Please sign in to comment.