IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 37-full-text-search-top-bar

Browse Source
This commit is contained in:
Lala Sabathil 2019-02-18 10:23:27 +01:00 committed by GitHub
commit 0a774740bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 4055 additions and 4042 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.babelrc
View File

@ -1,11 +1,23 @@
{
"presets": [
["env", { "modules": false }]
[
"@babel/preset-env",
{
"modules": false
}
]
],
"env": {
"test": {
"presets": [
["env", { "targets": { "node": "current" }}]
[
"@babel/preset-env",
{
"targets": {
"node": "10"
}
}
]
]
}
}

5
.travis.yml
View File

@ -39,6 +39,11 @@ after_success:
- wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
- chmod +x send.sh
- ./send.sh success $WEBHOOK_URL
- if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then
wget https://raw.githubusercontent.com/Human-Connection/Discord-Bot/develop/tester.sh &&
chmod +x tester.sh &&
./tester.sh staging $WEBHOOK_URL;
fi
after_failure:
- wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh

19
nuxt.config.js
View File

@ -9,6 +9,8 @@ module.exports = {
dev: dev,
debug: dev ? 'nuxt:*,app' : null,
modern: 'server',
transition: {
name: 'slide-up',
mode: 'out-in'
@ -89,13 +91,14 @@ module.exports = {
'cookie-universal-nuxt',
'@nuxtjs/apollo',
'@nuxtjs/axios',
'portal-vue/nuxt',
[
'nuxt-sass-resources-loader',
path.resolve(__dirname, './styleguide/src/system/styles/shared.scss')
]
'@nuxtjs/style-resources',
'portal-vue/nuxt'
],
styleResources: {
scss: ['~/styleguide/src/system/styles/shared.scss']
},
/*
** Axios module configuration
*/
@ -157,12 +160,6 @@ module.exports = {
** Build configuration
*/
build: {
/*
* TODO: import the polyfill instead of using the deprecated vendor key
* Polyfill missing ES6 & 7 Methods to work on older Browser
*/
vendor: ['@babel/polyfill'],
/*
** You can extend webpack config here
*/

79
package.json
View File

@ -40,47 +40,50 @@
]
},
"dependencies": {
"@nuxtjs/apollo": "^4.0.0-rc3",
"@nuxtjs/axios": "^5.3.6",
"@nuxtjs/dotenv": "^1.3.0",
"accounting": "^0.4.1",
"cookie-universal-nuxt": "^2.0.14",
"cross-env": "^5.2.0",
"date-fns": "^2.0.0-alpha.26",
"express": "^4.16.3",
"global": "^4.3.2",
"graphql": "^14.1.1",
"graphql-tag": "^2.10.1",
"jsonwebtoken": "^8.3.0",
"nuxt": "^2.0.0",
"nuxt-env": "^0.0.4",
"nuxt-sass-resources-loader": "^2.0.5",
"@nuxtjs/apollo": "4.0.0-rc4",
"@nuxtjs/axios": "~5.3.6",
"@nuxtjs/dotenv": "~1.3.0",
"@nuxtjs/style-resources": "~0.1.2",
"accounting": "~0.4.1",
"apollo-cache-inmemory": "~1.4.3",
"apollo-client": "~2.4.13",
"cookie-universal-nuxt": "~2.0.14",
"cross-env": "~5.2.0",
"date-fns": "2.0.0-alpha.26",
"express": "~4.16.4",
"graphql": "~14.1.1",
"jsonwebtoken": "~8.4.0",
"nuxt": "~2.4.3",
"nuxt-env": "~0.1.0",
"portal-vue": "~1.5.1",
"v-tooltip": "^2.0.0-rc.33",
"vue-count-to": "^1.0.13",
"v-tooltip": "~2.0.0-rc.33",
"vue-count-to": "~1.0.13",
"vue-izitoast": "1.1.2",
"vue-sweetalert-icons": "^3.2.0",
"vuex-i18n": "^1.11.0"
"vue-sweetalert-icons": "~3.2.0",
"vuex-i18n": "~1.11.0"
},
"devDependencies": {
"@vue/eslint-config-prettier": "^4.0.1",
"@vue/server-test-utils": "^1.0.0-beta.29",
"@vue/test-utils": "^1.0.0-beta.28",
"babel-eslint": "^10.0.1",
"babel-jest": "^23.6.0",
"babel-preset-env": "^1.7.0",
"cypress-cucumber-preprocessor": "^1.9.1",
"eslint": "^5.13.0",
"eslint-config-prettier": "^3.1.0",
"eslint-loader": "^2.0.0",
"eslint-plugin-prettier": "3.0.1",
"eslint-plugin-vue": "^5.1.0",
"jest": "^23.6.0",
"node-sass": "^4.11.0",
"nodemon": "^1.18.9",
"prettier": "1.14.3",
"sass-loader": "^7.1.0",
"vue-jest": "^3.0.2",
"vue-svg-loader": "^0.11.0"
"@babel/core": "~7.2.2",
"@babel/preset-env": "~7.3.1",
"@vue/cli-shared-utils": "~3.4.0",
"@vue/eslint-config-prettier": "~4.0.1",
"@vue/server-test-utils": "~1.0.0-beta.29",
"@vue/test-utils": "~1.0.0-beta.29",
"babel-core": "~7.0.0-bridge.0",
"babel-eslint": "~10.0.1",
"babel-jest": "~24.1.0",
"cypress-cucumber-preprocessor": "~1.11.0",
"eslint": "~5.14.0",
"eslint-config-prettier": "~3.6.0",
"eslint-loader": "~2.1.2",
"eslint-plugin-prettier": "~3.0.1",
"eslint-plugin-vue": "~5.2.1",
"jest": "~24.1.0",
"node-sass": "~4.11.0",
"nodemon": "~1.18.10",
"prettier": "~1.14.3",
"sass-loader": "~7.1.0",
"vue-jest": "~3.0.3",
"vue-svg-loader": "~0.11.0"
}
}

2
pages/admin/notifications.vue
View File

@ -2,7 +2,7 @@
<ds-card :header="$t('admin.notifications.name')">
<hc-empty
icon="tasks"
message="Comming Soon…"
message="Coming Soon…"
/>
</ds-card>
</template>

2
pages/admin/organizations.vue
View File

@ -2,7 +2,7 @@
<ds-card :header="$t('admin.organizations.name')">
<hc-empty
icon="tasks"
message="Comming Soon…"
message="Coming Soon…"
/>
</ds-card>
</template>

2
pages/admin/pages.vue
View File

@ -2,7 +2,7 @@
<ds-card :header="$t('admin.pages.name')">
<hc-empty
icon="tasks"
message="Comming Soon…"
message="Coming Soon…"
/>
</ds-card>
</template>

2
pages/admin/settings.vue
View File

@ -2,7 +2,7 @@
<ds-card :header="$t('admin.settings.name')">
<hc-empty
icon="tasks"
message="Comming Soon…"
message="Coming Soon…"
/>
</ds-card>
</template>

2
pages/admin/users.vue
View File

@ -2,7 +2,7 @@
<ds-card :header="$t('admin.users.name')">
<hc-empty
icon="tasks"
message="Comming Soon…"
message="Coming Soon…"
/>
</ds-card>
</template>

2
pages/post/_slug/take-action.vue
View File

@ -2,7 +2,7 @@
<ds-card header="Werde aktiv!">
<hc-empty
icon="tasks"
message="Comming Soon…"
message="Coming Soon…"
/>
</ds-card>
</template>

2
pages/settings/data-download.vue
View File

@ -2,7 +2,7 @@
<ds-card :header="$t('settings.download.name')">
<hc-empty
icon="tasks"
message="Comming Soon…"
message="Coming Soon…"
/>
</ds-card>
</template>

2
pages/settings/delete-account.vue
View File

@ -2,7 +2,7 @@
<ds-card :header="$t('settings.delete.name')">
<hc-empty
icon="tasks"
message="Comming Soon…"
message="Coming Soon…"
/>
</ds-card>
</template>

2
pages/settings/invites.vue
View File

@ -2,7 +2,7 @@
<ds-card :header="$t('settings.invites.name')">
<hc-empty
icon="tasks"
message="Comming Soon…"
message="Coming Soon…"
/>
</ds-card>
</template>

2
pages/settings/languages.vue
View File

@ -2,7 +2,7 @@
<ds-card :header="$t('settings.languages.name')">
<hc-empty
icon="tasks"
message="Comming Soon…"
message="Coming Soon…"
/>
</ds-card>
</template>

2
pages/settings/my-organizations.vue
View File

@ -2,7 +2,7 @@
<ds-card :header="$t('settings.organizations.name')">
<hc-empty
icon="tasks"
message="Comming Soon…"
message="Coming Soon…"
/>
</ds-card>
</template>

2
pages/settings/security.vue
View File

@ -2,7 +2,7 @@
<ds-card :header="$t('settings.security.name')">
<hc-empty
icon="tasks"
message="Comming Soon…"
message="Coming Soon…"
/>
</ds-card>
</template>

90
styleguide/package.json
View File

@ -5,7 +5,7 @@
"scripts": {
"serve": "http-server ./docs -o -s",
"build": "yarn theo && vue-cli-service build",
"lint": "vue-cli-service lint",
"lint": "vue-cli-service lint --no-fix",
"dev": "npm-run-all --parallel theo:onchange theo servedev",
"servedev": "vue-cli-service serve --open",
"build:lib": "yarn theo && cross-env BUILD=library vue-cli-service build --target lib --name system ./src/library.js",
@ -14,54 +14,54 @@
"test:unit": "vue-cli-service test:unit"
},
"dependencies": {
"portal-vue": "^1.5.1",
"vue": "^2.5.17"
"portal-vue": "~1.5.1",
"vue": "~2.6.6"
},
"devDependencies": {
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/standalone": "^7.0.0-beta.56",
"@vue/cli-plugin-babel": "^3.0.0-rc.12",
"@vue/cli-plugin-eslint": "^3.0.0-rc.12",
"@vue/cli-plugin-unit-jest": "^3.0.1",
"@vue/cli-service": "^3.0.0-rc.12",
"@vue/eslint-config-prettier": "^4.0.1",
"@vue/test-utils": "^1.0.0-beta.20",
"async-validator": "^1.8.5",
"@babel/core": "~7.2.2",
"@babel/plugin-syntax-dynamic-import": "~7.2.0",
"@babel/standalone": "~7.3.2",
"@vue/cli-plugin-babel": "~3.4.0",
"@vue/cli-plugin-eslint": "~3.4.0",
"@vue/cli-plugin-unit-jest": "~3.4.0",
"@vue/cli-service": "~3.4.0",
"@vue/test-utils": "~1.0.0-beta.29",
"async-validator": "~1.10.1",
"babel-core": "7.0.0-bridge.0",
"babel-jest": "^23.0.1",
"babel-plugin-transform-require-context": "^0.0.3",
"cheerio": "^1.0.0-rc.2",
"clipboard-copy": "^2.0.1",
"clone-deep": "^4.0.0",
"codemirror": "^5.39.2",
"cross-env": "^5.2.0",
"dot-prop": "^4.2.0",
"lodash": "^4.17.10",
"markdown-it": "^8.4.2",
"markdown-it-abbr": "^1.0.4",
"markdown-it-deflist": "^2.0.3",
"markdown-it-emoji": "^1.4.0",
"markdown-it-footnote": "^3.0.1",
"markdown-it-ins": "^2.0.0",
"markdown-it-katex": "^2.0.3",
"markdown-it-mark": "^2.0.0",
"markdown-it-sub": "^1.0.0",
"markdown-it-sup": "^1.0.0",
"markdown-it-task-lists": "^2.1.1",
"node-sass": "^4.9.3",
"npm-run-all": "^4.1.3",
"onchange": "^4.1.0",
"raw-loader": "^0.5.1",
"sass-loader": "^7.1.0",
"theo": "^8.0.0-beta.2",
"vue-click-outside": "^1.0.7",
"vue-docgen-api": "^2.3.13",
"vue-router": "^3.0.1",
"vue-svg-loader": "^0.8.0",
"vue-template-compiler": "^2.5.17",
"babel-jest": "~24.1.0",
"babel-plugin-transform-require-context": "~0.1.1",
"cheerio": "~1.0.0-rc.2",
"clipboard-copy": "~2.0.1",
"clone-deep": "~4.0.1",
"codemirror": "~5.43.0",
"cross-env": "~5.2.0",
"dot-prop": "~4.2.0",
"lodash": "~4.17.11",
"markdown-it": "~8.4.2",
"markdown-it-abbr": "~1.0.4",
"markdown-it-deflist": "~2.0.3",
"markdown-it-emoji": "~1.4.0",
"markdown-it-footnote": "~3.0.1",
"markdown-it-ins": "~2.0.0",
"markdown-it-katex": "~2.0.3",
"markdown-it-mark": "~2.0.0",
"markdown-it-sub": "~1.0.0",
"markdown-it-sup": "~1.0.0",
"markdown-it-task-lists": "~2.1.1",
"node-sass": "~4.11.0",
"npm-run-all": "~4.1.5",
"onchange": "~5.2.0",
"raw-loader": "~1.0.0",
"sass-loader": "~7.1.0",
"theo": "~8.1.1",
"vue-click-outside": "~1.0.7",
"vue-docgen-api": "~2.6.12",
"vue-router": "~3.0.2",
"vue-svg-loader": "~0.12.0",
"vue-template-compiler": "~2.6.6",
"vuep": "git+https://github.com/visualjerk/vuep.git#fix-iframe-firefox",
"webpack-bundle-analyzer": "^2.13.1",
"webpack-merge-and-include-globally": "^2.0.11"
"webpack-bundle-analyzer": "~3.0.4",
"webpack-merge-and-include-globally": "~2.1.14"
},
"author": "visualjerk",
"main": "./dist/system.umd.min.js",

2
styleguide/src/styleguide/components/SectionPage.vue
View File

@ -61,7 +61,7 @@ export default {
}
try {
const mdFile = require(`!raw-loader?modules!../docs/${name}.md`)
const mdFile = require(`raw-loader!../docs/${name}.md`)
this.description = mdFile
} catch (err) {
this.description = null

16
styleguide/src/system/components/layout/Modal/Modal.vue
View File

@ -122,34 +122,30 @@ export default {
try {
if (show) {
this.$emit('opened')
document
.getElementsByTagName('body')[0]
.classList
.add('modal-open')
document.getElementsByTagName('body')[0].classList.add('modal-open')
} else {
document
.getElementsByTagName('body')[0]
.classList
.remove('modal-open')
.classList.remove('modal-open')
}
} catch (err) {}
}
}
},
methods: {
confirm (type = 'confirm') {
confirm(type = 'confirm') {
this.$emit('confirm')
this.close(type)
},
cancel (type = 'cancel') {
cancel(type = 'cancel') {
this.$emit('cancel')
this.close(type)
},
close (type) {
close(type) {
this.$emit('update:isOpen', false)
this.$emit('close', type)
},
backdropHandler () {
backdropHandler() {
if (!this.force) {
this.cancel('backdrop')
}

2462
styleguide/yarn.lock
View File

File diff suppressed because it is too large Load Diff

5384
yarn.lock
View File

File diff suppressed because it is too large Load Diff