diff --git a/env/dev/src/image_assets.clj b/env/dev/src/image_assets.clj deleted file mode 100644 index dd9fba4..0000000 --- a/env/dev/src/image_assets.clj +++ /dev/null @@ -1,102 +0,0 @@ -(ns image-assets - (:require - [clojure.string :as string] - [clojure.java.io :as io] - [clojure.java.jdbc :as sql] - [clj-http.client :as http] - [config.core :as config] - [mtgcoll.db :refer [db]] - [mtgcoll.config :refer [config]]) - (:use - mtgcoll.utils)) - -;; NOTE: The Gatherer site serves up images via the image handler as PNG's but -;; the HTTP response incorrectly sets a "image/jpeg" content-type -;; (which is probably only intended for the card images). -;; The mana/set/symbol images are all actually PNG! - -(defn ->gatherer-image-handler-url - [size & {:keys [name rarity set]}] - (-> "http://gatherer.wizards.com/Handlers/Image.ashx?type=symbol" - (str "&size=" size) - (str (if name (str "&name=" name))) - (str (if rarity (str "&rarity=" rarity))) - (str (if set (str "&set=" set))))) - -(defn download-image-as-byte-array - [url] - (let [response (http/get url {:headers chrome-osx-request-headers - :as :byte-array}) - body (:body response)] - (if-not (empty? body) - body))) - -(defn save-bytes-to-file! - [filename bytes] - (let [file (io/file (str (config/get config :gatherer :image-save-path) filename)) - path (io/file (.getParent file))] - (.mkdirs path) - (with-open [w (io/output-stream (.getPath file))] - (.write w bytes)))) - -(defn get-gatherer-set-codes - [] - (sql/query db ["select code, gatherer_code from sets"])) - -(defn download-set-image - [size {:keys [code gatherer_code]}] - (if-let [image-bytes (download-image-as-byte-array (->gatherer-image-handler-url size :rarity "C" :set code))] - image-bytes - (if-let [image-bytes (if gatherer_code - (download-image-as-byte-array (->gatherer-image-handler-url size :rarity "C" :set gatherer_code)))] - image-bytes - (download-image-as-byte-array (->gatherer-image-handler-url size :rarity "M" :set code))))) - -(defn download-gatherer-set-images! - [size] - (doseq [code (get-gatherer-set-codes)] - (println code) - (if-let [image-bytes (download-set-image size code)] - (save-bytes-to-file! (str "/sets/" size "/" (:code code) ".png") image-bytes) - (println "Could not get image for:" code)))) - -#_(download-gatherer-set-images! "small") -#_(download-gatherer-set-images! "medium") - -(defn download-symbol-image - [size name] - (download-image-as-byte-array (->gatherer-image-handler-url size :name name))) - -(def mana-symbols - ["C" "W" "U" "B" "R" "G" "S" "X" "Y" "Z" "WU" "WB" "UB" "UR" "BR" "BG" "RG" "RW" "GW" "GU" "2W" "2U" "2B" "2R" "2G" "P" "WP" "UP" "BP" "RP" "GP" "INFINITY" "H" "HW" "HU" "HB" "HR" "HG" "0" "1" "2" "3" "4" "5" "6" "7" "8" "9" "10" "11" "12" "13" "14" "15" "16" "17" "18" "19" "20" "100" "1000000"]) - -(def gather-symbol-names - {"S" "snow" - "HR" "HalfR" - "T" "tap" - "Q" "untap"}) - -(def other-symbols - ["T" "Q" "CHAOS"]) - -(defn download-gatherer-symbol-image! - [size type symbol-name] - (when-let [image-bytes (download-symbol-image size (or (get gather-symbol-names symbol-name) symbol-name))] - (save-bytes-to-file! (str "/" type "/" size "/" symbol-name ".png") image-bytes) - true)) - -(defn download-gatherer-symbol-images! - [size] - ; mana symbols - (doseq [symbol-name mana-symbols] - (println symbol-name) - (if-not (download-gatherer-symbol-image! size "mana" symbol-name) - (println "Could not get image for:" symbol-name))) - ; other symbols - (doseq [symbol-name other-symbols] - (println symbol-name) - (if-not (download-gatherer-symbol-image! size "symbols" symbol-name) - (println "Could not get image for:" symbol-name)))) - -#_(download-gatherer-symbol-images! "small") -#_(download-gatherer-symbol-images! "medium") diff --git a/env/dev/src/user.clj b/env/dev/src/user.clj index 7be718e..1e15e4e 100644 --- a/env/dev/src/user.clj +++ b/env/dev/src/user.clj @@ -2,18 +2,16 @@ (:use mtgcoll.core) (:require - [ragtime.jdbc :as jdbc] [ragtime.repl :as ragtime] + [mtgcoll.config :as config] [mtgcoll.db :as db])) -(defn get-ragtime-config [] - {:datastore (jdbc/sql-database db/db) - :migrations (jdbc/load-directory "migrations")}) - (defn migrate [& args] - (println "Running migrations on" (:subname db/db)) - (ragtime/migrate (get-ragtime-config))) + (config/load! "config.edn") + (println "Running migrations on" (:subname @db/db)) + (ragtime/migrate (db/get-ragtime-config))) (defn rollback [& args] - (println "Rolling back migrations on" (:subname db/db)) - (ragtime/rollback (get-ragtime-config) (or (first args) 1))) + (config/load! "config.edn") + (println "Rolling back migrations on" (:subname @db/db)) + (ragtime/rollback (db/get-ragtime-config) (or (first args) 1))) diff --git a/project.clj b/project.clj index e1529b1..f3c3247 100644 --- a/project.clj +++ b/project.clj @@ -9,6 +9,7 @@ [org.immutant/web "2.1.4"] [org.clojure/tools.logging "0.3.1"] + [org.clojure/tools.cli "0.3.5"] [org.clojure/java.jdbc "0.6.1"] [org.postgresql/postgresql "9.4.1208.jre7"] [com.taoensso/sente "1.8.1"] diff --git a/migrations/00001_sets_table.down.sql b/resources/migrations/00001_sets_table.down.sql similarity index 100% rename from migrations/00001_sets_table.down.sql rename to resources/migrations/00001_sets_table.down.sql diff --git a/migrations/00001_sets_table.up.sql b/resources/migrations/00001_sets_table.up.sql similarity index 100% rename from migrations/00001_sets_table.up.sql rename to resources/migrations/00001_sets_table.up.sql diff --git a/migrations/00002_cards_table.down.sql b/resources/migrations/00002_cards_table.down.sql similarity index 100% rename from migrations/00002_cards_table.down.sql rename to resources/migrations/00002_cards_table.down.sql diff --git a/migrations/00002_cards_table.up.sql b/resources/migrations/00002_cards_table.up.sql similarity index 100% rename from migrations/00002_cards_table.up.sql rename to resources/migrations/00002_cards_table.up.sql diff --git a/migrations/00003_card_variations_table.down.sql b/resources/migrations/00003_card_variations_table.down.sql similarity index 100% rename from migrations/00003_card_variations_table.down.sql rename to resources/migrations/00003_card_variations_table.down.sql diff --git a/migrations/00003_card_variations_table.up.sql b/resources/migrations/00003_card_variations_table.up.sql similarity index 100% rename from migrations/00003_card_variations_table.up.sql rename to resources/migrations/00003_card_variations_table.up.sql diff --git a/migrations/00004_card_names_table.down.sql b/resources/migrations/00004_card_names_table.down.sql similarity index 100% rename from migrations/00004_card_names_table.down.sql rename to resources/migrations/00004_card_names_table.down.sql diff --git a/migrations/00004_card_names_table.up.sql b/resources/migrations/00004_card_names_table.up.sql similarity index 100% rename from migrations/00004_card_names_table.up.sql rename to resources/migrations/00004_card_names_table.up.sql diff --git a/migrations/00005_card_images_table.down.sql b/resources/migrations/00005_card_images_table.down.sql similarity index 100% rename from migrations/00005_card_images_table.down.sql rename to resources/migrations/00005_card_images_table.down.sql diff --git a/migrations/00005_card_images_table.up.sql b/resources/migrations/00005_card_images_table.up.sql similarity index 100% rename from migrations/00005_card_images_table.up.sql rename to resources/migrations/00005_card_images_table.up.sql diff --git a/migrations/00006_card_prices_table.down.sql b/resources/migrations/00006_card_prices_table.down.sql similarity index 100% rename from migrations/00006_card_prices_table.down.sql rename to resources/migrations/00006_card_prices_table.down.sql diff --git a/migrations/00006_card_prices_table.up.sql b/resources/migrations/00006_card_prices_table.up.sql similarity index 100% rename from migrations/00006_card_prices_table.up.sql rename to resources/migrations/00006_card_prices_table.up.sql diff --git a/migrations/00007_collection_table.down.sql b/resources/migrations/00007_collection_table.down.sql similarity index 100% rename from migrations/00007_collection_table.down.sql rename to resources/migrations/00007_collection_table.down.sql diff --git a/migrations/00007_collection_table.up.sql b/resources/migrations/00007_collection_table.up.sql similarity index 100% rename from migrations/00007_collection_table.up.sql rename to resources/migrations/00007_collection_table.up.sql diff --git a/migrations/00008_add_prices_to_cards_table.down.sql b/resources/migrations/00008_add_prices_to_cards_table.down.sql similarity index 100% rename from migrations/00008_add_prices_to_cards_table.down.sql rename to resources/migrations/00008_add_prices_to_cards_table.down.sql diff --git a/migrations/00008_add_prices_to_cards_table.up.sql b/resources/migrations/00008_add_prices_to_cards_table.up.sql similarity index 100% rename from migrations/00008_add_prices_to_cards_table.up.sql rename to resources/migrations/00008_add_prices_to_cards_table.up.sql diff --git a/migrations/00009_add_owned_count_to_cards_table.down.sql b/resources/migrations/00009_add_owned_count_to_cards_table.down.sql similarity index 100% rename from migrations/00009_add_owned_count_to_cards_table.down.sql rename to resources/migrations/00009_add_owned_count_to_cards_table.down.sql diff --git a/migrations/00009_add_owned_count_to_cards_table.up.sql b/resources/migrations/00009_add_owned_count_to_cards_table.up.sql similarity index 100% rename from migrations/00009_add_owned_count_to_cards_table.up.sql rename to resources/migrations/00009_add_owned_count_to_cards_table.up.sql diff --git a/migrations/00010_median_function.down.sql b/resources/migrations/00010_median_function.down.sql similarity index 100% rename from migrations/00010_median_function.down.sql rename to resources/migrations/00010_median_function.down.sql diff --git a/migrations/00010_median_function.up.sql b/resources/migrations/00010_median_function.up.sql similarity index 100% rename from migrations/00010_median_function.up.sql rename to resources/migrations/00010_median_function.up.sql diff --git a/migrations/00011_add_online_boolean_to_collection_table.down.sql b/resources/migrations/00011_add_online_boolean_to_collection_table.down.sql similarity index 100% rename from migrations/00011_add_online_boolean_to_collection_table.down.sql rename to resources/migrations/00011_add_online_boolean_to_collection_table.down.sql diff --git a/migrations/00011_add_online_boolean_to_collection_table.up.sql b/resources/migrations/00011_add_online_boolean_to_collection_table.up.sql similarity index 100% rename from migrations/00011_add_online_boolean_to_collection_table.up.sql rename to resources/migrations/00011_add_online_boolean_to_collection_table.up.sql diff --git a/resources/public/img/missing_symbol_large.png b/resources/public/img/missing_symbol_large.png new file mode 100644 index 0000000..5970725 Binary files /dev/null and b/resources/public/img/missing_symbol_large.png differ diff --git a/resources/public/img/sets/medium/10E.png b/resources/public/img/sets/medium/10E.png deleted file mode 100644 index 00f3dab..0000000 Binary files a/resources/public/img/sets/medium/10E.png and /dev/null differ diff --git a/resources/public/img/sets/medium/2ED.png b/resources/public/img/sets/medium/2ED.png deleted file mode 100644 index 8d95a5a..0000000 Binary files a/resources/public/img/sets/medium/2ED.png and /dev/null differ diff --git a/resources/public/img/sets/medium/3ED.png b/resources/public/img/sets/medium/3ED.png deleted file mode 100644 index dd3a093..0000000 Binary files a/resources/public/img/sets/medium/3ED.png and /dev/null differ diff --git a/resources/public/img/sets/medium/4ED.png b/resources/public/img/sets/medium/4ED.png deleted file mode 100644 index b695e86..0000000 Binary files a/resources/public/img/sets/medium/4ED.png and /dev/null differ diff --git a/resources/public/img/sets/medium/5DN.png b/resources/public/img/sets/medium/5DN.png deleted file mode 100644 index 8d93e49..0000000 Binary files a/resources/public/img/sets/medium/5DN.png and /dev/null differ diff --git a/resources/public/img/sets/medium/5ED.png b/resources/public/img/sets/medium/5ED.png deleted file mode 100644 index b025ef8..0000000 Binary files a/resources/public/img/sets/medium/5ED.png and /dev/null differ diff --git a/resources/public/img/sets/medium/6ED.png b/resources/public/img/sets/medium/6ED.png deleted file mode 100644 index 1d4c8c8..0000000 Binary files a/resources/public/img/sets/medium/6ED.png and /dev/null differ diff --git a/resources/public/img/sets/medium/7ED.png b/resources/public/img/sets/medium/7ED.png deleted file mode 100644 index 894625b..0000000 Binary files a/resources/public/img/sets/medium/7ED.png and /dev/null differ diff --git a/resources/public/img/sets/medium/8ED.png b/resources/public/img/sets/medium/8ED.png deleted file mode 100644 index 934abb7..0000000 Binary files a/resources/public/img/sets/medium/8ED.png and /dev/null differ diff --git a/resources/public/img/sets/medium/9ED.png b/resources/public/img/sets/medium/9ED.png deleted file mode 100644 index 4fbe250..0000000 Binary files a/resources/public/img/sets/medium/9ED.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ALA.png b/resources/public/img/sets/medium/ALA.png deleted file mode 100644 index 0707df2..0000000 Binary files a/resources/public/img/sets/medium/ALA.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ALL.png b/resources/public/img/sets/medium/ALL.png deleted file mode 100644 index e325856..0000000 Binary files a/resources/public/img/sets/medium/ALL.png and /dev/null differ diff --git a/resources/public/img/sets/medium/APC.png b/resources/public/img/sets/medium/APC.png deleted file mode 100644 index 1e999c7..0000000 Binary files a/resources/public/img/sets/medium/APC.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ARB.png b/resources/public/img/sets/medium/ARB.png deleted file mode 100644 index c909a9a..0000000 Binary files a/resources/public/img/sets/medium/ARB.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ARC.png b/resources/public/img/sets/medium/ARC.png deleted file mode 100644 index 5dad00d..0000000 Binary files a/resources/public/img/sets/medium/ARC.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ARN.png b/resources/public/img/sets/medium/ARN.png deleted file mode 100644 index f40f607..0000000 Binary files a/resources/public/img/sets/medium/ARN.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ATQ.png b/resources/public/img/sets/medium/ATQ.png deleted file mode 100644 index 5295d51..0000000 Binary files a/resources/public/img/sets/medium/ATQ.png and /dev/null differ diff --git a/resources/public/img/sets/medium/AVR.png b/resources/public/img/sets/medium/AVR.png deleted file mode 100644 index f7eac81..0000000 Binary files a/resources/public/img/sets/medium/AVR.png and /dev/null differ diff --git a/resources/public/img/sets/medium/BFZ.png b/resources/public/img/sets/medium/BFZ.png deleted file mode 100644 index ef3faaa..0000000 Binary files a/resources/public/img/sets/medium/BFZ.png and /dev/null differ diff --git a/resources/public/img/sets/medium/BNG.png b/resources/public/img/sets/medium/BNG.png deleted file mode 100644 index 056fcbc..0000000 Binary files a/resources/public/img/sets/medium/BNG.png and /dev/null differ diff --git a/resources/public/img/sets/medium/BOK.png b/resources/public/img/sets/medium/BOK.png deleted file mode 100644 index 44b77dc..0000000 Binary files a/resources/public/img/sets/medium/BOK.png and /dev/null differ diff --git a/resources/public/img/sets/medium/BRB.png b/resources/public/img/sets/medium/BRB.png deleted file mode 100644 index 34d51aa..0000000 Binary files a/resources/public/img/sets/medium/BRB.png and /dev/null differ diff --git a/resources/public/img/sets/medium/BTD.png b/resources/public/img/sets/medium/BTD.png deleted file mode 100644 index d195770..0000000 Binary files a/resources/public/img/sets/medium/BTD.png and /dev/null differ diff --git a/resources/public/img/sets/medium/C13.png b/resources/public/img/sets/medium/C13.png deleted file mode 100644 index 7804e34..0000000 Binary files a/resources/public/img/sets/medium/C13.png and /dev/null differ diff --git a/resources/public/img/sets/medium/C14.png b/resources/public/img/sets/medium/C14.png deleted file mode 100644 index e890e4a..0000000 Binary files a/resources/public/img/sets/medium/C14.png and /dev/null differ diff --git a/resources/public/img/sets/medium/C15.png b/resources/public/img/sets/medium/C15.png deleted file mode 100644 index 7f82c29..0000000 Binary files a/resources/public/img/sets/medium/C15.png and /dev/null differ diff --git a/resources/public/img/sets/medium/CHK.png b/resources/public/img/sets/medium/CHK.png deleted file mode 100644 index 9bff82f..0000000 Binary files a/resources/public/img/sets/medium/CHK.png and /dev/null differ diff --git a/resources/public/img/sets/medium/CHR.png b/resources/public/img/sets/medium/CHR.png deleted file mode 100644 index 7f1a244..0000000 Binary files a/resources/public/img/sets/medium/CHR.png and /dev/null differ diff --git a/resources/public/img/sets/medium/CM1.png b/resources/public/img/sets/medium/CM1.png deleted file mode 100644 index dbb30c5..0000000 Binary files a/resources/public/img/sets/medium/CM1.png and /dev/null differ diff --git a/resources/public/img/sets/medium/CMD.png b/resources/public/img/sets/medium/CMD.png deleted file mode 100644 index 4106e7a..0000000 Binary files a/resources/public/img/sets/medium/CMD.png and /dev/null differ diff --git a/resources/public/img/sets/medium/CNS.png b/resources/public/img/sets/medium/CNS.png deleted file mode 100644 index 301a1a6..0000000 Binary files a/resources/public/img/sets/medium/CNS.png and /dev/null differ diff --git a/resources/public/img/sets/medium/CON.png b/resources/public/img/sets/medium/CON.png deleted file mode 100644 index 6a518cf..0000000 Binary files a/resources/public/img/sets/medium/CON.png and /dev/null differ diff --git a/resources/public/img/sets/medium/CSP.png b/resources/public/img/sets/medium/CSP.png deleted file mode 100644 index b1c2426..0000000 Binary files a/resources/public/img/sets/medium/CSP.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DD2.png b/resources/public/img/sets/medium/DD2.png deleted file mode 100644 index ffab0b3..0000000 Binary files a/resources/public/img/sets/medium/DD2.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DD3_DVD.png b/resources/public/img/sets/medium/DD3_DVD.png deleted file mode 100644 index 7488dcd..0000000 Binary files a/resources/public/img/sets/medium/DD3_DVD.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DD3_EVG.png b/resources/public/img/sets/medium/DD3_EVG.png deleted file mode 100644 index f6ba422..0000000 Binary files a/resources/public/img/sets/medium/DD3_EVG.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DD3_GVL.png b/resources/public/img/sets/medium/DD3_GVL.png deleted file mode 100644 index 1249aff..0000000 Binary files a/resources/public/img/sets/medium/DD3_GVL.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DD3_JVC.png b/resources/public/img/sets/medium/DD3_JVC.png deleted file mode 100644 index ffab0b3..0000000 Binary files a/resources/public/img/sets/medium/DD3_JVC.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DDC.png b/resources/public/img/sets/medium/DDC.png deleted file mode 100644 index 7488dcd..0000000 Binary files a/resources/public/img/sets/medium/DDC.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DDD.png b/resources/public/img/sets/medium/DDD.png deleted file mode 100644 index 1249aff..0000000 Binary files a/resources/public/img/sets/medium/DDD.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DDE.png b/resources/public/img/sets/medium/DDE.png deleted file mode 100644 index 38d4a56..0000000 Binary files a/resources/public/img/sets/medium/DDE.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DDF.png b/resources/public/img/sets/medium/DDF.png deleted file mode 100644 index 493f8ca..0000000 Binary files a/resources/public/img/sets/medium/DDF.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DDG.png b/resources/public/img/sets/medium/DDG.png deleted file mode 100644 index c10dd1a..0000000 Binary files a/resources/public/img/sets/medium/DDG.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DDH.png b/resources/public/img/sets/medium/DDH.png deleted file mode 100644 index 988d617..0000000 Binary files a/resources/public/img/sets/medium/DDH.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DDI.png b/resources/public/img/sets/medium/DDI.png deleted file mode 100644 index 5242d74..0000000 Binary files a/resources/public/img/sets/medium/DDI.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DDJ.png b/resources/public/img/sets/medium/DDJ.png deleted file mode 100644 index 8ef7397..0000000 Binary files a/resources/public/img/sets/medium/DDJ.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DDK.png b/resources/public/img/sets/medium/DDK.png deleted file mode 100644 index e133039..0000000 Binary files a/resources/public/img/sets/medium/DDK.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DDL.png b/resources/public/img/sets/medium/DDL.png deleted file mode 100644 index 9cd3390..0000000 Binary files a/resources/public/img/sets/medium/DDL.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DDM.png b/resources/public/img/sets/medium/DDM.png deleted file mode 100644 index 4eaf32e..0000000 Binary files a/resources/public/img/sets/medium/DDM.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DDN.png b/resources/public/img/sets/medium/DDN.png deleted file mode 100644 index de9da81..0000000 Binary files a/resources/public/img/sets/medium/DDN.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DDO.png b/resources/public/img/sets/medium/DDO.png deleted file mode 100644 index 8509bdf..0000000 Binary files a/resources/public/img/sets/medium/DDO.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DDP.png b/resources/public/img/sets/medium/DDP.png deleted file mode 100644 index 5e4659f..0000000 Binary files a/resources/public/img/sets/medium/DDP.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DGM.png b/resources/public/img/sets/medium/DGM.png deleted file mode 100644 index 22e1156..0000000 Binary files a/resources/public/img/sets/medium/DGM.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DIS.png b/resources/public/img/sets/medium/DIS.png deleted file mode 100644 index 5e72dc4..0000000 Binary files a/resources/public/img/sets/medium/DIS.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DKA.png b/resources/public/img/sets/medium/DKA.png deleted file mode 100644 index 279098b..0000000 Binary files a/resources/public/img/sets/medium/DKA.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DRB.png b/resources/public/img/sets/medium/DRB.png deleted file mode 100644 index 455ef18..0000000 Binary files a/resources/public/img/sets/medium/DRB.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DRK.png b/resources/public/img/sets/medium/DRK.png deleted file mode 100644 index a3884e8..0000000 Binary files a/resources/public/img/sets/medium/DRK.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DST.png b/resources/public/img/sets/medium/DST.png deleted file mode 100644 index ff9be23..0000000 Binary files a/resources/public/img/sets/medium/DST.png and /dev/null differ diff --git a/resources/public/img/sets/medium/DTK.png b/resources/public/img/sets/medium/DTK.png deleted file mode 100644 index 2b4f4c4..0000000 Binary files a/resources/public/img/sets/medium/DTK.png and /dev/null differ diff --git a/resources/public/img/sets/medium/EVE.png b/resources/public/img/sets/medium/EVE.png deleted file mode 100644 index 527c3e8..0000000 Binary files a/resources/public/img/sets/medium/EVE.png and /dev/null differ diff --git a/resources/public/img/sets/medium/EVG.png b/resources/public/img/sets/medium/EVG.png deleted file mode 100644 index f6ba422..0000000 Binary files a/resources/public/img/sets/medium/EVG.png and /dev/null differ diff --git a/resources/public/img/sets/medium/EXO.png b/resources/public/img/sets/medium/EXO.png deleted file mode 100644 index 8d48f41..0000000 Binary files a/resources/public/img/sets/medium/EXO.png and /dev/null differ diff --git a/resources/public/img/sets/medium/EXP.png b/resources/public/img/sets/medium/EXP.png deleted file mode 100644 index 03965a8..0000000 Binary files a/resources/public/img/sets/medium/EXP.png and /dev/null differ diff --git a/resources/public/img/sets/medium/FEM.png b/resources/public/img/sets/medium/FEM.png deleted file mode 100644 index 0d56add..0000000 Binary files a/resources/public/img/sets/medium/FEM.png and /dev/null differ diff --git a/resources/public/img/sets/medium/FRF.png b/resources/public/img/sets/medium/FRF.png deleted file mode 100644 index c067c8d..0000000 Binary files a/resources/public/img/sets/medium/FRF.png and /dev/null differ diff --git a/resources/public/img/sets/medium/FRF_UGIN.png b/resources/public/img/sets/medium/FRF_UGIN.png deleted file mode 100644 index 2e1adbf..0000000 Binary files a/resources/public/img/sets/medium/FRF_UGIN.png and /dev/null differ diff --git a/resources/public/img/sets/medium/FUT.png b/resources/public/img/sets/medium/FUT.png deleted file mode 100644 index 6e5b7c6..0000000 Binary files a/resources/public/img/sets/medium/FUT.png and /dev/null differ diff --git a/resources/public/img/sets/medium/GPT.png b/resources/public/img/sets/medium/GPT.png deleted file mode 100644 index 565457f..0000000 Binary files a/resources/public/img/sets/medium/GPT.png and /dev/null differ diff --git a/resources/public/img/sets/medium/GTC.png b/resources/public/img/sets/medium/GTC.png deleted file mode 100644 index 46719a8..0000000 Binary files a/resources/public/img/sets/medium/GTC.png and /dev/null differ diff --git a/resources/public/img/sets/medium/H09.png b/resources/public/img/sets/medium/H09.png deleted file mode 100644 index eeae08f..0000000 Binary files a/resources/public/img/sets/medium/H09.png and /dev/null differ diff --git a/resources/public/img/sets/medium/HML.png b/resources/public/img/sets/medium/HML.png deleted file mode 100644 index 861e8e8..0000000 Binary files a/resources/public/img/sets/medium/HML.png and /dev/null differ diff --git a/resources/public/img/sets/medium/HOP.png b/resources/public/img/sets/medium/HOP.png deleted file mode 100644 index 733a6e7..0000000 Binary files a/resources/public/img/sets/medium/HOP.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ICE.png b/resources/public/img/sets/medium/ICE.png deleted file mode 100644 index 909ce70..0000000 Binary files a/resources/public/img/sets/medium/ICE.png and /dev/null differ diff --git a/resources/public/img/sets/medium/INV.png b/resources/public/img/sets/medium/INV.png deleted file mode 100644 index 13bff94..0000000 Binary files a/resources/public/img/sets/medium/INV.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ISD.png b/resources/public/img/sets/medium/ISD.png deleted file mode 100644 index 0d57cc3..0000000 Binary files a/resources/public/img/sets/medium/ISD.png and /dev/null differ diff --git a/resources/public/img/sets/medium/JOU.png b/resources/public/img/sets/medium/JOU.png deleted file mode 100644 index 1ef75d2..0000000 Binary files a/resources/public/img/sets/medium/JOU.png and /dev/null differ diff --git a/resources/public/img/sets/medium/JUD.png b/resources/public/img/sets/medium/JUD.png deleted file mode 100644 index 555e4bd..0000000 Binary files a/resources/public/img/sets/medium/JUD.png and /dev/null differ diff --git a/resources/public/img/sets/medium/KTK.png b/resources/public/img/sets/medium/KTK.png deleted file mode 100644 index d02a246..0000000 Binary files a/resources/public/img/sets/medium/KTK.png and /dev/null differ diff --git a/resources/public/img/sets/medium/LEA.png b/resources/public/img/sets/medium/LEA.png deleted file mode 100644 index f969bf1..0000000 Binary files a/resources/public/img/sets/medium/LEA.png and /dev/null differ diff --git a/resources/public/img/sets/medium/LEB.png b/resources/public/img/sets/medium/LEB.png deleted file mode 100644 index 5d5693f..0000000 Binary files a/resources/public/img/sets/medium/LEB.png and /dev/null differ diff --git a/resources/public/img/sets/medium/LEG.png b/resources/public/img/sets/medium/LEG.png deleted file mode 100644 index a7f2915..0000000 Binary files a/resources/public/img/sets/medium/LEG.png and /dev/null differ diff --git a/resources/public/img/sets/medium/LGN.png b/resources/public/img/sets/medium/LGN.png deleted file mode 100644 index 3c8b9ff..0000000 Binary files a/resources/public/img/sets/medium/LGN.png and /dev/null differ diff --git a/resources/public/img/sets/medium/LRW.png b/resources/public/img/sets/medium/LRW.png deleted file mode 100644 index 9198069..0000000 Binary files a/resources/public/img/sets/medium/LRW.png and /dev/null differ diff --git a/resources/public/img/sets/medium/M10.png b/resources/public/img/sets/medium/M10.png deleted file mode 100644 index f3e8fde..0000000 Binary files a/resources/public/img/sets/medium/M10.png and /dev/null differ diff --git a/resources/public/img/sets/medium/M11.png b/resources/public/img/sets/medium/M11.png deleted file mode 100644 index a6bd263..0000000 Binary files a/resources/public/img/sets/medium/M11.png and /dev/null differ diff --git a/resources/public/img/sets/medium/M12.png b/resources/public/img/sets/medium/M12.png deleted file mode 100644 index 2a1a656..0000000 Binary files a/resources/public/img/sets/medium/M12.png and /dev/null differ diff --git a/resources/public/img/sets/medium/M13.png b/resources/public/img/sets/medium/M13.png deleted file mode 100644 index c0adfce..0000000 Binary files a/resources/public/img/sets/medium/M13.png and /dev/null differ diff --git a/resources/public/img/sets/medium/M14.png b/resources/public/img/sets/medium/M14.png deleted file mode 100644 index 5be5fce..0000000 Binary files a/resources/public/img/sets/medium/M14.png and /dev/null differ diff --git a/resources/public/img/sets/medium/M15.png b/resources/public/img/sets/medium/M15.png deleted file mode 100644 index 0edae8c..0000000 Binary files a/resources/public/img/sets/medium/M15.png and /dev/null differ diff --git a/resources/public/img/sets/medium/MBS.png b/resources/public/img/sets/medium/MBS.png deleted file mode 100644 index 4ec983d..0000000 Binary files a/resources/public/img/sets/medium/MBS.png and /dev/null differ diff --git a/resources/public/img/sets/medium/MD1.png b/resources/public/img/sets/medium/MD1.png deleted file mode 100644 index 04cca59..0000000 Binary files a/resources/public/img/sets/medium/MD1.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ME2.png b/resources/public/img/sets/medium/ME2.png deleted file mode 100644 index 2947929..0000000 Binary files a/resources/public/img/sets/medium/ME2.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ME3.png b/resources/public/img/sets/medium/ME3.png deleted file mode 100644 index acec04b..0000000 Binary files a/resources/public/img/sets/medium/ME3.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ME4.png b/resources/public/img/sets/medium/ME4.png deleted file mode 100644 index c218200..0000000 Binary files a/resources/public/img/sets/medium/ME4.png and /dev/null differ diff --git a/resources/public/img/sets/medium/MED.png b/resources/public/img/sets/medium/MED.png deleted file mode 100644 index ed46eef..0000000 Binary files a/resources/public/img/sets/medium/MED.png and /dev/null differ diff --git a/resources/public/img/sets/medium/MIR.png b/resources/public/img/sets/medium/MIR.png deleted file mode 100644 index 9998236..0000000 Binary files a/resources/public/img/sets/medium/MIR.png and /dev/null differ diff --git a/resources/public/img/sets/medium/MM2.png b/resources/public/img/sets/medium/MM2.png deleted file mode 100644 index 8282c18..0000000 Binary files a/resources/public/img/sets/medium/MM2.png and /dev/null differ diff --git a/resources/public/img/sets/medium/MMA.png b/resources/public/img/sets/medium/MMA.png deleted file mode 100644 index 7230d31..0000000 Binary files a/resources/public/img/sets/medium/MMA.png and /dev/null differ diff --git a/resources/public/img/sets/medium/MMQ.png b/resources/public/img/sets/medium/MMQ.png deleted file mode 100644 index 22da263..0000000 Binary files a/resources/public/img/sets/medium/MMQ.png and /dev/null differ diff --git a/resources/public/img/sets/medium/MOR.png b/resources/public/img/sets/medium/MOR.png deleted file mode 100644 index cce2727..0000000 Binary files a/resources/public/img/sets/medium/MOR.png and /dev/null differ diff --git a/resources/public/img/sets/medium/MRD.png b/resources/public/img/sets/medium/MRD.png deleted file mode 100644 index 91897ae..0000000 Binary files a/resources/public/img/sets/medium/MRD.png and /dev/null differ diff --git a/resources/public/img/sets/medium/NMS.png b/resources/public/img/sets/medium/NMS.png deleted file mode 100644 index 277679d..0000000 Binary files a/resources/public/img/sets/medium/NMS.png and /dev/null differ diff --git a/resources/public/img/sets/medium/NPH.png b/resources/public/img/sets/medium/NPH.png deleted file mode 100644 index af304c8..0000000 Binary files a/resources/public/img/sets/medium/NPH.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ODY.png b/resources/public/img/sets/medium/ODY.png deleted file mode 100644 index 2358fd8..0000000 Binary files a/resources/public/img/sets/medium/ODY.png and /dev/null differ diff --git a/resources/public/img/sets/medium/OGW.png b/resources/public/img/sets/medium/OGW.png deleted file mode 100644 index b83b448..0000000 Binary files a/resources/public/img/sets/medium/OGW.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ONS.png b/resources/public/img/sets/medium/ONS.png deleted file mode 100644 index 0939e7b..0000000 Binary files a/resources/public/img/sets/medium/ONS.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ORI.png b/resources/public/img/sets/medium/ORI.png deleted file mode 100644 index 67f1bec..0000000 Binary files a/resources/public/img/sets/medium/ORI.png and /dev/null differ diff --git a/resources/public/img/sets/medium/PC2.png b/resources/public/img/sets/medium/PC2.png deleted file mode 100644 index d771bbb..0000000 Binary files a/resources/public/img/sets/medium/PC2.png and /dev/null differ diff --git a/resources/public/img/sets/medium/PCY.png b/resources/public/img/sets/medium/PCY.png deleted file mode 100644 index bf89f01..0000000 Binary files a/resources/public/img/sets/medium/PCY.png and /dev/null differ diff --git a/resources/public/img/sets/medium/PD2.png b/resources/public/img/sets/medium/PD2.png deleted file mode 100644 index 69a5575..0000000 Binary files a/resources/public/img/sets/medium/PD2.png and /dev/null differ diff --git a/resources/public/img/sets/medium/PD3.png b/resources/public/img/sets/medium/PD3.png deleted file mode 100644 index feec587..0000000 Binary files a/resources/public/img/sets/medium/PD3.png and /dev/null differ diff --git a/resources/public/img/sets/medium/PLC.png b/resources/public/img/sets/medium/PLC.png deleted file mode 100644 index 84fa7f8..0000000 Binary files a/resources/public/img/sets/medium/PLC.png and /dev/null differ diff --git a/resources/public/img/sets/medium/PLS.png b/resources/public/img/sets/medium/PLS.png deleted file mode 100644 index 07462cf..0000000 Binary files a/resources/public/img/sets/medium/PLS.png and /dev/null differ diff --git a/resources/public/img/sets/medium/PO2.png b/resources/public/img/sets/medium/PO2.png deleted file mode 100644 index eef8320..0000000 Binary files a/resources/public/img/sets/medium/PO2.png and /dev/null differ diff --git a/resources/public/img/sets/medium/POR.png b/resources/public/img/sets/medium/POR.png deleted file mode 100644 index 40c482f..0000000 Binary files a/resources/public/img/sets/medium/POR.png and /dev/null differ diff --git a/resources/public/img/sets/medium/PTK.png b/resources/public/img/sets/medium/PTK.png deleted file mode 100644 index c7171d7..0000000 Binary files a/resources/public/img/sets/medium/PTK.png and /dev/null differ diff --git a/resources/public/img/sets/medium/RAV.png b/resources/public/img/sets/medium/RAV.png deleted file mode 100644 index 64223ba..0000000 Binary files a/resources/public/img/sets/medium/RAV.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ROE.png b/resources/public/img/sets/medium/ROE.png deleted file mode 100644 index 804fb4b..0000000 Binary files a/resources/public/img/sets/medium/ROE.png and /dev/null differ diff --git a/resources/public/img/sets/medium/RTR.png b/resources/public/img/sets/medium/RTR.png deleted file mode 100644 index 68f1d50..0000000 Binary files a/resources/public/img/sets/medium/RTR.png and /dev/null differ diff --git a/resources/public/img/sets/medium/S00.png b/resources/public/img/sets/medium/S00.png deleted file mode 100644 index 4a4efe3..0000000 Binary files a/resources/public/img/sets/medium/S00.png and /dev/null differ diff --git a/resources/public/img/sets/medium/S99.png b/resources/public/img/sets/medium/S99.png deleted file mode 100644 index d39e15c..0000000 Binary files a/resources/public/img/sets/medium/S99.png and /dev/null differ diff --git a/resources/public/img/sets/medium/SCG.png b/resources/public/img/sets/medium/SCG.png deleted file mode 100644 index 47b4f42..0000000 Binary files a/resources/public/img/sets/medium/SCG.png and /dev/null differ diff --git a/resources/public/img/sets/medium/SHM.png b/resources/public/img/sets/medium/SHM.png deleted file mode 100644 index 0089cf4..0000000 Binary files a/resources/public/img/sets/medium/SHM.png and /dev/null differ diff --git a/resources/public/img/sets/medium/SOK.png b/resources/public/img/sets/medium/SOK.png deleted file mode 100644 index 8ef666a..0000000 Binary files a/resources/public/img/sets/medium/SOK.png and /dev/null differ diff --git a/resources/public/img/sets/medium/SOM.png b/resources/public/img/sets/medium/SOM.png deleted file mode 100644 index da382d7..0000000 Binary files a/resources/public/img/sets/medium/SOM.png and /dev/null differ diff --git a/resources/public/img/sets/medium/STH.png b/resources/public/img/sets/medium/STH.png deleted file mode 100644 index 73b7822..0000000 Binary files a/resources/public/img/sets/medium/STH.png and /dev/null differ diff --git a/resources/public/img/sets/medium/THS.png b/resources/public/img/sets/medium/THS.png deleted file mode 100644 index 3f658d2..0000000 Binary files a/resources/public/img/sets/medium/THS.png and /dev/null differ diff --git a/resources/public/img/sets/medium/TMP.png b/resources/public/img/sets/medium/TMP.png deleted file mode 100644 index a7b03bc..0000000 Binary files a/resources/public/img/sets/medium/TMP.png and /dev/null differ diff --git a/resources/public/img/sets/medium/TOR.png b/resources/public/img/sets/medium/TOR.png deleted file mode 100644 index b1be7ad..0000000 Binary files a/resources/public/img/sets/medium/TOR.png and /dev/null differ diff --git a/resources/public/img/sets/medium/TPR.png b/resources/public/img/sets/medium/TPR.png deleted file mode 100644 index a48db97..0000000 Binary files a/resources/public/img/sets/medium/TPR.png and /dev/null differ diff --git a/resources/public/img/sets/medium/TSB.png b/resources/public/img/sets/medium/TSB.png deleted file mode 100644 index 4770ab1..0000000 Binary files a/resources/public/img/sets/medium/TSB.png and /dev/null differ diff --git a/resources/public/img/sets/medium/TSP.png b/resources/public/img/sets/medium/TSP.png deleted file mode 100644 index 4b6a564..0000000 Binary files a/resources/public/img/sets/medium/TSP.png and /dev/null differ diff --git a/resources/public/img/sets/medium/UDS.png b/resources/public/img/sets/medium/UDS.png deleted file mode 100644 index 4e0eec7..0000000 Binary files a/resources/public/img/sets/medium/UDS.png and /dev/null differ diff --git a/resources/public/img/sets/medium/UGL.png b/resources/public/img/sets/medium/UGL.png deleted file mode 100644 index c09d0ea..0000000 Binary files a/resources/public/img/sets/medium/UGL.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ULG.png b/resources/public/img/sets/medium/ULG.png deleted file mode 100644 index 9741e8b..0000000 Binary files a/resources/public/img/sets/medium/ULG.png and /dev/null differ diff --git a/resources/public/img/sets/medium/UNH.png b/resources/public/img/sets/medium/UNH.png deleted file mode 100644 index 3482123..0000000 Binary files a/resources/public/img/sets/medium/UNH.png and /dev/null differ diff --git a/resources/public/img/sets/medium/USG.png b/resources/public/img/sets/medium/USG.png deleted file mode 100644 index 9599d72..0000000 Binary files a/resources/public/img/sets/medium/USG.png and /dev/null differ diff --git a/resources/public/img/sets/medium/V09.png b/resources/public/img/sets/medium/V09.png deleted file mode 100644 index dca2bf9..0000000 Binary files a/resources/public/img/sets/medium/V09.png and /dev/null differ diff --git a/resources/public/img/sets/medium/V10.png b/resources/public/img/sets/medium/V10.png deleted file mode 100644 index c39e78b..0000000 Binary files a/resources/public/img/sets/medium/V10.png and /dev/null differ diff --git a/resources/public/img/sets/medium/V11.png b/resources/public/img/sets/medium/V11.png deleted file mode 100644 index 625768c..0000000 Binary files a/resources/public/img/sets/medium/V11.png and /dev/null differ diff --git a/resources/public/img/sets/medium/V12.png b/resources/public/img/sets/medium/V12.png deleted file mode 100644 index 1394466..0000000 Binary files a/resources/public/img/sets/medium/V12.png and /dev/null differ diff --git a/resources/public/img/sets/medium/V13.png b/resources/public/img/sets/medium/V13.png deleted file mode 100644 index aec0394..0000000 Binary files a/resources/public/img/sets/medium/V13.png and /dev/null differ diff --git a/resources/public/img/sets/medium/V14.png b/resources/public/img/sets/medium/V14.png deleted file mode 100644 index fd859ed..0000000 Binary files a/resources/public/img/sets/medium/V14.png and /dev/null differ diff --git a/resources/public/img/sets/medium/V15.png b/resources/public/img/sets/medium/V15.png deleted file mode 100644 index 899e9b0..0000000 Binary files a/resources/public/img/sets/medium/V15.png and /dev/null differ diff --git a/resources/public/img/sets/medium/VAN.png b/resources/public/img/sets/medium/VAN.png deleted file mode 100644 index 3b66e6e..0000000 Binary files a/resources/public/img/sets/medium/VAN.png and /dev/null differ diff --git a/resources/public/img/sets/medium/VIS.png b/resources/public/img/sets/medium/VIS.png deleted file mode 100644 index be10f93..0000000 Binary files a/resources/public/img/sets/medium/VIS.png and /dev/null differ diff --git a/resources/public/img/sets/medium/VMA.png b/resources/public/img/sets/medium/VMA.png deleted file mode 100644 index a990ae9..0000000 Binary files a/resources/public/img/sets/medium/VMA.png and /dev/null differ diff --git a/resources/public/img/sets/medium/WTH.png b/resources/public/img/sets/medium/WTH.png deleted file mode 100644 index 1830f3c..0000000 Binary files a/resources/public/img/sets/medium/WTH.png and /dev/null differ diff --git a/resources/public/img/sets/medium/WWK.png b/resources/public/img/sets/medium/WWK.png deleted file mode 100644 index 4070d1e..0000000 Binary files a/resources/public/img/sets/medium/WWK.png and /dev/null differ diff --git a/resources/public/img/sets/medium/ZEN.png b/resources/public/img/sets/medium/ZEN.png deleted file mode 100644 index b8def4a..0000000 Binary files a/resources/public/img/sets/medium/ZEN.png and /dev/null differ diff --git a/resources/public/img/sets/small/10E.png b/resources/public/img/sets/small/10E.png deleted file mode 100644 index 71e0030..0000000 Binary files a/resources/public/img/sets/small/10E.png and /dev/null differ diff --git a/resources/public/img/sets/small/2ED.png b/resources/public/img/sets/small/2ED.png deleted file mode 100644 index 5e8fad8..0000000 Binary files a/resources/public/img/sets/small/2ED.png and /dev/null differ diff --git a/resources/public/img/sets/small/3ED.png b/resources/public/img/sets/small/3ED.png deleted file mode 100644 index 0a58616..0000000 Binary files a/resources/public/img/sets/small/3ED.png and /dev/null differ diff --git a/resources/public/img/sets/small/4ED.png b/resources/public/img/sets/small/4ED.png deleted file mode 100644 index 6bad487..0000000 Binary files a/resources/public/img/sets/small/4ED.png and /dev/null differ diff --git a/resources/public/img/sets/small/5DN.png b/resources/public/img/sets/small/5DN.png deleted file mode 100644 index a2ab939..0000000 Binary files a/resources/public/img/sets/small/5DN.png and /dev/null differ diff --git a/resources/public/img/sets/small/5ED.png b/resources/public/img/sets/small/5ED.png deleted file mode 100644 index ae663d5..0000000 Binary files a/resources/public/img/sets/small/5ED.png and /dev/null differ diff --git a/resources/public/img/sets/small/6ED.png b/resources/public/img/sets/small/6ED.png deleted file mode 100644 index dbdc74f..0000000 Binary files a/resources/public/img/sets/small/6ED.png and /dev/null differ diff --git a/resources/public/img/sets/small/7ED.png b/resources/public/img/sets/small/7ED.png deleted file mode 100644 index 69815d4..0000000 Binary files a/resources/public/img/sets/small/7ED.png and /dev/null differ diff --git a/resources/public/img/sets/small/8ED.png b/resources/public/img/sets/small/8ED.png deleted file mode 100644 index c76b3cf..0000000 Binary files a/resources/public/img/sets/small/8ED.png and /dev/null differ diff --git a/resources/public/img/sets/small/9ED.png b/resources/public/img/sets/small/9ED.png deleted file mode 100644 index 52366e3..0000000 Binary files a/resources/public/img/sets/small/9ED.png and /dev/null differ diff --git a/resources/public/img/sets/small/ALA.png b/resources/public/img/sets/small/ALA.png deleted file mode 100644 index 188f04c..0000000 Binary files a/resources/public/img/sets/small/ALA.png and /dev/null differ diff --git a/resources/public/img/sets/small/ALL.png b/resources/public/img/sets/small/ALL.png deleted file mode 100644 index f076828..0000000 Binary files a/resources/public/img/sets/small/ALL.png and /dev/null differ diff --git a/resources/public/img/sets/small/APC.png b/resources/public/img/sets/small/APC.png deleted file mode 100644 index ea286f6..0000000 Binary files a/resources/public/img/sets/small/APC.png and /dev/null differ diff --git a/resources/public/img/sets/small/ARB.png b/resources/public/img/sets/small/ARB.png deleted file mode 100644 index d4018cf..0000000 Binary files a/resources/public/img/sets/small/ARB.png and /dev/null differ diff --git a/resources/public/img/sets/small/ARC.png b/resources/public/img/sets/small/ARC.png deleted file mode 100644 index b7a0523..0000000 Binary files a/resources/public/img/sets/small/ARC.png and /dev/null differ diff --git a/resources/public/img/sets/small/ARN.png b/resources/public/img/sets/small/ARN.png deleted file mode 100644 index 4ad2bf3..0000000 Binary files a/resources/public/img/sets/small/ARN.png and /dev/null differ diff --git a/resources/public/img/sets/small/ATQ.png b/resources/public/img/sets/small/ATQ.png deleted file mode 100644 index f4332c3..0000000 Binary files a/resources/public/img/sets/small/ATQ.png and /dev/null differ diff --git a/resources/public/img/sets/small/AVR.png b/resources/public/img/sets/small/AVR.png deleted file mode 100644 index 2d66f4d..0000000 Binary files a/resources/public/img/sets/small/AVR.png and /dev/null differ diff --git a/resources/public/img/sets/small/BFZ.png b/resources/public/img/sets/small/BFZ.png deleted file mode 100644 index 38a2abc..0000000 Binary files a/resources/public/img/sets/small/BFZ.png and /dev/null differ diff --git a/resources/public/img/sets/small/BNG.png b/resources/public/img/sets/small/BNG.png deleted file mode 100644 index e439afe..0000000 Binary files a/resources/public/img/sets/small/BNG.png and /dev/null differ diff --git a/resources/public/img/sets/small/BOK.png b/resources/public/img/sets/small/BOK.png deleted file mode 100644 index a339992..0000000 Binary files a/resources/public/img/sets/small/BOK.png and /dev/null differ diff --git a/resources/public/img/sets/small/BRB.png b/resources/public/img/sets/small/BRB.png deleted file mode 100644 index aa64f7a..0000000 Binary files a/resources/public/img/sets/small/BRB.png and /dev/null differ diff --git a/resources/public/img/sets/small/BTD.png b/resources/public/img/sets/small/BTD.png deleted file mode 100644 index f710b52..0000000 Binary files a/resources/public/img/sets/small/BTD.png and /dev/null differ diff --git a/resources/public/img/sets/small/C13.png b/resources/public/img/sets/small/C13.png deleted file mode 100644 index ff9a6a5..0000000 Binary files a/resources/public/img/sets/small/C13.png and /dev/null differ diff --git a/resources/public/img/sets/small/C14.png b/resources/public/img/sets/small/C14.png deleted file mode 100644 index 10bb0cd..0000000 Binary files a/resources/public/img/sets/small/C14.png and /dev/null differ diff --git a/resources/public/img/sets/small/C15.png b/resources/public/img/sets/small/C15.png deleted file mode 100644 index ef304f1..0000000 Binary files a/resources/public/img/sets/small/C15.png and /dev/null differ diff --git a/resources/public/img/sets/small/CHK.png b/resources/public/img/sets/small/CHK.png deleted file mode 100644 index d6ea4c4..0000000 Binary files a/resources/public/img/sets/small/CHK.png and /dev/null differ diff --git a/resources/public/img/sets/small/CHR.png b/resources/public/img/sets/small/CHR.png deleted file mode 100644 index 95ba06d..0000000 Binary files a/resources/public/img/sets/small/CHR.png and /dev/null differ diff --git a/resources/public/img/sets/small/CM1.png b/resources/public/img/sets/small/CM1.png deleted file mode 100644 index 4e39c39..0000000 Binary files a/resources/public/img/sets/small/CM1.png and /dev/null differ diff --git a/resources/public/img/sets/small/CMD.png b/resources/public/img/sets/small/CMD.png deleted file mode 100644 index bde45ca..0000000 Binary files a/resources/public/img/sets/small/CMD.png and /dev/null differ diff --git a/resources/public/img/sets/small/CNS.png b/resources/public/img/sets/small/CNS.png deleted file mode 100644 index 5d305fe..0000000 Binary files a/resources/public/img/sets/small/CNS.png and /dev/null differ diff --git a/resources/public/img/sets/small/CON.png b/resources/public/img/sets/small/CON.png deleted file mode 100644 index a87d3f8..0000000 Binary files a/resources/public/img/sets/small/CON.png and /dev/null differ diff --git a/resources/public/img/sets/small/CSP.png b/resources/public/img/sets/small/CSP.png deleted file mode 100644 index ee542fc..0000000 Binary files a/resources/public/img/sets/small/CSP.png and /dev/null differ diff --git a/resources/public/img/sets/small/DD2.png b/resources/public/img/sets/small/DD2.png deleted file mode 100644 index 618b83c..0000000 Binary files a/resources/public/img/sets/small/DD2.png and /dev/null differ diff --git a/resources/public/img/sets/small/DD3_DVD.png b/resources/public/img/sets/small/DD3_DVD.png deleted file mode 100644 index 4c6f36d..0000000 Binary files a/resources/public/img/sets/small/DD3_DVD.png and /dev/null differ diff --git a/resources/public/img/sets/small/DD3_EVG.png b/resources/public/img/sets/small/DD3_EVG.png deleted file mode 100644 index 398e01f..0000000 Binary files a/resources/public/img/sets/small/DD3_EVG.png and /dev/null differ diff --git a/resources/public/img/sets/small/DD3_GVL.png b/resources/public/img/sets/small/DD3_GVL.png deleted file mode 100644 index 5d703cb..0000000 Binary files a/resources/public/img/sets/small/DD3_GVL.png and /dev/null differ diff --git a/resources/public/img/sets/small/DD3_JVC.png b/resources/public/img/sets/small/DD3_JVC.png deleted file mode 100644 index 618b83c..0000000 Binary files a/resources/public/img/sets/small/DD3_JVC.png and /dev/null differ diff --git a/resources/public/img/sets/small/DDC.png b/resources/public/img/sets/small/DDC.png deleted file mode 100644 index 4c6f36d..0000000 Binary files a/resources/public/img/sets/small/DDC.png and /dev/null differ diff --git a/resources/public/img/sets/small/DDD.png b/resources/public/img/sets/small/DDD.png deleted file mode 100644 index 5d703cb..0000000 Binary files a/resources/public/img/sets/small/DDD.png and /dev/null differ diff --git a/resources/public/img/sets/small/DDE.png b/resources/public/img/sets/small/DDE.png deleted file mode 100644 index 4af5e70..0000000 Binary files a/resources/public/img/sets/small/DDE.png and /dev/null differ diff --git a/resources/public/img/sets/small/DDF.png b/resources/public/img/sets/small/DDF.png deleted file mode 100644 index 3877e50..0000000 Binary files a/resources/public/img/sets/small/DDF.png and /dev/null differ diff --git a/resources/public/img/sets/small/DDG.png b/resources/public/img/sets/small/DDG.png deleted file mode 100644 index 19c0804..0000000 Binary files a/resources/public/img/sets/small/DDG.png and /dev/null differ diff --git a/resources/public/img/sets/small/DDH.png b/resources/public/img/sets/small/DDH.png deleted file mode 100644 index 2a51202..0000000 Binary files a/resources/public/img/sets/small/DDH.png and /dev/null differ diff --git a/resources/public/img/sets/small/DDI.png b/resources/public/img/sets/small/DDI.png deleted file mode 100644 index 84e76ac..0000000 Binary files a/resources/public/img/sets/small/DDI.png and /dev/null differ diff --git a/resources/public/img/sets/small/DDJ.png b/resources/public/img/sets/small/DDJ.png deleted file mode 100644 index b2086ba..0000000 Binary files a/resources/public/img/sets/small/DDJ.png and /dev/null differ diff --git a/resources/public/img/sets/small/DDK.png b/resources/public/img/sets/small/DDK.png deleted file mode 100644 index a3c3d68..0000000 Binary files a/resources/public/img/sets/small/DDK.png and /dev/null differ diff --git a/resources/public/img/sets/small/DDL.png b/resources/public/img/sets/small/DDL.png deleted file mode 100644 index 21df788..0000000 Binary files a/resources/public/img/sets/small/DDL.png and /dev/null differ diff --git a/resources/public/img/sets/small/DDM.png b/resources/public/img/sets/small/DDM.png deleted file mode 100644 index 6552aab..0000000 Binary files a/resources/public/img/sets/small/DDM.png and /dev/null differ diff --git a/resources/public/img/sets/small/DDN.png b/resources/public/img/sets/small/DDN.png deleted file mode 100644 index 0ea2be0..0000000 Binary files a/resources/public/img/sets/small/DDN.png and /dev/null differ diff --git a/resources/public/img/sets/small/DDO.png b/resources/public/img/sets/small/DDO.png deleted file mode 100644 index 614545a..0000000 Binary files a/resources/public/img/sets/small/DDO.png and /dev/null differ diff --git a/resources/public/img/sets/small/DDP.png b/resources/public/img/sets/small/DDP.png deleted file mode 100644 index 00eaf9b..0000000 Binary files a/resources/public/img/sets/small/DDP.png and /dev/null differ diff --git a/resources/public/img/sets/small/DGM.png b/resources/public/img/sets/small/DGM.png deleted file mode 100644 index 8be4d82..0000000 Binary files a/resources/public/img/sets/small/DGM.png and /dev/null differ diff --git a/resources/public/img/sets/small/DIS.png b/resources/public/img/sets/small/DIS.png deleted file mode 100644 index b3a76b4..0000000 Binary files a/resources/public/img/sets/small/DIS.png and /dev/null differ diff --git a/resources/public/img/sets/small/DKA.png b/resources/public/img/sets/small/DKA.png deleted file mode 100644 index 7c1da14..0000000 Binary files a/resources/public/img/sets/small/DKA.png and /dev/null differ diff --git a/resources/public/img/sets/small/DRB.png b/resources/public/img/sets/small/DRB.png deleted file mode 100644 index ffda86d..0000000 Binary files a/resources/public/img/sets/small/DRB.png and /dev/null differ diff --git a/resources/public/img/sets/small/DRK.png b/resources/public/img/sets/small/DRK.png deleted file mode 100644 index 9c944d8..0000000 Binary files a/resources/public/img/sets/small/DRK.png and /dev/null differ diff --git a/resources/public/img/sets/small/DST.png b/resources/public/img/sets/small/DST.png deleted file mode 100644 index f90d335..0000000 Binary files a/resources/public/img/sets/small/DST.png and /dev/null differ diff --git a/resources/public/img/sets/small/DTK.png b/resources/public/img/sets/small/DTK.png deleted file mode 100644 index 94bd497..0000000 Binary files a/resources/public/img/sets/small/DTK.png and /dev/null differ diff --git a/resources/public/img/sets/small/EVE.png b/resources/public/img/sets/small/EVE.png deleted file mode 100644 index 01b7a97..0000000 Binary files a/resources/public/img/sets/small/EVE.png and /dev/null differ diff --git a/resources/public/img/sets/small/EVG.png b/resources/public/img/sets/small/EVG.png deleted file mode 100644 index 398e01f..0000000 Binary files a/resources/public/img/sets/small/EVG.png and /dev/null differ diff --git a/resources/public/img/sets/small/EXO.png b/resources/public/img/sets/small/EXO.png deleted file mode 100644 index da1f208..0000000 Binary files a/resources/public/img/sets/small/EXO.png and /dev/null differ diff --git a/resources/public/img/sets/small/EXP.png b/resources/public/img/sets/small/EXP.png deleted file mode 100644 index 1320bdd..0000000 Binary files a/resources/public/img/sets/small/EXP.png and /dev/null differ diff --git a/resources/public/img/sets/small/FEM.png b/resources/public/img/sets/small/FEM.png deleted file mode 100644 index 19c7507..0000000 Binary files a/resources/public/img/sets/small/FEM.png and /dev/null differ diff --git a/resources/public/img/sets/small/FRF.png b/resources/public/img/sets/small/FRF.png deleted file mode 100644 index 61b4f86..0000000 Binary files a/resources/public/img/sets/small/FRF.png and /dev/null differ diff --git a/resources/public/img/sets/small/FRF_UGIN.png b/resources/public/img/sets/small/FRF_UGIN.png deleted file mode 100644 index b2be970..0000000 Binary files a/resources/public/img/sets/small/FRF_UGIN.png and /dev/null differ diff --git a/resources/public/img/sets/small/FUT.png b/resources/public/img/sets/small/FUT.png deleted file mode 100644 index 937f13d..0000000 Binary files a/resources/public/img/sets/small/FUT.png and /dev/null differ diff --git a/resources/public/img/sets/small/GPT.png b/resources/public/img/sets/small/GPT.png deleted file mode 100644 index 1f7e961..0000000 Binary files a/resources/public/img/sets/small/GPT.png and /dev/null differ diff --git a/resources/public/img/sets/small/GTC.png b/resources/public/img/sets/small/GTC.png deleted file mode 100644 index 474dcb0..0000000 Binary files a/resources/public/img/sets/small/GTC.png and /dev/null differ diff --git a/resources/public/img/sets/small/H09.png b/resources/public/img/sets/small/H09.png deleted file mode 100644 index 9b06ede..0000000 Binary files a/resources/public/img/sets/small/H09.png and /dev/null differ diff --git a/resources/public/img/sets/small/HML.png b/resources/public/img/sets/small/HML.png deleted file mode 100644 index 82e937f..0000000 Binary files a/resources/public/img/sets/small/HML.png and /dev/null differ diff --git a/resources/public/img/sets/small/HOP.png b/resources/public/img/sets/small/HOP.png deleted file mode 100644 index 31b9821..0000000 Binary files a/resources/public/img/sets/small/HOP.png and /dev/null differ diff --git a/resources/public/img/sets/small/ICE.png b/resources/public/img/sets/small/ICE.png deleted file mode 100644 index ade15c5..0000000 Binary files a/resources/public/img/sets/small/ICE.png and /dev/null differ diff --git a/resources/public/img/sets/small/INV.png b/resources/public/img/sets/small/INV.png deleted file mode 100644 index d5792ef..0000000 Binary files a/resources/public/img/sets/small/INV.png and /dev/null differ diff --git a/resources/public/img/sets/small/ISD.png b/resources/public/img/sets/small/ISD.png deleted file mode 100644 index c07a881..0000000 Binary files a/resources/public/img/sets/small/ISD.png and /dev/null differ diff --git a/resources/public/img/sets/small/JOU.png b/resources/public/img/sets/small/JOU.png deleted file mode 100644 index b05978c..0000000 Binary files a/resources/public/img/sets/small/JOU.png and /dev/null differ diff --git a/resources/public/img/sets/small/JUD.png b/resources/public/img/sets/small/JUD.png deleted file mode 100644 index 59622b3..0000000 Binary files a/resources/public/img/sets/small/JUD.png and /dev/null differ diff --git a/resources/public/img/sets/small/KTK.png b/resources/public/img/sets/small/KTK.png deleted file mode 100644 index ff0601c..0000000 Binary files a/resources/public/img/sets/small/KTK.png and /dev/null differ diff --git a/resources/public/img/sets/small/LEA.png b/resources/public/img/sets/small/LEA.png deleted file mode 100644 index 4171524..0000000 Binary files a/resources/public/img/sets/small/LEA.png and /dev/null differ diff --git a/resources/public/img/sets/small/LEB.png b/resources/public/img/sets/small/LEB.png deleted file mode 100644 index 6edbe26..0000000 Binary files a/resources/public/img/sets/small/LEB.png and /dev/null differ diff --git a/resources/public/img/sets/small/LEG.png b/resources/public/img/sets/small/LEG.png deleted file mode 100644 index 44c0c5f..0000000 Binary files a/resources/public/img/sets/small/LEG.png and /dev/null differ diff --git a/resources/public/img/sets/small/LGN.png b/resources/public/img/sets/small/LGN.png deleted file mode 100644 index b9b2f42..0000000 Binary files a/resources/public/img/sets/small/LGN.png and /dev/null differ diff --git a/resources/public/img/sets/small/LRW.png b/resources/public/img/sets/small/LRW.png deleted file mode 100644 index 8deceb1..0000000 Binary files a/resources/public/img/sets/small/LRW.png and /dev/null differ diff --git a/resources/public/img/sets/small/M10.png b/resources/public/img/sets/small/M10.png deleted file mode 100644 index 8603af4..0000000 Binary files a/resources/public/img/sets/small/M10.png and /dev/null differ diff --git a/resources/public/img/sets/small/M11.png b/resources/public/img/sets/small/M11.png deleted file mode 100644 index db9f1d4..0000000 Binary files a/resources/public/img/sets/small/M11.png and /dev/null differ diff --git a/resources/public/img/sets/small/M12.png b/resources/public/img/sets/small/M12.png deleted file mode 100644 index 5bf0101..0000000 Binary files a/resources/public/img/sets/small/M12.png and /dev/null differ diff --git a/resources/public/img/sets/small/M13.png b/resources/public/img/sets/small/M13.png deleted file mode 100644 index 2f86464..0000000 Binary files a/resources/public/img/sets/small/M13.png and /dev/null differ diff --git a/resources/public/img/sets/small/M14.png b/resources/public/img/sets/small/M14.png deleted file mode 100644 index 5eeef44..0000000 Binary files a/resources/public/img/sets/small/M14.png and /dev/null differ diff --git a/resources/public/img/sets/small/M15.png b/resources/public/img/sets/small/M15.png deleted file mode 100644 index b4c478a..0000000 Binary files a/resources/public/img/sets/small/M15.png and /dev/null differ diff --git a/resources/public/img/sets/small/MBS.png b/resources/public/img/sets/small/MBS.png deleted file mode 100644 index 51b179c..0000000 Binary files a/resources/public/img/sets/small/MBS.png and /dev/null differ diff --git a/resources/public/img/sets/small/MD1.png b/resources/public/img/sets/small/MD1.png deleted file mode 100644 index a897345..0000000 Binary files a/resources/public/img/sets/small/MD1.png and /dev/null differ diff --git a/resources/public/img/sets/small/ME2.png b/resources/public/img/sets/small/ME2.png deleted file mode 100644 index 2c2daa6..0000000 Binary files a/resources/public/img/sets/small/ME2.png and /dev/null differ diff --git a/resources/public/img/sets/small/ME3.png b/resources/public/img/sets/small/ME3.png deleted file mode 100644 index 3a9e780..0000000 Binary files a/resources/public/img/sets/small/ME3.png and /dev/null differ diff --git a/resources/public/img/sets/small/ME4.png b/resources/public/img/sets/small/ME4.png deleted file mode 100644 index 840d0a3..0000000 Binary files a/resources/public/img/sets/small/ME4.png and /dev/null differ diff --git a/resources/public/img/sets/small/MED.png b/resources/public/img/sets/small/MED.png deleted file mode 100644 index 2e21bc5..0000000 Binary files a/resources/public/img/sets/small/MED.png and /dev/null differ diff --git a/resources/public/img/sets/small/MIR.png b/resources/public/img/sets/small/MIR.png deleted file mode 100644 index 36fc2b3..0000000 Binary files a/resources/public/img/sets/small/MIR.png and /dev/null differ diff --git a/resources/public/img/sets/small/MM2.png b/resources/public/img/sets/small/MM2.png deleted file mode 100644 index cb2bf37..0000000 Binary files a/resources/public/img/sets/small/MM2.png and /dev/null differ diff --git a/resources/public/img/sets/small/MMA.png b/resources/public/img/sets/small/MMA.png deleted file mode 100644 index 36026aa..0000000 Binary files a/resources/public/img/sets/small/MMA.png and /dev/null differ diff --git a/resources/public/img/sets/small/MMQ.png b/resources/public/img/sets/small/MMQ.png deleted file mode 100644 index 0f0f14a..0000000 Binary files a/resources/public/img/sets/small/MMQ.png and /dev/null differ diff --git a/resources/public/img/sets/small/MOR.png b/resources/public/img/sets/small/MOR.png deleted file mode 100644 index 42fb6cb..0000000 Binary files a/resources/public/img/sets/small/MOR.png and /dev/null differ diff --git a/resources/public/img/sets/small/MRD.png b/resources/public/img/sets/small/MRD.png deleted file mode 100644 index 45ff113..0000000 Binary files a/resources/public/img/sets/small/MRD.png and /dev/null differ diff --git a/resources/public/img/sets/small/NMS.png b/resources/public/img/sets/small/NMS.png deleted file mode 100644 index a7b7794..0000000 Binary files a/resources/public/img/sets/small/NMS.png and /dev/null differ diff --git a/resources/public/img/sets/small/NPH.png b/resources/public/img/sets/small/NPH.png deleted file mode 100644 index 51a7afe..0000000 Binary files a/resources/public/img/sets/small/NPH.png and /dev/null differ diff --git a/resources/public/img/sets/small/ODY.png b/resources/public/img/sets/small/ODY.png deleted file mode 100644 index b8c862f..0000000 Binary files a/resources/public/img/sets/small/ODY.png and /dev/null differ diff --git a/resources/public/img/sets/small/OGW.png b/resources/public/img/sets/small/OGW.png deleted file mode 100644 index 1a07fdc..0000000 Binary files a/resources/public/img/sets/small/OGW.png and /dev/null differ diff --git a/resources/public/img/sets/small/ONS.png b/resources/public/img/sets/small/ONS.png deleted file mode 100644 index c2bc899..0000000 Binary files a/resources/public/img/sets/small/ONS.png and /dev/null differ diff --git a/resources/public/img/sets/small/ORI.png b/resources/public/img/sets/small/ORI.png deleted file mode 100644 index 75431fa..0000000 Binary files a/resources/public/img/sets/small/ORI.png and /dev/null differ diff --git a/resources/public/img/sets/small/PC2.png b/resources/public/img/sets/small/PC2.png deleted file mode 100644 index 7ece431..0000000 Binary files a/resources/public/img/sets/small/PC2.png and /dev/null differ diff --git a/resources/public/img/sets/small/PCY.png b/resources/public/img/sets/small/PCY.png deleted file mode 100644 index 02f5fcf..0000000 Binary files a/resources/public/img/sets/small/PCY.png and /dev/null differ diff --git a/resources/public/img/sets/small/PD2.png b/resources/public/img/sets/small/PD2.png deleted file mode 100644 index b6b1ee4..0000000 Binary files a/resources/public/img/sets/small/PD2.png and /dev/null differ diff --git a/resources/public/img/sets/small/PD3.png b/resources/public/img/sets/small/PD3.png deleted file mode 100644 index dc1424c..0000000 Binary files a/resources/public/img/sets/small/PD3.png and /dev/null differ diff --git a/resources/public/img/sets/small/PLC.png b/resources/public/img/sets/small/PLC.png deleted file mode 100644 index 761d4c9..0000000 Binary files a/resources/public/img/sets/small/PLC.png and /dev/null differ diff --git a/resources/public/img/sets/small/PLS.png b/resources/public/img/sets/small/PLS.png deleted file mode 100644 index bb02f6b..0000000 Binary files a/resources/public/img/sets/small/PLS.png and /dev/null differ diff --git a/resources/public/img/sets/small/PO2.png b/resources/public/img/sets/small/PO2.png deleted file mode 100644 index e87eeac..0000000 Binary files a/resources/public/img/sets/small/PO2.png and /dev/null differ diff --git a/resources/public/img/sets/small/POR.png b/resources/public/img/sets/small/POR.png deleted file mode 100644 index e1fd008..0000000 Binary files a/resources/public/img/sets/small/POR.png and /dev/null differ diff --git a/resources/public/img/sets/small/PTK.png b/resources/public/img/sets/small/PTK.png deleted file mode 100644 index 9078cf5..0000000 Binary files a/resources/public/img/sets/small/PTK.png and /dev/null differ diff --git a/resources/public/img/sets/small/RAV.png b/resources/public/img/sets/small/RAV.png deleted file mode 100644 index 22fb6a5..0000000 Binary files a/resources/public/img/sets/small/RAV.png and /dev/null differ diff --git a/resources/public/img/sets/small/ROE.png b/resources/public/img/sets/small/ROE.png deleted file mode 100644 index 218dfb5..0000000 Binary files a/resources/public/img/sets/small/ROE.png and /dev/null differ diff --git a/resources/public/img/sets/small/RTR.png b/resources/public/img/sets/small/RTR.png deleted file mode 100644 index 0f0cff0..0000000 Binary files a/resources/public/img/sets/small/RTR.png and /dev/null differ diff --git a/resources/public/img/sets/small/S00.png b/resources/public/img/sets/small/S00.png deleted file mode 100644 index 707839e..0000000 Binary files a/resources/public/img/sets/small/S00.png and /dev/null differ diff --git a/resources/public/img/sets/small/S99.png b/resources/public/img/sets/small/S99.png deleted file mode 100644 index 8aba340..0000000 Binary files a/resources/public/img/sets/small/S99.png and /dev/null differ diff --git a/resources/public/img/sets/small/SCG.png b/resources/public/img/sets/small/SCG.png deleted file mode 100644 index 217578c..0000000 Binary files a/resources/public/img/sets/small/SCG.png and /dev/null differ diff --git a/resources/public/img/sets/small/SHM.png b/resources/public/img/sets/small/SHM.png deleted file mode 100644 index 3cf3f52..0000000 Binary files a/resources/public/img/sets/small/SHM.png and /dev/null differ diff --git a/resources/public/img/sets/small/SOK.png b/resources/public/img/sets/small/SOK.png deleted file mode 100644 index 87ff28f..0000000 Binary files a/resources/public/img/sets/small/SOK.png and /dev/null differ diff --git a/resources/public/img/sets/small/SOM.png b/resources/public/img/sets/small/SOM.png deleted file mode 100644 index 8eede64..0000000 Binary files a/resources/public/img/sets/small/SOM.png and /dev/null differ diff --git a/resources/public/img/sets/small/STH.png b/resources/public/img/sets/small/STH.png deleted file mode 100644 index a3e69f6..0000000 Binary files a/resources/public/img/sets/small/STH.png and /dev/null differ diff --git a/resources/public/img/sets/small/THS.png b/resources/public/img/sets/small/THS.png deleted file mode 100644 index 800c307..0000000 Binary files a/resources/public/img/sets/small/THS.png and /dev/null differ diff --git a/resources/public/img/sets/small/TMP.png b/resources/public/img/sets/small/TMP.png deleted file mode 100644 index e24e7f9..0000000 Binary files a/resources/public/img/sets/small/TMP.png and /dev/null differ diff --git a/resources/public/img/sets/small/TOR.png b/resources/public/img/sets/small/TOR.png deleted file mode 100644 index 3b65814..0000000 Binary files a/resources/public/img/sets/small/TOR.png and /dev/null differ diff --git a/resources/public/img/sets/small/TPR.png b/resources/public/img/sets/small/TPR.png deleted file mode 100644 index ee0b13b..0000000 Binary files a/resources/public/img/sets/small/TPR.png and /dev/null differ diff --git a/resources/public/img/sets/small/TSB.png b/resources/public/img/sets/small/TSB.png deleted file mode 100644 index 6b50242..0000000 Binary files a/resources/public/img/sets/small/TSB.png and /dev/null differ diff --git a/resources/public/img/sets/small/TSP.png b/resources/public/img/sets/small/TSP.png deleted file mode 100644 index 0cfcb0a..0000000 Binary files a/resources/public/img/sets/small/TSP.png and /dev/null differ diff --git a/resources/public/img/sets/small/UDS.png b/resources/public/img/sets/small/UDS.png deleted file mode 100644 index 9158671..0000000 Binary files a/resources/public/img/sets/small/UDS.png and /dev/null differ diff --git a/resources/public/img/sets/small/UGL.png b/resources/public/img/sets/small/UGL.png deleted file mode 100644 index 4881fa2..0000000 Binary files a/resources/public/img/sets/small/UGL.png and /dev/null differ diff --git a/resources/public/img/sets/small/ULG.png b/resources/public/img/sets/small/ULG.png deleted file mode 100644 index 5981007..0000000 Binary files a/resources/public/img/sets/small/ULG.png and /dev/null differ diff --git a/resources/public/img/sets/small/UNH.png b/resources/public/img/sets/small/UNH.png deleted file mode 100644 index f9761a1..0000000 Binary files a/resources/public/img/sets/small/UNH.png and /dev/null differ diff --git a/resources/public/img/sets/small/USG.png b/resources/public/img/sets/small/USG.png deleted file mode 100644 index 9c072ae..0000000 Binary files a/resources/public/img/sets/small/USG.png and /dev/null differ diff --git a/resources/public/img/sets/small/V09.png b/resources/public/img/sets/small/V09.png deleted file mode 100644 index aeb41b4..0000000 Binary files a/resources/public/img/sets/small/V09.png and /dev/null differ diff --git a/resources/public/img/sets/small/V10.png b/resources/public/img/sets/small/V10.png deleted file mode 100644 index 8b5e661..0000000 Binary files a/resources/public/img/sets/small/V10.png and /dev/null differ diff --git a/resources/public/img/sets/small/V11.png b/resources/public/img/sets/small/V11.png deleted file mode 100644 index 1f4b7da..0000000 Binary files a/resources/public/img/sets/small/V11.png and /dev/null differ diff --git a/resources/public/img/sets/small/V12.png b/resources/public/img/sets/small/V12.png deleted file mode 100644 index 64e6f56..0000000 Binary files a/resources/public/img/sets/small/V12.png and /dev/null differ diff --git a/resources/public/img/sets/small/V13.png b/resources/public/img/sets/small/V13.png deleted file mode 100644 index 6726321..0000000 Binary files a/resources/public/img/sets/small/V13.png and /dev/null differ diff --git a/resources/public/img/sets/small/V14.png b/resources/public/img/sets/small/V14.png deleted file mode 100644 index 511609c..0000000 Binary files a/resources/public/img/sets/small/V14.png and /dev/null differ diff --git a/resources/public/img/sets/small/V15.png b/resources/public/img/sets/small/V15.png deleted file mode 100644 index 02470ea..0000000 Binary files a/resources/public/img/sets/small/V15.png and /dev/null differ diff --git a/resources/public/img/sets/small/VAN.png b/resources/public/img/sets/small/VAN.png deleted file mode 100644 index b2be970..0000000 Binary files a/resources/public/img/sets/small/VAN.png and /dev/null differ diff --git a/resources/public/img/sets/small/VIS.png b/resources/public/img/sets/small/VIS.png deleted file mode 100644 index 6380cb8..0000000 Binary files a/resources/public/img/sets/small/VIS.png and /dev/null differ diff --git a/resources/public/img/sets/small/VMA.png b/resources/public/img/sets/small/VMA.png deleted file mode 100644 index 8a5fe54..0000000 Binary files a/resources/public/img/sets/small/VMA.png and /dev/null differ diff --git a/resources/public/img/sets/small/WTH.png b/resources/public/img/sets/small/WTH.png deleted file mode 100644 index e31d0c7..0000000 Binary files a/resources/public/img/sets/small/WTH.png and /dev/null differ diff --git a/resources/public/img/sets/small/WWK.png b/resources/public/img/sets/small/WWK.png deleted file mode 100644 index d8aea92..0000000 Binary files a/resources/public/img/sets/small/WWK.png and /dev/null differ diff --git a/resources/public/img/sets/small/ZEN.png b/resources/public/img/sets/small/ZEN.png deleted file mode 100644 index 2392adc..0000000 Binary files a/resources/public/img/sets/small/ZEN.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/0.png b/resources/public/img/symbols/medium/0.png deleted file mode 100644 index 8db51da..0000000 Binary files a/resources/public/img/symbols/medium/0.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/1.png b/resources/public/img/symbols/medium/1.png deleted file mode 100644 index 8d11438..0000000 Binary files a/resources/public/img/symbols/medium/1.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/10.png b/resources/public/img/symbols/medium/10.png deleted file mode 100644 index 119ef57..0000000 Binary files a/resources/public/img/symbols/medium/10.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/100.png b/resources/public/img/symbols/medium/100.png deleted file mode 100644 index 5f98305..0000000 Binary files a/resources/public/img/symbols/medium/100.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/1000000.png b/resources/public/img/symbols/medium/1000000.png deleted file mode 100644 index aeb9a17..0000000 Binary files a/resources/public/img/symbols/medium/1000000.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/11.png b/resources/public/img/symbols/medium/11.png deleted file mode 100644 index 63c5b6a..0000000 Binary files a/resources/public/img/symbols/medium/11.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/12.png b/resources/public/img/symbols/medium/12.png deleted file mode 100644 index bf39bbf..0000000 Binary files a/resources/public/img/symbols/medium/12.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/13.png b/resources/public/img/symbols/medium/13.png deleted file mode 100644 index fb4f01e..0000000 Binary files a/resources/public/img/symbols/medium/13.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/14.png b/resources/public/img/symbols/medium/14.png deleted file mode 100644 index 0a373bf..0000000 Binary files a/resources/public/img/symbols/medium/14.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/15.png b/resources/public/img/symbols/medium/15.png deleted file mode 100644 index 48e1fb6..0000000 Binary files a/resources/public/img/symbols/medium/15.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/16.png b/resources/public/img/symbols/medium/16.png deleted file mode 100644 index e76d5bc..0000000 Binary files a/resources/public/img/symbols/medium/16.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/2.png b/resources/public/img/symbols/medium/2.png deleted file mode 100644 index fe6410d..0000000 Binary files a/resources/public/img/symbols/medium/2.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/2B.png b/resources/public/img/symbols/medium/2B.png deleted file mode 100644 index 1a2e303..0000000 Binary files a/resources/public/img/symbols/medium/2B.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/2G.png b/resources/public/img/symbols/medium/2G.png deleted file mode 100644 index 9c7ce34..0000000 Binary files a/resources/public/img/symbols/medium/2G.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/2R.png b/resources/public/img/symbols/medium/2R.png deleted file mode 100644 index 29f1899..0000000 Binary files a/resources/public/img/symbols/medium/2R.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/2U.png b/resources/public/img/symbols/medium/2U.png deleted file mode 100644 index 07ae67a..0000000 Binary files a/resources/public/img/symbols/medium/2U.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/2W.png b/resources/public/img/symbols/medium/2W.png deleted file mode 100644 index e8733f1..0000000 Binary files a/resources/public/img/symbols/medium/2W.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/3.png b/resources/public/img/symbols/medium/3.png deleted file mode 100644 index 1c256cd..0000000 Binary files a/resources/public/img/symbols/medium/3.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/4.png b/resources/public/img/symbols/medium/4.png deleted file mode 100644 index f21d048..0000000 Binary files a/resources/public/img/symbols/medium/4.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/5.png b/resources/public/img/symbols/medium/5.png deleted file mode 100644 index ce6840e..0000000 Binary files a/resources/public/img/symbols/medium/5.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/6.png b/resources/public/img/symbols/medium/6.png deleted file mode 100644 index f27311c..0000000 Binary files a/resources/public/img/symbols/medium/6.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/7.png b/resources/public/img/symbols/medium/7.png deleted file mode 100644 index 5094d17..0000000 Binary files a/resources/public/img/symbols/medium/7.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/8.png b/resources/public/img/symbols/medium/8.png deleted file mode 100644 index 5f3ff8b..0000000 Binary files a/resources/public/img/symbols/medium/8.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/9.png b/resources/public/img/symbols/medium/9.png deleted file mode 100644 index dcb2110..0000000 Binary files a/resources/public/img/symbols/medium/9.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/B.png b/resources/public/img/symbols/medium/B.png deleted file mode 100644 index 08b187c..0000000 Binary files a/resources/public/img/symbols/medium/B.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/BG.png b/resources/public/img/symbols/medium/BG.png deleted file mode 100644 index a72a338..0000000 Binary files a/resources/public/img/symbols/medium/BG.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/BP.png b/resources/public/img/symbols/medium/BP.png deleted file mode 100644 index c3b56ed..0000000 Binary files a/resources/public/img/symbols/medium/BP.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/BR.png b/resources/public/img/symbols/medium/BR.png deleted file mode 100644 index 81d4659..0000000 Binary files a/resources/public/img/symbols/medium/BR.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/C.png b/resources/public/img/symbols/medium/C.png deleted file mode 100644 index 1a868ee..0000000 Binary files a/resources/public/img/symbols/medium/C.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/G.png b/resources/public/img/symbols/medium/G.png deleted file mode 100644 index da95aa4..0000000 Binary files a/resources/public/img/symbols/medium/G.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/GP.png b/resources/public/img/symbols/medium/GP.png deleted file mode 100644 index 457db65..0000000 Binary files a/resources/public/img/symbols/medium/GP.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/GU.png b/resources/public/img/symbols/medium/GU.png deleted file mode 100644 index f82f1a4..0000000 Binary files a/resources/public/img/symbols/medium/GU.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/GW.png b/resources/public/img/symbols/medium/GW.png deleted file mode 100644 index 2cb1bb3..0000000 Binary files a/resources/public/img/symbols/medium/GW.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/HR.png b/resources/public/img/symbols/medium/HR.png deleted file mode 100644 index 3831f22..0000000 Binary files a/resources/public/img/symbols/medium/HR.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/INFINITY.png b/resources/public/img/symbols/medium/INFINITY.png deleted file mode 100644 index 8f506ca..0000000 Binary files a/resources/public/img/symbols/medium/INFINITY.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/P.png b/resources/public/img/symbols/medium/P.png deleted file mode 100644 index 31644f9..0000000 Binary files a/resources/public/img/symbols/medium/P.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/Q.png b/resources/public/img/symbols/medium/Q.png deleted file mode 100644 index 81089d7..0000000 Binary files a/resources/public/img/symbols/medium/Q.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/R.png b/resources/public/img/symbols/medium/R.png deleted file mode 100644 index 66edcdb..0000000 Binary files a/resources/public/img/symbols/medium/R.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/RG.png b/resources/public/img/symbols/medium/RG.png deleted file mode 100644 index cb2f898..0000000 Binary files a/resources/public/img/symbols/medium/RG.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/RP.png b/resources/public/img/symbols/medium/RP.png deleted file mode 100644 index aaed512..0000000 Binary files a/resources/public/img/symbols/medium/RP.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/RW.png b/resources/public/img/symbols/medium/RW.png deleted file mode 100644 index e11c57b..0000000 Binary files a/resources/public/img/symbols/medium/RW.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/S.png b/resources/public/img/symbols/medium/S.png deleted file mode 100644 index db0b15c..0000000 Binary files a/resources/public/img/symbols/medium/S.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/T.png b/resources/public/img/symbols/medium/T.png deleted file mode 100644 index ce4124f..0000000 Binary files a/resources/public/img/symbols/medium/T.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/U.png b/resources/public/img/symbols/medium/U.png deleted file mode 100644 index 0bb7851..0000000 Binary files a/resources/public/img/symbols/medium/U.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/UB.png b/resources/public/img/symbols/medium/UB.png deleted file mode 100644 index fb8904d..0000000 Binary files a/resources/public/img/symbols/medium/UB.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/UP.png b/resources/public/img/symbols/medium/UP.png deleted file mode 100644 index 0c48596..0000000 Binary files a/resources/public/img/symbols/medium/UP.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/UR.png b/resources/public/img/symbols/medium/UR.png deleted file mode 100644 index d1333e4..0000000 Binary files a/resources/public/img/symbols/medium/UR.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/W.png b/resources/public/img/symbols/medium/W.png deleted file mode 100644 index 2e03d60..0000000 Binary files a/resources/public/img/symbols/medium/W.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/WB.png b/resources/public/img/symbols/medium/WB.png deleted file mode 100644 index a1a8281..0000000 Binary files a/resources/public/img/symbols/medium/WB.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/WP.png b/resources/public/img/symbols/medium/WP.png deleted file mode 100644 index c280314..0000000 Binary files a/resources/public/img/symbols/medium/WP.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/WU.png b/resources/public/img/symbols/medium/WU.png deleted file mode 100644 index cfc7af2..0000000 Binary files a/resources/public/img/symbols/medium/WU.png and /dev/null differ diff --git a/resources/public/img/symbols/medium/X.png b/resources/public/img/symbols/medium/X.png deleted file mode 100644 index 8dca09d..0000000 Binary files a/resources/public/img/symbols/medium/X.png and /dev/null differ diff --git a/resources/public/img/symbols/small/0.png b/resources/public/img/symbols/small/0.png deleted file mode 100644 index 3a3edce..0000000 Binary files a/resources/public/img/symbols/small/0.png and /dev/null differ diff --git a/resources/public/img/symbols/small/1.png b/resources/public/img/symbols/small/1.png deleted file mode 100644 index 4e68b4f..0000000 Binary files a/resources/public/img/symbols/small/1.png and /dev/null differ diff --git a/resources/public/img/symbols/small/10.png b/resources/public/img/symbols/small/10.png deleted file mode 100644 index 73f1947..0000000 Binary files a/resources/public/img/symbols/small/10.png and /dev/null differ diff --git a/resources/public/img/symbols/small/100.png b/resources/public/img/symbols/small/100.png deleted file mode 100644 index 688fa99..0000000 Binary files a/resources/public/img/symbols/small/100.png and /dev/null differ diff --git a/resources/public/img/symbols/small/1000000.png b/resources/public/img/symbols/small/1000000.png deleted file mode 100644 index c553511..0000000 Binary files a/resources/public/img/symbols/small/1000000.png and /dev/null differ diff --git a/resources/public/img/symbols/small/11.png b/resources/public/img/symbols/small/11.png deleted file mode 100644 index 7ffe568..0000000 Binary files a/resources/public/img/symbols/small/11.png and /dev/null differ diff --git a/resources/public/img/symbols/small/12.png b/resources/public/img/symbols/small/12.png deleted file mode 100644 index 6e8ded0..0000000 Binary files a/resources/public/img/symbols/small/12.png and /dev/null differ diff --git a/resources/public/img/symbols/small/13.png b/resources/public/img/symbols/small/13.png deleted file mode 100644 index a88a275..0000000 Binary files a/resources/public/img/symbols/small/13.png and /dev/null differ diff --git a/resources/public/img/symbols/small/14.png b/resources/public/img/symbols/small/14.png deleted file mode 100644 index 185812e..0000000 Binary files a/resources/public/img/symbols/small/14.png and /dev/null differ diff --git a/resources/public/img/symbols/small/15.png b/resources/public/img/symbols/small/15.png deleted file mode 100644 index 8427014..0000000 Binary files a/resources/public/img/symbols/small/15.png and /dev/null differ diff --git a/resources/public/img/symbols/small/16.png b/resources/public/img/symbols/small/16.png deleted file mode 100644 index 657f0dd..0000000 Binary files a/resources/public/img/symbols/small/16.png and /dev/null differ diff --git a/resources/public/img/symbols/small/2.png b/resources/public/img/symbols/small/2.png deleted file mode 100644 index ff71783..0000000 Binary files a/resources/public/img/symbols/small/2.png and /dev/null differ diff --git a/resources/public/img/symbols/small/2B.png b/resources/public/img/symbols/small/2B.png deleted file mode 100644 index 7990f9c..0000000 Binary files a/resources/public/img/symbols/small/2B.png and /dev/null differ diff --git a/resources/public/img/symbols/small/2G.png b/resources/public/img/symbols/small/2G.png deleted file mode 100644 index 2ae74dc..0000000 Binary files a/resources/public/img/symbols/small/2G.png and /dev/null differ diff --git a/resources/public/img/symbols/small/2R.png b/resources/public/img/symbols/small/2R.png deleted file mode 100644 index 9268086..0000000 Binary files a/resources/public/img/symbols/small/2R.png and /dev/null differ diff --git a/resources/public/img/symbols/small/2U.png b/resources/public/img/symbols/small/2U.png deleted file mode 100644 index bd9da55..0000000 Binary files a/resources/public/img/symbols/small/2U.png and /dev/null differ diff --git a/resources/public/img/symbols/small/2W.png b/resources/public/img/symbols/small/2W.png deleted file mode 100644 index 8c1aa73..0000000 Binary files a/resources/public/img/symbols/small/2W.png and /dev/null differ diff --git a/resources/public/img/symbols/small/3.png b/resources/public/img/symbols/small/3.png deleted file mode 100644 index 64ddeb1..0000000 Binary files a/resources/public/img/symbols/small/3.png and /dev/null differ diff --git a/resources/public/img/symbols/small/4.png b/resources/public/img/symbols/small/4.png deleted file mode 100644 index 825d1dc..0000000 Binary files a/resources/public/img/symbols/small/4.png and /dev/null differ diff --git a/resources/public/img/symbols/small/5.png b/resources/public/img/symbols/small/5.png deleted file mode 100644 index 7ceb46e..0000000 Binary files a/resources/public/img/symbols/small/5.png and /dev/null differ diff --git a/resources/public/img/symbols/small/6.png b/resources/public/img/symbols/small/6.png deleted file mode 100644 index 52c8374..0000000 Binary files a/resources/public/img/symbols/small/6.png and /dev/null differ diff --git a/resources/public/img/symbols/small/7.png b/resources/public/img/symbols/small/7.png deleted file mode 100644 index 85442b2..0000000 Binary files a/resources/public/img/symbols/small/7.png and /dev/null differ diff --git a/resources/public/img/symbols/small/8.png b/resources/public/img/symbols/small/8.png deleted file mode 100644 index 9093612..0000000 Binary files a/resources/public/img/symbols/small/8.png and /dev/null differ diff --git a/resources/public/img/symbols/small/9.png b/resources/public/img/symbols/small/9.png deleted file mode 100644 index 23b062c..0000000 Binary files a/resources/public/img/symbols/small/9.png and /dev/null differ diff --git a/resources/public/img/symbols/small/B.png b/resources/public/img/symbols/small/B.png deleted file mode 100644 index 7831e30..0000000 Binary files a/resources/public/img/symbols/small/B.png and /dev/null differ diff --git a/resources/public/img/symbols/small/BG.png b/resources/public/img/symbols/small/BG.png deleted file mode 100644 index 4c12e14..0000000 Binary files a/resources/public/img/symbols/small/BG.png and /dev/null differ diff --git a/resources/public/img/symbols/small/BP.png b/resources/public/img/symbols/small/BP.png deleted file mode 100644 index 654c2e5..0000000 Binary files a/resources/public/img/symbols/small/BP.png and /dev/null differ diff --git a/resources/public/img/symbols/small/BR.png b/resources/public/img/symbols/small/BR.png deleted file mode 100644 index aeafe02..0000000 Binary files a/resources/public/img/symbols/small/BR.png and /dev/null differ diff --git a/resources/public/img/symbols/small/C.png b/resources/public/img/symbols/small/C.png deleted file mode 100644 index fbfb448..0000000 Binary files a/resources/public/img/symbols/small/C.png and /dev/null differ diff --git a/resources/public/img/symbols/small/G.png b/resources/public/img/symbols/small/G.png deleted file mode 100644 index 408e226..0000000 Binary files a/resources/public/img/symbols/small/G.png and /dev/null differ diff --git a/resources/public/img/symbols/small/GP.png b/resources/public/img/symbols/small/GP.png deleted file mode 100644 index f6f8c5f..0000000 Binary files a/resources/public/img/symbols/small/GP.png and /dev/null differ diff --git a/resources/public/img/symbols/small/GU.png b/resources/public/img/symbols/small/GU.png deleted file mode 100644 index ddd4e06..0000000 Binary files a/resources/public/img/symbols/small/GU.png and /dev/null differ diff --git a/resources/public/img/symbols/small/GW.png b/resources/public/img/symbols/small/GW.png deleted file mode 100644 index c6e3dbb..0000000 Binary files a/resources/public/img/symbols/small/GW.png and /dev/null differ diff --git a/resources/public/img/symbols/small/HR.png b/resources/public/img/symbols/small/HR.png deleted file mode 100644 index 4bcb6b9..0000000 Binary files a/resources/public/img/symbols/small/HR.png and /dev/null differ diff --git a/resources/public/img/symbols/small/INFINITY.png b/resources/public/img/symbols/small/INFINITY.png deleted file mode 100644 index ba5061e..0000000 Binary files a/resources/public/img/symbols/small/INFINITY.png and /dev/null differ diff --git a/resources/public/img/symbols/small/P.png b/resources/public/img/symbols/small/P.png deleted file mode 100644 index 8339a47..0000000 Binary files a/resources/public/img/symbols/small/P.png and /dev/null differ diff --git a/resources/public/img/symbols/small/Q.png b/resources/public/img/symbols/small/Q.png deleted file mode 100644 index ef786c7..0000000 Binary files a/resources/public/img/symbols/small/Q.png and /dev/null differ diff --git a/resources/public/img/symbols/small/R.png b/resources/public/img/symbols/small/R.png deleted file mode 100644 index 0b37e1d..0000000 Binary files a/resources/public/img/symbols/small/R.png and /dev/null differ diff --git a/resources/public/img/symbols/small/RG.png b/resources/public/img/symbols/small/RG.png deleted file mode 100644 index 8fb117b..0000000 Binary files a/resources/public/img/symbols/small/RG.png and /dev/null differ diff --git a/resources/public/img/symbols/small/RP.png b/resources/public/img/symbols/small/RP.png deleted file mode 100644 index dd2ef85..0000000 Binary files a/resources/public/img/symbols/small/RP.png and /dev/null differ diff --git a/resources/public/img/symbols/small/RW.png b/resources/public/img/symbols/small/RW.png deleted file mode 100644 index bd1730f..0000000 Binary files a/resources/public/img/symbols/small/RW.png and /dev/null differ diff --git a/resources/public/img/symbols/small/S.png b/resources/public/img/symbols/small/S.png deleted file mode 100644 index 1832d62..0000000 Binary files a/resources/public/img/symbols/small/S.png and /dev/null differ diff --git a/resources/public/img/symbols/small/T.png b/resources/public/img/symbols/small/T.png deleted file mode 100644 index f98f166..0000000 Binary files a/resources/public/img/symbols/small/T.png and /dev/null differ diff --git a/resources/public/img/symbols/small/U.png b/resources/public/img/symbols/small/U.png deleted file mode 100644 index 5834722..0000000 Binary files a/resources/public/img/symbols/small/U.png and /dev/null differ diff --git a/resources/public/img/symbols/small/UB.png b/resources/public/img/symbols/small/UB.png deleted file mode 100644 index 74a143a..0000000 Binary files a/resources/public/img/symbols/small/UB.png and /dev/null differ diff --git a/resources/public/img/symbols/small/UP.png b/resources/public/img/symbols/small/UP.png deleted file mode 100644 index 35160ce..0000000 Binary files a/resources/public/img/symbols/small/UP.png and /dev/null differ diff --git a/resources/public/img/symbols/small/UR.png b/resources/public/img/symbols/small/UR.png deleted file mode 100644 index 14f489d..0000000 Binary files a/resources/public/img/symbols/small/UR.png and /dev/null differ diff --git a/resources/public/img/symbols/small/W.png b/resources/public/img/symbols/small/W.png deleted file mode 100644 index 9bfa9aa..0000000 Binary files a/resources/public/img/symbols/small/W.png and /dev/null differ diff --git a/resources/public/img/symbols/small/WB.png b/resources/public/img/symbols/small/WB.png deleted file mode 100644 index 496aa7c..0000000 Binary files a/resources/public/img/symbols/small/WB.png and /dev/null differ diff --git a/resources/public/img/symbols/small/WP.png b/resources/public/img/symbols/small/WP.png deleted file mode 100644 index d89fbfe..0000000 Binary files a/resources/public/img/symbols/small/WP.png and /dev/null differ diff --git a/resources/public/img/symbols/small/WU.png b/resources/public/img/symbols/small/WU.png deleted file mode 100644 index c6e9e3e..0000000 Binary files a/resources/public/img/symbols/small/WU.png and /dev/null differ diff --git a/resources/public/img/symbols/small/X.png b/resources/public/img/symbols/small/X.png deleted file mode 100644 index 7d9fb64..0000000 Binary files a/resources/public/img/symbols/small/X.png and /dev/null differ diff --git a/src/mtgcoll/cli.clj b/src/mtgcoll/cli.clj new file mode 100644 index 0000000..3b5a3c5 --- /dev/null +++ b/src/mtgcoll/cli.clj @@ -0,0 +1,60 @@ +(ns mtgcoll.cli + (:require + [clojure.string :as string] + [clojure.tools.cli :as cli])) + +(def ^:private cli-options + [["-c" "--config EDN-CONFIG-FILE" + "EDN configuration file to use. If ommitted, assumes one is located in the current working directory." + "-h" "--help"]]) + +(def ^:private actions + [["web" "(default) Runs the web application"] + ["setup-db" "Initializes database"] + ["load-json" "Loads mtgjson card/set data from specified json file"] + ["scrape-prices" "Runs all price scrapers, updating card pricing"] + ["scrape-set-images" "Downloads set images from gatherer"]]) + +(defn- ->actions-summary + [] + (->> actions + (map (fn [[action desc]] (str " " action "\t\t" desc))) + (string/join \newline))) + +(defn- ->usage-string + [options-summary] + (->> ["MTG Web Collection" + "" + "Usage: mtgcoll [options] [action] [arguments]" + "" + "Options:" + options-summary + "" + "Actions:" + (->actions-summary)] + (string/join \newline))) + +(defn- ->error-msg + [errors] + (str "Invalid options/arguments.\n" + (string/join \newline errors))) + +(defn- exit + [status msg] + (println msg) + (System/exit status)) + +(defn parse-cli-args + [args] + (let [{:keys [options arguments errors summary] :as parsed-cli} (cli/parse-opts args cli-options) + arguments (or arguments ["web"]) + action (first arguments) + arguments (rest arguments) + valid-action? (some #{action} (map first actions))] + (cond + (:help options) (exit 0 (->usage-string summary)) + (not valid-action?) (exit 1 (->usage-string summary)) + errors (exit 1 (->error-msg errors))) + {:options options + :action (keyword action) + :arguments arguments})) diff --git a/src/mtgcoll/config.clj b/src/mtgcoll/config.clj index 769b917..0c0817c 100644 --- a/src/mtgcoll/config.clj +++ b/src/mtgcoll/config.clj @@ -1,5 +1,14 @@ (ns mtgcoll.config + (:refer-clojure :exclude [get]) (:require [config.core :as cfg])) -(defonce config (cfg/load (System/getenv "config"))) +(defonce app-config (atom {})) + +(defn load! + [config-file] + (reset! app-config (cfg/load (or config-file (System/getenv "config"))))) + +(defn get + [& ks] + (apply cfg/get @app-config ks)) \ No newline at end of file diff --git a/src/mtgcoll/core.clj b/src/mtgcoll/core.clj index a251ef3..804406d 100644 --- a/src/mtgcoll/core.clj +++ b/src/mtgcoll/core.clj @@ -11,9 +11,12 @@ [taoensso.sente.server-adapters.immutant :refer [sente-web-server-adapter]] [views.reagent.sente.server :as vr] - [config.core :as config] - [mtgcoll.config :refer [config]] + [mtgcoll.cli :refer [parse-cli-args]] + [mtgcoll.config :as config] [mtgcoll.db :as db] + [mtgcoll.models.mtgjson :refer [load-mtgjson-data!]] + [mtgcoll.scrapers.image-assets :refer [download-gatherer-set-images! download-gatherer-symbol-images!]] + [mtgcoll.scrapers.common :refer [update-prices!]] [mtgcoll.views.core :as views] [mtgcoll.views.sente :as sente] [mtgcoll.routes.main-page :refer [main-page-routes]] @@ -22,11 +25,12 @@ (defn init [] - (log/info "Starting up ...") + (log/info "Starting up web application ...") - (when (config/get config :dev?) + (when (config/get :dev?) (log/info "Running in development environment.")) + (db/setup-config!) (db/verify-connection) (sente/init!) (views/init!) @@ -41,7 +45,7 @@ (defn wrap-env-middleware [handler] - (if (config/get config :dev?) + (if (config/get :dev?) (-> handler (wrap-reload)) handler)) @@ -62,6 +66,34 @@ (init) (immutant/run #'handler {:port 8080})) +(defn stop-server + [] + (immutant/stop) + (shutdown)) + + (defn -main [& args] - (run-server)) + (let [{:keys [options action arguments]} (parse-cli-args args)] + (config/load! (:config options)) + (db/setup-config!) + (db/verify-connection) + (case action + :web + (run-server) + + :setup-db + (db/initialize-database!) + + :load-json + (load-mtgjson-data! (first arguments)) + + :scrape-prices + (if (seq arguments) + (update-prices! (first arguments)) + (update-prices!)) + + :scrape-set-images + (do + (download-gatherer-set-images!) + (download-gatherer-symbol-images!))))) diff --git a/src/mtgcoll/db.clj b/src/mtgcoll/db.clj index f3718bf..f11761f 100644 --- a/src/mtgcoll/db.clj +++ b/src/mtgcoll/db.clj @@ -1,15 +1,29 @@ (ns mtgcoll.db (:require [clojure.java.jdbc :as sql] - [config.core :as config] - [mtgcoll.config :refer [config]])) + [ragtime.jdbc :as jdbc] + [ragtime.repl :as ragtime] + [mtgcoll.config :as config])) -(def db {:classname "org.postgresql.Driver" - :subprotocol "postgresql" - :subname (str "//" (config/get config :db :host) ":" (or (config/get config :db :port) 5432) "/" (config/get config :db :name)) - :user (config/get config :db :username) - :password (config/get config :db :password)}) +(defonce db (atom nil)) + +(defn setup-config! + [] + (reset! db {:classname "org.postgresql.Driver" + :subprotocol "postgresql" + :subname (str "//" (config/get :db :host) ":" (or (config/get :db :port) 5432) "/" (config/get :db :name)) + :user (config/get :db :username) + :password (config/get :db :password)})) (defn verify-connection [] - (sql/query db "select 1")) + (sql/query @db "select 1")) + +(defn get-ragtime-config [] + {:datastore (jdbc/sql-database @db) + :migrations (jdbc/load-resources "migrations")}) + +(defn initialize-database! + [] + (println "Initializating database") + (ragtime/migrate (get-ragtime-config))) \ No newline at end of file diff --git a/src/mtgcoll/models/cards.clj b/src/mtgcoll/models/cards.clj index d143c6e..a2f595a 100644 --- a/src/mtgcoll/models/cards.clj +++ b/src/mtgcoll/models/cards.clj @@ -4,11 +4,18 @@ [honeysql.core :as hsql] [mtgcoll.db :refer [db]])) +(defn get-card-image-info + [card-id] + (sql/query @db ["select set_code, image_name + from cards + where id = ?" card-id] + {:result-set-fn first})) + (defn get-card-db-image [card-id] - (let [result (sql/query db ["select image_bytes, mimetype - from card_images - where card_id = ?" card-id] + (let [result (sql/query @db ["select image_bytes, mimetype + from card_images + where card_id = ?" card-id] {:result-set-fn first})] (if (:image_bytes result) result))) @@ -28,28 +35,32 @@ [:= :number number])) (remove nil? x) (vec x))}] - (seq (sql/query db (hsql/format q) {:row-fn :id})))) + (seq (sql/query @db (hsql/format q) {:row-fn :id})))) (defn update-price! [card-id price-source price online?] ;; written assuming postgresql server is _not_ 9.5+ (so, without access to UPSERT functionality) (sql/with-db-transaction - [dt db] + [dt @db] (let [num-updates (first - (sql/execute! db ["update card_prices - set price = ?, - last_updated_at = current_timestamp - where card_id = ? and - source = ? and - online = ?" - price card-id (name price-source) online?]))] + (sql/execute! + dt + ["update card_prices + set price = ?, + last_updated_at = current_timestamp + where card_id = ? and + source = ? and + online = ?" + price card-id (name price-source) online?]))] (if (= 0 num-updates) (first - (sql/execute! db ["insert into card_prices - (card_id, source, online, price, last_updated_at) - values - (?, ?, ?, ?, current_timestamp)" - card-id (name price-source) online? price])) + (sql/execute! + dt + ["insert into card_prices + (card_id, source, online, price, last_updated_at) + values + (?, ?, ?, ?, current_timestamp)" + card-id (name price-source) online? price])) num-updates)))) (defn update-prices! diff --git a/src/mtgcoll/models/collection.clj b/src/mtgcoll/models/collection.clj index 4f09542..4c0c2df 100644 --- a/src/mtgcoll/models/collection.clj +++ b/src/mtgcoll/models/collection.clj @@ -9,9 +9,9 @@ ;; written assuming postgresql server is _not_ 9.5+ (so, without access to UPSERT functionality) (with-view-transaction view-system - [dt db] + [dt @db] (let [num-updates (first - (vexec! view-system db + (vexec! view-system dt ["update collection set quantity = quantity + ? where card_id = ? and @@ -19,7 +19,7 @@ quantity-change card-id quality]))] (if (= 0 num-updates) (first - (vexec! view-system db + (vexec! view-system dt ["insert into collection (card_id, quality, quantity) values diff --git a/env/dev/src/import.clj b/src/mtgcoll/models/mtgjson.clj similarity index 66% rename from env/dev/src/import.clj rename to src/mtgcoll/models/mtgjson.clj index 552957b..0074294 100644 --- a/env/dev/src/import.clj +++ b/src/mtgcoll/models/mtgjson.clj @@ -1,40 +1,24 @@ -(ns import +(ns mtgcoll.models.mtgjson (:require [clojure.string :as string] [clojure.java.io :as io] [clojure.java.jdbc :as sql] [cheshire.core :as json] [pantomime.mime :refer [mime-type-of]] - [config.core :as config] - [mtgcoll.config :refer [config]] - [mtgcoll.db :refer [db]]) + [mtgcoll.config :as config] + [mtgcoll.db :refer [db]] + [mtgcoll.db :as db]) (:use mtgcoll.utils) (:import (java.text SimpleDateFormat) (java.sql Timestamp))) -(defonce all-sets-json (atom nil)) +(def mtg-json-path (config/get :import :json-path)) -(def mtg-json-path (config/get config :import :json-path)) -(def mtg-card-images-path (str mtg-json-path "/AllSets")) - -(defn load-json! - [] - (with-open [rdr (io/reader (str mtg-json-path "/AllSets.json"))] - (reset! all-sets-json (json/parse-stream rdr true))) - (count (keys @all-sets-json))) - -(defn get-card-image-file - [set-code card-image-name] - (let [image-filename (str mtg-card-images-path "/" set-code "/" (string/lower-case card-image-name) ".jpg") - image-file (io/file image-filename)] - (if (.exists image-file) - (with-open [rdr (io/input-stream image-filename)] - (let [length (.length (io/file image-filename)) - buffer (byte-array length)] - (.read rdr buffer, 0, length) - {:bytes buffer - :mimetype (mime-type-of image-file)}))))) +(defn load-json + [json-file] + (with-open [rdr (io/reader json-file)] + (json/parse-stream rdr true))) (defn parse-date [^String s] @@ -42,11 +26,11 @@ (Timestamp. (.getTime (.parse (SimpleDateFormat. "yyyy-MM-dd") s))))) (defn create-sets! - [] - (doseq [[_ m] @all-sets-json] + [json-data] + (doseq [[_ m] json-data] (try (sql/insert! - db + @db :sets {:code (:code m) :name (:name m) @@ -58,7 +42,7 @@ :type (:type m) :block (:block m) :online_only (boolean (:onlineOnly m))}) - (println (:code m) "-" (:name m)) + (println "Added set" (:code m) "-" (:name m)) (catch Exception e (println e) (println (dissoc m :cards)) @@ -83,28 +67,16 @@ :multiverseid id :variant_card_id nil}))) -(defn create-card-image! - [db-con card-id image-name {:keys [bytes mimetype]}] - (sql/insert! - db-con - :card_images - {:card_id card-id - :image_name image-name - :image_bytes bytes - :mimetype mimetype})) - (defn create-cards-for-set! [set-code cards] (reduce (fn [cnt card] (let [card-id (:id card) names (:names card) - variations (:variations card) - image-name (:imageName card) - image-file (get-card-image-file set-code image-name)] + variations (:variations card)] (try (sql/with-db-transaction - [db-con db] + [db-con @db] (sql/insert! db-con :cards @@ -140,8 +112,7 @@ :release_date (:releaseDate card) :starter (boolean (:starter card))}) (create-card-names! db-con card-id names) - (create-card-variations! db-con card-id variations) - (create-card-image! db-con card-id image-name image-file)) + (create-card-variations! db-con card-id variations)) (catch Exception e (println e) (println card) @@ -151,29 +122,29 @@ cards)) (defn create-cards! - [] - (doseq [[_ m] @all-sets-json] + [json-data] + (doseq [[_ m] json-data] (let [num-created (create-cards-for-set! (:code m) (:cards m))] - (println (:code m) "-" (:name m) "-" num-created "cards")))) + (println "Added" num-created "cards for set" (:code m) "-" (:name m))))) (defn fillin-card-variation-ids! [] + (println "Filling in card IDs for card variations") (sql/execute! - db + @db ["update card_variations set variant_card_id = (select c.id from cards c where c.multiverseid = card_variations.multiverseid)"])) -(defn load-to-sql! - [] - (load-json!) - (println "---- CREATING SETS ----") - (create-sets!) - (println "\n\n---- CREATING CARDS ----") - (create-cards!) - (println "\n\n---- FILLING IN CARD IDS FOR CARD VARIATIONS ----") - (fillin-card-variation-ids!) - (println "\n\n done!")) - -#_(load-to-sql!) +(defn load-mtgjson-data! + [json-file] + (println "Loading MTG JSON data") + (if-not (file-exists? json-file) + (println "Error loading MTG JSON data: file not found.") + (let [json-data (load-json json-file)] + (create-sets! json-data) + (create-cards! json-data) + (fillin-card-variation-ids!) + (println "Done!") + true))) diff --git a/src/mtgcoll/models/sets.clj b/src/mtgcoll/models/sets.clj index 0f3338f..7e2150c 100644 --- a/src/mtgcoll/models/sets.clj +++ b/src/mtgcoll/models/sets.clj @@ -5,4 +5,4 @@ (defn get-set-codes [] - (seq (sql/query db ["select code, gatherer_code from sets"]))) + (seq (sql/query @db ["select code, gatherer_code from sets"]))) diff --git a/src/mtgcoll/routes/images.clj b/src/mtgcoll/routes/images.clj index e3365c1..084f1ca 100644 --- a/src/mtgcoll/routes/images.clj +++ b/src/mtgcoll/routes/images.clj @@ -4,7 +4,10 @@ [clojure.java.jdbc :as sql] [compojure.core :refer [routes GET POST]] [webtools.response :as response] - [mtgcoll.models.cards :as cards])) + [mtgcoll.config :as config] + [mtgcoll.models.cards :as cards]) + (:use + mtgcoll.utils)) (defn sanitize-path-arg [arg] @@ -13,20 +16,19 @@ (def image-routes (routes (GET "/images/cards/:id" [id] - (if-let [{:keys [image_bytes mimetype]} (cards/get-card-db-image id)] - (-> (response/content (io/input-stream image_bytes)) - (response/content-type mimetype)) - (-> (response/content (-> (io/resource "public/img/cardback.jpg") - (io/file))) - (response/content-type "image/jpeg")))) + (if-let [{:keys [set_code image_name]} (cards/get-card-image-info id)] + (let [filename (str (config/get :card-images-path) "/" set_code "/" image_name ".jpg") + image-file (if (file-exists? filename) + (io/file filename) + (io/file (io/resource "public/img/cardback.jpg")))] + (-> (io/input-stream image-file) + (response/content) + (response/content-type "image/jpeg"))))) (GET "/images/:type/:size/:name" [type size name] - (let [size (some #{size} ["small" "medium"]) - path (str "public/img/" (sanitize-path-arg type) "/" size "/" (sanitize-path-arg name) ".png") - res (io/resource path)] - (if res - (io/file res) - (-> (io/resource (if (= "sets" type) - "public/img/empty.png" - (str "public/img/missing_symbol_" size ".png"))) - (io/file))))))) + (let [size (some #{size} ["small" "medium" "large"]) + path (str (config/get :other-images-path) "/" (sanitize-path-arg type) "/" size "/" (sanitize-path-arg name) ".png") + file (if (file-exists? path) + (io/file path) + (io/file (io/resource (str "public/img/missing_symbol_" size ".png"))))] + file)))) diff --git a/src/mtgcoll/routes/main_page.clj b/src/mtgcoll/routes/main_page.clj index 11d7cb3..3bedc67 100644 --- a/src/mtgcoll/routes/main_page.clj +++ b/src/mtgcoll/routes/main_page.clj @@ -5,8 +5,7 @@ [hiccup.element :refer [javascript-tag]] [webtools.page :refer [html5 js-env-settings]] [webtools.reagent.page :refer [include-bootstrap-metatags include-bootstrap-css]] - [config.core :as config] - [mtgcoll.config :refer [config]])) + [mtgcoll.config :as config])) (defn main-page [request] @@ -18,7 +17,7 @@ (include-css "css/app.css")] [:body [:div#app [:h1 "Please wait, loading ..."]] - (js-env-settings "" (boolean (config/get config :dev?))) + (js-env-settings "" (boolean (config/get :dev?))) (include-js "cljs/app.js")])) (def main-page-routes diff --git a/src/mtgcoll/scrapers/common.clj b/src/mtgcoll/scrapers/common.clj index 7759519..105848e 100644 --- a/src/mtgcoll/scrapers/common.clj +++ b/src/mtgcoll/scrapers/common.clj @@ -1,29 +1,29 @@ (ns mtgcoll.scrapers.common (:require - [clojure.java.jdbc :as sql] [views.core :as views] [views.sql.core :refer [hint-type]] - [mtgcoll.db :refer [db]] [mtgcoll.views.core :refer [view-system]] [mtgcoll.models.cards :as cards] [mtgcoll.models.sets :as sets] [mtgcoll.scrapers.protocols :refer [scrape]] - [mtgcoll.scrapers.list :refer [price-scrapers]])) + [mtgcoll.scrapers.list :refer [price-scrapers]] + [mtgcoll.db :as db])) (defn update-prices! - [source] - (if-let [price-scraper (get price-scrapers source)] - (do - (println "updating prices using" source "scraper.") - (doseq [set (sets/get-set-codes)] - (println "scraping prices for set:" set) - (let [{:keys [source prices normalized-name?]} (scrape price-scraper set)] - (if prices - (cards/update-prices! source prices {:normalized-name? normalized-name?}) - (println "could not obtain prices for set:" set)))) - ; manually add a hint indicating the card_prices table was updated so all - ; relevant views refresh. we intentionally do NOT update prices using vexec! - ; as price updates are done via (potentially) thousands of inserts/updates - ; which, if we used vexec!, would result in thousands of unnecessary view - ; refreshes being triggered. - (views/put-hints! view-system [(views/hint nil #{:card_prices} hint-type)])))) + ([source] + (println "Updating" source "card prices.") + (db/verify-connection) + (if-let [price-scraper (get price-scrapers source)] + (do + (doseq [set (sets/get-set-codes)] + (println "Scraping prices for set:" set) + (let [{:keys [source prices normalized-name?]} (scrape price-scraper set)] + (if prices + (cards/update-prices! source prices {:normalized-name? normalized-name?}) + (println "Could not obtain prices for set:" set)))) + (views/put-hints! view-system [(views/hint nil #{:card_prices} hint-type)])) + (println "No price scraper \"" source "\" found."))) + ([] + (println "Updating prices using all available scrapers.") + (doseq [source (keys price-scrapers)] + (update-prices! source)))) diff --git a/src/mtgcoll/scrapers/image_assets.clj b/src/mtgcoll/scrapers/image_assets.clj new file mode 100644 index 0000000..fe07105 --- /dev/null +++ b/src/mtgcoll/scrapers/image_assets.clj @@ -0,0 +1,97 @@ +(ns mtgcoll.scrapers.image-assets + (:require + [clojure.string :as string] + [clojure.java.io :as io] + [clojure.java.jdbc :as sql] + [clj-http.client :as http] + [mtgcoll.db :refer [db]] + [mtgcoll.config :as config]) + (:use + mtgcoll.utils)) + +;; NOTE: The Gatherer site serves up images via the image handler as PNG's but +;; the HTTP response incorrectly sets a "image/jpeg" content-type +;; (which is probably only intended for the card images). +;; The mana/set/symbol images are all actually PNG! + +(defn- ->gatherer-image-handler-url + [size & {:keys [name rarity set]}] + (-> "http://gatherer.wizards.com/Handlers/Image.ashx?type=symbol" + (str "&size=" size) + (str (if name (str "&name=" name))) + (str (if rarity (str "&rarity=" rarity))) + (str (if set (str "&set=" set))))) + +(defn- save-bytes-to-file! + [filename bytes] + (let [file (io/file (str (config/get :other-images-path) filename)) + path (io/file (.getParent file))] + (.mkdirs path) + (with-open [w (io/output-stream (.getPath file))] + (.write w bytes)))) + +(defn- get-gatherer-set-codes + [] + (sql/query @db ["select code, gatherer_code from sets order by code"])) + +(defn- download-set-image + [size {:keys [code gatherer_code]}] + (if-let [image-bytes (download-as-byte-array (->gatherer-image-handler-url size :rarity "C" :set code))] + image-bytes + (if-let [image-bytes (if gatherer_code + (download-as-byte-array (->gatherer-image-handler-url size :rarity "C" :set gatherer_code)))] + image-bytes + ;; last attempt if all else fails -- use "M" rarity code. some set images are only available this way ... + (download-as-byte-array (->gatherer-image-handler-url size :rarity "M" :set code))))) + +(def ^:private sizes + ["small" "medium" "large"]) + +(defn download-gatherer-set-images! + [] + (println "Downloading set images from Gatherer") + (doseq [code (get-gatherer-set-codes)] + (println "Getting images for set:" code) + (doseq [size sizes] + (if-let [image-bytes (download-set-image size code)] + (save-bytes-to-file! (str "/sets/" size "/" (:code code) ".png") image-bytes) + (println "Unable to download" size "image for:" code))))) + +;;;; + +(defn- download-symbol-image + [size name] + (download-as-byte-array (->gatherer-image-handler-url size :name name))) + +(def ^:private mana-symbols + ["C" "W" "U" "B" "R" "G" "S" "X" "Y" "Z" "WU" "WB" "UB" "UR" "BR" "BG" "RG" "RW" "GW" "GU" "2W" "2U" "2B" "2R" "2G" "P" "WP" "UP" "BP" "RP" "GP" "INFINITY" "H" "HW" "HU" "HB" "HR" "HG" "0" "1" "2" "3" "4" "5" "6" "7" "8" "9" "10" "11" "12" "13" "14" "15" "16" "17" "18" "19" "20" "100" "1000000"]) + +(def ^:private gather-symbol-names + {"S" "snow" + "HR" "HalfR" + "T" "tap" + "Q" "untap"}) + +(def ^:private other-symbols + ["T" "Q" "CHAOS"]) + +(defn- download-gatherer-symbol-image! + [size type symbol-name] + (when-let [image-bytes (download-symbol-image size (or (get gather-symbol-names symbol-name) symbol-name))] + (save-bytes-to-file! (str "/" type "/" size "/" symbol-name ".png") image-bytes) + true)) + +(defn download-gatherer-symbol-images! + [] + (println "Downloading mana symbol images from Gatherer") + (doseq [symbol-name mana-symbols] + (println "Getting images for mana symbol:" symbol-name) + (doseq [size sizes] + (if-not (download-gatherer-symbol-image! size "mana" symbol-name) + (println "Unable to download" size "image for mana symbol:" symbol-name)))) + ; other symbols + (doseq [symbol-name other-symbols] + (println "Getting images for symbol:" symbol-name) + (doseq [size sizes] + (if-not (download-gatherer-symbol-image! size "symbols" symbol-name) + (println "Unable to download" size "image for other symbol:" symbol-name))))) diff --git a/src/mtgcoll/utils.clj b/src/mtgcoll/utils.clj index bc3d974..22d0299 100644 --- a/src/mtgcoll/utils.clj +++ b/src/mtgcoll/utils.clj @@ -1,6 +1,8 @@ (ns mtgcoll.utils (:require - [clojure.string :as string]) + [clojure.string :as string] + [clojure.java.io :as io] + [clj-http.client :as http]) (:import (java.io ByteArrayInputStream InputStream) (java.text Normalizer Normalizer$Form))) @@ -35,3 +37,16 @@ (.replace "”" "\"") (.replace "–" "-") (.replaceAll "[^\\p{ASCII}]" "")))) + +(defn file-exists? + [filename] + (if-not (string/blank? filename) + (let [file (io/file filename)] + (.exists file)))) + +(defn download-as-byte-array + [url] + (let [response (http/get url {:headers chrome-osx-request-headers :as :byte-array}) + body (:body response)] + (if-not (empty? body) + body))) diff --git a/src/mtgcoll/views/core.clj b/src/mtgcoll/views/core.clj index 8c7c81a..ed5e382 100644 --- a/src/mtgcoll/views/core.clj +++ b/src/mtgcoll/views/core.clj @@ -14,40 +14,44 @@ (defonce view-system (atom {})) +(defn get-db + [_] + @db) + (def views - [(view :card-info db #'cards/card-info {:result-set-fn first}) - (view :full-card-info db #'cards/full-card-info [:cards :collection :card_prices] {:result-set-fn first}) - (view :card-names db #'cards/card-names) - (view :card-variations db #'cards/card-variations) - (view :card-printings db #'cards/card-printings) - (view :cards db #'cards/cards [:cards :collection :card_prices]) - (view :count-of-cards db #'cards/count-of-cards {:result-set-fn #(->> % first :count)}) + [(view :card-info get-db #'cards/card-info {:result-set-fn first}) + (view :full-card-info get-db #'cards/full-card-info [:cards :collection :card_prices] {:result-set-fn first}) + (view :card-names get-db #'cards/card-names) + (view :card-variations get-db #'cards/card-variations) + (view :card-printings get-db #'cards/card-printings) + (view :cards get-db #'cards/cards [:cards :collection :card_prices]) + (view :count-of-cards get-db #'cards/count-of-cards {:result-set-fn #(->> % first :count)}) - (view :set-info db #'sets/set-info {:result-set-fn first}) - (view :simple-sets-list db #'sets/simple-sets-list) - (view :sets-list db #'sets/sets-list) + (view :set-info get-db #'sets/set-info {:result-set-fn first}) + (view :simple-sets-list get-db #'sets/simple-sets-list) + (view :sets-list get-db #'sets/sets-list) - (view :owned-card db #'collection/owned-card) - (view :total-owned-of-card db #'collection/total-owned-of-card) + (view :owned-card get-db #'collection/owned-card) + (view :total-owned-of-card get-db #'collection/total-owned-of-card) - (view :card-pricing db #'prices/card-pricing) - (view :pricing-sources db #'prices/pricing-sources) + (view :card-pricing get-db #'prices/card-pricing) + (view :pricing-sources get-db #'prices/pricing-sources) - (view :stats/owned-total db #'statistics/owned-total {:row-fn :sum :result-set-fn first}) - (view :stats/distinct-owned-total db #'statistics/distinct-owned-total {:row-fn :count :result-set-fn first}) - (view :stats/color-totals db #'statistics/color-totals {:result-set-fn first}) - (view :stats/basic-type-totals db #'statistics/basic-type-totals {:result-set-fn first}) - (view :stats/most-common-types db #'statistics/most-common-types) - (view :stats/total-sets-owned-from db #'statistics/total-sets-owned-from {:row-fn :count :result-set-fn first}) - (view :stats/total-sets-owned-all-from db #'statistics/total-sets-owned-all-from {:row-fn :count :result-set-fn first}) - (view :stats/most-owned-sets db #'statistics/most-owned-sets) - (view :stats/most-copies-of-card db #'statistics/most-copies-of-card) - (view :stats/most-nonland-copies-of-card db #'statistics/most-nonland-copies-of-card) - (view :stats/total-price db #'statistics/total-price {:row-fn :total :result-set-fn first}) - (view :stats/agg-price-stats db #'statistics/agg-price-stats {:result-set-fn first}) - (view :stats/most-valuable-cards db #'statistics/most-valuable-cards) - (view :stats/num-cards-worth-over-1-dollar db #'statistics/num-cards-worth-over-1-dollar {:row-fn :count :result-set-fn first}) - (view :stats/card-rarity-totals db #'statistics/card-rarity-totals)]) + (view :stats/owned-total get-db #'statistics/owned-total {:row-fn :sum :result-set-fn first}) + (view :stats/distinct-owned-total get-db #'statistics/distinct-owned-total {:row-fn :count :result-set-fn first}) + (view :stats/color-totals get-db #'statistics/color-totals {:result-set-fn first}) + (view :stats/basic-type-totals get-db #'statistics/basic-type-totals {:result-set-fn first}) + (view :stats/most-common-types get-db #'statistics/most-common-types) + (view :stats/total-sets-owned-from get-db #'statistics/total-sets-owned-from {:row-fn :count :result-set-fn first}) + (view :stats/total-sets-owned-all-from get-db #'statistics/total-sets-owned-all-from {:row-fn :count :result-set-fn first}) + (view :stats/most-owned-sets get-db #'statistics/most-owned-sets) + (view :stats/most-copies-of-card get-db #'statistics/most-copies-of-card) + (view :stats/most-nonland-copies-of-card get-db #'statistics/most-nonland-copies-of-card) + (view :stats/total-price get-db #'statistics/total-price {:row-fn :total :result-set-fn first}) + (view :stats/agg-price-stats get-db #'statistics/agg-price-stats {:result-set-fn first}) + (view :stats/most-valuable-cards get-db #'statistics/most-valuable-cards) + (view :stats/num-cards-worth-over-1-dollar get-db #'statistics/num-cards-worth-over-1-dollar {:row-fn :count :result-set-fn first}) + (view :stats/card-rarity-totals get-db #'statistics/card-rarity-totals)]) #_(views/add-views! view-system views)