cleanup + gitignores for diff host

s-alad · May 4, 2024 · fd1d2bd · fd1d2bd
1 parent afdc3c4
commit fd1d2bd
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 246 deletions.
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
@@ -0,0 +1,20 @@
+# This file was auto-generated by the Firebase CLI
+# https://github.com/firebase/firebase-tools
+
+name: Deploy to Firebase Hosting on merge
+'on':
+  push:
+    branches:
+      - main
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: npm ci && npm run build
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_TOOFAKE_CLIENT }}'
+          channelId: live
+          projectId: toofake-client
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -0,0 +1,17 @@
+# This file was auto-generated by the Firebase CLI
+# https://github.com/firebase/firebase-tools
+
+name: Deploy to Firebase Hosting on PR
+'on': pull_request
+jobs:
+  build_and_preview:
+    if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: npm ci && npm run build
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_TOOFAKE_CLIENT }}'
+          projectId: toofake-client
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,2 @@
-#Pycache 
-__pycache__/
-models/__pycache__/
-server/models/__pycache__/
-__pycache__
-
-
-#Dependencies 
 node_modules/
-prop.py
 .env
-/test
diff --git a/client/.gitignore b/client/.gitignore
@@ -36,6 +36,13 @@ next-env.d.ts
 
 # sst
 .sst
+sst-env.d.ts
+sst.config.ts
 
 # open-next
 .open-next
+
+# firebase
+firebase.json
+.firebaserc
+.firebase
diff --git a/client/pages/_document.tsx b/client/pages/_document.tsx
@@ -6,8 +6,10 @@ export default function Document() {
 	return (
 		<Html lang="en">
 			<Head>
-				<Script async src="https://toofake-analytics.up.railway.app/script.js" data-website-id="849b3e73-c171-4ee0-bb3c-fd1aba9fe2d5" strategy="lazyOnload"></Script>
-				<Script async src="https://toofake-analytics.up.railway.app/script.js" data-website-id="fb480e66-7c55-423b-9543-753b669fbfca" strategy="lazyOnload"></Script>
+				{/* <Script async src="https://toofake-analytics.up.railway.app/script.js" data-website-id="849b3e73-c171-4ee0-bb3c-fd1aba9fe2d5" strategy="lazyOnload"></Script>
+				<Script async src="https://toofake-analytics.up.railway.app/script.js" data-website-id="fb480e66-7c55-423b-9543-753b669fbfca" strategy="lazyOnload"></Script> */}
+				<Script defer src="https://toofake-analytics.vercel.app/script.js" data-website-id="849b3e73-c171-4ee0-bb3c-fd1aba9fe2d5" strategy="lazyOnload"></Script>
+				<Script defer src="https://toofake-analytics.vercel.app/script.js" data-website-id="fb480e66-7c55-423b-9543-753b669fbfca" strategy="lazyOnload"></Script>
 			</Head>
 			<body>
 				<Main />

diff --git a/client/pages/api/otp/fire/send.ts b/client/pages/api/otp/fire/send.ts
@@ -1,6 +1,5 @@
 import type { NextApiRequest, NextApiResponse } from 'next'
 import axios from 'axios';
-import { generateDeviceId } from '@/utils/device';
 import { GAPIKEY } from '@/utils/constants';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {

diff --git a/client/pages/api/otp/fire/verify.ts b/client/pages/api/otp/fire/verify.ts
@@ -1,6 +1,5 @@
 import type { NextApiRequest, NextApiResponse } from 'next'
 import axios from 'axios';
-import { generateDeviceId } from '@/utils/device';
 import { GAPIKEY, PROXY } from '@/utils/constants';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {

diff --git a/client/pages/api/otp/vonage/verify.ts b/client/pages/api/otp/vonage/verify.ts
@@ -1,6 +1,5 @@
 import type { NextApiRequest, NextApiResponse } from 'next'
 import axios from 'axios';
-import { generateDeviceId } from '@/utils/device';
 import { GAPIKEY } from '@/utils/constants';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {

diff --git a/client/pages/index.tsx b/client/pages/index.tsx
@@ -1,11 +1,9 @@
 import Head from 'next/head'
 import { Inter } from 'next/font/google'
-import styles from '@/styles/Home.module.css'
 import Image from 'next/image'
 import s from './index.module.scss'
 import axios from "axios";
 import { useState } from 'react';
-import { generateDeviceId } from '@/utils/device'
 import PhoneInput from 'react-phone-input-2';
 import "react-phone-input-2/lib/bootstrap.css";
 import { useRouter } from 'next/router'

diff --git a/client/styles/Home.module.css b/client/styles/Home.module.css