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

OD Hack: struct + fix + features + clean #25

Merged
merged 38 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
b64c714
fix indexer prisma pull
MSghais Aug 20, 2024
2713995
change folder structure repo
MSghais Aug 20, 2024
98a0e56
add nip 07 extension connection
MSghais Aug 20, 2024
26186fe
retrive password settings
MSghais Aug 20, 2024
f5efa36
Add @MSGhais as a contributor
MSghais Aug 20, 2024
dd02ab2
fix lint + typo + ci
MSghais Aug 20, 2024
9795eaa
try fix favicon mobile
MSghais Aug 20, 2024
11e01c0
add pk import + relays config
MSghais Aug 20, 2024
f720f7c
add telegram web + backend service
MSghais Aug 20, 2024
59fc5b6
add package json to build backend
MSghais Aug 20, 2024
d945c77
try lock to deploy backend
MSghais Aug 20, 2024
5c9affe
add backend + tg
MSghais Aug 20, 2024
82cf3e5
backend docker in root
MSghais Aug 20, 2024
78e918e
backend docker file in root
MSghais Aug 20, 2024
a4ba45b
docker fix => try env setup and deploy
MSghais Aug 20, 2024
8529c98
clean
MSghais Aug 20, 2024
0c5173c
no common build
MSghais Aug 20, 2024
d595dff
fix pnpm i docker
MSghais Aug 20, 2024
91f6cb0
no frozen
MSghais Aug 20, 2024
9cf63a5
prisma in root
MSghais Aug 20, 2024
8c2a4b7
tsup root
MSghais Aug 20, 2024
5cfbb5c
delete tsconfig
MSghais Aug 20, 2024
cc301b2
node type and tsup in backend
MSghais Aug 20, 2024
283f117
tsconfig
MSghais Aug 20, 2024
7f09751
config module
MSghais Aug 20, 2024
7ae029b
frozen
MSghais Aug 20, 2024
6a7bab9
tsconfig node in backend and root
MSghais Aug 20, 2024
198a644
tsconfig root
MSghais Aug 20, 2024
4b732c1
fix config backend
MSghais Aug 20, 2024
ec72d84
error docker with module
MSghais Aug 20, 2024
50d0089
call gooddevops for deploy backend
MSghais Aug 20, 2024
fdf79a4
no build
MSghais Aug 20, 2024
3dc42ce
no build copy
MSghais Aug 20, 2024
a7f628d
reuse dist
MSghais Aug 20, 2024
2f3120f
fix lint package
MSghais Aug 20, 2024
3b9923f
clean
MSghais Aug 20, 2024
2e4ec98
check undefined
MSghais Aug 20, 2024
88992be
fix nostr sdk
MSghais Aug 20, 2024
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
  •  
  •  
  •  
208 changes: 5 additions & 203 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -1,223 +1,25 @@
{
"projectName": "joyboy",
"projectOwner": "keep-starknet-strange",
"projectName": "afk_monorepo",
"projectOwner": "AFK-AlignedFamKernel",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
"README.md"
],
"imageSize": 100,
"commit": true,
"commitConvention": "gitmoji",
"commitConvention": "none",
"contributors": [
{
"login": "AbdelStark",
"name": "Abdel @ StarkWare ",
"avatar_url": "https://avatars.githubusercontent.com/u/45264458?v=4",
"profile": "https://github.com/AbdelStark",
"contributions": [
"code"
]
},
{
"login": "maciejka",
"name": "Maciej Kamiński @ StarkWare",
"avatar_url": "https://avatars.githubusercontent.com/u/190855?v=4",
"profile": "https://github.com/maciejka",
"contributions": [
"code"
]
},
{
"login": "MSghais",
"name": "MSG",
"avatar_url": "https://avatars.githubusercontent.com/u/59928086?v=4",
"profile": "https://github.com/MSghais",
"contributions": [
"code"
]
},
{
"login": "kateberryd",
"name": "Catherine Jonathan",
"avatar_url": "https://avatars.githubusercontent.com/u/35270183?v=4",
"profile": "https://github.com/kateberryd",
"contributions": [
"code"
]
},
{
"login": "ayushtom",
"name": "Ayush Tomar",
"avatar_url": "https://avatars.githubusercontent.com/u/41674634?v=4",
"profile": "https://github.com/ayushtom",
"contributions": [
"code"
]
},
{
"login": "mubarak23",
"name": "Mubarak Muhammad Aminu",
"avatar_url": "https://avatars.githubusercontent.com/u/7858376?v=4",
"profile": "http://mubarak23.github.io/",
"contributions": [
"code"
]
},
{
"login": "ugur-eren",
"name": "Uğur Eren",
"avatar_url": "https://avatars.githubusercontent.com/u/86152092?v=4",
"profile": "https://ugureren.net/",
"contributions": [
"code"
]
},
{
"login": "Oshioke-Salaki",
"name": "Oshioke Salaki",
"avatar_url": "https://avatars.githubusercontent.com/u/105825121?v=4",
"profile": "https://github.com/Oshioke-Salaki",
"contributions": [
"code"
]
},
{
"login": "bhavyagosai",
"name": "Bhavya Gosai",
"avatar_url": "https://avatars.githubusercontent.com/u/64588227?v=4",
"profile": "https://github.com/bhavyagosai",
"contributions": [
"code"
]
},
{
"login": "BlackStarkGoku",
"name": "BlackStarkGoku",
"avatar_url": "https://avatars.githubusercontent.com/u/165695008?v=4",
"profile": "https://github.com/BlackStarkGoku",
"contributions": [
"code"
]
},
{
"login": "Israelrex9",
"name": "IsraelRex",
"avatar_url": "https://avatars.githubusercontent.com/u/46507005?v=4",
"profile": "https://github.com/Israelrex9",
"contributions": [
"design"
]
},
{
"login": "EjembiEmmanuel",
"name": "Emmaunuel Ejembi",
"avatar_url": "https://avatars.githubusercontent.com/u/83036156?v=4",
"profile": "https://github.com/EjembiEmmanuel",
"contributions": [
"code"
]
},
{
"login": "Ayoazeez26",
"name": "Abdulhakeem Abdulazeez Ayodeji",
"avatar_url": "https://avatars.githubusercontent.com/u/44169294?v=4",
"profile": "https://github.com/Ayoazeez26",
"contributions": [
"code"
]
},
{
"login": "josephchimebuka",
"name": "Joseph Chimebuka",
"avatar_url": "https://avatars.githubusercontent.com/u/87217051?v=4",
"profile": "https://github.com/josephchimebuka",
"contributions": [
"code"
]
},
{
"login": "omahs",
"name": "omahs",
"avatar_url": "https://avatars.githubusercontent.com/u/73983677?v=4",
"profile": "https://github.com/omahs",
"contributions": [
"code"
]
},
{
"login": "Calebux",
"name": "Caleb ",
"avatar_url": "https://avatars.githubusercontent.com/u/119738245?v=4",
"profile": "https://github.com/Calebux",
"contributions": [
"code"
]
},
{
"login": "benbaruka",
"name": "Ben Ickah",
"avatar_url": "https://avatars.githubusercontent.com/u/89651828?v=4",
"profile": "https://developer.mozilla.org/",
"contributions": [
"code"
]
},
{
"login": "Shoetan",
"name": "Emmanuel Soetan",
"avatar_url": "https://avatars.githubusercontent.com/u/17912134?v=4",
"profile": "https://soetandev.netlify.app/",
"contributions": [
"code"
]
},
{
"login": "princeibs",
"name": "princeibs",
"avatar_url": "https://avatars.githubusercontent.com/u/64266194?v=4",
"profile": "https://github.com/princeibs",
"contributions": [
"code"
]
},
{
"login": "goofylfg",
"name": "goofylfg",
"avatar_url": "https://avatars.githubusercontent.com/u/165781272?v=4",
"profile": "https://github.com/goofylfg",
"contributions": [
"code"
]
},
{
"login": "lfgtwo",
"name": "lfg2",
"avatar_url": "https://avatars.githubusercontent.com/u/171595475?v=4",
"profile": "https://github.com/lfgtwo",
"contributions": [
"code"
]
},
{
"login": "devcollinss",
"name": "Collins Ikechukwu (devcollins)",
"avatar_url": "https://avatars.githubusercontent.com/u/90073781?v=4",
"profile": "https://github.com/devcollinss",
"contributions": [
"code"
]
},
{
"login": "petersssong",
"name": "petersssong",
"avatar_url": "https://avatars.githubusercontent.com/u/171840752?v=4",
"profile": "https://github.com/petersssong",
"contributions": [
"code"
"doc"
]
}
],
"contributorsPerLine": 7,
"linkToUsage": false
"linkToUsage": true
}
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
- Claiming a task

- Comment on the task you would like to take, include the estimated delivery timeline (start date and estimated completion date), describe how you would approach this task and a include brief summary of relevant skills.
- Join the Telegram group for updates and discussions. https://t.me/JoyboyStarknet
- Join the Telegram group for updates and discussions. https://t.me/afk_aligned_fam_kernel

- Task Assignment

Expand All @@ -23,7 +23,7 @@
### Setup

- Clone the repository
- Navigate to the JoyboyCommunity directory. `cd JoyboyCommunity`
- Navigate to the AFK Mobile directory. `cd apps/mobile`
- Install the dependencies using yarn `yarn install`
- Start the development server `yarn start`
- Open the app in your browser / device / emulator.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ on:
branches:
- main
paths:
- "JoyboyCommunity/**"
- "apps/mobile/**"
pull_request:
branches:
- main
paths:
- "JoyboyCommunity/**"
- "apps/mobile/**"

jobs:
check-app:
runs-on: ubuntu-latest

defaults:
run:
working-directory: ./JoyboyCommunity
working-directory: ./apps/mobile

steps:
- name: Checkout Code
Expand All @@ -28,17 +28,16 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: "20.x"
cache: "yarn"
cache-dependency-path: ./JoyboyCommunity/yarn.lock
cache: "pnpm"

- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile

- name: Prettier Format Check
run: yarn format:check
run: pnpm format:check

- name: ESLint Check
run: yarn lint
run: pnpm lint

- name: TypeScript Check
run: yarn ts:check
run: pnpm ts:check
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ node_modules/

.turbo

pnpm-lock.yaml
.env
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
shamefully-hoist=true
[email protected]
66 changes: 66 additions & 0 deletions Backend copy.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# Use a Node.js base image
FROM node:18-alpine AS base

# Set the working directory inside the container
WORKDIR /app

# Add an argument for the Telegram bot token
ARG TELEGRAM_BOT_TOKEN

# Set the environment variable
ENV TELEGRAM_BOT_TOKEN=${TELEGRAM_BOT_TOKEN}

# Add an argument for th Indexer postgres url
ARG INDEXER_DATABASE_URL

# Set the environment variable
ENV INDEXER_DATABASE_URL=${INDEXER_DATABASE_URL}


# Add an argument for Telegram webapp
ARG TELEGRAM_WEB_APP

# Set the environment variable
ENV TELEGRAM_WEB_APP=${TELEGRAM_WEB_APP}

# Copy root-level package files
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./

# Install pnpm globally
RUN npm install -g pnpm

# Install all dependencies for the workspace, including common and data-backend
RUN pnpm install --frozen-lockfile

# Copy the entire repository into the Docker container
COPY . .

# Build the indexer-prisma package
RUN pnpm --filter indexer-prisma build

# Build the data-backend package
RUN pnpm --filter data-backend build

# Use a smaller production base image
FROM node:18-alpine AS production

# Set the working directory in the production container
WORKDIR /app

# Copy the node_modules and built files from the base stage
COPY --from=base /app/node_modules ./node_modules
COPY --from=base /app/packages/common ./packages/common
COPY --from=base /app/packages/indexer-prisma ./packages/indexer-prisma
COPY --from=base /app/apps/data-backend/dist ./apps/data-backend/dist

# Copy only necessary files for the application to run
COPY apps/data-backend/package.json ./

# Set the environment variable to production
ENV NODE_ENV=production

# Expose the port your app runs on
EXPOSE 3000

# Command to start the application
CMD ["node", "apps/data-backend/dist/index.js"]
Loading
Loading