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.

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

Fixed various broken things, Fix deployment Makefile #90

Merged
merged 1 commit into from
Apr 9, 2024
Merged

Fixed various broken things, Fix deployment Makefile #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
.PHONY: build
build:
SRC=$(shell find src/ -type f)
STATIC=$(shell find static -type f)

node_modules: package.json
npm install

public: $(SRC) $(STATIC) node_modules
npm run build

.PHONY: deploy
deploy: build
deploy: public
# Allow everything
ssh svsticky.nl chmod -R 777 /var/www/intro/intro-cs.svsticky.nl

# Purge old stuff
ssh svsticky.nl rm -rf /var/www/intro/intro-cs.svsticky.nl/*

# Copy new stuff
rsync --progress public/* svsticky.nl:/var/www/intro/intro-cs.svsticky.nl/
rsync --progress -r public/* svsticky.nl:/var/www/intro/intro-cs.svsticky.nl/

# Fix permissions again
ssh svsticky.nl chown -R tobias:tobias /var/www/intro/intro-cs.svsticky.nl
Expand Down
12 changes: 9 additions & 3 deletions gatsby-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,15 @@ module.exports = {
title: "Intro - CS",
},
plugins: [
`gatsby-plugin-image`,
`gatsby-plugin-sharp`,
`gatsby-transformer-sharp`,
`gatsby-plugin-image`,
`gatsby-plugin-sharp`,
`gatsby-transformer-sharp`,
{
resolve: 'gatsby-plugin-manifest',
options: {
"icon": "src/assets/images/icon.png"
}
}
],
};

31 changes: 31 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"fs-extra": "^10.0.1",
"gatsby": "^4.25.7",
"gatsby-plugin-image": "^2.25.0",
"gatsby-plugin-manifest": "^4.25.0",
"gatsby-plugin-sharp": "^4.25.1",
"gatsby-source-filesystem": "^4.25.0",
"gatsby-transformer-sharp": "^4.25.0",
Expand Down
Binary file added src/assets/images/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/Association.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const Association = ({ association }) => (
<a href={association.link}>
<img className="ui right floated medium spaced image association" src='https://public.svsticky.nl/logos/logo_compact_outline_kleur.svg' alt={association.name}/>
</a>
<p><div dangerouslySetInnerHTML={{ __html: association.text}}></div> <a href={association.textlink}>{association.textlink.substring(8)}</a></p>
<div dangerouslySetInnerHTML={{ __html: association.text}} />
</div>

);
Expand Down
42 changes: 21 additions & 21 deletions src/components/Home.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {StaticImage} from "gatsby-plugin-image";
class Home extends Component {
render() {
return (
<main ref="background">l
<main ref="background">
<Menu />
<div className="ui main container">
{/*<div className="video-container">*/}
Expand All @@ -32,7 +32,6 @@ class Home extends Component {
<div className="ui fluid card">
<div className="card content">
<p className="anchor" id="kamp"></p>
<p className="ui center aligned large header">Kamp</p>
{getText(data.kamp)}
</div>
</div>
Expand All @@ -45,30 +44,31 @@ class Home extends Component {
</div>
</div>
<div className="ui fluid card">
<div className="card content">
<p className="anchor" id="inschrijven"></p>
<p className="ui center aligned large header">Inschrijving</p>
{getText(data.register)}
{/*<pretix-widget event="https://pretix.svsticky.nl/intro/2023/"></pretix-widget>*/}
{/*<noscript>*/}
{/* <div className="pretix-widget">*/}
{/* <div className="pretix-widget-info-message">*/}
{/* JavaScript is disabled in your browser. To access our ticket shop without JavaScript,*/}
{/* please <a target="_blank" href="https://pretix.svsticky.nl/intro/2023/">click here</a>.*/}
{/* </div>*/}
{/* </div>*/}
{/*</noscript>*/}
{/*<p>*/}
{/* Je kunt onze privacy statement <a href="https://raw.githubusercontent.com/svsticky/intro-website/intro-2023/src/assets/privacy-statement.md">hier</a> vinden.*/}
{/*</p>*/}
</div>
<div className="card content">
<p className="anchor" id="inschrijven"></p>
<p className="ui center aligned large header">Inschrijven</p>

{getText(data.register)}
{/*<pretix-widget event="https://pretix.svsticky.nl/intro/2023/"></pretix-widget>*/}
{/*<noscript>*/}
{/* <div className="pretix-widget">*/}
{/* <div className="pretix-widget-info-message">*/}
{/* JavaScript is disabled in your browser. To access our ticket shop without JavaScript,*/}
{/* please <a target="_blank" href="https://pretix.svsticky.nl/intro/2023/">click here</a>.*/}
{/* </div>*/}
{/* </div>*/}
{/*</noscript>*/}
{/*<p>*/}
{/* Je kunt onze privacy statement <a href="https://raw.githubusercontent.com/svsticky/intro-website/intro-2023/src/assets/privacy-statement.md">hier</a> vinden.*/}
{/*</p>*/}
</div>
</div>
<div className="ui fluid card">
<div className="card content">
<p className="anchor" id="programma"></p>
<p className="ui center aligned large header">Programma</p>
{/*{getText(data.programDisclaimer, true)}<br/>*/}
{getProgram(data.program)}
{getText(data.programDisclaimer)}<br/>
{/*{getProgram(data.program)}*/}
</div>
</div>
<div className="ui fluid card">
Expand Down
10 changes: 1 addition & 9 deletions src/components/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,12 @@
},
"register": [
{
"name": "Inschrijven",
"anchor": "inschrijven",
"text": "Als je ingeschreven staat voor een van de studies sta je automatisch ingeschreven voor het algemene deel van de introductie. Je moet je echter voor sommige activiteiten zelf inschrijven en een kaartje kopen.\n\nDe inschrijvingen zijn nog niet open. Houdt deze site in de gaten!"
}
],
"programDisclaimer": [
{
"name": "Informatie",
"text": "De planning wordt nog bekend gemaakt!",
"textlink": ""
},
{
"text": "Let op: Deze informatie kan nog veranderen, houd de website in de gaten!",
"textlink": "",
"bold": true
}
Expand All @@ -78,8 +71,7 @@
"Associations": [
{
"name": "Sticky",
"text": "Sticky is de studievereniging voor informatica, gametechnologie en informatiekunde. Het is dé plek om buiten je colleges je studiegenoten op een informele manier te leren kennen. Sticky organiseert wekelijks vele soorten activiteiten, van filmavonden tot themaborrels, en van LAN-parties tot culturele uitstapjes naar het buitenland. Daarnaast biedt Sticky ondersteuning bij je studie, bijvoorbeeld via het opzetten van hulpmiddagen, waar ouderejaars studenten je door de moeilijkste vakken kunnen helpen, en door het aanbieden van korting op je studieboeken. Kijk vooral eens een keer op <a href='https://svsticky.nl'>svsticky.nl</a> voor meer informatie!\nInschrijven bij Sticky kost je eenmalig €7,50 en kan via ",
"textlink": "https://intro.svsticky.nl",
"text": "Sticky is de studievereniging voor informatica, gametechnologie en informatiekunde. Het is dé plek om buiten je colleges je studiegenoten op een informele manier te leren kennen. Sticky organiseert wekelijks vele soorten activiteiten, van filmavonden tot themaborrels, en van LAN-parties tot culturele uitstapjes naar het buitenland. Daarnaast biedt Sticky ondersteuning bij je studie, bijvoorbeeld via het opzetten van hulpmiddagen, waar ouderejaars studenten je door de moeilijkste vakken kunnen helpen, en door het aanbieden van korting op je studieboeken. Kijk vooral eens een keer op <a href='https://svsticky.nl'>svsticky.nl</a> voor meer informatie!\nInschrijven bij Sticky kost je eenmalig €7,50 en kan via<a href='https://intro.svsticky.nl'>intro.svsticky.nl</a>",
"photo": "sticky.png",
"link": "https://svsticky.nl/"
}
Expand Down
12 changes: 0 additions & 12 deletions src/components/data.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,6 @@
{
"type": "object",
"properties": {
"name": {
"type": "string"
},
"anchor": {
"type": "string"
},
"text": {
"type": "string"
}
Expand All @@ -149,9 +143,6 @@
{
"type": "object",
"properties": {
"name": {
"type": "string"
},
"text": {
"type": "string"
},
Expand Down Expand Up @@ -535,9 +526,6 @@
"text": {
"type": "string"
},
"textlink": {
"type": "string"
},
"photo": {
"type": "string"
},
Expand Down
37 changes: 37 additions & 0 deletions src/pages/404.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import React, {Component} from "react";

// Import components
import Home from '../components/Home.jsx';

// CSS framework
import 'fomantic-ui-css/semantic.min.css';
import Menu from "../components/Menu";

const NotFoundPage = () => {
return (
<NotFoundComponent></NotFoundComponent>
)
}

class NotFoundComponent extends Component {
render() {
return (
<main ref="background">
<Menu/>
<div className="ui main container" >
<div className="ui fluid card">
<div className="card content">
<p className="anchor" id="notFound"></p>
<p className="ui center aligned large header">Not found</p>
<p className="ui">
The page you were looking for could not be found
</p>
</div>
</div>
</div>
</main>
)
}
}

export default NotFoundPage
Binary file added static/boekje.pdf
View file
Open in desktop
Binary file not shown.
Loading