Projects/nettsiden
Projects/nettsiden
8
2
Fork 0
Code Issues 15 Pull Requests 2 Activity

feat: adds spaceapi endpoint #57

Merged
oysteikt merged 3 commits from spaceapi into master 2024-05-18 20:05:13 +02:00
Conversation 2 Commits 3 Files Changed 2 +72
2 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nix/module.nix
View File

@ -198,6 +198,10 @@ in
fastcgi_pass unix:${config.services.phpfpm.pools."pvv-nettsiden".socket};
'';
"= /spaceapi.php".extraConfig = ''
add_header Content-Type application/json;
'';
# based on https://simplesamlphp.org/docs/stable/simplesamlphp-install.html#configuring-nginx
"^~ /simplesaml/" = {
alias = "${finalPackage}/${finalPackage.passthru.simplesamlphpPath}/public/";

68
www/spaceapi.php Normal file
View File

@ -0,0 +1,68 @@
<?php
require_once dirname(__DIR__) . implode(DIRECTORY_SEPARATOR, ['', 'inc', 'include.php']);
$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS);
$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$door = new \pvv\side\Door($pdo);
$doorEntry = (object)($door->getCurrent());
?>
{
"api_compatibility": ["14"],
"space": "Programvareverkstedet",
"logo": "https://git.pvv.ntnu.no/assets/img/logo.png",
"url": "https://www.pvv.ntnu.no/",
oysteikt marked this conversation as resolved Outdated
oysteikt commented 2024-05-12 04:55:10 +02:00
Outdated
Review
Copy Link

We could potentially use https://git.pvv.ntnu.no/assets/img/logo.svg instead

We could potentially use https://git.pvv.ntnu.no/assets/img/logo.svg instead
"location": {
"ext_campus": "NTNU Gløshaugen",
"ext_room_name": "Oppredning/Gruvedrift, Floor 2, Room 247",
"ext_mazemap": "https://link.mazemap.com/2n2HWa7H",
"address": "Sem Sælands vei 1, 7034 Trondheim, Norway",
"timezone": "Europe/Oslo",
"lon": 10.242,
"lat": 63.250
felixalb marked this conversation as resolved Outdated
oysteikt commented 2024-05-12 14:08:25 +02:00
Outdated
Review
Copy Link

Should this be irc://irc.pvv.ntnu.no/pvv maybe?

Should this be `irc://irc.pvv.ntnu.no/pvv` maybe?
👍 1
},
oysteikt marked this conversation as resolved
oysteikt commented 2024-05-14 23:31:50 +02:00
Review
Copy Link

Should we add issue_mail?

Should we add `issue_mail`?
"contact": {
"irc": "irc://irc.pvv.ntnu.no/pvv",
"email": "pvv@pvv.ntnu.no",
"ext_discord": "https://discord.gg/8VTBr6Q",
"gopher": "gopher://isvegg.pvv.ntnu.no",
"matrix": "#pvv:pvv.ntnu.no"
},
"issue_report_channels": ["email"],
oysteikt marked this conversation as resolved
oysteikt commented 2024-05-14 23:31:39 +02:00
Review
Copy Link

Maybe add a message, just in case anyone is wondering

"message": "Open for public when members are present"
Maybe add a message, just in case anyone is wondering ```json "message": "Open for public when members are present" ```
"state": {
"open": <?php echo($doorEntry->open ? "true" : "false"); ?>,
"lastchange": <?php echo($doorEntry->time ? $doorEntry->time : 0); ?>,
"message": "<?php echo($doorEntry->open ? "open for public, members are present" : "closed"); ?>"
},
"feeds": {
"wiki": {
felixalb marked this conversation as resolved Outdated
oysteikt commented 2024-05-12 04:51:57 +02:00
Outdated
Review
Copy Link

Maybe add calender https://www.pvv.ntnu.no/hendelser/?

Maybe add `calender` https://www.pvv.ntnu.no/hendelser/?
felixalb commented 2024-05-12 10:15:31 +02:00
Outdated
Review
Copy Link

That link is neither RSS nor ical, so that i don't think that's allowed per https://spaceapi.io/docs/. Ical support on the website would be amazing though, but surprisingly difficult to implement due to our terrible event system.

That link is neither RSS nor ical, so that i don't think that's allowed per https://spaceapi.io/docs/. Ical support on the website would be amazing though, but surprisingly difficult to implement due to our terrible event system.
felixalb commented 2024-05-12 10:37:29 +02:00
Outdated
Review
Copy Link

I added the /hendelser/-page to "links" for now.

I added the /hendelser/-page to "links" for now.
oysteikt commented 2024-05-12 14:07:20 +02:00
Outdated
Review
Copy Link

No, I do think we could add it under calendar. The type being rss, atom or ical are just being provided as examples. We could set "type": "html" and still be compliant.

No, I do think we could add it under calendar. The `type` being `rss`, `atom` or `ical` are just being provided as examples. We could set `"type": "html"` and still be compliant.
"type": "atom",
"url": "https://www.pvv.ntnu.no/w/api.php?hidebots=1&urlversion=1&action=feedrecentchanges&feedformat=atom"
},
"calendar": {
"type": "html",
felixalb marked this conversation as resolved Outdated
oysteikt commented 2024-05-12 04:53:08 +02:00
Outdated
Review
Copy Link

Should we add links to other official medias, like youtube, facebook or linkedin using links?

Should we add links to other official medias, like youtube, facebook or linkedin using `links`?
felixalb commented 2024-05-12 10:17:32 +02:00
Outdated
Review
Copy Link

Not right there, under projects

"projects": Your project sites (links to GitHub, wikis or wherever your projects are hosted)

But we could make a list of

"links": Arbitrary links that you'd like to share

The list you recommended seems good 👍

Not right there, under projects > "projects": Your project sites (links to GitHub, wikis or wherever your projects are hosted) But we could make a list of > "links": Arbitrary links that you'd like to share The list you recommended seems good 👍
oysteikt commented 2024-05-12 14:07:42 +02:00
Outdated
Review
Copy Link

Thanks, that was what I meant. Not sure where else to comment

Thanks, that was what I meant. Not sure where else to comment
"url": "https://www.pvv.ntnu.no/hendelser/"
}
},
"projects": [
"https://github.com/Programvareverkstedet/",
"https://git.pvv.ntnu.no/",
"https://www.pvv.ntnu.no/prosjekt/"
],
"links": [
{
"name": "YouTube",
"url": "https://www.youtube.com/@pvvntnu5640"
},
{
"name": "LinkedIn",
"url": "https://www.linkedin.com/company/pvvntnu/"
},
{
"name": "Facebook",
"url": "https://www.facebook.com/pvvntnu/"
}
]
}