From 553ebefb869234c77851c6746988a31d92bb8fc2 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Fri, 19 Oct 2018 18:18:55 -0400 Subject: [PATCH] fix: readme + admin UI fixes --- README.md | 171 +----------------- client/components/admin/admin-groups-edit.vue | 2 +- client/components/admin/admin-users.vue | 3 +- server/graph/schemas/navigation.graphql | 2 +- 4 files changed, 4 insertions(+), 174 deletions(-) diff --git a/README.md b/README.md index cb307582..c5514f29 100644 --- a/README.md +++ b/README.md @@ -1,172 +1,3 @@ ![Wiki.js](https://raw.githubusercontent.com/Requarks/wiki-site/1.0/assets/images/logo.png) -[![Release](https://img.shields.io/github/release/Requarks/wiki.svg?style=flat-square&maxAge=3600)](https://github.com/Requarks/wiki/releases) -[![License](https://img.shields.io/badge/license-AGPLv3-blue.svg?style=flat-square)](https://github.com/requarks/wiki/blob/master/LICENSE) -[![Backers on Open Collective](https://opencollective.com/wikijs/backers/badge.svg)](#backers) -[![Sponsors on Open Collective](https://opencollective.com/wikijs/sponsors/badge.svg)](#sponsors) -[![npm](https://img.shields.io/badge/npm-wiki.js-blue.svg?style=flat-square)](https://www.npmjs.com/package/wiki.js) -[![Downloads](https://img.shields.io/github/downloads/Requarks/wiki/total.svg?style=flat-square)](https://www.npmjs.com/package/wiki.js) -![Build Status](https://requarks.visualstudio.com/_apis/public/build/definitions/5850c090-02b9-4312-b4ce-0e1f5677b574/6/badge) -[![Codacy Badge](https://img.shields.io/codacy/grade/1d0217a3153c4595bdedb322263e55c8/master.svg?style=flat-square)](https://www.codacy.com/app/Requarks/wiki) -[![Standard - JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](http://standardjs.com/) -[![Chat on Gitter](https://img.shields.io/badge/chat-on_gitter-CC2B5E.svg?style=flat-square&logo=image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAOCAMAAADUg/YpAAAABlBMVEUAAAD///%2Bl2Z/dAAAAAXRSTlMAQObYZgAAABVJREFUeAFjwAUYYTQByAAh0WicAAAFnwAYeB5bLwAAAABJRU5ErkJggg==)](https://gitter.im/Requarks/wiki) -[![Twitter Follow](https://img.shields.io/badge/follow-%40requarks-blue.svg?style=flat-square)](https://twitter.com/requarks) - -##### A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown - -- **[Official Website](https://wiki.js.org/)** -- **[Getting Started](https://wiki.js.org/get-started.html)** -- **[Documentation](https://docs.requarks.io/wiki/)** -- [Requirements](#requirements) -- [Change Log](https://github.com/Requarks/wiki/blob/master/CHANGELOG.md) -- [Feature Requests](https://wikijs.canny.io/features) -- [Milestones](#milestones) -- [Chat with us](#gitter) -- [Translations](#translations) *(We need your help!)* -- [Special Thanks](#special-thanks) - - - Sponsor - - -## Requirements - -Wiki.js can run on virtually all platforms where Node.js can (Windows, Mac, Linux, etc.). - -- Node.js **6.11.1** or later -- MongoDB **3.2** or later -- Git **2.7.4** or later -- An empty Git repository (optional) - -> Read the full [prerequisites](https://docs.requarks.io/wiki/prerequisites) article for full details. - -## Cloud Install - -[![Deploy to Heroku](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/requarks/wiki-heroku) - -*Docker Cloud, Azure, IBM Bluemix and more coming soon!* - -## Docker - -A docker Wiki.js image is available on Docker Hub: - -[![Docker Image](https://raw.githubusercontent.com/Requarks/wiki-site/master/assets/images/docker-deploy.png)](https://hub.docker.com/r/requarks/wiki/) - -You can also use a Dockerfile ([see example](https://github.com/Requarks/wiki/blob/master/tools/Dockerfile)) or Docker Compose ([see example](https://github.com/Requarks/wiki/blob/master/tools/docker-compose.yml)) to run Wiki.js. - -## Milestones - -Current and upcoming milestones *(major features only, see the [changelog](https://github.com/Requarks/wiki/blob/master/CHANGELOG.md) for complete list of features and bug fixes)*: - -### 1.0.11 - Stable -![Progress](http://progressed.io/bar/100) - -**Note**: As 2.0 is under development, no new features are being developed in the 1.0 branch. - -- [x] Japanese localization -- [x] Fix for name search when using OpenLDAP -- [x] Added referrer policy header - -### 2.0.0 - Dev -![Progress](http://progressed.io/bar/35) - -**Goals**: - - Decouple front-end and back-end completely. - - All operations and queries will be made via GraphQL API. - - New fully responsive layout, with better customization capabilities. - - Full localization support, especially for non-latin languages. - -**Breaking Changes**: MongoDB is being phased out in favor of PostgreSQL + Redis. An upgrade tool will be provided to migrate existing data to the new system. - -- [x] GraphQL API - - [x] Comments - - [x] Documents - - [x] Files - - [x] Folders - - [x] Groups - - [x] Rights - - [x] Settings - - [x] Tags - - [x] Translations - - [x] Users -- [x] Migrate to PostgreSQL + Redis datastore -- [ ] Themes -- [ ] New Login page -- [ ] History / Revert to previous version -- [ ] Optional Two-Steps Authentication (2FA) -- [x] Docker support + Auto compile/publish to Docker Hub -- [x] Support sub-directory installations (e.g. example.com/wiki) -- [ ] Persist system settings to database instead of file-based -- [ ] User Groups + Better permissions management -- [x] Make use of all available CPU cores, distributed jobs queue -- [ ] Tags per document / folder -- [ ] Comments / Discussion per document -- [ ] Profile page per user -- [ ] Preview changes directly from the editor, without saving -- [x] Modular authentication providers -- [ ] High Availability support (multiple concurrent instances) -- [ ] Insert Link modal in Editor -- [ ] Better simultaneous user editing handling - -## Gitter - -Want to discuss features, ideas or issues? Join our [gitter channel](https://gitter.im/Requarks/wiki). We are very active and friendly! -[![Chat on Gitter](https://img.shields.io/badge/chat-on_gitter-CC2B5E.svg?style=flat-square&logo=image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAOCAMAAADUg/YpAAAABlBMVEUAAAD///%2Bl2Z/dAAAAAXRSTlMAQObYZgAAABVJREFUeAFjwAUYYTQByAAh0WicAAAFnwAYeB5bLwAAAABJRU5ErkJggg==)](https://gitter.im/Requarks/wiki) - -## Twitter - -Follow our Twitter feed to learn about upcoming updates and new releases! -[![Twitter Follow](https://img.shields.io/badge/follow-%40requarks-blue.svg?style=flat-square)](https://twitter.com/requarks) - -## Translations - -We are looking for translators to make Wiki.js available in multiple languages. If your language is not listed below and would like to contribute to this project, contact us on our [gitter channel](https://gitter.im/Requarks/wiki) and we'll provide you with the necessary tool to add translations, no coding required! - -**Languages that are already translated:** - -- [x] English -- [x] Chinese - *Thanks to [@choicky](https://github.com/choicky)* -- [x] Dutch - *Thanks to [@weirdwater](https://github.com/weirdwater)* -- [x] Estonian - *Thanks to [@vonforum](https://github.com/vonforum)* -- [x] French -- [x] German - *Thanks to [@joetjengerdes](https://github.com/joetjengerdes), [@MyZeD](https://github.com/MyZeD)* -- [x] Japanese - *Thanks to [@johnnyshields](https://github.com/johnnyshields)* -- [x] Korean - *Thanks to [@junwonpk](https://github.com/junwonpk)* -- [x] Persian - *Thanks to [@ashkang](https://github.com/ashkang)* -- [x] Portuguese - *Thanks to [@felipeplets](https://github.com/felipeplets)* -- [x] Russian - *Thanks to [@efimlosev](https://github.com/efimlosev)* -- [x] Spanish - *Thanks to [@MatiasArriola](https://github.com/MatiasArriola)* - -## Special Thanks - -![Browserstack](https://wiki.js.org/assets/images/logo_browserstack.png) -[Browserstack](https://www.browserstack.com/) for providing access to their great cross-browser testing tools. - -[![DigitalOcean](https://wiki.js.org/assets/images/logo_digitalocean.png)](https://m.do.co/c/5f7445bfa4d0) -[DigitalOcean](https://m.do.co/c/5f7445bfa4d0) for providing hosting of the Wiki.js documentation site. - -## Contributors - -This project exists thanks to all the people who contribute. [[Contribute]](CONTRIBUTING.md). - - -## Backers - -Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/wikijs#backer)] - - - -## Sponsors - -Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/wikijs#sponsor)] - - - - - - - - - - - +View [milestones and documentation on the master branch]() instead! diff --git a/client/components/admin/admin-groups-edit.vue b/client/components/admin/admin-groups-edit.vue index b068aa99..f84f1842 100644 --- a/client/components/admin/admin-groups-edit.vue +++ b/client/components/admin/admin-groups-edit.vue @@ -48,7 +48,7 @@ v-container.pa-3(fluid, grid-list-md) v-layout(row, wrap) v-flex(xs12, md6, lg4, v-for='pmGroup in permissions') - v-card.md2.grey.lighten-5(flat) + v-card.md2.grey(flat, :class='$vuetify.dark ? "darken-4" : "lighten-5"') v-subheader {{pmGroup.category}} v-card-text.pt-0 template(v-for='(pm, idx) in pmGroup.items') diff --git a/client/components/admin/admin-users.vue b/client/components/admin/admin-users.vue index c75ad938..bef7c233 100644 --- a/client/components/admin/admin-users.vue +++ b/client/components/admin/admin-users.vue @@ -29,7 +29,6 @@ ) template(slot='headers', slot-scope='props') tr - //- th(width='50') th.text-xs-left( v-for='header in props.headers' :key='header.text' @@ -40,7 +39,7 @@ | {{ header.text }} v-icon(small, v-if='header.sortable') arrow_upward template(slot='items', slot-scope='props') - tr(:active='props.selected') + tr.is-clickable(:active='props.selected', @click='$router.push("/users/" + props.item.id)') //- td v-checkbox(hide-details, :input-value='props.selected', color='blue darken-2', @click='props.selected = !props.selected') td.text-xs-right {{ props.item.id }} diff --git a/server/graph/schemas/navigation.graphql b/server/graph/schemas/navigation.graphql index af56c3eb..65702e9f 100644 --- a/server/graph/schemas/navigation.graphql +++ b/server/graph/schemas/navigation.graphql @@ -25,7 +25,7 @@ type NavigationQuery { type NavigationMutation { updateTree( tree: [NavigationItemInput]! - ): DefaultResponse + ): DefaultResponse @auth(requires: ["manage:navigation", "manage:system"]) } # -----------------------------------------------