Commit Graph
84 Commits
Author SHA1 Message Date
marek c3f1bba1d7 Merge pull request 'map-with-names' (#14) from map-with-names into master
Reviewed-on: #14
2024-02-19 23:33:44 +01:00
marek 736cf7e065 final change because now it works 2024-02-19 23:30:09 +01:00
marek 68e10ec2ea maybe working with add part button 2024-02-19 23:23:41 +01:00
marek b9142f71e0 made map show annotation on edit 2024-02-19 23:09:23 +01:00
marek 8818b7d801 this is the only way to tests things 2024-02-19 23:01:52 +01:00
marek 34d58dcfc9 fix the stoopid 2024-02-19 22:56:18 +01:00
marek 0b77656e05 map with names 2024-02-19 22:53:44 +01:00
marek 316c9323c2 can i even push to master 2024-02-19 19:45:11 +01:00
marek 1e6ac07e9e Merge pull request 'fixed bug where it was possible to set an empty location' (#13) from fix-empty-location into master
Reviewed-on: #13
2024-02-19 18:57:47 +01:00
marek 0c8ebeea3b fixed inability to edit parts 2024-02-19 18:38:29 +01:00
marek c4da0395fa added how to on adding users 2023-04-05 21:30:52 +02:00
marek 2d412372b1 Merge pull request 'fixed issue with being able to add a part to an empty location' (#12) from fix-empty-location into master
Reviewed-on: #12
2023-04-05 21:26:31 +02:00
marek c11c192d1c fixed issue with being able to add a part to an empty location 2023-04-05 21:25:51 +02:00
marek 3c3f72b14f removed autodeploy 2023-04-05 21:24:11 +02:00
marek 435e771e10 Merge pull request 'fixed creating new users using userEditor' (#10) from fix-creating-users into master
Reviewed-on: #10
2023-04-05 19:36:52 +02:00
marek 81409dc448 fixed creating new users using userEditor 2023-04-05 19:20:53 +02:00
marek cd224a685b Merge pull request 'clear-partid-when-closing-part-vuew' (#7) from clear-partid-when-closing-part-vuew into master
Reviewed-on: #7
2022-11-30 13:07:06 +01:00
marek 6998c7eff2 clicking away the overlay by clicking outside of it also works with url 2022-11-30 13:05:15 +01:00
marek 807c136143 fixed previous commit by writing javascript not in python 2022-11-30 13:01:47 +01:00
marek 51022e79bd made url not contain part id when part view closed 2022-11-30 12:52:46 +01:00
marek b698ec446f Merge pull request 'tagline-randomizer' (#4) from tagline-randomizer into master
Reviewed-on: #4
2022-11-28 22:18:37 +01:00
marek 4bceb35bd5 added more taglines 2022-11-28 22:15:33 +01:00
marek b3f8f890f4 tagline randomiser 2022-11-28 22:08:37 +01:00
marek fcf5f25c16 de-triced a piece of code 2022-11-28 21:38:57 +01:00
marek f57ac131ff Merge remote-tracking branch 'origin/wilhelm-usereditor' into wilhelm-usereditor 2022-11-28 21:32:28 +01:00
marek ab663b1dec Merge pull request 'html spot for missing since text' (#3) from missing-feature into master
Reviewed-on: #3
2022-11-28 21:30:10 +01:00
marek 3cbff49168 html spot for missing since text 2022-11-28 21:28:32 +01:00
marek a9ee37f96e commented out Octopart Magic autofill until we fix the API 2022-11-28 20:25:21 +01:00
marek 3edd0542b8 gitignore mac garbage 2022-11-28 20:23:53 +01:00
marek 3754174c7d URL is now shareable 2022-11-28 20:23:43 +01:00
marek 6077dd4228 direct linking to search queries and parts 2022-11-28 19:21:52 +01:00
marek 4cf02f26c4 octopart link pretty 2018-11-14 16:40:40 +01:00
marek f4235556f7 octopart-fetch button is mash-like-an-idiot proof 2018-11-14 16:40:28 +01:00
marek 82f1c364de Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch 2018-11-13 22:50:41 +01:00
marek 38c22af31f fixed octopart fetch for server encoding issues 2018-11-13 22:50:29 +01:00
marek 2a8b1f50f4 Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch 2018-11-13 22:10:44 +01:00
marek 7e60da9362 octopart button now with more sponsor product placement! 2018-11-13 22:10:26 +01:00
marek 227e725e95 more magical octopart button prototype (temporarily disabled) 2018-11-13 22:09:34 +01:00
marek 3cb81e9a79 Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch 2018-11-13 21:58:49 +01:00
marek b297462d3b fixed location editor 2018-11-13 21:58:38 +01:00
marek 4649723f87 Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch 2018-11-13 20:56:51 +01:00
marek 0b64c50f36 fixed links for the locationEditor 2018-11-13 20:56:44 +01:00
marek e3f25e76f2 added tracking of who added which part; requires database update though. 2018-11-13 19:12:45 +01:00
marek e5f6341d4e Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch 2018-11-13 18:14:32 +01:00
marek c29d0af836 main results table width limited 2018-11-13 18:14:16 +01:00
marek c0f0fd732f Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch 2018-11-13 17:33:25 +01:00
marek b871e98cbb removed the key file from the repo, so it doesn't get overwritten 2018-11-13 17:33:10 +01:00
marek ad643464cb octopart search added. note: the API key is NOT included in the public repo, for obvious reasons. 2018-11-13 15:23:51 +01:00
marek 4f1e51e7bd made the site a little better looking on any mobile phone that is exactly my iphone. 2018-11-13 01:20:59 +01:00
marek 6120420f56 added an ugly favicon. Note: the default one that we get the 404 error about will be taken from the root domain elab.kth.se anyway. 2018-11-13 00:34:45 +01:00
marek d1bd2aa0ec Locations can now be deleted. I have created you, now I can destroy you! 2018-11-13 00:14:05 +01:00
marek 954b449757 location editor can now be used to edit locations. And add them! 2018-11-12 20:56:12 +01:00
marek a99a356985 hiding overlay is more reliable 2018-11-12 20:55:34 +01:00
marek 44adb43466 made /parts/ work in URL just as well as /parts 2018-11-12 20:55:10 +01:00
marek 846b7297ce location editor lists the new style of locations. Actual adding/editing locations coming soon. 2018-11-12 01:48:16 +01:00
marek 777942aeaa removed placeholder vault.png, resized "HERE" pointer 2018-11-12 01:19:00 +01:00
marek 2ce132868c fixed saving the location_id instead of container_id when adding or editing a part 2018-11-12 01:16:16 +01:00
marek 694310a733 TEMPORARY disabled datasheet posting, because otherwise could not test other related functionality 2018-11-12 01:15:41 +01:00
marek 42fb09f89b ALL the maps and overlays! Please don't move any furniture in lab nao. 2018-11-12 00:01:31 +01:00
marek 9c80db4943 Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch 2018-11-11 20:42:26 +01:00
marek 0fdcd100ff maps with container overlays 2018-11-11 20:42:09 +01:00
marek c4ca575ca1 new maps 2018-11-11 20:41:31 +01:00
marek d31799b3aa endpoint for listing locations in a given container 2018-11-11 20:05:55 +01:00
marek 5df74f1276 Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch 2018-11-11 18:46:31 +01:00
marek 7c1fd24cb0 location containers part 1. Mostly broken. 2018-11-11 18:46:17 +01:00
marek 2029ef5aeb made location listing part of the template, rather than an unnecesary AJAX request + secret sauce sorting 2018-11-11 01:19:32 +01:00
marek fd4f29ca7d temporary placeholder map for the VAULT. Hopefully just temporary and won't stay forever. 2018-11-11 00:53:19 +01:00
marek 00a2d6f070 location editor (MVP - can only add locations) 2018-11-11 00:52:30 +01:00
marek d131bcede6 removed a temporary test file and script relating to it 2018-11-11 00:52:03 +01:00
marek 3518c04c09 split script.js into a "common.js" that is useful for other pages and regular "script.js" for only the main page 2018-11-11 00:51:16 +01:00
marek 2d867f327c made the map styling reusable for the clickable map. I'm working under the wild assumption that we might not desperatly need a class called exactly "map" in a place different than specifically in an element named "overlay" 2018-11-10 23:31:16 +01:00
marek 513cc34bdd removed alpha channel from map before sending, to further reduce bandwidth abuse 2018-11-10 21:59:01 +01:00
marek 1234bdfa14 made the map not strech and display inline with the data-table 2018-11-10 21:58:18 +01:00
marek 2813481da4 updated map with chairs, so we can sit comfortably. Also reduced size 2018-11-10 21:57:40 +01:00
marek f8301552c4 made all parts relative with a global rootURL variable, for easy server deployment 2018-11-10 17:57:53 +01:00
marek efc5af0b61 added a shitty readme.md 2018-11-10 17:42:04 +01:00
marek 4d6ef6a07b locations are returned alphabetically 2018-11-10 01:05:31 +01:00
marek b8b014f314 Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch 2018-11-10 00:39:15 +01:00
marek 2b481df94c endpoint for getting a map for a given location ID /parts/getlocationURL/<id> 2018-11-10 00:39:00 +01:00
marek dadab62e9e endpoint for listing locations 2018-11-10 00:15:00 +01:00
marek 7d5d5bb3b4 Merge branch 'master' of https://git.elab.kth.se/davide/ELAB-partsearch 2018-11-09 23:29:08 +01:00
marek 04d10120da map X Y coordinate generator for making new locations 2018-11-09 23:28:55 +01:00
marek 4ce95acbac fixed transparancy issue on generated map 2018-11-09 22:17:42 +01:00
marek d3cd668c9e things can be pointed at with the map 2018-11-09 21:24:21 +01:00