diff --git a/Makefile b/Makefile index 01bb9acee56db2836b9932a7895e3b3a79189c79..c06fb77d800d459ff01573b940c125e82a67d39d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SHELL = /bin/sh -TARGET = pling-store +TARGET = ocs-store srcdir = . DESTDIR = diff --git a/app/main.js b/app/main.js index f4399a407ea04695bbbec11a9a43f7029ba30775..ca5172797b7b7c2e0a0066fcbf1c0d5607202877 100644 --- a/app/main.js +++ b/app/main.js @@ -88,7 +88,6 @@ function createWindow() { } mainWindow.loadURL(indexFileUrl); - mainWindow.maximize(); mainWindow.on('close', () => { const appConfigStore = new ElectronStore({name: appConfigStoreStorage}); diff --git a/app/scripts/components/OmniboxComponent.js b/app/scripts/components/OmniboxComponent.js index a9107a4af490f0bf7e49cb23b57082bac1f00a09..4f02389f05bddbc1e4fac44f88c80a3d973e7335 100644 --- a/app/scripts/components/OmniboxComponent.js +++ b/app/scripts/components/OmniboxComponent.js @@ -232,13 +232,11 @@ export default class OmniboxComponent extends BaseComponent { <nav> <ul> <li><app-button data-action="webview_startPage" data-url="https://www.pling.com/">pling.com</app-button></li> - <li><app-button data-action="webview_startPage" data-url="https://www.appimagehub.com/">Appimagehub.com</app-button></li> + <li><app-button data-action="webview_startPage" data-url="https://www.opendesktop.org/s/Gnome">gnome-look.org</app-button></li> <li><app-button data-action="webview_startPage" data-url="https://store.kde.org/">store.kde.org</app-button></li> - <li><app-button data-action="webview_startPage" data-url="https://www.pling.com/s/Artwork">s/Artwork</app-button></li> - <li><app-button data-action="webview_startPage" data-url="https://www.pling.com/s/Gnome">s/Gnome</app-button></li> - <li><app-button data-action="webview_startPage" data-url="https://www.pling.com/s/Comics">Comics</app-button></li> - <li><app-button data-action="webview_startPage" data-url="https://www.pling.com/s/XFCE">xfce-look.org</app-button></li> - <li><app-button data-action="webview_startPage" data-url="https://www.pling.com/s/Videos">Videos</app-button></li> + <li><app-button data-action="webview_startPage" data-url="https://www.opendesktop.org/s/XFCE">xfce-look.org</app-button></li> + <li><app-button data-action="webview_startPage" data-url="https://www.opendesktop.org/s/Window-Managers">box-look.org</app-button></li> + <li><app-button data-action="webview_startPage" data-url="https://www.opendesktop.org/s/Enlightenment">enlightenment-themes.org</app-button></li> </ul> </nav> </div> diff --git a/package-lock.json b/package-lock.json index fd53e2b28a976b250174ddf932433e428ceaea61..7b3dcee6c81b20aa6b13a85ae2e146e9258321e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "pling-store", - "version": "5.0.0", + "name": "ocs-store", + "version": "4.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -873,11 +873,6 @@ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - }, "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", @@ -959,14 +954,6 @@ "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", "dev": true }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, "loud-rejection": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", @@ -1118,7 +1105,8 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true }, "object-keys": { "version": "0.4.0", @@ -1292,16 +1280,6 @@ "through2": "~0.2.3" } }, - "prop-types": { - "version": "15.7.2", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", - "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.8.1" - } - }, "psl": { "version": "1.1.31", "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz", @@ -1335,21 +1313,6 @@ "integrity": "sha512-6NjOhOpkvbc/gpMEfk2hpXuWyHfbLFN8as5jx3jf4bhELvouRoYvc8d/W3NVVPwEBF1ICfbpwp1oRm8OJ2WDWw==", "dev": true }, - "react": { - "version": "16.9.0", - "resolved": "https://registry.npmjs.org/react/-/react-16.9.0.tgz", - "integrity": "sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==", - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2" - } - }, - "react-is": { - "version": "16.9.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz", - "integrity": "sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==" - }, "read-pkg": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", diff --git a/package.json b/package.json index 266aae28a0d12188be63e2407853e54d00d329d7..d040a9626940bea8ba88e9f41c90488f6f14d3ac 100644 --- a/package.json +++ b/package.json @@ -1,25 +1,24 @@ { - "name": "pling-store", - "productName": "Pling-Store", - "version": "5.0.0", + "name": "ocs-store", + "productName": "OCS-Store", + "version": "4.1.1", "description": "Store Frontend and Management Application based on OpenCollaborationServices (OCS) of Opendesktop.org.", - "author": "Pling.com", + "author": "Opendesktop.org", "license": "GPL-3.0", - "homepage": "https://www.pling.com/", - "repository": "https://www.opencode.net/dfn2/pling-store", - "bugs": "https://www.opencode.net/dfn2/pling-store/issues", + "homepage": "https://www.opendesktop.org/", + "repository": "https://git.opendesktop.org/akiraohgaki/ocs-store", + "bugs": "https://git.opendesktop.org/akiraohgaki/ocs-store/issues", "main": "app/main.js", "scripts": { "start": "electron .", "debug": "electron . --debug", - "package": "electron-packager . pling-store --platform=linux --arch=x64 --out=dist --overwrite --ignore='^/(\\.gitignore|\\.gitlab\\-ci\\.yml|Makefile|README\\.md|desktop|launcher|pkg|scripts|appimagebuild)($|/)'" + "package": "electron-packager . ocs-store --platform=linux --arch=x64 --out=dist --overwrite --ignore='^/(\\.gitignore|\\.gitlab\\-ci\\.yml|Makefile|README\\.md|desktop|launcher|pkg|scripts|appimagebuild)($|/)'" }, "dependencies": { "electron-store": "2.*.*", + "request": "2.*.*", "esm": "3.*.*", - "lit-html": "1.*.*", - "react": "^16.9.0", - "request": "2.*.*" + "lit-html": "1.*.*" }, "devDependencies": { "electron": "4.*.*", diff --git a/pkg/appimage/appimagebuild b/pkg/appimage/appimagebuild index b32afe679e68c6b437adfe6e44fb5c9c10c06eab..2585f8d1d3fded2f7da5a5defe7e76e77535494e 100644 --- a/pkg/appimage/appimagebuild +++ b/pkg/appimage/appimagebuild @@ -1,10 +1,10 @@ #!/bin/bash -PKGNAME='pling-store' -PKGVER='5.0.0' +PKGNAME='ocs-store' +PKGVER='4.1.1' PKGREL='1' -UPDINFO='zsync|http://dl.opendesktop.org/api/files/download/id/1532435039/as/latest/pling-store-x86_64.AppImage.zsync' +UPDINFO='zsync|http://dl.opendesktop.org/api/files/download/id/1532435039/as/latest/ocs-store-x86_64.AppImage.zsync' APPDIR="${PKGNAME}.AppDir" make @@ -14,10 +14,10 @@ install -D -m 755 ${APPDIR}/usr/bin/${PKGNAME} ${APPDIR}/AppRun install -D -m 644 ${APPDIR}/usr/share/applications/${PKGNAME}.desktop ${APPDIR}/${PKGNAME}.desktop install -D -m 644 ${APPDIR}/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.svg ${APPDIR}/${PKGNAME}.svg -install -D -m 755 /usr/lib/x86_64-linux-gnu/libgconf-2.so.4 ${APPDIR}/usr/lib/pling-store-linux-x64/libgconf-2.so.4 -install -D -m 755 /usr/lib/x86_64-linux-gnu/libXss.so.1 ${APPDIR}/usr/lib/pling-store-linux-x64/libXss.so.1 -install -D -m 755 /usr/lib/x86_64-linux-gnu/gtk-2.0/modules/libcanberra-gtk-module.so ${APPDIR}/usr/lib/pling-store-linux-x64/libcanberra-gtk-module.so -install -D -m 755 /usr/lib/x86_64-linux-gnu/libgnome-keyring.so.0 ${APPDIR}/usr/lib/pling-store-linux-x64/libgnome-keyring.so.0 +install -D -m 755 /usr/lib/x86_64-linux-gnu/libgconf-2.so.4 ${APPDIR}/usr/lib/ocs-store-linux-x64/libgconf-2.so.4 +install -D -m 755 /usr/lib/x86_64-linux-gnu/libXss.so.1 ${APPDIR}/usr/lib/ocs-store-linux-x64/libXss.so.1 +install -D -m 755 /usr/lib/x86_64-linux-gnu/gtk-2.0/modules/libcanberra-gtk-module.so ${APPDIR}/usr/lib/ocs-store-linux-x64/libcanberra-gtk-module.so +install -D -m 755 /usr/lib/x86_64-linux-gnu/libgnome-keyring.so.0 ${APPDIR}/usr/lib/ocs-store-linux-x64/libgnome-keyring.so.0 curl -fsSL -o ocs-manager https://git.opendesktop.org/akiraohgaki/ocs-manager/uploads/d3dc42436b82d11360ebc96b38d4aaf4/ocs-manager-0.8.1-1-x86_64.AppImage install -D -m 755 ocs-manager ${APPDIR}/usr/bin/ocs-manager diff --git a/scripts/package b/scripts/package index 895b12e8148c45997996ca05b40925f79086a8e0..3116e5a708e3e31c14a4e95856896c870b4433e6 100644 --- a/scripts/package +++ b/scripts/package @@ -1,6 +1,6 @@ #!/bin/bash -PKGNAME='pling-store' +PKGNAME='ocs-store' PKGUSER='pkgbuilder'