diff --git a/.circleci/config.yml b/.circleci/config.yml
index f516f44..2d99012 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,33 +1,13 @@
-# Use the latest 2.1 version of CircleCI pipeline process engine.
-# See: https://circleci.com/docs/2.0/configuration-reference
version: 2.1
-
orbs:
- # The Node.js orb contains a set of prepackaged CircleCI configuration you can utilize
- # Orbs reduce the amount of configuration required for common tasks.
- # See the orb documentation here: https://circleci.com/developer/orbs/orb/circleci/node
node: circleci/node@4.1
-
-
jobs:
- # Below is the definition of your job to build and test your app, you can rename and customize it as you want.
- build-and-test:
- # These next lines define a Docker executor: https://circleci.com/docs/2.0/executor-types/
- # You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
- # A list of available CircleCI Docker Convenience Images are available here: https://circleci.com/developer/images/image/cimg/node
+ build-and-test:
docker:
- image: cimg/node:15.1
- # Then run your tests!
- # CircleCI will report the results back to your VCS provider.
steps:
- # Checkout the code as the first step.
- checkout
- # Next, the node orb's install-packages step will install the dependencies from a package.json.
- # The orb install-packages step will also automatically cache them for faster future runs.
- node/install-packages
- # If you are using yarn instead npm, remove the line above and uncomment the two lines below.
- # - node/install-packages:
- # pkg-manager: yarn
- run:
name: Get environment ready
command: sudo apt update && sudo apt install rpm -y
@@ -39,12 +19,6 @@ jobs:
workflows:
- # Below is the definition of your workflow.
- # Inside the workflow, you provide the jobs you want to run, e.g this workflow runs the build-and-test job above.
- # CircleCI will run this workflow on every commit.
- # For more details on extending your workflow, see the configuration docs: https://circleci.com/docs/2.0/configuration-reference/#workflows
sample:
jobs:
- build-and-test
- # For running simple node tests, you could optionally use the node/test job from the orb to replicate and replace the job above in fewer lines.
- # - node/test
diff --git a/.github/workflows/pr.js.yml b/.github/workflows/pr.js.yml
new file mode 100644
index 0000000..9597c37
--- /dev/null
+++ b/.github/workflows/pr.js.yml
@@ -0,0 +1,47 @@
+name: Pull request
+
+on:
+ pull_request:
+ branches: [ main ]
+
+jobs:
+ build:
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ os: [self-hosted, windows-latest]
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-node@v2
+ with:
+ node-version: '14'
+ cache: 'npm'
+ - name: Setup basic environment
+ run: npm install
+ - name: Setup extra environment
+ if: startsWith(matrix.os, 'self')
+ run: brew install fakeroot && brew install dpkg && npm install
+ - name: Build MacOS and Linux executables
+ if: startsWith(matrix.os, 'self')
+ run: npm run make -- --platform=darwin && npm run make -- --platform=linux
+ - name: Build Windows executables
+ if: startsWith(matrix.os, 'windows')
+ run: npm run make -- --platform=win32
+ - name: Get version
+ if: startsWith(matrix.os, 'windows')
+ id: version
+ uses: Saionaro/extract-package-version@v1.0.6
+ - name: Upload artifacts
+ if: startsWith(matrix.os, 'self')
+ uses: actions/upload-artifact@v2
+ with:
+ name: builds
+ path: |
+ out/make
+ - name: Upload artifacts
+ if: startsWith(matrix.os, 'windows')
+ uses: actions/upload-artifact@v2
+ with:
+ name: builds
+ path: |
+ out/make/squirrel.windows/x64/GitLab.exe
diff --git a/.github/workflows/push.js.yml b/.github/workflows/push.js.yml
new file mode 100644
index 0000000..2ea32f5
--- /dev/null
+++ b/.github/workflows/push.js.yml
@@ -0,0 +1,33 @@
+name: Push
+
+on:
+ push:
+ branches: [ main ]
+
+jobs:
+ build:
+ runs-on: self-hosted
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-node@v2
+ with:
+ node-version: '14'
+ cache: 'npm'
+ - id: check
+ uses: EndBug/version-check@v2
+ with:
+ diff-search: true
+ token: ${{ secrets.GITHUB_TOKEN }}
+ - name: Version logging
+ run: 'echo "Changed: ${{ steps.check.outputs.changed }}, Commit: ${{ steps.check.outputs.commit }}, New version: ${{ steps.check.outputs.version }}, Type: (${{ steps.check.outputs.type }})"'
+ - name: Create Release
+ if: steps.check.outputs.changed == 'true' || steps.check.outputs.changed == true
+ id: create_release
+ uses: actions/create-release@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.RELEASE }}
+ with:
+ tag_name: v${{ steps.check.outputs.version }}
+ release_name: v${{ steps.check.outputs.version }}
+ draft: false
+ prerelease: false
diff --git a/.github/workflows/release.js.yml b/.github/workflows/release.js.yml
new file mode 100644
index 0000000..d940036
--- /dev/null
+++ b/.github/workflows/release.js.yml
@@ -0,0 +1,35 @@
+name: Release
+
+on:
+ release:
+ types: [ created ]
+
+jobs:
+ build:
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ os: [self-hosted, windows-latest]
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ - uses: actions/setup-node@v2
+ with:
+ node-version: '14'
+ cache: 'npm'
+ - name: Setup basic environment
+ run: npm install
+ - name: Setup extra environment
+ if: startsWith(matrix.os, 'self')
+ run: brew install fakeroot && brew install dpkg
+ - name: Publish release for Windows
+ if: startsWith(matrix.os, 'windows')
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ run: npm run publish
+ - name: Publish release for Mac and Linux
+ if: startsWith(matrix.os, 'self')
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ run: npm run publish -- --platform=darwin && npm run publish -- --platform=linux
diff --git a/.gitignore b/.gitignore
index ec13598..f4feb45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ Thumbs.db
.vscode/*
yarn.lock
package-lock.json
+builds/
diff --git a/LICENSE.md b/LICENSE.md
deleted file mode 100644
index b823bcc..0000000
--- a/LICENSE.md
+++ /dev/null
@@ -1,39 +0,0 @@
-CC0 1.0 Universal
-==================
-
-Statement of Purpose
----------------------
-
-The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights.
---------------------------------
-A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
-
-i. the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
-ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
-iv. rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
-v. rights protecting the extraction, dissemination, use and reuse of data in a Work;
-vi. database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
-vii. other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
-
-2. Waiver.
------------
-To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback.
-----------------------------
-Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose.
-
-4. Limitations and Disclaimers.
---------------------------------
-
-a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
-b. Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
-c. Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
-d. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
diff --git a/README.md b/README.md
index df7ef6d..7d08db0 100644
--- a/README.md
+++ b/README.md
@@ -1,45 +1 @@
-# electron-quick-start
-
-**Clone and run for a quick way to see Electron in action.**
-
-This is a minimal Electron application based on the [Quick Start Guide](https://electronjs.org/docs/tutorial/quick-start) within the Electron documentation.
-
-**Use this app along with the [Electron API Demos](https://electronjs.org/#get-started) app for API code examples to help you get started.**
-
-A basic Electron application needs just these files:
-
-- `package.json` - Points to the app's main file and lists its details and dependencies.
-- `main.js` - Starts the app and creates a browser window to render HTML. This is the app's **main process**.
-- `index.html` - A web page to render. This is the app's **renderer process**.
-
-You can learn more about each of these components within the [Quick Start Guide](https://electronjs.org/docs/tutorial/quick-start).
-
-## To Use
-
-To clone and run this repository you'll need [Git](https://git-scm.com) and [Node.js](https://nodejs.org/en/download/) (which comes with [npm](http://npmjs.com)) installed on your computer. From your command line:
-
-```bash
-# Clone this repository
-git clone https://github.com/electron/electron-quick-start
-# Go into the repository
-cd electron-quick-start
-# Install dependencies
-npm install
-# Run the app
-npm start
-```
-
-Note: If you're using Linux Bash for Windows, [see this guide](https://www.howtogeek.com/261575/how-to-run-graphical-linux-desktop-applications-from-windows-10s-bash-shell/) or use `node` from the command prompt.
-
-## Resources for Learning Electron
-
-- [electronjs.org/docs](https://electronjs.org/docs) - all of Electron's documentation
-- [electronjs.org/community#boilerplates](https://electronjs.org/community#boilerplates) - sample starter apps created by the community
-- [electron/electron-quick-start](https://github.com/electron/electron-quick-start) - a very basic starter Electron app
-- [electron/simple-samples](https://github.com/electron/simple-samples) - small applications with ideas for taking them further
-- [electron/electron-api-demos](https://github.com/electron/electron-api-demos) - an Electron app that teaches you how to use Electron
-- [hokein/electron-sample-apps](https://github.com/hokein/electron-sample-apps) - small demo apps for the various Electron APIs
-
-## License
-
-[CC0 1.0 (Public Domain)](LICENSE.md)
+[](https://github.com/MvRemmerden/GitDock/actions/workflows/push.js.yml) [](https://github.com/MvRemmerden/GitDock/actions/workflows/release.js.yml)
diff --git a/myApp.js b/myApp.js
index 176f5ab..2226f3e 100644
--- a/myApp.js
+++ b/myApp.js
@@ -10,7 +10,7 @@ process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true';
let access_token = store.get('access_token')
let user_id = store.get('user_id')
let username = store.get('username')
-let host = store.get('host') || 'https://git.fosscommunity.in'
+let host = store.get('host') || 'https://gitlab.com'
let plan = store.get('plan') || 'free'
let recentlyVisitedString = ''
let currentProject
@@ -69,7 +69,7 @@ const mb = menubar({
icon: __dirname + '/assets/gitlab.png',
preloadWindow: true,
browserWindow: {
- width: 1000,
+ width: 550,
height: 700,
webPreferences: {
preload: __dirname + '/preload.js',
@@ -397,16 +397,14 @@ if (access_token && user_id && username) {
//Regularly relaoading content
setInterval(function () {
- getLastEvent()
- /*console.log('update')
getRecentlyVisited()
getLastCommits()
getRecentComments()
- getUsersProjects()
- getBookmarks()*/
- }, 10000);
+ //TODO Implement smarter polling for commits
+ //getLastEvent()
+ }, 30000);
- mb.window.webContents.openDevTools()
+ //mb.window.webContents.openDevTools()
mb.window.webContents.setWindowOpenHandler(({ url }) => {
shell.openExternal(url);
return { action: 'deny' };
@@ -426,7 +424,7 @@ if (access_token && user_id && username) {
mb.window.loadURL(`file://${__dirname}/login.html`).then(() => {
changeTheme(store.get('theme'), false)
mb.showWindow()
- mb.window.webContents.openDevTools()
+ //mb.window.webContents.openDevTools()
})
})
}
@@ -475,7 +473,7 @@ function openSettingsPage() {
}
async function startLogin() {
- await mb.window.loadURL(host + '/oauth/authorize?client_id=8bcaf7f5331bcb81b6f231d2f82e20a75112a20ef58744f5c73b02d9df025fe4&redirect_uri=' + host + '&response_type=token&state=test&scope=read_api')
+ await mb.window.loadURL(host + '/oauth/authorize?client_id=2ab9d5c2290a3efcacbd5fc99ef469b7767ef5656cfc09376944b03ef4a8acee&redirect_uri=' + host + '&response_type=token&state=test&scope=read_api')
mb.window.on('page-title-updated', handleLogin)
mb.showWindow()
}
@@ -802,7 +800,7 @@ async function getMoreRecentlyVisited() {
mb.window.webContents.executeJavaScript('document.getElementById("detail-headline").innerHTML = ""')
let previousDate = 0
for (let j = 0; j < item.length; j++) {
- if (item[j].title && item[j].url.indexOf(host + '/') == 0 && (item[j].url.indexOf('/-/issues/') != -1 || item[j].url.indexOf('/-/merge_requests/') != -1 || item[j].url.indexOf('/-/epics/') != -1) && !moreRecentlyVisitedTitlesArray.includes(item[j].title) && item[j].title.split('·')[0] != 'Not Found' && item[j].title.split('·')[0] != 'New Issue ' && item[j].title.split('·')[0] != 'New Merge Request ' && item[j].title.split('·')[0] != 'New merge request ' && item[j].title.split('·')[0] != 'New Epic ' && item[j].title.split('·')[0] != 'Edit ' && item[j].title.split('·')[0] != 'Merge requests ' && item[j].title.split('·')[0] != 'Issues ') {
+ if (item[j].title && item[j].url.indexOf(host + '/') == 0 && (item[j].url.indexOf('/-/issues/') != -1 || item[j].url.indexOf('/-/merge_requests/') != -1 || item[j].url.indexOf('/-/epics/') != -1) && !moreRecentlyVisitedTitlesArray.includes(item[j].title) && item[j].title.split('·')[0] != 'Not Found' && item[j].title.split('·')[0] != 'New Issue ' && item[j].title.split('·')[0] != 'New Merge Request ' && item[j].title.split('·')[0] != 'New merge request ' && item[j].title.split('·')[0] != 'New Epic ' && item[j].title.split('·')[0] != 'Edit ' && item[j].title.split('·')[0] != 'Merge requests ' && item[j].title.split('·')[0] != 'Issues ' && item[j].title.split('·')[0] != '500 Error - GitLab') {
let nameWithNamespace = item[j].url.replace(host + '/', '').split('/-/')[0]
if (nameWithNamespace.split('/')[0] != 'groups') {
url = host + '/api/v4/projects/' + nameWithNamespace.split('/')[0] + '%2F' + nameWithNamespace.split('/')[1] + '?access_token=' + access_token
@@ -1224,7 +1222,7 @@ function displayCommit(commit, project, focus = 'project') {
} else {
subline = commit.author_name
}
- return '