From 4d137c131d44097b241f5d79a8f7c831718eb501 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 17:57:06 +0000 Subject: [PATCH 01/16] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index d95c956..74bd460 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,10 @@ Wellcome to the NOSTROS project. # Running - Open a virtual device +- Install +``` +yarn format +``` - Run Metro ``` yarn start From 0dbc0358fd50592d22342b5fcb65b9ff8c84c8b7 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 18:13:35 +0000 Subject: [PATCH 02/16] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 74bd460..acb3833 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,10 @@ yarn start # Some Features to Work On +## Basics +- [ ] Infinite Load +- [ ] Relays management (add, remove and recomend) +- [ ] Random Key Generator ## Home - [ ] Public Room - [ ] Other Rooms @@ -43,7 +47,6 @@ yarn start ## Send - [ ] Mentions https://github.com/nostr-protocol/nips/blob/master/08.md ## Config -- [ ] Relays management (add, remove and recomend) - [ ] Private Key download # Kudos From c86bd104193b8222ab0d1e7966d46b77d5ed9982 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 18:14:04 +0000 Subject: [PATCH 03/16] Update README.md --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index acb3833..e36089f 100644 --- a/README.md +++ b/README.md @@ -27,26 +27,26 @@ yarn start # Some Features to Work On -## Basics +### Basics - [ ] Infinite Load - [ ] Relays management (add, remove and recomend) - [ ] Random Key Generator -## Home +### Home - [ ] Public Room - [ ] Other Rooms -## Profile +### Profile - [ ] Verify NIP-05 - [ ] Verify LNURL https://github.com/andrerfneves/lightning-address -## Contacts +### Contacts - [ ] Direct Messages https://github.com/nostr-protocol/nips/blob/master/04.md -## Note +### Note - [ ] Mentions https://github.com/nostr-protocol/nips/blob/master/08.md - [ ] Reactions https://github.com/nostr-protocol/nips/blob/master/25.md - [ ] Deletion https://github.com/nostr-protocol/nips/blob/master/09.md - [ ] Tag Users https://github.com/nostr-protocol/nips/blob/master/10.md -## Send +### Send - [ ] Mentions https://github.com/nostr-protocol/nips/blob/master/08.md -## Config +### Config - [ ] Private Key download # Kudos From b1ba9e4321a66f2ae27b014ed6b922316c1f8f34 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 20:15:51 +0200 Subject: [PATCH 04/16] Format --- frontend/Components/ContactsPage/index.tsx | 3 --- frontend/Components/HomePage/index.tsx | 11 +++++++++-- frontend/Components/LandingPage/index.tsx | 2 +- frontend/Components/MainLayout/index.tsx | 2 +- frontend/Contexts/AppContext.tsx | 2 +- frontend/Contexts/RelayPoolContext.tsx | 1 - 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/frontend/Components/ContactsPage/index.tsx b/frontend/Components/ContactsPage/index.tsx index cfcd485..2bfce8b 100644 --- a/frontend/Components/ContactsPage/index.tsx +++ b/frontend/Components/ContactsPage/index.tsx @@ -125,7 +125,4 @@ export const ContactsPage: React.FC = () => { }; export default ContactsPage; -function setIsContact(arg0: boolean) { - throw new Error('Function not implemented.'); -} diff --git a/frontend/Components/HomePage/index.tsx b/frontend/Components/HomePage/index.tsx index 41ba8c1..fe5b075 100644 --- a/frontend/Components/HomePage/index.tsx +++ b/frontend/Components/HomePage/index.tsx @@ -12,12 +12,14 @@ import { EventKind } from '../../lib/nostr/Events'; import { RelayFilters } from '../../lib/nostr/Relay'; import { getReplyEventId } from '../../Functions/RelayFunctions/Events'; import { getUsers } from '../../Functions/DatabaseFunctions/Users'; +import Loading from '../Loading'; export const HomePage: React.FC = () => { const { database, setPage, page } = useContext(AppContext); - const { lastEventId, setLastEventId, relayPool, publicKey } = useContext(RelayPoolContext); + const { lastEventId, relayPool, publicKey } = useContext(RelayPoolContext); const theme = useTheme(); const [notes, setNotes] = useState([]); + const [totalContacts, setTotalContacts] = useState(-1); const { t } = useTranslation('common'); const loadNotes: () => void = () => { @@ -32,6 +34,7 @@ export const HomePage: React.FC = () => { if (database) { getNotes(database, { limit: 1 }).then((notes) => { getUsers(database, { contacts: true }).then((users) => { + setTotalContacts(users.length) let message: RelayFilters = { kinds: [EventKind.textNote, EventKind.recommendServer], authors: [publicKey, ...users.map((user) => user.id)], @@ -92,7 +95,11 @@ export const HomePage: React.FC = () => { return ( <> - itemCard(item.item)} /> + {notes.length === 0 && totalContacts !== 0 ? ( + + ) : ( + itemCard(item.item)} /> + )} { }, [init, relayPool, loadingDb]); useEffect(() => { - if (usersReady && relayPool) { + if (usersReady && relayPool && !loadingDb) { initRelays() setPage('home'); } diff --git a/frontend/Components/MainLayout/index.tsx b/frontend/Components/MainLayout/index.tsx index c2daefc..3d95c61 100644 --- a/frontend/Components/MainLayout/index.tsx +++ b/frontend/Components/MainLayout/index.tsx @@ -1,4 +1,4 @@ -import React, { useContext, useEffect, useState } from 'react'; +import React, { useContext, useState } from 'react'; import { Layout } from '@ui-kitten/components'; import { StyleSheet } from 'react-native'; import { AppContext } from '../../Contexts/AppContext'; diff --git a/frontend/Contexts/AppContext.tsx b/frontend/Contexts/AppContext.tsx index c883681..539cc55 100644 --- a/frontend/Contexts/AppContext.tsx +++ b/frontend/Contexts/AppContext.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react'; +import React, { useState } from 'react'; import { SQLiteDatabase } from 'react-native-sqlite-storage'; import { initDatabase } from '../Functions/DatabaseFunctions'; import { createInitDatabase } from '../Functions/DatabaseFunctions/Migrations'; diff --git a/frontend/Contexts/RelayPoolContext.tsx b/frontend/Contexts/RelayPoolContext.tsx index 23a520b..f606dfb 100644 --- a/frontend/Contexts/RelayPoolContext.tsx +++ b/frontend/Contexts/RelayPoolContext.tsx @@ -6,7 +6,6 @@ import { AppContext } from './AppContext'; import { storeEvent } from '../Functions/DatabaseFunctions/Events'; import { getRelays, Relay as RelayEntity, storeRelay } from '../Functions/DatabaseFunctions/Relays'; import { showMessage } from 'react-native-flash-message'; -import { getReplyEventId } from '../Functions/RelayFunctions/Events'; export interface RelayPoolContextProps { relayPool?: RelayPool; From f685d5f3a5b225183cb604a0aa68423f990f0506 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 18:20:08 +0000 Subject: [PATCH 05/16] Create CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1 @@ + From 2b18f2313dc7b90c070a78031b0ad94b28ee588e Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 20:21:09 +0200 Subject: [PATCH 06/16] Workflows --- .github/workflows/android-build.yml | 81 ++++++++++++++++++++++++++++ .github/workflows/frontend-build.yml | 39 ++++++++++++++ .github/workflows/js-linter.yml | 47 ++++++++++++++++ .github/workflows/release.yml | 59 ++++++++++++++++++++ 4 files changed, 226 insertions(+) create mode 100644 .github/workflows/android-build.yml create mode 100644 .github/workflows/frontend-build.yml create mode 100644 .github/workflows/js-linter.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml new file mode 100644 index 0000000..f2cf3bb --- /dev/null +++ b/.github/workflows/android-build.yml @@ -0,0 +1,81 @@ +name: "Build: Android" +on: + workflow_dispatch: + workflow_call: + inputs: + semver: + required: true + type: string + push: + branches: [ "main" ] + paths: [ "frontend" ] + pull_request: + branches: [ "main" ] + paths: [ "frontend" ] + +jobs: + build-android: + runs-on: ubuntu-latest + steps: + - name: 'Checkout' + uses: actions/checkout@v3 + + - name: 'Install yarn Dependencies' + run: | + yarn install + + - uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 11 + + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + + - name: 'Build Android Release' + run: | + cd android + ./gradlew assembleRelease + + - name: 'Get Commit Hash' + id: commit + uses: pr-mpt/actions-commit-hash@v1 + + - name: 'Upload .apk Release Artifact (for Release)' + uses: actions/upload-artifact@v3 + if: inputs.semver != '' # If this workflow is called from release.yml + with: + name: nostros-${{ inputs.semver }}.apk + path: android/app/build/outputs/apk/release/app-release.apk + + - name: 'Upload .apk Artifact (for Pre-release)' + uses: actions/upload-artifact@v3 + if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release) + with: + name: nostros-${{ steps.commit.outputs.short }}.apk + path: android/app/build/outputs/apk/release/app-release.apk + + - name: 'Create Pre-release' + id: create_release + if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release) + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: android-${{ steps.commit.outputs.short }} + release_name: nostros-android-${{ steps.commit.outputs.short }} + changelog: CHANGELOG.md + draft: false + prerelease: true + + - name: 'Upload Pre-release APK Release Asset' + id: upload-release-apk-asset + if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release) + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./android/app/build/outputs/apk/release/app-release.apk + asset_name: nostros-${{ steps.commit.outputs.short }}.apk + asset_content_type: application/apk diff --git a/.github/workflows/frontend-build.yml b/.github/workflows/frontend-build.yml new file mode 100644 index 0000000..c160fd2 --- /dev/null +++ b/.github/workflows/frontend-build.yml @@ -0,0 +1,39 @@ +name: "Build: Frontend All Bundles" + +on: + push: + branches: [ "main" ] + paths: [ "frontend" ] + pull_request: + branches: [ "main" ] + paths: [ "frontend" ] + +concurrency: + group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' + cancel-in-progress: true + +permissions: + contents: read + pull-requests: read + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: 'Checkout' + uses: actions/checkout@v3 + - name: 'Setup node' + uses: actions/setup-node@v3 + with: + node-version: 16.17.0 + cache: yarn + cache-dependency-path: frontend/package-lock.json + - name: 'Install NPM Dependencies' + run: | + cd frontend + yarn install + - name: 'Format' + run: | + cd frontend + yarn format \ No newline at end of file diff --git a/.github/workflows/js-linter.yml b/.github/workflows/js-linter.yml new file mode 100644 index 0000000..03282a7 --- /dev/null +++ b/.github/workflows/js-linter.yml @@ -0,0 +1,47 @@ +name: "Lint: Javascript Client" + +on: + # Trigger the workflow on push or pull request, + # but only for the main branch + push: + branches: + - main + paths: + - frontend + pull_request: + branches: + - main + paths: + - frontend + +jobs: + run-linters: + name: Run linters + runs-on: ubuntu-latest + + steps: + - name: Check out Git repository + uses: actions/checkout@v2 + + - name: 'Setup node' + uses: actions/setup-node@v3 + with: + node-version: 16.17.0 + cache: yarn + cache-dependency-path: frontend/package-lock.json + + # ESLint and Prettier must be in `package.json` + - name: 'Install NPM Dependencies' + run: | + cd frontend + yarn install + + - name: Run linters + uses: wearerequired/lint-action@v2 + with: + prettier: true + prettier_dir: frontend + + ## Disabled due to error + # eslint: true + # eslint_dir: frontend \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..aadba6b --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,59 @@ + +name: Release + +on: + push: + tags: + - "v*.*.*" + +jobs: + check-version: + runs-on: ubuntu-latest + outputs: + semver: ${{ steps.validate.outputs.semver }} + steps: + - name: 'Checkout' + uses: actions/checkout@v3 + - name: 'Expose Version' + id: validate + shell: bash + run: | + semver=$(git describe --tags --abbrev=0) + android-build: + uses: KoalaSat/nostros/.github/workflows/android-build.yml@main + needs: [check-version] + with: + semver: ${{ needs.check-version.outputs.semver }} + release: + needs: [android-build] + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: "Generate Release Changelog" + id: changelog + uses: heinrichreimer/github-changelog-generator-action@v2.3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + - name: Release + id: create-release + uses: softprops/action-gh-release@v1 + with: + body: ${{ steps.changelog.outputs.changelog }} + + # Upload APK artifact asset + - name: 'Download APK Artifact' + uses: actions/download-artifact@v3 + with: + name: nostros-${{ needs.check-version.outputs.semver }}.apk + path: . + - name: 'Upload APK Asset' + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create-release.outputs.upload_url }} + asset_path: app-release.apk + asset_name: nostros-${{ needs.check-version.outputs.semver }}.apk + asset_content_type: application/apk \ No newline at end of file From e89e60dcd85c0243953da147098c28b898bed92e Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 19:58:26 +0000 Subject: [PATCH 07/16] Update README.md --- .github/workflows/android-build.yml | 35 +------------------------ .github/workflows/frontend-build.yml | 39 ---------------------------- .github/workflows/release.yml | 22 ++-------------- README.md | 5 +++- 4 files changed, 7 insertions(+), 94 deletions(-) delete mode 100644 .github/workflows/frontend-build.yml diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index f2cf3bb..5f0a10c 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -43,39 +43,6 @@ jobs: - name: 'Upload .apk Release Artifact (for Release)' uses: actions/upload-artifact@v3 - if: inputs.semver != '' # If this workflow is called from release.yml with: - name: nostros-${{ inputs.semver }}.apk + name: nostros-$(git describe --tags --abbrev=0).apk path: android/app/build/outputs/apk/release/app-release.apk - - - name: 'Upload .apk Artifact (for Pre-release)' - uses: actions/upload-artifact@v3 - if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release) - with: - name: nostros-${{ steps.commit.outputs.short }}.apk - path: android/app/build/outputs/apk/release/app-release.apk - - - name: 'Create Pre-release' - id: create_release - if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release) - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: android-${{ steps.commit.outputs.short }} - release_name: nostros-android-${{ steps.commit.outputs.short }} - changelog: CHANGELOG.md - draft: false - prerelease: true - - - name: 'Upload Pre-release APK Release Asset' - id: upload-release-apk-asset - if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release) - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./android/app/build/outputs/apk/release/app-release.apk - asset_name: nostros-${{ steps.commit.outputs.short }}.apk - asset_content_type: application/apk diff --git a/.github/workflows/frontend-build.yml b/.github/workflows/frontend-build.yml deleted file mode 100644 index c160fd2..0000000 --- a/.github/workflows/frontend-build.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: "Build: Frontend All Bundles" - -on: - push: - branches: [ "main" ] - paths: [ "frontend" ] - pull_request: - branches: [ "main" ] - paths: [ "frontend" ] - -concurrency: - group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' - cancel-in-progress: true - -permissions: - contents: read - pull-requests: read - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: 'Checkout' - uses: actions/checkout@v3 - - name: 'Setup node' - uses: actions/setup-node@v3 - with: - node-version: 16.17.0 - cache: yarn - cache-dependency-path: frontend/package-lock.json - - name: 'Install NPM Dependencies' - run: | - cd frontend - yarn install - - name: 'Format' - run: | - cd frontend - yarn format \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aadba6b..247f560 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,25 +7,7 @@ on: - "v*.*.*" jobs: - check-version: - runs-on: ubuntu-latest - outputs: - semver: ${{ steps.validate.outputs.semver }} - steps: - - name: 'Checkout' - uses: actions/checkout@v3 - - name: 'Expose Version' - id: validate - shell: bash - run: | - semver=$(git describe --tags --abbrev=0) - android-build: - uses: KoalaSat/nostros/.github/workflows/android-build.yml@main - needs: [check-version] - with: - semver: ${{ needs.check-version.outputs.semver }} release: - needs: [android-build] runs-on: ubuntu-latest steps: - name: Checkout @@ -45,7 +27,7 @@ jobs: - name: 'Download APK Artifact' uses: actions/download-artifact@v3 with: - name: nostros-${{ needs.check-version.outputs.semver }}.apk + name: nostros-$(git describe --tags --abbrev=0).apk path: . - name: 'Upload APK Asset' id: upload-release-asset @@ -55,5 +37,5 @@ jobs: with: upload_url: ${{ steps.create-release.outputs.upload_url }} asset_path: app-release.apk - asset_name: nostros-${{ needs.check-version.outputs.semver }}.apk + asset_name: nostros-$(git describe --tags --abbrev=0).apk asset_content_type: application/apk \ No newline at end of file diff --git a/README.md b/README.md index e36089f..070eca8 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,10 @@ yarn start ``` # Some Features to Work On - +### Bugs +- [ ] User info missing on first start +- [ ] i18n not loading +- [ ] Logging out and in again does not work ### Basics - [ ] Infinite Load - [ ] Relays management (add, remove and recomend) From 0bc6c4bf7f0c46df473839ac608c4dedb51d2a89 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 22:10:09 +0200 Subject: [PATCH 08/16] Workflows --- .github/workflows/android-build.yml | 6 ------ .github/workflows/release.yml | 7 +++++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 5f0a10c..ab163cc 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -1,11 +1,5 @@ name: "Build: Android" on: - workflow_dispatch: - workflow_call: - inputs: - semver: - required: true - type: string push: branches: [ "main" ] paths: [ "frontend" ] diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 247f560..f4ea690 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,10 @@ on: - "v*.*.*" jobs: + android-build: + uses: KoalaSat/nostros/.github/workflows/android-build.yml@main release: + needs: [android-build] runs-on: ubuntu-latest steps: - name: Checkout @@ -27,7 +30,7 @@ jobs: - name: 'Download APK Artifact' uses: actions/download-artifact@v3 with: - name: nostros-$(git describe --tags --abbrev=0).apk + name: nostros-${{ needs.check-version.outputs.semver }}.apk path: . - name: 'Upload APK Asset' id: upload-release-asset @@ -37,5 +40,5 @@ jobs: with: upload_url: ${{ steps.create-release.outputs.upload_url }} asset_path: app-release.apk - asset_name: nostros-$(git describe --tags --abbrev=0).apk + asset_name: nostros-${{ needs.check-version.outputs.semver }}.apk asset_content_type: application/apk \ No newline at end of file From e02d1c31c1c15d20b6c56c19acc212d9d1de1075 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 22:11:29 +0200 Subject: [PATCH 09/16] Workflows 2 --- .github/workflows/android-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index ab163cc..3b0e115 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -1,5 +1,7 @@ name: "Build: Android" on: + workflow_dispatch: + workflow_call: push: branches: [ "main" ] paths: [ "frontend" ] From 3c3df7ec3e1c773a97935ad3b816f76631a3131a Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 20:15:33 +0000 Subject: [PATCH 10/16] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 070eca8..d09dfbe 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ yarn start - [ ] User info missing on first start - [ ] i18n not loading - [ ] Logging out and in again does not work +- [ ] Clipboard library not working ### Basics - [ ] Infinite Load - [ ] Relays management (add, remove and recomend) From 19114b7db935dd6c96e912afcfdb1bd92b4a71bf Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 22:17:41 +0200 Subject: [PATCH 11/16] Workflows Java Version --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f4ea690..d156b25 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: - name: 'Download APK Artifact' uses: actions/download-artifact@v3 with: - name: nostros-${{ needs.check-version.outputs.semver }}.apk + name: nostros-$(git describe --tags --abbrev=0).apk path: . - name: 'Upload APK Asset' id: upload-release-asset @@ -40,5 +40,5 @@ jobs: with: upload_url: ${{ steps.create-release.outputs.upload_url }} asset_path: app-release.apk - asset_name: nostros-${{ needs.check-version.outputs.semver }}.apk + asset_name: nostros-$(git describe --tags --abbrev=0).apk asset_content_type: application/apk \ No newline at end of file From 1cfc8bc1c7a6f4ca105a4771128a8ee24a80bb54 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 22:29:48 +0200 Subject: [PATCH 12/16] Workflows Fix --- .github/workflows/android-build.yml | 2 +- .github/workflows/release.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 3b0e115..8b10013 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -40,5 +40,5 @@ jobs: - name: 'Upload .apk Release Artifact (for Release)' uses: actions/upload-artifact@v3 with: - name: nostros-$(git describe --tags --abbrev=0).apk + name: nostros-${{ github.ref_name }}.apk path: android/app/build/outputs/apk/release/app-release.apk diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d156b25..cd4e2d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: - name: 'Download APK Artifact' uses: actions/download-artifact@v3 with: - name: nostros-$(git describe --tags --abbrev=0).apk + name: nostros-${{ github.ref_name }}.apk path: . - name: 'Upload APK Asset' id: upload-release-asset @@ -40,5 +40,5 @@ jobs: with: upload_url: ${{ steps.create-release.outputs.upload_url }} asset_path: app-release.apk - asset_name: nostros-$(git describe --tags --abbrev=0).apk + asset_name: nostros-${{ github.ref_name }}.apk asset_content_type: application/apk \ No newline at end of file From 26458c75bf1c5bc59c31147a53a60f238ecbc7ed Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 20:35:21 +0000 Subject: [PATCH 13/16] Update README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d09dfbe..a191f23 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ -[![Codacy Badge](https://app.codacy.com/project/badge/Grade/db3100f978a542d588f8ae9a4abf2d55)](https://www.codacy.com/gh/KoalaSat/sats-4-likes-bot/dashboard?utm_source=github.com&utm_medium=referral&utm_content=KoalaSat/sats-4-likes-bot&utm_campaign=Badge_Grade) -[![MIT license](https://img.shields.io/badge/license-MIT-green)](https://github.com/KoalaSat/sats-4-likes-bot/blob/main/LICENSE) +[![Codacy Badge](https://app.codacy.com/project/badge/Grade/db3100f978a542d588f8ae9a4abf2d55)](https://www.codacy.com/gh/KoalaSat/nostros/dashboard?utm_source=github.com&utm_medium=referral&utm_content=KoalaSat/nostros&utm_campaign=Badge_Grade) +[![Apache 2 license](https://img.shields.io/badge/license-Apache%202-blue)](https://github.com/KoalaSat/nostros/blob/main/LICENSE) + +https://img.shields.io/badge/license-Apache%202-blue ![nostros_logo](https://user-images.githubusercontent.com/111684255/197588983-2a196d74-0f1e-45e8-be56-0da8c1602835.png) From 2d95b0778aa1ae85b5c538acc3b89ac119697723 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 20:35:45 +0000 Subject: [PATCH 14/16] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index a191f23..2e94970 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ [![Codacy Badge](https://app.codacy.com/project/badge/Grade/db3100f978a542d588f8ae9a4abf2d55)](https://www.codacy.com/gh/KoalaSat/nostros/dashboard?utm_source=github.com&utm_medium=referral&utm_content=KoalaSat/nostros&utm_campaign=Badge_Grade) [![Apache 2 license](https://img.shields.io/badge/license-Apache%202-blue)](https://github.com/KoalaSat/nostros/blob/main/LICENSE) -https://img.shields.io/badge/license-Apache%202-blue - ![nostros_logo](https://user-images.githubusercontent.com/111684255/197588983-2a196d74-0f1e-45e8-be56-0da8c1602835.png) Wellcome to the NOSTROS project. From 5a0f50d24cde0bb71cec16b871d05be0c20f320f Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 20:46:00 +0000 Subject: [PATCH 15/16] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 2e94970..ec344b9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -[![Codacy Badge](https://app.codacy.com/project/badge/Grade/db3100f978a542d588f8ae9a4abf2d55)](https://www.codacy.com/gh/KoalaSat/nostros/dashboard?utm_source=github.com&utm_medium=referral&utm_content=KoalaSat/nostros&utm_campaign=Badge_Grade) [![Apache 2 license](https://img.shields.io/badge/license-Apache%202-blue)](https://github.com/KoalaSat/nostros/blob/main/LICENSE) ![nostros_logo](https://user-images.githubusercontent.com/111684255/197588983-2a196d74-0f1e-45e8-be56-0da8c1602835.png) From d4d93ae02cafc454047f9a83d20aff54dcf4204e Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Mon, 24 Oct 2022 23:03:53 +0200 Subject: [PATCH 16/16] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ec344b9..e8d30f4 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Wellcome to the NOSTROS project. # Getting Started -## Required Libraries and Framworks +## Required Libraries and Frameworks - Node 16.x - JDK 17.0.x - (Android) Android Studio SKD @@ -17,7 +17,7 @@ Wellcome to the NOSTROS project. - Open a virtual device - Install ``` -yarn format +yarn install ``` - Run Metro ```