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

Merging new changes from oblf #54

Merged
merged 52 commits into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
0ed4ab3
changes for oblf: remove button for take observation , add new fields…
upendraTekdi Feb 15, 2024
b188949
Merge pull request #36 from upendraTekdi/uk_oblf_fixes
vaivk369 Feb 15, 2024
220a04c
Issue #213840 feat: Add config on cohort level to show/not to show th…
vaibhavsTekdi Feb 19, 2024
aa5f02e
Merge pull request #38 from vaibhavsTekdi/vs-oblf
vaivk369 Feb 19, 2024
cedde90
Issue #214005 feat: Teacher Attendance Specific to Cohort
vaibhavsTekdi Feb 19, 2024
8a66b93
Merge branch 'oblf-21stFeb' of github.com:tekdi/shiksha-frontend into…
vaibhavsTekdi Feb 19, 2024
fdc9025
Task #213997: API integration of AttendanceSearch api call and update…
upendraTekdi Feb 19, 2024
314fa7d
Issue #214005 feat: Teacher Attendance Specific to Cohort
vaibhavsTekdi Feb 20, 2024
0bac238
Merge pull request #39 from vaibhavsTekdi/vs-oblf
vaivk369 Feb 20, 2024
ae90f8a
Issue #214069 feat: Show the cohort list on the basis of cohort membe…
vaibhavsTekdi Feb 20, 2024
3692f15
Issue #214069 feat: Show the cohort list on the basis of cohort membe…
vaibhavsTekdi Feb 20, 2024
431529e
Merge pull request #41 from vaibhavsTekdi/vs-updatecohortsearchlist
vaivk369 Feb 20, 2024
2c4f526
Merge branch 'oblf-21stFeb' of https://github.com/tekdi/shiksha-front…
upendraTekdi Feb 20, 2024
fc4b2db
Task #213997: API integration of AttendanceSearch api call and update…
upendraTekdi Feb 20, 2024
d0a1ae7
Create 1.txt
PrasadAthani Feb 20, 2024
45e8331
Create oblf-21stFeb-9.20.yml
PrasadAthani Feb 20, 2024
89b47f3
Merge pull request #40 from upendraTekdi/uk_oblf_fixes
vaivk369 Feb 21, 2024
122fae7
Issue #214069 feat: Add the school(parent) name to cohort(class) on c…
vaibhavsTekdi Feb 21, 2024
05bf83d
Merge branch 'oblf-21stFeb' of github.com:tekdi/shiksha-frontend into…
vaibhavsTekdi Feb 21, 2024
7a061bd
Create Jenkinsfile
PrasadAthani Feb 21, 2024
2645e08
Issue #214069 feat: Add the school(parent) name to cohort(class) on c…
vaibhavsTekdi Feb 21, 2024
0d0ec46
Merge branch 'oblf-21stFeb' of github.com:tekdi/shiksha-frontend into…
vaibhavsTekdi Feb 21, 2024
d830679
Merge pull request #42 from vaibhavsTekdi/vs-updatecohortsearchlist
vaivk369 Feb 21, 2024
b1978f1
Delete .github/workflows/build-test.yml
PrasadAthani Feb 21, 2024
5c910bf
Delete .github/workflows/sandbox-build-deploy.yml
PrasadAthani Feb 21, 2024
6c81b6b
Delete .github/workflows/prod-build-deploy.yml
PrasadAthani Feb 21, 2024
60d7e61
Update oblf-21stFeb-9.20.yml
PrasadAthani Feb 21, 2024
82bb313
Update pack-prod-build.sh
PrasadAthani Feb 21, 2024
56b9c07
Update pack-prod-build.sh
PrasadAthani Feb 21, 2024
42987b2
Update pack-prod-build.sh
PrasadAthani Feb 21, 2024
783743b
Issue #214069 feat: Add the school(parent) name to cohort(class) on c…
vaibhavsTekdi Feb 22, 2024
4f55c62
Issue #214069 feat: Add the school(parent) name to cohort(class) on c…
vaibhavsTekdi Feb 22, 2024
0808582
Merge pull request #46 from vaibhavsTekdi/vs-updatecohortsearchlist
PrasadAthani Feb 22, 2024
f39c409
Update pack-prod-build.sh
PrasadAthani Feb 22, 2024
62fd11a
Update oblf-21stFeb-9.20.yml
PrasadAthani Feb 22, 2024
059b297
Create 2.txt
PrasadAthani Feb 22, 2024
2795e62
Issue #214069 feat: Add the school(parent) name to cohort(class) on c…
vaibhavsTekdi Feb 22, 2024
d01860e
Merge branch 'oblf-21stFeb' of github.com:tekdi/shiksha-frontend into…
vaibhavsTekdi Feb 22, 2024
ad0c00b
Update oblf-21stFeb-9.20.yml
PrasadAthani Feb 22, 2024
7a93872
Merge pull request #47 from vaibhavsTekdi/vs-updatecohortsearchlist
vaivk369 Feb 22, 2024
9b7e547
Delete 2.txt
PrasadAthani Feb 22, 2024
76303c5
Issue #000 chore: adding assets-links.json file
vaivk369 Feb 22, 2024
f2d5dd8
Issue #000 chore: adding assets-links.json file
vaivk369 Feb 22, 2024
9e2058c
Merge pull request #48 from vaivk369/oblf
vaivk369 Feb 22, 2024
01500ef
Issue #000 chore: adding assets-links.json file
vaivk369 Feb 22, 2024
c065eea
Merge pull request #49 from vaivk369/oblf
vaivk369 Feb 22, 2024
1db4bc5
Issue #000 fix: ui issues
vaivk369 Feb 22, 2024
5d434a8
Merge pull request #50 from vaivk369/oblf
vaivk369 Feb 22, 2024
cd551a6
Issue #000 UI fixes
vaivk369 Feb 23, 2024
2ac21c3
Merge pull request #51 from vaivk369/oblf
vaivk369 Feb 23, 2024
28b17b0
Issue #000 fix: ui issues
vaibhavsTekdi Feb 23, 2024
4f8070e
Merge pull request #52 from vaibhavsTekdi/vs-updatecohortsearchlist
vaivk369 Feb 23, 2024
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
37 changes: 0 additions & 37 deletions .github/workflows/build-test.yml

This file was deleted.

79 changes: 79 additions & 0 deletions .github/workflows/oblf-21stFeb-9.20.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Deploy to oblf-21stFeb
on:
push:
branches:
- oblf-21stFeb
jobs:
build:
name: Generate Build and Deploy to DEV
# environment: PROD
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Setup Node Env
uses: actions/setup-node@v3
with:
node-version: 21.1.0

- name: Generate React Build
run: |

yarn install
yarn build
- name: Create Lerna Bundles for Submodules
run: |
sh ./scripts/pack-prod-build.sh

- name: Show PWD
run: |
echo "Current Working Directory:"
pwd


- name: List Contents
run: |
echo "Contents of the current directory (in reverse order):"
ls -lr

# - name: List Contents
# run: |
# echo "Contents of the dist directory (in reverse order):"
# cd /home/runner/work/shiksha-frontend/shiksha-frontend/dist
# ls -lr

- name: Deploy to Server 1
uses: easingthemes/ssh-deploy@main
env:
SSH_PRIVATE_KEY: ${{ secrets.EC2_SSH_KEY }}
REMOTE_HOST: ${{ secrets.HOST_DNS }}
REMOTE_USER: ${{ secrets.USERNAME }}
TARGET: ${{ secrets.TARGET_DIR }}

- name: Set up SSH key
run: |
mkdir -p ~/.ssh
echo "${{ secrets.EC2_SSH_KEY }}" > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
# Add the SSH key to the known_hosts file (replace hostname with your actual hostname)
ssh-keyscan -H ${{ secrets.HOST_DNS }} >> ~/.ssh/known_hosts


# - name: Deploy with rsync
# run: |
# rsync -avz -e "ssh -i ~/.ssh/id_rsa" ./dist/ ${{ secrets.USERNAME }}@${{ secrets.HOST_DNS }}:/home/ubuntu/prasad


- name: Copy Build Artifact using Rsync
run: rsync -avz -e "ssh -p ${{ secrets.PORT }}" shiksha-ui.tar ${{ secrets.USERNAME }}@${{ secrets.HOST_DNS }}:/home/prasad

- name: Unzip Artifact to Correct Locations to Deploy
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.HOST_DNS }}
username: ${{ secrets.USERNAME }}
key: ${{ secrets.EC2_SSH_KEY }}
script: |
cd /home/prasad
tar -xvf shiksha-ui.tar -C /var/www/shiksha.uniteframework.io/new
51 changes: 0 additions & 51 deletions .github/workflows/prod-build-deploy.yml

This file was deleted.

41 changes: 0 additions & 41 deletions .github/workflows/sandbox-build-deploy.yml

This file was deleted.

8 changes: 8 additions & 0 deletions .well-known/assetlinks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[{
"relation": ["delegate_permission/common.handle_all_urls"],
"target": {
"namespace": "android_app",
"package_name": "io.uniteframework.shiksha.twa",
"sha256_cert_fingerprints": ["5D:27:14:88:B0:06:02:E1:20:BB:4E:41:88:76:FD:32:0F:A4:26:EC:FE:BD:DA:C1:70:88:89:8C:50:C8:E9:F3"]
}
}]
1 change: 1 addition & 0 deletions 1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

33 changes: 33 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
pipeline {
agent any
stages {
stage('clean workspace'){
steps{
cleanWs()
}
}
stage('Checkout'){

steps{

// git branch: 'main', credentialsId: 'github-1', url: 'https://github.com/tekdi/shiksha-backend.git'
// checkout scmGit(branches: [[name: '*/oblf-21stFeb']], extensions: [], userRemoteConfigs: [[credentialsId: 'github-1', url: 'https://github.com/tekdi/shiksha-backend.git']])
checkout scmGit(branches: [[name: '*/oblf-21stFeb']], extensions: [], userRemoteConfigs: [[credentialsId: 'github-1', url: 'https://github.com/tekdi/shiksha-frontend.git']])

echo "========================== ***Repository cloned Successfully*** =========================="

}
}

stage ('Build&Deploy') {

steps {

sh 'yarn install'
sh 'yarn run build'
sh './scripts/pack-prod-build.sh'
}
}

}
}
Loading
Loading