Merge pull request 'Calendar: Remove recurring events for summer break 2024' (#61 ) from calendar-disable-events into master

Reviewed-on: #61
Calendar: Remove recurring events for summer break 2024
2024-06-15 00:36:32 +02:00 · 2024-06-11 17:09:35 +02:00 · 2024-05-30 21:19:42 +02:00 · 2024-05-30 21:19:29 +02:00 · 2024-05-19 22:25:52 +02:00 · 2024-05-19 22:09:37 +02:00
10 changed files with 101 additions and 30 deletions
--- a/inc/include.php
+++ b/inc/include.php
@ -24,9 +24,9 @@ use \pvv\side\Agenda;
 $agenda = new \pvv\side\Agenda([
  // new \pvv\side\social\NerdepitsaActivity,
  // new \pvv\side\social\AnimekveldActivity,
-  new \pvv\side\social\HackekveldActivity,
-  new \pvv\side\social\BrettspillActivity,
-  new \pvv\side\social\DriftkveldActivity,
+  // new \pvv\side\social\HackekveldActivity,
+  // new \pvv\side\social\BrettspillActivity,
+  // new \pvv\side\social\DriftkveldActivity,
  new \pvv\side\DBActivity($pdo),
 ]);

--- a/nix/module.nix
+++ b/nix/module.nix
@ -217,14 +217,14 @@ in
            '';
          };

-          ${cfg.settings.GALLERY.SERVER_PATH} = {
+          "^~ ${cfg.settings.GALLERY.SERVER_PATH}" = {
            root = cfg.settings.GALLERY.DIR;
            extraConfig = ''
              rewrite ^${cfg.settings.GALLERY.SERVER_PATH}/(.*)$ /$1 break;
            '';
          };

-          ${cfg.settings.SLIDESHOW.SERVER_PATH} = {
+          "^~ ${cfg.settings.SLIDESHOW.SERVER_PATH}" = {
            root = cfg.settings.SLIDESHOW.DIR;
            extraConfig = ''
              rewrite ^${cfg.settings.SLIDESHOW.SERVER_PATH}/(.*)$ /$1 break;
--- a/src/pvv/side/social/animekveldevent.php
+++ b/src/pvv/side/social/animekveldevent.php
@ -38,7 +38,6 @@ class AnimekveldEvent extends Event {
 			'',
 			'Alle kan være med på å anbefale eller veto serier.',
 			'',
-			'I disse tider blir visningene i all hovedsak holdt online på vår <a href="https://discord.gg/cx4aXU7">Discord server</a>'
 			];
 	}

--- a/www/galleri/index.php
+++ b/www/galleri/index.php
@ -52,6 +52,17 @@ function getDirContents($dir, &$results = array()) {
 }
 $images = getDirContents($galleryDir);

+function cmpModifyTime($a, $b) {
+	global $galleryDir;
+
+        $mtime_a = filemtime($galleryDir . $a);
+        $mtime_b = filemtime($galleryDir . $b);
+
+	return ($mtime_a > $mtime_b) ? -1 : 1;
+}
+
+usort($images, "cmpModifyTime");
+
 $imageTemplate = '
 <div class="card">
    <div class="card-image-div">
@ -105,7 +116,6 @@ $imageTemplate = '
            $vars = [
                "%user"         =>  htmlspecialchars($imguser),
                "%time"         =>  $modTime,
-                "%timestamp"    =>  filemtime($galleryDir . $value),
                "%name"         =>  htmlspecialchars($displaypath),
                "%path"         =>  $serverPath . $value,
 		"%thumbnail"    =>  $serverPath . "/.thumbnails" . $value . ".png",
--- a/www/js/slideshow.js
+++ b/www/js/slideshow.js
@ -21,7 +21,7 @@ function stepSlideshow(imgs) {
        //Change source to next picture after it is faded out
        slideshowIndex = (slideshowIndex + 1) % imgs.length; 
        ssi2.src = slideshowFnames[slideshowIndex];
-    }, 800);  
+    }, 1000);
 }

 //Initialize slideshow, start interval
@ -29,4 +29,4 @@ if (slideshowFnames.length > 1) {
    slideshowInterval = setInterval(()=>{
        stepSlideshow(slideshowFnames);
    }, SLIDESHOWDELAYMS);
-}
+}
--- a/www/kontakt/index.php
+++ b/www/kontakt/index.php
@ -43,11 +43,11 @@ require_once dirname(dirname(__DIR__)) . implode(DIRECTORY_SEPARATOR, ['', 'inc'

 		<p>Vi har en <a href="http://list.pvv.org/mailman/listinfo/aktive">e-postliste for aktive medlemmer</a>. All offisiell informasjon blir sendt på denne listen, og alle arrengementer blir også annonsert her.</p>

-		<p>Vi har en <a target="_blank" href="https://matrix.to/#/#pvv:pvv.ntnu.no">Matrix-server</a> for chat, memes, og all annen kommunikasjon. Den er bridget med IRC-kanalen og Discord-guilden vår. Hvis du er medlem kan du bruke vår <a href="https://chat.pvv.ntnu.no">self-hosted web client</a>.</p>
+		<p>Vi har et <a target="_blank" href="https://matrix.to/#/#pvv:pvv.ntnu.no">Matrix Space™</a> for chat, memes, og all annen kommunikasjon. Den er bridget med IRC-kanalen og Discord-serveren vår. Hvis du er medlem kan du bruke vår egen instans av <a href="https://chat.pvv.ntnu.no">Element web</a>.</p>
 		
 		<p>Vi har en IRC-kanal på <a href="http://webchat.ircnet.net/">IRCnet</a> kalt #pvv.</p>

-		<p>Vi har en <a target="_blank" href="https://discord.gg/8VTBr6Q">Discord-guild</a> for de som foretrekker Discord over Matrix. </p>
+		<p>Vi har en <a target="_blank" href="https://discord.gg/8VTBr6Q">Discord-server</a> for de som foretrekker Discord over Matrix. </p>

 	</main>
 </body>
--- a/www/spaceapi.php
+++ b/www/spaceapi.php
@ -0,0 +1,71 @@
+<?php
+
+require_once dirname(__DIR__) . implode(DIRECTORY_SEPARATOR, ['', 'inc', 'include.php']);
+
+header('Content-Type: application/json');
+header('Access-Control-Allow-Origin: *');
+
+$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/",
+  "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.4063852,
+    "lat": 63.4170226
+  },
+  "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"],
+  "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": {
+      "type": "atom",
+      "url": "https://wiki.pvv.ntnu.no/w/api.php?hidebots=1&urlversion=1&action=feedrecentchanges&feedformat=atom"
+    },
+    "calendar": {
+      "type": "html",
+      "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/"
+    }
+  ]
+}
--- a/www/tjenester/img/gitea.png
+++ b/www/tjenester/img/gitea.png
--- a/www/tjenester/img/gogs.png
+++ b/www/tjenester/img/gogs.png
--- a/www/tjenester/index.php
+++ b/www/tjenester/index.php
@ -28,31 +28,22 @@ require_once dirname(dirname(__DIR__)) . implode(DIRECTORY_SEPARATOR, ['', 'inc'
            <div class="categoryContent">

              <div class="service">
+                <div class="serviceContent">
+                  <h2 class="serviceTitle">Gitea</h2>
+                  <p class="serviceDescription">Vår interne git-tjener, åpen for alle medlemmer</p>
+                  <div class="serviceLink"><a href="https://git.pvv.ntnu.no" target="_blank">Gå til git.pvv.ntnu.no</a></div>
+                </div>
+                <img class="serviceImage" src="img/gitea.png" alt="Gitea-logo">
+              </div>
+
+	      <div class="service">
                <div class="serviceContent">
                  <h2 class="serviceTitle">GitHub</h2>
                  <p class="serviceDescription">Våre offentlige kodebrønner, åpent for verden!</p>
                  <div class="serviceLink"><a href="https://github.com/Programvareverkstedet/" target="_blank">Gå til GitHub</a></div>
                </div>
                <img class="serviceImage" src="img/github.png" alt="GitHub-logo">
-              </div>
-
-              <div class="service">
-                <div class="serviceContent">
-                  <h2 class="serviceTitle">Gogs</h2>
-                  <p class="serviceDescription">Vår interne git-tjener, åpen for alle medlemmer</p>
-                  <div class="serviceLink"><a href="https://git.pvv.ntnu.no" target="_blank">Gå til git.pvv.ntnu.no</a></div>
-                </div>
-                <img class="serviceImage" src="img/gogs.png" alt="Gogs-logo">
-              </div>
-
-              <div class="service">
-                <div class="serviceContent">
-                  <h2 class="serviceTitle">Dev og Trac</h2>
-                  <p class="serviceDescription">Trac er vårt gamle prosjektsystem. Her kan du lage og dele prosjekter om du er for hipster for github.</p>
-                  <div class="serviceLink"><a href="https://dev.pvv.ntnu.no/projects/pvv-dev/" target="_blank">Gå til dev.pvv.ntnu.no</a></div>
-                </div>
-                <img class="serviceImage" src="img/trac.png" alt="Trac-logo">
-              </div>
+	      </div>

            </div>
          </div>
Author	SHA1	Message	Date
Oystein Kristoffer Tveit	6e4a79ed3d	Merge pull request 'Calendar: Remove recurring events for summer break 2024' (#61 ) from calendar-disable-events into master Reviewed-on: #61	2024-06-15 00:36:32 +02:00
Felix Albrigtsen	ce99b309f8	Calendar: Remove recurring events for summer break 2024	2024-06-11 17:09:35 +02:00
Felix Albrigtsen	37445f42b5	Merge pull request 'Oppdater Matrix-server til Matrix Space™' (#50 ) from info-updates into master Reviewed-on: #50	2024-05-30 21:19:42 +02:00
Eirik Witterso	9717c11af5	Fix discord-server og matrix space	2024-05-30 21:19:29 +02:00
Adrian Gunnar Lauterer	2cab4df4b1	Merge pull request 'fix: updated spaceapi coords' (#60 ) from adriangl-patch-spaceapi-coords into master Reviewed-on: #60	2024-05-19 22:25:52 +02:00
Adrian Gunnar Lauterer	18c8426246	fix: updated spaceapi coords	2024-05-19 22:09:37 +02:00
Oystein Kristoffer Tveit	4890a0af04	nix/module: fix spaceapi endpoint	2024-05-19 20:06:22 +02:00
Felix Albrigtsen	7bf2c31db3	feat: adds spaceapi endpoint (#57 ) A basic implementation of the https://spaceapi.io/ specification. Tested working door sensor status. Added basic info about us, our website, git forge and wiki. Co-authored with @sindos and @oysteikt. Reviewed-on: #57 Co-authored-by: Felix Albrigtsen <felix@albrigtsen.it> Co-committed-by: Felix Albrigtsen <felix@albrigtsen.it>	2024-05-18 20:05:13 +02:00
Adrian Gunnar Lauterer	13a6df92ce	Merge pull request 'Gitea istedenfor gogs på tjenester-siden' (#56 ) from gitea-i-tjenester into master Reviewed-on: #56	2024-05-11 22:55:36 +02:00
Adrian Gunnar Lauterer	f87c6820d7	services: move gitea above github and remove trac	2024-05-07 21:31:42 +02:00
Adrian Gunnar Lauterer	592c6d46c4	services: replaced gogs with gitea	2024-05-07 21:31:20 +02:00
Felix Albrigtsen	9d9d99e6ba	gallery: sort by timestamp. slideshow: fix transition bug on firefox	2024-04-14 01:59:12 +02:00
Oystein Kristoffer Tveit	216e153f89	nix/module: correct some nginx locations directives	2024-04-11 13:19:59 +02:00
Felix Albrigtsen	d528df5f99	Merge pull request 'Fix links after moving from spikkje to bekka' (#55 ) from www2-www-fixes into master Reviewed-on: #55	2024-04-11 00:43:32 +02:00