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

Change contactinfo janus #2118

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
66 changes: 65 additions & 1 deletion backend/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -3940,7 +3940,23 @@
"deprecationReason": null,
"description": "",
"isDeprecated": false,
"name": "text",
"name": "thumbnail",
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "String",
"ofType": null
}
}
},
{
"args": [],
"deprecationReason": null,
"description": "",
"isDeprecated": false,
"name": "caption",
"type": {
"kind": "NON_NULL",
"name": null,
Expand All @@ -3967,6 +3983,22 @@
}
}
},
{
"args": [],
"deprecationReason": null,
"description": "",
"isDeprecated": false,
"name": "editDate",
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "DateTime",
"ofType": null
}
}
},
{
"args": [],
"deprecationReason": null,
Expand All @@ -3990,6 +4022,38 @@
"name": "BlogType",
"ofType": null
}
},
{
"args": [],
"deprecationReason": null,
"description": "",
"isDeprecated": false,
"name": "blogMd",
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "String",
"ofType": null
}
}
},
{
"args": [],
"deprecationReason": null,
"description": "",
"isDeprecated": false,
"name": "publicBool",
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Boolean",
"ofType": null
}
}
}
],
"inputFields": null,
Expand Down
Binary file modified frontend/public/img/JanusstyretsMedlemmer/Eventsjef.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/public/img/JanusstyretsMedlemmer/Festsjef.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/public/img/JanusstyretsMedlemmer/Hyttetursjef.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/public/img/JanusstyretsMedlemmer/Kjellersjef.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/public/img/JanusstyretsMedlemmer/Nestleder.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/public/img/JanusstyretsMedlemmer/PRsjef.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/public/img/JanusstyretsMedlemmer/President.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/public/img/JanusstyretsMedlemmer/Sekretær.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
4 changes: 2 additions & 2 deletions frontend/src/pages/about/board.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const BoardPage: NextPageWithLayout = () => {
rank: 4,
name: "Thomas Kallasten Pedersen",
position: "President Janus Sosial",
email: "president@janulinjeforening.no",
email: "president@januslinjeforening.no",
},
{
rank: 5,
Expand All @@ -42,7 +42,7 @@ const BoardPage: NextPageWithLayout = () => {
rank: 6,
name: "Ida Harneshaug",
position: "Leder Bindeleddet",
email: "leder@bindeleddet.ntnu.no",
email: "[email protected]",
},
{
rank: 7,
Expand Down
56 changes: 33 additions & 23 deletions frontend/src/pages/janus/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,98 +14,108 @@ import Kjellersjef from "~/public/img/JanusstyretsMedlemmer/Kjellersjef.jpg";
import Nestleder from "~/public/img/JanusstyretsMedlemmer/Nestleder.jpg";
import President from "~/public/img/JanusstyretsMedlemmer/President.jpg";
import PRsjef from "~/public/img/JanusstyretsMedlemmer/PRsjef.jpg";
import Faddersjef from "~/public/img/JanusstyretsMedlemmer/Faddersjef.jpg";
import Sekretær from "~/public/img/JanusstyretsMedlemmer/Sekretær.jpg";
import Websjef from "~/public/img/JanusstyretsMedlemmer/Websjef.jpg";
import Sosialsjef from "~/public/img/JanusstyretsMedlemmer/Sosialsjef.jpg";
const JanusPage: NextPageWithLayout = () => {
const responsibles = [
{
id: 1,
name: "Jenny Wæraas Temmerud",
name: "Thomas Kallasten Pedersen",
position: "President",
color: red[800],
image: President,
phonenumber: "tlf: 41388 670",
phonenumber: "tlf: 472 73 906",
email: "[email protected]",
},
{
id: 2,
name: "Philip Thomas Jenkins",
name: "Oscar Tegneby",
position: "Økonomisjef/Nestleder",
color: red[500],
image: Nestleder,
phonenumber: "955 52 393",
phonenumber: "tlf: 404 83 638",
email: "[email protected]",
},
{
id: 3,
name: "Mina Lindebø Myrstøl",
position: "Websjef",
name: "Julie Pape Bjørseth",
position: "Sosialsjef",
color: red[500],
image: Websjef,
phonenumber: "tlf: 477 17 089",
image: Sosialsjef,
phonenumber: "tlf: 415 68 433",
email: "[email protected]",
},
{
id: 4,
name: "Camilla Toftum Hop",
name: "Arthur Brunborg",
position: "Janu;Script-Redaktør",
color: red[500],
image: JanusScriptRedaktør,
phonenumber: "tlf: 477 09 820",
phonenumber: "tlf: 923 45 672",
email: "[email protected]",
},
{
id: 5,
name: "Elise Flovikholm",
name: "Simen Øvreås",
position: "Hyttetursjef",
color: red[500],
image: Hyttetursjef,
phonenumber: "tlf: 413 40 153",
phonenumber: "tlf: 904 11 446",
email: "[email protected]",
},
{
id: 6,
name: "Silje Holm Johannesen",
name: "Herman Husebø",
position: "Kjellersjef",
color: red[500],
image: Kjellersjef,
phonenumber: "tlf: 974 27 813",
phonenumber: "tlf: 480 91 961",
email: "[email protected]",
},
{
id: 7,
name: "Thomas Kallasten Pedersen",
name: "Kristina Lie",
position: "Festsjef",
color: red[500],
image: Festsjef,
phonenumber: "tlf: 472 73 906",
phonenumber: "tlf: 959 66 786",
email: "[email protected]",
},
{
id: 8,
name: "Eva Marie Melbø",
name: "Brage Olsen Lind",
position: "Eventsjef",
color: red[500],
image: Eventsjef,
phonenumber: "tlf: 960 43 668",
phonenumber: "tlf: 482 72 575",
email: "[email protected]",
},
{
id: 9,
name: "Minda Harms",
name: "Ida Grytaas Forsmo",
position: "PR-sjef",
color: red[500],
image: PRsjef,
phonenumber: "tlf: 407 61 475",
phonenumber: "tlf: 954 57 680",
email: "[email protected]",
},
{
id: 10,
name: "Magnus Johansen Moldekleiv",
name: "Hedda Kvåle",
position: "Sekretær",
color: red[500],
image: Sekretær,
phonenumber: "tlf: 928 17 970",
phonenumber: "tlf: 942 59 253",
email: "[email protected]",
},
{
id: 11,
name: "Meimei Husemoen",
position: "Faddersjef",
color: red[500],
image: Faddersjef,
phonenumber: "tlf: 481 89 468",
email: "[email protected]",
},
];
Expand Down
Loading