김대철 / CafeRecommend

Go to a project
Toggle navigation Toggle navigation pinning
dckat
5f056929 1 parent 9cc39958

커밋시 충돌부분 수정 

fix: package-lock.json, index.js pull 과정 중 발생한 충돌 일부 수정
Inline Side-by-side
Showing 2 changed files with 321 additions and 325 deletions
...@@ -1151,17 +1151,15 @@ ...@@ -1151,17 +1151,15 @@
1151 "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", 1151 "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
1152 "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==" 1152 "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="
1153 }, 1153 },
1154 -<<<<<<< HEAD
1155 "isstream": { 1154 "isstream": {
1156 "version": "0.1.2", 1155 "version": "0.1.2",
1157 "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", 1156 "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
1158 "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" 1157 "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
1159 -======= 1158 + },
1160 "isarray": { 1159 "isarray": {
1161 "version": "1.0.0", 1160 "version": "1.0.0",
1162 "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", 1161 "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
1163 "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" 1162 "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
1164 ->>>>>>> 725445bde095435f47f8bc948873818794f00365
1165 }, 1163 },
1166 "jake": { 1164 "jake": {
1167 "version": "10.8.2", 1165 "version": "10.8.2",
...@@ -1815,334 +1813,335 @@ ...@@ -1815,334 +1813,335 @@
1815 "jsbn": "~0.1.0", 1813 "jsbn": "~0.1.0",
1816 "safer-buffer": "^2.0.2", 1814 "safer-buffer": "^2.0.2",
1817 "tweetnacl": "~0.14.0" 1815 "tweetnacl": "~0.14.0"
1818 - }
1819 - "sqlstring": {
1820 - "version": "2.3.1",
1821 - "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz",
1822 - "integrity": "sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A="
1823 - },
1824 - "statuses": {
1825 - "version": "1.4.0",
1826 - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
1827 - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
1828 - },
1829 - "string-width": {
1830 - "version": "4.2.2",
1831 - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
1832 - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
1833 - "requires": {
1834 - "emoji-regex": "^8.0.0",
1835 - "is-fullwidth-code-point": "^3.0.0",
1836 - "strip-ansi": "^6.0.0"
1837 }, 1816 },
1838 - "dependencies": { 1817 + "sqlstring": {
1839 - "ansi-regex": { 1818 + "version": "2.3.1",
1840 - "version": "5.0.0", 1819 + "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz",
1841 - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", 1820 + "integrity": "sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A="
1842 - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" 1821 + },
1843 - }, 1822 + "statuses": {
1844 - "emoji-regex": { 1823 + "version": "1.4.0",
1845 - "version": "8.0.0", 1824 + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
1846 - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", 1825 + "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
1847 - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" 1826 + },
1848 - }, 1827 + "string-width": {
1849 - "is-fullwidth-code-point": { 1828 + "version": "4.2.2",
1850 - "version": "3.0.0", 1829 + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
1851 - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", 1830 + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
1852 - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" 1831 + "requires": {
1832 + "emoji-regex": "^8.0.0",
1833 + "is-fullwidth-code-point": "^3.0.0",
1834 + "strip-ansi": "^6.0.0"
1853 }, 1835 },
1854 - "strip-ansi": { 1836 + "dependencies": {
1855 - "version": "6.0.0", 1837 + "ansi-regex": {
1856 - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", 1838 + "version": "5.0.0",
1857 - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", 1839 + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
1858 - "requires": { 1840 + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
1859 - "ansi-regex": "^5.0.0" 1841 + },
1842 + "emoji-regex": {
1843 + "version": "8.0.0",
1844 + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
1845 + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
1846 + },
1847 + "is-fullwidth-code-point": {
1848 + "version": "3.0.0",
1849 + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
1850 + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
1851 + },
1852 + "strip-ansi": {
1853 + "version": "6.0.0",
1854 + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
1855 + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
1856 + "requires": {
1857 + "ansi-regex": "^5.0.0"
1858 + }
1860 } 1859 }
1861 } 1860 }
1862 - }
1863 - },
1864 - "string_decoder": {
1865 - "version": "1.1.1",
1866 - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
1867 - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
1868 - "requires": {
1869 - "safe-buffer": "~5.1.0"
1870 - }
1871 - },
1872 - "strip-ansi": {
1873 - "version": "5.2.0",
1874 - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
1875 - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
1876 - "requires": {
1877 - "ansi-regex": "^4.1.0"
1878 - }
1879 - },
1880 - "strip-json-comments": {
1881 - "version": "2.0.1",
1882 - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
1883 - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
1884 - },
1885 - "supports-color": {
1886 - "version": "5.5.0",
1887 - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
1888 - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
1889 - "requires": {
1890 - "has-flag": "^3.0.0"
1891 - }
1892 - },
1893 - "term-size": {
1894 - "version": "2.2.1",
1895 - "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
1896 - "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="
1897 - },
1898 - "to-readable-stream": {
1899 - "version": "1.0.0",
1900 - "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
1901 - "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="
1902 - },
1903 - "to-regex-range": {
1904 - "version": "5.0.1",
1905 - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
1906 - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
1907 - "requires": {
1908 - "is-number": "^7.0.0"
1909 - }
1910 - },
1911 - "toidentifier": {
1912 - "version": "1.0.0",
1913 - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
1914 - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
1915 - },
1916 - "touch": {
1917 - "version": "3.1.0",
1918 - "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
1919 - "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
1920 - "requires": {
1921 - "nopt": "~1.0.10"
1922 - }
1923 - },
1924 - "tough-cookie": {
1925 - "version": "2.5.0",
1926 - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
1927 - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
1928 - "requires": {
1929 - "psl": "^1.1.28",
1930 - "punycode": "^2.1.1"
1931 - }
1932 - },
1933 - "tunnel-agent": {
1934 - "version": "0.6.0",
1935 - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
1936 - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
1937 - "requires": {
1938 - "safe-buffer": "^5.0.1"
1939 - }
1940 - },
1941 - "tweetnacl": {
1942 - "version": "0.14.5",
1943 - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
1944 - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
1945 - },
1946 - "type-fest": {
1947 - "version": "0.8.1",
1948 - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
1949 - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
1950 - },
1951 - "type-is": {
1952 - "version": "1.6.18",
1953 - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
1954 - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
1955 - "requires": {
1956 - "media-typer": "0.3.0",
1957 - "mime-types": "~2.1.24"
1958 - }
1959 - },
1960 - "typedarray-to-buffer": {
1961 - "version": "3.1.5",
1962 - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
1963 - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
1964 - "requires": {
1965 - "is-typedarray": "^1.0.0"
1966 - }
1967 - },
1968 - "uid-safe": {
1969 - "version": "2.1.5",
1970 - "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
1971 - "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
1972 - "requires": {
1973 - "random-bytes": "~1.0.0"
1974 - }
1975 - },
1976 - "undefsafe": {
1977 - "version": "2.0.3",
1978 - "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.3.tgz",
1979 - "integrity": "sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A==",
1980 - "requires": {
1981 - "debug": "^2.2.0"
1982 - }
1983 - },
1984 - "unique-string": {
1985 - "version": "2.0.0",
1986 - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
1987 - "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
1988 - "requires": {
1989 - "crypto-random-string": "^2.0.0"
1990 - }
1991 - },
1992 - "universalify": {
1993 - "version": "0.1.2",
1994 - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
1995 - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
1996 - },
1997 - "unpipe": {
1998 - "version": "1.0.0",
1999 - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
2000 - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
2001 - },
2002 - "update-notifier": {
2003 - "version": "4.1.3",
2004 - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz",
2005 - "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==",
2006 - "requires": {
2007 - "boxen": "^4.2.0",
2008 - "chalk": "^3.0.0",
2009 - "configstore": "^5.0.1",
2010 - "has-yarn": "^2.1.0",
2011 - "import-lazy": "^2.1.0",
2012 - "is-ci": "^2.0.0",
2013 - "is-installed-globally": "^0.3.1",
2014 - "is-npm": "^4.0.0",
2015 - "is-yarn-global": "^0.3.0",
2016 - "latest-version": "^5.0.0",
2017 - "pupa": "^2.0.1",
2018 - "semver-diff": "^3.1.1",
2019 - "xdg-basedir": "^4.0.0"
2020 }, 1861 },
2021 - "dependencies": { 1862 + "string_decoder": {
2022 - "ansi-styles": { 1863 + "version": "1.1.1",
2023 - "version": "4.3.0", 1864 + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
2024 - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", 1865 + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
2025 - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", 1866 + "requires": {
2026 - "requires": { 1867 + "safe-buffer": "~5.1.0"
2027 - "color-convert": "^2.0.1" 1868 + }
2028 - } 1869 + },
2029 - }, 1870 + "strip-ansi": {
2030 - "chalk": { 1871 + "version": "5.2.0",
2031 - "version": "3.0.0", 1872 + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
2032 - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", 1873 + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
2033 - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", 1874 + "requires": {
2034 - "requires": { 1875 + "ansi-regex": "^4.1.0"
2035 - "ansi-styles": "^4.1.0", 1876 + }
2036 - "supports-color": "^7.1.0" 1877 + },
2037 - } 1878 + "strip-json-comments": {
2038 - }, 1879 + "version": "2.0.1",
2039 - "color-convert": { 1880 + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
2040 - "version": "2.0.1", 1881 + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
2041 - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", 1882 + },
2042 - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", 1883 + "supports-color": {
2043 - "requires": { 1884 + "version": "5.5.0",
2044 - "color-name": "~1.1.4" 1885 + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
2045 - } 1886 + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
2046 - }, 1887 + "requires": {
2047 - "color-name": { 1888 + "has-flag": "^3.0.0"
2048 - "version": "1.1.4", 1889 + }
2049 - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", 1890 + },
2050 - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" 1891 + "term-size": {
2051 - }, 1892 + "version": "2.2.1",
2052 - "has-flag": { 1893 + "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
2053 - "version": "4.0.0", 1894 + "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="
2054 - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", 1895 + },
2055 - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" 1896 + "to-readable-stream": {
1897 + "version": "1.0.0",
1898 + "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
1899 + "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="
1900 + },
1901 + "to-regex-range": {
1902 + "version": "5.0.1",
1903 + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
1904 + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
1905 + "requires": {
1906 + "is-number": "^7.0.0"
1907 + }
1908 + },
1909 + "toidentifier": {
1910 + "version": "1.0.0",
1911 + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
1912 + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
1913 + },
1914 + "touch": {
1915 + "version": "3.1.0",
1916 + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
1917 + "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
1918 + "requires": {
1919 + "nopt": "~1.0.10"
1920 + }
1921 + },
1922 + "tough-cookie": {
1923 + "version": "2.5.0",
1924 + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
1925 + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
1926 + "requires": {
1927 + "psl": "^1.1.28",
1928 + "punycode": "^2.1.1"
1929 + }
1930 + },
1931 + "tunnel-agent": {
1932 + "version": "0.6.0",
1933 + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
1934 + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
1935 + "requires": {
1936 + "safe-buffer": "^5.0.1"
1937 + }
1938 + },
1939 + "tweetnacl": {
1940 + "version": "0.14.5",
1941 + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
1942 + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
1943 + },
1944 + "type-fest": {
1945 + "version": "0.8.1",
1946 + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
1947 + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
1948 + },
1949 + "type-is": {
1950 + "version": "1.6.18",
1951 + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
1952 + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
1953 + "requires": {
1954 + "media-typer": "0.3.0",
1955 + "mime-types": "~2.1.24"
1956 + }
1957 + },
1958 + "typedarray-to-buffer": {
1959 + "version": "3.1.5",
1960 + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
1961 + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
1962 + "requires": {
1963 + "is-typedarray": "^1.0.0"
1964 + }
1965 + },
1966 + "uid-safe": {
1967 + "version": "2.1.5",
1968 + "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
1969 + "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
1970 + "requires": {
1971 + "random-bytes": "~1.0.0"
1972 + }
1973 + },
1974 + "undefsafe": {
1975 + "version": "2.0.3",
1976 + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.3.tgz",
1977 + "integrity": "sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A==",
1978 + "requires": {
1979 + "debug": "^2.2.0"
1980 + }
1981 + },
1982 + "unique-string": {
1983 + "version": "2.0.0",
1984 + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
1985 + "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
1986 + "requires": {
1987 + "crypto-random-string": "^2.0.0"
1988 + }
1989 + },
1990 + "universalify": {
1991 + "version": "0.1.2",
1992 + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
1993 + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
1994 + },
1995 + "unpipe": {
1996 + "version": "1.0.0",
1997 + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
1998 + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
1999 + },
2000 + "update-notifier": {
2001 + "version": "4.1.3",
2002 + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz",
2003 + "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==",
2004 + "requires": {
2005 + "boxen": "^4.2.0",
2006 + "chalk": "^3.0.0",
2007 + "configstore": "^5.0.1",
2008 + "has-yarn": "^2.1.0",
2009 + "import-lazy": "^2.1.0",
2010 + "is-ci": "^2.0.0",
2011 + "is-installed-globally": "^0.3.1",
2012 + "is-npm": "^4.0.0",
2013 + "is-yarn-global": "^0.3.0",
2014 + "latest-version": "^5.0.0",
2015 + "pupa": "^2.0.1",
2016 + "semver-diff": "^3.1.1",
2017 + "xdg-basedir": "^4.0.0"
2056 }, 2018 },
2057 - "supports-color": { 2019 + "dependencies": {
2058 - "version": "7.2.0", 2020 + "ansi-styles": {
2059 - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", 2021 + "version": "4.3.0",
2060 - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", 2022 + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
2061 - "requires": { 2023 + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
2062 - "has-flag": "^4.0.0" 2024 + "requires": {
2025 + "color-convert": "^2.0.1"
2026 + }
2027 + },
2028 + "chalk": {
2029 + "version": "3.0.0",
2030 + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
2031 + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
2032 + "requires": {
2033 + "ansi-styles": "^4.1.0",
2034 + "supports-color": "^7.1.0"
2035 + }
2036 + },
2037 + "color-convert": {
2038 + "version": "2.0.1",
2039 + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
2040 + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
2041 + "requires": {
2042 + "color-name": "~1.1.4"
2043 + }
2044 + },
2045 + "color-name": {
2046 + "version": "1.1.4",
2047 + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
2048 + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
2049 + },
2050 + "has-flag": {
2051 + "version": "4.0.0",
2052 + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
2053 + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
2054 + },
2055 + "supports-color": {
2056 + "version": "7.2.0",
2057 + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
2058 + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
2059 + "requires": {
2060 + "has-flag": "^4.0.0"
2061 + }
2063 } 2062 }
2064 } 2063 }
2064 + },
2065 + "uri-js": {
2066 + "version": "4.4.1",
2067 + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
2068 + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
2069 + "requires": {
2070 + "punycode": "^2.1.0"
2071 + }
2072 + },
2073 + "url-parse-lax": {
2074 + "version": "3.0.0",
2075 + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
2076 + "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
2077 + "requires": {
2078 + "prepend-http": "^2.0.0"
2079 + }
2080 + },
2081 + "util-deprecate": {
2082 + "version": "1.0.2",
2083 + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
2084 + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
2085 + },
2086 + "utils-merge": {
2087 + "version": "1.0.1",
2088 + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
2089 + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
2090 + },
2091 + "uuid": {
2092 + "version": "3.4.0",
2093 + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
2094 + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
2095 + },
2096 + "vary": {
2097 + "version": "1.1.2",
2098 + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
2099 + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
2100 + },
2101 + "verror": {
2102 + "version": "1.10.0",
2103 + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
2104 + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
2105 + "requires": {
2106 + "assert-plus": "^1.0.0",
2107 + "core-util-is": "1.0.2",
2108 + "extsprintf": "^1.2.0"
2109 + }
2110 + },
2111 + "widest-line": {
2112 + "version": "3.1.0",
2113 + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
2114 + "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
2115 + "requires": {
2116 + "string-width": "^4.0.0"
2117 + }
2118 + },
2119 + "wrappy": {
2120 + "version": "1.0.2",
2121 + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
2122 + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
2123 + },
2124 + "write-file-atomic": {
2125 + "version": "3.0.3",
2126 + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
2127 + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
2128 + "requires": {
2129 + "imurmurhash": "^0.1.4",
2130 + "is-typedarray": "^1.0.0",
2131 + "signal-exit": "^3.0.2",
2132 + "typedarray-to-buffer": "^3.1.5"
2133 + }
2134 + },
2135 + "xdg-basedir": {
2136 + "version": "4.0.0",
2137 + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
2138 + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="
2139 + },
2140 + "yallist": {
2141 + "version": "4.0.0",
2142 + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
2143 + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
2065 } 2144 }
2066 - },
2067 - "uri-js": {
2068 - "version": "4.4.1",
2069 - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
2070 - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
2071 - "requires": {
2072 - "punycode": "^2.1.0"
2073 - }
2074 - },
2075 - "url-parse-lax": {
2076 - "version": "3.0.0",
2077 - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
2078 - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
2079 - "requires": {
2080 - "prepend-http": "^2.0.0"
2081 - }
2082 - },
2083 - "util-deprecate": {
2084 - "version": "1.0.2",
2085 - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
2086 - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
2087 - },
2088 - "utils-merge": {
2089 - "version": "1.0.1",
2090 - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
2091 - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
2092 - },
2093 - "uuid": {
2094 - "version": "3.4.0",
2095 - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
2096 - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
2097 - },
2098 - "vary": {
2099 - "version": "1.1.2",
2100 - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
2101 - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
2102 - },
2103 - "verror": {
2104 - "version": "1.10.0",
2105 - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
2106 - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
2107 - "requires": {
2108 - "assert-plus": "^1.0.0",
2109 - "core-util-is": "1.0.2",
2110 - "extsprintf": "^1.2.0"
2111 - }
2112 - },
2113 - "widest-line": {
2114 - "version": "3.1.0",
2115 - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
2116 - "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
2117 - "requires": {
2118 - "string-width": "^4.0.0"
2119 - }
2120 - },
2121 - "wrappy": {
2122 - "version": "1.0.2",
2123 - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
2124 - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
2125 - },
2126 - "write-file-atomic": {
2127 - "version": "3.0.3",
2128 - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
2129 - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
2130 - "requires": {
2131 - "imurmurhash": "^0.1.4",
2132 - "is-typedarray": "^1.0.0",
2133 - "signal-exit": "^3.0.2",
2134 - "typedarray-to-buffer": "^3.1.5"
2135 - }
2136 - },
2137 - "xdg-basedir": {
2138 - "version": "4.0.0",
2139 - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
2140 - "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="
2141 - },
2142 - "yallist": {
2143 - "version": "4.0.0",
2144 - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
2145 - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
2146 } 2145 }
2147 } 2146 }
2148 } 2147 }
......
...@@ -170,8 +170,6 @@ function checkAuthenticated(req, res, next) { ...@@ -170,8 +170,6 @@ function checkAuthenticated(req, res, next) {
170 res.redirect("/index"); 170 res.redirect("/index");
171 }); 171 });
172 } 172 }
173 -<<<<<<< HEAD
174 -=======
175 173
176 router.get("/map", (req, res) => { 174 router.get("/map", (req, res) => {
177 console.log(req.session.user); 175 console.log(req.session.user);
...@@ -183,4 +181,3 @@ router.get('/logout',function(req,res){ ...@@ -183,4 +181,3 @@ router.get('/logout',function(req,res){
183 req.session.destroy(); //세션비우기 181 req.session.destroy(); //세션비우기
184 res.redirect('/'); 182 res.redirect('/');
185 }); 183 });
186 ->>>>>>> 725445bde095435f47f8bc948873818794f00365
......