Skip to content
Snippets Groups Projects
Commit 5059cc4a authored by Eli Kogan-Wang's avatar Eli Kogan-Wang
Browse files

reformat

reformat markdown
parent affd2996
No related branches found
No related tags found
No related merge requests found
# EditorConfig is awesome: https://EditorConfig.org
# top-most EditorConfig file
root = true
[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = false
insert_final_newline = false
[*.json]
indent_size = 2
[*.md]
indent_size = 2
\ No newline at end of file
......@@ -4,22 +4,23 @@ This repository holds the dashboard which is displayed in the student council.
## Used libraries
* [Bootstrap (5.1.3)](https://getbootstrap.com/)
* [Bootstrap Icons (1.7)](https://icons.getbootstrap.com/)
* [jQuery (3.6.0)](https://jquery.com/)
* [jQuery Marquee (1.6.0)](https://www.npmjs.com/package/jquery.marquee)
* [Moment.js](https://momentjs.com/)
* [ical.js](https://github.com/mozilla-comm/ical.js/)
- [Bootstrap (5.1.3)](https://getbootstrap.com/)
- [Bootstrap Icons (1.7)](https://icons.getbootstrap.com/)
- [jQuery (3.6.0)](https://jquery.com/)
- [jQuery Marquee (1.6.0)](https://www.npmjs.com/package/jquery.marquee)
- [Moment.js](https://momentjs.com/)
- [ical.js](https://github.com/mozilla-comm/ical.js/)
## Used APIs
* [Autobahn API](https://autobahn.api.bund.dev/)
* Padersprinter API (not official documented)
* Studierendenwerk Paderborn Mensa API (not official documented)
- [Autobahn API](https://autobahn.api.bund.dev/)
- Padersprinter API (not official documented)
- Studierendenwerk Paderborn Mensa API (not official documented)
## Adding middle content
To add new content to the center of the dashboard (displayed for a certain time), you have to follow these steps:
1. Create the following files:
1. modules/my_module.js
2. modules/my_module.css (if necessary)
......@@ -34,11 +35,10 @@ To add new content to the center of the dashboard (displayed for a certain time)
@import "modules/my_module.css";
```
3. Register your js-function:<BR>
In your js-file, use the function ```register_middle_content(html, build_func, duration) ``` to register your content and add it to the animation flow.
* ``` html ```: The html code, which will be used as a container for the content with a specific identifier, i.e. ``` <div id="my_module"></div> ```
* ``` build_func ```: The function which will fetch data, process and appends it into the container. Please be aware of the following:
* This function is handled as a promise object, because it is very likely that you will use an async function to fetch data. You can do something like:
In your js-file, use the function `register_middle_content(html, build_func, duration) ` to register your content and add it to the animation flow.
- `html`: The html code, which will be used as a container for the content with a specific identifier, i.e. `<div id="my_module"></div>`
- `build_func`: The function which will fetch data, process and appends it into the container. Please be aware of the following:
- This function is handled as a promise object, because it is very likely that you will use an async function to fetch data. You can do something like:
```javascript
let build_func = function () {
let deferred = new $.Deferred();
......@@ -54,6 +54,6 @@ To add new content to the center of the dashboard (displayed for a certain time)
deferred.resolve();
});
return deferred.promise();
}
};
```
* ``` duration ``` This optional parameter can be used to set a fix time in milliseconds. If not set it will be set to 20000.
\ No newline at end of file
- `duration` This optional parameter can be used to set a fix time in milliseconds. If not set it will be set to 20000.
......@@ -3,7 +3,10 @@
"2021": {
"WiSe": {
"begin": 40,
"no_lectures": [52, 1]
"no_lectures": [
52,
1
]
}
},
"2022": {
......
......@@ -25,10 +25,12 @@
"end": "14:00"
}
],
"5": [{
"5": [
{
"start": "11:15",
"end": "13:30"
}],
}
],
"6": [],
"7": []
},
......
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="UTF-8">
<title>Fachschaft Mathe / Info</title>
......@@ -7,6 +8,7 @@
<link href="libs/bootstrap-icons-1.7.0/bootstrap-icons.css" rel="stylesheet" />
<link href="master.css" rel="stylesheet" />
</head>
<body class="w-100 h-100 overflow-hidden">
<div class="container-fluid">
<div class="row mt-2">
......@@ -42,7 +44,8 @@
<div class="row">
<div class="col-12">
<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0"
aria-valuemax="100"></div>
</div>
</div>
</div>
......@@ -65,6 +68,7 @@
</div>
</div>
</div>
<div class="row mt-2">
<div class="col-12">
<div class="card w-100">
......@@ -77,13 +81,13 @@
<div class="row mt-2">
<div class="col-12">
<div class="card w-100">
<div class="card-body text-end" style="display:flex;flex:auto;justify-content: center;">
<div class="card-body text-end recipe-box">
<h6 class="display-6 recipe-name">Lu</h6>
<h6 class="display-6 recipe-heading">heading</h6>
<!-- <h6 class="display-6 recipe-ingedrients">ingedrients</h6>
<h6 class="display-6 recipe-zubereitung">Zubereitung</h6> -->
<img class="display-6 recipe-qr" width="500" height="600" >
<img class="display-6 recipe-pic" width="500" height="600">
<img class="display-6 recipe-pic">
<h6 class="display-6 recipe-heading">heading</h6>
<img class="display-6 recipe-qr">
</div>
</div>
</div>
......@@ -99,4 +103,5 @@
<script src="libs/ical.js" type="text/javascript"></script>
<script src="master.js" type="text/javascript"></script>
</body>
</html>
\ No newline at end of file
......@@ -21,4 +21,3 @@
width: calc(100% - 2rem);
height: 100%;
}
\ No newline at end of file
.clock-hours:before {
content: var(--timer-hours);
}
.clock-minutes:before {
content: var(--timer-minutes);
}
.clock-seconds:before {
content: var(--timer-seconds);
}
......@@ -11,23 +13,30 @@
.date-weekday:before {
content: var(--timer-weekday);
}
.date-day:before {
content: var(--timer-day);
}
.date-month:before {
content: var(--timer-month);
}
.date-year:before {
content: var(--timer-year);
}
.date-week:after {
content: var(--timer-week);
}
.date-courseweek:after {
content: var(--timer-courseweek);
}
.date-item, .clock-item, .clock-divider{
.date-item,
.clock-item,
.clock-divider {
display: inline-block;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment