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

Jump to bottom

Rewrite the Weather to an Edge App #105

Merged
merged 16 commits into from
Aug 15, 2023
Merged

Rewrite the Weather to an Edge App #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c3a2235
Move files from `src/` to root directory.
nicomiguelino Jul 12, 2023
d4c9dd8
Rewrite the Weather app to an Edge App.
nicomiguelino Jul 13, 2023
6e174c6
Fix the degrees symbol.
nicomiguelino Jul 17, 2023
1c02f3d
Modify `index.html` so that Google Analytics and Sentry integrations
nicomiguelino Jul 18, 2023
0d9fdf3
Have the script get the OpenWeatherMap API key from settings instead.
nicomiguelino Jul 18, 2023
dbf61bc
Make use of `localStorage` to cache weather data.
nicomiguelino Jul 20, 2023
515a5b2
Update the script to use `IndexedDB` instead of `localStorage`.
nicomiguelino Jul 21, 2023
85a9696
Fix the manifest file for the Weather Edge App.
nicomiguelino Jul 21, 2023
9857e43
Remove `READNE.md` as Markdown files are not supported for Edge Apps.
nicomiguelino Jul 21, 2023
4f75801
Change `boolean`- and `secret`-typed settings to `string`.
nicomiguelino Jul 21, 2023
e146465
Change type from `string` to `text`.
nicomiguelino Jul 21, 2023
6ec77b2
Modify conditional statement whether to disable analytics in Weather
nicomiguelino Jul 22, 2023
177f839
Merge branch 'Screenly:master' into 99-weather-app-rewrite
nicomiguelino Aug 3, 2023
6797890
Merge branch 'master' into 99-weather-app-rewrite
nicomiguelino Aug 10, 2023
1b1a08e
Change data type of sensitive settings to `secret` instead of `text`.
nicomiguelino Aug 14, 2023
d03118e
Resolve the most recent code review comments for the weather app.
nicomiguelino Aug 15, 2023
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
3 changes: 0 additions & 3 deletions edge-apps/weather/.babelrc
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions edge-apps/weather/.dockerignore
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions edge-apps/weather/.gitignore
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions edge-apps/weather/Dockerfile
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions edge-apps/weather/README.md
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions edge-apps/weather/bs-config.json
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions edge-apps/weather/gulpfile.js
View file
Open in desktop

This file was deleted.

51 changes: 31 additions & 20 deletions edge-apps/weather/src/index.html → edge-apps/weather/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
<head>
<title>Screenly Weather App - Weather Forecast</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/static/styles/main.css" />
<link rel="stylesheet" href="/static/styles/background.css" />
<link rel="stylesheet" href="static/styles/main.css" />
<link rel="stylesheet" href="static/styles/background.css" />
<script src="screenly.js?version=1"></script>
</head>
<body>
<div class="content">
Expand All @@ -14,12 +15,12 @@
<img src="/static/images/icons/map-pin.svg" alt="map pin icon">
<span id="city"></span>
</span>

<span class="location-item">
<img src="/static/images/icons/clock.svg" alt="clock icon">
<span id="time"></span>
</span>

<span class="location-item">
<img src="/static/images/icons/calendar.svg" alt="calendar icon">
<span id="date"></span>
Expand All @@ -41,31 +42,41 @@
</div>
<div class="weather-item dummy-node">
<span class="item-temp-degree">
<span class="item-temp"></span><sup>°</sup>
<span class="item-temp"></span>&deg;
</span>
<img class="item-icon" alt="clock icon">
<span class="item-time"></span>
</div>
</section>
</div>
<!--removeIf(sentry)-->
<script src="https://js.sentry-cdn.com/SENTRY_ID.min.js" crossorigin="anonymous"></script>
<!--endRemoveIf(sentry)-->

<!--removeIf(googleAnalytics)-->
<script async src="https://www.googletagmanager.com/gtag/js?id=GA_API_KEY"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
const disableAnalytics = screenly.settings.disable_analytics == "true";

if (disableAnalytics != "true") {
const sentryId = screenly.settings.sentry_id;
const gaApiKey = screenly.settings.ga_api_key;

const sentryScript = document.createElement('script');
sentryScript.src = `https://js.sentry-cdn.com/${sentryId}.min.js`;
sentryScript.crossOrigin = 'anonymous';
document.head.appendChild(sentryScript);

gtag('config', 'GA_API_KEY');
const gtagScript = document.createElement('script');
gtagScript.src = `https://www.googletagmanager.com/gtag/js?id=${gaApiKey}`;
gtagScript.async = true;
document.head.appendChild(gtagScript);

window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}

gtag('js', new Date());
gtag('config', gaApiKey);
}
</script>
<!--endRemoveIf(googleAnalytics)-->
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.4/moment-with-locales.min.js" integrity="sha512-42PE0rd+wZ2hNXftlM78BSehIGzezNeQuzihiBCvUEB3CVxHvsShF86wBWwQORNxNINlBPuq7rG4WWhNiTVHFg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="/static/js/icons.js"></script>
<script src="/static/js/main.js"></script>
<script src="/static/js/load-metadata.js"></script>
<script src="/static/js/load-screenly.js"></script>

<script src="static/js/moment-with-locales.min.js"></script>
<script src="static/js/icons.js"></script>
<script src="static/js/main.js"></script>
</body>
</html>
6 changes: 0 additions & 6 deletions edge-apps/weather/mocks/db.json
View file
Open in desktop

This file was deleted.

Loading