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

Minor improvement on tags page #453

Merged
merged 5 commits into from
Nov 30, 2023
Merged

Minor improvement on tags page #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0bead5f
Don't error if storing markers in localstorage throws an error
timcowlishaw Nov 20, 2023
5e1378a
Add error to catch
oscgonfer Nov 20, 2023
e36d013
use angular-spinner from our cloned repo
timcowlishaw Nov 20, 2023
9459acb
Minor improvement on tags page
oscgonfer Nov 30, 2023
d391a86
Merge remote-tracking branch 'origin/bugfix/fix-map-in-safari' into e…
oscgonfer Nov 30, 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
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"angular-load": "~0.3.0",
"angular-material": "^1.1.9",
"angular-sanitize": "^1.7.0",
"angular-spinner": "~0.6.1",
"angular-spinner": "https://github.com/fablabbcn/bower-angular-spinner.git",
"angular-ui-router": "^1.0.17",
"angular-cookies": "^1.7.0",
"d3": "~3.5.5",
Expand Down
5 changes: 3 additions & 2 deletions src/app/components/tags/tags.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ <h2>
<div class="kitTags__textElement">
<h4 class="md-title">About #Tags</h4>
<p class="sg-paragraph2">
Smart Citizen is a project by <a target="_blank" href="http://fablabbcn.org/">Fab Lab Barcelona</a> to offer an alternative to the centralised data production and management systems used by the large corporations that constitute the driving force behind the smart city concept. The project empowers citizens and communities to gather information on their environment and make it available to the public, using open source hardware and software design.
These tags are contributed by the community and show the variety applications of the Smart Citizen Project. You can use tags to organize and filter devices. If you need a tag, and you can't find one that works for you, you can request the creation of new tags in the forum.
</p>
<md-button class="color-cyan" ng-href="https://forum.smartcitizen.me/index.php?p=/discussion/comment/1501" target="_blank">SUGGEST NEW TAGS</md-button>
<br>
<a style="text-decoration: none" href="https://forum.smartcitizen.me/c/general/" class="btn-black-outline btn-round-new">SUGGEST NEW TAGS</a>
</div>
</div>
</div>
Expand Down
7 changes: 5 additions & 2 deletions src/app/core/api/device.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,11 @@
timestamp: new Date(),
data: data
};

$window.localStorage.setItem('smartcitizen.markers', JSON.stringify(obj) );
try {
$window.localStorage.setItem('smartcitizen.markers', JSON.stringify(obj) );
} catch (e) {
console.log("Could not store markers in localstorage. skipping...");
}
worldMarkers = obj.data;
}

Expand Down
Loading