Skip to content

Commit

Permalink
Update stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
exavolt committed Jun 19, 2020
1 parent 1bc7d7d commit 10dcf6b
Show file tree
Hide file tree
Showing 10 changed files with 2,232 additions and 978 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#-------------------------------------------------------------------------------------------------------------

# To fully customize the contents of this image, use the following Dockerfile instead:
# https://github.com/microsoft/vscode-dev-containers/tree/v0.117.1/containers/typescript-node-12/.devcontainer/Dockerfile
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-12
# https://github.com/microsoft/vscode-dev-containers/tree/v0.117.1/containers/javascript-node-14/.devcontainer/Dockerfile
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-14

# ** [Optional] Uncomment this section to install additional packages. **
#
Expand Down
16 changes: 6 additions & 10 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,24 @@
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.117.1/containers/typescript-node-12
// https://github.com/microsoft/vscode-dev-containers/tree/v0.117.1/containers/javascript-node-14
{
"name": "Node.js 12 & TypeScript",
"name": "Node.js 14",
"dockerFile": "Dockerfile",

// Set *default* container specific settings.json values on container create.
"settings": {
"terminal.integrated.shell.linux": "/bin/bash"
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"dbaeumer.vscode-eslint",
"ms-vscode.vscode-typescript-tslint-plugin",
"esbenp.prettier-vscode",
"octref.vetur"
"hikerpig.vetur"
],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [23000, 23001, 28888]

//"forwardPorts": [3000],
"appPort": ["3200:3000"],
"runArgs": ["--memory=2g"]
// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "yarn install",

// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
// "remoteUser": "node"
}
20 changes: 20 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
module.exports = {
root: true,
env: {
browser: true,
node: true
},
parserOptions: {
parser: 'babel-eslint'
},
extends: [
'@nuxtjs',
'prettier',
'prettier/vue',
'plugin:prettier/recommended',
'plugin:nuxt/recommended'
],
plugins: ['prettier'],
// add your custom rules here
rules: {}
}
1 change: 0 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"source.fixAll.eslint": true
},
"eslint.format.enable": true,
"eslint.workingDirectories": ["./citadel-iam", "./iam-webui", "./monolith"],
"vetur.validation.template": false,
"vetur.format.defaultFormatter.html": "prettier"
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# monolith

> Citadel monolith example
> Kadisoka monolith example
## Build Setup

Expand Down
2 changes: 1 addition & 1 deletion nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ export default {
extend(config, ctx) {}
},
server: {
port: 23000
host: '0.0.0.0'
}
}
21 changes: 16 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,32 @@
{
"name": "monolith",
"version": "1.0.0",
"description": "Citadel monolith example",
"description": "Kadisoka monolith example",
"author": "Fahrezal Effendi",
"private": true,
"scripts": {
"dev": "nuxt",
"build": "nuxt build",
"start": "nuxt start",
"generate": "nuxt generate"
"generate": "nuxt generate",
"lint": "eslint --ext .js,.vue --ignore-path .gitignore .",
"lintfix": "eslint --fix --ext .js,.vue --ignore-path .gitignore ."
},
"dependencies": {
"@nuxtjs/axios": "^5.3.6",
"@nuxtjs/axios": "^5.11.0",
"@nuxtjs/dotenv": "^1.4.0",
"@nuxtjs/pwa": "^3.0.0-0",
"nuxt": "^2.0.0",
"nuxt": "^2.13.0",
"vuex-persist": "^2.2.0"
},
"devDependencies": {}
"devDependencies": {
"@nuxtjs/eslint-config": "^3.0.0",
"@nuxtjs/eslint-module": "^2.0.0",
"babel-eslint": "^10.0.1",
"eslint": "^7.2.0",
"eslint-config-prettier": "^6.10.0",
"eslint-plugin-nuxt": ">=0.4.2",
"eslint-plugin-prettier": "^3.1.2",
"prettier": "^2.0.0"
}
}
2 changes: 1 addition & 1 deletion pages/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
>
<a v-else href="/accounts/signin" class="button--green">Sign in</a>
<a
href="https://github.com/rez-go/citadel"
href="https://github.com/kadisoka"
target="_blank"
class="button--grey"
>GitHub</a
Expand Down
2 changes: 1 addition & 1 deletion plugins/myapp.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export default ({ app }, inject) => {
const myApp = {
appName: 'Monolith',
appDesc: 'Citadel monolith example'
appDesc: 'Kadisoka monolith example'
}
inject('myApp', myApp)
}
Loading

0 comments on commit 10dcf6b

Please sign in to comment.