Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI Overhaul #1552

Merged
merged 45 commits into from
Sep 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
8b7b8c3
Setup svelte
pajlow Oct 10, 2020
c91eab9
Simplify reload, move resources, migrate views
pajlow Nov 16, 2020
a926b95
Merge remote-tracking branch 'upstream/master'
pajlow Nov 16, 2020
236815e
Remove bundle files, remove some duplicate assets
pajlow Nov 18, 2020
f1c65f2
Merge branch 'master' of https://github.com/pajlow/ubports-installer …
NeoTheThird Nov 20, 2020
2749b22
Merge pull request #1 from ubports/pajlow-master
pajlow Nov 20, 2020
817c649
Remove favicon and start using stores
pajlow Nov 21, 2020
59cae36
Merge branch 'master' of github.com:pajlow/ubports-installer
pajlow Nov 21, 2020
44b56b2
Migrate some modals, fix linting and remove pug files
pajlow Nov 24, 2020
cf42727
Use stores for data exchange between routes
pajlow Nov 28, 2020
90469d3
Finish some more views before rebase
pajlow Dec 4, 2020
9fba089
Setup svelte
pajlow Oct 10, 2020
39e5701
Simplify reload, move resources, migrate views
pajlow Nov 16, 2020
854d82f
Remove bundle files, remove some duplicate assets
pajlow Nov 18, 2020
4f01efc
Remove favicon and start using stores
pajlow Nov 21, 2020
1d46768
Migrate some modals, fix linting and remove pug files
pajlow Nov 24, 2020
5f9d877
Use stores for data exchange between routes
pajlow Nov 28, 2020
6a06803
Finish some more views before rebase
pajlow Dec 4, 2020
cabf245
Resolve rebase leftovers, more svelte modals
pajlow Dec 10, 2020
7ce2d11
Merge branch 'master' of github.com:pajlow/ubports-installer
pajlow Dec 10, 2020
c2c9868
Continue with options modal
pajlow Dec 28, 2020
b09b0f6
Merge remote-tracking branch 'upstream/master'
pajlow Dec 28, 2020
1d27030
Finish options modal
pajlow Dec 30, 2020
2f86c81
Finish unlock modal
pajlow Feb 14, 2021
e6a7f1a
Finish oem modal, progress bar and some animations
pajlow Feb 27, 2021
92c36d6
Merge remote-tracking branch 'upstream/master'
pajlow Feb 27, 2021
d0b91a3
Move modals to dedicated component
pajlow Mar 7, 2021
ee6e109
Merge remote-tracking branch 'upstream/master'
pajlow Mar 7, 2021
88cb4d0
Create footer component
pajlow Mar 7, 2021
723b17a
Use auto subscriptions
pajlow Mar 7, 2021
c753a25
Suggested changes
pajlow Mar 7, 2021
806a27d
Move to native prettier linter
NeoTheThird Mar 10, 2021
c1b2ebf
Enforce linter on backend files
NeoTheThird Mar 10, 2021
fa43042
Remove favicon
NeoTheThird Mar 10, 2021
4185a79
Remove no-longer-generated gulp output from .gitignore
NeoTheThird Mar 10, 2021
03ed6dd
Merge pull request #2 from ubports/pajlow-master
pajlow Mar 10, 2021
6608931
Update package.json
pajlow Mar 11, 2021
eec7029
lint and add Yumi
pajlow Mar 11, 2021
a780e04
Add waiting dots and improve styling
pajlow Mar 16, 2021
995402a
Add particles, push and download animations
pajlow Mar 28, 2021
fbf3704
Modal transition
pajlow Mar 28, 2021
f98c85f
Merge branch 'master' of https://github.com/pajlow/ubports-installer …
NeoTheThird Sep 26, 2021
6f37023
Lint
NeoTheThird Sep 26, 2021
152af17
Remove pug
NeoTheThird Sep 26, 2021
3daaeb9
Merge pull request #3 from ubports/pajlow-master
pajlow Sep 26, 2021
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
9 changes: 0 additions & 9 deletions .eslintrc.yml

This file was deleted.

297 changes: 147 additions & 150 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Continuous Integration

on:
push:
branches: [ master ]
branches: [master]
pull_request:
branches: [ master ]
branches: [master]
release:
types:
- published
Expand All @@ -15,34 +15,32 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Use Node.js 14
uses: actions/setup-node@v1
with:
node-version: "14"

- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-

- name: npm ci
run: npm ci
- name: npm audit
run: npm audit --production
- name: npm run lint
run: npm run lint
- name: npm run docs
run: npm run docs
- name: npm run prerender
run: npm run prerender
- uses: actions/checkout@v1
- name: Use Node.js 14
uses: actions/setup-node@v1
with:
node-version: "14"

- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-

- name: npm install
run: npm install
- name: npm audit
run: npm audit --production
- name: npm run lint
run: npm run lint
- name: npm run docs
run: npm run docs

test:
name: Test ${{ matrix.os }}
Expand All @@ -53,35 +51,35 @@ jobs:
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
- uses: actions/checkout@v1
- name: Use Node.js 14
uses: actions/setup-node@v1
with:
node-version: "14"

- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-

- name: test
run: |
npm ci
npm run test

- name: codecov.io
if: contains(runner.os, 'Linux')
uses: codecov/codecov-action@v1
with:
file: coverage/lcov.info
verbose: true
- uses: actions/checkout@v1
- name: Use Node.js 14
uses: actions/setup-node@v1
with:
node-version: "14"

- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-

- name: test
run: |
npm install
npm run test

- name: codecov.io
if: contains(runner.os, 'Linux')
uses: codecov/codecov-action@v1
with:
file: coverage/lcov.info
verbose: true

build:
name: Build ${{ matrix.os }}
Expand All @@ -92,98 +90,97 @@ jobs:
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
- uses: actions/checkout@v1
- name: Use Node.js 14
uses: actions/setup-node@v1
with:
node-version: "14"

- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-

- name: prepare build
run: |
npm ci
npm run prerender

- name: build linux
if: contains(runner.os, 'Linux')
run: |
node ./build.js -o linux -p deb -a x64
node ./build.js -o linux -p AppImage -a x64

- name: build macOS
if: contains(runner.os, 'macOS')
run: |
node ./build.js -o darwin -p dmg -a x64

- name: build windows
if: contains(runner.os, 'Windows')
run: |
node ./build.js -o win32 -p portable -a x64

- name: archive artifacts
uses: actions/upload-artifact@v2
with:
name: ubports-installer
path: |
dist/*.deb
dist/*.AppImage
dist/*.dmg
dist/*.exe

- name: upload release assets
if: github.event_name == 'release'
uses: actions/github-script@v2
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
const fs = require('fs');
const { repo: { owner, repo }} = context;
const tag = context.ref.replace("refs/tags/", "");
console.log("trying to upload to", owner, repo, tag);

const crypto = require('crypto');
const sha256sum = path => new Promise((resolve, reject) => {
const hash = crypto.createHash('sha256');
const stream = fs.createReadStream(path);
stream.on('error', reject);
stream.on('data', chunk => hash.update(chunk));
stream.on('end', () => resolve(hash.digest('hex')));
});

github.repos.getReleaseByTag({ owner, repo, tag })
.then(({data: {id: release_id}}) =>
Promise.all(
fs.readdirSync('./dist/').filter(f =>
f.match(/ubports-installer_*.*/) &&
!f.includes("snap") &&
!f.includes("blockmap")
)
.map(file =>
github.repos.uploadReleaseAsset({
owner, repo, release_id,
name: file,
data: fs.readFileSync(`./dist/${file}`)
})
.then(() => console.log("uploaded", file))
.then(() => sha256sum(`./dist/${file}`))
.then(data =>
- uses: actions/checkout@v1
- name: Use Node.js 14
uses: actions/setup-node@v1
with:
node-version: "14"

- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-

- name: prepare build
run: |
npm install

- name: build linux
if: contains(runner.os, 'Linux')
run: |
node ./build.js -o linux -p deb -a x64
node ./build.js -o linux -p AppImage -a x64

- name: build macOS
if: contains(runner.os, 'macOS')
run: |
node ./build.js -o darwin -p dmg -a x64

- name: build windows
if: contains(runner.os, 'Windows')
run: |
node ./build.js -o win32 -p portable -a x64

- name: archive artifacts
uses: actions/upload-artifact@v2
with:
name: ubports-installer
path: |
dist/*.deb
dist/*.AppImage
dist/*.dmg
dist/*.exe

- name: upload release assets
if: github.event_name == 'release'
uses: actions/github-script@v2
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
const fs = require('fs');
const { repo: { owner, repo }} = context;
const tag = context.ref.replace("refs/tags/", "");
console.log("trying to upload to", owner, repo, tag);

const crypto = require('crypto');
const sha256sum = path => new Promise((resolve, reject) => {
const hash = crypto.createHash('sha256');
const stream = fs.createReadStream(path);
stream.on('error', reject);
stream.on('data', chunk => hash.update(chunk));
stream.on('end', () => resolve(hash.digest('hex')));
});

github.repos.getReleaseByTag({ owner, repo, tag })
.then(({data: {id: release_id}}) =>
Promise.all(
fs.readdirSync('./dist/').filter(f =>
f.match(/ubports-installer_*.*/) &&
!f.includes("snap") &&
!f.includes("blockmap")
)
.map(file =>
github.repos.uploadReleaseAsset({
owner, repo, release_id, data,
name: `${file}.sha256`
owner, repo, release_id,
name: file,
data: fs.readFileSync(`./dist/${file}`)
})
.then(() => console.log("uploaded", file))
.then(() => sha256sum(`./dist/${file}`))
.then(data =>
github.repos.uploadReleaseAsset({
owner, repo, release_id, data,
name: `${file}.sha256`
})
)
.then(() => console.log("uploaded checksum for", file))
)
.then(() => console.log("uploaded checksum for", file))
)
)
)
)
Loading