Skip to content

Commit 43c102b

Browse files
ziddigsmziddigsm
committed
resolved the issue where i icon isnt displaying anything. Resolved merge conflicts too
2 parents 1ed6c87 + 113e1c5 commit 43c102b

569 files changed

Lines changed: 57018 additions & 18258 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 0 additions & 151 deletions
This file was deleted.

‎.eslintignore‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ src/config.json
99
src/index.js
1010
src/reducers/**
1111
src/styles.js
12-
src/utils/**
1312
src/__tests__/**
1413

1514
/public/
@@ -19,20 +18,14 @@ src/components/App.jsx
1918
src/components/AutoReload/**
2019
src/components/Badge/**
2120
src/components/common/**
22-
src/components/Header/**
23-
src/components/BMDashboard/BMHeader/**
24-
src/components/MonthlyEffort/**
25-
src/components/ProfileLinks/**
2621
src/components/Projects/**
2722
src/components/Reports/**
2823
src/components/SetupProfile/**
29-
src/components/SummaryBar/**
3024
src/components/SummaryManagement/**
3125
src/components/TaskEditSuggestions/**
3226
src/components/TeamMemberTasks/**
3327
src/components/Teams/**
3428
src/components/TeamLocations/**
35-
src/components/Timelog/**
3629
src/components/UserManagement/**
3730
src/components/UserProfile/**
3831
src/components/Announcements/**

‎.eslintrc.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"extends": [
3+
"airbnb",
4+
"prettier"
5+
],
6+
"plugins": [
7+
"prettier"
8+
],
9+
"rules": {
10+
"prettier/prettier": "error",
11+
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }]
12+
},
13+
"env": {
14+
"browser": true,
15+
"es2021": true
16+
},
17+
"parserOptions": {
18+
"ecmaFeatures": {
19+
"jsx": true
20+
},
21+
"ecmaVersion": 12,
22+
"sourceType": "module"
23+
}
24+
}

‎.github/workflows/deploy.yml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Build and Deploy
2+
on:
3+
push:
4+
branches:
5+
- main
6+
- development
7+
concurrency:
8+
group: Build and Deploy / ${{ github.ref_name == 'main' && 'Production' || 'Development' }}
9+
cancel-in-progress: true
10+
jobs:
11+
# Build
12+
build:
13+
name: Build
14+
strategy:
15+
matrix:
16+
environment: ${{ github.ref_name == 'main' && fromJson('["Production", "Beta"]') || fromJson('["Development"]') }}
17+
environment: ${{ matrix.environment }}
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Checkout Repository
21+
uses: actions/checkout@v4
22+
- name: Setup Node.js
23+
uses: actions/setup-node@v4
24+
with:
25+
node-version: 14
26+
cache: 'npm'
27+
- name: Install Dependencies
28+
run: npm ci
29+
# We don't run tests here since we assume it's already done during PR process.
30+
# - name: Update Browser List
31+
# run: npx browserslist@latest --update-db
32+
- name: Build React App
33+
run: npm run build && cp build/index.html build/200.html
34+
env:
35+
NODE_ENV: ${{ github.ref_name == 'main' && 'production' || 'development' }}
36+
REACT_APP_APIENDPOINT: ${{ vars.REACT_APP_API_ENDPOINT }}
37+
GENERATE_SOURCEMAP: ${{ github.ref_name != 'main' }}
38+
- name: Upload Build Artifact
39+
uses: actions/upload-artifact@v4
40+
with:
41+
name: ${{ matrix.environment }} Build
42+
path: ./build
43+
# Deployment
44+
deployment-surge:
45+
name: Deploy to Surge
46+
needs: build
47+
runs-on: ubuntu-latest
48+
strategy:
49+
matrix:
50+
environment: ${{ github.ref_name == 'main' && fromJson('["Production", "Beta"]') || fromJson('["Development"]') }}
51+
environment: ${{ matrix.environment }}
52+
if: ${{ success() }}
53+
steps:
54+
- name: Download Build Artifact
55+
uses: actions/download-artifact@v4
56+
with:
57+
name: ${{ matrix.environment }} Build
58+
path: ./build
59+
- name: Deploy to Surge
60+
uses: dswistowski/surge-sh-action@v1
61+
with:
62+
domain: ${{ vars.SURGE_DOMAIN }}
63+
project: './build'
64+
login: ${{ secrets.SURGE_LOGIN }}
65+
token: ${{ secrets.SURGE_TOKEN }}

‎.github/workflows/node.js.yml‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎.github/workflows/pull_request_test.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Pull Request Unit Test
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
- development
8+
jobs:
9+
test:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
- uses: actions/setup-node@v4
14+
with:
15+
node-version: 14
16+
cache: 'npm'
17+
- name: Install Dependencies
18+
run: npm ci
19+
- name: Run Unit Tests
20+
run: npm test

‎.prettierignore‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,21 @@ src/routes.js
1212
src/setupTests.js
1313
src/store.js
1414
src/styles.js
15-
src/utils/**
1615
src/__tests__/**
1716

1817

1918
src/components/App.jsx
2019
src/components/AutoReload/**
21-
src/components/Header/**
2220
src/components/Inventory/**
2321
src/components/Memberships/**
24-
src/components/MonthlyEffort/**
25-
src/components/NewProfileLink/**
26-
src/components/ProfileLinks/**
2722
src/components/Projects/**
2823
src/components/Reports/**
2924
src/components/SetupProfile/**
30-
src/components/SummaryBar/**
3125
src/components/SummaryManagement/**
3226
src/components/TaskEditSuggestions/**
3327
src/components/TeamLocations/**
3428
src/components/TeamMemberTasks/**
3529
src/components/Teams/**
36-
src/components/Timelog/**
3730
src/components/UserManagement/**
3831
src/components/UserProfile/**
3932
src/components/Announcements/**

‎.vscode/settings.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
// other settings
3+
// formatting using eslint
4+
// let editor format using prettier for all other files
5+
"editor.formatOnSave": true,
6+
// disable editor formatting, so eslint can handle it
7+
"[javascript]": {
8+
"editor.formatOnSave": true
9+
},
10+
//"eslint.enable": true,
11+
// available through eslint plugin in vscode
12+
"eslint.alwaysShowStatus": true,
13+
"editor.tabSize": 2,
14+
"editor.codeActionsOnSave": {
15+
"source.fixAll.eslint": "explicit"
16+
},
17+
"files.exclude": {
18+
"**/.classpath": true,
19+
"**/.project": true,
20+
"**/.settings": true,
21+
"**/.factorypath": true
22+
}
23+
}

0 commit comments

Comments
 (0)