Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

refactor: add semantic react to remove jquery (#319)

Guilherme Oenning7dce9ce8529b
diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.go
index bb5e8693d..c355bd28f 100644
--- a/app/storage/postgres/idea.go
+++ b/app/storage/postgres/idea.go
@@ -262,11 +262,10 @@ func (s *IdeaStorage) Search(query, filter string, tags []string) ([]*models.Ide
err error
)
if query != "" {
- scoreField := "ts_rank(setweight(to_tsvector(title), 'A') || setweight(to_tsvector(description), 'B'), to_tsquery('english', $4)) + similarity(title, $5) + similarity(description, $5)"
+ scoreField := "ts_rank(setweight(to_tsvector(title), 'A') || setweight(to_tsvector(description), 'B'), to_tsquery('english', $3)) + similarity(title, $4) + similarity(description, $4)"
sql := fmt.Sprintf(`
SELECT * FROM (%s) AS q
WHERE %s > 0.1
- AND tags @> $3
ORDER BY %s DESC
`, innerQuery, scoreField, scoreField)
err = s.trx.Select(&ideas, sql, s.tenant.ID, pq.Array([]int{
@@ -275,7 +274,7 @@ func (s *IdeaStorage) Search(query, filter string, tags []string) ([]*models.Ide
models.IdeaPlanned,
models.IdeaCompleted,
models.IdeaDeclined,
- }), pq.Array(tags), ToTSQuery(query), query)
+ }), ToTSQuery(query), query)
} else {
statuses, sort := getFilterData(filter)
sql := fmt.Sprintf(`
diff --git a/package-lock.json b/package-lock.json
index e836e5935..9f879d8c3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,12 +4,6 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
- "@types/jquery": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.0.tgz",
- "integrity": "sha512-szaKV2OQgwxYTGTY6qd9eeBfGGCaP7n2OGit4JdbOcfGgc9VWjfhMhnu5AVNhIAu8WWDIB36q9dfPVba1fGeIQ==",
- "dev": true
- },
"@types/markdown-it": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-0.0.4.tgz",
@@ -400,6 +394,22 @@
"js-tokens": "3.0.2"
}
},
+ "babel-runtime": {
+ "version": "6.26.0",
+ "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+ "requires": {
+ "core-js": "2.5.3",
+ "regenerator-runtime": "0.11.1"
+ },
+ "dependencies": {
+ "core-js": {
+ "version": "2.5.3",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
+ "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4="
+ }
+ }
+ },
"balanced-match": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -878,6 +888,11 @@
}
}
},
+ "classnames": {
+ "version": "2.2.5",
+ "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.5.tgz",
+ "integrity": "sha1-+zgB1FNGdknvNgPH1hoCvRKb3m0="
+ },
"cliui": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
@@ -2069,13 +2084,15 @@
"dependencies": {
"abbrev": {
"version": "1.1.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+ "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
"dev": true,
"optional": true
},
"ajv": {
"version": "4.11.8",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+ "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
"dev": true,
"optional": true,
"requires": {
@@ -2085,18 +2102,21 @@
},
"ansi-regex": {
"version": "2.1.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"dev": true
},
"aproba": {
"version": "1.1.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz",
+ "integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s=",
"dev": true,
"optional": true
},
"are-we-there-yet": {
"version": "1.1.4",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+ "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
"dev": true,
"optional": true,
"requires": {
@@ -2106,42 +2126,49 @@
},
"asn1": {
"version": "0.2.3",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+ "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
"dev": true,
"optional": true
},
"assert-plus": {
"version": "0.2.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+ "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
"dev": true,
"optional": true
},
"asynckit": {
"version": "0.4.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
"dev": true,
"optional": true
},
"aws-sign2": {
"version": "0.6.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+ "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
"dev": true,
"optional": true
},
"aws4": {
"version": "1.6.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+ "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
"dev": true,
"optional": true
},
"balanced-match": {
"version": "0.4.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+ "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
"dev": true
},
"bcrypt-pbkdf": {
"version": "1.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+ "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
"dev": true,
"optional": true,
"requires": {
@@ -2150,7 +2177,8 @@
},
"block-stream": {
"version": "0.0.9",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
"dev": true,
"requires": {
"inherits": "2.0.3"
@@ -2158,7 +2186,8 @@
},
"boom": {
"version": "2.10.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+ "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
"dev": true,
"requires": {
"hoek": "2.16.3"
@@ -2166,7 +2195,8 @@
},
"brace-expansion": {
"version": "1.1.7",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
+ "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
"dev": true,
"requires": {
"balanced-match": "0.4.2",
@@ -2175,29 +2205,34 @@
},
"buffer-shims": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+ "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
"dev": true
},
"caseless": {
"version": "0.12.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
"dev": true,
"optional": true
},
"co": {
"version": "4.6.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+ "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
"dev": true,
"optional": true
},
"code-point-at": {
"version": "1.1.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
"dev": true
},
"combined-stream": {
"version": "1.0.5",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+ "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
"dev": true,
"requires": {
"delayed-stream": "1.0.0"
@@ -2205,22 +2240,26 @@
},
"concat-map": {
"version": "0.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true
},
"console-control-strings": {
"version": "1.1.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
"dev": true
},
"core-util-is": {
"version": "1.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
"dev": true
},
"cryptiles": {
"version": "2.0.5",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+ "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
"dev": true,
"requires": {
"boom": "2.10.1"
@@ -2228,7 +2267,8 @@
},
"dashdash": {
"version": "1.14.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
"dev": true,
"optional": true,
"requires": {
@@ -2237,7 +2277,8 @@
"dependencies": {
"assert-plus": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
"dev": true,
"optional": true
}
@@ -2245,7 +2286,8 @@
},
"debug": {
"version": "2.6.8",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+ "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
"dev": true,
"optional": true,
"requires": {
@@ -2254,30 +2296,35 @@
},
"deep-extend": {
"version": "0.4.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+ "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
"dev": true,
"optional": true
},
"delayed-stream": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
"dev": true
},
"delegates": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+ "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
"dev": true,
"optional": true
},
"detect-libc": {
"version": "1.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.2.tgz",
+ "integrity": "sha1-ca1dIEvxempsqPRQxhRUBm70YeE=",
"dev": true,
"optional": true
},
"ecc-jsbn": {
"version": "0.1.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+ "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
"dev": true,
"optional": true,
"requires": {
@@ -2286,24 +2333,28 @@
},
"extend": {
"version": "3.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+ "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
"dev": true,
"optional": true
},
"extsprintf": {
"version": "1.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
+ "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
"dev": true
},
"forever-agent": {
"version": "0.6.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
"dev": true,
"optional": true
},
"form-data": {
"version": "2.1.4",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+ "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
"dev": true,
"optional": true,
"requires": {
@@ -2314,12 +2365,14 @@
},
"fs.realpath": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true
},
"fstream": {
"version": "1.0.11",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+ "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
"dev": true,
"requires": {
"graceful-fs": "4.1.11",
@@ -2330,7 +2383,8 @@
},
"fstream-ignore": {
"version": "1.0.5",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+ "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
"dev": true,
"optional": true,
"requires": {
@@ -2341,7 +2395,8 @@
},
"gauge": {
"version": "2.7.4",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"dev": true,
"optional": true,
"requires": {
@@ -2357,7 +2412,8 @@
},
"getpass": {
"version": "0.1.7",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
"dev": true,
"optional": true,
"requires": {
@@ -2366,7 +2422,8 @@
"dependencies": {
"assert-plus": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
"dev": true,
"optional": true
}
@@ -2374,7 +2431,8 @@
},
"glob": {
"version": "7.1.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+ "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
"dev": true,
"requires": {
"fs.realpath": "1.0.0",
@@ -2387,18 +2445,21 @@
},
"graceful-fs": {
"version": "4.1.11",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
"dev": true
},
"har-schema": {
"version": "1.0.5",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+ "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
"dev": true,
"optional": true
},
"har-validator": {
"version": "4.2.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+ "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
"dev": true,
"optional": true,
"requires": {
@@ -2408,13 +2469,15 @@
},
"has-unicode": {
"version": "2.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+ "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
"dev": true,
"optional": true
},
"hawk": {
"version": "3.1.3",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+ "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
"dev": true,
"requires": {
"boom": "2.10.1",
@@ -2425,12 +2488,14 @@
},
"hoek": {
"version": "2.16.3",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+ "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
"dev": true
},
"http-signature": {
"version": "1.1.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+ "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
"dev": true,
"optional": true,
"requires": {
@@ -2441,7 +2506,8 @@
},
"inflight": {
"version": "1.0.6",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"dev": true,
"requires": {
"once": "1.4.0",
@@ -2450,18 +2516,21 @@
},
"inherits": {
"version": "2.0.3",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
"dev": true
},
"ini": {
"version": "1.3.4",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+ "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
"dev": true,
"optional": true
},
"is-fullwidth-code-point": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"requires": {
"number-is-nan": "1.0.1"
@@ -2469,24 +2538,28 @@
},
"is-typedarray": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
"dev": true,
"optional": true
},
"isarray": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
"dev": true
},
"isstream": {
"version": "0.1.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
"dev": true,
"optional": true
},
"jodid25519": {
"version": "1.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
+ "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=",
"dev": true,
"optional": true,
"requires": {
@@ -2495,19 +2568,22 @@
},
"jsbn": {
"version": "0.1.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
"dev": true,
"optional": true
},
"json-schema": {
"version": "0.2.3",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
"dev": true,
"optional": true
},
"json-stable-stringify": {
"version": "1.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+ "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
"dev": true,
"optional": true,
"requires": {
@@ -2516,19 +2592,22 @@
},
"json-stringify-safe": {
"version": "5.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
"dev": true,
"optional": true
},
"jsonify": {
"version": "0.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+ "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
"dev": true,
"optional": true
},
"jsprim": {
"version": "1.4.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
+ "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
"dev": true,
"optional": true,
"requires": {
@@ -2540,7 +2619,8 @@
"dependencies": {
"assert-plus": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
"dev": true,
"optional": true
}
@@ -2548,12 +2628,14 @@
},
"mime-db": {
"version": "1.27.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
+ "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
"dev": true
},
"mime-types": {
"version": "2.1.15",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
+ "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
"dev": true,
"requires": {
"mime-db": "1.27.0"
@@ -2561,7 +2643,8 @@
},
"minimatch": {
"version": "3.0.4",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true,
"requires": {
"brace-expansion": "1.1.7"
@@ -2569,12 +2652,14 @@
},
"minimist": {
"version": "0.0.8",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"dev": true
},
"mkdirp": {
"version": "0.5.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+ "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
"requires": {
"minimist": "0.0.8"
@@ -2582,13 +2667,15 @@
},
"ms": {
"version": "2.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
"dev": true,
"optional": true
},
"node-pre-gyp": {
"version": "0.6.39",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz",
+ "integrity": "sha512-OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ==",
"dev": true,
"optional": true,
"requires": {
@@ -2607,7 +2694,8 @@
},
"nopt": {
"version": "4.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+ "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
"dev": true,
"optional": true,
"requires": {
@@ -2617,7 +2705,8 @@
},
"npmlog": {
"version": "4.1.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz",
+ "integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==",
"dev": true,
"optional": true,
"requires": {
@@ -2629,24 +2718,28 @@
},
"number-is-nan": {
"version": "1.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
"dev": true
},
"oauth-sign": {
"version": "0.8.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+ "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
"dev": true,
"optional": true
},
"once": {
"version": "1.4.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"dev": true,
"requires": {
"wrappy": "1.0.2"
@@ -2654,19 +2747,22 @@
},
"os-homedir": {
"version": "1.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+ "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
"dev": true,
"optional": true
},
"os-tmpdir": {
"version": "1.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"dev": true,
"optional": true
},
"osenv": {
"version": "0.1.4",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+ "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
"dev": true,
"optional": true,
"requires": {
@@ -2676,35 +2772,41 @@
},
"path-is-absolute": {
"version": "1.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"dev": true
},
"performance-now": {
"version": "0.2.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+ "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
"dev": true,
"optional": true
},
"process-nextick-args": {
"version": "1.0.7",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+ "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
"dev": true
},
"punycode": {
"version": "1.4.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
"dev": true,
"optional": true
},
"qs": {
"version": "6.4.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+ "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
"dev": true,
"optional": true
},
"rc": {
"version": "1.2.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
+ "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
"dev": true,
"optional": true,
"requires": {
@@ -2716,7 +2818,8 @@
"dependencies": {
"minimist": {
"version": "1.2.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true,
"optional": true
}
@@ -2724,7 +2827,8 @@
},
"readable-stream": {
"version": "2.2.9",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
+ "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
"dev": true,
"requires": {
"buffer-shims": "1.0.0",
@@ -2738,7 +2842,8 @@
},
"request": {
"version": "2.81.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+ "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
"dev": true,
"optional": true,
"requires": {
@@ -2768,7 +2873,8 @@
},
"rimraf": {
"version": "2.6.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+ "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
"dev": true,
"requires": {
"glob": "7.1.2"
@@ -2776,30 +2882,35 @@
},
"safe-buffer": {
"version": "5.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+ "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
"dev": true
},
"semver": {
"version": "5.3.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+ "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
"dev": true,
"optional": true
},
"set-blocking": {
"version": "2.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
"dev": true,
"optional": true
},
"signal-exit": {
"version": "3.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
"dev": true,
"optional": true
},
"sntp": {
"version": "1.0.9",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+ "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
"dev": true,
"requires": {
"hoek": "2.16.3"
@@ -2807,7 +2918,8 @@
},
"sshpk": {
"version": "1.13.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz",
+ "integrity": "sha1-/yo+T9BEl1Vf7Zezmg/YL6+zozw=",
"dev": true,
"optional": true,
"requires": {
@@ -2824,7 +2936,8 @@
"dependencies": {
"assert-plus": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
"dev": true,
"optional": true
}
@@ -2832,7 +2945,8 @@
},
"string-width": {
"version": "1.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"requires": {
"code-point-at": "1.1.0",
@@ -2842,7 +2956,8 @@
},
"string_decoder": {
"version": "1.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
+ "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
"dev": true,
"requires": {
"safe-buffer": "5.0.1"
@@ -2850,13 +2965,15 @@
},
"stringstream": {
"version": "0.0.5",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+ "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
"dev": true,
"optional": true
},
"strip-ansi": {
"version": "3.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
"ansi-regex": "2.1.1"
@@ -2864,13 +2981,15 @@
},
"strip-json-comments": {
"version": "2.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+ "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
"dev": true,
"optional": true
},
"tar": {
"version": "2.2.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+ "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
"dev": true,
"requires": {
"block-stream": "0.0.9",
@@ -2880,7 +2999,8 @@
},
"tar-pack": {
"version": "3.4.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+ "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
"dev": true,
"optional": true,
"requires": {
@@ -2896,7 +3016,8 @@
},
"tough-cookie": {
"version": "2.3.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+ "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
"dev": true,
"optional": true,
"requires": {
@@ -2905,7 +3026,8 @@
},
"tunnel-agent": {
"version": "0.6.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
"dev": true,
"optional": true,
"requires": {
@@ -2914,30 +3036,35 @@
},
"tweetnacl": {
"version": "0.14.5",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
"dev": true,
"optional": true
},
"uid-number": {
"version": "0.0.6",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+ "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
"dev": true,
"optional": true
},
"util-deprecate": {
"version": "1.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
"dev": true
},
"uuid": {
"version": "3.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
+ "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=",
"dev": true,
"optional": true
},
"verror": {
"version": "1.3.6",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
+ "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
"dev": true,
"optional": true,
"requires": {
@@ -2946,7 +3073,8 @@
},
"wide-align": {
"version": "1.1.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+ "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
"dev": true,
"optional": true,
"requires": {
@@ -2955,7 +3083,8 @@
},
"wrappy": {
"version": "1.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true
}
}
@@ -3973,8 +4102,7 @@
"lodash": {
"version": "4.17.4",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
- "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
- "dev": true
+ "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
},
"lodash.assign": {
"version": "4.2.0",
@@ -5902,6 +6030,11 @@
"integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
"dev": true
},
+ "regenerator-runtime": {
+ "version": "0.11.1",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+ "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+ },
"regex-cache": {
"version": "0.4.4",
"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
@@ -6161,6 +6294,18 @@
"jquery": "3.3.1"
}
},
+ "semantic-ui-react": {
+ "version": "0.79.0",
+ "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-0.79.0.tgz",
+ "integrity": "sha512-bcVLU9TibB2O5cHvl8A4ED5CZ1VN3+h8JNxBqCJRJ8o2TeLlytj5YKjRqdTMi+4BcAJIGbmw2pC1EEFPaPLX1Q==",
+ "requires": {
+ "babel-runtime": "6.26.0",
+ "classnames": "2.2.5",
+ "fbjs": "0.8.16",
+ "lodash": "4.17.4",
+ "prop-types": "15.6.0"
+ }
+ },
"semver": {
"version": "5.4.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
diff --git a/package.json b/package.json
index 4b0cc61c8..32b19898a 100644
--- a/package.json
+++ b/package.json
@@ -4,15 +4,14 @@
"repository": "https://github.com/getfider/fider",
"private": true,
"dependencies": {
- "jquery": "^3.3.1",
"markdown-it": "^8.4.1",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-textarea-autosize": "^5.2.1",
- "semantic-ui-css": "2.2.14"
+ "semantic-ui-css": "2.2.14",
+ "semantic-ui-react": "^0.79.0"
},
"devDependencies": {
- "@types/jquery": "^3.3.0",
"@types/markdown-it": "0.0.4",
"@types/mocha": "^2.2.48",
"@types/react": "^16.0.38",
diff --git a/public/assets/styles/main.scss b/public/assets/styles/main.scss
index a6eeb4b10..fc25c9a6d 100644
--- a/public/assets/styles/main.scss
+++ b/public/assets/styles/main.scss
@@ -139,7 +139,7 @@ code {
}
.ui.inline.dropdown {
- .text {
+ > .text {
border-bottom: 1px dashed #9e9e9e
}
}
@@ -254,13 +254,6 @@ code {
}
}
-.signin-message {
- background-color: $menu-color;
- .ui.basic.red.label {
- background-color: $menu-color !important;
- }
-}
-
.signin-options{
.ui.stackable.grid>.column:not(.row),
.column {
diff --git a/public/assets/styles/variables.scss b/public/assets/styles/variables.scss
index 1434514d9..71290bec2 100644
--- a/public/assets/styles/variables.scss
+++ b/public/assets/styles/variables.scss
@@ -21,6 +21,28 @@ $green: #15CD72;
$green-darker: #0CB863;
$red: #db2828;
+// Queries
+$tablet-width: 768px;
+$desktop-width: 1024px;
+
+@mixin mobile {
+ @media (max-width: #{$tablet-width - 0.1px}) {
+ @content;
+ }
+}
+
+@mixin tablet {
+ @media (min-width: #{$tablet-width}) {
+ @content;
+ }
+}
+
+@mixin desktop {
+ @media (min-width: #{$desktop-width}) {
+ @content;
+ }
+}
+
@function textColorFor($color) {
@if (lightness($color) > 60) {
@return #484848; // Lighter background, return dark color
diff --git a/public/components/common/Modal.scss b/public/components/common/Modal.scss
index 7e04bc2a3..897cc14fc 100644
--- a/public/components/common/Modal.scss
+++ b/public/components/common/Modal.scss
@@ -33,13 +33,13 @@
width: 100%;
&.small {
- @media only screen and (min-width: 768px) {
+ @include tablet {
width: 500px;
}
}
&.large {
- @media only screen and (min-width: 768px) {
+ @include tablet {
width: 750px;
}
}
diff --git a/public/components/common/index.tsx b/public/components/common/index.tsx
index 56a46188e..7bda62085 100644
--- a/public/components/common/index.tsx
+++ b/public/components/common/index.tsx
@@ -14,3 +14,7 @@ export * from "./Modal";
export * from "./Loader";
import Textarea from "react-textarea-autosize";
export { Textarea };
+
+import Dropdown from "semantic-ui-react/dist/commonjs/modules/Dropdown";
+import { DropdownProps, DropdownItemProps, DropdownOnSearchChangeData } from "semantic-ui-react/index.d";
+export { Dropdown, DropdownProps, DropdownItemProps, DropdownOnSearchChangeData };
diff --git a/public/index.tsx b/public/index.tsx
index 4675bdfe1..75229538b 100644
--- a/public/index.tsx
+++ b/public/index.tsx
@@ -3,14 +3,6 @@ import * as ReactDOM from "react-dom";
import { resolveRootComponent } from "@fider/router";
import { Header, Footer } from "@fider/components/common";
import { analytics } from "@fider/services";
-import * as $ from "jquery";
-
-const w = window as any;
-w.$ = w.jQuery = $;
-
-import "semantic-ui-css/components/site.min.js";
-import "semantic-ui-css/components/transition.min.js";
-import "semantic-ui-css/components/dropdown.min.js";
import "semantic-ui-css/components/reset.min.css";
import "semantic-ui-css/components/site.min.css";
@@ -35,6 +27,7 @@ import "semantic-ui-css/components/menu.min.css";
import "semantic-ui-css/components/comment.min.css";
import "@fider/assets/styles/main.scss";
+const w = window as any;
w.props = {};
w.set = (key: string, value: any): void => {
w.props[key] = value;
diff --git a/public/pages/Home/Home.page.scss b/public/pages/Home/Home.page.scss
index 40cee6e46..52ad610f9 100644
--- a/public/pages/Home/Home.page.scss
+++ b/public/pages/Home/Home.page.scss
@@ -36,34 +36,40 @@
.ideas-filter {
.item {
.label {
+ position: absolute;
font-size: 8px;
margin-left: 5px;
}
}
}
- .tags-filter.has-selection {
- i.filter {
- vertical-align: middle;
+ .tags-filter {
+ .ui.empty.circular.label {
+ font-size: .71428571rem;
+ margin-right: 5px;
}
- .ui.label.transition {
+ .selected.item {
background-color: transparent;
- box-shadow: none;
- font-weight: 500;
- .ui.empty.circular.label {
- font-size: .71428571rem;
- margin-right: 5px;
+ font-weight: normal;
+ }
+ i.check {
+ color: transparent;
+ }
+ .selected-tag {
+ i.check {
+ color: $green;
}
}
}
- .filter-column {
- display: flex;
- align-items: center;
- }
-
- .no-ideas-found {
- margin-top: 10px;
+ @include mobile {
+ .filter-column {
+ padding-right: 0;
+ }
+
+ .search-column {
+ padding-left: 0;
+ }
}
#new-idea-input {
@@ -78,15 +84,4 @@
border-radius: 0;
}
- .signin-message {
- @media only screen and (min-width: 768px) and (max-width: 991px) {
- span {
- display: none;
- }
- i {
- margin: 0 auto !important;
- }
- }
- }
-
}
\ No newline at end of file
diff --git a/public/pages/Home/components/IdeaFilter.tsx b/public/pages/Home/components/IdeaFilter.tsx
index 3bf9a5350..328cbe197 100644
--- a/public/pages/Home/components/IdeaFilter.tsx
+++ b/public/pages/Home/components/IdeaFilter.tsx
@@ -1,7 +1,6 @@
import * as React from "react";
import { Idea, IdeaStatus } from "@fider/models";
-
-export type IdeaFilterFunction = (ideas: Idea[]) => Idea[];
+import { Dropdown, DropdownItemProps } from "@fider/components";
interface IdeaFilterProps {
activeFilter: string;
@@ -9,87 +8,44 @@ interface IdeaFilterProps {
filterChanged: (name: string) => void;
}
-const names: { [key: string]: string } = {
- trending: "trending",
- recent: "recent",
- "most-wanted": "most wanted",
- "most-discussed": "most discussed",
- planned: "planned",
- started: "started",
- completed: "completed",
- declined: "declined"
-};
-
export class IdeaFilter extends React.Component<IdeaFilterProps, {}> {
- private element?: HTMLDivElement;
-
constructor(props: IdeaFilterProps) {
super(props);
}
- public componentDidMount() {
- $(this.element).dropdown({
- onChange: (value: string) => {
- this.props.filterChanged(value);
- }
- });
- }
-
public render() {
- let activeFilter = this.props.activeFilter;
- if (!(this.props.activeFilter in names)) {
- activeFilter = "trending";
- }
+ const options: DropdownItemProps[] = [
+ { text: "trending", value: "trending", content: "Trending" },
+ { text: "recent", value: "recent", content: "Recent" },
+ { text: "most wanted", value: "most-wanted", content: "Most Wanted" },
+ { text: "most discussed", value: "most discussed", content: "Most Discussed" }
+ ];
+
+ IdeaStatus.All.filter(s => s.filterable && this.props.countPerStatus[s.value]).forEach(s => {
+ options.push({
+ text: s.title.toLowerCase(),
+ value: s.slug,
+ content: (
+ <span>
+ {s.title} <a className="ui mini circular label">{this.props.countPerStatus[s.value]}</a>
+ </span>
+ )
+ });
+ });
- const statusFilterItems = IdeaStatus.All.filter(s => s.filterable && this.props.countPerStatus[s.value]).map(s => (
- <div
- key={s.value}
- className={`item ${activeFilter === s.slug && "active"}`}
- data-value={s.slug}
- data-text={s.title.toLowerCase()}
- >
- {s.title}
- <a className="ui mini circular label">{this.props.countPerStatus[s.value]}</a>
- </div>
- ));
+ const activeFilter = options.find(x => x.value === this.props.activeFilter) ? this.props.activeFilter : "trending";
return (
<>
- <div className="content">
- Showing{" "}
- <div className="ideas-filter ui inline dropdown" ref={e => (this.element = e!)}>
- <div className="text">{names[activeFilter]}</div>
- <i className="dropdown icon" />
- <div className="menu">
- <div className="header">What do you want to see?</div>
- <div
- className={`item ${activeFilter === "trending" && "active"}`}
- data-value="trending"
- data-text="trending"
- >
- Trending
- </div>
- <div className={`item ${activeFilter === "recent" && "active"}`} data-value="recent" data-text="recent">
- Recent
- </div>
- <div
- className={`item ${activeFilter === "most-wanted" && "active"}`}
- data-value="most-wanted"
- data-text="most wanted"
- >
- Most Wanted
- </div>
- <div
- className={`item ${activeFilter === "most-discussed" && "active"}`}
- data-value="most-discussed"
- data-text="most discussed"
- >
- Most Discussed
- </div>
- {statusFilterItems}
- </div>
- </div>
- </div>
+ Show{" "}
+ <Dropdown
+ className="ideas-filter"
+ header="What do you want to see?"
+ inline={true}
+ options={options}
+ defaultValue={activeFilter}
+ onChange={(item, data) => this.props.filterChanged(data.value as string)}
+ />
</>
);
}
diff --git a/public/pages/Home/components/IdeasContainer.tsx b/public/pages/Home/components/IdeasContainer.tsx
index ef35618ec..66baa3369 100644
--- a/public/pages/Home/components/IdeasContainer.tsx
+++ b/public/pages/Home/components/IdeasContainer.tsx
@@ -109,15 +109,26 @@ export class IdeasContainer extends React.Component<IdeasContainerProps, IdeasCo
<>
<div className="ui grid">
{!this.state.query && (
- <div className="ten wide mobile ten wide tablet twelve wide computer column filter-column">
- <IdeaFilter
- activeFilter={this.state.filter}
- filterChanged={filter => this.changeFilterCriteria({ filter })}
- countPerStatus={this.props.countPerStatus}
- />
+ <div className="eleven wide mobile eleven wide tablet twelve wide computer column filter-column">
+ <div className="content">
+ <IdeaFilter
+ activeFilter={this.state.filter}
+ filterChanged={filter => this.changeFilterCriteria({ filter })}
+ countPerStatus={this.props.countPerStatus}
+ />
+ <TagsFilter
+ tags={this.props.tags}
+ selectionChanged={tags => this.changeFilterCriteria({ tags })}
+ defaultSelection={this.state.tags}
+ />
+ </div>
</div>
)}
- <div className={!this.state.query ? `six wide mobile six wide tablet four wide computer column` : "column"}>
+ <div
+ className={
+ !this.state.query ? `five wide mobile five wide tablet four wide computer column search-column` : "column"
+ }
+ >
<div className="ui search">
<div className="ui icon fluid input">
<input
@@ -135,11 +146,6 @@ export class IdeasContainer extends React.Component<IdeasContainerProps, IdeasCo
</div>
</div>
</div>
- <TagsFilter
- tags={this.props.tags}
- selectionChanged={tags => this.changeFilterCriteria({ tags })}
- defaultSelection={this.state.tags}
- />
{this.state.loading ? (
<Loader />
) : (
diff --git a/public/pages/Home/components/ListIdeas.tsx b/public/pages/Home/components/ListIdeas.tsx
index 23128b271..f23e952b4 100644
--- a/public/pages/Home/components/ListIdeas.tsx
+++ b/public/pages/Home/components/ListIdeas.tsx
@@ -30,7 +30,7 @@ const ListIdeaItem = (props: { idea: Idea; user?: CurrentUser; tags: Tag[] }) =>
</a>
<MultiLineText className="description" text={props.idea.description} style="simple" />
<ShowIdeaResponse status={props.idea.status} response={props.idea.response} />
- {props.tags.map(tag => <ShowTag key={tag.id} size="tiny" tag={tag} />)}
+ {props.tags.map(tag => <ShowTag key={tag.id} size="mini" tag={tag} />)}
</div>
</div>
);
@@ -53,7 +53,7 @@ export class ListIdeas extends React.Component<ListIdeasProps, ListIdeasState> {
public render() {
if (this.props.ideas.length === 0) {
- return <p className="no-ideas-found">{this.props.emptyText}</p>;
+ return <p>{this.props.emptyText}</p>;
}
const ideasToList = this.props.ideas.slice(0, this.state.showCount);
diff --git a/public/pages/Home/components/TagsFilter.tsx b/public/pages/Home/components/TagsFilter.tsx
index 3db8e4845..143998764 100644
--- a/public/pages/Home/components/TagsFilter.tsx
+++ b/public/pages/Home/components/TagsFilter.tsx
@@ -1,6 +1,7 @@
import * as React from "react";
import { Tag } from "@fider/models";
import { ShowTag } from "@fider/components/ShowTag";
+import { Dropdown, DropdownProps } from "@fider/components";
interface TagsFilterProps {
tags: Tag[];
@@ -13,8 +14,6 @@ interface TagsFilterState {
}
export class TagsFilter extends React.Component<TagsFilterProps, TagsFilterState> {
- private element?: HTMLDivElement;
-
constructor(props: TagsFilterProps) {
super(props);
this.state = {
@@ -22,58 +21,55 @@ export class TagsFilter extends React.Component<TagsFilterProps, TagsFilterState
};
}
- public componentDidMount() {
- const $element = $(this.element);
- this.props.defaultSelection.forEach(t => {
- $element.dropdown("set selected", t);
- });
- $element.dropdown({
- onAdd: (value: string) => {
- const id = parseInt(value, 10);
- const selected = this.state.selected.concat(value);
- this.setState({ selected });
- this.props.selectionChanged(selected);
- },
- onRemove: (value: string) => {
- const idx = this.state.selected.indexOf(value);
- const selected = this.state.selected.splice(idx, 1) && this.state.selected;
- this.setState({ selected });
- this.props.selectionChanged(selected);
- }
- });
- }
+ private onChange = (e: React.SyntheticEvent<HTMLElement>, data: DropdownProps) => {
+ let selected = [];
+ const idx = this.state.selected.indexOf(data.value as string);
+ if (idx >= 0) {
+ selected = this.state.selected.splice(idx, 1) && this.state.selected;
+ } else {
+ selected = this.state.selected.concat(data.value as string);
+ }
+ this.setState({ selected });
+ this.props.selectionChanged(selected);
+ };
public render() {
if (this.props.tags.length === 0) {
return null;
}
- return (
- <div className={`tags-filter ${this.state.selected.length > 0 ? "has-selection" : ""}`}>
- <div className={`ui multiple dropdown `} ref={e => (this.element = e!)}>
- <i className="filter icon" />
- <span className="text">Filter by tag...</span>
- <div className="menu">
- <div className="ui icon search input">
- <i className="search icon" />
- <input type="text" placeholder="Search tags..." />
- </div>
- <div className="divider" />
- <div className="header">
- <i className="tags icon" />
- Tag
- </div>
- <div className="scrolling menu">
- {this.props.tags.map(t => (
- <div key={t.id} className="item" data-value={t.slug}>
- <ShowTag tag={t} circular={true} />
- {t.name}
- </div>
- ))}
- </div>
+ const options = this.props.tags.map(t => {
+ return {
+ value: t.slug,
+ text: t.name,
+ content: (
+ <div className={this.state.selected.indexOf(t.slug) >= 0 ? "selected-tag" : ""}>
+ <i className="icon check" />
+ <ShowTag tag={t} circular={true} />
+ {t.name}
</div>
- </div>
- </div>
+ )
+ };
+ });
+
+ const text =
+ this.state.selected.length === 0
+ ? "any tag"
+ : this.state.selected.length === 1 ? "1 tag" : `${this.state.selected.length} tags`;
+
+ return (
+ <>
+ with{" "}
+ <Dropdown
+ className="tags-filter"
+ selectOnBlur={false}
+ text={text}
+ defaultValue="0"
+ inline={true}
+ options={options}
+ onChange={this.onChange}
+ />
+ </>
);
}
}
diff --git a/public/pages/ShowIdea/ShowIdea.page.scss b/public/pages/ShowIdea/ShowIdea.page.scss
index 8a28fec67..237263294 100644
--- a/public/pages/ShowIdea/ShowIdea.page.scss
+++ b/public/pages/ShowIdea/ShowIdea.page.scss
@@ -19,7 +19,7 @@
}
}
- @media only screen and (min-width: 768px) {
+ @include tablet {
.header-col,
.comments-col {
float: left;
@@ -35,7 +35,7 @@
}
.action-col {
- @media only screen and (min-width: 768px) {
+ @include tablet {
width: 200px;
}
.ui.list {
diff --git a/public/pages/ShowIdea/components/IdeaSearch.tsx b/public/pages/ShowIdea/components/IdeaSearch.tsx
index 2f4d0c194..9c1c891b2 100644
--- a/public/pages/ShowIdea/components/IdeaSearch.tsx
+++ b/public/pages/ShowIdea/components/IdeaSearch.tsx
@@ -1,6 +1,7 @@
import * as React from "react";
import { Idea, IdeaStatus } from "@fider/models";
import { actions } from "@fider/services";
+import { Dropdown, DropdownProps, DropdownItemProps, DropdownOnSearchChangeData } from "@fider/components";
interface IdeaSearchProps {
exclude?: number[];
@@ -8,62 +9,75 @@ interface IdeaSearchProps {
}
interface IdeaSearchState {
- ideas?: Idea[];
+ ideas: Idea[];
}
export class IdeaSearch extends React.Component<IdeaSearchProps, IdeaSearchState> {
- private element?: HTMLDivElement;
+ private timer: number = 0;
constructor(props: IdeaSearchProps) {
super(props);
- this.state = {};
- actions.getAllIdeas().then(res => {
- const ideas =
- this.props.exclude && this.props.exclude.length > 0
- ? res.data.filter(i => this.props.exclude!.indexOf(i.number) === -1)
- : res.data;
- this.setState({ ideas });
- });
+ this.state = {
+ ideas: []
+ };
+ this.search("");
}
- public componentDidUpdate() {
- $(this.element).dropdown({
- fullTextSearch: true,
- onChange: (ideaNumber: string) => {
- if (ideaNumber) {
- this.props.onChanged(parseInt(ideaNumber, 10));
- }
- }
- });
- }
+ private onSearchChange = (e: React.SyntheticEvent<HTMLElement>, data: DropdownOnSearchChangeData) => {
+ this.search(data.searchQuery);
+ };
- public render() {
- const items = this.state.ideas && (
- <div className="menu">
- {this.state.ideas.map(i => {
- const status = IdeaStatus.Get(i.status);
- return (
- <div key={i.id} className="item" data-value={i.number} data-text={i.title}>
- <span className="support">
- <i className="medium caret up icon" />
- {i.totalSupporters}
- </span>
- <span className={`ui mini label ${status.color}`}>{status.title}</span>
- {i.title}
- </div>
- );
- })}
- </div>
- );
+ private onChange = (e: React.SyntheticEvent<HTMLElement>, data: DropdownProps) => {
+ this.props.onChanged(parseInt(data.value as string, 10));
+ };
- const className = `ui selection ${items ? "search" : "loading"} fluid dropdown fdr-idea-search`;
+ private search = (searchQuery: string) => {
+ clearTimeout(this.timer);
+ this.timer = setTimeout(() => {
+ actions.searchIdeas(searchQuery, "", []).then(res => {
+ const ideas =
+ this.props.exclude && this.props.exclude.length > 0
+ ? res.data.filter(i => this.props.exclude!.indexOf(i.number) === -1)
+ : res.data;
+ this.setState({ ideas });
+ });
+ }, 200);
+ };
+
+ private returnAll = (options: DropdownItemProps[], value: string) => options;
+
+ public render() {
+ const options = this.state.ideas.map(i => {
+ const status = IdeaStatus.Get(i.status);
+ return {
+ key: i.number,
+ text: i.title,
+ value: i.number,
+ content: (
+ <>
+ <span className="support">
+ <i className="medium caret up icon" />
+ {i.totalSupporters}
+ </span>
+ <span className={`ui mini label ${status.color}`}>{status.title}</span>
+ {i.title}
+ </>
+ )
+ };
+ });
return (
- <div className={className} ref={e => (this.element = e!)}>
- <i className="dropdown icon" />
- <div className="default text">Search original idea</div>
- {items}
- </div>
+ <Dropdown
+ className="fdr-idea-search"
+ fluid={true}
+ selectOnBlur={false}
+ selection={true}
+ search={this.returnAll}
+ options={options}
+ placeholder="Search original idea"
+ onChange={this.onChange}
+ onSearchChange={this.onSearchChange}
+ />
);
}
}
diff --git a/public/pages/ShowIdea/components/TagsPanel.tsx b/public/pages/ShowIdea/components/TagsPanel.tsx
index 29c123f9b..86b589a49 100644
--- a/public/pages/ShowIdea/components/TagsPanel.tsx
+++ b/public/pages/ShowIdea/components/TagsPanel.tsx
@@ -61,7 +61,7 @@ export class TagsPanel extends React.Component<TagsPanelProps, TagsPanelState> {
<div className="ui list tag-list">
{this.state.assignedTags.map(tag => (
<div key={tag.id} className="item">
- <ShowTag tag={tag} />
+ <ShowTag tag={tag} size="mini" />
</div>
))}
</div>
diff --git a/public/tsd.d.ts b/public/tsd.d.ts
index 8a31e6172..36ecb54b9 100644
--- a/public/tsd.d.ts
+++ b/public/tsd.d.ts
@@ -1,9 +1,3 @@
-interface JQuery {
- modal(opts: any): any;
- popup(args: any): any;
- dropdown(args?: any, args2?: any): any;
-}
-
interface Window {
ga?: (cmd: string, evt: string, args?: any) => void;
}
diff --git a/tsconfig.json b/tsconfig.json
index 649fa6ffa..faffdc60c 100755
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,7 +5,6 @@
"strict": true,
"sourceMap": true,
"types": [
- "jquery",
"markdown-it",
"react",
"react-dom",