Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# SPDX-FileCopyrightText: 2020, Michiel de Jong <michiel@unhosted.org>
# SPDX-License-Identifier: MIT



Dockerfile
env.list
.git
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# SPDX-FileCopyrightText: 2020, Michiel de Jong <michiel@unhosted.org>
# SPDX-License-Identifier: MIT



sudo: false
language: php
script:
Expand Down
5 changes: 5 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# SPDX-FileCopyrightText: 2020, Michiel de Jong <michiel@unhosted.org>
# SPDX-License-Identifier: MIT



FROM nextcloud:latest
COPY site.conf /etc/apache2/sites-enabled/000-default.conf
RUN a2enmod ssl
Expand Down
216 changes: 216 additions & 0 deletions LICENSES/AGPL-3.0-or-later.txt

Large diffs are not rendered by default.

File renamed without changes.
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!--
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
SPDX-License-Identifier: MIT
-->


# solid-nextcloud
A plugin to make Nextcloud compatible with Solid

Expand Down Expand Up @@ -40,3 +46,7 @@ Grant access to co-editor https://your-nextcloud-server.com/apps/solid/@your-use
For instance if you're using the [development install](#development-install), that would be https://localhost/apps/solid/@alice/turtle#me
Now in a separate browser window, log in to https://generator.inrupt.com/text-editor with https://your-nextcloud-server.com.
You should be able to edit the file as a co-author now, using your Nextcloud account as a webid identity provider.

## License

This project is under MIT licese. However, some elements are being licensed under AGPL-3.0. For accurate information, please check individual files.
4 changes: 4 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2020, Michiel de Jong <michiel@unhosted.org>
# SPDX-License-Identifier: MIT


---
baseurl: /solid-nextcloud
description: A plugin to make Nextcloud compatible with Solid
Expand Down
5 changes: 5 additions & 0 deletions init.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
#SPDX-License-Identifier: MIT



#!/bin/bash
php console.php maintenance:install --admin-user alice --admin-pass alice123
php console.php status
Expand Down
4 changes: 4 additions & 0 deletions run-solid-test-suite.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
#SPDX-License-Identifier: MIT


#!/bin/bash
set -e

Expand Down
5 changes: 5 additions & 0 deletions site.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# SPDX-FileCopyrightText: 2020, Michiel de Jong <michiel@unhosted.org>
# SPDX-License-Identifier: MIT



<VirtualHost *:443>
DocumentRoot /var/www/html
ErrorLog ${APACHE_LOG_DIR}/error.log
Expand Down
7 changes: 7 additions & 0 deletions solid/.travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# SPDX-FileCopyrightText: 2020, Michiel de Jong <michiel@unhosted.org>
# SPDX-License-Identifier: MIT





# Note this is the auto-generated .travis.yml,
# we also have our own one in the repo root
# that runs the PDS Interop test suites
Expand Down
9 changes: 5 additions & 4 deletions solid/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# This file is licensed under the Affero General Public License version 3 or
# later. See the COPYING file.
# @author Bernhard Posselt <dev@bernhard-posselt.com>
# @copyright Bernhard Posselt 2016

#SPDX-FileCopyrightText: 2016, Bernhard Posselt <dev@bernhard-posselt.com>
#SPDX-License-Identifier: AGPL-3.0-or-later



# Generic Makefile for building and packaging a Nextcloud app which uses npm and
# Composer.
Expand Down
6 changes: 6 additions & 0 deletions solid/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!--
SPDX-FileCopyrightText: 2020, Michiel de Jong <michiel@unhosted.org>
SPDX-License-Identifier: MIT
-->


# Solid
Place this app in **nextcloud/apps/**

Expand Down
8 changes: 8 additions & 0 deletions solid/appinfo/app.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/



<?php

declare(strict_types=1);
Expand Down
6 changes: 6 additions & 0 deletions solid/appinfo/info.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# SPDX-FileCopyrightText: 2020, Michiel de Jong <michiel@unhosted.org>
# SPDX-License-Identifier: MIT




<?xml version="1.0"?>
<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
Expand Down
10 changes: 10 additions & 0 deletions solid/appinfo/routes.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/





<?php
/**
* Create your routes in here. The name is the lowercase name of the controller
Expand Down
10 changes: 9 additions & 1 deletion solid/css/settings-admin.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/**
* SPDX-FileCopyrightText: 2020, Michiel de Jong <michiel@unhosted.org>
* SPDX-License-Identifier: MIT
*/




#solid-admin label {
width: 160px;
vertical-align: top;
Expand All @@ -11,4 +19,4 @@
height: 240px;
font-size: 12px;
font-family: monospace;
}
}
8 changes: 8 additions & 0 deletions solid/css/style.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/**
* SPDX-FileCopyrightText: 2020, Michiel de Jong <michiel@unhosted.org>
* SPDX-License-Identifier: MIT
*/




#hello {
color: red;
}
5 changes: 5 additions & 0 deletions solid/img/app.svg.license
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/
10 changes: 9 additions & 1 deletion solid/js/settings-admin.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
// SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
// SPDX-License-Identifier: MIT






$(document).ready(function() {

$('#solid-private-key').change(function(el) {
Expand All @@ -8,4 +16,4 @@ $(document).ready(function() {
OCP.AppConfig.setValue('solid','encryptionKey',this.value);
});

});
});
8 changes: 8 additions & 0 deletions solid/lib/AppInfo/SolidApp.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/



<?php
namespace OCA\Solid\AppInfo;

Expand Down
9 changes: 9 additions & 0 deletions solid/lib/Controller/PageController.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/




<?php
namespace OCA\Solid\Controller;

Expand Down
8 changes: 8 additions & 0 deletions solid/lib/Controller/ServerController.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/



<?php
namespace OCA\Solid\Controller;

Expand Down
8 changes: 8 additions & 0 deletions solid/lib/Controller/StorageController.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/



<?php
namespace OCA\Solid\Controller;

Expand Down
12 changes: 11 additions & 1 deletion solid/lib/ServerConfig.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/





<?php
namespace OCA\Solid;

Expand Down Expand Up @@ -171,4 +181,4 @@ private function generateKeySet() {
);
return $result;
}
}
}
10 changes: 9 additions & 1 deletion solid/lib/Service/UserService.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/



<?php
namespace OCA\Solid\Service;

Expand All @@ -17,4 +25,4 @@ public function logout() {
$this->userSession->logout();
}

}
}
12 changes: 11 additions & 1 deletion solid/lib/Settings.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/





<?php

namespace OCA\Solid;
Expand Down Expand Up @@ -30,4 +40,4 @@ public function getSection() {
public function getPriority() {
return 50;
}
}
}
10 changes: 9 additions & 1 deletion solid/templates/admin.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/



<?php
script('solid', 'settings-admin');
style('solid', 'settings-admin');
Expand All @@ -16,4 +24,4 @@
<textarea id="solid-encryption-key" type="text"><?php p($_['encryptionKey']); ?></textarea>
</label>
</p>
</div>
</div>
7 changes: 7 additions & 0 deletions solid/templates/content/index.php
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/


<h1>Hello world</h1>
9 changes: 9 additions & 0 deletions solid/templates/index.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/




<?php
script('solid', 'script');
style('solid', 'style');
Expand Down
8 changes: 8 additions & 0 deletions solid/templates/navigation/index.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/



<ul class="with-icon">
<li><a class="icon-home" href="#">Home</a></li>
<li><a class="icon-user" href="@admin/">Profile</a></li>
Expand Down
9 changes: 9 additions & 0 deletions solid/templates/profile.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/




<?php
script('solid', 'script');
style('solid', 'style');
Expand Down
8 changes: 8 additions & 0 deletions solid/templates/profile/index.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/*
SPDX-FileCopyrightText: 2020, Michiel de Jong <<michiel@unhosted.org>>
*
SPDX-License-Identifier: MIT
*/



<div class="app-content-details" id="solid-body"
xmlns:vcard="http://www.w3.org/2006/vcard/ns#"
xmlns:foaf="http://xmlns.com/foaf/0.1/"
Expand Down
Loading