Skip to content

Commit

Permalink
Update app to fit 18 new Sharing sidebar (#153)
Browse files Browse the repository at this point in the history
Update app to fit 18 new Sharing sidebar
  • Loading branch information
skjnldsv authored Nov 28, 2019
2 parents 19c754c + bd5ebe7 commit b21d65b
Show file tree
Hide file tree
Showing 30 changed files with 10,781 additions and 9,498 deletions.
5 changes: 0 additions & 5 deletions .babelrc

This file was deleted.

14 changes: 7 additions & 7 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ trigger:
- pull_request
- push
---

kind: pipeline
name: frontend
name: webpack-build

steps:
- name: jsbuild
image: nextcloudci/node:node-4
commands:
- apk add --no-cache make
- make
- name: build
image: nextcloudci/node:node-4
commands:
- npm ci
- npm run build

trigger:
branch:
Expand Down
5 changes: 5 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
extends: [
'nextcloud'
]
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ build/
vendor/
clover.xml
js

.vscode
32 changes: 32 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
module.exports = {
extends: 'stylelint-config-recommended-scss',
rules: {
indentation: 'tab',
'selector-type-no-unknown': null,
'number-leading-zero': null,
'rule-empty-line-before': [
'always',
{
ignore: ['after-comment', 'inside-block']
}
],
'declaration-empty-line-before': [
'never',
{
ignore: ['after-declaration']
}
],
'comment-empty-line-before': null,
'selector-type-case': null,
'selector-list-comma-newline-after': null,
'no-descending-specificity': null,
'string-quotes': 'single',
'selector-pseudo-element-no-unknown': [
true,
{
ignorePseudoElements: ['v-deep']
}
]
},
plugins: ['stylelint-scss']
};
13 changes: 13 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,19 @@ clean:
clean-dev:
rm -rf node_modules

# Linting
lint:
npm run lint

lint-fix:
npm run lint:fix

# Style linting
stylelint:
npm run stylelint

stylelint-fix:
npm run stylelint:fix

appstore: clean package

Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Guests accounts can be created from the share menu by entering either the recipients email or name and choosing "create guest account", once the share is created the guest user will receive an email notification about the mail with a link to set their password.
Guests users can only access files shared to them and can't create any files outside of shares, additionally, the apps accessible to guest accounts are whitelisted.]]></description>
<version>1.3.1</version>
<version>1.4.0</version>
<licence>agpl</licence>
<author>Nextcloud</author>
<types>
Expand Down
10 changes: 10 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module.exports = {
presets: [
[
'@babel/preset-env',
{
modules: false
}
]
]
}
51 changes: 0 additions & 51 deletions css/app.css

This file was deleted.

3 changes: 0 additions & 3 deletions css/personal.css

This file was deleted.

1 change: 0 additions & 1 deletion lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ private function setupGuestManagement() {
'OCA\Files::loadAdditionalScripts',
function () {
\OCP\Util::addScript('guests', 'main');
\OCP\Util::addStyle('guests', 'app');
}
);
}
Expand Down
1 change: 0 additions & 1 deletion lib/Controller/SettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
use OCA\Guests\Config;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\DataResponse;
use OCP\IConfig;
use OCP\IRequest;
use OCP\L10N\IFactory;

Expand Down
1 change: 1 addition & 0 deletions lib/GuestManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ public function getGuestInfo($userId) {
return [
'shares' => array_map(function (IShare $share) {
return [
'id' => $share->getId(),
'shared_by' => $share->getSharedBy(),
'mime_type' => $share->getNodeCacheEntry()->getMimeType(),
'name' => $share->getNodeCacheEntry()->getName(),
Expand Down
2 changes: 0 additions & 2 deletions lib/RestrictionManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ public function setupRestrictions() {
/** @var NavigationManager $navManager */
$navManager = $this->server->getNavigationManager();

\OCP\Util::addStyle('guests', 'personal');

$this->server->registerService('NavigationManager', function () use ($navManager) {
return new FilteredNavigationManager($this->userSession->getUser(), $navManager, $this->whitelist);
});
Expand Down
Loading

0 comments on commit b21d65b

Please sign in to comment.