Skip to content

Country issue frontend #36

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.

Sign up for GitHub

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

Open
nitininhouse wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Country issue frontend #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1527560
country fix
nitininhouse Apr 12, 2025
905893d
removed none in country frontend
nitininhouse Apr 13, 2025
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
3 changes: 2 additions & 1 deletion src/components/displayComponents/education.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ const Education = props => {
{props.item.institute + ", "}
{props.item.city && props.item.city + ", "}
{props.item.state && props.item.state + ", "}
{props.item.country !== "NONE" ? formatCountry(props.item.country) + ", " : ""}
{props.item.country !== "NONE" &&
formatCountry(props.item.country)}
{props.item.year}
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/displayComponents/project.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const Project = props => {
</div>
{props.item.image ? (
<div>
<Modal basic trigger={<Image src={props.item.image} styleName="style.compPicture" />} basic fluid>
<Modal basic trigger={<Image src={props.item.image} styleName="style.compPicture" />} fluid>
<Modal.Content image>
<Image src={props.item.image} styleName="style.compPicture" wrapped size={"massive"} />
</Modal.Content>
Expand Down
2 changes: 1 addition & 1 deletion src/components/displayComponents/supervision.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const Supervision = props => {
<List.Content>
<div>
{item.topic} ({category})
{item.country !== "NONE" ? ", " + formatCountry(item.country) : ""}
{props.item.country && formatCountry(props.item.country)}
<div styleName="style.gray">{duration}</div>
<div styleName="style.gray">{item.scholarsName}</div>
{item.nameOfOtherSupervisors && <div styleName="style.gray">Other supervisors: {item.nameOfOtherSupervisors}</div>}
Expand Down
2 changes: 1 addition & 1 deletion src/constants/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const collaborationOptions = [
];

export const countryOptions = [
{ text: "None", key: "NONE", value: "NONE"},

{ text: "Afghanistan", key: "AFGHANISTAN", value: "AFGHANISTAN" },
{ text: "Albania", key: "ALBANIA", value: "ALBANIA" },
{ text: "Algeria", key: "ALGERIA", value: "ALGERIA" },
Expand Down