Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
521f053
Add UI elements
robert-cronin Aug 4, 2020
47fdd2b
Add storybook
robert-cronin Aug 5, 2020
323ed00
Update to js-polykey@0.0.11
robert-cronin Aug 5, 2020
19c4508
Add systemuicon svg files
robert-cronin Aug 6, 2020
e96057d
Update configuration and keys interfaces
robert-cronin Aug 6, 2020
8331212
wip
robert-cronin Aug 7, 2020
615ed2e
Replace private overlay with public nixpkgs pkgs
robert-cronin Aug 10, 2020
556e366
wip
robert-cronin Aug 11, 2020
3272c3a
wip
robert-cronin Sep 30, 2020
4931c54
wip
robert-cronin Oct 15, 2020
fa3362e
wip
robert-cronin Oct 19, 2020
c9165ad
wip
robert-cronin Oct 23, 2020
1dc65a9
wip
robert-cronin Oct 26, 2020
32c514e
wip
robert-cronin Oct 26, 2020
acb8312
wip
robert-cronin Oct 26, 2020
ed8c5f1
wip
robert-cronin Oct 26, 2020
b8c4b27
wip
robert-cronin Oct 26, 2020
93d555d
chore: show hello world
gideonairex Oct 26, 2020
778a53a
wip
robert-cronin Oct 26, 2020
34268e7
wip
robert-cronin Oct 26, 2020
bf2a3ba
wip
robert-cronin Oct 26, 2020
afede92
chore: update lintin
gideonairex Oct 26, 2020
207d581
feature: add balmui
gideonairex Oct 26, 2020
6fd2c3f
chore: update publicPath
gideonairex Oct 26, 2020
f6a1312
wip: progress with adding back end
robert-cronin Oct 26, 2020
3c93f25
fix: fonts
gideonairex Oct 27, 2020
7989989
Merge branch 'mvp' of github.com:MatrixAI/PolyKey into mvp
gideonairex Oct 27, 2020
1946e1c
chore: update UI
gideonairex Oct 27, 2020
b8cfe93
chore: complete the UI
gideonairex Oct 27, 2020
e3868ae
chore: use hash mode
gideonairex Oct 28, 2020
f08b2a3
feature: add store
gideonairex Oct 28, 2020
68b657e
wip
robert-cronin Oct 29, 2020
8764475
wip
robert-cronin Oct 29, 2020
30f658f
fix: linting
gideonairex Oct 29, 2020
4b97ed1
Merge branch 'mvp' of github.com:MatrixAI/PolyKey into mvp
gideonairex Oct 29, 2020
b406916
wip
robert-cronin Oct 29, 2020
549c47e
Merge branch 'mvp' of github.com:MatrixAI/PolyKey into mvp
robert-cronin Oct 29, 2020
c7826fc
feature: udpate store
gideonairex Oct 29, 2020
15f7e08
wip
robert-cronin Oct 29, 2020
831553e
chore: refactor
gideonairex Oct 30, 2020
28652d9
wip: update to latest js-polykey version
robert-cronin Oct 30, 2020
b2f8580
chore: update keys
gideonairex Oct 30, 2020
cd1a7cc
Merge branch 'mvp' of github.com:MatrixAI/PolyKey into mvp
gideonairex Oct 30, 2020
89c015d
wip: update return type for UnlockNode
robert-cronin Oct 30, 2020
c83f596
Merge branch 'mvp' of github.com:MatrixAI/PolyKey into mvp
robert-cronin Oct 30, 2020
a02f675
chore: update
gideonairex Oct 30, 2020
f0e6abb
Merge branch 'mvp' of github.com:MatrixAI/PolyKey into mvp
gideonairex Oct 30, 2020
919d324
wip: add system tray actions
robert-cronin Oct 30, 2020
7e959ce
chore: secrets refactor
gideonairex Oct 30, 2020
234901e
Merge branch 'mvp' of github.com:MatrixAI/PolyKey into mvp
gideonairex Oct 30, 2020
2b2240e
wip: fix errors in vue cmpts and update model
robert-cronin Oct 30, 2020
86d46a2
wip: update app start logic
robert-cronin Oct 31, 2020
5f76ee6
wip: update views and misc. updates
robert-cronin Oct 31, 2020
e417f33
wip: add peers view and misc. updates
robert-cronin Oct 31, 2020
24ea54a
wip: add misc. views and functionality
robert-cronin Oct 31, 2020
fdba0e2
wip
robert-cronin Oct 31, 2020
8814c05
wip: update cli and gui name
robert-cronin Oct 31, 2020
3b1b468
wip: update build script
robert-cronin Nov 2, 2020
863ff4f
wip: update logo.png path
robert-cronin Nov 2, 2020
bee608f
feature: add tailwind
gideonairex Nov 2, 2020
570766f
Merge branch 'mvp' of github.com:MatrixAI/PolyKey into mvp
gideonairex Nov 2, 2020
9a1764a
chore: add test tailwind
gideonairex Nov 2, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .env

This file was deleted.

4 changes: 4 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
USE_SYSTEM_7ZA=true

// Twilio STUN and TURN
TWILIO_ACCOUNT_SID=
TWILIO_AUTH_TOKEN=
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
"@typescript-eslint"
],
"rules": {
"space-before-function-paren" : 0
}
}
90 changes: 73 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,78 @@
.DS_Store
node_modules
/.env
/result
/result-*
/dist

# local env files
.env.local
.env.*.local

# Log files
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# TypeScript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env

# parcel-bundler cache (https://parceljs.org/)
.cache

# next.js build output
.next

# nuxt.js build output
.nuxt

# vuepress build output
.vuepress/dist

# Serverless directories
.serverless
5 changes: 2 additions & 3 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"semi": true,
"trailingComma": "all",
"semi": false,
"singleQuote": true,
"printWidth": 120,
"tabWidth": 2
}
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"compile-hero.disable-compile-files-on-did-save-code": false
}
19 changes: 19 additions & 0 deletions config/storybook/config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* eslint-disable import/no-extraneous-dependencies */
import { configure, addDecorator } from "@storybook/vue";
import vuetify from "../../src/renderer/plugins/vuetify";

// import "@mdi/font/css/materialdesignicons.css";

// Ensures every story is wrapped in a v-app tag
addDecorator(() => ({
vuetify: vuetify,
template: '<v-app><v-main><story/></v-main></v-app>',
}))

const req = require.context("../../src/renderer/stories", true, /.*stories.ts$/);

function loadStories() {
req.keys().forEach(filename => req(filename));
}

configure(loadStories, module);
28 changes: 26 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@

const { pathsToModuleNameMapper } = require('ts-jest/utils');
const { compilerOptions } = require('./tsconfig');

module.exports = {
preset: '@vue/cli-plugin-unit-jest/presets/typescript-and-babel'
}
"verbose": true,
"roots": [
"<rootDir>/tests"
],
"testMatch": [
"**/?(*.)+(spec|test|unit.test).+(ts|tsx|js)"
],
"transform": {
"^.+\\.vue$": "vue-jest",
"^.+\\.tsx?$": "ts-jest"
},
moduleFileExtensions: ['vue', 'js', 'json', 'ts'],
setupFiles: [
"<rootDir>/tests/setup.ts"
],
globalSetup: "<rootDir>/tests/globalSetup.ts",
globalTeardown: "<rootDir>/tests/globalTeardown.ts",
moduleNameMapper: pathsToModuleNameMapper(
compilerOptions.paths,
{ prefix: "<rootDir>/src/" }
)
};
6 changes: 3 additions & 3 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ stdenv.mkDerivation rec {
rm -rf ./node_modules
ln -s -t "." "$dev_node_modules"
export PATH="$dev_node_modules/.bin:$PATH"
# Expansion of 'npm run build'.
electron-webpack

npm run compile
'';

# doCheck = true;
Expand Down Expand Up @@ -136,7 +136,7 @@ stdenv.mkDerivation rec {
mv "$PWD/node_modules" "$out/lib/"
declare target="$(readlink -f "$out/lib/node_modules")"
ln -s -T "$target/js-polykey/bin/polykey" "$out/bin/pk"
ln -s -T "$target/js-polykey/bin/polykey" "$out/bin/polykey-cli"
# ln -s -T "$target/js-polykey/bin/polykey" "$out/bin/polykey"
rm -r "$out/lib/node_modules"

ln -s -t "$out/bin" "$out_elec_exe"
Expand Down
Loading