Skip to content

Commit f8a426a

Browse files
rishavanandkairavkkpshreyaviflovogt
authored
dev master merge (#93)
Co-authored-by: rishavanand <rishavdipsite@gmail.com> Co-authored-by: kairavkkp <kairavpithadia13@gmail.com> Co-authored-by: Shreya Vijay <shreyavi@usc.edu> Co-authored-by: Florian Vogt <florian.vogt@sap.com>
1 parent ec54df5 commit f8a426a

6 files changed

Lines changed: 116 additions & 67 deletions

File tree

.github/workflows/main.yml

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,41 @@ name: CI
55
# Controls when the action will run. Triggers the workflow on push or pull request
66
# events but only for the master branch
77
on:
8-
push:
9-
branches: [ master, dev ]
10-
pull_request:
11-
types: [opened, opened, synchronize, reopened]
12-
branches: [ master, dev ]
8+
push:
9+
branches: [master, dev]
10+
pull_request:
11+
types: [opened, opened, synchronize, reopened]
12+
branches: [master, dev]
1313

1414
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1515
jobs:
16-
# This workflow contains a single job called "build"
17-
build:
18-
# The type of runner that the job will run on
19-
runs-on: ubuntu-latest
20-
21-
strategy:
22-
matrix:
23-
node-version: [14.x]
24-
25-
# Steps represent a sequence of tasks that will be executed as part of the job
26-
steps:
27-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
28-
- uses: actions/checkout@v2
29-
30-
- name: Install dependencies
31-
run: npm i
32-
33-
- name: Run linter
34-
run: npm run lint
35-
36-
- name: Build
37-
run: npm run build
16+
# This workflow contains a single job called "build"
17+
build:
18+
# The type of runner that the job will run on
19+
runs-on: ubuntu-latest
20+
21+
strategy:
22+
matrix:
23+
node-version: [14.x]
24+
25+
# Steps represent a sequence of tasks that will be executed as part of the job
26+
steps:
27+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
28+
- uses: actions/checkout@v3
29+
30+
- uses: actions/setup-node@v3
31+
with:
32+
node-version: ${{ matrix.node-version }}
33+
cache: 'npm'
34+
35+
- name: Print versions
36+
run: npm run info
37+
38+
- name: Install dependencies
39+
run: npm i
40+
41+
- name: Run linter
42+
run: npm run lint
43+
44+
- name: Build
45+
run: npm run build

package-lock.json

Lines changed: 59 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@
7373
"serve": "gatsby serve",
7474
"clean": "gatsby clean",
7575
"test": "echo \"Write tests! -> https://gatsby.dev/unit-testing\" && exit 1",
76-
"lint": "eslint '*/**/*.{js,ts,tsx}' --quiet --fix"
76+
"lint": "eslint '*/**/*.{js,ts,tsx}' --quiet --fix",
77+
"info": "echo \"Node version: $(node -v)\" && echo \"NPM version: $(npm -v)\""
7778
},
7879
"husky": {
7980
"hooks": {

src/components/Field/SkillsField.tsx

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,19 @@ export const SkillsField = ({
6666
modifyField: (filedProps: SkillsFieldProps) => void;
6767
}) => {
6868
const [searchValue, setSearchValue] = useState('');
69-
70-
const screens = useBreakpoint();
71-
72-
const skillsColSpan = screens.md ? 6 : 12;
73-
74-
const localSkillsFieldProps: typeof fieldProps = {
69+
const [localSkillsFieldProps, setLocalSkillsFieldProps] = useState({
7570
options: {
7671
size: SIZE.MEDIUM,
7772
},
7873
data: {
7974
list: [],
8075
},
8176
...fieldProps,
82-
};
77+
});
78+
79+
const screens = useBreakpoint();
80+
81+
const skillsColSpan = screens.md ? 6 : 12;
8382

8483
const onChange = event => {
8584
const name = event.target.value;
@@ -94,9 +93,8 @@ export const SkillsField = ({
9493

9594
localSkillsFieldProps.data.list = currentSkillsList as string[];
9695

97-
modifyField({
98-
...localSkillsFieldProps,
99-
});
96+
setLocalSkillsFieldProps(localSkillsFieldProps);
97+
modifyField(localSkillsFieldProps);
10098
};
10199

102100
const onSearch = value => {
@@ -145,7 +143,11 @@ export const SkillsField = ({
145143
</Dropdown>
146144
</Col>
147145
</Row>
148-
<Checkbox.Group defaultValue={localSkillsFieldProps.data.list} style={{ width: '100%' }}>
146+
<Checkbox.Group
147+
defaultValue={localSkillsFieldProps.data.list}
148+
value={localSkillsFieldProps.data.list}
149+
style={{ width: '100%' }}
150+
>
149151
<Row>
150152
{Object.values(SKILLS)
151153
.filter(skill =>

src/config/skills.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@ const BASE_URL = typeof window !== 'undefined' ? window.location.href : '';
44
type Skill = { label: string; value: string; iconUrl: string };
55

66
export const SKILLS: Record<string, Skill> = {
7+
openui5: {
8+
label: 'OpenUI5',
9+
value: 'openui5',
10+
iconUrl: BASE_URL + 'skills-assets/openui5.svg',
11+
},
712
terraform: {
813
label: 'Terraform',
914
value: 'terraform',
10-
iconUrl: BASE_URL + 'skills-assets/terraformio-icon.svg'
15+
iconUrl: BASE_URL + 'skills-assets/terraformio-icon.svg',
1116
},
1217
vuejs: {
1318
label: 'Vue.js',

static/skills-assets/openui5.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)